From xen-changelog-bounces@lists.xenproject.org Wed May 01 08:44:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 08:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715266.1116780 (Exim 4.92) (envelope-from ) id 1s25ZL-0005FL-EO; Wed, 01 May 2024 08:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715266.1116780; Wed, 01 May 2024 08: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 1s25ZL-0005FE-Bw; Wed, 01 May 2024 08:44:03 +0000 Received: by outflank-mailman (input) for mailman id 715266; Wed, 01 May 2024 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 1s25ZJ-0005F8-Nf for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 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 1s25ZJ-0002oR-L1 for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 08:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s25ZJ-0008Ku-IG for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 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=2BKcIdJpU23Ok0As4xzJ/A2cAxR5MXStc0MzZWx0e1E=; b=3Mp43uokYyUnGND85f0w3qgcxb SQNuzsID9piXsMQtp5wPMQXmoQGoTyyFmoBIhMwzZTxWwV+/mYd8DNufXcp1iMopGQTZU5gDIPGgI XKva+nfvlr5QfF8nwj1hqglBMao0nbQ0+4lWjG5VbGw+JOhQsWwFEUVQ1FsMySAYLC6k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec: fix reporting of BHB clearing usage from guest entry points Message-Id: Date: Wed, 01 May 2024 08:44:01 +0000 commit 7f73536e2644722ec87dc491511cc0f9f762d1eb Author: Roger Pau Monné AuthorDate: Mon Apr 29 10:20:58 2024 +0200 Commit: Jan Beulich CommitDate: Mon Apr 29 10:20:58 2024 +0200 x86/spec: fix reporting of BHB clearing usage from guest entry points Reporting whether the BHB clearing on entry is done for the different domains types based on cpu_has_bhb_seq is unhelpful, as that variable signals whether there's a BHB clearing sequence selected, but that alone doesn't imply that such sequence is used from the PV and/or HVM entry points. Instead use opt_bhb_entry_{pv,hvm} which do signal whether BHB clearing is performed on entry from PV/HVM. Fixes: 689ad48ce9cf ('x86/spec-ctrl: Wire up the Native-BHI software sequences') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 049ab0b2c9f1f5edb54b505fef0bc575787dafe9 master date: 2024-04-25 16:35:56 +0200 --- xen/arch/x86/spec_ctrl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 6ce2815746..d6f8b31394 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -617,14 +617,14 @@ static void __init print_details(enum ind_thunk thunk) (boot_cpu_has(X86_FEATURE_SC_MSR_HVM) || boot_cpu_has(X86_FEATURE_SC_RSB_HVM) || boot_cpu_has(X86_FEATURE_IBPB_ENTRY_HVM) || - cpu_has_bhb_seq || + opt_bhb_entry_hvm || opt_eager_fpu || opt_verw_hvm) ? "" : " None", boot_cpu_has(X86_FEATURE_SC_MSR_HVM) ? " MSR_SPEC_CTRL" : "", boot_cpu_has(X86_FEATURE_SC_RSB_HVM) ? " RSB" : "", opt_eager_fpu ? " EAGER_FPU" : "", opt_verw_hvm ? " VERW" : "", boot_cpu_has(X86_FEATURE_IBPB_ENTRY_HVM) ? " IBPB-entry" : "", - cpu_has_bhb_seq ? " BHB-entry" : ""); + opt_bhb_entry_hvm ? " BHB-entry" : ""); #endif #ifdef CONFIG_PV @@ -632,14 +632,14 @@ static void __init print_details(enum ind_thunk thunk) (boot_cpu_has(X86_FEATURE_SC_MSR_PV) || boot_cpu_has(X86_FEATURE_SC_RSB_PV) || boot_cpu_has(X86_FEATURE_IBPB_ENTRY_PV) || - cpu_has_bhb_seq || + opt_bhb_entry_pv || opt_eager_fpu || opt_verw_pv) ? "" : " None", boot_cpu_has(X86_FEATURE_SC_MSR_PV) ? " MSR_SPEC_CTRL" : "", boot_cpu_has(X86_FEATURE_SC_RSB_PV) ? " RSB" : "", opt_eager_fpu ? " EAGER_FPU" : "", opt_verw_pv ? " VERW" : "", boot_cpu_has(X86_FEATURE_IBPB_ENTRY_PV) ? " IBPB-entry" : "", - cpu_has_bhb_seq ? " BHB-entry" : ""); + opt_bhb_entry_pv ? " BHB-entry" : ""); printk(" XPTI (64-bit PV only): Dom0 %s, DomU %s (with%s PCID)\n", opt_xpti_hwdom ? "enabled" : "disabled", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Wed May 01 08:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 08:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715267.1116784 (Exim 4.92) (envelope-from ) id 1s25ZV-0005HA-Fw; Wed, 01 May 2024 08:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715267.1116784; Wed, 01 May 2024 08: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 1s25ZV-0005H3-DU; Wed, 01 May 2024 08:44:13 +0000 Received: by outflank-mailman (input) for mailman id 715267; Wed, 01 May 2024 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 1s25ZT-0005Gx-Qt for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 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 1s25ZT-0002oa-Q2 for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 08:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s25ZT-0008Lt-NG for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 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=p+oaCTYuhwL2VavkoSLK9M/bVi2YSv5D6TbNJ33O+ew=; b=O8TLg8M/Acfo4kG5ROIPUi/BH8 wBcoD7HKSXueHCF2eFlLwIw8VGv9GV+OulguPhs19VtlGELRVugSwvqw7WkedVcqnJx1KAoMpSSh7 oVoDshKfHaai2wKxh0vqez1hgZ1mQ/f/yJg6moqXdR6HEKy1mszJF2D+DiosnqSPFHJk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec: adjust logic that elides lfence Message-Id: Date: Wed, 01 May 2024 08:44:11 +0000 commit 056500003eb44314cb90f2e3e7b2d405e86b5657 Author: Roger Pau Monné AuthorDate: Mon Apr 29 10:23:03 2024 +0200 Commit: Jan Beulich CommitDate: Mon Apr 29 10:23:03 2024 +0200 x86/spec: adjust logic that elides lfence It's currently too restrictive by just checking whether there's a BHB clearing sequence selected. It should instead check whether BHB clearing is used on entry from PV or HVM specifically. Switch to use opt_bhb_entry_{pv,hvm} instead, and then remove cpu_has_bhb_seq since it no longer has any users. Reported-by: Jan Beulich Fixes: 954c983abcee ('x86/spec-ctrl: Software BHB-clearing sequences') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 656ae8f1091bcefec9c46ec3ea3ac2118742d4f6 master date: 2024-04-25 16:37:01 +0200 --- xen/arch/x86/spec_ctrl.c | 6 +++--- xen/include/asm-x86/cpufeature.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index d6f8b31394..bdafbbb0f2 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -2227,7 +2227,7 @@ void __init init_speculation_mitigations(void) * unconditional WRMSR. If we do have it, or we're not using any * prior conditional block, then it's safe to drop the LFENCE. */ - if ( !cpu_has_bhb_seq && + if ( !opt_bhb_entry_pv && (boot_cpu_has(X86_FEATURE_SC_MSR_PV) || !boot_cpu_has(X86_FEATURE_IBPB_ENTRY_PV)) ) setup_force_cpu_cap(X86_SPEC_NO_LFENCE_ENTRY_PV); @@ -2243,7 +2243,7 @@ void __init init_speculation_mitigations(void) * active in the block that is skipped when interrupting guest * context, then it's safe to drop the LFENCE. */ - if ( !cpu_has_bhb_seq && + if ( !opt_bhb_entry_pv && (boot_cpu_has(X86_FEATURE_SC_MSR_PV) || (!boot_cpu_has(X86_FEATURE_IBPB_ENTRY_PV) && !boot_cpu_has(X86_FEATURE_SC_RSB_PV))) ) @@ -2255,7 +2255,7 @@ void __init init_speculation_mitigations(void) * A BHB sequence, if used, is the only conditional action, so if we * don't have it, we don't need the safety LFENCE. */ - if ( !cpu_has_bhb_seq ) + if ( !opt_bhb_entry_hvm ) setup_force_cpu_cap(X86_SPEC_NO_LFENCE_ENTRY_VMX); } diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index fd43408d35..892af11384 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -178,9 +178,6 @@ /* Bugs. */ #define cpu_bug_fpu_ptrs boot_cpu_has(X86_BUG_FPU_PTRS) -#define cpu_has_bhb_seq (boot_cpu_has(X86_SPEC_BHB_TSX) || \ - boot_cpu_has(X86_SPEC_BHB_LOOPS)) - enum _cache_type { CACHE_TYPE_NULL = 0, CACHE_TYPE_DATA = 1, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Wed May 01 18:22:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 18:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715385.1116949 (Exim 4.92) (envelope-from ) id 1s2Eah-0002H3-AJ; Wed, 01 May 2024 18:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715385.1116949; Wed, 01 May 2024 18: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 1s2Eah-0002Gv-7U; Wed, 01 May 2024 18:22:03 +0000 Received: by outflank-mailman (input) for mailman id 715385; Wed, 01 May 2024 18:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Eag-0002Gn-2g for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Eag-0004zU-0X for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2Eaf-0002UG-UR for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18: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=3bj9wqsHNoBNtAqhJoYgm8Tqys+Z+tdagk1ef1bs2/w=; b=CnF9x4Eyv9PBSp76BJjsu3WSzl YzlVB9qmNqpw/ux1sq3+8uVjzjBzlUBR6WMycfrtgVJUMnjXVzKOlfyQ/Nrt1q+yk9QNUhQwGAtS9 jyXzGsPPIvTDl9BgZ59i40uANttQSwHwmQdiX+o+mtgKs9nx4Y1XZUeiDpy4uuLzJ7OA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msi: passthrough all MSI-X vector ctrl writes to device model Message-Id: Date: Wed, 01 May 2024 18:22:01 +0000 commit 64b21662b1b1619b7b411365aa83ec7fca9edeb4 Author: Marek Marczykowski-Górecki AuthorDate: Tue Apr 30 08:31:01 2024 +0200 Commit: Jan Beulich CommitDate: Tue Apr 30 08:31:01 2024 +0200 x86/msi: passthrough all MSI-X vector ctrl writes to device model QEMU needs to know whether clearing maskbit of a vector is really clearing, or was already cleared before. Currently Xen sends only clearing that bit to the device model, but not setting it, so QEMU cannot detect it. Because of that, QEMU is working this around by checking via /dev/mem, but that isn't the proper approach. Give all necessary information to QEMU by passing all ctrl writes, including masking a vector. Advertise the new behavior via XENVER_get_features, so QEMU can know it doesn't need to access /dev/mem anymore. While this commit doesn't move the whole maskbit handling to QEMU (as discussed on xen-devel as one of the possibilities), it is a necessary first step anyway. Including telling QEMU it will get all the required information to do so. The actual implementation would need to include: - a hypercall for QEMU to control just maskbit (without (re)binding the interrupt again - a method for QEMU to tell Xen it will actually do the work Those are not part of this series. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/hvm/vmsi.c | 19 ++++++++++++++----- xen/common/kernel.c | 1 + xen/include/public/features.h | 8 ++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index adbac965f9..9999179837 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -283,8 +283,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, unsigned long flags; struct irq_desc *desc; - if ( (len != 4 && len != 8) || (address & (len - 1)) ) - return r; + if ( !IS_ALIGNED(address, len) ) + return X86EMUL_OKAY; rcu_read_lock(&msixtbl_rcu_lock); @@ -345,8 +345,7 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, unlock: spin_unlock_irqrestore(&desc->lock, flags); - if ( len == 4 ) - r = X86EMUL_OKAY; + r = X86EMUL_OKAY; out: rcu_read_unlock(&msixtbl_rcu_lock); @@ -357,7 +356,17 @@ static int cf_check _msixtbl_write( const struct hvm_io_handler *handler, uint64_t address, uint32_t len, uint64_t val) { - return msixtbl_write(current, address, len, val); + /* Ignore invalid length or unaligned writes. */ + if ( (len != 4 && len != 8) || !IS_ALIGNED(address, len) ) + return X86EMUL_OKAY; + + /* + * This function returns X86EMUL_UNHANDLEABLE even if write is properly + * handled, to propagate it to the device model (so it can keep its + * internal state in sync). + */ + msixtbl_write(current, address, len, val); + return X86EMUL_UNHANDLEABLE; } static bool cf_check msixtbl_range( diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 08dbaa2a05..b44b2439ca 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -637,6 +637,7 @@ long do_xen_version(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) | (1U << XENFEAT_hvm_callback_vector) | (has_pirq(d) ? (1U << XENFEAT_hvm_pirqs) : 0); + fi.submap |= (1U << XENFEAT_dm_msix_all_writes); #endif if ( !paging_mode_translate(d) || is_domain_direct_mapped(d) ) fi.submap |= (1U << XENFEAT_direct_mapped); diff --git a/xen/include/public/features.h b/xen/include/public/features.h index 4437f25d25..8801930947 100644 --- a/xen/include/public/features.h +++ b/xen/include/public/features.h @@ -120,6 +120,14 @@ #define XENFEAT_runstate_phys_area 18 #define XENFEAT_vcpu_time_phys_area 19 +/* + * If set, Xen will passthrough all MSI-X vector ctrl writes to device model, + * not only those unmasking an entry. This allows device model to properly keep + * track of the MSI-X table without having to read it from the device behind + * Xen's backs. This information is relevant only for device models. + */ +#define XENFEAT_dm_msix_all_writes 20 + #define XENFEAT_NR_SUBMAPS 1 #endif /* __XEN_PUBLIC_FEATURES_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 01 18:22:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 18:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715386.1116955 (Exim 4.92) (envelope-from ) id 1s2Ear-0002J0-CK; Wed, 01 May 2024 18:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715386.1116955; Wed, 01 May 2024 18: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 1s2Ear-0002Is-9C; Wed, 01 May 2024 18:22:13 +0000 Received: by outflank-mailman (input) for mailman id 715386; Wed, 01 May 2024 18:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Eaq-0002Ik-5c for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Eaq-0004ze-4j for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2Eaq-0002V1-2q for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18: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=cGQ25zj4BMi95OfLnrM6viar2lRc5Mu9j4Aj0QpuR5g=; b=PaKSljOjjj9/WfEKeTRUoSZ12q BnOcmjU4czTpPA//F4RUvMiq1/UfeS8bh37RwLiJUTGbYua23xL6Rceyq+86tWI1/qLbPNvyKtRxh i4geeETPYQ5UiHxfnvXyxmzqK2INtrj8SpwIcVAGUp+WomRyvSQKhqj0Lfw3gaaMGcZQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/MCE: guard call to Intel-specific intel_get_extended_msrs() Message-Id: Date: Wed, 01 May 2024 18:22:12 +0000 commit abc68e78a38f75a191515861235c9cc15fd2481b Author: Sergiy Kibrik AuthorDate: Tue Apr 30 08:32:03 2024 +0200 Commit: Jan Beulich CommitDate: Tue Apr 30 08:32:03 2024 +0200 x86/MCE: guard call to Intel-specific intel_get_extended_msrs() Add check for CONFIG_INTEL build option to conditional call of this routine, so that if Intel support is disabled the call would be eliminated. No functional change intended. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 2844685983..d179e6b068 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -328,7 +328,8 @@ mcheck_mca_logout(enum mca_source who, struct mca_banks *bankmask, ASSERT(mig); mca_init_global(mc_flags, mig); /* A hook here to get global extended msrs */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) + if ( IS_ENABLED(CONFIG_INTEL) && + boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) intel_get_extended_msrs(mig, mci); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 01 18:22:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 18:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715387.1116956 (Exim 4.92) (envelope-from ) id 1s2Eb1-0002Lk-Du; Wed, 01 May 2024 18:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715387.1116956; Wed, 01 May 2024 18: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 1s2Eb1-0002Lc-Ak; Wed, 01 May 2024 18:22:23 +0000 Received: by outflank-mailman (input) for mailman id 715387; Wed, 01 May 2024 18:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Eb0-0002LS-AI for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Eb0-0004zp-9N for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2Eb0-0002VY-6s for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18: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=rTB0QsQkKtwLmx00PgymRZOmwA7wRpXOzxJGJFnZIsM=; b=a3f8V5bBSwk0ob42Y3lf3Gvy9n rzMOFJAsQt06uQ0S0sL6ZANBrbaNlmNht7SB2OPRWJQ9DryUl/uxwJv1x4UCu1K9/4ov6w0pFfq37 kKxI9vREyZMHZZpO1MlrK8EGACUtjdlosoXZ3e+Xpxeub3qj7bC5trW2HBE36tVtsr7U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/xsm: Wire up get_dom0_console Message-Id: Date: Wed, 01 May 2024 18:22:22 +0000 commit 647f7e50ebeeb8152974cad6a12affe474c74513 Author: Jason Andryuk AuthorDate: Tue Apr 30 08:33:41 2024 +0200 Commit: Jan Beulich CommitDate: Tue Apr 30 08:33:41 2024 +0200 xen/xsm: Wire up get_dom0_console An XSM hook for get_dom0_console is currently missing. Using XSM with a PVH dom0 shows: (XEN) FLASK: Denying unknown platform_op: 64. Wire up the hook, and allow it for dom0. Fixes: 4dd160583c ("x86/platform: introduce hypercall to get initial video console settings") Signed-off-by: Jason Andryuk Acked-by: Daniel P. Smith --- tools/flask/policy/modules/dom0.te | 2 +- xen/xsm/flask/hooks.c | 4 ++++ xen/xsm/flask/policy/access_vectors | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index f1dcff48e2..16b8c9646d 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - coverage_op + coverage_op get_dom0_console }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 78225f68c1..5e88c71b8e 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1558,6 +1558,10 @@ static int cf_check flask_platform_op(uint32_t op) return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, SECCLASS_XEN2, XEN2__GET_SYMBOL, NULL); + case XENPF_get_dom0_console: + return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, + SECCLASS_XEN2, XEN2__GET_DOM0_CONSOLE, NULL); + default: return avc_unknown_permission("platform_op", op); } diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 4e6710a63e..a35e3d4c51 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,6 +99,8 @@ class xen2 livepatch_op # XEN_SYSCTL_coverage_op coverage_op +# XENPF_get_dom0_console + get_dom0_console } # Classes domain and domain2 consist of operations that a domain performs on -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 01 18:22:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 18:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715388.1116961 (Exim 4.92) (envelope-from ) id 1s2EbB-0002PI-F1; Wed, 01 May 2024 18:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715388.1116961; Wed, 01 May 2024 18: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 1s2EbB-0002PB-CL; Wed, 01 May 2024 18:22:33 +0000 Received: by outflank-mailman (input) for mailman id 715388; Wed, 01 May 2024 18:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2EbA-0002P0-EH for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2EbA-0004zy-CX for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2EbA-0002WD-BV for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18: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=byAcHNc6Jd+lFAdHaOJam/PMvvgDWLyrGJI8XqhZPVk=; b=GU5UwwgITT/im75kDLxE3Q0ekQ LlVJX3QL0n2a+KukP4OGD3q4coiYHbUqyHxUxZHuCyiKaUUbKKeEovcA3DJol6Q6zSZ3orzLq0HdV d1n1RL+CG28NXJbHOOrvszeJrReDI5nwbvATjJSGrw/JaxtlJorsIx1OfP7y6JKSjbWw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Fix Syntax warning in gen-cpuid.py Message-Id: Date: Wed, 01 May 2024 18:22:32 +0000 commit 08e79bba73d74a85d3ce6ff0f91c5205f1e05eda Author: Jason Andryuk AuthorDate: Tue Apr 30 08:34:37 2024 +0200 Commit: Jan Beulich CommitDate: Tue Apr 30 08:34:37 2024 +0200 xen/x86: Fix Syntax warning in gen-cpuid.py Python 3.12.2 warns: xen/tools/gen-cpuid.py:50: SyntaxWarning: invalid escape sequence '\s' "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" xen/tools/gen-cpuid.py:51: SyntaxWarning: invalid escape sequence '\s' "\s+/\*([\w!]*) .*$") Specify the strings as raw strings so '\s' is read as literal '\' + 's'. This avoids escaping all the '\'s in the strings. Signed-off-by: Jason Andryuk Acked-by: Andrew Cooper --- xen/tools/gen-cpuid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index bf3f9ec01e..dadeb33080 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -47,8 +47,8 @@ def parse_definitions(state): """ feat_regex = re.compile( r"^XEN_CPUFEATURE\(([A-Z0-9_]+)," - "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" - "\s+/\*([\w!]*) .*$") + r"\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" + r"\s+/\*([\w!]*) .*$") word_regex = re.compile( r"^/\* .* word (\d*) \*/$") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 01 18:22:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 18:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715389.1116964 (Exim 4.92) (envelope-from ) id 1s2EbL-0002S4-GV; Wed, 01 May 2024 18:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715389.1116964; Wed, 01 May 2024 18: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 1s2EbL-0002Rw-Do; Wed, 01 May 2024 18:22:43 +0000 Received: by outflank-mailman (input) for mailman id 715389; Wed, 01 May 2024 18:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2EbK-0002Rj-Gp for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2EbK-00050B-G6 for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2EbK-0002Wm-Ec for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18: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=3USN7NtuSU+mrdFwdJ631WkHzWfOY6S88SfEDuyl76o=; b=EkmBqF/SqsEiBjjnSdyQjYJTDJ ARuTZBnqCPRaJbdGHSj6iB9TEx+AT4BLWZoFRACDIMjfDCvbM4RBmH8Fxlgjh4+Z8hTkWrTgfsVjQ i4mAdDX7wbya9W918wDzVNEWVNN9OWnlceVgTWHaQb2LxTFwR1/xuTBqmJJU+I+o2kGE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: improve check-extension() macro Message-Id: Date: Wed, 01 May 2024 18:22:42 +0000 commit bf0059282d7e5c1c625cb1a80410db5918c45fe1 Author: Oleksii Kurochko AuthorDate: Tue Apr 30 08:36:39 2024 +0200 Commit: Jan Beulich CommitDate: Tue Apr 30 08:36:39 2024 +0200 xen/riscv: improve check-extension() macro Now, the check-extension() macro has 1 argument instead of 2. This change helps to reduce redundancy around usage of extensions name (in the case of the zbb extension, the name was used 3 times). To implement this, a new variable was introduced: -insn which represents the instruction support that is being checked. Additionally, zbb-insn is updated to use $(comma) instead of ",". Suggested-by: Jan Beulich Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich --- xen/arch/riscv/arch.mk | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/xen/arch/riscv/arch.mk b/xen/arch/riscv/arch.mk index 05c113f2c2..8c071aff65 100644 --- a/xen/arch/riscv/arch.mk +++ b/xen/arch/riscv/arch.mk @@ -13,12 +13,21 @@ riscv-generic-flags := $(riscv-abi-y) -march=$(riscv-march-y) # check-extension: Check whether extenstion is supported by a compiler and # an assembler. -# Usage: $(call check-extension,extension_name,"instr") -check-extension = $(call as-insn,$(CC) $(riscv-generic-flags)_$(1),$(2),_$(1)) - -zbb-insn := "andn t0, t0, t0" -zbb := $(call check-extension,zbb,$(zbb-insn)) -zihintpause := $(call check-extension,zihintpause,"pause") +# Usage: $(call check-extension,extension_name). +# it should be defined variable with following name: +# -insn := "insn" +# which represents an instruction of extension support of which is +# going to be checked. +define check-extension = +$(eval $(1) := \ + $(call as-insn,$(CC) $(riscv-generic-flags)_$(1),$(value $(1)-insn),_$(1))) +endef + +zbb-insn := "andn t0$(comma)t0$(comma)t0" +$(call check-extension,zbb) + +zihintpause-insn := "pause" +$(call check-extension,zihintpause) extensions := $(zbb) $(zihintpause) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 01 18:22:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 18:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715390.1116968 (Exim 4.92) (envelope-from ) id 1s2EbW-0002V0-Ho; Wed, 01 May 2024 18:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715390.1116968; Wed, 01 May 2024 18: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 1s2EbW-0002Ut-FK; Wed, 01 May 2024 18:22:54 +0000 Received: by outflank-mailman (input) for mailman id 715390; Wed, 01 May 2024 18:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2EbU-0002Uj-Jv for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2EbU-00050h-JD for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2EbU-0002XG-IO for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18: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=SiBhoX9uCr4ZzLcZRdNfkHSwspvrsX4GsCUpYiNobig=; b=nYOvFGYlwPyT5sUpUULXvtoSvc HW8WWoWdDcWoXv0lK/mZQIJ3ZFBbbVntTY04v8Clv3joCbjzLpFDTcf9aex8omWYc+v/nkVI2av0F X02l0U9zsIvuuPKhfwQtdJUKiqX1KSloFPppV5wwQX4WLiAOD3UMgxLtyt68vp5fs4GU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] revert "x86/mm: re-implement get_page_light() using an atomic increment" Message-Id: Date: Wed, 01 May 2024 18:22:52 +0000 commit b819bd65f4fb25be582f66ba2e4134f61d86f459 Author: Jan Beulich AuthorDate: Tue Apr 30 08:37:19 2024 +0200 Commit: Jan Beulich CommitDate: Tue Apr 30 08:37:19 2024 +0200 revert "x86/mm: re-implement get_page_light() using an atomic increment" This reverts commit c40bc0576dcc5acd4d7e22ef628eb4642f568533. That change aimed at eliminating an open-coded lock-like construct, which really isn't all that similar to, in particular, get_page(). The function always succeeds. Any remaining concern would want taking care of by placing block_lock_speculation() at the end of the function. Since the function is called only during page (de)validation, any possible performance concerns over such extra serialization could likely be addressed by pre-validating (e.g. via pinning) page tables. The fundamental issue with the change being reverted is that it detects bad state only after already having caused possible corruption. While the system is going to be halted in such an event, there is a time window during which the resulting incorrect state could be leveraged by a clever (in particular: fast enough) attacker. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/mm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 87529db7d1..d968bbbc73 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2582,10 +2582,16 @@ bool get_page(struct page_info *page, const struct domain *domain) */ static void get_page_light(struct page_info *page) { - unsigned long old_pgc = arch_fetch_and_add(&page->count_info, 1); + unsigned long x, nx, y = page->count_info; - BUG_ON(!(old_pgc & PGC_count_mask)); /* Not allocated? */ - BUG_ON(!((old_pgc + 1) & PGC_count_mask)); /* Overflow? */ + do { + x = y; + nx = x + 1; + BUG_ON(!(x & PGC_count_mask)); /* Not allocated? */ + BUG_ON(!(nx & PGC_count_mask)); /* Overflow? */ + y = cmpxchg(&page->count_info, x, nx); + } + while ( unlikely(y != x) ); } static int validate_page(struct page_info *page, unsigned long type, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 01 18:23:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 18:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715391.1116972 (Exim 4.92) (envelope-from ) id 1s2Ebg-0002Xl-JU; Wed, 01 May 2024 18:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715391.1116972; Wed, 01 May 2024 18: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 1s2Ebg-0002Xe-Go; Wed, 01 May 2024 18:23:04 +0000 Received: by outflank-mailman (input) for mailman id 715391; Wed, 01 May 2024 18:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Ebe-0002XI-Mv for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Ebe-000517-MA for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2Ebe-0002Xv-LH for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 18: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=BbAab0Yk+5qDmAQpoB0p+oRmLpQqJP3/SQ/BEiyDHSI=; b=H+juC7sTXVMl2SgFOH6lF7hCo5 iXDoeflu9wEg9GPbSUIh2jTgk38v8AOoBR6l23NP3a3ywzSg01NSja8oRx/rSWWiqkAiZzjhrjpJV KK7Yzoxog9vSdg9alNw1QaTmrUKslgrCrO6jaLNBFb0s0/ihO3peZ1jnlBEmb5Eb3C5E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: Annotate the accumulated features Message-Id: Date: Wed, 01 May 2024 18:23:02 +0000 commit 9e30bd8f4a8cee83368276c5149c7e2304efe5a2 Author: Andrew Cooper AuthorDate: Fri Apr 26 16:53:08 2024 +0100 Commit: Andrew Cooper CommitDate: Tue Apr 30 14:28:54 2024 +0100 x86/cpu-policy: Annotate the accumulated features Some features need accumulating rather than intersecting to make migration safe. Introduce the new '|' attribute for this purpose. Right now, it's only used by the Xapi toolstack, but it will be used by xl/libxl when the full policy-object work is complete, and until then it's still a useful hint for hand-crafted cpuid= lines in vm.cfg files. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/include/public/arch-x86/cpufeatureset.h | 15 ++++++++++----- xen/tools/gen-cpuid.py | 7 +++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 53f13dec31..6627453e39 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -72,6 +72,11 @@ enum { * 'H' = HVM HAP guests (not PV or HVM Shadow guests). * Upper case => Available by default * Lower case => Can be opted-in to, but not available by default. + * + * Migration: '|' + * This bit should be visible to a guest if any anywhere it might run has + * the bit set. i.e. it needs accumulating across the migration pool, + * rather than intersecting. */ /* Intel-defined CPU features, CPUID level 0x00000001.edx, word 0 */ @@ -248,7 +253,7 @@ XEN_CPUFEATURE(IBRS_ALWAYS, 8*32+16) /*S IBRS preferred always on */ XEN_CPUFEATURE(STIBP_ALWAYS, 8*32+17) /*S STIBP preferred always on */ XEN_CPUFEATURE(IBRS_FAST, 8*32+18) /*S IBRS preferred over software options */ XEN_CPUFEATURE(IBRS_SAME_MODE, 8*32+19) /*S IBRS provides same-mode protection */ -XEN_CPUFEATURE(NO_LMSL, 8*32+20) /*S EFER.LMSLE no longer supported. */ +XEN_CPUFEATURE(NO_LMSL, 8*32+20) /*S| EFER.LMSLE no longer supported. */ XEN_CPUFEATURE(AMD_PPIN, 8*32+23) /* Protected Processor Inventory Number */ XEN_CPUFEATURE(AMD_SSBD, 8*32+24) /*S MSR_SPEC_CTRL.SSBD available */ XEN_CPUFEATURE(VIRT_SSBD, 8*32+25) /*! MSR_VIRT_SPEC_CTRL.SSBD */ @@ -263,7 +268,7 @@ XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single XEN_CPUFEATURE(FSRM, 9*32+ 4) /*A Fast Short REP MOVS */ XEN_CPUFEATURE(AVX512_VP2INTERSECT, 9*32+8) /*a VP2INTERSECT{D,Q} insns */ XEN_CPUFEATURE(SRBDS_CTRL, 9*32+ 9) /* MSR_MCU_OPT_CTRL and RNGDS_MITG_DIS. */ -XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*!A VERW clears microarchitectural buffers */ +XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*!A| VERW clears microarchitectural buffers */ XEN_CPUFEATURE(RTM_ALWAYS_ABORT, 9*32+11) /*! RTM disabled (but XBEGIN wont fault) */ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*A SERIALIZE insn */ @@ -292,7 +297,7 @@ XEN_CPUFEATURE(AVX_IFMA, 10*32+23) /*A AVX-IFMA Instructions */ /* AMD-defined CPU features, CPUID level 0x80000021.eax, word 11 */ XEN_CPUFEATURE(NO_NEST_BP, 11*32+ 0) /*A No Nested Data Breakpoints */ -XEN_CPUFEATURE(FS_GS_NS, 11*32+ 1) /*S FS/GS base MSRs non-serialising */ +XEN_CPUFEATURE(FS_GS_NS, 11*32+ 1) /*S| FS/GS base MSRs non-serialising */ XEN_CPUFEATURE(LFENCE_DISPATCH, 11*32+ 2) /*A LFENCE always serializing */ XEN_CPUFEATURE(NSCB, 11*32+ 6) /*A Null Selector Clears Base (and limit too) */ XEN_CPUFEATURE(AUTO_IBRS, 11*32+ 8) /*S Automatic IBRS */ @@ -343,7 +348,7 @@ XEN_CPUFEATURE(DOITM, 16*32+12) /* Data Operand Invariant Timing XEN_CPUFEATURE(SBDR_SSDP_NO, 16*32+13) /*A No Shared Buffer Data Read or Sideband Stale Data Propagation */ XEN_CPUFEATURE(FBSDP_NO, 16*32+14) /*A No Fill Buffer Stale Data Propagation */ XEN_CPUFEATURE(PSDP_NO, 16*32+15) /*A No Primary Stale Data Propagation */ -XEN_CPUFEATURE(FB_CLEAR, 16*32+17) /*!A Fill Buffers cleared by VERW */ +XEN_CPUFEATURE(FB_CLEAR, 16*32+17) /*!A| Fill Buffers cleared by VERW */ XEN_CPUFEATURE(FB_CLEAR_CTRL, 16*32+18) /* MSR_OPT_CPU_CTRL.FB_CLEAR_DIS */ XEN_CPUFEATURE(RRSBA, 16*32+19) /*! Restricted RSB Alternative */ XEN_CPUFEATURE(BHI_NO, 16*32+20) /*A No Branch History Injection */ @@ -353,7 +358,7 @@ XEN_CPUFEATURE(PBRSB_NO, 16*32+24) /*A No Post-Barrier RSB prediction XEN_CPUFEATURE(GDS_CTRL, 16*32+25) /* MCU_OPT_CTRL.GDS_MIT_{DIS,LOCK} */ XEN_CPUFEATURE(GDS_NO, 16*32+26) /*A No Gather Data Sampling */ XEN_CPUFEATURE(RFDS_NO, 16*32+27) /*A No Register File Data Sampling */ -XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A Register File(s) cleared by VERW */ +XEN_CPUFEATURE(RFDS_CLEAR, 16*32+28) /*!A| Register File(s) cleared by VERW */ /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.edx, word 17 */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index dadeb33080..380b9d973a 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -21,7 +21,7 @@ class State(object): self.names = {} # Value => Name mapping self.values = {} # Name => Value mapping self.raw = { - '!': set(), + '!': set(), '|': set(), 'A': set(), 'S': set(), 'H': set(), 'a': set(), 's': set(), 'h': set(), } @@ -48,7 +48,7 @@ def parse_definitions(state): feat_regex = re.compile( r"^XEN_CPUFEATURE\(([A-Z0-9_]+)," r"\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" - r"\s+/\*([\w!]*) .*$") + r"\s+/\*([\w!|]*) .*$") word_regex = re.compile( r"^/\* .* word (\d*) \*/$") @@ -415,6 +415,8 @@ def write_results(state): #define INIT_SPECIAL_FEATURES { \\\n%s\n} +#define INIT_SIMPLE_OR { \\\n%s\n} + #define INIT_PV_DEF_FEATURES { \\\n%s\n} #define INIT_PV_MAX_FEATURES { \\\n%s\n} @@ -436,6 +438,7 @@ def write_results(state): next(featureset_to_uint32s(state.common_1d, 1)), format_uint32s(state, state.names.keys(), 4), format_uint32s(state, state.raw['!'], 4), + format_uint32s(state, state.raw['|'], 4), format_uint32s(state, state.pv_def, 4), format_uint32s(state, state.pv_max, 4), format_uint32s(state, state.hvm_shadow_def, 4), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 01 21:55:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 21:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715502.1117177 (Exim 4.92) (envelope-from ) id 1s2Hur-0002Wi-GC; Wed, 01 May 2024 21:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715502.1117177; Wed, 01 May 2024 21:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Hur-0002Wa-DP; Wed, 01 May 2024 21:55:05 +0000 Received: by outflank-mailman (input) for mailman id 715502; Wed, 01 May 2024 21:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Hup-0002WU-Od for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Hup-0000j7-Ki for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2Hup-0004Ba-IL for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XUdGqjiNVTHk7vZPU+URq3DQMwKsr4jpYZwtgTZ7u+s=; b=DUmq7uIoJJvcg+xiSQI0tOweN0 +b4urpVc2WVL8A96QRIuA2HN76MMTKIoxEWb0qtr3D2NA5M4iCQj6dqyTHKAMnEju/Jrk55zl5k3+ wfP7boqfFJGwaAzBxMoVETVObSd0K1eNTndYmb231HTaywBqflioEtYpaiw86io3W8Qg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: tag Rule 7.2 as clean and temporarily remove Rules 1.1 and 8.2 Message-Id: Date: Wed, 01 May 2024 21:55:03 +0000 commit c1aa6fb5f628aed04acf7f75503a927e12e69247 Author: Federico Serafini AuthorDate: Mon Apr 29 17:21:57 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 1 12:49:16 2024 -0700 automation/eclair: tag Rule 7.2 as clean and temporarily remove Rules 1.1 and 8.2 Update ECLAIR configuration to consider Rule 7.2 as clean. Temporarily remove the clean tag from Rules 1.1 and 8.2: when violations of such rules will be addressed, the clean tag will be reintroduced. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index d609b470eb..bdf94ed996 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R1.1||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 01 21:55:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 21:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715503.1117180 (Exim 4.92) (envelope-from ) id 1s2Hv0-0002YG-HI; Wed, 01 May 2024 21:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715503.1117180; Wed, 01 May 2024 21:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Hv0-0002Y8-El; Wed, 01 May 2024 21:55:14 +0000 Received: by outflank-mailman (input) for mailman id 715503; Wed, 01 May 2024 21:55:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Huz-0002Y2-Pc for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Huz-0000jI-Nc for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2Huz-0004CE-Mk for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4QSKyD8NXnnDJ07Pw74vcMhjq4W46H3Wb9jnyUhG5bQ=; b=ovAvgwfgPbjPgAzDFdMHiQI/+w JNdIo84D/IgsFqnibtmLx3Gkes84mAdd3NrFY2CcWwI4H0F3w9KCjCWvAjfXJRGkzV4HMdikyfddy 7n0XX9KS31SY+BzaIi9ukTaDlF2i0bonZHZJG7uEjA8Uq9Kx6wfO7fXFWeBCbUa1CSCQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: do not allow failure for triggered analyses Message-Id: Date: Wed, 01 May 2024 21:55:13 +0000 commit 7556f46a9b6169e2e29df96bbbb43f318277f635 Author: Federico Serafini AuthorDate: Mon Apr 29 17:21:58 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 1 12:49:20 2024 -0700 automation: do not allow failure for triggered analyses Do not allow_failure for triggered analyses: introducing regressions of clean guidelines will cause a CI failure. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini --- automation/gitlab-ci/analyze.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analyze.yaml index 46c9d8e2e5..32bf570149 100644 --- a/automation/gitlab-ci/analyze.yaml +++ b/automation/gitlab-ci/analyze.yaml @@ -26,7 +26,6 @@ .eclair-analysis:triggered: extends: .eclair-analysis - allow_failure: true rules: - if: $CI_PIPELINE_SOURCE == "schedule" when: never -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 01 21:55:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 May 2024 21:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715504.1117184 (Exim 4.92) (envelope-from ) id 1s2HvB-0002ap-In; Wed, 01 May 2024 21:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715504.1117184; Wed, 01 May 2024 21:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2HvB-0002ah-GF; Wed, 01 May 2024 21:55:25 +0000 Received: by outflank-mailman (input) for mailman id 715504; Wed, 01 May 2024 21:55:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Hv9-0002aP-Sc for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2Hv9-0000jb-Qt for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2Hv9-0004Cg-Pb for xen-changelog@lists.xenproject.org; Wed, 01 May 2024 21:55:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ex5j9P9r+o4ONqjDmM6M7i6Z8uGBRULquaxSS1fsHcE=; b=NdW9MnKHSP2ER0Ozh36zrSR2cr ra7Vpw6FxT06gEponi8AfXnNATvJMkdJzRgO2L+8heSJ2/q7p8WhYFQuGTTdbtFNy/3gMiKJhgdx9 s5WPfNU6xVIA0atXRMo/guXDdhbNcqs8lRiGup+0mJBiyN9RNFPWsSsjcG7zpeyuMpNo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: make explicit there are no adopted files by default Message-Id: Date: Wed, 01 May 2024 21:55:23 +0000 commit feb9158a620040846d76981acbe8ea9e2255a07b Author: Federico Serafini AuthorDate: Mon Apr 29 17:21:59 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 1 12:49:23 2024 -0700 automation/eclair: make explicit there are no adopted files by default Update ECLAIR configuration to consider no adopted files by default. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/analysis.ecl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index a604582da3..66ed7f952c 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -21,6 +21,10 @@ map_strings("scheduled-analysis",analysis_kind) -eval_file=toolchain.ecl -eval_file=public_APIs.ecl + +-doc="Initially, there are no files tagged as adopted." +-file_tag+={adopted,"none()"} + if(not(scheduled_analysis), eval_file("adopted.ecl") ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 02 11:55:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 May 2024 11:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715767.1117648 (Exim 4.92) (envelope-from ) id 1s2V1i-0004NQ-Mq; Thu, 02 May 2024 11:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715767.1117648; Thu, 02 May 2024 11:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V1i-0004NI-KC; Thu, 02 May 2024 11:55:02 +0000 Received: by outflank-mailman (input) for mailman id 715767; Thu, 02 May 2024 11:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V1h-0004NC-J3 for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V1h-00025H-EV for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2V1h-00018F-DN for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11: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=TPbdYvhUcfmdXpAf2G/WDaRu+l1iNsS/B4AkXf8pvYY=; b=IYpiLkSGRntXhlmyhLvyhKe5ic HNFUzo535yp+i6drf/OWrXt9MPRODrLAeE64Kr558W9PE6sc/VIVjeC+IXsvluVESwESByZXsc2m/ HbvYihOyFnnqHJg8asnT/+u2IJMtRlo6U1AmykJY8MfEsZcDQPO8ZnyUjAszi0OCAouM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: tag Rule 7.2 as clean and temporarily remove Rules 1.1 and 8.2 Message-Id: Date: Thu, 02 May 2024 11:55:01 +0000 commit c1aa6fb5f628aed04acf7f75503a927e12e69247 Author: Federico Serafini AuthorDate: Mon Apr 29 17:21:57 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 1 12:49:16 2024 -0700 automation/eclair: tag Rule 7.2 as clean and temporarily remove Rules 1.1 and 8.2 Update ECLAIR configuration to consider Rule 7.2 as clean. Temporarily remove the clean tag from Rules 1.1 and 8.2: when violations of such rules will be addressed, the clean tag will be reintroduced. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index d609b470eb..bdf94ed996 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R1.1||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 02 11:55:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 May 2024 11:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715768.1117652 (Exim 4.92) (envelope-from ) id 1s2V1s-0004PB-OQ; Thu, 02 May 2024 11:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715768.1117652; Thu, 02 May 2024 11:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V1s-0004P4-Lj; Thu, 02 May 2024 11:55:12 +0000 Received: by outflank-mailman (input) for mailman id 715768; Thu, 02 May 2024 11:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V1r-0004Ow-JR for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V1r-00025f-Hj for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2V1r-00018g-Gd for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GRHLQ3Eokq1CCnc78OCzgnGyPsQfCGeARtMPP9hjZYQ=; b=BM0ZJ3ajtJczdImwqCDRxMf/LL CbRbvrK48sdVhB4LdKARaPcrkApj3LotdNpuR5Ps5S1hmz/ZMUz8ZT9vdF8/6K60EqLWXMIe6gTqW fqS2Y9INMaXjXBv61IsJ0/f7Tiymjz+QzNAHe9h3XgwPiPCpo1Rx7oE7C7Hy6WppmZvw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: do not allow failure for triggered analyses Message-Id: Date: Thu, 02 May 2024 11:55:11 +0000 commit 7556f46a9b6169e2e29df96bbbb43f318277f635 Author: Federico Serafini AuthorDate: Mon Apr 29 17:21:58 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 1 12:49:20 2024 -0700 automation: do not allow failure for triggered analyses Do not allow_failure for triggered analyses: introducing regressions of clean guidelines will cause a CI failure. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini --- automation/gitlab-ci/analyze.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analyze.yaml index 46c9d8e2e5..32bf570149 100644 --- a/automation/gitlab-ci/analyze.yaml +++ b/automation/gitlab-ci/analyze.yaml @@ -26,7 +26,6 @@ .eclair-analysis:triggered: extends: .eclair-analysis - allow_failure: true rules: - if: $CI_PIPELINE_SOURCE == "schedule" when: never -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 02 11:55:22 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 May 2024 11:55:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.715769.1117657 (Exim 4.92) (envelope-from ) id 1s2V22-0004Rn-QQ; Thu, 02 May 2024 11:55:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 715769.1117657; Thu, 02 May 2024 11:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V22-0004Rf-NS; Thu, 02 May 2024 11:55:22 +0000 Received: by outflank-mailman (input) for mailman id 715769; Thu, 02 May 2024 11:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V21-0004RJ-MR for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2V21-00025n-Lh for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2V21-000198-Js for xen-changelog@lists.xenproject.org; Thu, 02 May 2024 11:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ndu5HQuGcEGVEKp8eWUzixR+6EzXMcJWPSmQ2mm+KDw=; b=pLx8idLrfML/m5POssePoXLOe5 NgPmzPFqvWEQNxln+k7+wtDH965UvlrrKGX+i/4r/b5Pp4KKm43LcP2NBvrraTUE7Qo8QogG42UtZ xtSvDU1eD3/xrdV2/Ow/dEUZUrF9aH2/xMCwWGdtiBx+ZaMGB+yr91WNIfwLhDLHHMuo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: make explicit there are no adopted files by default Message-Id: Date: Thu, 02 May 2024 11:55:21 +0000 commit feb9158a620040846d76981acbe8ea9e2255a07b Author: Federico Serafini AuthorDate: Mon Apr 29 17:21:59 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 1 12:49:23 2024 -0700 automation/eclair: make explicit there are no adopted files by default Update ECLAIR configuration to consider no adopted files by default. Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/analysis.ecl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index a604582da3..66ed7f952c 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -21,6 +21,10 @@ map_strings("scheduled-analysis",analysis_kind) -eval_file=toolchain.ecl -eval_file=public_APIs.ecl + +-doc="Initially, there are no files tagged as adopted." +-file_tag+={adopted,"none()"} + if(not(scheduled_analysis), eval_file("adopted.ecl") ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 03 09:22:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 May 2024 09:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.716300.1118391 (Exim 4.92) (envelope-from ) id 1s2p7E-000552-AM; Fri, 03 May 2024 09:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 716300.1118391; Fri, 03 May 2024 09:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2p7E-00054u-7a; Fri, 03 May 2024 09:22:04 +0000 Received: by outflank-mailman (input) for mailman id 716300; Fri, 03 May 2024 09:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2p7D-00054o-GI for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 09:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2p7D-0000qu-8s for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 09:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2p7D-0003Kh-60 for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 09:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JJEmZn/ujxNxm54fc51PJDJamTmqMxfHv69UcqbU3gY=; b=ayNETmMzDzo8a9r+5rM5+0TKTD hUP2MR0UECpYKjEAIQKpDui9a34M5BaD39J3NO5ujmmzYdtsrty7Po3Kup+JluMsdORgdanjA9Nzq puwqT9+/f1bMSF1sCZHK83i404JqYYoIg0dIalMdJ7VKXKdexkMUJnAY7ubUONW1WU3g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] Update Xen version to 4.15.7 Message-Id: Date: Fri, 03 May 2024 09:22:03 +0000 commit 543bbddf79f105682904c3b5a09c5a1692ae4b15 Author: Julien Grall AuthorDate: Fri May 3 10:21:11 2024 +0100 Commit: Julien Grall CommitDate: Fri May 3 10:21:11 2024 +0100 Update Xen version to 4.15.7 Signed-off-by: Julien Grall --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 2cd249c308..7ad7167746 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 15 -export XEN_EXTRAVERSION ?= .6$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .7$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri May 03 16:55:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 May 2024 16:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.716600.1118742 (Exim 4.92) (envelope-from ) id 1s2wBc-00015G-Qr; Fri, 03 May 2024 16:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 716600.1118742; Fri, 03 May 2024 16: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 1s2wBc-000158-OD; Fri, 03 May 2024 16:55:04 +0000 Received: by outflank-mailman (input) for mailman id 716600; Fri, 03 May 2024 16:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2wBb-00014U-Ki for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2wBb-0000p5-9s for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2wBb-0000gH-8m for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bIelXzh872kiCrRnPYjTFVX9F8RGyE5DGw3C4yhYHe0=; b=p0wvvjQ62WAPEESlJdAiNxdAwQ Nwbt0x3Lb6BPF/pwugnGQpUdX5tQkoBAzgSX6VpT1XVtNSU2JRnq2HbWga4zcch7znXeBD/s+lwB9 Qhg8+fODTqWu4Nj0hZ8gv3L/3e2OaSDoo6wAD/hdsnH4IeA6bKFz9Iou9/FiEXOP0HRQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: don't let test-xenstore write nodes exceeding default size Message-Id: Date: Fri, 03 May 2024 16:55:03 +0000 commit 642005e310483c490b0725fab4672f2b77fdf2ba Author: Juergen Gross AuthorDate: Thu May 2 15:21:36 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 2 18:15:31 2024 +0100 tools/tests: don't let test-xenstore write nodes exceeding default size Today test-xenstore will write nodes with 3000 bytes node data. This size is exceeding the default quota for the allowed node size. While working in dom0 with C-xenstored, OCAML-xenstored does not like that. Use a size of 2000 instead, which is lower than the allowed default node size of 2048. Fixes: 3afc5e4a5b75 ("tools/tests: add xenstore testing framework") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/tests/xenstore/test-xenstore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/xenstore/test-xenstore.c b/tools/tests/xenstore/test-xenstore.c index d491dac53b..73a7011d21 100644 --- a/tools/tests/xenstore/test-xenstore.c +++ b/tools/tests/xenstore/test-xenstore.c @@ -408,9 +408,9 @@ static int test_ta3_deinit(uintptr_t par) #define TEST(s, f, p, l) { s, f ## _init, f, f ## _deinit, (uintptr_t)(p), l } struct test tests[] = { TEST("read 1", test_read, 1, "Read node with 1 byte data"), -TEST("read 3000", test_read, 3000, "Read node with 3000 bytes data"), +TEST("read 2000", test_read, 2000, "Read node with 2000 bytes data"), TEST("write 1", test_write, 1, "Write node with 1 byte data"), -TEST("write 3000", test_write, 3000, "Write node with 3000 bytes data"), +TEST("write 2000", test_write, 2000, "Write node with 2000 bytes data"), TEST("dir", test_dir, 0, "List directory"), TEST("rm node", test_rm, 0, "Remove single node"), TEST("rm dir", test_rm, WRITE_BUFFERS_N, "Remove node with sub-nodes"), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 03 16:55:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 May 2024 16:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.716602.1118747 (Exim 4.92) (envelope-from ) id 1s2wBm-0001Cf-SW; Fri, 03 May 2024 16:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 716602.1118747; Fri, 03 May 2024 16:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2wBm-0001CX-Pg; Fri, 03 May 2024 16:55:14 +0000 Received: by outflank-mailman (input) for mailman id 716602; Fri, 03 May 2024 16:55:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2wBl-0001Aw-Dl for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2wBl-0000pG-D1 for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2wBl-0000h3-Bx for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0t69xu0jKhLn44MsCxSxtJRds0KZ1Oze9FaAlE3cx00=; b=XjfcJjrMnYlEn6rGfaYgh6O0GI K4rPmtzYCE57qXQNI4bXs2kX12n2+/lC3LcJyHnbmamFruUrGC7tBhy6xkubqp6n+2TsdkD7kuHPH +iLztt0BjKizksK5plY6eYOG1BSY6K1Au+ksXhMOgF5xzMJXKW7fjr/S7dNGv8ljZ2RU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/tests: let test-xenstore exit with non-0 status in case of error Message-Id: Date: Fri, 03 May 2024 16:55:13 +0000 commit 2d4ba205591ba64f31149ae31051678159ee9e11 Author: Juergen Gross AuthorDate: Thu May 2 11:22:13 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 2 18:15:46 2024 +0100 tools/tests: let test-xenstore exit with non-0 status in case of error In case a test is failing in test-xenstore, let the tool exit with an exit status other than 0. Fix a typo in an error message. Reported-by: Andrew Cooper Fixes: 3afc5e4a5b75 ("tools/tests: add xenstore testing framework") Signed-off-by: Juergen Gross --- tools/tests/xenstore/test-xenstore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/tests/xenstore/test-xenstore.c b/tools/tests/xenstore/test-xenstore.c index 73a7011d21..7a9bd9afb3 100644 --- a/tools/tests/xenstore/test-xenstore.c +++ b/tools/tests/xenstore/test-xenstore.c @@ -506,14 +506,14 @@ int main(int argc, char *argv[]) stop = time(NULL) + randtime; srandom((unsigned int)stop); - while ( time(NULL) < stop ) + while ( time(NULL) < stop && !ret ) { t = random() % ARRAY_SIZE(tests); ret = call_test(tests + t, iters, true); } } else - for ( t = 0; t < ARRAY_SIZE(tests); t++ ) + for ( t = 0; t < ARRAY_SIZE(tests) && !ret; t++ ) { if ( !test || !strcmp(test, tests[t].name) ) ret = call_test(tests + t, iters, false); @@ -525,10 +525,10 @@ int main(int argc, char *argv[]) xs_close(xsh); if ( ta_loops ) - printf("Exhaustive transaction retries (%d) occurrred %d times.\n", + printf("Exhaustive transaction retries (%d) occurred %d times.\n", MAX_TA_LOOPS, ta_loops); - return 0; + return ret ? 3 : 0; } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 03 16:55:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 May 2024 16:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.716604.1118751 (Exim 4.92) (envelope-from ) id 1s2wBw-0001K9-U8; Fri, 03 May 2024 16:55:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 716604.1118751; Fri, 03 May 2024 16:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2wBw-0001K2-RG; Fri, 03 May 2024 16:55:24 +0000 Received: by outflank-mailman (input) for mailman id 716604; Fri, 03 May 2024 16:55:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2wBv-0001Jn-Hb for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s2wBv-0000pg-Gk for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s2wBv-0000hV-FM for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 16:55:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QR3zXw3AJHgEJmpm1Kx3M1STB6FbqJZao7snh+D0WbM=; b=PGMLsqIaNhAglX3EJdyGuuKAjT pJFobTDAoJmV4HZueOUfAKawBiLGIAq/82hh4hYsOUVS+YW7HJFF+cg7JOrIp0D9rw5zQ5zHT6pr4 oethbTLgyXNp4hW02oCaNcl87DECi+h+N2oQ0GU9lnTJunOT4P+Y8vkegH+1yPNafrOM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/Kconfig: Drop the final remnants of ---help--- Message-Id: Date: Fri, 03 May 2024 16:55:23 +0000 commit f95cd010cbf0914154a0c2775c979d9158b1a3cb Author: Andrew Cooper AuthorDate: Thu May 2 18:35:09 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 3 16:27:39 2024 +0100 xen/Kconfig: Drop the final remnants of ---help--- We deprecated the use of ---help--- a while ago, but a lot of new content copy&pastes bad examples. Convert the remaining instances, and update Kconfig's parser to no longer recongise it. This now causes builds to fail with: Kconfig.debug:8: syntax error Kconfig.debug:7: unknown statement "---help---" which short circuits one common piece of churn in new content. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/Kconfig | 2 +- xen/Kconfig.debug | 28 ++++++++++++------------ xen/arch/arm/Kconfig | 8 +++---- xen/arch/arm/platforms/Kconfig | 12 +++++------ xen/arch/x86/Kconfig | 32 +++++++++++++-------------- xen/common/Kconfig | 48 ++++++++++++++++++++--------------------- xen/common/sched/Kconfig | 10 ++++----- xen/drivers/passthrough/Kconfig | 8 +++---- xen/drivers/video/Kconfig | 2 +- xen/tools/kconfig/lexer.l | 2 +- 10 files changed, 76 insertions(+), 76 deletions(-) diff --git a/xen/Kconfig b/xen/Kconfig index 1e1b041fd5..e459cdac0c 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -84,7 +84,7 @@ config UNSUPPORTED config LTO bool "Link Time Optimisation" depends on BROKEN - ---help--- + help Enable Link Time Optimisation. If unsure, say N. diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index fa81853e93..61b24ac552 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -4,7 +4,7 @@ menu "Debugging Options" config DEBUG bool "Developer Checks" default y - ---help--- + help If you say Y here this will enable developer checks such as asserts and extra printks. This option is intended for development purposes only, and not for production use. @@ -17,14 +17,14 @@ config GDBSX bool "Guest debugging with gdbsx" depends on X86 default y - ---help--- + help If you want to enable support for debugging guests from dom0 via gdbsx then say Y. config FRAME_POINTER bool "Compile Xen with frame pointers" default DEBUG - ---help--- + help If you say Y here the resulting Xen will be slightly larger and maybe slower, but it gives very useful debugging information in case of any Xen bugs. @@ -33,7 +33,7 @@ config COVERAGE bool "Code coverage support" depends on !LIVEPATCH select SUPPRESS_DUPLICATE_SYMBOL_WARNINGS if !ENFORCE_UNIQUE_SYMBOLS - ---help--- + help Enable code coverage support. If unsure, say N here. @@ -41,7 +41,7 @@ config COVERAGE config DEBUG_LOCK_PROFILE bool "Lock Profiling" select DEBUG_LOCKS - ---help--- + help Lock profiling allows you to see how often locks are taken and blocked. You can use serial console to print (and reset) using 'l' and 'L' respectively, or the 'xenlockprof' tool. @@ -49,13 +49,13 @@ config DEBUG_LOCK_PROFILE config DEBUG_LOCKS bool "Lock debugging" default DEBUG - ---help--- + help Enable debugging features of lock handling. Some additional checks will be performed when acquiring and releasing locks. config PERF_COUNTERS bool "Performance Counters" - ---help--- + help Enables software performance counters that allows you to analyze bottlenecks in the system. To access this data you can use serial console to print (and reset) using 'p' and 'P' respectively, or @@ -64,21 +64,21 @@ config PERF_COUNTERS config PERF_ARRAYS bool "Performance Counter Array Histograms" depends on PERF_COUNTERS - ---help--- + help Enables software performance counter array histograms. config VERBOSE_DEBUG bool "Verbose debug messages" default DEBUG - ---help--- + help Guest output from HYPERVISOR_console_io and hypervisor parsing ELF images (dom0) will be logged in the Xen ring buffer. config DEVICE_TREE_DEBUG bool "Device tree debug messages" depends on HAS_DEVICE_TREE - ---help--- + help Device tree parsing and DOM0 device tree building messages are logged in the Xen ring buffer. If unsure, say N here. @@ -86,14 +86,14 @@ config DEVICE_TREE_DEBUG config SCRUB_DEBUG bool "Page scrubbing test" default DEBUG - ---help--- + help Verify that pages that need to be scrubbed before being allocated to a guest are indeed scrubbed. config UBSAN bool "Undefined behaviour sanitizer" depends on HAS_UBSAN - ---help--- + help Enable undefined behaviour sanitizer. It uses compiler to insert code snippets so that undefined behaviours in C are detected during runtime. This requires a UBSAN capable compiler and it is a debug only feature. @@ -109,7 +109,7 @@ config UBSAN_FATAL config DEBUG_TRACE bool "Debug trace support" - ---help--- + help Debug trace enables to record debug trace messages which are printed either directly to the console or are printed to console in case of a system crash. @@ -117,7 +117,7 @@ config DEBUG_TRACE config XMEM_POOL_POISON bool "Poison free xenpool blocks" default DEBUG - ---help--- + help Poison free blocks with 0xAA bytes and verify them when a block is allocated in order to spot use-after-free issues. diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index f8139a773a..21d03d9f44 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -67,7 +67,7 @@ source "arch/Kconfig" config ACPI bool "ACPI (Advanced Configuration and Power Interface) Support (UNSUPPORTED)" if UNSUPPORTED depends on ARM_64 && ARM_EFI - ---help--- + help Advanced Configuration and Power Interface (ACPI) support for Xen is an alternative to device tree on ARM64. This requires UEFI. @@ -102,7 +102,7 @@ config GICV3 depends on !NEW_VGIC default n if ARM_32 default y if ARM_64 - ---help--- + help Driver for the ARM Generic Interrupt Controller v3. If unsure, use the default setting. @@ -132,7 +132,7 @@ config HVM config NEW_VGIC bool "Use new VGIC implementation" select GICV2 - ---help--- + help This is an alternative implementation of the ARM GIC interrupt controller emulation, based on the Linux/KVM VGIC. It has a better @@ -147,7 +147,7 @@ config NEW_VGIC config SBSA_VUART_CONSOLE bool "Emulated SBSA UART console support" default y - ---help--- + help Allows a guest to use SBSA Generic UART as a console. The SBSA Generic UART implements a subset of ARM PL011 UART. diff --git a/xen/arch/arm/platforms/Kconfig b/xen/arch/arm/platforms/Kconfig index c93a6b2756..76f7e76b1b 100644 --- a/xen/arch/arm/platforms/Kconfig +++ b/xen/arch/arm/platforms/Kconfig @@ -1,14 +1,14 @@ choice prompt "Platform Support" default ALL_PLAT - ---help--- + help Choose which hardware platform to enable in Xen. If unsure, choose ALL_PLAT. config ALL_PLAT bool "All Platforms" - ---help--- + help Enable support for all available hardware platforms. It doesn't automatically select any of the related drivers. @@ -17,7 +17,7 @@ config QEMU depends on ARM_64 select GICV3 select HAS_PL011 - ---help--- + help Enable all the required drivers for QEMU aarch64 virt emulated machine. @@ -26,7 +26,7 @@ config RCAR3 depends on ARM_64 select HAS_SCIF select IPMMU_VMSA - ---help--- + help Enable all the required drivers for Renesas RCar3 config MPSOC @@ -34,12 +34,12 @@ config MPSOC depends on ARM_64 select HAS_CADENCE_UART select ARM_SMMU - ---help--- + help Enable all the required drivers for Xilinx Ultrascale+ MPSoC config NO_PLAT bool "No Platforms" - ---help--- + help Do not enable specific support for any platform. endchoice diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 2b6248774d..7e03e4bc55 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -58,7 +58,7 @@ source "arch/Kconfig" config PV def_bool y prompt "PV support" - ---help--- + help Interfaces to support PV domains. These require guest kernel support to run as a PV guest, but don't require any specific hardware support. @@ -71,7 +71,7 @@ config PV32 depends on PV default PV_SHIM select COMPAT - ---help--- + help The 32bit PV ABI uses Ring1, an area of the x86 architecture which was deprecated and mostly removed in the AMD64 spec. As a result, it occasionally conflicts with newer x86 hardware features, causing @@ -90,7 +90,7 @@ config PV_LINEAR_PT bool "Support for PV linear pagetables" depends on PV default y - ---help--- + help Linear pagetables (also called "recursive pagetables") refers to the practice of a guest operating system having pagetable entries pointing to other pagetables of the same level (i.e., @@ -113,7 +113,7 @@ config HVM select COMPAT select IOREQ_SERVER select MEM_ACCESS_ALWAYS_ON - ---help--- + help Interfaces to support HVM domains. HVM domains require hardware virtualisation extensions (e.g. Intel VT-x, AMD SVM), but can boot guests which have no specific Xen knowledge. @@ -126,7 +126,7 @@ config XEN_SHSTK bool "Supervisor Shadow Stacks" depends on HAS_AS_CET_SS default y - ---help--- + help Control-flow Enforcement Technology (CET) is a set of features in hardware designed to combat Return-oriented Programming (ROP, also call/jump COP/JOP) attacks. Shadow Stacks are one CET feature @@ -152,7 +152,7 @@ config SHADOW_PAGING bool "Shadow Paging" default !PV_SHIM_EXCLUSIVE depends on PV || HVM - ---help--- + help Shadow paging is a software alternative to hardware paging support (Intel EPT, AMD NPT). @@ -171,7 +171,7 @@ config SHADOW_PAGING config BIGMEM bool "big memory support" default n - ---help--- + help Allows Xen to support up to 123Tb of memory. This requires enlarging struct page_info as well as shrinking @@ -183,7 +183,7 @@ config HVM_FEP bool "HVM Forced Emulation Prefix support (UNSUPPORTED)" if UNSUPPORTED default DEBUG depends on HVM - ---help--- + help Compiles in a feature that allows HVM guest to arbitrarily exercise the instruction emulator. @@ -203,7 +203,7 @@ config TBOOT depends on UNSUPPORTED default !PV_SHIM_EXCLUSIVE select CRYPTO - ---help--- + help Allows support for Trusted Boot using the Intel(R) Trusted Execution Technology (TXT) @@ -213,14 +213,14 @@ choice prompt "Alignment of Xen image" default XEN_ALIGN_2M if PV_SHIM_EXCLUSIVE default XEN_ALIGN_DEFAULT - ---help--- + help Specify alignment for Xen image. If unsure, choose "default". config XEN_ALIGN_DEFAULT bool "Default alignment" - ---help--- + help Pick alignment according to build variants. For EFI build the default alignment is 2M. For ELF build @@ -281,7 +281,7 @@ config GUEST config XEN_GUEST bool "Xen Guest" select GUEST - ---help--- + help Support for Xen detecting when it is running under Xen. If unsure, say N. @@ -290,7 +290,7 @@ config PVH_GUEST def_bool y prompt "PVH Guest" depends on XEN_GUEST - ---help--- + help Support booting using the PVH ABI. If unsure, say Y. @@ -299,7 +299,7 @@ config PV_SHIM def_bool y prompt "PV Shim" depends on PV && XEN_GUEST - ---help--- + help Build Xen with a mode which acts as a shim to allow PV guest to run in an HVM/PVH container. This mode can only be enabled with command line option. @@ -309,7 +309,7 @@ config PV_SHIM config PV_SHIM_EXCLUSIVE bool "PV Shim Exclusive" depends on PV_SHIM - ---help--- + help Build Xen in a way which unconditionally assumes PV_SHIM mode. This option is only intended for use when building a dedicated PV Shim firmware, and will not function correctly in other scenarios. @@ -321,7 +321,7 @@ if !PV_SHIM_EXCLUSIVE config HYPERV_GUEST bool "Hyper-V Guest" select GUEST - ---help--- + help Support for Xen detecting when it is running under Hyper-V. If unsure, say N. diff --git a/xen/common/Kconfig b/xen/common/Kconfig index cff3166ff9..565ceda741 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -15,7 +15,7 @@ config CORE_PARKING config GRANT_TABLE bool "Grant table support" if EXPERT default y - ---help--- + help Grant table provides a generic mechanism to memory sharing between domains. This shared memory interface underpins the split device drivers for block and network IO in a classic @@ -90,7 +90,7 @@ config MEM_ACCESS def_bool MEM_ACCESS_ALWAYS_ON prompt "Memory Access and VM events" if !MEM_ACCESS_ALWAYS_ON depends on HVM - ---help--- + help Framework to configure memory access types for guests and receive related events in userspace. @@ -133,7 +133,7 @@ config INDIRECT_THUNK config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y - ---help--- + help Contemporary processors may use speculative execution as a performance optimisation, but this can potentially be abused by an attacker to leak data via speculative sidechannels. @@ -154,7 +154,7 @@ config SPECULATIVE_HARDEN_BRANCH bool "Speculative Branch Hardening" default y depends on X86 - ---help--- + help Contemporary processors may use speculative execution as a performance optimisation, but this can potentially be abused by an attacker to leak data via speculative sidechannels. @@ -228,7 +228,7 @@ config DIT_DEFAULT config HYPFS bool "Hypervisor file system support" default y - ---help--- + help Support Xen hypervisor file system. This file system is used to present various hypervisor internal data to dom0 and in some cases to allow modifying settings. Disabling the support will @@ -241,7 +241,7 @@ config HYPFS_CONFIG bool "Provide hypervisor .config via hypfs entry" default y depends on HYPFS - ---help--- + help When enabled the contents of the .config file used to build the hypervisor are provided via the hypfs entry /buildinfo/config. @@ -252,7 +252,7 @@ config IOREQ_SERVER bool "IOREQ support (EXPERT)" if EXPERT && !X86 default X86 depends on HVM - ---help--- + help Enables generic mechanism for providing emulated devices to the guests. If unsure, say N. @@ -261,7 +261,7 @@ config KEXEC bool "kexec support" default y depends on HAS_KEXEC - ---help--- + help Allows a running Xen hypervisor to be replaced with another OS without rebooting. This is primarily used to execute a crash environment to collect information on a Xen hypervisor or dom0 crash. @@ -270,7 +270,7 @@ config KEXEC config EFI_SET_VIRTUAL_ADDRESS_MAP bool "EFI: call SetVirtualAddressMap()" if EXPERT - ---help--- + help Call EFI SetVirtualAddressMap() runtime service to setup memory map for further runtime services. According to UEFI spec, it isn't strictly necessary, but many UEFI implementations misbehave when this call is @@ -292,7 +292,7 @@ config XENOPROF config XSM bool "Xen Security Modules support" default ARM - ---help--- + help Enables the security framework known as Xen Security Modules which allows administrators fine-grained control over a Xen domain and its capabilities by defining permissible interactions between domains, @@ -305,7 +305,7 @@ config XSM_FLASK def_bool y prompt "FLux Advanced Security Kernel support" depends on XSM - ---help--- + help Enables FLASK (FLux Advanced Security Kernel) as the access control mechanism used by the XSM framework. This provides a mandatory access control framework by which security enforcement, isolation, and @@ -318,7 +318,7 @@ config XSM_FLASK_AVC_STATS def_bool y prompt "Maintain statistics on the FLASK access vector cache" if EXPERT depends on XSM_FLASK - ---help--- + help Maintain counters on the access vector cache that can be viewed using the FLASK_AVC_CACHESTATS sub-op of the xsm_op hypercall. Disabling this will save a tiny amount of memory and time to update the stats. @@ -329,7 +329,7 @@ config XSM_FLASK_POLICY bool "Compile Xen with a built-in FLASK security policy" default y if "$(XEN_HAS_CHECKPOLICY)" = "y" depends on XSM_FLASK - ---help--- + help This includes a default XSM policy in the hypervisor so that the bootloader does not need to load a policy to get sane behavior from an XSM-enabled hypervisor. If this is disabled, a policy must be @@ -345,7 +345,7 @@ config XSM_SILO def_bool y prompt "SILO support" depends on XSM - ---help--- + help Enables SILO as the access control mechanism used by the XSM framework. This is not the default module, add boot parameter xsm=silo to choose it. This will deny any unmediated communication channels (grant tables @@ -372,7 +372,7 @@ config LATE_HWDOM bool "Dedicated hardware domain" default n depends on XSM && X86 - ---help--- + help Allows the creation of a dedicated hardware domain distinct from domain 0 that manages devices without needing access to other privileged functionality such as the ability to manage domains. @@ -390,7 +390,7 @@ config LATE_HWDOM config ARGO bool "Argo: hypervisor-mediated interdomain communication (UNSUPPORTED)" if UNSUPPORTED - ---help--- + help Enables a hypercall for domains to ask the hypervisor to perform data transfer of messages between domains. @@ -417,7 +417,7 @@ config LIVEPATCH default X86 depends on "$(XEN_HAS_BUILD_ID)" = "y" select CC_SPLIT_SECTIONS - ---help--- + help Allows a running Xen hypervisor to be dynamically patched using binary patches without rebooting. This is primarily used to binarily patch in the field an hypervisor with XSA fixes. @@ -428,7 +428,7 @@ config FAST_SYMBOL_LOOKUP bool "Fast symbol lookup (bigger binary)" default y depends on LIVEPATCH - ---help--- + help When searching for symbol addresses we can use the built-in system that is optimized for searching symbols using addresses as the key. However using it for the inverse (find address using the symbol name) @@ -440,7 +440,7 @@ config FAST_SYMBOL_LOOKUP config ENFORCE_UNIQUE_SYMBOLS bool "Enforce unique symbols" default LIVEPATCH - ---help--- + help Multiple symbols with the same name aren't generally a problem unless livepatching is to be used. @@ -454,7 +454,7 @@ config ENFORCE_UNIQUE_SYMBOLS config SUPPRESS_DUPLICATE_SYMBOL_WARNINGS bool "Suppress duplicate symbol warnings" depends on !ENFORCE_UNIQUE_SYMBOLS - ---help--- + help Multiple symbols with the same name aren't generally a problem unless Live patching is to be used, so these warnings can be suppressed by enabling this option. Certain other options (known @@ -464,7 +464,7 @@ config SUPPRESS_DUPLICATE_SYMBOL_WARNINGS config CMDLINE string "Built-in hypervisor command string" if EXPERT default "" - ---help--- + help Enter arguments here that should be compiled into the hypervisor image and used at boot time. When the system boots, this string will be parsed prior to the bootloader command line. So if a @@ -475,7 +475,7 @@ config CMDLINE_OVERRIDE bool "Built-in command line overrides bootloader arguments" default n depends on CMDLINE != "" - ---help--- + help Set this option to 'Y' to have the hypervisor ignore the bootloader command line, and use ONLY the built-in command line. @@ -485,7 +485,7 @@ config CMDLINE_OVERRIDE config DOM0_MEM string "Default value for dom0_mem boot parameter" default "" - ---help--- + help Sets a default value for dom0_mem, e.g. "512M". The specified string will be used for the dom0_mem parameter in case it was not specified on the command line. @@ -507,7 +507,7 @@ config DTB_FILE config TRACEBUFFER bool "Enable tracing infrastructure" if EXPERT default y - ---help--- + help Enable tracing infrastructure and pre-defined tracepoints within Xen. This will allow live information about Xen's execution and performance to be collected at run time for debugging or performance analysis. diff --git a/xen/common/sched/Kconfig b/xen/common/sched/Kconfig index b2ef0c99a3..18ca1ce7ab 100644 --- a/xen/common/sched/Kconfig +++ b/xen/common/sched/Kconfig @@ -4,20 +4,20 @@ menu "Schedulers" config SCHED_CREDIT bool "Credit scheduler support" default y - ---help--- + help The traditional credit scheduler is a general purpose scheduler. config SCHED_CREDIT2 bool "Credit2 scheduler support" default y - ---help--- + help The credit2 scheduler is a general purpose scheduler that is optimized for lower latency and higher VM density. config SCHED_RTDS bool "RTDS scheduler support (UNSUPPORTED)" if UNSUPPORTED default DEBUG - ---help--- + help The RTDS scheduler is a soft and firm real-time scheduler for multicore, targeted for embedded, automotive, graphics and gaming in the cloud, and general low-latency workloads. @@ -25,14 +25,14 @@ config SCHED_RTDS config SCHED_ARINC653 bool "ARINC653 scheduler support (UNSUPPORTED)" if UNSUPPORTED default DEBUG - ---help--- + help The ARINC653 scheduler is a hard real-time scheduler for single cores, targeted for avionics, drones, and medical devices. config SCHED_NULL bool "Null scheduler support (UNSUPPORTED)" if UNSUPPORTED default PV_SHIM || DEBUG - ---help--- + help The null scheduler is a static, zero overhead scheduler, for when there always are less vCPUs than pCPUs, typically in embedded or HPC scenarios. diff --git a/xen/drivers/passthrough/Kconfig b/xen/drivers/passthrough/Kconfig index 864fcf3b0c..78edd80536 100644 --- a/xen/drivers/passthrough/Kconfig +++ b/xen/drivers/passthrough/Kconfig @@ -6,7 +6,7 @@ if ARM config ARM_SMMU bool "ARM SMMUv1 and v2 driver" default y - ---help--- + help Support for implementations of the ARM System MMU architecture versions 1 and 2. @@ -16,7 +16,7 @@ config ARM_SMMU config ARM_SMMU_V3 bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support" if EXPERT depends on ARM_64 && (!ACPI || BROKEN) - ---help--- + help Support for implementations of the ARM System MMU architecture version 3. Driver is in experimental stage and should not be used in production. @@ -27,7 +27,7 @@ config ARM_SMMU_V3 config IPMMU_VMSA bool "Renesas IPMMU-VMSA found in R-Car Gen3/Gen4 SoCs" depends on ARM_64 - ---help--- + help Support for implementations of the Renesas IPMMU-VMSA found in R-Car Gen3/Gen4 SoCs. @@ -68,7 +68,7 @@ choice prompt "IOMMU device quarantining default behavior" depends on HAS_PCI default IOMMU_QUARANTINE_BASIC - ---help--- + help When a PCI device is assigned to an untrusted domain, it is possible for that domain to program the device to DMA to an arbitrary address. The IOMMU is used to protect the host from malicious DMA by making diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 41ca503cc9..245030beea 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -7,7 +7,7 @@ config VGA select VIDEO depends on X86 default y if !PV_SHIM_EXCLUSIVE - ---help--- + help Enable VGA output for the Xen hypervisor. If unsure, say Y. diff --git a/xen/tools/kconfig/lexer.l b/xen/tools/kconfig/lexer.l index 6354c905b0..4b7339ff4c 100644 --- a/xen/tools/kconfig/lexer.l +++ b/xen/tools/kconfig/lexer.l @@ -105,7 +105,7 @@ n [A-Za-z0-9_-] "endchoice" return T_ENDCHOICE; "endif" return T_ENDIF; "endmenu" return T_ENDMENU; -"help"|"---help---" return T_HELP; +"help" return T_HELP; "hex" return T_HEX; "if" return T_IF; "imply" return T_IMPLY; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 03 21:22:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 May 2024 21:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.716685.1118844 (Exim 4.92) (envelope-from ) id 1s30Ly-0000d5-2v; Fri, 03 May 2024 21:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 716685.1118844; Fri, 03 May 2024 21: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 1s30Ly-0000cx-0O; Fri, 03 May 2024 21:22:02 +0000 Received: by outflank-mailman (input) for mailman id 716685; Fri, 03 May 2024 21:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s30Lx-0000cr-Or for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 21:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s30Lx-0005Vk-O2 for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 21:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s30Lx-0003Of-Mx for xen-changelog@lists.xenproject.org; Fri, 03 May 2024 21:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=COVAWC/X7yUmjM63pj4/cLpSQ10Js8hGNXjxqAMS92E=; b=Bw9luwFqJJ1daZFvKoQESnzM1y mjrgJjJwEZ8/GovO8FPDvgpL++zPx59HYhZFdMoNoBW24MpZ/axHRCEQonRVO8Wd8FFHkdNzgQx8U fVgBGxCqChLp7PXC6m2HvE3VJzvGAyJglpBItK3NRNSSawkS57IfTIKzAAggpd3bI/9U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] Update Xen version to 4.15.7 Message-Id: Date: Fri, 03 May 2024 21:22:01 +0000 commit 543bbddf79f105682904c3b5a09c5a1692ae4b15 Author: Julien Grall AuthorDate: Fri May 3 10:21:11 2024 +0100 Commit: Julien Grall CommitDate: Fri May 3 10:21:11 2024 +0100 Update Xen version to 4.15.7 Signed-off-by: Julien Grall --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 2cd249c308..7ad7167746 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 15 -export XEN_EXTRAVERSION ?= .6$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .7$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat May 04 06:44:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 04 May 2024 06:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.716806.1119029 (Exim 4.92) (envelope-from ) id 1s397q-0000OL-Sl; Sat, 04 May 2024 06:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 716806.1119029; Sat, 04 May 2024 06: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 1s397q-0000OD-Ph; Sat, 04 May 2024 06:44:02 +0000 Received: by outflank-mailman (input) for mailman id 716806; Sat, 04 May 2024 06:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s397p-0000Np-NM for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s397p-0007rK-MW for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s397p-00064h-LY for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06: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=kjVdvP9Amy7NJVoJ/QHTOkvSEaClRSpupCKOZj+B/q0=; b=be6TjDLrt6MKpQV4EHjvUZSl4F sJpsE/RzvndnclkGGyKke7x3WuXr1btS0oPcZXIDT3XQbV5LNs9w3w2bp8VASEAiqJf21xr0Xy9GX 2jPhG7672hOf75u3V8sDBhz+AkIT5n+xEeOxUdzblaxZ/5z3fX1Pxc1WeoOM+mLi2FiU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests: don't let test-xenstore write nodes exceeding default size Message-Id: Date: Sat, 04 May 2024 06:44:01 +0000 commit 642005e310483c490b0725fab4672f2b77fdf2ba Author: Juergen Gross AuthorDate: Thu May 2 15:21:36 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 2 18:15:31 2024 +0100 tools/tests: don't let test-xenstore write nodes exceeding default size Today test-xenstore will write nodes with 3000 bytes node data. This size is exceeding the default quota for the allowed node size. While working in dom0 with C-xenstored, OCAML-xenstored does not like that. Use a size of 2000 instead, which is lower than the allowed default node size of 2048. Fixes: 3afc5e4a5b75 ("tools/tests: add xenstore testing framework") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/tests/xenstore/test-xenstore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/xenstore/test-xenstore.c b/tools/tests/xenstore/test-xenstore.c index d491dac53b..73a7011d21 100644 --- a/tools/tests/xenstore/test-xenstore.c +++ b/tools/tests/xenstore/test-xenstore.c @@ -408,9 +408,9 @@ static int test_ta3_deinit(uintptr_t par) #define TEST(s, f, p, l) { s, f ## _init, f, f ## _deinit, (uintptr_t)(p), l } struct test tests[] = { TEST("read 1", test_read, 1, "Read node with 1 byte data"), -TEST("read 3000", test_read, 3000, "Read node with 3000 bytes data"), +TEST("read 2000", test_read, 2000, "Read node with 2000 bytes data"), TEST("write 1", test_write, 1, "Write node with 1 byte data"), -TEST("write 3000", test_write, 3000, "Write node with 3000 bytes data"), +TEST("write 2000", test_write, 2000, "Write node with 2000 bytes data"), TEST("dir", test_dir, 0, "List directory"), TEST("rm node", test_rm, 0, "Remove single node"), TEST("rm dir", test_rm, WRITE_BUFFERS_N, "Remove node with sub-nodes"), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 04 06:44:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 04 May 2024 06:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.716807.1119033 (Exim 4.92) (envelope-from ) id 1s3980-0000Xa-Tu; Sat, 04 May 2024 06:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 716807.1119033; Sat, 04 May 2024 06: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 1s3980-0000XT-RF; Sat, 04 May 2024 06:44:12 +0000 Received: by outflank-mailman (input) for mailman id 716807; Sat, 04 May 2024 06:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s397z-0000Vo-Rt for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s397z-0007rV-R4 for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s397z-00065w-OZ for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06: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=S5PgKXNYOrz38b2KHbLAq8S2vqKo6+XnIei2jtnHpaM=; b=d6mY9VDQdKT20eIpn1RCN7XGhS G+Y6u3trnv3v1dn7USeePyykhyxvJnbMB7vuW68kBWBIrt8BexM55O2rJAqfaJaWTTKcx5aI5S1kK 24HxKyUpNbvaVbNvCFZc3BGri0LtzpzX8RaILJxiF+hu8ohRgbWkrZDFsylpit0HAs2g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/tests: let test-xenstore exit with non-0 status in case of error Message-Id: Date: Sat, 04 May 2024 06:44:11 +0000 commit 2d4ba205591ba64f31149ae31051678159ee9e11 Author: Juergen Gross AuthorDate: Thu May 2 11:22:13 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 2 18:15:46 2024 +0100 tools/tests: let test-xenstore exit with non-0 status in case of error In case a test is failing in test-xenstore, let the tool exit with an exit status other than 0. Fix a typo in an error message. Reported-by: Andrew Cooper Fixes: 3afc5e4a5b75 ("tools/tests: add xenstore testing framework") Signed-off-by: Juergen Gross --- tools/tests/xenstore/test-xenstore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/tests/xenstore/test-xenstore.c b/tools/tests/xenstore/test-xenstore.c index 73a7011d21..7a9bd9afb3 100644 --- a/tools/tests/xenstore/test-xenstore.c +++ b/tools/tests/xenstore/test-xenstore.c @@ -506,14 +506,14 @@ int main(int argc, char *argv[]) stop = time(NULL) + randtime; srandom((unsigned int)stop); - while ( time(NULL) < stop ) + while ( time(NULL) < stop && !ret ) { t = random() % ARRAY_SIZE(tests); ret = call_test(tests + t, iters, true); } } else - for ( t = 0; t < ARRAY_SIZE(tests); t++ ) + for ( t = 0; t < ARRAY_SIZE(tests) && !ret; t++ ) { if ( !test || !strcmp(test, tests[t].name) ) ret = call_test(tests + t, iters, false); @@ -525,10 +525,10 @@ int main(int argc, char *argv[]) xs_close(xsh); if ( ta_loops ) - printf("Exhaustive transaction retries (%d) occurrred %d times.\n", + printf("Exhaustive transaction retries (%d) occurred %d times.\n", MAX_TA_LOOPS, ta_loops); - return 0; + return ret ? 3 : 0; } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 04 06:44:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 04 May 2024 06:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.716809.1119037 (Exim 4.92) (envelope-from ) id 1s398A-0000gH-WD; Sat, 04 May 2024 06:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 716809.1119037; Sat, 04 May 2024 06: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 1s398A-0000gA-TK; Sat, 04 May 2024 06:44:22 +0000 Received: by outflank-mailman (input) for mailman id 716809; Sat, 04 May 2024 06:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s398A-0000fu-0Z for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3989-0007rg-Vy for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06:44:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3989-000679-TP for xen-changelog@lists.xenproject.org; Sat, 04 May 2024 06: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=pD/bHh9PYk3yofVl6cbf1FYBHhjowGvPiMNx8XqJhWI=; b=EcSnp+zY4Og0HKfDZj3e5Pmdyg 8Qdzx9v+8JG0JKqO6gylaOpEUCaaBMhn1I+9KL23c3HiG7+7kYaj5Idf2BF6GzWIrdZrcE8erj1Mo ZBqm4pAaLF6cbYiZ/F39t1sd37xrntUHCKWogxLpVoaW0nlZVdpBbNA81Lua5l5LSJXc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/Kconfig: Drop the final remnants of ---help--- Message-Id: Date: Sat, 04 May 2024 06:44:21 +0000 commit f95cd010cbf0914154a0c2775c979d9158b1a3cb Author: Andrew Cooper AuthorDate: Thu May 2 18:35:09 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 3 16:27:39 2024 +0100 xen/Kconfig: Drop the final remnants of ---help--- We deprecated the use of ---help--- a while ago, but a lot of new content copy&pastes bad examples. Convert the remaining instances, and update Kconfig's parser to no longer recongise it. This now causes builds to fail with: Kconfig.debug:8: syntax error Kconfig.debug:7: unknown statement "---help---" which short circuits one common piece of churn in new content. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/Kconfig | 2 +- xen/Kconfig.debug | 28 ++++++++++++------------ xen/arch/arm/Kconfig | 8 +++---- xen/arch/arm/platforms/Kconfig | 12 +++++------ xen/arch/x86/Kconfig | 32 +++++++++++++-------------- xen/common/Kconfig | 48 ++++++++++++++++++++--------------------- xen/common/sched/Kconfig | 10 ++++----- xen/drivers/passthrough/Kconfig | 8 +++---- xen/drivers/video/Kconfig | 2 +- xen/tools/kconfig/lexer.l | 2 +- 10 files changed, 76 insertions(+), 76 deletions(-) diff --git a/xen/Kconfig b/xen/Kconfig index 1e1b041fd5..e459cdac0c 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -84,7 +84,7 @@ config UNSUPPORTED config LTO bool "Link Time Optimisation" depends on BROKEN - ---help--- + help Enable Link Time Optimisation. If unsure, say N. diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index fa81853e93..61b24ac552 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -4,7 +4,7 @@ menu "Debugging Options" config DEBUG bool "Developer Checks" default y - ---help--- + help If you say Y here this will enable developer checks such as asserts and extra printks. This option is intended for development purposes only, and not for production use. @@ -17,14 +17,14 @@ config GDBSX bool "Guest debugging with gdbsx" depends on X86 default y - ---help--- + help If you want to enable support for debugging guests from dom0 via gdbsx then say Y. config FRAME_POINTER bool "Compile Xen with frame pointers" default DEBUG - ---help--- + help If you say Y here the resulting Xen will be slightly larger and maybe slower, but it gives very useful debugging information in case of any Xen bugs. @@ -33,7 +33,7 @@ config COVERAGE bool "Code coverage support" depends on !LIVEPATCH select SUPPRESS_DUPLICATE_SYMBOL_WARNINGS if !ENFORCE_UNIQUE_SYMBOLS - ---help--- + help Enable code coverage support. If unsure, say N here. @@ -41,7 +41,7 @@ config COVERAGE config DEBUG_LOCK_PROFILE bool "Lock Profiling" select DEBUG_LOCKS - ---help--- + help Lock profiling allows you to see how often locks are taken and blocked. You can use serial console to print (and reset) using 'l' and 'L' respectively, or the 'xenlockprof' tool. @@ -49,13 +49,13 @@ config DEBUG_LOCK_PROFILE config DEBUG_LOCKS bool "Lock debugging" default DEBUG - ---help--- + help Enable debugging features of lock handling. Some additional checks will be performed when acquiring and releasing locks. config PERF_COUNTERS bool "Performance Counters" - ---help--- + help Enables software performance counters that allows you to analyze bottlenecks in the system. To access this data you can use serial console to print (and reset) using 'p' and 'P' respectively, or @@ -64,21 +64,21 @@ config PERF_COUNTERS config PERF_ARRAYS bool "Performance Counter Array Histograms" depends on PERF_COUNTERS - ---help--- + help Enables software performance counter array histograms. config VERBOSE_DEBUG bool "Verbose debug messages" default DEBUG - ---help--- + help Guest output from HYPERVISOR_console_io and hypervisor parsing ELF images (dom0) will be logged in the Xen ring buffer. config DEVICE_TREE_DEBUG bool "Device tree debug messages" depends on HAS_DEVICE_TREE - ---help--- + help Device tree parsing and DOM0 device tree building messages are logged in the Xen ring buffer. If unsure, say N here. @@ -86,14 +86,14 @@ config DEVICE_TREE_DEBUG config SCRUB_DEBUG bool "Page scrubbing test" default DEBUG - ---help--- + help Verify that pages that need to be scrubbed before being allocated to a guest are indeed scrubbed. config UBSAN bool "Undefined behaviour sanitizer" depends on HAS_UBSAN - ---help--- + help Enable undefined behaviour sanitizer. It uses compiler to insert code snippets so that undefined behaviours in C are detected during runtime. This requires a UBSAN capable compiler and it is a debug only feature. @@ -109,7 +109,7 @@ config UBSAN_FATAL config DEBUG_TRACE bool "Debug trace support" - ---help--- + help Debug trace enables to record debug trace messages which are printed either directly to the console or are printed to console in case of a system crash. @@ -117,7 +117,7 @@ config DEBUG_TRACE config XMEM_POOL_POISON bool "Poison free xenpool blocks" default DEBUG - ---help--- + help Poison free blocks with 0xAA bytes and verify them when a block is allocated in order to spot use-after-free issues. diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index f8139a773a..21d03d9f44 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -67,7 +67,7 @@ source "arch/Kconfig" config ACPI bool "ACPI (Advanced Configuration and Power Interface) Support (UNSUPPORTED)" if UNSUPPORTED depends on ARM_64 && ARM_EFI - ---help--- + help Advanced Configuration and Power Interface (ACPI) support for Xen is an alternative to device tree on ARM64. This requires UEFI. @@ -102,7 +102,7 @@ config GICV3 depends on !NEW_VGIC default n if ARM_32 default y if ARM_64 - ---help--- + help Driver for the ARM Generic Interrupt Controller v3. If unsure, use the default setting. @@ -132,7 +132,7 @@ config HVM config NEW_VGIC bool "Use new VGIC implementation" select GICV2 - ---help--- + help This is an alternative implementation of the ARM GIC interrupt controller emulation, based on the Linux/KVM VGIC. It has a better @@ -147,7 +147,7 @@ config NEW_VGIC config SBSA_VUART_CONSOLE bool "Emulated SBSA UART console support" default y - ---help--- + help Allows a guest to use SBSA Generic UART as a console. The SBSA Generic UART implements a subset of ARM PL011 UART. diff --git a/xen/arch/arm/platforms/Kconfig b/xen/arch/arm/platforms/Kconfig index c93a6b2756..76f7e76b1b 100644 --- a/xen/arch/arm/platforms/Kconfig +++ b/xen/arch/arm/platforms/Kconfig @@ -1,14 +1,14 @@ choice prompt "Platform Support" default ALL_PLAT - ---help--- + help Choose which hardware platform to enable in Xen. If unsure, choose ALL_PLAT. config ALL_PLAT bool "All Platforms" - ---help--- + help Enable support for all available hardware platforms. It doesn't automatically select any of the related drivers. @@ -17,7 +17,7 @@ config QEMU depends on ARM_64 select GICV3 select HAS_PL011 - ---help--- + help Enable all the required drivers for QEMU aarch64 virt emulated machine. @@ -26,7 +26,7 @@ config RCAR3 depends on ARM_64 select HAS_SCIF select IPMMU_VMSA - ---help--- + help Enable all the required drivers for Renesas RCar3 config MPSOC @@ -34,12 +34,12 @@ config MPSOC depends on ARM_64 select HAS_CADENCE_UART select ARM_SMMU - ---help--- + help Enable all the required drivers for Xilinx Ultrascale+ MPSoC config NO_PLAT bool "No Platforms" - ---help--- + help Do not enable specific support for any platform. endchoice diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 2b6248774d..7e03e4bc55 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -58,7 +58,7 @@ source "arch/Kconfig" config PV def_bool y prompt "PV support" - ---help--- + help Interfaces to support PV domains. These require guest kernel support to run as a PV guest, but don't require any specific hardware support. @@ -71,7 +71,7 @@ config PV32 depends on PV default PV_SHIM select COMPAT - ---help--- + help The 32bit PV ABI uses Ring1, an area of the x86 architecture which was deprecated and mostly removed in the AMD64 spec. As a result, it occasionally conflicts with newer x86 hardware features, causing @@ -90,7 +90,7 @@ config PV_LINEAR_PT bool "Support for PV linear pagetables" depends on PV default y - ---help--- + help Linear pagetables (also called "recursive pagetables") refers to the practice of a guest operating system having pagetable entries pointing to other pagetables of the same level (i.e., @@ -113,7 +113,7 @@ config HVM select COMPAT select IOREQ_SERVER select MEM_ACCESS_ALWAYS_ON - ---help--- + help Interfaces to support HVM domains. HVM domains require hardware virtualisation extensions (e.g. Intel VT-x, AMD SVM), but can boot guests which have no specific Xen knowledge. @@ -126,7 +126,7 @@ config XEN_SHSTK bool "Supervisor Shadow Stacks" depends on HAS_AS_CET_SS default y - ---help--- + help Control-flow Enforcement Technology (CET) is a set of features in hardware designed to combat Return-oriented Programming (ROP, also call/jump COP/JOP) attacks. Shadow Stacks are one CET feature @@ -152,7 +152,7 @@ config SHADOW_PAGING bool "Shadow Paging" default !PV_SHIM_EXCLUSIVE depends on PV || HVM - ---help--- + help Shadow paging is a software alternative to hardware paging support (Intel EPT, AMD NPT). @@ -171,7 +171,7 @@ config SHADOW_PAGING config BIGMEM bool "big memory support" default n - ---help--- + help Allows Xen to support up to 123Tb of memory. This requires enlarging struct page_info as well as shrinking @@ -183,7 +183,7 @@ config HVM_FEP bool "HVM Forced Emulation Prefix support (UNSUPPORTED)" if UNSUPPORTED default DEBUG depends on HVM - ---help--- + help Compiles in a feature that allows HVM guest to arbitrarily exercise the instruction emulator. @@ -203,7 +203,7 @@ config TBOOT depends on UNSUPPORTED default !PV_SHIM_EXCLUSIVE select CRYPTO - ---help--- + help Allows support for Trusted Boot using the Intel(R) Trusted Execution Technology (TXT) @@ -213,14 +213,14 @@ choice prompt "Alignment of Xen image" default XEN_ALIGN_2M if PV_SHIM_EXCLUSIVE default XEN_ALIGN_DEFAULT - ---help--- + help Specify alignment for Xen image. If unsure, choose "default". config XEN_ALIGN_DEFAULT bool "Default alignment" - ---help--- + help Pick alignment according to build variants. For EFI build the default alignment is 2M. For ELF build @@ -281,7 +281,7 @@ config GUEST config XEN_GUEST bool "Xen Guest" select GUEST - ---help--- + help Support for Xen detecting when it is running under Xen. If unsure, say N. @@ -290,7 +290,7 @@ config PVH_GUEST def_bool y prompt "PVH Guest" depends on XEN_GUEST - ---help--- + help Support booting using the PVH ABI. If unsure, say Y. @@ -299,7 +299,7 @@ config PV_SHIM def_bool y prompt "PV Shim" depends on PV && XEN_GUEST - ---help--- + help Build Xen with a mode which acts as a shim to allow PV guest to run in an HVM/PVH container. This mode can only be enabled with command line option. @@ -309,7 +309,7 @@ config PV_SHIM config PV_SHIM_EXCLUSIVE bool "PV Shim Exclusive" depends on PV_SHIM - ---help--- + help Build Xen in a way which unconditionally assumes PV_SHIM mode. This option is only intended for use when building a dedicated PV Shim firmware, and will not function correctly in other scenarios. @@ -321,7 +321,7 @@ if !PV_SHIM_EXCLUSIVE config HYPERV_GUEST bool "Hyper-V Guest" select GUEST - ---help--- + help Support for Xen detecting when it is running under Hyper-V. If unsure, say N. diff --git a/xen/common/Kconfig b/xen/common/Kconfig index cff3166ff9..565ceda741 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -15,7 +15,7 @@ config CORE_PARKING config GRANT_TABLE bool "Grant table support" if EXPERT default y - ---help--- + help Grant table provides a generic mechanism to memory sharing between domains. This shared memory interface underpins the split device drivers for block and network IO in a classic @@ -90,7 +90,7 @@ config MEM_ACCESS def_bool MEM_ACCESS_ALWAYS_ON prompt "Memory Access and VM events" if !MEM_ACCESS_ALWAYS_ON depends on HVM - ---help--- + help Framework to configure memory access types for guests and receive related events in userspace. @@ -133,7 +133,7 @@ config INDIRECT_THUNK config SPECULATIVE_HARDEN_ARRAY bool "Speculative Array Hardening" default y - ---help--- + help Contemporary processors may use speculative execution as a performance optimisation, but this can potentially be abused by an attacker to leak data via speculative sidechannels. @@ -154,7 +154,7 @@ config SPECULATIVE_HARDEN_BRANCH bool "Speculative Branch Hardening" default y depends on X86 - ---help--- + help Contemporary processors may use speculative execution as a performance optimisation, but this can potentially be abused by an attacker to leak data via speculative sidechannels. @@ -228,7 +228,7 @@ config DIT_DEFAULT config HYPFS bool "Hypervisor file system support" default y - ---help--- + help Support Xen hypervisor file system. This file system is used to present various hypervisor internal data to dom0 and in some cases to allow modifying settings. Disabling the support will @@ -241,7 +241,7 @@ config HYPFS_CONFIG bool "Provide hypervisor .config via hypfs entry" default y depends on HYPFS - ---help--- + help When enabled the contents of the .config file used to build the hypervisor are provided via the hypfs entry /buildinfo/config. @@ -252,7 +252,7 @@ config IOREQ_SERVER bool "IOREQ support (EXPERT)" if EXPERT && !X86 default X86 depends on HVM - ---help--- + help Enables generic mechanism for providing emulated devices to the guests. If unsure, say N. @@ -261,7 +261,7 @@ config KEXEC bool "kexec support" default y depends on HAS_KEXEC - ---help--- + help Allows a running Xen hypervisor to be replaced with another OS without rebooting. This is primarily used to execute a crash environment to collect information on a Xen hypervisor or dom0 crash. @@ -270,7 +270,7 @@ config KEXEC config EFI_SET_VIRTUAL_ADDRESS_MAP bool "EFI: call SetVirtualAddressMap()" if EXPERT - ---help--- + help Call EFI SetVirtualAddressMap() runtime service to setup memory map for further runtime services. According to UEFI spec, it isn't strictly necessary, but many UEFI implementations misbehave when this call is @@ -292,7 +292,7 @@ config XENOPROF config XSM bool "Xen Security Modules support" default ARM - ---help--- + help Enables the security framework known as Xen Security Modules which allows administrators fine-grained control over a Xen domain and its capabilities by defining permissible interactions between domains, @@ -305,7 +305,7 @@ config XSM_FLASK def_bool y prompt "FLux Advanced Security Kernel support" depends on XSM - ---help--- + help Enables FLASK (FLux Advanced Security Kernel) as the access control mechanism used by the XSM framework. This provides a mandatory access control framework by which security enforcement, isolation, and @@ -318,7 +318,7 @@ config XSM_FLASK_AVC_STATS def_bool y prompt "Maintain statistics on the FLASK access vector cache" if EXPERT depends on XSM_FLASK - ---help--- + help Maintain counters on the access vector cache that can be viewed using the FLASK_AVC_CACHESTATS sub-op of the xsm_op hypercall. Disabling this will save a tiny amount of memory and time to update the stats. @@ -329,7 +329,7 @@ config XSM_FLASK_POLICY bool "Compile Xen with a built-in FLASK security policy" default y if "$(XEN_HAS_CHECKPOLICY)" = "y" depends on XSM_FLASK - ---help--- + help This includes a default XSM policy in the hypervisor so that the bootloader does not need to load a policy to get sane behavior from an XSM-enabled hypervisor. If this is disabled, a policy must be @@ -345,7 +345,7 @@ config XSM_SILO def_bool y prompt "SILO support" depends on XSM - ---help--- + help Enables SILO as the access control mechanism used by the XSM framework. This is not the default module, add boot parameter xsm=silo to choose it. This will deny any unmediated communication channels (grant tables @@ -372,7 +372,7 @@ config LATE_HWDOM bool "Dedicated hardware domain" default n depends on XSM && X86 - ---help--- + help Allows the creation of a dedicated hardware domain distinct from domain 0 that manages devices without needing access to other privileged functionality such as the ability to manage domains. @@ -390,7 +390,7 @@ config LATE_HWDOM config ARGO bool "Argo: hypervisor-mediated interdomain communication (UNSUPPORTED)" if UNSUPPORTED - ---help--- + help Enables a hypercall for domains to ask the hypervisor to perform data transfer of messages between domains. @@ -417,7 +417,7 @@ config LIVEPATCH default X86 depends on "$(XEN_HAS_BUILD_ID)" = "y" select CC_SPLIT_SECTIONS - ---help--- + help Allows a running Xen hypervisor to be dynamically patched using binary patches without rebooting. This is primarily used to binarily patch in the field an hypervisor with XSA fixes. @@ -428,7 +428,7 @@ config FAST_SYMBOL_LOOKUP bool "Fast symbol lookup (bigger binary)" default y depends on LIVEPATCH - ---help--- + help When searching for symbol addresses we can use the built-in system that is optimized for searching symbols using addresses as the key. However using it for the inverse (find address using the symbol name) @@ -440,7 +440,7 @@ config FAST_SYMBOL_LOOKUP config ENFORCE_UNIQUE_SYMBOLS bool "Enforce unique symbols" default LIVEPATCH - ---help--- + help Multiple symbols with the same name aren't generally a problem unless livepatching is to be used. @@ -454,7 +454,7 @@ config ENFORCE_UNIQUE_SYMBOLS config SUPPRESS_DUPLICATE_SYMBOL_WARNINGS bool "Suppress duplicate symbol warnings" depends on !ENFORCE_UNIQUE_SYMBOLS - ---help--- + help Multiple symbols with the same name aren't generally a problem unless Live patching is to be used, so these warnings can be suppressed by enabling this option. Certain other options (known @@ -464,7 +464,7 @@ config SUPPRESS_DUPLICATE_SYMBOL_WARNINGS config CMDLINE string "Built-in hypervisor command string" if EXPERT default "" - ---help--- + help Enter arguments here that should be compiled into the hypervisor image and used at boot time. When the system boots, this string will be parsed prior to the bootloader command line. So if a @@ -475,7 +475,7 @@ config CMDLINE_OVERRIDE bool "Built-in command line overrides bootloader arguments" default n depends on CMDLINE != "" - ---help--- + help Set this option to 'Y' to have the hypervisor ignore the bootloader command line, and use ONLY the built-in command line. @@ -485,7 +485,7 @@ config CMDLINE_OVERRIDE config DOM0_MEM string "Default value for dom0_mem boot parameter" default "" - ---help--- + help Sets a default value for dom0_mem, e.g. "512M". The specified string will be used for the dom0_mem parameter in case it was not specified on the command line. @@ -507,7 +507,7 @@ config DTB_FILE config TRACEBUFFER bool "Enable tracing infrastructure" if EXPERT default y - ---help--- + help Enable tracing infrastructure and pre-defined tracepoints within Xen. This will allow live information about Xen's execution and performance to be collected at run time for debugging or performance analysis. diff --git a/xen/common/sched/Kconfig b/xen/common/sched/Kconfig index b2ef0c99a3..18ca1ce7ab 100644 --- a/xen/common/sched/Kconfig +++ b/xen/common/sched/Kconfig @@ -4,20 +4,20 @@ menu "Schedulers" config SCHED_CREDIT bool "Credit scheduler support" default y - ---help--- + help The traditional credit scheduler is a general purpose scheduler. config SCHED_CREDIT2 bool "Credit2 scheduler support" default y - ---help--- + help The credit2 scheduler is a general purpose scheduler that is optimized for lower latency and higher VM density. config SCHED_RTDS bool "RTDS scheduler support (UNSUPPORTED)" if UNSUPPORTED default DEBUG - ---help--- + help The RTDS scheduler is a soft and firm real-time scheduler for multicore, targeted for embedded, automotive, graphics and gaming in the cloud, and general low-latency workloads. @@ -25,14 +25,14 @@ config SCHED_RTDS config SCHED_ARINC653 bool "ARINC653 scheduler support (UNSUPPORTED)" if UNSUPPORTED default DEBUG - ---help--- + help The ARINC653 scheduler is a hard real-time scheduler for single cores, targeted for avionics, drones, and medical devices. config SCHED_NULL bool "Null scheduler support (UNSUPPORTED)" if UNSUPPORTED default PV_SHIM || DEBUG - ---help--- + help The null scheduler is a static, zero overhead scheduler, for when there always are less vCPUs than pCPUs, typically in embedded or HPC scenarios. diff --git a/xen/drivers/passthrough/Kconfig b/xen/drivers/passthrough/Kconfig index 864fcf3b0c..78edd80536 100644 --- a/xen/drivers/passthrough/Kconfig +++ b/xen/drivers/passthrough/Kconfig @@ -6,7 +6,7 @@ if ARM config ARM_SMMU bool "ARM SMMUv1 and v2 driver" default y - ---help--- + help Support for implementations of the ARM System MMU architecture versions 1 and 2. @@ -16,7 +16,7 @@ config ARM_SMMU config ARM_SMMU_V3 bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support" if EXPERT depends on ARM_64 && (!ACPI || BROKEN) - ---help--- + help Support for implementations of the ARM System MMU architecture version 3. Driver is in experimental stage and should not be used in production. @@ -27,7 +27,7 @@ config ARM_SMMU_V3 config IPMMU_VMSA bool "Renesas IPMMU-VMSA found in R-Car Gen3/Gen4 SoCs" depends on ARM_64 - ---help--- + help Support for implementations of the Renesas IPMMU-VMSA found in R-Car Gen3/Gen4 SoCs. @@ -68,7 +68,7 @@ choice prompt "IOMMU device quarantining default behavior" depends on HAS_PCI default IOMMU_QUARANTINE_BASIC - ---help--- + help When a PCI device is assigned to an untrusted domain, it is possible for that domain to program the device to DMA to an arbitrary address. The IOMMU is used to protect the host from malicious DMA by making diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 41ca503cc9..245030beea 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -7,7 +7,7 @@ config VGA select VIDEO depends on X86 default y if !PV_SHIM_EXCLUSIVE - ---help--- + help Enable VGA output for the Xen hypervisor. If unsure, say Y. diff --git a/xen/tools/kconfig/lexer.l b/xen/tools/kconfig/lexer.l index 6354c905b0..4b7339ff4c 100644 --- a/xen/tools/kconfig/lexer.l +++ b/xen/tools/kconfig/lexer.l @@ -105,7 +105,7 @@ n [A-Za-z0-9_-] "endchoice" return T_ENDCHOICE; "endif" return T_ENDIF; "endmenu" return T_ENDMENU; -"help"|"---help---" return T_HELP; +"help" return T_HELP; "hex" return T_HEX; "if" return T_IF; "imply" return T_IMPLY; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 06 07:33:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 07:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717256.1119271 (Exim 4.92) (envelope-from ) id 1s3sqP-0004Q4-0M; Mon, 06 May 2024 07:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717256.1119271; Mon, 06 May 2024 07: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 1s3sqO-0004Pw-Tx; Mon, 06 May 2024 07:33:04 +0000 Received: by outflank-mailman (input) for mailman id 717256; Mon, 06 May 2024 07:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqN-0004Pq-On for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqN-0004eG-IQ for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3sqN-0006wn-HK for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HYCf6CmNEnx/+EW8f361Z/krRVf+DO+3/xMGMhLrKIc=; b=18EcX2uyNhucBLi5qWmixmxUi5 +fpMCgCDsb36X3eh7Xdow83N8vtUS9WVvBLNMw0v5+2n0YonyOSxnJxNnVgMz10Gueg7jZFvtvjQP dNw2bc5L1uu/YfPAEum5sZtu+E1bI1unMF7T+gyuYyhztE1cIN3b9Esfq0944wyXfAtA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: correct ATS checking for root complex integrated devices Message-Id: Date: Mon, 06 May 2024 07:33:03 +0000 commit 04e31583bab97e5042a44a1d00fce2760272635f Author: Jan Beulich AuthorDate: Mon May 6 09:22:45 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:22:45 2024 +0200 VT-d: correct ATS checking for root complex integrated devices Spec version 4.1 says "The ATSR structures identifies PCI Express Root-Ports supporting Address Translation Services (ATS) transactions. Software must enable ATS on endpoint devices behind a Root Port only if the Root Port is reported as supporting ATS transactions." Clearly root complex integrated devices aren't "behind root ports", matching my observation on a SapphireRapids system having an ATS- capable root complex integrated device. Hence for such devices we shouldn't try to locate a corresponding ATSR. Since both pci_find_ext_capability() and pci_find_cap_offset() return "unsigned int", change "pos" to that type at the same time. Fixes: 903b93211f56 ("[VTD] laying the ground work for ATS") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/drivers/passthrough/vtd/x86/ats.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index 1f5913bed9..61052ef580 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -44,7 +44,7 @@ struct acpi_drhd_unit *find_ats_dev_drhd(struct vtd_iommu *iommu) int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) { struct acpi_drhd_unit *ats_drhd; - int pos; + unsigned int pos, expfl = 0; if ( !ats_enabled || !iommu_qinval ) return 0; @@ -53,7 +53,12 @@ int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) !ecap_dev_iotlb(drhd->iommu->ecap) ) return 0; - if ( !acpi_find_matched_atsr_unit(pdev) ) + pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP); + if ( pos ) + expfl = pci_conf_read16(pdev->sbdf, pos + PCI_EXP_FLAGS); + + if ( MASK_EXTR(expfl, PCI_EXP_FLAGS_TYPE) != PCI_EXP_TYPE_RC_END && + !acpi_find_matched_atsr_unit(pdev) ) return 0; ats_drhd = find_ats_dev_drhd(drhd->iommu); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 07:33:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 07:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717257.1119274 (Exim 4.92) (envelope-from ) id 1s3sqZ-0004SE-1d; Mon, 06 May 2024 07:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717257.1119274; Mon, 06 May 2024 07:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqY-0004S6-VO; Mon, 06 May 2024 07:33:14 +0000 Received: by outflank-mailman (input) for mailman id 717257; Mon, 06 May 2024 07:33:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqX-0004Rv-Nv for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqX-0004ef-MD for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3sqX-0006xW-KT for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9Dh4diFPtk1bj3OTOGjj0g/uZPsK9icYn8T1yoXiNdU=; b=ae1QKkPD1QSjAVvxXtbniDpv+o xNi4v2TsIPAaMya86dGFMLnjtDsFCUaLJRYOM9lngwG3m7oNehY7IUMdnJc0nsyFRW0HddI1SSBS9 P5F77QBUNqkdqKMfxdHwOXfW1e6vEHGBahpflPDLqaMdIFaHcB+LACbyINeB3ehepOg8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] drivers/char: address violation of MISRA C Rule 20.7 Message-Id: Date: Mon, 06 May 2024 07:33:13 +0000 commit b801ccfe7ef0f6f779ce1060e13a1e2ffccec551 Author: Nicola Vetrini AuthorDate: Mon May 6 09:23:30 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:23:30 2024 +0200 drivers/char: address violation of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional chage. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/drivers/char/omap-uart.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index 03b5b66e7a..1079198a8d 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -48,8 +48,9 @@ /* System configuration register */ #define UART_OMAP_SYSC_DEF_CONF 0x0d /* autoidle mode, wakeup is enabled */ -#define omap_read(uart, off) readl((uart)->regs + (off<regs + (off<regs + ((off) << REG_SHIFT)) +#define omap_write(uart, off, val) writel(val, \ + (uart)->regs + ((off) << REG_SHIFT)) static struct omap_uart { u32 baud, clock_hz, data_bits, parity, stop_bits, fifo_size; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 07:33:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 07:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717258.1119278 (Exim 4.92) (envelope-from ) id 1s3sqj-0004Un-3L; Mon, 06 May 2024 07:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717258.1119278; Mon, 06 May 2024 07:33: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 1s3sqj-0004Uf-0T; Mon, 06 May 2024 07:33:25 +0000 Received: by outflank-mailman (input) for mailman id 717258; Mon, 06 May 2024 07:33:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqh-0004UR-RI for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqh-0004en-PW for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3sqh-0006yB-OF for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MgmMfU51WueqhKpN6284FLsED6OGAWNBcFxsalEgryI=; b=YAs0bFdY71SwuUq9keS10OFVBi 0UtjnOnMExjvKD8/l76/QOAcn1c+K1pRl+EQqGH5NO7u+MLQ3CBognEzy5cU9+b5akCDd4JX0MB+y 4WqSxcXrAtOMvl6yQSdYGl/MpvJUH+id4YOX+BmUILEMAV+NDZd9dlDUx2iJ1SM9+LPM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ppc/riscv: fix arch_acquire_resource_check() Message-Id: Date: Mon, 06 May 2024 07:33:23 +0000 commit 6654248f2273d4a8eb41e941b8fe6c70c957dfec Author: Roger Pau Monné AuthorDate: Mon May 6 09:24:10 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:24:10 2024 +0200 ppc/riscv: fix arch_acquire_resource_check() None of the implementations support set_foreign_p2m_entry() yet, neither they have a p2m walk in domain_relinquish_resources() in order to remove the foreign mappings from the p2m and thus drop the extra refcounts. Adjust the arch helpers to return false and introduce a comment that clearly states it is not only taking extra refcounts that's needed, but also dropping them on domain teardown. Fixes: 4988704e00d8 ('xen/riscv: introduce p2m.h') Fixes: 4a2f68f90930 ('xen/ppc: Define minimal stub headers required for full build') Signed-off-by: Roger Pau Monné Reviewed-by: Oleksii Kurochko Acked-by: Shawn Anastasio --- xen/arch/ppc/include/asm/p2m.h | 7 ++++--- xen/arch/riscv/include/asm/p2m.h | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/ppc/include/asm/p2m.h b/xen/arch/ppc/include/asm/p2m.h index 25ba054668..f144ef8e1a 100644 --- a/xen/arch/ppc/include/asm/p2m.h +++ b/xen/arch/ppc/include/asm/p2m.h @@ -81,10 +81,11 @@ static inline mfn_t gfn_to_mfn(struct domain *d, gfn_t gfn) 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. + * Requires refcounting the foreign mappings and walking the p2m on + * teardown in order to remove foreign pages from the p2m and drop the + * extra reference counts. */ - return true; + return false; } static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) diff --git a/xen/arch/riscv/include/asm/p2m.h b/xen/arch/riscv/include/asm/p2m.h index 87b13f8979..387f372b5d 100644 --- a/xen/arch/riscv/include/asm/p2m.h +++ b/xen/arch/riscv/include/asm/p2m.h @@ -79,10 +79,11 @@ static inline mfn_t gfn_to_mfn(struct domain *d, gfn_t gfn) static inline bool arch_acquire_resource_check(struct domain *d) { /* - * The reference counting of foreign entries in set_foreign_p2m_entry() - * is supported on RISCV. + * Requires refcounting the foreign mappings and walking the p2m on + * teardown in order to remove foreign pages from the p2m and drop the + * extra reference counts. */ - return true; + return false; } static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 07:33:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 07:33:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717259.1119283 (Exim 4.92) (envelope-from ) id 1s3sqt-0004Xd-4p; Mon, 06 May 2024 07:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717259.1119283; Mon, 06 May 2024 07:33: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 1s3sqt-0004XV-1s; Mon, 06 May 2024 07:33:35 +0000 Received: by outflank-mailman (input) for mailman id 717259; Mon, 06 May 2024 07:33:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqr-0004X8-Tc for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sqr-0004ew-Sg for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3sqr-0006ym-Rf for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VUEoFAl3fJOo6illMLavscqR8CFyiHIKc0iMqCGzpmA=; b=1kRSIUNQTWPzuhH8TI6sCi+mgg IcQH7Xym0b+yzSZD8MUG9MXdfMCw2BB+ZcSqnYLDxfMeysNsEcGKYP/8Ke5M48xh/aAOdUESsWxCE 4I3AWTu7ZVuGqEgK90AFCaoCVf3Q1ojqV07R2tanEAYOL9RwAzCE6Lbfl8/hnZtbaqCA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/misra: add Terms & Definitions section to rules.rst Message-Id: Date: Mon, 06 May 2024 07:33:33 +0000 commit 50a4f7c177013fa097b0c190cfc60c3257036274 Author: Federico Serafini AuthorDate: Mon May 6 09:24:37 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:24:37 2024 +0200 docs/misra: add Terms & Definitions section to rules.rst Add a section for terms and definitions used by MISRA but expressed in terms of the C specification. Add a definition of "switch clause" to the newly-introduced section. Link the first use of the term "switch clause" in the document to its definition. Suggested-by: Jan Beulich Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- docs/misra/rules.rst | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index b7b447e152..d3b70fdf04 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -489,8 +489,7 @@ maintainers if you want to suggest a change. * - `Rule 16.3 `_ - Required - - An unconditional break statement shall terminate every - switch-clause + - An unconditional break statement shall terminate every switch-clause_ - In addition to break, also other unconditional flow control statements such as continue, return, goto are allowed. @@ -712,3 +711,14 @@ maintainers if you want to suggest a change. - The value of a pointer to a FILE shall not be used after the associated stream has been closed - + +Terms & Definitions +------------------- + +.. _switch-clause: + +A *switch clause* can be defined as: +"the non-empty list of statements which follows a non-empty list of +case/default labels". +A formal definition is available within the amplification of MISRA C:2012 +Rule 16.1. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 07:33:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 07:33:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717260.1119287 (Exim 4.92) (envelope-from ) id 1s3sr3-0004dW-6D; Mon, 06 May 2024 07:33:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717260.1119287; Mon, 06 May 2024 07:33:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sr3-0004dO-3H; Mon, 06 May 2024 07:33:45 +0000 Received: by outflank-mailman (input) for mailman id 717260; Mon, 06 May 2024 07:33:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sr2-0004dC-0O for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3sr1-0004f3-Vq for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3sr1-0006zF-Up for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 07:33:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+8KqxCSVhKXz71W2tRmfh5gflOAsQ6GLVBeQBBkLkJk=; b=pbLCmrRid4zp+k9cwEieoMKYyK 6VXi4xUYCx4UQY8pF+Nk4D4FM3a1pPLHUhI/LDPr70XUa3AGs0jFTrBIE3V1pSa0XVF6kLq6+GS0l 8x/KqDR3jFdyj4e7OKPD49e3HhV6SwiHdqGhenfy51zJwGx5BERAuRu9j/n11WuKv/B0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: add deviation for Rule 16.4 Message-Id: Date: Mon, 06 May 2024 07:33:43 +0000 commit 692f6199bd9a45c93952142c610f0a7dd3b3ef8e Author: Federico Serafini AuthorDate: Mon May 6 09:24:50 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:24:50 2024 +0200 automation/eclair: add deviation for Rule 16.4 MISRA C:2012 Rule 16.4 states that "Every switch statement shall have a default label". Update ECLAIR configuration to take into account the deviations agreed during MISRA meetings. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 8 ++++++++ docs/misra/deviations.rst | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index d21f112a9b..f09ad71acf 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -384,6 +384,14 @@ explicit comment indicating the fallthrough intention is present." -config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through.? \\*/.*$,0..1))))"} -doc_end +-doc_begin="Switch statements having a controlling expression of enum type deliberately do not have a default case: gcc -Wall enables -Wswitch which warns (and breaks the build as we use -Werror) if one of the enum labels is missing from the switch." +-config=MC3R1.R16.4,reports+={deliberate,'any_area(kind(context)&&^.* has no `default.*$&&stmt(node(switch_stmt)&&child(cond,skip(__non_syntactic_paren_stmts,type(canonical(enum_underlying_type(any())))))))'} +-doc_end + +-doc_begin="A switch statement with a single switch clause and no default label may be used in place of an equivalent if statement if it is considered to improve readability." +-config=MC3R1.R16.4,switch_clauses+={deliberate,"switch(1)&&default(0)"} +-doc_end + -doc_begin="A switch statement with a single switch clause and no default label may be used in place of an equivalent if statement if it is considered to improve readability." -config=MC3R1.R16.6,switch_clauses+={deliberate, "default(0)"} -doc_end diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index ed0c1e8ed0..39cc321a27 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -334,6 +334,19 @@ Deviations related to MISRA C:2012 Rules: - /\* Fallthrough \*/ - /\* Fallthrough. \*/ + * - R16.4 + - Switch statements having a controlling expression of enum type + deliberately do not have a default case: gcc -Wall enables -Wswitch + which warns (and breaks the build as we use -Werror) if one of the enum + labels is missing from the switch. + - Tagged as `deliberate` for ECLAIR. + + * - R16.4 + - A switch statement with a single switch clause and no default label may + be used in place of an equivalent if statement if it is considered to + improve readability. + - Tagged as `deliberate` for ECLAIR. + * - R16.6 - A switch statement with a single switch clause and no default label may be used in place of an equivalent if statement if it is considered to -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 12:55:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 12:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717626.1120026 (Exim 4.92) (envelope-from ) id 1s3xs1-0002Bq-I3; Mon, 06 May 2024 12:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717626.1120026; Mon, 06 May 2024 12:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xs1-0002B0-Dr; Mon, 06 May 2024 12:55:05 +0000 Received: by outflank-mailman (input) for mailman id 717626; Mon, 06 May 2024 12:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xs0-00029X-5R for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xrz-0002lJ-VU for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3xrz-00009Q-Ua for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ab1FWWIW3q9Amw+siWuV+PxR/CHiQW0TXlpUFiDJ+Ds=; b=nyAx6d709Nit0/9SZp5o9C66/b ETJhvjygcu15Q9C1An2czMxrifw3A41zgU6isHRtZ3nngpLElzbGTNEvqZKZaGHnhvotVFIMkvLN8 M53HLnTycl/lCzxRfKKpROLxwUFsjD/aJPUhd1nBC3L4nApWi5WPjhK2LrexVArr8A2o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: tidy error handling of RMRR parsing Message-Id: Date: Mon, 06 May 2024 12:55:03 +0000 commit 426dbf404e20c8c7bb8775fcb2190e01e9a52668 Author: Jan Beulich AuthorDate: Mon May 6 14:51:29 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 14:51:29 2024 +0200 VT-d: tidy error handling of RMRR parsing It's acpi_parse_one_rmrr() where the allocation is coming from (by way of invoking acpi_parse_dev_scope()), or in add_one_user_rmrr()'s case allocation is even open-coded there, so freeing would better also happen there. Care needs to be taken to preserve acpi_parse_one_rmrr()'s ultimate return value. While fiddling with callers also move scope_devices_free() to .init and have it use XFREE() instead of open-coding it. To avoid making the situation worse for register_one_rmrr(), mark that __init right here as well. In register_one_rmrr() also have the "ignore" path take the main function return path. Suggested-by: Roger Pau Monné Signed-off-by: Jan Beulich --- xen/drivers/passthrough/vtd/dmar.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 76aade816c..882340b7ee 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -82,14 +82,13 @@ static int __init acpi_register_rmrr_unit(struct acpi_rmrr_unit *rmrr) return 0; } -static void scope_devices_free(struct dmar_scope *scope) +static void __init scope_devices_free(struct dmar_scope *scope) { if ( !scope ) return; scope->devices_cnt = 0; - xfree(scope->devices); - scope->devices = NULL; + XFREE(scope->devices); } static void __init disable_all_dmar_units(void) @@ -557,7 +556,7 @@ out: return ret; } -static int register_one_rmrr(struct acpi_rmrr_unit *rmrru) +static int __init register_one_rmrr(struct acpi_rmrr_unit *rmrru) { bool ignore = false; unsigned int i = 0; @@ -595,17 +594,13 @@ static int register_one_rmrr(struct acpi_rmrr_unit *rmrru) " Ignore RMRR [%"PRIx64",%"PRIx64"] as no device" " under its scope is PCI discoverable!\n", rmrru->base_address, rmrru->end_address); - scope_devices_free(&rmrru->scope); - xfree(rmrru); - return 1; + ret = 1; } else if ( rmrru->base_address > rmrru->end_address ) { dprintk(XENLOG_WARNING VTDPREFIX, " RMRR [%"PRIx64",%"PRIx64"] is incorrect!\n", rmrru->base_address, rmrru->end_address); - scope_devices_free(&rmrru->scope); - xfree(rmrru); ret = -EFAULT; } else @@ -660,21 +655,20 @@ acpi_parse_one_rmrr(struct acpi_dmar_header *header) &rmrru->scope, RMRR_TYPE, rmrr->segment); if ( !ret && (rmrru->scope.devices_cnt != 0) ) - { ret = register_one_rmrr(rmrru); - /* - * register_one_rmrr() returns greater than 0 when a specified - * PCIe device cannot be detected. To prevent VT-d from being - * disabled in such cases, reset the return value to 0 here. - */ - if ( ret > 0 ) - ret = 0; - } - else + if ( ret ) + { + scope_devices_free(&rmrru->scope); xfree(rmrru); + } - return ret; + /* + * register_one_rmrr() returns greater than 0 when a specified PCIe + * device cannot be detected. To prevent VT-d from being disabled in + * such cases, make the return value 0 here. + */ + return ret > 0 ? 0 : ret; } static int __init @@ -945,9 +939,13 @@ static int __init add_one_user_rmrr(unsigned long base_pfn, rmrr->scope.devices_cnt = dev_count; if ( register_one_rmrr(rmrr) ) + { printk(XENLOG_ERR VTDPREFIX "Could not register RMMR range "ERMRRU_FMT"\n", ERMRRU_ARG); + scope_devices_free(&rmrr->scope); + xfree(rmrr); + } return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 12:55:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 12:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717627.1120035 (Exim 4.92) (envelope-from ) id 1s3xsB-0002TO-M1; Mon, 06 May 2024 12:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717627.1120035; Mon, 06 May 2024 12:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsB-0002TG-J4; Mon, 06 May 2024 12:55:15 +0000 Received: by outflank-mailman (input) for mailman id 717627; Mon, 06 May 2024 12:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsA-0002SO-6k for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsA-0002lt-5v for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3xsA-0000A2-1W for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IloYCh1MMWkjlEz4H1OQ4xDJgv/DeQmz+jfUEgyuRSA=; b=hUbwZ+/CuV+2bdn+gqFsX5dPPG ASO1fUNhelJDSlB4I68lwM/wG2zLMYu5y5X3LXVuZCauwfFpi95vgLTUMYuO16ceySnxMKJ8Tr44z AVYCQTYHbsTxRbcPu8PwwOEpTb+wRZOxABNTFpmOkwG7kS3ZZrvaB9RYe0q35SEPU+/8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: parse ACPI "SoC Integrated Address Translation Cache Reporting Structure"s Message-Id: Date: Mon, 06 May 2024 12:55:14 +0000 commit b5996ab2840268529ff508713377c762c5517a36 Author: Jan Beulich AuthorDate: Mon May 6 14:52:12 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 14:52:12 2024 +0200 VT-d: parse ACPI "SoC Integrated Address Translation Cache Reporting Structure"s This is a prereq to us, in particular, respecting the "ATC required" flag. Note that ACPI_SATC_ATC_REQUIRED has its #define put in dmar.h, as we try to keep actbl*.h in sync what Linux (who in turn inherit from ACPI CA) has. Note further that some perhaps sub-optimal style aspects are mainly the way they are in order to stay consistent with other pre-existing code. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/drivers/passthrough/vtd/dmar.c | 95 ++++++++++++++++++++++++++++++++++++++ xen/drivers/passthrough/vtd/dmar.h | 11 +++++ xen/include/acpi/actbl2.h | 12 ++++- 3 files changed, 117 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 882340b7ee..91c22b8330 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -47,6 +47,7 @@ LIST_HEAD_READ_MOSTLY(acpi_drhd_units); LIST_HEAD_READ_MOSTLY(acpi_rmrr_units); static LIST_HEAD_READ_MOSTLY(acpi_atsr_units); static LIST_HEAD_READ_MOSTLY(acpi_rhsa_units); +static LIST_HEAD_READ_MOSTLY(acpi_satc_units); static struct acpi_table_header *__read_mostly dmar_table; static int __read_mostly dmar_flags; @@ -750,6 +751,93 @@ acpi_parse_one_rhsa(struct acpi_dmar_header *header) return ret; } +static int __init register_one_satc(struct acpi_satc_unit *satcu) +{ + bool ignore = false; + unsigned int i = 0; + int ret = 0; + + /* Skip checking if segment is not accessible yet. */ + if ( !pci_known_segment(satcu->segment) ) + i = UINT_MAX; + + for ( ; i < satcu->scope.devices_cnt; i++ ) + { + uint8_t b = PCI_BUS(satcu->scope.devices[i]); + uint8_t d = PCI_SLOT(satcu->scope.devices[i]); + uint8_t f = PCI_FUNC(satcu->scope.devices[i]); + + if ( !pci_device_detect(satcu->segment, b, d, f) ) + { + dprintk(XENLOG_WARNING VTDPREFIX, + " Non-existent device (%pp) is reported in SATC scope!\n", + &PCI_SBDF(satcu->segment, b, d, f)); + ignore = true; + } + else + { + ignore = false; + break; + } + } + + if ( ignore ) + { + dprintk(XENLOG_WARNING VTDPREFIX, + " Ignore SATC for seg %04x as no device under its scope is PCI discoverable\n", + satcu->segment); + return 1; + } + + if ( iommu_verbose ) + printk(VTDPREFIX " ATC required: %d\n", satcu->atc_required); + + list_add(&satcu->list, &acpi_satc_units); + + return ret; +} + +static int __init +acpi_parse_one_satc(const struct acpi_dmar_header *header) +{ + const struct acpi_dmar_satc *satc = + container_of(header, const struct acpi_dmar_satc, header); + struct acpi_satc_unit *satcu; + const void *dev_scope_start, *dev_scope_end; + int ret = acpi_dmar_check_length(header, sizeof(*satc)); + + if ( ret ) + return ret; + + satcu = xzalloc(struct acpi_satc_unit); + if ( !satcu ) + return -ENOMEM; + + satcu->segment = satc->segment; + satcu->atc_required = satc->flags & ACPI_SATC_ATC_REQUIRED; + + dev_scope_start = (const void *)(satc + 1); + dev_scope_end = (const void *)satc + header->length; + ret = acpi_parse_dev_scope(dev_scope_start, dev_scope_end, + &satcu->scope, SATC_TYPE, satc->segment); + + if ( !ret && satcu->scope.devices_cnt ) + ret = register_one_satc(satcu); + + if ( ret ) + { + scope_devices_free(&satcu->scope); + xfree(satcu); + } + + /* + * register_one_satc() returns greater than 0 when a specified PCIe + * device cannot be detected. To prevent VT-d from being disabled in + * such cases, make the return value 0 here. + */ + return ret > 0 ? 0 : ret; +} + static int __init cf_check acpi_parse_dmar(struct acpi_table_header *table) { struct acpi_table_dmar *dmar; @@ -803,6 +891,13 @@ static int __init cf_check acpi_parse_dmar(struct acpi_table_header *table) printk(VTDPREFIX "found ACPI_DMAR_RHSA:\n"); ret = acpi_parse_one_rhsa(entry_header); break; + + case ACPI_DMAR_TYPE_SATC: + if ( iommu_verbose ) + printk(VTDPREFIX "found ACPI_DMAR_SATC:\n"); + ret = acpi_parse_one_satc(entry_header); + break; + default: dprintk(XENLOG_WARNING VTDPREFIX, "Ignore unknown DMAR structure type (%#x)\n", diff --git a/xen/drivers/passthrough/vtd/dmar.h b/xen/drivers/passthrough/vtd/dmar.h index a1f2353a51..61f71ca5e6 100644 --- a/xen/drivers/passthrough/vtd/dmar.h +++ b/xen/drivers/passthrough/vtd/dmar.h @@ -91,6 +91,16 @@ struct acpi_rhsa_unit { u32 proximity_domain; }; +struct acpi_satc_unit { + struct dmar_scope scope; + struct list_head list; + uint16_t segment; + bool atc_required:1; +}; + +/* In lieu of a definition in actbl2.h. */ +#define ACPI_SATC_ATC_REQUIRED (1U << 0) + #define for_each_drhd_unit(drhd) \ list_for_each_entry(drhd, &acpi_drhd_units, list) @@ -106,6 +116,7 @@ struct acpi_atsr_unit *acpi_find_matched_atsr_unit(const struct pci_dev *); #define DMAR_TYPE 1 #define RMRR_TYPE 2 #define ATSR_TYPE 3 +#define SATC_TYPE 4 #define DMAR_OPERATION_TIMEOUT MILLISECS(1000) diff --git a/xen/include/acpi/actbl2.h b/xen/include/acpi/actbl2.h index 2ad08ea467..ee96e990d6 100644 --- a/xen/include/acpi/actbl2.h +++ b/xen/include/acpi/actbl2.h @@ -345,7 +345,8 @@ enum acpi_dmar_type { ACPI_DMAR_TYPE_RESERVED_MEMORY = 1, ACPI_DMAR_TYPE_ATSR = 2, ACPI_DMAR_HARDWARE_AFFINITY = 3, - ACPI_DMAR_TYPE_RESERVED = 4 /* 4 and greater are reserved */ + ACPI_DMAR_TYPE_SATC = 5, + ACPI_DMAR_TYPE_RESERVED = 7 /* 7 and greater are reserved */ }; /* DMAR Device Scope structure */ @@ -427,6 +428,15 @@ struct acpi_dmar_rhsa { u32 proximity_domain; }; +/* 5: SOC Integrated Address Translation Cache Reporting Structure */ + +struct acpi_dmar_satc { + struct acpi_dmar_header header; + uint8_t flags; + uint8_t reserved; + uint16_t segment; +}; + /******************************************************************************* * * HPET - High Precision Event Timer table -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 12:55:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 12:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717628.1120039 (Exim 4.92) (envelope-from ) id 1s3xsL-0002b3-OE; Mon, 06 May 2024 12:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717628.1120039; Mon, 06 May 2024 12:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsL-0002at-Kd; Mon, 06 May 2024 12:55:25 +0000 Received: by outflank-mailman (input) for mailman id 717628; Mon, 06 May 2024 12:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsK-0002aM-A2 for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsK-0002m0-9C for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3xsK-0000Av-8D for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RHuv63slcmxDdnvyBmZcKReIUv+4eecbL2LjeH+qMU8=; b=B2HCIOB1Yhhj0C88EUugG0hEV7 qnAxfosi2Lpy/HrCyMOg3DuxG6daKL8rmeuce+okqLKD9Fh/sYfhC5HEEQtSH6r/cf0WBzeSs8hcG peHllTfGI0yy7VWCPv1Gx6Olit0CS/Bgbv8gIzr4LrSUQdix2Q/iwDjNF80lDj1+Z5Q0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] AMD/IOMMU: add helper to check whether ATS is to be used for a device Message-Id: Date: Mon, 06 May 2024 12:55:24 +0000 commit d7032b4ca2b00f4db6f39cb057e1b9a07d72a6bb Author: Jan Beulich AuthorDate: Mon May 6 14:52:48 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 14:52:48 2024 +0200 AMD/IOMMU: add helper to check whether ATS is to be used for a device The same set of conditions is used in three places, requiring to be kept in sync. Introduce a helper to centralize these checks. To allow all parameters of the new helper be pointer-to-const, iommu_has_cap() also needs its 1st parameter to be constified. Beyond that further "modernize" that function. Requested-by: Roger Pau Monné Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/passthrough/amd/iommu.h | 4 ++-- xen/drivers/passthrough/amd/pci_amd_iommu.c | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index a86ed55333..8d6f63d87f 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -341,9 +341,9 @@ static inline void __free_amd_iommu_tables(void *table, unsigned int order) free_xenheap_pages(table, order); } -static inline int iommu_has_cap(struct amd_iommu *iommu, uint32_t bit) +static inline bool iommu_has_cap(const struct amd_iommu *iommu, unsigned int bit) { - return !!(iommu->cap.header & (1u << bit)); + return iommu->cap.header & (1u << bit); } /* access device id field from iommu cmd */ diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index f6efd88e36..73dcc4a2dd 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -114,6 +114,16 @@ static bool any_pdev_behind_iommu(const struct domain *d, return false; } +static bool use_ats( + const struct pci_dev *pdev, + const struct amd_iommu *iommu, + const struct ivrs_mappings *ivrs_dev) +{ + return !ivrs_dev->block_ats && + iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) && + pci_ats_device(iommu->seg, pdev->bus, pdev->devfn); +} + static int __must_check amd_iommu_setup_domain_device( struct domain *domain, struct amd_iommu *iommu, uint8_t devfn, struct pci_dev *pdev) @@ -185,9 +195,7 @@ static int __must_check amd_iommu_setup_domain_device( dte->ex = ivrs_dev->dte_allow_exclusion; dte->sys_mgt = MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT); - if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && - !ivrs_dev->block_ats && - iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) ) + if ( use_ats(pdev, iommu, ivrs_dev) ) dte->i = ats_enabled; spin_unlock_irqrestore(&iommu->lock, flags); @@ -248,9 +256,7 @@ static int __must_check amd_iommu_setup_domain_device( ASSERT(dte->sys_mgt == MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT)); - if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && - !ivrs_dev->block_ats && - iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) ) + if ( use_ats(pdev, iommu, ivrs_dev) ) ASSERT(dte->i == ats_enabled); spin_unlock_irqrestore(&iommu->lock, flags); @@ -268,9 +274,7 @@ static int __must_check amd_iommu_setup_domain_device( ASSERT(pcidevs_locked()); - if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && - !ivrs_dev->block_ats && - iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) && + if ( use_ats(pdev, iommu, ivrs_dev) && !pci_ats_enabled(iommu->seg, bus, pdev->devfn) ) { if ( devfn == pdev->devfn ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 12:55:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 12:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717630.1120044 (Exim 4.92) (envelope-from ) id 1s3xsV-0002lj-PZ; Mon, 06 May 2024 12:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717630.1120044; Mon, 06 May 2024 12:55:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsV-0002lb-MH; Mon, 06 May 2024 12:55:35 +0000 Received: by outflank-mailman (input) for mailman id 717630; Mon, 06 May 2024 12:55:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsU-0002lL-Cy for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s3xsU-0002m9-C6 for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s3xsU-0000Cy-BH for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 12:55:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Xk81XU/6ziitYgJI3au5uY3r9q0JAR1YOD3iWG18ntg=; b=KOsZds4GQW75w537EuUYA7EgQs zS2pAIPUI/Sy/udQpcypS91OKuOshGjNwDuTuSmkGj/Yyl9WKeA/1ner45QN1gbMTNTAn3gzVvxEE xv+b47wHZEf5XJfLlPYHd62eYBGvvZJmUOhLD+2ArDN/IJVh6a8nRHTiX/9qw3IA70gg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/platform: correct #undef in compat checking Message-Id: Date: Mon, 06 May 2024 12:55:34 +0000 commit ebab808eb1bb8f24c7d0dd41b956e48cb1824b81 Author: Jan Beulich AuthorDate: Mon May 6 14:53:17 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 14:53:17 2024 +0200 x86/platform: correct #undef in compat checking A stray 'p' was there, rendering the #undef ineffectual. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_64/platform_hypercall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index 99440f4076..347f5d6533 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -30,7 +30,7 @@ CHECK_pf_pcpu_version; #define xen_pf_ucode_revision xenpf_ucode_revision CHECK_pf_ucode_revision; -#undef xen_pf_pucode_revision +#undef xen_pf_ucode_revision #define xen_pf_enter_acpi_sleep xenpf_enter_acpi_sleep CHECK_pf_enter_acpi_sleep; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 06 19:11:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 19:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717814.1120307 (Exim 4.92) (envelope-from ) id 1s43jr-0001ay-5N; Mon, 06 May 2024 19:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717814.1120307; Mon, 06 May 2024 19:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43jr-0001ap-2Q; Mon, 06 May 2024 19:11:03 +0000 Received: by outflank-mailman (input) for mailman id 717814; Mon, 06 May 2024 19:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43jq-0001ah-0W for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43jp-0001wE-Ux for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s43jp-0007il-Se for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Qrh56qPoKyvVc1NbXOUat8GEF6X0Fib0DWLzPJc1e6k=; b=skZglf7QT6Fi9EVzBQsYtCiFqs IAekje9RdP/I6yKO+SAGq1mjRp2nq91tqlrlvAmdjYT/xnhnNQfkUWUkjeNIhMxXLpvFhX6qGLjK3 EmgK+dgwa/J4UrovcBBHRwheDwZpor0m1G4TDSymBsmjZgncHPcI2RNiOL6aa1xpzwBE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: correct ATS checking for root complex integrated devices Message-Id: Date: Mon, 06 May 2024 19:11:01 +0000 commit 04e31583bab97e5042a44a1d00fce2760272635f Author: Jan Beulich AuthorDate: Mon May 6 09:22:45 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:22:45 2024 +0200 VT-d: correct ATS checking for root complex integrated devices Spec version 4.1 says "The ATSR structures identifies PCI Express Root-Ports supporting Address Translation Services (ATS) transactions. Software must enable ATS on endpoint devices behind a Root Port only if the Root Port is reported as supporting ATS transactions." Clearly root complex integrated devices aren't "behind root ports", matching my observation on a SapphireRapids system having an ATS- capable root complex integrated device. Hence for such devices we shouldn't try to locate a corresponding ATSR. Since both pci_find_ext_capability() and pci_find_cap_offset() return "unsigned int", change "pos" to that type at the same time. Fixes: 903b93211f56 ("[VTD] laying the ground work for ATS") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/drivers/passthrough/vtd/x86/ats.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index 1f5913bed9..61052ef580 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -44,7 +44,7 @@ struct acpi_drhd_unit *find_ats_dev_drhd(struct vtd_iommu *iommu) int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) { struct acpi_drhd_unit *ats_drhd; - int pos; + unsigned int pos, expfl = 0; if ( !ats_enabled || !iommu_qinval ) return 0; @@ -53,7 +53,12 @@ int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) !ecap_dev_iotlb(drhd->iommu->ecap) ) return 0; - if ( !acpi_find_matched_atsr_unit(pdev) ) + pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP); + if ( pos ) + expfl = pci_conf_read16(pdev->sbdf, pos + PCI_EXP_FLAGS); + + if ( MASK_EXTR(expfl, PCI_EXP_FLAGS_TYPE) != PCI_EXP_TYPE_RC_END && + !acpi_find_matched_atsr_unit(pdev) ) return 0; ats_drhd = find_ats_dev_drhd(drhd->iommu); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 06 19:11:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 19:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717815.1120311 (Exim 4.92) (envelope-from ) id 1s43k1-0001dq-6S; Mon, 06 May 2024 19:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717815.1120311; Mon, 06 May 2024 19: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 1s43k1-0001di-3x; Mon, 06 May 2024 19:11:13 +0000 Received: by outflank-mailman (input) for mailman id 717815; Mon, 06 May 2024 19:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43k0-0001dV-3R for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43k0-0001wZ-2f for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s43k0-0007jP-0q for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DyUSY1HwtcLYIlKOOjnwnYNtrrzcXDf8GGossBROgjE=; b=qP3KFsOSkRM+vxbpLev9VCZkpx zz/aX/Lv9qfUyyJJ9EoE0T7BUTMB4fzoxqs73CvJVWHmL9qPPPNg6Zym/sRwWSWlgCMX1QzHOcY3m AkMr92TE5N00F8zmYb5AG24cnmqPZAopY67SBIvE/mRNTfAkKLl+eR0Y9K+/LQGs5IPg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] drivers/char: address violation of MISRA C Rule 20.7 Message-Id: Date: Mon, 06 May 2024 19:11:12 +0000 commit b801ccfe7ef0f6f779ce1060e13a1e2ffccec551 Author: Nicola Vetrini AuthorDate: Mon May 6 09:23:30 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:23:30 2024 +0200 drivers/char: address violation of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional chage. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/drivers/char/omap-uart.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index 03b5b66e7a..1079198a8d 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -48,8 +48,9 @@ /* System configuration register */ #define UART_OMAP_SYSC_DEF_CONF 0x0d /* autoidle mode, wakeup is enabled */ -#define omap_read(uart, off) readl((uart)->regs + (off<regs + (off<regs + ((off) << REG_SHIFT)) +#define omap_write(uart, off, val) writel(val, \ + (uart)->regs + ((off) << REG_SHIFT)) static struct omap_uart { u32 baud, clock_hz, data_bits, parity, stop_bits, fifo_size; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 06 19:11:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 19:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717817.1120315 (Exim 4.92) (envelope-from ) id 1s43kB-0001hH-9G; Mon, 06 May 2024 19:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717817.1120315; Mon, 06 May 2024 19: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 1s43kB-0001h9-6g; Mon, 06 May 2024 19:11:23 +0000 Received: by outflank-mailman (input) for mailman id 717817; Mon, 06 May 2024 19:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43kA-0001gw-7B for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43kA-0001x8-6Q for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s43kA-0007ju-4g for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YLaoyPPQDxjr4G9CXa1egJ4QPlCI9iJmMbVwbBgwPyI=; b=c1B6MGuPT/jin6FYFcHddWDbV7 JEJ6tfmPM7RDiLrw8l3KAV5rJjTBisUR/zEek9qsq0BbF7+0bF+qRZgFI3laqF6EEAW9BLa2kJ2kg j2VlPjoRIyK/s+UCYQGFAeObROFmVTyUvF1p1OVwfDrA1HUiS6D9399Qc7iO8++gmXnI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ppc/riscv: fix arch_acquire_resource_check() Message-Id: Date: Mon, 06 May 2024 19:11:22 +0000 commit 6654248f2273d4a8eb41e941b8fe6c70c957dfec Author: Roger Pau Monné AuthorDate: Mon May 6 09:24:10 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:24:10 2024 +0200 ppc/riscv: fix arch_acquire_resource_check() None of the implementations support set_foreign_p2m_entry() yet, neither they have a p2m walk in domain_relinquish_resources() in order to remove the foreign mappings from the p2m and thus drop the extra refcounts. Adjust the arch helpers to return false and introduce a comment that clearly states it is not only taking extra refcounts that's needed, but also dropping them on domain teardown. Fixes: 4988704e00d8 ('xen/riscv: introduce p2m.h') Fixes: 4a2f68f90930 ('xen/ppc: Define minimal stub headers required for full build') Signed-off-by: Roger Pau Monné Reviewed-by: Oleksii Kurochko Acked-by: Shawn Anastasio --- xen/arch/ppc/include/asm/p2m.h | 7 ++++--- xen/arch/riscv/include/asm/p2m.h | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/ppc/include/asm/p2m.h b/xen/arch/ppc/include/asm/p2m.h index 25ba054668..f144ef8e1a 100644 --- a/xen/arch/ppc/include/asm/p2m.h +++ b/xen/arch/ppc/include/asm/p2m.h @@ -81,10 +81,11 @@ static inline mfn_t gfn_to_mfn(struct domain *d, gfn_t gfn) 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. + * Requires refcounting the foreign mappings and walking the p2m on + * teardown in order to remove foreign pages from the p2m and drop the + * extra reference counts. */ - return true; + return false; } static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) diff --git a/xen/arch/riscv/include/asm/p2m.h b/xen/arch/riscv/include/asm/p2m.h index 87b13f8979..387f372b5d 100644 --- a/xen/arch/riscv/include/asm/p2m.h +++ b/xen/arch/riscv/include/asm/p2m.h @@ -79,10 +79,11 @@ static inline mfn_t gfn_to_mfn(struct domain *d, gfn_t gfn) static inline bool arch_acquire_resource_check(struct domain *d) { /* - * The reference counting of foreign entries in set_foreign_p2m_entry() - * is supported on RISCV. + * Requires refcounting the foreign mappings and walking the p2m on + * teardown in order to remove foreign pages from the p2m and drop the + * extra reference counts. */ - return true; + return false; } static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 06 19:11:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 19:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717818.1120318 (Exim 4.92) (envelope-from ) id 1s43kL-0001kJ-Ap; Mon, 06 May 2024 19:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717818.1120318; Mon, 06 May 2024 19:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43kL-0001k9-84; Mon, 06 May 2024 19:11:33 +0000 Received: by outflank-mailman (input) for mailman id 717818; Mon, 06 May 2024 19:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43kK-0001k1-AL for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43kK-0001xP-9S for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s43kK-0007kZ-8Y for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UMJynTrWF/w79HyTvFtoxDd2T885RL5NSfH593XcJnQ=; b=xTiBCYv4rqw2vrDz9jYo0ETjOm CnXsqxl6qux3QyhfWiW+Bokd6zO0jjsuD8cy6QHB1H/tPNmSIy77OmI0ttjfpP61nptHwd1nbIchh o/CSs3geIXLiSUIhUYXfGkK4I8mdTSXUZjWx5rAxe0q7D3Xy/Ld+B+wIi9HLGRsMeJCQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add Terms & Definitions section to rules.rst Message-Id: Date: Mon, 06 May 2024 19:11:32 +0000 commit 50a4f7c177013fa097b0c190cfc60c3257036274 Author: Federico Serafini AuthorDate: Mon May 6 09:24:37 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:24:37 2024 +0200 docs/misra: add Terms & Definitions section to rules.rst Add a section for terms and definitions used by MISRA but expressed in terms of the C specification. Add a definition of "switch clause" to the newly-introduced section. Link the first use of the term "switch clause" in the document to its definition. Suggested-by: Jan Beulich Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- docs/misra/rules.rst | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index b7b447e152..d3b70fdf04 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -489,8 +489,7 @@ maintainers if you want to suggest a change. * - `Rule 16.3 `_ - Required - - An unconditional break statement shall terminate every - switch-clause + - An unconditional break statement shall terminate every switch-clause_ - In addition to break, also other unconditional flow control statements such as continue, return, goto are allowed. @@ -712,3 +711,14 @@ maintainers if you want to suggest a change. - The value of a pointer to a FILE shall not be used after the associated stream has been closed - + +Terms & Definitions +------------------- + +.. _switch-clause: + +A *switch clause* can be defined as: +"the non-empty list of statements which follows a non-empty list of +case/default labels". +A formal definition is available within the amplification of MISRA C:2012 +Rule 16.1. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 06 19:11:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 May 2024 19:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717819.1120323 (Exim 4.92) (envelope-from ) id 1s43kV-0001nE-CC; Mon, 06 May 2024 19:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717819.1120323; Mon, 06 May 2024 19:11:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43kV-0001n5-9T; Mon, 06 May 2024 19:11:43 +0000 Received: by outflank-mailman (input) for mailman id 717819; Mon, 06 May 2024 19:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43kU-0001mx-E7 for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s43kU-0001xh-DO for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s43kU-0007l7-Bf for xen-changelog@lists.xenproject.org; Mon, 06 May 2024 19: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=MalAWj0tG+U506dssdMsBiab6fTsEn65/8vISzcCiJE=; b=K3NxSACQb40tJVl37IHJc1U/Qe eBKoeIvJiHfmdq3ZELpTjZM4i4CmBcIoslRwvmIQPVYBzDwvN8/KXbVg4r8bn6xS4pVpCyhzZd3y7 wyvLta6s6FpUmuPSEGOBMAauvazjl5q8VCAoI534lc/o3IpmMOfD/yygUaSkj4cBLoYA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: add deviation for Rule 16.4 Message-Id: Date: Mon, 06 May 2024 19:11:42 +0000 commit 692f6199bd9a45c93952142c610f0a7dd3b3ef8e Author: Federico Serafini AuthorDate: Mon May 6 09:24:50 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 09:24:50 2024 +0200 automation/eclair: add deviation for Rule 16.4 MISRA C:2012 Rule 16.4 states that "Every switch statement shall have a default label". Update ECLAIR configuration to take into account the deviations agreed during MISRA meetings. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 8 ++++++++ docs/misra/deviations.rst | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index d21f112a9b..f09ad71acf 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -384,6 +384,14 @@ explicit comment indicating the fallthrough intention is present." -config=MC3R1.R16.3,reports+={safe, "any_area(end_loc(any_exp(text(^(?s).*/\\* [fF]all ?through.? \\*/.*$,0..1))))"} -doc_end +-doc_begin="Switch statements having a controlling expression of enum type deliberately do not have a default case: gcc -Wall enables -Wswitch which warns (and breaks the build as we use -Werror) if one of the enum labels is missing from the switch." +-config=MC3R1.R16.4,reports+={deliberate,'any_area(kind(context)&&^.* has no `default.*$&&stmt(node(switch_stmt)&&child(cond,skip(__non_syntactic_paren_stmts,type(canonical(enum_underlying_type(any())))))))'} +-doc_end + +-doc_begin="A switch statement with a single switch clause and no default label may be used in place of an equivalent if statement if it is considered to improve readability." +-config=MC3R1.R16.4,switch_clauses+={deliberate,"switch(1)&&default(0)"} +-doc_end + -doc_begin="A switch statement with a single switch clause and no default label may be used in place of an equivalent if statement if it is considered to improve readability." -config=MC3R1.R16.6,switch_clauses+={deliberate, "default(0)"} -doc_end diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index ed0c1e8ed0..39cc321a27 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -334,6 +334,19 @@ Deviations related to MISRA C:2012 Rules: - /\* Fallthrough \*/ - /\* Fallthrough. \*/ + * - R16.4 + - Switch statements having a controlling expression of enum type + deliberately do not have a default case: gcc -Wall enables -Wswitch + which warns (and breaks the build as we use -Werror) if one of the enum + labels is missing from the switch. + - Tagged as `deliberate` for ECLAIR. + + * - R16.4 + - A switch statement with a single switch clause and no default label may + be used in place of an equivalent if statement if it is considered to + improve readability. + - Tagged as `deliberate` for ECLAIR. + * - R16.6 - A switch statement with a single switch clause and no default label may be used in place of an equivalent if statement if it is considered to -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 07 05:55:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 May 2024 05:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717880.1120386 (Exim 4.92) (envelope-from ) id 1s4Dn5-0002fv-7o; Tue, 07 May 2024 05:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717880.1120386; Tue, 07 May 2024 05:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4Dn5-0002fn-55; Tue, 07 May 2024 05:55:03 +0000 Received: by outflank-mailman (input) for mailman id 717880; Tue, 07 May 2024 05:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4Dn3-0002fh-P8 for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4Dn3-0006Wt-OE for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4Dn3-0006eH-N4 for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RauR6Vz10Z7qr/GnoZNk8hj37Gw84holSOXA7z2tkd0=; b=r92Y4sScD+HecSgZRFWXQTNODE fWaqq0aA5f9SbT60jLgnx1blQmzBAtYXdV/J4cVEEFVtbGarD2wB+5GT1odkI9AYIuxE4FHdhS1XZ LYw0pWZoAtsF3QkRiM2nhQSPpahil/7GNGllTpEyTHD6u3tOgSfkZIsio5pPI+ZyEktI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: tidy error handling of RMRR parsing Message-Id: Date: Tue, 07 May 2024 05:55:01 +0000 commit 426dbf404e20c8c7bb8775fcb2190e01e9a52668 Author: Jan Beulich AuthorDate: Mon May 6 14:51:29 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 14:51:29 2024 +0200 VT-d: tidy error handling of RMRR parsing It's acpi_parse_one_rmrr() where the allocation is coming from (by way of invoking acpi_parse_dev_scope()), or in add_one_user_rmrr()'s case allocation is even open-coded there, so freeing would better also happen there. Care needs to be taken to preserve acpi_parse_one_rmrr()'s ultimate return value. While fiddling with callers also move scope_devices_free() to .init and have it use XFREE() instead of open-coding it. To avoid making the situation worse for register_one_rmrr(), mark that __init right here as well. In register_one_rmrr() also have the "ignore" path take the main function return path. Suggested-by: Roger Pau Monné Signed-off-by: Jan Beulich --- xen/drivers/passthrough/vtd/dmar.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 76aade816c..882340b7ee 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -82,14 +82,13 @@ static int __init acpi_register_rmrr_unit(struct acpi_rmrr_unit *rmrr) return 0; } -static void scope_devices_free(struct dmar_scope *scope) +static void __init scope_devices_free(struct dmar_scope *scope) { if ( !scope ) return; scope->devices_cnt = 0; - xfree(scope->devices); - scope->devices = NULL; + XFREE(scope->devices); } static void __init disable_all_dmar_units(void) @@ -557,7 +556,7 @@ out: return ret; } -static int register_one_rmrr(struct acpi_rmrr_unit *rmrru) +static int __init register_one_rmrr(struct acpi_rmrr_unit *rmrru) { bool ignore = false; unsigned int i = 0; @@ -595,17 +594,13 @@ static int register_one_rmrr(struct acpi_rmrr_unit *rmrru) " Ignore RMRR [%"PRIx64",%"PRIx64"] as no device" " under its scope is PCI discoverable!\n", rmrru->base_address, rmrru->end_address); - scope_devices_free(&rmrru->scope); - xfree(rmrru); - return 1; + ret = 1; } else if ( rmrru->base_address > rmrru->end_address ) { dprintk(XENLOG_WARNING VTDPREFIX, " RMRR [%"PRIx64",%"PRIx64"] is incorrect!\n", rmrru->base_address, rmrru->end_address); - scope_devices_free(&rmrru->scope); - xfree(rmrru); ret = -EFAULT; } else @@ -660,21 +655,20 @@ acpi_parse_one_rmrr(struct acpi_dmar_header *header) &rmrru->scope, RMRR_TYPE, rmrr->segment); if ( !ret && (rmrru->scope.devices_cnt != 0) ) - { ret = register_one_rmrr(rmrru); - /* - * register_one_rmrr() returns greater than 0 when a specified - * PCIe device cannot be detected. To prevent VT-d from being - * disabled in such cases, reset the return value to 0 here. - */ - if ( ret > 0 ) - ret = 0; - } - else + if ( ret ) + { + scope_devices_free(&rmrru->scope); xfree(rmrru); + } - return ret; + /* + * register_one_rmrr() returns greater than 0 when a specified PCIe + * device cannot be detected. To prevent VT-d from being disabled in + * such cases, make the return value 0 here. + */ + return ret > 0 ? 0 : ret; } static int __init @@ -945,9 +939,13 @@ static int __init add_one_user_rmrr(unsigned long base_pfn, rmrr->scope.devices_cnt = dev_count; if ( register_one_rmrr(rmrr) ) + { printk(XENLOG_ERR VTDPREFIX "Could not register RMMR range "ERMRRU_FMT"\n", ERMRRU_ARG); + scope_devices_free(&rmrr->scope); + xfree(rmrr); + } return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 07 05:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 May 2024 05:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717881.1120390 (Exim 4.92) (envelope-from ) id 1s4DnF-0002hm-94; Tue, 07 May 2024 05:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717881.1120390; Tue, 07 May 2024 05: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 1s4DnF-0002hf-6c; Tue, 07 May 2024 05:55:13 +0000 Received: by outflank-mailman (input) for mailman id 717881; Tue, 07 May 2024 05:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4DnD-0002hX-Sx for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4DnD-0006XL-S2 for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4DnD-0006ek-QT for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XcrgeaWhmvD/qazrjr30zGy1GuEaNiQXp0mWpLLwCYs=; b=yrQ6LnvSMlOt2OlDP2tBRPMzIJ MqARU7zZ3FLuI96UyQoLY2j6bRo8xcfTVVALoAWpP0zfW/jAMZ5Snpqwa97kNJgyw5nWNtLiCs/9d i8fKbJCuxEBDdcEx+qS/XnqW6O9ppHkDL7axoR2rvBj5d91XFRtkS1KoAl0Qx80V0DLg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: parse ACPI "SoC Integrated Address Translation Cache Reporting Structure"s Message-Id: Date: Tue, 07 May 2024 05:55:11 +0000 commit b5996ab2840268529ff508713377c762c5517a36 Author: Jan Beulich AuthorDate: Mon May 6 14:52:12 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 14:52:12 2024 +0200 VT-d: parse ACPI "SoC Integrated Address Translation Cache Reporting Structure"s This is a prereq to us, in particular, respecting the "ATC required" flag. Note that ACPI_SATC_ATC_REQUIRED has its #define put in dmar.h, as we try to keep actbl*.h in sync what Linux (who in turn inherit from ACPI CA) has. Note further that some perhaps sub-optimal style aspects are mainly the way they are in order to stay consistent with other pre-existing code. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/drivers/passthrough/vtd/dmar.c | 95 ++++++++++++++++++++++++++++++++++++++ xen/drivers/passthrough/vtd/dmar.h | 11 +++++ xen/include/acpi/actbl2.h | 12 ++++- 3 files changed, 117 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 882340b7ee..91c22b8330 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -47,6 +47,7 @@ LIST_HEAD_READ_MOSTLY(acpi_drhd_units); LIST_HEAD_READ_MOSTLY(acpi_rmrr_units); static LIST_HEAD_READ_MOSTLY(acpi_atsr_units); static LIST_HEAD_READ_MOSTLY(acpi_rhsa_units); +static LIST_HEAD_READ_MOSTLY(acpi_satc_units); static struct acpi_table_header *__read_mostly dmar_table; static int __read_mostly dmar_flags; @@ -750,6 +751,93 @@ acpi_parse_one_rhsa(struct acpi_dmar_header *header) return ret; } +static int __init register_one_satc(struct acpi_satc_unit *satcu) +{ + bool ignore = false; + unsigned int i = 0; + int ret = 0; + + /* Skip checking if segment is not accessible yet. */ + if ( !pci_known_segment(satcu->segment) ) + i = UINT_MAX; + + for ( ; i < satcu->scope.devices_cnt; i++ ) + { + uint8_t b = PCI_BUS(satcu->scope.devices[i]); + uint8_t d = PCI_SLOT(satcu->scope.devices[i]); + uint8_t f = PCI_FUNC(satcu->scope.devices[i]); + + if ( !pci_device_detect(satcu->segment, b, d, f) ) + { + dprintk(XENLOG_WARNING VTDPREFIX, + " Non-existent device (%pp) is reported in SATC scope!\n", + &PCI_SBDF(satcu->segment, b, d, f)); + ignore = true; + } + else + { + ignore = false; + break; + } + } + + if ( ignore ) + { + dprintk(XENLOG_WARNING VTDPREFIX, + " Ignore SATC for seg %04x as no device under its scope is PCI discoverable\n", + satcu->segment); + return 1; + } + + if ( iommu_verbose ) + printk(VTDPREFIX " ATC required: %d\n", satcu->atc_required); + + list_add(&satcu->list, &acpi_satc_units); + + return ret; +} + +static int __init +acpi_parse_one_satc(const struct acpi_dmar_header *header) +{ + const struct acpi_dmar_satc *satc = + container_of(header, const struct acpi_dmar_satc, header); + struct acpi_satc_unit *satcu; + const void *dev_scope_start, *dev_scope_end; + int ret = acpi_dmar_check_length(header, sizeof(*satc)); + + if ( ret ) + return ret; + + satcu = xzalloc(struct acpi_satc_unit); + if ( !satcu ) + return -ENOMEM; + + satcu->segment = satc->segment; + satcu->atc_required = satc->flags & ACPI_SATC_ATC_REQUIRED; + + dev_scope_start = (const void *)(satc + 1); + dev_scope_end = (const void *)satc + header->length; + ret = acpi_parse_dev_scope(dev_scope_start, dev_scope_end, + &satcu->scope, SATC_TYPE, satc->segment); + + if ( !ret && satcu->scope.devices_cnt ) + ret = register_one_satc(satcu); + + if ( ret ) + { + scope_devices_free(&satcu->scope); + xfree(satcu); + } + + /* + * register_one_satc() returns greater than 0 when a specified PCIe + * device cannot be detected. To prevent VT-d from being disabled in + * such cases, make the return value 0 here. + */ + return ret > 0 ? 0 : ret; +} + static int __init cf_check acpi_parse_dmar(struct acpi_table_header *table) { struct acpi_table_dmar *dmar; @@ -803,6 +891,13 @@ static int __init cf_check acpi_parse_dmar(struct acpi_table_header *table) printk(VTDPREFIX "found ACPI_DMAR_RHSA:\n"); ret = acpi_parse_one_rhsa(entry_header); break; + + case ACPI_DMAR_TYPE_SATC: + if ( iommu_verbose ) + printk(VTDPREFIX "found ACPI_DMAR_SATC:\n"); + ret = acpi_parse_one_satc(entry_header); + break; + default: dprintk(XENLOG_WARNING VTDPREFIX, "Ignore unknown DMAR structure type (%#x)\n", diff --git a/xen/drivers/passthrough/vtd/dmar.h b/xen/drivers/passthrough/vtd/dmar.h index a1f2353a51..61f71ca5e6 100644 --- a/xen/drivers/passthrough/vtd/dmar.h +++ b/xen/drivers/passthrough/vtd/dmar.h @@ -91,6 +91,16 @@ struct acpi_rhsa_unit { u32 proximity_domain; }; +struct acpi_satc_unit { + struct dmar_scope scope; + struct list_head list; + uint16_t segment; + bool atc_required:1; +}; + +/* In lieu of a definition in actbl2.h. */ +#define ACPI_SATC_ATC_REQUIRED (1U << 0) + #define for_each_drhd_unit(drhd) \ list_for_each_entry(drhd, &acpi_drhd_units, list) @@ -106,6 +116,7 @@ struct acpi_atsr_unit *acpi_find_matched_atsr_unit(const struct pci_dev *); #define DMAR_TYPE 1 #define RMRR_TYPE 2 #define ATSR_TYPE 3 +#define SATC_TYPE 4 #define DMAR_OPERATION_TIMEOUT MILLISECS(1000) diff --git a/xen/include/acpi/actbl2.h b/xen/include/acpi/actbl2.h index 2ad08ea467..ee96e990d6 100644 --- a/xen/include/acpi/actbl2.h +++ b/xen/include/acpi/actbl2.h @@ -345,7 +345,8 @@ enum acpi_dmar_type { ACPI_DMAR_TYPE_RESERVED_MEMORY = 1, ACPI_DMAR_TYPE_ATSR = 2, ACPI_DMAR_HARDWARE_AFFINITY = 3, - ACPI_DMAR_TYPE_RESERVED = 4 /* 4 and greater are reserved */ + ACPI_DMAR_TYPE_SATC = 5, + ACPI_DMAR_TYPE_RESERVED = 7 /* 7 and greater are reserved */ }; /* DMAR Device Scope structure */ @@ -427,6 +428,15 @@ struct acpi_dmar_rhsa { u32 proximity_domain; }; +/* 5: SOC Integrated Address Translation Cache Reporting Structure */ + +struct acpi_dmar_satc { + struct acpi_dmar_header header; + uint8_t flags; + uint8_t reserved; + uint16_t segment; +}; + /******************************************************************************* * * HPET - High Precision Event Timer table -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 07 05:55:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 May 2024 05:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717882.1120394 (Exim 4.92) (envelope-from ) id 1s4DnP-0002kk-Ai; Tue, 07 May 2024 05:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717882.1120394; Tue, 07 May 2024 05: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 1s4DnP-0002ka-87; Tue, 07 May 2024 05:55:23 +0000 Received: by outflank-mailman (input) for mailman id 717882; Tue, 07 May 2024 05:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4DnO-0002kQ-07 for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4DnN-0006Xn-VW for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4DnN-0006fI-U9 for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cPR/pR33oV1eSsMb0D0wYYXGfttWcNVyeKsiOuNJB50=; b=Zxh2AB7wwjBiiTwJN39NsQRDkv kO054IyNz+iLO5DWHG4ZWmsl+2datQkc2wQ6EwstyrJu5GUq49Q1wS001GBJkNF0LUnTK3dL/9em7 YgUbxsWZ+mJsyOZGYRv4Pq47tLs59bsyY27IsvXl2npwOFFp8puDGqtaWGxJaPcoKj40=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: add helper to check whether ATS is to be used for a device Message-Id: Date: Tue, 07 May 2024 05:55:21 +0000 commit d7032b4ca2b00f4db6f39cb057e1b9a07d72a6bb Author: Jan Beulich AuthorDate: Mon May 6 14:52:48 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 14:52:48 2024 +0200 AMD/IOMMU: add helper to check whether ATS is to be used for a device The same set of conditions is used in three places, requiring to be kept in sync. Introduce a helper to centralize these checks. To allow all parameters of the new helper be pointer-to-const, iommu_has_cap() also needs its 1st parameter to be constified. Beyond that further "modernize" that function. Requested-by: Roger Pau Monné Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/passthrough/amd/iommu.h | 4 ++-- xen/drivers/passthrough/amd/pci_amd_iommu.c | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index a86ed55333..8d6f63d87f 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -341,9 +341,9 @@ static inline void __free_amd_iommu_tables(void *table, unsigned int order) free_xenheap_pages(table, order); } -static inline int iommu_has_cap(struct amd_iommu *iommu, uint32_t bit) +static inline bool iommu_has_cap(const struct amd_iommu *iommu, unsigned int bit) { - return !!(iommu->cap.header & (1u << bit)); + return iommu->cap.header & (1u << bit); } /* access device id field from iommu cmd */ diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index f6efd88e36..73dcc4a2dd 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -114,6 +114,16 @@ static bool any_pdev_behind_iommu(const struct domain *d, return false; } +static bool use_ats( + const struct pci_dev *pdev, + const struct amd_iommu *iommu, + const struct ivrs_mappings *ivrs_dev) +{ + return !ivrs_dev->block_ats && + iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) && + pci_ats_device(iommu->seg, pdev->bus, pdev->devfn); +} + static int __must_check amd_iommu_setup_domain_device( struct domain *domain, struct amd_iommu *iommu, uint8_t devfn, struct pci_dev *pdev) @@ -185,9 +195,7 @@ static int __must_check amd_iommu_setup_domain_device( dte->ex = ivrs_dev->dte_allow_exclusion; dte->sys_mgt = MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT); - if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && - !ivrs_dev->block_ats && - iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) ) + if ( use_ats(pdev, iommu, ivrs_dev) ) dte->i = ats_enabled; spin_unlock_irqrestore(&iommu->lock, flags); @@ -248,9 +256,7 @@ static int __must_check amd_iommu_setup_domain_device( ASSERT(dte->sys_mgt == MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT)); - if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && - !ivrs_dev->block_ats && - iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) ) + if ( use_ats(pdev, iommu, ivrs_dev) ) ASSERT(dte->i == ats_enabled); spin_unlock_irqrestore(&iommu->lock, flags); @@ -268,9 +274,7 @@ static int __must_check amd_iommu_setup_domain_device( ASSERT(pcidevs_locked()); - if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && - !ivrs_dev->block_ats && - iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) && + if ( use_ats(pdev, iommu, ivrs_dev) && !pci_ats_enabled(iommu->seg, bus, pdev->devfn) ) { if ( devfn == pdev->devfn ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 07 05:55:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 May 2024 05:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.717883.1120399 (Exim 4.92) (envelope-from ) id 1s4DnZ-0002np-Dk; Tue, 07 May 2024 05:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 717883.1120399; Tue, 07 May 2024 05: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 1s4DnZ-0002nh-At; Tue, 07 May 2024 05:55:33 +0000 Received: by outflank-mailman (input) for mailman id 717883; Tue, 07 May 2024 05:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4DnY-0002nb-3o for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4DnY-0006Xw-31 for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4DnY-0006hG-1M for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 05: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=Ppa6O+C88qiLTGoMeLLXvWPZ9QeHL0kTIBI2YYr8ohA=; b=KKMlP8CBWtcB3kZBPnC7DEE70r LudhJuFGhyeTKhnSsUCx5HeSgztEPQ3m4qFFlwfi1ybG9fTMvDvlsdMGhpJBKeK6kcnz9FloTzUlS B4rJwhnloay7d4bJR0EYeG4fSYMh5U1E4Vb2TPliTMr2peVwviDqgpHWA5FTeTCxc+gY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/platform: correct #undef in compat checking Message-Id: Date: Tue, 07 May 2024 05:55:32 +0000 commit ebab808eb1bb8f24c7d0dd41b956e48cb1824b81 Author: Jan Beulich AuthorDate: Mon May 6 14:53:17 2024 +0200 Commit: Jan Beulich CommitDate: Mon May 6 14:53:17 2024 +0200 x86/platform: correct #undef in compat checking A stray 'p' was there, rendering the #undef ineffectual. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_64/platform_hypercall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index 99440f4076..347f5d6533 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -30,7 +30,7 @@ CHECK_pf_pcpu_version; #define xen_pf_ucode_revision xenpf_ucode_revision CHECK_pf_ucode_revision; -#undef xen_pf_pucode_revision +#undef xen_pf_ucode_revision #define xen_pf_enter_acpi_sleep xenpf_enter_acpi_sleep CHECK_pf_enter_acpi_sleep; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 07 16:22:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 May 2024 16:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.718306.1120898 (Exim 4.92) (envelope-from ) id 1s4NZt-0001VM-Bd; Tue, 07 May 2024 16:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 718306.1120898; Tue, 07 May 2024 16:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4NZt-0001VE-8l; Tue, 07 May 2024 16:22:05 +0000 Received: by outflank-mailman (input) for mailman id 718306; Tue, 07 May 2024 16:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4NZr-0001V6-GZ for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 16:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4NZr-0002OY-6r for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 16:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4NZr-0003Hw-58 for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 16:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=REBTAZApkpiA+O1zBieFlMd5qLoorJg/48ePNKtO9jE=; b=AuvufIEQU/m01zMsviaAdGFzBb fWHAlLrSfcEzqszddWFTWYBdU1QbE2q10eGZfuQ/Yioir6C93RylqftdKBQ8+67kQbwfxy1Wbrax7 HVB/YCJ2uZtBqQkQKDZCJzRl/79YVPGvZLhOZaPzyj6mPj/4Y4ypKYqDnryLtih/QHxE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC Message-Id: Date: Tue, 07 May 2024 16:22:03 +0000 commit f4f2f3402b2f4985d69ffc0d46f845d05fd0b60f Author: Andrew Cooper AuthorDate: Sat May 4 02:10:33 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 7 15:18:36 2024 +0100 tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC The header description for xs_open() goes as far as to suggest that the fd is O_CLOEXEC, but it isn't actually. `xl devd` has been observed leaking /dev/xen/xenbus into children. Link: https://github.com/QubesOS/qubes-issues/issues/8292 Reported-by: Demi Marie Obenour Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross --- tools/libs/store/xs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 140b9a2839..1498515073 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -54,6 +54,10 @@ struct xs_stored_msg { #include #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + struct xs_handle { /* Communications channel to xenstore daemon. */ int fd; @@ -227,7 +231,7 @@ error: static int get_dev(const char *connect_to) { /* We cannot open read-only because requests are writes */ - return open(connect_to, O_RDWR); + return open(connect_to, O_RDWR | O_CLOEXEC); } static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 07 16:22:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 May 2024 16:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.718308.1120902 (Exim 4.92) (envelope-from ) id 1s4Na2-0001X3-Cs; Tue, 07 May 2024 16:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 718308.1120902; Tue, 07 May 2024 16:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4Na2-0001Wv-A9; Tue, 07 May 2024 16:22:14 +0000 Received: by outflank-mailman (input) for mailman id 718308; Tue, 07 May 2024 16:22:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4Na1-0001Wn-Dk for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 16:22:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4Na1-0002Oh-BG for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 16:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4Na1-0003IN-8u for xen-changelog@lists.xenproject.org; Tue, 07 May 2024 16:22:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iDPkT9E3dorq2OJSY8OU17RtNt3iZDirlkFe2VonGUE=; b=pyOQcWTkO/2g8UccC7bqJsvM26 PpL3aGNUObcMa6syxVOq5ckTPyugD0mj2sC4pyz4frmIY6TKLeUSB16N1y4gvZn63LjhZVMKnfhsF fhUDFfMSsD0/8PJtpaS07nPdZTeZMp91V9OsiUnYCgdCC1euRkdy02/HaygsuDxL5EkE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Message-Id: Date: Tue, 07 May 2024 16:22:13 +0000 commit a2330b51df267e20e66bbba6c5bf08f0570ed58b Author: Andrew Cooper AuthorDate: Tue May 7 12:19:41 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 7 16:56:46 2024 +0100 x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Ever since Xen 4.14, there has been a latent bug with migration. While some toolstacks can level the features properly, they don't shink feat.max_subleaf when all features have been dropped. This is because we *still* have not completed the toolstack side work for full CPU Policy objects. As a consequence, even when properly feature levelled, VMs can't migrate "backwards" across hardware which reduces feat.max_subleaf. One such example is Ice Lake (max_subleaf=2 for INTEL_PSFD) to Cascade Lake (max_subleaf=0). Extend the max policies feat.max_subleaf to the hightest number Xen knows about, but leave the default policies matching the host. This will allow VMs with a higher feat.max_subleaf than strictly necessary to migrate in. Eventually we'll manage to teach the toolstack how to avoid creating such VMs in the first place, but there's still more work to do there. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/cpu-policy.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 4b6d962763..99871b8e0e 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -590,6 +590,13 @@ static void __init calculate_pv_max_policy(void) unsigned int i; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -630,6 +637,10 @@ static void __init calculate_pv_def_policy(void) unsigned int i; *p = pv_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -666,6 +677,13 @@ static void __init calculate_hvm_max_policy(void) const uint32_t *mask; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? @@ -783,6 +801,10 @@ static void __init calculate_hvm_def_policy(void) const uint32_t *mask; *p = hvm_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 08 02:55:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 May 2024 02:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.718568.1121057 (Exim 4.92) (envelope-from ) id 1s4XSR-00034i-UG; Wed, 08 May 2024 02:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 718568.1121057; Wed, 08 May 2024 02:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4XSR-00034a-Rc; Wed, 08 May 2024 02:55:03 +0000 Received: by outflank-mailman (input) for mailman id 718568; Wed, 08 May 2024 02:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4XSQ-00034U-3i for xen-changelog@lists.xenproject.org; Wed, 08 May 2024 02:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4XSQ-0005IW-1I for xen-changelog@lists.xenproject.org; Wed, 08 May 2024 02:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4XSP-000061-VH for xen-changelog@lists.xenproject.org; Wed, 08 May 2024 02:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XuilcC4i7uk6lZW8ymoaV8Lu3q9l9kV7E9glDT1N7PM=; b=r1iwS8Zi96zFTEAHtwK9TzAr8T 1obYWvuWK5+K3iJYTTxfHqQz1gyksbR8cJZahMe6p9Q4WIIne4j3x3+tdGp945kK/cdPjMhI3WIm6 YnXXAiPd1Xa+qFSz4KGD1VEDJlYuzHLU+GTgnJzY3qouRBTMBjRhCWkWh9yx9TNrtc2k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC Message-Id: Date: Wed, 08 May 2024 02:55:01 +0000 commit f4f2f3402b2f4985d69ffc0d46f845d05fd0b60f Author: Andrew Cooper AuthorDate: Sat May 4 02:10:33 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 7 15:18:36 2024 +0100 tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC The header description for xs_open() goes as far as to suggest that the fd is O_CLOEXEC, but it isn't actually. `xl devd` has been observed leaking /dev/xen/xenbus into children. Link: https://github.com/QubesOS/qubes-issues/issues/8292 Reported-by: Demi Marie Obenour Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross --- tools/libs/store/xs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 140b9a2839..1498515073 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -54,6 +54,10 @@ struct xs_stored_msg { #include #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + struct xs_handle { /* Communications channel to xenstore daemon. */ int fd; @@ -227,7 +231,7 @@ error: static int get_dev(const char *connect_to) { /* We cannot open read-only because requests are writes */ - return open(connect_to, O_RDWR); + return open(connect_to, O_RDWR | O_CLOEXEC); } static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 08 02:55:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 May 2024 02:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.718569.1121062 (Exim 4.92) (envelope-from ) id 1s4XSc-00036Q-01; Wed, 08 May 2024 02:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 718569.1121062; Wed, 08 May 2024 02:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4XSb-00036I-T9; Wed, 08 May 2024 02:55:13 +0000 Received: by outflank-mailman (input) for mailman id 718569; Wed, 08 May 2024 02:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4XSa-000364-6A for xen-changelog@lists.xenproject.org; Wed, 08 May 2024 02:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4XSa-0005Id-5L for xen-changelog@lists.xenproject.org; Wed, 08 May 2024 02:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4XSa-00006U-3X for xen-changelog@lists.xenproject.org; Wed, 08 May 2024 02: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=eN3onGfK8JXJ2gOtyBTj/cw+OPTFEWcysBFRYki9vi0=; b=Y7cdaKjND04e7zWfScgCOpvXAI aibZmiz3VPyIg3j4HYe0s1XTdptdrYGGG+W7aRvOR+ESMhZ6Zq8ke/N7KU6tiAbQhwBb2VT3ol9Nb idJov4OXyv0R79YleEmf7dxrzuBXSgeTIbQOECjBJSR3VGw9uK1V4n3Nn4EqLSEfGevY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Message-Id: Date: Wed, 08 May 2024 02:55:12 +0000 commit a2330b51df267e20e66bbba6c5bf08f0570ed58b Author: Andrew Cooper AuthorDate: Tue May 7 12:19:41 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 7 16:56:46 2024 +0100 x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Ever since Xen 4.14, there has been a latent bug with migration. While some toolstacks can level the features properly, they don't shink feat.max_subleaf when all features have been dropped. This is because we *still* have not completed the toolstack side work for full CPU Policy objects. As a consequence, even when properly feature levelled, VMs can't migrate "backwards" across hardware which reduces feat.max_subleaf. One such example is Ice Lake (max_subleaf=2 for INTEL_PSFD) to Cascade Lake (max_subleaf=0). Extend the max policies feat.max_subleaf to the hightest number Xen knows about, but leave the default policies matching the host. This will allow VMs with a higher feat.max_subleaf than strictly necessary to migrate in. Eventually we'll manage to teach the toolstack how to avoid creating such VMs in the first place, but there's still more work to do there. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- xen/arch/x86/cpu-policy.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 4b6d962763..99871b8e0e 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -590,6 +590,13 @@ static void __init calculate_pv_max_policy(void) unsigned int i; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -630,6 +637,10 @@ static void __init calculate_pv_def_policy(void) unsigned int i; *p = pv_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -666,6 +677,13 @@ static void __init calculate_hvm_max_policy(void) const uint32_t *mask; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? @@ -783,6 +801,10 @@ static void __init calculate_hvm_def_policy(void) const uint32_t *mask; *p = hvm_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 09 08:22:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 08:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719123.1121715 (Exim 4.92) (envelope-from ) id 1s4z2T-00028I-Sc; Thu, 09 May 2024 08:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719123.1121715; Thu, 09 May 2024 08:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4z2T-00028A-PO; Thu, 09 May 2024 08:22:05 +0000 Received: by outflank-mailman (input) for mailman id 719123; Thu, 09 May 2024 08:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4z2R-000284-MW for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 08:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s4z2R-0005A3-Fz for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 08:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s4z2R-00084h-EV for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 08:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KszX430cxJn7hRm5dGY8d8P49rwGqdcs12RDsRAfj8c=; b=nf49Sp4eRdnGFaSYYGDGqtDiT6 L5INoRDAqhWwZcLeqZ7IvkNWLV9UrcOeIvwq9C4wZyE5Yugyhld1uhfU4Hk27iRQi5ans6F2WZSAo EY4hLc7MqnTfToRVFwllkl5M+es/KvLF9hynScu5O7LyQp45VbcEAZ5fDsutLrHqEckg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] svm: Fix MISRA 8.2 violation Message-Id: Date: Thu, 09 May 2024 08:22:03 +0000 commit e8e8afee990ae74a4d2797ddae1b58a4e03912b5 Author: George Dunlap AuthorDate: Thu Apr 25 09:49:42 2024 +0100 Commit: George Dunlap CommitDate: Thu May 9 09:02:01 2024 +0100 svm: Fix MISRA 8.2 violation Misra 8.2 requires named parameters in prototypes. Use the name from the implementaiton. Fixes: 0d19d3aab0 ("svm/nestedsvm: Introduce nested capabilities bit") Reported-by: Andrew Cooper Reported-by: Nicola Vetrini Signed-off-by: George Dunlap Acked-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/hvm/nestedhvm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/hvm/nestedhvm.h b/xen/arch/x86/include/asm/hvm/nestedhvm.h index 0568acb25f..ea2c1bc328 100644 --- a/xen/arch/x86/include/asm/hvm/nestedhvm.h +++ b/xen/arch/x86/include/asm/hvm/nestedhvm.h @@ -83,7 +83,7 @@ static inline bool vvmcx_valid(const struct vcpu *v) } -void start_nested_svm(struct hvm_function_table *); -void start_nested_vmx(struct hvm_function_table *); +void start_nested_svm(struct hvm_function_table *hvm_function_table); +void start_nested_vmx(struct hvm_function_table *hvm_function_table); #endif /* _HVM_NESTEDHVM_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:22:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719325.1122010 (Exim 4.92) (envelope-from ) id 1s57T3-00074g-L1; Thu, 09 May 2024 17:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719325.1122010; Thu, 09 May 2024 17:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57T3-00074Y-IT; Thu, 09 May 2024 17:22:05 +0000 Received: by outflank-mailman (input) for mailman id 719325; Thu, 09 May 2024 17:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57T2-00074S-3p for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57T2-0006qy-0i for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57T1-0006dF-Vu for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TQs6EtasOyaDJ+s60GE+dqbRFEstDOqHmnwyzVfzipI=; b=FHARjy/PJqHcJU+/89kmDJ5jqg 6BAHvgsD8uOjewVmAUI4r0jousafpDqmYcKMKJtDSYuFBOfB6yCne0w8WEtVMFgmcNeNeDnjsm8Ux I8BJZFLr2FEfgGkLAyV+GpX4Af+S8LwmjIJcrTTqCFbYELCNByQsGPjj/N2MDgsLCYgw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: tag MISRA C Rule 8.2 as clean. Message-Id: Date: Thu, 09 May 2024 17:22:03 +0000 commit 0c79b7bc9b61fb7bfe2350308955e0ba29a5e3b9 Author: Nicola Vetrini AuthorDate: Thu May 9 14:04:07 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 automation/eclair_analysis: tag MISRA C Rule 8.2 as clean. Tag the rule as clean, as there are no more violations in the codebase since e8e8afee990a ("svm: Fix MISRA 8.2 violation"). Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index bdf94ed996..a014500a41 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:22:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:22:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719326.1122013 (Exim 4.92) (envelope-from ) id 1s57TD-00076C-MG; Thu, 09 May 2024 17:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719326.1122013; Thu, 09 May 2024 17:22:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TD-000765-Jq; Thu, 09 May 2024 17:22:15 +0000 Received: by outflank-mailman (input) for mailman id 719326; Thu, 09 May 2024 17:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TC-00075v-5w for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TC-0006rI-50 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57TC-0006e0-2m for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SzaA7VraOipAyF9YyFb+LJARQSaJXBgihSCHCVbXDAU=; b=zWco9DfIQYAGnjqKW+t76a4R6z EkAKSoZ3eMLPessdtrhLv/eIdw7cfIbGY7hg5F8gFH5pB+IC6jmUxHSQG6JL5OjF+mJz4401L0YWD P2rgvCMWHeDorFec7FWYEj20K2PR6KodaLNWjBvYBeXGxZ7uML/J0IDwlhaOuQoxHL5I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: unblock pipelines from certain repositories Message-Id: Date: Thu, 09 May 2024 17:22:14 +0000 commit 3c228e24b2f1c936e773ce83497fe46d5cb1a887 Author: Nicola Vetrini AuthorDate: Mon May 6 10:52:31 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 automation/eclair_analysis: unblock pipelines from certain repositories Repositories under people/* only execute the analyze step if manually triggered, but in order to avoid blocking the rest of the pipeline if such step is not run, allow it to fail. Reported-by: Andrew Cooper Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/analyze.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analyze.yaml index 32bf570149..02e0ea692c 100644 --- a/automation/gitlab-ci/analyze.yaml +++ b/automation/gitlab-ci/analyze.yaml @@ -31,6 +31,7 @@ when: never - if: $WTOKEN && $CI_PROJECT_PATH =~ /^xen-project\/people\/.*$/ when: manual + allow_failure: true - !reference [.eclair-analysis, rules] eclair-x86_64: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:22:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:22:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719327.1122018 (Exim 4.92) (envelope-from ) id 1s57TN-00078o-Nw; Thu, 09 May 2024 17:22:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719327.1122018; Thu, 09 May 2024 17:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TN-00078g-LJ; Thu, 09 May 2024 17:22:25 +0000 Received: by outflank-mailman (input) for mailman id 719327; Thu, 09 May 2024 17:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TM-00078W-9g for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TM-0006rX-81 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57TM-0006eY-71 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yqxLvcYMv5q494ANWpWuLKCUVlIDRohsGCnU//YJ7SA=; b=ADH96mZwrq3mP72ujrwy6lQ6S0 njyLk+doBQvPJsHd4jHabhlYM1qojXe2iqT3gIfobkPeezQH6Avf9YJsS2UVyTOU8W2YBEeJQI08l LDXbHDZgQerWwRq4jCN+lgCxu4NWs28NiXm51WgJFAPSg2olNBAofOikGJ2/5BPMVaxM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ucode: Distinguish "ucode already up to date" Message-Id: Date: Thu, 09 May 2024 17:22:24 +0000 commit 648db37a155aca6f66d4cf3bb118417a728c3579 Author: Andrew Cooper AuthorDate: Wed May 8 16:56:12 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/ucode: Distinguish "ucode already up to date" Right now, Xen returns -ENOENT for both "the provided blob isn't correct for this CPU", and "the blob isn't newer than what's loaded". This in turn causes xen-ucode to exit with an error, when "nothing to do" is more commonly a success condition. Handle EEXIST specially and exit cleanly. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- tools/misc/xen-ucode.c | 5 ++++- xen/arch/x86/cpu/microcode/core.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index c6ae6498d6..390969db3d 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -125,8 +125,11 @@ int main(int argc, char *argv[]) exit(1); } + errno = 0; ret = xc_microcode_update(xch, buf, len); - if ( ret ) + if ( ret == -1 && errno == EEXIST ) + printf("Microcode already up to date\n"); + else if ( ret ) { fprintf(stderr, "Failed to update microcode. (err: %s)\n", strerror(errno)); diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index e738a88f5c..762111838f 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -640,7 +640,7 @@ static long cf_check microcode_update_helper(void *data) "microcode: couldn't find any newer%s revision in the provided blob!\n", opt_ucode_allow_same ? " (or the same)" : ""); microcode_free_patch(patch); - ret = -ENOENT; + ret = -EEXIST; goto put; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:22:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:22:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719328.1122022 (Exim 4.92) (envelope-from ) id 1s57TX-0007BU-PX; Thu, 09 May 2024 17:22:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719328.1122022; Thu, 09 May 2024 17:22:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TX-0007BL-Mf; Thu, 09 May 2024 17:22:35 +0000 Received: by outflank-mailman (input) for mailman id 719328; Thu, 09 May 2024 17:22:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TW-0007B8-CD for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57TW-0006re-BR for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57TW-0006fL-A8 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UvIsRZ6+tQwDFsjL0MwhRnfgZGveV29Znx1wf4mlimY=; b=stVVt5+AW69UCnkoXIL+BhCusv OUU3yoxoKk/9E01/SrvmyJZuz57NXbJlxyYKIotBYFOG8eIpBvC0VYM0LlNnKbvAuPS2QyuzHbmoR WX/oBsao0bM0ciq0ZiRj4xhO5TctLRLL+bDMCEhk4a6EuqNYFiU83uJPxyfXI++i9++g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gunzip: don't leak memory on error paths Message-Id: Date: Thu, 09 May 2024 17:22:34 +0000 commit 473156eec61c162ae73778222283dcc599144030 Author: Jan Beulich AuthorDate: Mon May 6 10:08:40 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: don't leak memory on error paths While decompression errors are likely going to be fatal to Xen's boot process anyway, the latest with the goal of doing multiple decompressor runs it is likely better to avoid leaks even on error paths. All the more when this way code size actually shrinks a tiny bit. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/gzip/inflate.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 220d2ff4d9..b5b70bfb70 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -757,16 +757,14 @@ static int noinline __init inflate_fixed(void) } /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) { - free(l); - return 1; - } + i = inflate_codes(tl, td, bl, bd); /* free the decoding tables, return */ free(l); huft_free(tl); huft_free(td); - return 0; + + return !!i; } /* @@ -940,19 +938,17 @@ static int noinline __init inflate_dynamic(void) DEBG("dyn6 "); /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) { - ret = 1; - goto out; - } + ret = !!inflate_codes(tl, td, bl, bd); - DEBG("dyn7 "); + if ( !ret ) + DEBG("dyn7 "); /* free the decoding tables, return */ huft_free(tl); huft_free(td); - DEBG(">"); - ret = 0; + if ( !ret ) + DEBG(">"); out: free(ll); return ret; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:22:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719329.1122026 (Exim 4.92) (envelope-from ) id 1s57Th-0007Eo-Qv; Thu, 09 May 2024 17:22:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719329.1122026; Thu, 09 May 2024 17:22:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Th-0007Eh-O8; Thu, 09 May 2024 17:22:45 +0000 Received: by outflank-mailman (input) for mailman id 719329; Thu, 09 May 2024 17:22:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Tg-0007ET-FG for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Tg-0006rr-EU for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57Tg-0006fw-Dd for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mMPFpkk5F8GUlKp3xFVIqphyf/SrbfvKVYn8IIWG90A=; b=nW0rV8xaXc5xV19gZzifg7mFoM iogdV7bO9v/UUQjknlgM8s1z6lcFH14XtQaCXdRal+s7RWAi7k0bYDdGuFUj+ey4IDywaSG/cUAyX L8HTXkW44ywjMCLjm4XB/Qde8EqysXJLmO9nj2TutyiUxB9k8wkgqQlmGcY6PnQCQV7M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gunzip: Introduce struct gunzip_state and refactor window Message-Id: Date: Thu, 09 May 2024 17:22:44 +0000 commit 02e32883f3caa7b40908c405d7dffc92512a0a59 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:17 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Introduce struct gunzip_state and refactor window Introduce struct gunzip_state so the state can be per-instance rather than global. Allocate and free the structure in perform_gunzip(). Move the window (output) pointer into gunzip_state first, which involves plumbing the state pointer all the way down into flush_window(). Drop the 'slide' alias, and the flush_output() macro too as it hides at least one "wp = wp" assignment. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 23 +++++++++++----- xen/common/gzip/inflate.c | 69 ++++++++++++++++++++++++----------------------- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index d07c451cd8..9892564973 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -4,10 +4,12 @@ #include #include -static unsigned char *__initdata window; - #define WSIZE 0x80000000U +struct gunzip_state { + unsigned char *window; +}; + static unsigned char *__initdata inbuf; static unsigned int __initdata insize; @@ -45,7 +47,7 @@ typedef unsigned long ulg; #endif static long __initdata bytes_out; -static void flush_window(void); +static void flush_window(struct gunzip_state *s); static __init void error(const char *x) { @@ -60,7 +62,7 @@ static __init int fill_inbuf(void) #include "inflate.c" -static __init void flush_window(void) +static __init void flush_window(struct gunzip_state *s) { /* * The window is equal to the output buffer therefore only need to @@ -70,7 +72,7 @@ static __init void flush_window(void) unsigned int n; unsigned char *in, ch; - in = window; + in = s->window; for ( n = 0; n < outcnt; n++ ) { ch = *in++; @@ -97,12 +99,17 @@ __init int gzip_check(char *image, unsigned long image_len) __init int perform_gunzip(char *output, char *image, unsigned long image_len) { + struct gunzip_state *s; int rc; if ( !gzip_check(image, image_len) ) return 1; - window = (unsigned char *)output; + s = malloc(sizeof(struct gunzip_state)); + if ( !s ) + return -ENOMEM; + + s->window = (unsigned char *)output; inbuf = (unsigned char *)image; insize = image_len; inptr = 0; @@ -110,7 +117,7 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) makecrc(); - if ( gunzip() < 0 ) + if ( gunzip(s) < 0 ) { rc = -EINVAL; } @@ -119,6 +126,8 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) rc = 0; } + free(s); + return rc; } diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index b5b70bfb70..ccfb2c718c 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -119,8 +119,6 @@ static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #"; #endif /* !__XEN__ */ -#define slide window - /* * Huffman code lookup table entry--this entry is four bytes for machines * that have 16-bit pointers (e.g. PC's in the small or medium model). @@ -143,12 +141,13 @@ struct huft { static int huft_build(unsigned *, unsigned, unsigned, const ush *, const ush *, struct huft **, int *); static int huft_free(struct huft *); -static int inflate_codes(struct huft *, struct huft *, int, int); -static int inflate_stored(void); -static int inflate_fixed(void); -static int inflate_dynamic(void); -static int inflate_block(int *); -static int inflate(void); +static int inflate_codes( + struct gunzip_state *s, struct huft *tl, struct huft *td, int bl, int bd); +static int inflate_stored(struct gunzip_state *s); +static int inflate_fixed(struct gunzip_state *s); +static int inflate_dynamic(struct gunzip_state *s); +static int inflate_block(struct gunzip_state *s, int *e); +static int inflate(struct gunzip_state *s); /* * The inflate algorithm uses a sliding 32 K byte window on the uncompressed @@ -163,7 +162,6 @@ static int inflate(void); */ /* unsigned wp; current position in slide */ #define wp outcnt -#define flush_output(w) (wp=(w),flush_window()) /* Tables for deflate from PKZIP's appnote.txt. */ static const unsigned border[] = { /* Order of the bit length code lengths */ @@ -545,7 +543,7 @@ static int __init huft_free(struct huft *t) * @param bd Number of bits decoded by td[] */ static int __init inflate_codes( - struct huft *tl, struct huft *td, int bl, int bd) + struct gunzip_state *s, struct huft *tl, struct huft *td, int bl, int bd) { register unsigned e; /* table entry flag/number of extra bits */ unsigned n, d; /* length and index for copy */ @@ -578,11 +576,12 @@ static int __init inflate_codes( DUMPBITS(t->b); if (e == 16) /* then it's a literal */ { - slide[w++] = (uch)t->v.n; - Tracevv((stderr, "%c", slide[w-1])); + s->window[w++] = (uch)t->v.n; + Tracevv((stderr, "%c", s->window[w-1])); if (w == WSIZE) { - flush_output(w); + wp = w; + flush_window(s); w = 0; } } @@ -618,18 +617,19 @@ static int __init inflate_codes( n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e); if (w - d >= e) /* (this test assumes unsigned comparison) */ { - memcpy(slide + w, slide + d, e); + memcpy(s->window + w, s->window + d, e); w += e; d += e; } else /* do it slow to avoid memcpy() overlap */ do { - slide[w++] = slide[d++]; - Tracevv((stderr, "%c", slide[w-1])); + s->window[w++] = s->window[d++]; + Tracevv((stderr, "%c", s->window[w-1])); } while (--e); if (w == WSIZE) { - flush_output(w); + wp = w; + flush_window(s); w = 0; } } while (n); @@ -649,7 +649,7 @@ static int __init inflate_codes( } /* "decompress" an inflated type 0 (stored) block. */ -static int __init inflate_stored(void) +static int __init inflate_stored(struct gunzip_state *s) { unsigned n; /* number of bytes in block */ unsigned w; /* current window position */ @@ -682,10 +682,11 @@ static int __init inflate_stored(void) while (n--) { NEEDBITS(8); - slide[w++] = (uch)b; + s->window[w++] = (uch)b; if (w == WSIZE) { - flush_output(w); + wp = w; + flush_window(s); w = 0; } DUMPBITS(8); @@ -713,7 +714,7 @@ static int __init inflate_stored(void) * either replace this with a custom decoder, or at least precompute the * Huffman tables. */ -static int noinline __init inflate_fixed(void) +static int noinline __init inflate_fixed(struct gunzip_state *s) { int i; /* temporary variable */ struct huft *tl; /* literal/length code table */ @@ -757,7 +758,7 @@ static int noinline __init inflate_fixed(void) } /* decompress until an end-of-block code */ - i = inflate_codes(tl, td, bl, bd); + i = inflate_codes(s, tl, td, bl, bd); /* free the decoding tables, return */ free(l); @@ -772,7 +773,7 @@ static int noinline __init inflate_fixed(void) */ /* decompress an inflated type 2 (dynamic Huffman codes) block. */ -static int noinline __init inflate_dynamic(void) +static int noinline __init inflate_dynamic(struct gunzip_state *s) { int i; /* temporary variables */ unsigned j; @@ -938,7 +939,7 @@ static int noinline __init inflate_dynamic(void) DEBG("dyn6 "); /* decompress until an end-of-block code */ - ret = !!inflate_codes(tl, td, bl, bd); + ret = !!inflate_codes(s, tl, td, bl, bd); if ( !ret ) DEBG("dyn7 "); @@ -963,7 +964,7 @@ static int noinline __init inflate_dynamic(void) * * @param e Last block flag */ -static int __init inflate_block(int *e) +static int __init inflate_block(struct gunzip_state *s, int *e) { unsigned t; /* block type */ register ulg b; /* bit buffer */ @@ -991,11 +992,11 @@ static int __init inflate_block(int *e) /* inflate that block type */ if (t == 2) - return inflate_dynamic(); + return inflate_dynamic(s); if (t == 0) - return inflate_stored(); + return inflate_stored(s); if (t == 1) - return inflate_fixed(); + return inflate_fixed(s); DEBG(">"); @@ -1007,7 +1008,7 @@ static int __init inflate_block(int *e) } /* decompress an inflated entry */ -static int __init inflate(void) +static int __init inflate(struct gunzip_state *s) { int e; /* last block flag */ int r; /* result code */ @@ -1019,7 +1020,7 @@ static int __init inflate(void) /* decompress until the last block */ do { - r = inflate_block(&e); + r = inflate_block(s, &e); if (r) return r; } while (!e); @@ -1032,8 +1033,7 @@ static int __init inflate(void) inptr--; } - /* flush out slide */ - flush_output(wp); + flush_window(s); /* return success */ return 0; @@ -1101,7 +1101,7 @@ static void __init makecrc(void) /* * Do the uncompression! */ -static int __init gunzip(void) +static int __init gunzip(struct gunzip_state *s) { uch flags; unsigned char magic[2]; /* magic header */ @@ -1165,7 +1165,8 @@ static int __init gunzip(void) } /* Decompress */ - if ((res = inflate())) { + if ( (res = inflate(s)) ) + { switch (res) { case 0: break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:22:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:22:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719330.1122029 (Exim 4.92) (envelope-from ) id 1s57Tr-0007HU-Sr; Thu, 09 May 2024 17:22:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719330.1122029; Thu, 09 May 2024 17:22:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Tr-0007HN-Pz; Thu, 09 May 2024 17:22:55 +0000 Received: by outflank-mailman (input) for mailman id 719330; Thu, 09 May 2024 17:22:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Tq-0007HB-IH for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Tq-0006s3-HT for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57Tq-0006gn-Ga for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:22: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=8xQnbKByk9bS+FCVQmQEBtkPyElCQBP0/Sz09KUSwwk=; b=RxbauV3SJJwPzKcOWdgPnHhJsr xpmiA0ycvCz+zu3eFdgiP9JH123XFqAbdZuci5ILHku35THIO9Uzkg1dSvvv60QLxPfwKPZ/5jVOk p6L0gEZrNahp3iOgbEZ37lfrF+YoOQwjE8Rswbe/tRG89KuR62ZveF26PgZtuevnAqJo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gunzip: Move window position into gunzip_state Message-Id: Date: Thu, 09 May 2024 17:22:54 +0000 commit 461eacc76b539f0631828c44e4c2ed38fbe3fe91 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:18 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move window position into gunzip_state Move the window position, outcnt/wp, into struct gunzip_state. This removes 'outcnt' and it's alias 'wp'. Consistently use the term "position" which is better than "pointer" given that this is is a plain integer field. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 12 ++++++------ xen/common/gzip/inflate.c | 18 ++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index 9892564973..f2c3a5b6cd 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -8,6 +8,9 @@ struct gunzip_state { unsigned char *window; + + /* window position */ + unsigned int wp; }; static unsigned char *__initdata inbuf; @@ -16,9 +19,6 @@ static unsigned int __initdata insize; /* Index of next byte to be processed in inbuf: */ static unsigned int __initdata inptr; -/* Bytes in output buffer: */ -static unsigned int __initdata outcnt; - #define malloc(a) xmalloc_bytes(a) #define free(a) xfree(a) #define memzero(s, n) memset((s), 0, (n)) @@ -73,15 +73,15 @@ static __init void flush_window(struct gunzip_state *s) unsigned char *in, ch; in = s->window; - for ( n = 0; n < outcnt; n++ ) + for ( n = 0; n < s->wp; n++ ) { ch = *in++; c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); } crc = c; - bytes_out += (unsigned long)outcnt; - outcnt = 0; + bytes_out += s->wp; + s->wp = 0; } __init int gzip_check(char *image, unsigned long image_len) diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index ccfb2c718c..651056ef24 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -160,8 +160,6 @@ static int inflate(struct gunzip_state *s); * "uch *slide;" and then malloc'ed in the latter case. The definition * must be in unzip.h, included above. */ -/* unsigned wp; current position in slide */ -#define wp outcnt /* Tables for deflate from PKZIP's appnote.txt. */ static const unsigned border[] = { /* Order of the bit length code lengths */ @@ -557,7 +555,7 @@ static int __init inflate_codes( /* make local copies of globals */ b = bb; /* initialize bit buffer */ k = bk; - w = wp; /* initialize window position */ + w = s->wp; /* initialize window position */ /* inflate the coded data */ ml = mask_bits[bl]; /* precompute masks for speed */ @@ -580,7 +578,7 @@ static int __init inflate_codes( Tracevv((stderr, "%c", s->window[w-1])); if (w == WSIZE) { - wp = w; + s->wp = w; flush_window(s); w = 0; } @@ -628,7 +626,7 @@ static int __init inflate_codes( } while (--e); if (w == WSIZE) { - wp = w; + s->wp = w; flush_window(s); w = 0; } @@ -637,7 +635,7 @@ static int __init inflate_codes( } /* restore the globals from the locals */ - wp = w; /* restore global window pointer */ + s->wp = w; /* restore global window position */ bb = b; /* restore global bit buffer */ bk = k; @@ -661,7 +659,7 @@ static int __init inflate_stored(struct gunzip_state *s) /* make local copies of globals */ b = bb; /* initialize bit buffer */ k = bk; - w = wp; /* initialize window position */ + w = s->wp; /* initialize window position */ /* go to byte boundary */ @@ -685,7 +683,7 @@ static int __init inflate_stored(struct gunzip_state *s) s->window[w++] = (uch)b; if (w == WSIZE) { - wp = w; + s->wp = w; flush_window(s); w = 0; } @@ -693,7 +691,7 @@ static int __init inflate_stored(struct gunzip_state *s) } /* restore the globals from the locals */ - wp = w; /* restore global window pointer */ + s->wp = w; /* restore global window position */ bb = b; /* restore global bit buffer */ bk = k; @@ -1014,7 +1012,7 @@ static int __init inflate(struct gunzip_state *s) int r; /* result code */ /* initialize window, bit buffer */ - wp = 0; + s->wp = 0; bk = 0; bb = 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:23:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:23:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719331.1122034 (Exim 4.92) (envelope-from ) id 1s57U1-0007Kp-0N; Thu, 09 May 2024 17:23:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719331.1122034; Thu, 09 May 2024 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 1s57U0-0007Kg-Tc; Thu, 09 May 2024 17:23:04 +0000 Received: by outflank-mailman (input) for mailman id 719331; Thu, 09 May 2024 17:23:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57U0-0007Ka-MA for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57U0-0006sk-Kz for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57U0-0006iJ-JY for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tH6Jb5YQl/ldzKEReRCL4+oO7+PT3qu6nu3Oup9HndQ=; b=sHFLRL0umlmPfPqU7IPSk/Jz6U pdmzxXzLxgURr2kdju2FhDtcNq+ue3TBAPm734/SFYh2Xg9Tf3LS4xODclpLEWJWaZ3CtUO89Xa8S PbYKRB9UG3lYz2AqrJls/r8tULbbCr1jfw9lLlIdosIPSY4DBiry65HM+lXMI0NPjUXI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gunzip: Move input buffer handling into gunzip_state Message-Id: Date: Thu, 09 May 2024 17:23:04 +0000 commit fd273a5690f4ca4d19b79c42562e8b53c3197327 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:19 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move input buffer handling into gunzip_state Move the input buffer handling, buffer pointer(inbuf), size(insize), and index(inptr), into gunzip_state. Adjust functions and macros that consumed the input buffer to accept a struct gunzip_state reference. Convert get_byte() into a real function and subsume fill_inbuf(). Fix the failure path to work correctly when error() stops being a plain panic(). Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 30 ++++++++------- xen/common/gzip/inflate.c | 97 +++++++++++++++++++++++++---------------------- 2 files changed, 67 insertions(+), 60 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index f2c3a5b6cd..a04ddd7445 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -11,13 +11,12 @@ struct gunzip_state { /* window position */ unsigned int wp; -}; - -static unsigned char *__initdata inbuf; -static unsigned int __initdata insize; -/* Index of next byte to be processed in inbuf: */ -static unsigned int __initdata inptr; + unsigned char *inbuf; + unsigned int insize; + /* Index of next byte to be processed in inbuf: */ + unsigned int inptr; +}; #define malloc(a) xmalloc_bytes(a) #define free(a) xfree(a) @@ -27,8 +26,6 @@ typedef unsigned char uch; typedef unsigned short ush; typedef unsigned long ulg; -#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf()) - /* Diagnostic functions */ #ifdef DEBUG # define Assert(cond, msg) do { if (!(cond)) error(msg); } while (0) @@ -54,10 +51,15 @@ static __init void error(const char *x) panic("%s\n", x); } -static __init int fill_inbuf(void) +static __init int get_byte(struct gunzip_state *s) { - error("ran out of input data"); - return 0; + if ( s->inptr >= s->insize ) + { + error("ran out of input data"); + return -1; + } + + return s->inbuf[s->inptr++]; } #include "inflate.c" @@ -110,9 +112,9 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) return -ENOMEM; s->window = (unsigned char *)output; - inbuf = (unsigned char *)image; - insize = image_len; - inptr = 0; + s->inbuf = (unsigned char *)image; + s->insize = image_len; + s->inptr = 0; bytes_out = 0; makecrc(); diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 651056ef24..62179e6ed6 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -220,8 +220,8 @@ static const ush mask_bits[] = { 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff }; -#define NEXTBYTE() ({ int v = get_byte(); if (v < 0) goto underrun; (uch)v; }) -#define NEEDBITS(n) {while(k<(n)){b|=((ulg)NEXTBYTE())<>=(n);k-=(n);} /* @@ -562,14 +562,14 @@ static int __init inflate_codes( md = mask_bits[bd]; for (;;) /* do until end of block */ { - NEEDBITS((unsigned)bl); + NEEDBITS(s, (unsigned)bl); if ((e = (t = tl + ((unsigned)b & ml))->e) > 16) do { if (e == 99) return 1; DUMPBITS(t->b); e -= 16; - NEEDBITS(e); + NEEDBITS(s, e); } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); DUMPBITS(t->b); if (e == 16) /* then it's a literal */ @@ -590,22 +590,22 @@ static int __init inflate_codes( break; /* get length of block to copy */ - NEEDBITS(e); + NEEDBITS(s, e); n = t->v.n + ((unsigned)b & mask_bits[e]); DUMPBITS(e); /* decode distance of block to copy */ - NEEDBITS((unsigned)bd); + NEEDBITS(s, (unsigned)bd); if ((e = (t = td + ((unsigned)b & md))->e) > 16) do { if (e == 99) return 1; DUMPBITS(t->b); e -= 16; - NEEDBITS(e); + NEEDBITS(s, e); } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); DUMPBITS(t->b); - NEEDBITS(e); + NEEDBITS(s, e); d = w - t->v.n - ((unsigned)b & mask_bits[e]); DUMPBITS(e); Tracevv((stderr,"\\[%d,%d]", w-d, n)); @@ -668,10 +668,10 @@ static int __init inflate_stored(struct gunzip_state *s) /* get the length and its complement */ - NEEDBITS(16); + NEEDBITS(s, 16); n = ((unsigned)b & 0xffff); DUMPBITS(16); - NEEDBITS(16); + NEEDBITS(s, 16); if (n != (unsigned)((~b) & 0xffff)) return 1; /* error in compressed data */ DUMPBITS(16); @@ -679,7 +679,7 @@ static int __init inflate_stored(struct gunzip_state *s) /* read and output the compressed data */ while (n--) { - NEEDBITS(8); + NEEDBITS(s, 8); s->window[w++] = (uch)b; if (w == WSIZE) { @@ -802,13 +802,13 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) k = bk; /* read in table lengths */ - NEEDBITS(5); + NEEDBITS(s, 5); nl = 257 + ((unsigned)b & 0x1f); /* number of literal/length codes */ DUMPBITS(5); - NEEDBITS(5); + NEEDBITS(s, 5); nd = 1 + ((unsigned)b & 0x1f); /* number of distance codes */ DUMPBITS(5); - NEEDBITS(4); + NEEDBITS(s, 4); nb = 4 + ((unsigned)b & 0xf); /* number of bit length codes */ DUMPBITS(4); if (nl > 286 || nd > 30) @@ -822,7 +822,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) /* read in bit-length-code lengths */ for (j = 0; j < nb; j++) { - NEEDBITS(3); + NEEDBITS(s, 3); ll[border[j]] = (unsigned)b & 7; DUMPBITS(3); } @@ -849,7 +849,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) i = l = 0; while ((unsigned)i < n) { - NEEDBITS((unsigned)bl); + NEEDBITS(s, (unsigned)bl); j = (td = tl + ((unsigned)b & m))->b; DUMPBITS(j); j = td->v.n; @@ -857,7 +857,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) ll[i++] = l = j; /* save last length in l */ else if (j == 16) /* repeat last length 3 to 6 times */ { - NEEDBITS(2); + NEEDBITS(s, 2); j = 3 + ((unsigned)b & 3); DUMPBITS(2); if ((unsigned)i + j > n) { @@ -869,7 +869,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) } else if (j == 17) /* 3 to 10 zero length codes */ { - NEEDBITS(3); + NEEDBITS(s, 3); j = 3 + ((unsigned)b & 7); DUMPBITS(3); if ((unsigned)i + j > n) { @@ -882,7 +882,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) } else /* j == 18: 11 to 138 zero length codes */ { - NEEDBITS(7); + NEEDBITS(s, 7); j = 11 + ((unsigned)b & 0x7f); DUMPBITS(7); if ((unsigned)i + j > n) { @@ -975,12 +975,12 @@ static int __init inflate_block(struct gunzip_state *s, int *e) k = bk; /* read in last block bit */ - NEEDBITS(1); + NEEDBITS(s, 1); *e = (int)b & 1; DUMPBITS(1); /* read in block type */ - NEEDBITS(2); + NEEDBITS(s, 2); t = (unsigned)b & 3; DUMPBITS(2); @@ -1028,7 +1028,7 @@ static int __init inflate(struct gunzip_state *s) */ while (bk >= 8) { bk -= 8; - inptr--; + s->inptr--; } flush_window(s); @@ -1108,9 +1108,9 @@ static int __init gunzip(struct gunzip_state *s) ulg orig_len = 0; /* original uncompressed length */ int res; - magic[0] = NEXTBYTE(); - magic[1] = NEXTBYTE(); - method = NEXTBYTE(); + magic[0] = NEXTBYTE(s); + magic[1] = NEXTBYTE(s); + method = NEXTBYTE(s); if (magic[0] != 037 || /* octal-ok */ ((magic[1] != 0213) && (magic[1] != 0236))) { /* octal-ok */ @@ -1124,7 +1124,7 @@ static int __init gunzip(struct gunzip_state *s) return -1; } - flags = (uch)get_byte(); + flags = (uch)get_byte(s); if ((flags & ENCRYPTED) != 0) { error("Input is encrypted"); return -1; @@ -1137,29 +1137,34 @@ static int __init gunzip(struct gunzip_state *s) error("Input has invalid flags"); return -1; } - NEXTBYTE(); /* Get timestamp */ - NEXTBYTE(); - NEXTBYTE(); - NEXTBYTE(); + NEXTBYTE(s); /* Get timestamp */ + NEXTBYTE(s); + NEXTBYTE(s); + NEXTBYTE(s); - (void)NEXTBYTE(); /* Ignore extra flags for the moment */ - (void)NEXTBYTE(); /* Ignore OS type for the moment */ + NEXTBYTE(s); /* Ignore extra flags for the moment */ + NEXTBYTE(s); /* Ignore OS type for the moment */ if ((flags & EXTRA_FIELD) != 0) { - unsigned len = (unsigned)NEXTBYTE(); - len |= ((unsigned)NEXTBYTE())<<8; - while (len--) (void)NEXTBYTE(); + unsigned int len = NEXTBYTE(s); + + len |= (unsigned int)NEXTBYTE(s) << 8; + + while ( len-- ) + NEXTBYTE(s); } /* Get original file name if it was truncated */ if ((flags & ORIG_NAME) != 0) { /* Discard the old name */ - while (NEXTBYTE() != 0) /* null */ ; + while ( NEXTBYTE(s) != 0) /* null */ + ; } /* Discard file comment if any */ if ((flags & COMMENT) != 0) { - while (NEXTBYTE() != 0) /* null */ ; + while ( NEXTBYTE(s) != 0 ) /* null */ + ; } /* Decompress */ @@ -1190,15 +1195,15 @@ static int __init gunzip(struct gunzip_state *s) /* crc32 (see algorithm.doc) * uncompressed input size modulo 2^32 */ - orig_crc = (ulg) NEXTBYTE(); - orig_crc |= (ulg) NEXTBYTE() << 8; - orig_crc |= (ulg) NEXTBYTE() << 16; - orig_crc |= (ulg) NEXTBYTE() << 24; - - orig_len = (ulg) NEXTBYTE(); - orig_len |= (ulg) NEXTBYTE() << 8; - orig_len |= (ulg) NEXTBYTE() << 16; - orig_len |= (ulg) NEXTBYTE() << 24; + orig_crc = (ulg) NEXTBYTE(s); + orig_crc |= (ulg) NEXTBYTE(s) << 8; + orig_crc |= (ulg) NEXTBYTE(s) << 16; + orig_crc |= (ulg) NEXTBYTE(s) << 24; + + orig_len = (ulg) NEXTBYTE(s); + orig_len |= (ulg) NEXTBYTE(s) << 8; + orig_len |= (ulg) NEXTBYTE(s) << 16; + orig_len |= (ulg) NEXTBYTE(s) << 24; /* Validate decompression */ if (orig_crc != CRC_VALUE) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:23:16 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:23:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719332.1122037 (Exim 4.92) (envelope-from ) id 1s57UC-0007NI-1P; Thu, 09 May 2024 17:23:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719332.1122037; Thu, 09 May 2024 17:23:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UB-0007NB-VD; Thu, 09 May 2024 17:23:15 +0000 Received: by outflank-mailman (input) for mailman id 719332; Thu, 09 May 2024 17:23:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UA-0007N2-Oj for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UA-0006sr-Nv for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57UA-0006jB-N4 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cEumIhST+jwora6elZ+lw3W0yU3fBtR6NEOYRZ+EBPw=; b=nM+UZMHbU8qslcLsO2W706aVYO ciL5BENqV0JJsAw/WIXYBIqwKKqzVcVXSYDd6mXqZ1fL8WYA1nbXKucLCEHQlUFXJoMdF8GV/EZTV reLjaXsOGAjDqrgl4x1nTRenQ5VzygI98V6LnuosZoXqkOlqyr46J1kZ/gdLvcxK4qr4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gunzip: Move output count into gunzip_state Message-Id: Date: Thu, 09 May 2024 17:23:14 +0000 commit d386a383dd6fe937cbd05ea9502f5e6059ad3036 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:20 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move output count into gunzip_state Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 7 ++++--- xen/common/gzip/inflate.c | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index a04ddd7445..8770430312 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -16,6 +16,8 @@ struct gunzip_state { unsigned int insize; /* Index of next byte to be processed in inbuf: */ unsigned int inptr; + + unsigned long bytes_out; }; #define malloc(a) xmalloc_bytes(a) @@ -43,7 +45,6 @@ typedef unsigned long ulg; # define Tracecv(c, x) #endif -static long __initdata bytes_out; static void flush_window(struct gunzip_state *s); static __init void error(const char *x) @@ -82,7 +83,7 @@ static __init void flush_window(struct gunzip_state *s) } crc = c; - bytes_out += s->wp; + s->bytes_out += s->wp; s->wp = 0; } @@ -115,7 +116,7 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) s->inbuf = (unsigned char *)image; s->insize = image_len; s->inptr = 0; - bytes_out = 0; + s->bytes_out = 0; makecrc(); diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 62179e6ed6..2d53391e74 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -1210,7 +1210,9 @@ static int __init gunzip(struct gunzip_state *s) error("crc error"); return -1; } - if (orig_len != bytes_out) { + + if ( orig_len != s->bytes_out ) + { error("length error"); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:23:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:23:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719333.1122043 (Exim 4.92) (envelope-from ) id 1s57UM-0007QP-3Y; Thu, 09 May 2024 17:23:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719333.1122043; Thu, 09 May 2024 17:23:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UM-0007QH-0P; Thu, 09 May 2024 17:23:26 +0000 Received: by outflank-mailman (input) for mailman id 719333; Thu, 09 May 2024 17:23:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UK-0007Q4-Rd for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UK-0006sy-Qr for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57UK-0006kI-Q0 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=N8+MWdVybIZ2pQlLwD+wHQwnXglV4d84GUd51XhJWr8=; b=aC69g+Lic9aCo+yzINFWJeoB5E +XuwpX/kf5q7+Al/wzYVicvrw8YKDkP2aiYeRNFDJeyYs6x0eIOLVJuq0Nn2PnaeSPxqafpcp6wMn O4tpLDMFDYQpXz9R6UVZVlfBSEDYKukJ1+O8QBS/sUh84EjelNQ67kuWXnuQkOZxtrhQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gunzip: Move bitbuffer into gunzip_state Message-Id: Date: Thu, 09 May 2024 17:23:24 +0000 commit 7a4483358f6171c4fab3ef5a56161eb90f6668f4 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:21 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move bitbuffer into gunzip_state Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 3 +++ xen/common/gzip/inflate.c | 44 +++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index 8770430312..134144a184 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -18,6 +18,9 @@ struct gunzip_state { unsigned int inptr; unsigned long bytes_out; + + unsigned long bb; /* bit buffer */ + unsigned int bk; /* bits in bit buffer */ }; #define malloc(a) xmalloc_bytes(a) diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 2d53391e74..7487616442 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -211,9 +211,6 @@ static const ush cpdext[] = { /* Extra bits for distance codes */ * the stream. */ -static ulg __initdata bb; /* bit buffer */ -static unsigned __initdata bk; /* bits in bit buffer */ - static const ush mask_bits[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, @@ -553,8 +550,8 @@ static int __init inflate_codes( /* make local copies of globals */ - b = bb; /* initialize bit buffer */ - k = bk; + b = s->bb; /* initialize bit buffer */ + k = s->bk; w = s->wp; /* initialize window position */ /* inflate the coded data */ @@ -636,8 +633,8 @@ static int __init inflate_codes( /* restore the globals from the locals */ s->wp = w; /* restore global window position */ - bb = b; /* restore global bit buffer */ - bk = k; + s->bb = b; /* restore global bit buffer */ + s->bk = k; /* done */ return 0; @@ -657,8 +654,8 @@ static int __init inflate_stored(struct gunzip_state *s) DEBG("bb; /* initialize bit buffer */ + k = s->bk; w = s->wp; /* initialize window position */ @@ -692,8 +689,8 @@ static int __init inflate_stored(struct gunzip_state *s) /* restore the globals from the locals */ s->wp = w; /* restore global window position */ - bb = b; /* restore global bit buffer */ - bk = k; + s->bb = b; /* restore global bit buffer */ + s->bk = k; DEBG(">"); return 0; @@ -798,8 +795,8 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) return 1; /* make local bit buffer */ - b = bb; - k = bk; + b = s->bb; + k = s->bk; /* read in table lengths */ NEEDBITS(s, 5); @@ -903,8 +900,8 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) DEBG("dyn5 "); /* restore the global bit buffer */ - bb = b; - bk = k; + s->bb = b; + s->bk = k; DEBG("dyn5a "); @@ -971,8 +968,8 @@ static int __init inflate_block(struct gunzip_state *s, int *e) DEBG("bb; + k = s->bk; /* read in last block bit */ NEEDBITS(s, 1); @@ -985,8 +982,8 @@ static int __init inflate_block(struct gunzip_state *s, int *e) DUMPBITS(2); /* restore the global bit buffer */ - bb = b; - bk = k; + s->bb = b; + s->bk = k; /* inflate that block type */ if (t == 2) @@ -1013,8 +1010,8 @@ static int __init inflate(struct gunzip_state *s) /* initialize window, bit buffer */ s->wp = 0; - bk = 0; - bb = 0; + s->bk = 0; + s->bb = 0; /* decompress until the last block */ do { @@ -1026,8 +1023,9 @@ static int __init inflate(struct gunzip_state *s) /* Undo too much lookahead. The next read will be byte aligned so we * can discard unused bits in the last meaningful byte. */ - while (bk >= 8) { - bk -= 8; + while ( s->bk >= 8 ) + { + s->bk -= 8; s->inptr--; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:23:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:23:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719334.1122045 (Exim 4.92) (envelope-from ) id 1s57UW-0007TD-4J; Thu, 09 May 2024 17:23:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719334.1122045; Thu, 09 May 2024 17:23:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UW-0007T6-1r; Thu, 09 May 2024 17:23:36 +0000 Received: by outflank-mailman (input) for mailman id 719334; Thu, 09 May 2024 17:23:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UU-0007Sy-Ub for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57UU-0006t9-Tt for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57UU-0006kl-Sz for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wwIryGEyBuaUgGfsj8DqHMA1ecDQh+SxYWDiNrFEclc=; b=zPMOQhb2zVVR9margzKf3Ri7s6 co0iNRdmoJH8mxjeLUwiYr9KfgR9PzlOwok+mmksP7DM7QpafVTzs8dj/DzA3AfhAZe6GFOl4z8PI e3/F77KhZLzG5vX5qkAQFngjE2Lg6jw4W5Ls6lWr4/crmhGnC25XHmVfc4s6oB0X11WA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/gunzip: Move crc state into gunzip_state Message-Id: Date: Thu, 09 May 2024 17:23:34 +0000 commit 1c6112b8f5c5d6f2c5ff1c84887cd9241c891732 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:22 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move crc state into gunzip_state Move the crc and its state into struct gunzip_state. In the process, expand the only use of CRC_VALUE as it is hides what is being compared. Furthermore, all variables here should be uint32_t rather than unsigned long, which halves the storage space required. Filter the typechanges through the logic. Adjust the logic to hold crc in a positive form, and negate it for update in flush_window(). This is the more normal way to write CRC algorithms, and avoids weird-to-follow logic in gunzip(). Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 11 +++++++---- xen/common/gzip/inflate.c | 16 ++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index 134144a184..89f45d4050 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -21,6 +21,9 @@ struct gunzip_state { unsigned long bb; /* bit buffer */ unsigned int bk; /* bits in bit buffer */ + + uint32_t crc_32_tab[256]; + uint32_t crc; }; #define malloc(a) xmalloc_bytes(a) @@ -74,7 +77,7 @@ static __init void flush_window(struct gunzip_state *s) * The window is equal to the output buffer therefore only need to * compute the crc. */ - unsigned long c = crc; + uint32_t c = ~s->crc; unsigned int n; unsigned char *in, ch; @@ -82,9 +85,9 @@ static __init void flush_window(struct gunzip_state *s) for ( n = 0; n < s->wp; n++ ) { ch = *in++; - c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); + c = s->crc_32_tab[(c ^ ch) & 0xff] ^ (c >> 8); } - crc = c; + s->crc = ~c; s->bytes_out += s->wp; s->wp = 0; @@ -121,7 +124,7 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) s->inptr = 0; s->bytes_out = 0; - makecrc(); + makecrc(s); if ( gunzip(s) < 0 ) { diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 7487616442..b9a2d7a23a 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -1041,16 +1041,12 @@ static int __init inflate(struct gunzip_state *s) * **********************************************************************/ -static ulg __initdata crc_32_tab[256]; -static ulg __initdata crc; /* initialized in makecrc() so it'll reside in bss */ -#define CRC_VALUE (crc ^ 0xffffffffUL) - /* * Code to compute the CRC-32 table. Borrowed from * gzip-1.0.3/makecrc.c. */ -static void __init makecrc(void) +static void __init makecrc(struct gunzip_state *s) { /* Not copyrighted 1990 Mark Adler */ @@ -1067,7 +1063,7 @@ static void __init makecrc(void) for (i = 0; i < sizeof(p)/sizeof(int); i++) e |= 1L << (31 - p[i]); - crc_32_tab[0] = 0; + s->crc_32_tab[0] = 0; for (i = 1; i < 256; i++) { @@ -1078,11 +1074,10 @@ static void __init makecrc(void) if (k & 1) c ^= e; } - crc_32_tab[i] = c; + s->crc_32_tab[i] = c; } - /* this is initialized here so this code could reside in ROM */ - crc = (ulg)0xffffffffUL; /* shift register contents */ + s->crc = 0; } /* gzip flag byte */ @@ -1204,7 +1199,8 @@ static int __init gunzip(struct gunzip_state *s) orig_len |= (ulg) NEXTBYTE(s) << 24; /* Validate decompression */ - if (orig_crc != CRC_VALUE) { + if ( orig_crc != s->crc ) + { error("crc error"); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:23:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:23:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719335.1122050 (Exim 4.92) (envelope-from ) id 1s57Ug-0007dd-6F; Thu, 09 May 2024 17:23:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719335.1122050; Thu, 09 May 2024 17:23:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Ug-0007dE-3H; Thu, 09 May 2024 17:23:46 +0000 Received: by outflank-mailman (input) for mailman id 719335; Thu, 09 May 2024 17:23:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Uf-0007Yd-1R for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Uf-0006tJ-0a for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57Ue-0006lO-W1 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tgAW5qSpkyJTzoXnPveWAQrNq6TPKHDL1vPJaBytsUc=; b=BtldWgJBQYvvII02TukxUvLQU3 kefyYZtmZdXnS0lFRgEy6hK1vujRgEteR79O1Q/c7iOBXP2itnDRGCXoN9X1f/V18pGFWlB1t2yOm ID+9U6jtcusA4s2cy0zPhrYUTyeukpAec4/dbSjibdY9nPcFHgEaqfuoju8IybV+irto=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/hvmloader: Move various helpers to being static inlines Message-Id: Date: Thu, 09 May 2024 17:23:44 +0000 commit 754a29cacf8eb3bbfeeff00a46b2b9dec512936f Author: Andrew Cooper AuthorDate: Wed Aug 24 11:08:28 2022 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 tools/hvmloader: Move various helpers to being static inlines The IO port, MSR, IO-APIC and LAPIC accessors compile typically to single or pairs of instructions, which is less overhead than even the stack manipulation to call the helpers. Move the implementations from util.c to being static inlines in util.h In addition, turn ioapic_base_address into a constant as it is never modified from 0xfec00000 (substantially shrinks the IO-APIC logic), and make use of the "A" constraint for WRMSR/RDMSR like we already do for RDTSC. Bloat-o-meter reports a net: add/remove: 0/13 grow/shrink: 0/18 up/down: 0/-790 (-790) No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/firmware/hvmloader/config.h | 1 - tools/firmware/hvmloader/hvmloader.c | 1 - tools/firmware/hvmloader/mp_tables.c | 2 +- tools/firmware/hvmloader/util.c | 78 +------------------------ tools/firmware/hvmloader/util.h | 110 +++++++++++++++++++++++++++++++---- 5 files changed, 100 insertions(+), 92 deletions(-) diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index c82adf6dc5..cd716bf392 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -44,7 +44,6 @@ extern struct bios_config ovmf_config; #define PAGE_SHIFT 12 #define PAGE_SIZE (1ul << PAGE_SHIFT) -extern uint32_t ioapic_base_address; extern uint8_t ioapic_version; #define IOAPIC_ID 0x01 diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index c58841e5b5..f8af88fabf 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -113,7 +113,6 @@ asm ( unsigned long scratch_start = SCRATCH_PHYSICAL_ADDRESS; -uint32_t ioapic_base_address = 0xfec00000; uint8_t ioapic_version; bool acpi_enabled; diff --git a/tools/firmware/hvmloader/mp_tables.c b/tools/firmware/hvmloader/mp_tables.c index d207ecbf00..77d3010406 100644 --- a/tools/firmware/hvmloader/mp_tables.c +++ b/tools/firmware/hvmloader/mp_tables.c @@ -229,7 +229,7 @@ static void fill_mp_ioapic_entry(struct mp_ioapic_entry *mpie) mpie->ioapic_id = IOAPIC_ID; mpie->ioapic_version = ioapic_version; mpie->ioapic_flags = 1; /* enabled */ - mpie->ioapic_addr = ioapic_base_address; + mpie->ioapic_addr = IOAPIC_BASE_ADDRESS; } diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index e82047d993..c34f077b38 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -42,60 +42,6 @@ bool check_overlap(uint64_t start, uint64_t size, (start < reserved_start + reserved_size); } -void wrmsr(uint32_t idx, uint64_t v) -{ - asm volatile ( - "wrmsr" - : : "c" (idx), "a" ((uint32_t)v), "d" ((uint32_t)(v>>32)) ); -} - -uint64_t rdmsr(uint32_t idx) -{ - uint32_t lo, hi; - - asm volatile ( - "rdmsr" - : "=a" (lo), "=d" (hi) : "c" (idx) ); - - return (lo | ((uint64_t)hi << 32)); -} - -void outb(uint16_t addr, uint8_t val) -{ - asm volatile ( "outb %%al, %%dx" : : "d" (addr), "a" (val) ); -} - -void outw(uint16_t addr, uint16_t val) -{ - asm volatile ( "outw %%ax, %%dx" : : "d" (addr), "a" (val) ); -} - -void outl(uint16_t addr, uint32_t val) -{ - asm volatile ( "outl %%eax, %%dx" : : "d" (addr), "a" (val) ); -} - -uint8_t inb(uint16_t addr) -{ - uint8_t val; - asm volatile ( "inb %%dx,%%al" : "=a" (val) : "d" (addr) ); - return val; -} - -uint16_t inw(uint16_t addr) -{ - uint16_t val; - asm volatile ( "inw %%dx,%%ax" : "=a" (val) : "d" (addr) ); - return val; -} - -uint32_t inl(uint16_t addr) -{ - uint32_t val; - asm volatile ( "inl %%dx,%%eax" : "=a" (val) : "d" (addr) ); - return val; -} - uint8_t cmos_inb(uint8_t idx) { outb(0x70, idx); @@ -493,28 +439,6 @@ void *scratch_alloc(uint32_t size, uint32_t align) return (void *)(unsigned long)s; } -uint32_t ioapic_read(uint32_t reg) -{ - *(volatile uint32_t *)(ioapic_base_address + 0x00) = reg; - return *(volatile uint32_t *)(ioapic_base_address + 0x10); -} - -void ioapic_write(uint32_t reg, uint32_t val) -{ - *(volatile uint32_t *)(ioapic_base_address + 0x00) = reg; - *(volatile uint32_t *)(ioapic_base_address + 0x10) = val; -} - -uint32_t lapic_read(uint32_t reg) -{ - return *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg); -} - -void lapic_write(uint32_t reg, uint32_t val) -{ - *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg) = val; -} - #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3)) @@ -945,7 +869,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, config->lapic_base_address = LAPIC_BASE_ADDRESS; config->lapic_id = acpi_lapic_id; - config->ioapic_base_address = ioapic_base_address; + config->ioapic_base_address = IOAPIC_BASE_ADDRESS; config->ioapic_id = IOAPIC_ID; config->pci_isa_irq_mask = PCI_ISA_IRQ_MASK; diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 14078bde1e..deb823a892 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -7,6 +7,7 @@ #include #include #include +#include "config.h" #include "e820.h" #include @@ -54,28 +55,113 @@ static inline int test_and_clear_bit(int nr, volatile void *addr) } /* MSR access */ -void wrmsr(uint32_t idx, uint64_t v); -uint64_t rdmsr(uint32_t idx); +static inline void wrmsr(uint32_t idx, uint64_t v) +{ + asm volatile ( "wrmsr" :: "c" (idx), "A" (v) ); +} + +static inline uint64_t rdmsr(uint32_t idx) +{ + uint64_t res; + + asm volatile ( "rdmsr" : "=A" (res) : "c" (idx) ); + + return res; +} /* I/O output */ -void outb(uint16_t addr, uint8_t val); -void outw(uint16_t addr, uint16_t val); -void outl(uint16_t addr, uint32_t val); +static inline void outb(uint16_t port, uint8_t val) +{ + asm volatile ( "outb %[val], %[port]" + : + : [port] "Nd" (port), + [val] "a" (val) + : "memory" ); +} + +static inline void outw(uint16_t port, uint16_t val) +{ + asm volatile ( "outw %[val], %[port]" + : + : [port] "Nd" (port), + [val] "a" (val) + : "memory" ); +} + +static inline void outl(uint16_t port, uint32_t val) +{ + asm volatile ( "outl %[val], %[port]" + : + : [port] "Nd" (port), + [val] "a" (val) + : "memory" ); +} /* I/O input */ -uint8_t inb(uint16_t addr); -uint16_t inw(uint16_t addr); -uint32_t inl(uint16_t addr); +static inline uint8_t inb(uint16_t port) +{ + uint8_t val; + + asm volatile ( "inb %[port], %[val]" + : [val] "=a" (val) + : [port] "Nd" (port) + : "memory" ); + + return val; +} + +static inline uint16_t inw(uint16_t port) +{ + uint16_t val; + + asm volatile ( "inw %[port], %[val]" + : [val] "=a" (val) + : [port] "Nd" (port) + : "memory" ); + + return val; +} + +static inline uint32_t inl(uint16_t port) +{ + uint32_t val; + + asm volatile ( "inl %[port], %[val]" + : [val] "=a" (val) + : [port] "Nd" (port) + : "memory" ); + + return val; +} /* CMOS access */ uint8_t cmos_inb(uint8_t idx); void cmos_outb(uint8_t idx, uint8_t val); /* APIC access */ -uint32_t ioapic_read(uint32_t reg); -void ioapic_write(uint32_t reg, uint32_t val); -uint32_t lapic_read(uint32_t reg); -void lapic_write(uint32_t reg, uint32_t val); +#define IOAPIC_BASE_ADDRESS 0xfec00000 +static inline uint32_t ioapic_read(uint32_t reg) +{ + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x00) = reg; + return *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x10); +} + +static inline void ioapic_write(uint32_t reg, uint32_t val) +{ + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x00) = reg; + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x10) = val; +} + +#define LAPIC_BASE_ADDRESS 0xfee00000 +static inline uint32_t lapic_read(uint32_t reg) +{ + return *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg); +} + +static inline void lapic_write(uint32_t reg, uint32_t val) +{ + *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg) = val; +} /* PCI access */ uint32_t pci_read(uint32_t devfn, uint32_t reg, uint32_t len); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:23:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:23:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719336.1122055 (Exim 4.92) (envelope-from ) id 1s57Uq-0007jB-9M; Thu, 09 May 2024 17:23:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719336.1122055; Thu, 09 May 2024 17:23:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Uq-0007j3-6M; Thu, 09 May 2024 17:23:56 +0000 Received: by outflank-mailman (input) for mailman id 719336; Thu, 09 May 2024 17:23:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Up-0007ih-48 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Up-0006tR-3M for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57Up-0006lt-2b for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:23:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6D8YtfgShFz2xW3al4mybB/k1lba5Abu8t1Wh7Ubnu8=; b=G5+WrYCdSoKAWj4nucoAPMMFsc 0Q8Dui8cLl1pll41nkWDKnjk4hFRW4GOJaFtB+6L3qmgWsSCaaGKo41ZCeR2Ago1leTsIucX6ro3R B4R25ydQ71xr4J5yST7ZIDjhycbKLUVUVuLwcsP+klaiGTRi0hoM7PdpfFoAsU5hBGkU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/hvmloader: Wake APs with hypercalls rather than INIT+SIPI+SIPI Message-Id: Date: Thu, 09 May 2024 17:23:55 +0000 commit 752ec9a9b195759aa7f6059e65155d404654e316 Author: Alejandro Vallejo AuthorDate: Wed May 8 13:39:23 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 tools/hvmloader: Wake APs with hypercalls rather than INIT+SIPI+SIPI ... in order to change how LAPIC_ID handling works. Importantly, this allows us to start APs by vCPU ID in order to query the LAPIC_ID, rather than needing to know the APIC_ID in order to wake them. Other improvements avoid: * The 16bit entry stub * A LMSW insn, which has no decode assist on AMD and needs emulating fully * 13 vLAPIC emulations when 3 hypercalls can do * 4 pages of stack when 1 in plenty Signed-off-by: Alejandro Vallejo Reviewed-by: Andrew Cooper --- tools/firmware/hvmloader/smp.c | 112 +++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 66 deletions(-) diff --git a/tools/firmware/hvmloader/smp.c b/tools/firmware/hvmloader/smp.c index 082b17f138..6ebf0b60fa 100644 --- a/tools/firmware/hvmloader/smp.c +++ b/tools/firmware/hvmloader/smp.c @@ -22,88 +22,71 @@ #include "util.h" #include "config.h" #include "apic_regs.h" +#include "hypercall.h" -#define AP_BOOT_EIP 0x1000 -extern char ap_boot_start[], ap_boot_end[]; +#include +#include + +#include static int ap_callin, ap_cpuid; -asm ( - " .text \n" - " .code16 \n" - "ap_boot_start: .code16 \n" - " mov %cs,%ax \n" - " mov %ax,%ds \n" - " lgdt gdt_desr-ap_boot_start\n" - " xor %ax, %ax \n" - " inc %ax \n" - " lmsw %ax \n" - " ljmpl $0x08,$1f \n" - "gdt_desr: \n" - " .word gdt_end - gdt - 1 \n" - " .long gdt \n" - "ap_boot_end: .code32 \n" - "1: mov $0x10,%eax \n" - " mov %eax,%ds \n" - " mov %eax,%es \n" - " mov %eax,%ss \n" - " movl $stack_top,%esp \n" - " movl %esp,%ebp \n" - " call ap_start \n" - "1: hlt \n" - " jmp 1b \n" - " \n" - " .align 8 \n" - "gdt: \n" - " .quad 0x0000000000000000 \n" - " .quad 0x00cf9a000000ffff \n" /* 0x08: Flat code segment */ - " .quad 0x00cf92000000ffff \n" /* 0x10: Flat data segment */ - "gdt_end: \n" - " \n" - " .bss \n" - " .align 8 \n" - "stack: \n" - " .skip 0x4000 \n" - "stack_top: \n" - " .text \n" - ); - -void ap_start(void); /* non-static avoids unused-function compiler warning */ -/*static*/ void ap_start(void) +static void ap_start(void) { printf(" - CPU%d ... ", ap_cpuid); cacheattr_init(); printf("done.\n"); + + if ( !ap_cpuid ) /* Used on the BSP too */ + return; + wmb(); ap_callin = 1; -} -static void lapic_wait_ready(void) -{ - while ( lapic_read(APIC_ICR) & APIC_ICR_BUSY ) - cpu_relax(); + /* After this point, the BSP will shut us down. */ + + for ( ;; ) + asm volatile ( "hlt" ); } static void boot_cpu(unsigned int cpu) { - unsigned int icr2 = SET_APIC_DEST_FIELD(LAPIC_ID(cpu)); + static uint8_t ap_stack[PAGE_SIZE] __attribute__ ((aligned (16))); + static struct vcpu_hvm_context ap; /* Initialise shared variables. */ ap_cpuid = cpu; ap_callin = 0; wmb(); - /* Wake up the secondary processor: INIT-SIPI-SIPI... */ - lapic_wait_ready(); - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_INIT); - lapic_wait_ready(); - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_STARTUP | (AP_BOOT_EIP >> 12)); - lapic_wait_ready(); - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_STARTUP | (AP_BOOT_EIP >> 12)); - lapic_wait_ready(); + /* Wake up the secondary processor */ + ap = (struct vcpu_hvm_context) { + .mode = VCPU_HVM_MODE_32B, + .cpu_regs.x86_32 = { + .eip = (unsigned long)ap_start, + .esp = (unsigned long)ap_stack + ARRAY_SIZE(ap_stack), + + /* Protected Mode, no paging. */ + .cr0 = X86_CR0_PE, + + /* 32bit Flat Mode */ + .cs_limit = -1U, + .ds_limit = -1U, + .ss_limit = -1U, + .es_limit = -1U, + .tr_limit = 0x67, + .cs_ar = 0xc9b, + .ds_ar = 0xc93, + .es_ar = 0xc93, + .ss_ar = 0xc93, + .tr_ar = 0x8b, + }, + }; + + if ( hypercall_vcpu_op(VCPUOP_initialise, cpu, &ap) ) + BUG(); + if ( hypercall_vcpu_op(VCPUOP_up, cpu, NULL) ) + BUG(); /* * Wait for the secondary processor to complete initialisation. @@ -113,17 +96,14 @@ static void boot_cpu(unsigned int cpu) cpu_relax(); /* Take the secondary processor offline. */ - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_INIT); - lapic_wait_ready(); + if ( hypercall_vcpu_op(VCPUOP_down, cpu, NULL) ) + BUG(); } void smp_initialise(void) { unsigned int i, nr_cpus = hvm_info->nr_vcpus; - memcpy((void *)AP_BOOT_EIP, ap_boot_start, ap_boot_end - ap_boot_start); - printf("Multiprocessor initialisation:\n"); ap_start(); for ( i = 1; i < nr_cpus; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:24:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:24:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719337.1122058 (Exim 4.92) (envelope-from ) id 1s57V0-0007ls-AS; Thu, 09 May 2024 17:24:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719337.1122058; Thu, 09 May 2024 17:24:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57V0-0007li-7o; Thu, 09 May 2024 17:24:06 +0000 Received: by outflank-mailman (input) for mailman id 719337; Thu, 09 May 2024 17:24:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Uz-0007lW-78 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Uz-0006u3-6P for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57Uz-0006nn-5c for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WS69DWVrfMcwGsRbKxpF3CCxVm/n9yccDQ4dDqhOKZg=; b=0fJH5lMIzwZQzKn8Oj0rrju5NY ieU/LUEJLD5AeCRP4CuXm4nE03RpeiNiKqdLe6g6X0ndgBZfHwrfvHYzhw7eu9kpNzm0mON0lyVai AlnHsn4JhlZkmtJUvqcsTxa953K5TfxwuhR2hRRHFmXnIOFnsQk+G5KzYsmVfhwNdTLg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm: Defer the size calculation in hvm_save_cpu_xsave_states() Message-Id: Date: Thu, 09 May 2024 17:24:05 +0000 commit 1dd6b50dc48a704388a1107f38bfcb87235b9016 Author: Andrew Cooper AuthorDate: Mon Apr 29 17:31:03 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/hvm: Defer the size calculation in hvm_save_cpu_xsave_states() HVM_CPU_XSAVE_SIZE() may rewrite %xcr0 twice. Defer the calculation until after we've decided to write out an XSAVE record. Note in hvm_load_cpu_xsave_states() that there were versions of Xen which wrote out a useless XSAVE record. This sadly limits out ability to tidy up the existing infrastructure. Also leave a note in xstate_ctxt_size() that 0 still needs tolerating for now. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 10 ++++++++-- xen/arch/x86/xstate.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0ce45b177c..9594e0a5c5 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1197,12 +1197,13 @@ static int cf_check hvm_save_cpu_xsave_states( struct vcpu *v, hvm_domain_context_t *h) { struct hvm_hw_cpu_xsave *ctxt; - unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); + unsigned int size; int err; - if ( !cpu_has_xsave || !xsave_enabled(v) ) + if ( !xsave_enabled(v) ) return 0; /* do nothing */ + size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); err = _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size); if ( err ) return err; @@ -1255,6 +1256,11 @@ static int cf_check hvm_load_cpu_xsave_states( if ( !cpu_has_xsave ) return -EOPNOTSUPP; + /* + * Note: Xen prior to 4.12 would write out empty XSAVE records for VMs + * running on XSAVE-capable hardware but without XSAVE active. + */ + /* Customized checking for entry since our entry is of variable length */ desc = (struct hvm_save_descriptor *)&h->data[h->cur]; if ( sizeof (*desc) > h->size - h->cur) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index cf94761d05..99cedb4f5e 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -573,7 +573,7 @@ unsigned int xstate_ctxt_size(u64 xcr0) if ( xcr0 == xfeature_mask ) return xsave_cntxt_size; - if ( xcr0 == 0 ) + if ( xcr0 == 0 ) /* TODO: clean up paths passing 0 in here. */ return 0; return hw_uncompressed_size(xcr0); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:24:16 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:24:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719338.1122061 (Exim 4.92) (envelope-from ) id 1s57VA-0007sn-Bn; Thu, 09 May 2024 17:24:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719338.1122061; Thu, 09 May 2024 17:24:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57VA-0007sg-9E; Thu, 09 May 2024 17:24:16 +0000 Received: by outflank-mailman (input) for mailman id 719338; Thu, 09 May 2024 17:24:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57V9-0007sY-AI for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57V9-0006uA-9X for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57V9-0006oe-8f for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=z8ImuGGvemYhpXJ0O1RCqROTc1CIvp7ZoH+VCWzz6v4=; b=cnOtUNAbHh6KPIoIdrfhZlca/g zp4UpW4m1R2FpvffzjpkS6M/DzhowiVeURHAw1Rn6sUUl8X526FmOxXy+6TG9WX2iBEFPCjOBNg7e oJGmhnlh1SQVPQPdOKYJainc5U0B3yyDdOqOUaHRtK8Q/gt2YLNOt25UdAm8AjYKFaNE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/unaligned: address violation of MISRA C Rule 20.7 Message-Id: Date: Thu, 09 May 2024 17:24:15 +0000 commit 8e22c78e171bcc71dc4f7f6549a0a60c958f1465 Author: Nicola Vetrini AuthorDate: Tue Apr 30 16:28:15 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/unaligned: address violation of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- tools/include/xen-tools/common-macros.h | 2 +- xen/include/xen/unaligned.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 07aed92684..60912225cb 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -102,7 +102,7 @@ #define put_unaligned_t(type, val, ptr) do { \ struct { type x; } __packed *ptr_ = (typeof(ptr_))(ptr); \ - ptr_->x = val; \ + ptr_->x = (val); \ } while (0) #define get_unaligned(ptr) get_unaligned_t(typeof(*(ptr)), ptr) diff --git a/xen/include/xen/unaligned.h b/xen/include/xen/unaligned.h index 3eda0ece11..d9bb599e65 100644 --- a/xen/include/xen/unaligned.h +++ b/xen/include/xen/unaligned.h @@ -19,7 +19,7 @@ #define put_unaligned_t(type, val, ptr) do { \ struct { type x; } __packed *ptr_ = (typeof(ptr_))(ptr); \ - ptr_->x = val; \ + ptr_->x = (val); \ } while (0) #define get_unaligned(ptr) get_unaligned_t(typeof(*(ptr)), ptr) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:24:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:24:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719339.1122065 (Exim 4.92) (envelope-from ) id 1s57VK-0007z8-D5; Thu, 09 May 2024 17:24:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719339.1122065; Thu, 09 May 2024 17:24:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57VK-0007z1-Ae; Thu, 09 May 2024 17:24:26 +0000 Received: by outflank-mailman (input) for mailman id 719339; Thu, 09 May 2024 17:24:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57VJ-0007yt-DM for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57VJ-0006uH-CZ for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57VJ-0006pH-Bg for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ftNQQBduz3Suh4mZmLYkNR39t1QpwnCTMwEI9890G+w=; b=iM2rI/K/ys1fRQcvjUJnXke3CU aIBZl3fL3Bkdocj7OITP6wttq+/yAS6ylDBoxRRkTmqPI3aM/yBOhnXNTuWaT/rQoqXkuOChQfAyQ 7W4E8ywOHpq7sy9gjyLlJOWDhy0pZFJPj+SjdF93jCucG9c+WMEnTz7tEiwRgFvQ3KPQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/pci: address violations of MISRA C Rule 20.7 Message-Id: Date: Thu, 09 May 2024 17:24:25 +0000 commit 14424d90e1ca432eceafafac603ea8e9cfb84dd3 Author: Nicola Vetrini AuthorDate: Tue Apr 30 16:28:16 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/pci: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- xen/include/xen/pci_regs.h | 6 +++--- xen/include/xen/vpci.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index 9909b27425..0bc18efabb 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -445,9 +445,9 @@ #define PCI_EXP_RTSTA 32 /* Root Status */ /* Extended Capabilities (PCI-X 2.0 and Express) */ -#define PCI_EXT_CAP_ID(header) (header & 0x0000ffff) -#define PCI_EXT_CAP_VER(header) ((header >> 16) & 0xf) -#define PCI_EXT_CAP_NEXT(header) ((header >> 20) & 0xffc) +#define PCI_EXT_CAP_ID(header) ((header) & 0x0000ffff) +#define PCI_EXT_CAP_VER(header) (((header) >> 16) & 0xf) +#define PCI_EXT_CAP_NEXT(header) (((header) >> 20) & 0xffc) #define PCI_EXT_CAP_ID_ERR 1 #define PCI_EXT_CAP_ID_VC 2 diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index e89c571890..6e4c972f35 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -23,7 +23,7 @@ typedef int vpci_register_init_t(struct pci_dev *dev); #define REGISTER_VPCI_INIT(x, p) \ static vpci_register_init_t *const x##_entry \ - __used_section(".data.vpci." p) = x + __used_section(".data.vpci." p) = (x) /* Assign vPCI to device by adding handlers. */ int __must_check vpci_assign_device(struct pci_dev *pdev); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:24:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:24:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719340.1122070 (Exim 4.92) (envelope-from ) id 1s57VU-000827-Ew; Thu, 09 May 2024 17:24:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719340.1122070; Thu, 09 May 2024 17:24:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57VU-00081x-C4; Thu, 09 May 2024 17:24:36 +0000 Received: by outflank-mailman (input) for mailman id 719340; Thu, 09 May 2024 17:24:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57VT-00081m-GA for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57VT-0006uO-FO for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57VT-0006pz-Ef for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OXln42TrkM9DndluPoGrUdApxWjIRtaoFNjDA4qsssc=; b=bsqZL++6aX/1g7ueFnIxSsVl0p 7X/3xHe0VYldwU8/Nn+19Z+d8MO3jJIah0ppspp0R8UkQ0oUoUeXeE5HmCYBiMpzsMBJhCpZMGq4a 9HYgNNd6EmoNcJ9UktudbHWiNHsUVwtAXlRKZkUPnDpSRk5yF0ZSsgjj876e3Ng9eCps=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: add deviation of MISRA C:2012 Rule 14.4 Message-Id: Date: Thu, 09 May 2024 17:24:35 +0000 commit 3d1033c9117f9c0b53cb3d1faded7969c5c065b7 Author: Federico Serafini AuthorDate: Thu May 2 15:11:15 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 automation/eclair: add deviation of MISRA C:2012 Rule 14.4 Update ECLAIR configuration to take into account the deviations agreed during MISRA meetings. Amend an existing entry of Rule 14.4 in deviations-rst: it is not a project-wide deviation. Tag Rule 14.4 as clean for arm. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 4 ++++ automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- docs/misra/deviations.rst | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index f09ad71acf..5eb7368a73 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -343,6 +343,10 @@ statements are deliberate" -config=MC3R1.R14.3,statements={deliberate , "wrapped(any(),node(if_stmt))" } -doc_end +-doc_begin="A controlling expression of 'if' and iteration statements having integer, character or pointer type has a semantics that is well-known to all Xen developers." +-config=MC3R1.R14.4,etypes+={deliberate, "any()", "src_type(integer||character)||src_expr(type(desugar(pointer(any()))))"} +-doc_end + -doc_begin="The XEN team relies on the fact that the enum is_dying has the constant with assigned value 0 act as false and the other ones as true, therefore have the same behavior of a boolean" diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index a014500a41..1e13258fa9 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -29,7 +29,7 @@ if(string_equal(target,"x86_64"), ) if(string_equal(target,"arm64"), - service_selector({"additional_clean_guidelines","MC3R1.R16.6||MC3R1.R20.12||MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.2||MC3R1.R7.3||MC3R1.R8.6||MC3R1.R9.3"}) + service_selector({"additional_clean_guidelines","MC3R1.R14.4||MC3R1.R16.6||MC3R1.R20.12||MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.2||MC3R1.R7.3||MC3R1.R8.6||MC3R1.R9.3"}) ) -reports+={clean:added,"service(clean_guidelines_common||additional_clean_guidelines)"} diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 39cc321a27..161134771c 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -290,11 +290,17 @@ Deviations related to MISRA C:2012 Rules: statements are deliberate. - Project-wide deviation; tagged as `disapplied` for ECLAIR. + * - R14.4 + - A controlling expression of 'if' and iteration statements having + integer, character or pointer type has a semantics that is well-known to + all Xen developers. + - Tagged as `deliberate` for ECLAIR. + * - R14.4 - The XEN team relies on the fact that the enum is_dying has the constant with assigned value 0 act as false and the other ones as true, therefore have the same behavior of a boolean. - - Project-wide deviation; tagged as `deliberate` for ECLAIR. + - Tagged as `deliberate` for ECLAIR. * - R16.2 - Complying with the Rule would entail a lot of code duplication in the -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:24:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:24:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719341.1122074 (Exim 4.92) (envelope-from ) id 1s57Ve-000855-GM; Thu, 09 May 2024 17:24:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719341.1122074; Thu, 09 May 2024 17:24:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Ve-00084x-DZ; Thu, 09 May 2024 17:24:46 +0000 Received: by outflank-mailman (input) for mailman id 719341; Thu, 09 May 2024 17:24:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Vd-00084p-JK for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Vd-0006uV-IX for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57Vd-0006qW-Hk for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3Z2HEgc3pVvqVqZWN16L5xfLyAOCdFe6DpmTq3JLPaA=; b=uPJMdrURQn+Pnn8FCwY8ZETDw3 wLnYXefsRxJZqSApzaKMLuIK6YMHTVzb35EsOxba3+sDFqGfO892XlxpBI8I+byqx/m/Cav9u84TV VzQ+VFlB64QPNg0ucPCeeSrv1S1fVqA4V3k6qKrMEmC+ySiTVlIHtKwrK9OtfRn4TcSs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/IOMMU: address violations of MISRA C:2012 Rule 14.4 Message-Id: Date: Thu, 09 May 2024 17:24:45 +0000 commit fcefb2a2471a9b9d6997c62e9be461f17c390ebf Author: Maria Celeste Cesario AuthorDate: Wed May 8 20:46:21 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/IOMMU: address violations of MISRA C:2012 Rule 14.4 The xen sources contain violations of MISRA C:2012 Rule 14.4 whose headline states: "The controlling expression of an if statement and the controlling expression of an iteration-statement shall have essentially Boolean type". Add comparisons to avoid using enum constants as controlling expressions to comply with Rule 14.4. Amend the comment in the enum definition to reflect the fact that boolean uses of iommu_intremap are no longer allowed. No functional change. Signed-off-by: Maria Celeste Cesario Signed-off-by: Simone Ballarin Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/arch/x86/hpet.c | 6 +++--- xen/arch/x86/msi.c | 4 ++-- xen/drivers/passthrough/amd/iommu_init.c | 4 ++-- xen/drivers/passthrough/vtd/iommu.c | 4 ++-- xen/drivers/passthrough/vtd/quirks.c | 2 +- xen/include/xen/iommu.h | 4 ---- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 0759eae055..2f54d31889 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -278,7 +278,7 @@ static int hpet_msi_write(struct hpet_event_channel *ch, struct msi_msg *msg) { ch->msi.msg = *msg; - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { int rc = iommu_update_ire_from_msi(&ch->msi, msg); @@ -352,7 +352,7 @@ static int __init hpet_setup_msi_irq(struct hpet_event_channel *ch) u32 cfg = hpet_read32(HPET_Tn_CFG(ch->idx)); irq_desc_t *desc = irq_to_desc(ch->msi.irq); - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { ch->msi.hpet_id = hpet_blockid; ret = iommu_setup_hpet_msi(&ch->msi); @@ -371,7 +371,7 @@ static int __init hpet_setup_msi_irq(struct hpet_event_channel *ch) ret = __hpet_setup_msi_irq(desc); if ( ret < 0 ) { - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) iommu_update_ire_from_msi(&ch->msi, NULL); return ret; } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e721aaf5c0..3009ce109f 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -189,7 +189,7 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) { entry->msg = *msg; - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { int rc; @@ -555,7 +555,7 @@ int msi_free_irq(struct msi_desc *entry) destroy_irq(entry[nr].irq); /* Free the unused IRTE if intr remap enabled */ - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) iommu_update_ire_from_msi(entry + nr, NULL); } diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 358c8cbad9..6c0dc2d5cb 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1483,7 +1483,7 @@ int __init amd_iommu_init(bool xt) goto error_out; } - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) register_keyhandler('V', &amd_iommu_dump_intremap_tables, "dump IOMMU intremap tables", 0); @@ -1501,7 +1501,7 @@ int __init amd_iommu_init_late(void) /* Further initialize the device table(s). */ pci_init = true; - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) rc = iterate_ivrs_mappings(amd_iommu_setup_device_table); for_each_amd_iommu ( iommu ) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index c7110af7c9..e13be244c1 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2540,7 +2540,7 @@ static int __must_check init_vtd_hw(bool resume) /* * Enable interrupt remapping */ - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { int apic; for ( apic = 0; apic < nr_ioapics; apic++ ) @@ -2556,7 +2556,7 @@ static int __must_check init_vtd_hw(bool resume) } } } - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { for_each_drhd_unit ( drhd ) { diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 5a56565ea8..950dcd56ef 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -392,7 +392,7 @@ void __init platform_quirks_init(void) map_igd_reg(); /* Tylersburg interrupt remap quirk */ - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) tylersburg_intremap_quirk(); } diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 92db6f124f..442ae5322d 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -60,10 +60,6 @@ extern uint8_t iommu_quarantine; #ifdef CONFIG_X86 extern enum __packed iommu_intremap { - /* - * In order to allow traditional boolean uses of the iommu_intremap - * variable, the "off" value has to come first (yielding a value of zero). - */ iommu_intremap_off, /* * Interrupt remapping enabled, but only able to generate interrupts -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:24:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:24:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719342.1122077 (Exim 4.92) (envelope-from ) id 1s57Vo-00088e-Iw; Thu, 09 May 2024 17:24:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719342.1122077; Thu, 09 May 2024 17:24:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Vo-00088X-GJ; Thu, 09 May 2024 17:24:56 +0000 Received: by outflank-mailman (input) for mailman id 719342; Thu, 09 May 2024 17:24:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Vn-00088N-M2 for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Vn-0006ud-LI for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57Vn-0006r1-Kb for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:24:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=klWWgi73RdcQD5DpkJORPBQUgUoz7iLb0ceMPVxviQY=; b=e8A0b18woBu9U6j3iJh6O7UfxG 78IQ9ElMkRn8Q+k1syQhi1vxba+E22tF1AhIfzCiZ8FlU0W2ujaaeH1/F6nXUcePUHZaHYIxLVN63 IDhJaA6JhSkP0Wnmci6Otx0iC+mE6FFXOE2O20eEq+MfvEi4yiUz/Mg/PcPjF9YhVU7g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Explain how moving mod[0] works Message-Id: Date: Thu, 09 May 2024 17:24:55 +0000 commit 49c810e86799211bf15e67ddff8dca4e29166ca2 Author: Andrew Cooper AuthorDate: Tue Apr 23 16:45:36 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/boot: Explain how moving mod[0] works modules_headroom is a misleading name as it applies strictly to mod[0] only, and the movement loop is deeply unintuitive and completely undocumented. Provide help to whomever needs to look at this code next. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/setup.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index caf235c628..f84e1cd79c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1432,6 +1432,11 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) /* Is the region suitable for relocating the multiboot modules? */ for ( j = mbi->mods_count - 1; j >= 0; j-- ) { + /* + * 'headroom' is a guess for the decompressed size and + * decompressor overheads of mod[0] (the dom0 kernel). When we + * move mod[0], we incorporate this as extra space at the start. + */ unsigned long headroom = j ? 0 : modules_headroom; unsigned long size = PAGE_ALIGN(headroom + mod[j].mod_end); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 09 17:25:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 May 2024 17:25:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719343.1122083 (Exim 4.92) (envelope-from ) id 1s57Vy-0008Bc-L2; Thu, 09 May 2024 17:25:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719343.1122083; Thu, 09 May 2024 17:25:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Vy-0008BU-Hr; Thu, 09 May 2024 17:25:06 +0000 Received: by outflank-mailman (input) for mailman id 719343; Thu, 09 May 2024 17:25:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Vx-0008BK-Ot for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:25:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s57Vx-0006vH-OC for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:25:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s57Vx-0006rx-NQ for xen-changelog@lists.xenproject.org; Thu, 09 May 2024 17:25:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E5Nupzqgq3cA/JKR2gRLO157ugFk5qhc0JjT9nB8GgU=; b=twaoAXQBdvP0fujAAGqH+HSTtI foaNj7QJKpncI/7zAWlQL3VJaUUkIGB2qEEpUlDmDKPvc01XhI+PDXDs/3NfTQeqi1LCOkHUwFDv0 EbPnlqmBWQVtdE77fhJKmCD4Qt2XzM5f1ao6Z1CR2bGJTd6fJ2URPTcENSAiXrNFTjCE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Refactor pvh_load_kernel() to have an initrd_len local Message-Id: Date: Thu, 09 May 2024 17:25:05 +0000 commit 53959cb8309919fc2f157a1c99e0af2ce280cb84 Author: Andrew Cooper AuthorDate: Tue Apr 23 12:42:47 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/boot: Refactor pvh_load_kernel() to have an initrd_len local The expression get more complicated when ->mod_end isn't being abused as a size field. Introduce and use a initrd_len local variable. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/dom0_build.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index ac71d43a6b..b0cb96c3bc 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -650,6 +650,7 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, { void *image_start = image_base + image_headroom; unsigned long image_len = image->mod_end; + unsigned long initrd_len = initrd ? initrd->mod_end : 0; struct elf_binary elf; struct elf_dom_parms parms; paddr_t last_addr; @@ -710,7 +711,7 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, * simplify it. */ last_addr = find_memory(d, &elf, sizeof(start_info) + - (initrd ? ROUNDUP(initrd->mod_end, PAGE_SIZE) + + (initrd ? ROUNDUP(initrd_len, PAGE_SIZE) + sizeof(mod) : 0) + (cmdline ? ROUNDUP(strlen(cmdline) + 1, @@ -725,7 +726,7 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, if ( initrd != NULL ) { rc = hvm_copy_to_guest_phys(last_addr, mfn_to_virt(initrd->mod_start), - initrd->mod_end, v); + initrd_len, v); if ( rc ) { printk("Unable to copy initrd to guest\n"); @@ -733,8 +734,8 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, } mod.paddr = last_addr; - mod.size = initrd->mod_end; - last_addr += ROUNDUP(initrd->mod_end, elf_64bit(&elf) ? 8 : 4); + mod.size = initrd_len; + last_addr += ROUNDUP(initrd_len, elf_64bit(&elf) ? 8 : 4); if ( initrd->string ) { char *str = __va(initrd->string); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 10 01:11:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 01:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719431.1122177 (Exim 4.92) (envelope-from ) id 1s5En4-0003BN-MI; Fri, 10 May 2024 01:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719431.1122177; Fri, 10 May 2024 01:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5En4-0003BG-Jm; Fri, 10 May 2024 01:11:14 +0000 Received: by outflank-mailman (input) for mailman id 719431; Fri, 10 May 2024 01:11:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5En3-0003B8-Lb for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5En3-0007rE-Kj for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5En3-0000v4-Iy for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=J92FeYjSSri+iZSsz2/v0Dyxlt06Wig9kqfWQBAakZY=; b=tMfnt4v2WJp40i4YnaFGZ/EMaL KzHC+L7Fog74PMgQAxqlQwozACsYwD79kMcSgt1+EDlpJHXm8N6Hbd4DrzHdBtbj5dKgErB7py0bG f7rJBBHxuAjp1wLXqgDjuTwnmnaZfIw5oUMVgIHCw1CvoQQo+sTkF7nCd5I1mMq4oWCA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Fix MISRA regression on R1.1, flexible array member not at the end Message-Id: Date: Fri, 10 May 2024 01:11:13 +0000 commit 93c27d54dd236f19bc5319303790952305edceaf Author: Luca Fancellu AuthorDate: Tue Apr 30 12:09:22 2024 +0100 Commit: Stefano Stabellini CommitDate: Thu May 9 17:59:25 2024 -0700 xen/arm: Fix MISRA regression on R1.1, flexible array member not at the end Commit 2209c1e35b47 ("xen/arm: Introduce a generic way to access memory bank structures") introduced a MISRA regression for Rule 1.1 because a flexible array member is introduced in the middle of a struct, furthermore this is using a GCC extension that is going to be deprecated in GCC 14 and a warning to identify such cases will be present (-Wflex-array-member-not-at-end) to identify such cases. In order to fix this issue, use the macro __struct_group to create a structure 'struct membanks_hdr' which will hold the common data among structures using the 'struct membanks' interface. Modify the 'struct shared_meminfo' and 'struct meminfo' to use this new structure, effectively removing the flexible array member from the middle of the structure and modify the code accessing the .common field to use the macro container_of to maintain the functionality of the interface. Given this change, container_of needs to be supplied with a type and so the macro 'kernel_info_get_mem' inside arm/include/asm/kernel.h can't be an option since it uses const and non-const types for struct membanks, so introduce two static inline, one of which will keep the const qualifier. Given the complexity of the interface, which carries a lot of benefit but on the other hand could be prone to developer confusion if the access is open-coded, introduce two static inline helper for the 'struct kernel_info' .shm_mem member and get rid the open-coding shm_mem.common access. Fixes: 2209c1e35b47 ("xen/arm: Introduce a generic way to access memory bank structures") Reported-by: Nicola Vetrini Signed-off-by: Luca Fancellu --- xen/arch/arm/acpi/domain_build.c | 2 +- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/arm/include/asm/kernel.h | 11 ++++++++++- xen/arch/arm/include/asm/setup.h | 18 ++++++++++-------- xen/arch/arm/include/asm/static-shmem.h | 12 ++++++++++++ xen/arch/arm/static-shmem.c | 19 +++++++++---------- 6 files changed, 45 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index ed895dd8f9..2ce75543d0 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -451,7 +451,7 @@ static int __init estimate_acpi_efi_size(struct domain *d, struct acpi_table_rsdp *rsdp_tbl; struct acpi_table_header *table; - efi_size = estimate_efi_size(kernel_info_get_mem(kinfo)->nr_banks); + efi_size = estimate_efi_size(kernel_info_get_mem_const(kinfo)->nr_banks); acpi_size = ROUNDUP(sizeof(struct acpi_table_fadt), 8); acpi_size += ROUNDUP(sizeof(struct acpi_table_stao), 8); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 0784e4c5e3..f6550809cf 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -805,7 +805,7 @@ int __init make_memory_node(const struct kernel_info *kinfo, int addrcells, * static shared memory banks need to be listed as /memory node, so when * this function is handling the normal memory, add the banks. */ - if ( mem == kernel_info_get_mem(kinfo) ) + if ( mem == kernel_info_get_mem_const(kinfo) ) shm_mem_node_fill_reg_range(kinfo, reg, &nr_cells, addrcells, sizecells); @@ -884,7 +884,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, { const struct membanks *mem = bootinfo_get_mem(); const struct membanks *mem_banks[] = { - kernel_info_get_mem(kinfo), + kernel_info_get_mem_const(kinfo), bootinfo_get_reserved_mem(), #ifdef CONFIG_STATIC_SHM bootinfo_get_shmem(), @@ -1108,7 +1108,7 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, uint64_t bankend; const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; - const struct membanks *kinfo_mem = kernel_info_get_mem(kinfo); + const struct membanks *kinfo_mem = kernel_info_get_mem_const(kinfo); int res = -ENOENT; for ( i = 0; i < GUEST_RAM_BANKS; i++ ) diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index 16a2bfc01e..7e6e3c82a4 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -80,7 +80,16 @@ struct kernel_info { }; }; -#define kernel_info_get_mem(kinfo) (&(kinfo)->mem.common) +static inline struct membanks *kernel_info_get_mem(struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, const struct membanks, common); +} #ifdef CONFIG_STATIC_SHM #define KERNEL_INFO_SHM_MEM_INIT .shm_mem.common.max_banks = NR_SHMEM_BANKS, diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 28fb659fe9..61c15806a7 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -64,18 +64,20 @@ struct membank { }; struct membanks { - unsigned int nr_banks; - unsigned int max_banks; + __struct_group(membanks_hdr, common, , + unsigned int nr_banks; + unsigned int max_banks; + ); struct membank bank[]; }; struct meminfo { - struct membanks common; + struct membanks_hdr common; struct membank bank[NR_MEM_BANKS]; }; struct shared_meminfo { - struct membanks common; + struct membanks_hdr common; struct membank bank[NR_SHMEM_BANKS]; struct shmem_membank_extra extra[NR_SHMEM_BANKS]; }; @@ -166,25 +168,25 @@ extern domid_t max_init_domid; static inline struct membanks *bootinfo_get_mem(void) { - return &bootinfo.mem.common; + return container_of(&bootinfo.mem.common, struct membanks, common); } static inline struct membanks *bootinfo_get_reserved_mem(void) { - return &bootinfo.reserved_mem.common; + return container_of(&bootinfo.reserved_mem.common, struct membanks, common); } #ifdef CONFIG_ACPI static inline struct membanks *bootinfo_get_acpi(void) { - return &bootinfo.acpi.common; + return container_of(&bootinfo.acpi.common, struct membanks, common); } #endif #ifdef CONFIG_STATIC_SHM static inline struct membanks *bootinfo_get_shmem(void) { - return &bootinfo.shmem.common; + return container_of(&bootinfo.shmem.common, struct membanks, common); } static inline struct shmem_membank_extra *bootinfo_get_shmem_extra(void) diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h index 3b6569e570..806ee41cfc 100644 --- a/xen/arch/arm/include/asm/static-shmem.h +++ b/xen/arch/arm/include/asm/static-shmem.h @@ -45,6 +45,18 @@ int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, int *nr_cells, int addrcells, int sizecells); +static inline struct membanks * +kernel_info_get_shm_mem(struct kernel_info *kinfo) +{ + return container_of(&kinfo->shm_mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_shm_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->shm_mem.common, const struct membanks, common); +} + #else /* !CONFIG_STATIC_SHM */ /* Worst case /memory node reg element: (addrcells + sizecells) */ diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 09f474ec60..78881dd1d3 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -172,16 +172,16 @@ static int __init assign_shared_memory(struct domain *d, } static int __init -append_shm_bank_to_domain(struct shared_meminfo *kinfo_shm_mem, paddr_t start, +append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, paddr_t size, const char *shm_id) { - struct membanks *shm_mem = &kinfo_shm_mem->common; + struct membanks *shm_mem = kernel_info_get_shm_mem(kinfo); struct shmem_membank_extra *shm_mem_extra; if ( shm_mem->nr_banks >= shm_mem->max_banks ) return -ENOMEM; - shm_mem_extra = &kinfo_shm_mem->extra[shm_mem->nr_banks]; + shm_mem_extra = &kinfo->shm_mem.extra[shm_mem->nr_banks]; shm_mem->bank[shm_mem->nr_banks].start = start; shm_mem->bank[shm_mem->nr_banks].size = size; @@ -289,8 +289,7 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, * Record static shared memory region info for later setting * up shm-node in guest device tree. */ - ret = append_shm_bank_to_domain(&kinfo->shm_mem, gbase, psize, - shm_id); + ret = append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); if ( ret ) return ret; } @@ -301,7 +300,7 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, int __init make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells) { - const struct membanks *mem = &kinfo->shm_mem.common; + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); void *fdt = kinfo->fdt; unsigned int i = 0; int res = 0; @@ -517,7 +516,7 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, int __init make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells) { - const struct membanks *mem = &kinfo->shm_mem.common; + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); void *fdt = kinfo->fdt; int res = 0; /* Placeholder for reserved-memory\0 */ @@ -579,7 +578,7 @@ void __init init_sharedmem_pages(void) int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, struct rangeset *rangeset) { - const struct membanks *shm_mem = &kinfo->shm_mem.common; + const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); unsigned int i; /* Remove static shared memory regions */ @@ -607,7 +606,7 @@ int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, int __init remove_shm_holes_for_domU(const struct kernel_info *kinfo, struct membanks *ext_regions) { - const struct membanks *shm_mem = &kinfo->shm_mem.common; + const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); struct rangeset *guest_holes; unsigned int i; paddr_t start; @@ -673,7 +672,7 @@ void __init shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, int *nr_cells, int addrcells, int sizecells) { - const struct membanks *mem = &kinfo->shm_mem.common; + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); unsigned int i; __be32 *cells; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 10 01:11:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 01:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719430.1122175 (Exim 4.92) (envelope-from ) id 1s5Emu-00039x-LI; Fri, 10 May 2024 01:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719430.1122175; Fri, 10 May 2024 01:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5Emu-00039l-IL; Fri, 10 May 2024 01:11:04 +0000 Received: by outflank-mailman (input) for mailman id 719430; Fri, 10 May 2024 01:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5Emt-00039d-J2 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5Emt-0007qp-Gd for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5Emt-0000uL-Ep for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YaYUhd09XwJ9NqjA8V8Uu75SRdReGkz0pllr9uWCMUc=; b=0N+PmXbY+/+uQMOHj3n35Cd8b9 wIvOGfIgGbpKu+xN2NCxYhFe1TDXr8aGsz1DakP8zmsyeEZPxcpnsOVk219V3IyvgPnDRKmB4LeoE DG4Cg6pNv30l2Z5zz4Co4Atz24t+1T1JOJ8r+P8bmkBnj1khiWCaeYfHtF8LeaVkvOQ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/kernel.h: Import __struct_group from Linux Message-Id: Date: Fri, 10 May 2024 01:11:03 +0000 commit 1672df9ebd80edb0832eb4671f946a4d98bfdd42 Author: Luca Fancellu AuthorDate: Tue Apr 30 12:09:21 2024 +0100 Commit: Stefano Stabellini CommitDate: Thu May 9 17:59:15 2024 -0700 xen/kernel.h: Import __struct_group from Linux Import __struct_group from Linux, commit 50d7bd38c3aa ("stddef: Introduce struct_group() helper macro"), in order to allow the access through the anonymous structure to the members without having to write also the name, e.g: struct foo { int one; struct { int two; int three, four; } thing; int five; }; would become: struct foo { int one; __struct_group(/* None */, thing, /* None */, int two; int three, four; ); int five; }; Allowing the users of this structure to access the .thing members by using .two/.three/.four on the struct foo. This construct will become useful in order to have some generalized interfaces that shares some common members. Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 50d7bd38c3aa Reported-by: Nicola Vetrini Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/include/xen/kernel.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/xen/include/xen/kernel.h b/xen/include/xen/kernel.h index bb6b0f3891..bc2440b5f9 100644 --- a/xen/include/xen/kernel.h +++ b/xen/include/xen/kernel.h @@ -54,6 +54,27 @@ typeof_field(type, member) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) +/** + * __struct_group() - Create a mirrored named and anonyomous struct + * + * @TAG: The tag name for the named sub-struct (usually empty) + * @NAME: The identifier name of the mirrored sub-struct + * @ATTRS: Any struct attributes (usually empty) + * @MEMBERS: The member declarations for the mirrored structs + * + * Used to create an anonymous union of two structs with identical layout + * and size: one anonymous and one named. The former's members can be used + * normally without sub-struct naming, and the latter can be used to + * reason about the start, end, and size of the group of struct members. + * The named struct can also be explicitly tagged for layer reuse, as well + * as both having struct attributes appended. + */ +#define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ + union { \ + struct { MEMBERS } ATTRS; \ + struct TAG { MEMBERS } ATTRS NAME; \ + } ATTRS + /* * Check at compile time that something is of a particular type. * Always evaluates to 1 so you may use it easily in comparisons. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 10 01:11:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 01:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719432.1122181 (Exim 4.92) (envelope-from ) id 1s5EnE-0003Dx-Nw; Fri, 10 May 2024 01:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719432.1122181; Fri, 10 May 2024 01:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5EnE-0003Dp-LM; Fri, 10 May 2024 01:11:24 +0000 Received: by outflank-mailman (input) for mailman id 719432; Fri, 10 May 2024 01:11:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5EnD-0003Df-PM for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5EnD-0007rQ-OZ for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5EnD-0000vc-Mv for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uJt/QiW4oQpiVqjBYCQl+gdb2xNQvAfIUQtJgbEM33o=; b=4X+74F6Lj77lQxevlm7jJcTFAp VojP4Re8t11JDnQxHf6PsRiNfRub1M+5EdifUvizWTuYaJLtTZ+hN3oAlL68D7GW0wXDGCtBZ3e9s cfRMrkEkJ3Qt3ElKVDQLRLivvJk7KtZFPK9qO0lLiXTqlfQ/62vAfeVkAow/XtH00CLc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: amend configuration for some MISRA rules Message-Id: Date: Fri, 10 May 2024 01:11:23 +0000 commit f4cd14e502bafe773d8c808010c53e99c750290f Author: Alessandro Zucchelli AuthorDate: Thu May 9 18:02:17 2024 -0700 Commit: Stefano Stabellini CommitDate: Thu May 9 18:02:17 2024 -0700 automation/eclair_analysis: amend configuration for some MISRA rules Adjust ECLAIR configuration for rules: R21.14, R21.15, R21.16 by taking into account mem* macros defined in the Xen sources as if they were equivalent to the ones in Standard Library. Signed-off-by: Alessandro Zucchelli Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/analysis.ecl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 66ed7f952c..d4628d582c 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -19,6 +19,23 @@ map_strings("scheduled-analysis",analysis_kind) -enable=B.EXPLAIN +-doc_begin="These configurations serve the purpose of recognizing the 'mem*' macros as +their Standard Library equivalents." + +-config=MC3R1.R21.14,call_select+= +{"macro(^memcmp$)&&any_arg(1..2, skip(__non_syntactic_paren_cast_stmts, node(string_literal)))", + "any()", violation, "%{__callslct_any_base_fmt()}", {{arg, "%{__callslct_arg_fmt()}"}}} + +-config=MC3R1.R21.15,call_args+= +{"macro(^mem(cmp|move|cpy)$)", {1, 2}, "unqual_pointee_compatible", + "%{__argscmpr_culprit_fmt()}", "%{__argscmpr_evidence_fmt()}"} + +-config=MC3R1.R21.16,call_select+= +{"macro(^memcmp$)&&any_arg(1..2, skip(__non_syntactic_paren_stmts, type(canonical(__memcmp_pte_types))))", + "any()", violation, "%{__callslct_any_base_fmt()}", {{arg,"%{__callslct_arg_type_fmt()}"}}} + +-doc_end + -eval_file=toolchain.ecl -eval_file=public_APIs.ecl -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 10 01:11:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 01:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719433.1122186 (Exim 4.92) (envelope-from ) id 1s5EnO-0003HC-R4; Fri, 10 May 2024 01:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719433.1122186; Fri, 10 May 2024 01:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5EnO-0003H4-OL; Fri, 10 May 2024 01:11:34 +0000 Received: by outflank-mailman (input) for mailman id 719433; Fri, 10 May 2024 01:11:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5EnN-0003Gt-SN for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5EnN-0007rY-Rc for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5EnN-0000w9-QZ for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 01:11:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=C+NnNJh+sRxLhzf2PRwjqszRqdsgN6EiRpZW1bwEgpw=; b=w0tHUuQ2a/kDX0RruvzBcYK956 i08yEMHuOkcoJdgLVFxDaOmYliVlZDl9G4SAO4Bjoc2lFQwkwde5UTnqyIu/31+20cv/al1wbT1MP 3WAxLJAC7ATXfKLj9DmW2OWYp/PiVzU9GPk4r+fUec92lTtVI6kZN6SudD+/BYeVdhLo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair: hide reports coming from adopted code in scheduled analysis Message-Id: Date: Fri, 10 May 2024 01:11:33 +0000 commit b0082b908391b29b7c4dd5e6c389ebd6481926f8 Author: Federico Serafini AuthorDate: Fri May 3 15:14:11 2024 +0200 Commit: Stefano Stabellini CommitDate: Thu May 9 18:03:24 2024 -0700 automation/eclair: hide reports coming from adopted code in scheduled analysis To improve clarity and ease of navigation do not show reports related to adopted code in the scheduled analysis. Configuration options are commented out because they may be useful in the future. Signed-off-by: Simone Ballarin Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/analysis.ecl | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index d4628d582c..9134e59617 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -4,11 +4,11 @@ setq(data_dir,getenv("ECLAIR_DATA_DIR")) setq(analysis_kind,getenv("ANALYSIS_KIND")) -setq(scheduled_analysis,nil) +# setq(scheduled_analysis,nil) -strings_map("scheduled-analysis",500,"","^.*scheduled$",0,setq(scheduled_analysis,t)) -strings_map("scheduled-analysis",500,"","^.*$",0) -map_strings("scheduled-analysis",analysis_kind) +# strings_map("scheduled-analysis",500,"","^.*scheduled$",0,setq(scheduled_analysis,t)) +# strings_map("scheduled-analysis",500,"","^.*$",0) +# map_strings("scheduled-analysis",analysis_kind) -verbose @@ -42,12 +42,16 @@ their Standard Library equivalents." -doc="Initially, there are no files tagged as adopted." -file_tag+={adopted,"none()"} -if(not(scheduled_analysis), - eval_file("adopted.ecl") -) -if(not(scheduled_analysis), - eval_file("out_of_scope.ecl") -) +# if(not(scheduled_analysis), +# eval_file("adopted.ecl") +# ) +# if(not(scheduled_analysis), +# eval_file("out_of_scope.ecl") +# ) + +-eval_file=adopted.ecl +-eval_file=out_of_scope.ecl + -eval_file=deviations.ecl -eval_file=call_properties.ecl -eval_file=tagging.ecl -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:22:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719904.1122758 (Exim 4.92) (envelope-from ) id 1s5R8N-0001RT-TI; Fri, 10 May 2024 14:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719904.1122758; Fri, 10 May 2024 14:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8N-0001RL-QH; Fri, 10 May 2024 14:22:03 +0000 Received: by outflank-mailman (input) for mailman id 719904; Fri, 10 May 2024 14:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8M-0001RB-Bv for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8M-0006ze-9T for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R8M-0006Gl-8R for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qtJRbQnAzNd2Jwquw9O3zGrHE9qn2Ixuce23xytE7ko=; b=WrGkEnEBBbv8yDEvIeMfUO3mbE 7UD0SdgN+Gni578mIulZPihhhEsUlkg66sH4uQgtPfdnVR4EovQCIx2grvWKWJd413XT6bJ8YivBx gnnacoqtYLSItVq9iWlGJ+bKYIL5FCoJzPPXGKhtrSrrI+Bj5z5SS/4aIF3NC3eKnshk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] svm: Fix MISRA 8.2 violation Message-Id: Date: Fri, 10 May 2024 14:22:02 +0000 commit e8e8afee990ae74a4d2797ddae1b58a4e03912b5 Author: George Dunlap AuthorDate: Thu Apr 25 09:49:42 2024 +0100 Commit: George Dunlap CommitDate: Thu May 9 09:02:01 2024 +0100 svm: Fix MISRA 8.2 violation Misra 8.2 requires named parameters in prototypes. Use the name from the implementaiton. Fixes: 0d19d3aab0 ("svm/nestedsvm: Introduce nested capabilities bit") Reported-by: Andrew Cooper Reported-by: Nicola Vetrini Signed-off-by: George Dunlap Acked-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/hvm/nestedhvm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/hvm/nestedhvm.h b/xen/arch/x86/include/asm/hvm/nestedhvm.h index 0568acb25f..ea2c1bc328 100644 --- a/xen/arch/x86/include/asm/hvm/nestedhvm.h +++ b/xen/arch/x86/include/asm/hvm/nestedhvm.h @@ -83,7 +83,7 @@ static inline bool vvmcx_valid(const struct vcpu *v) } -void start_nested_svm(struct hvm_function_table *); -void start_nested_vmx(struct hvm_function_table *); +void start_nested_svm(struct hvm_function_table *hvm_function_table); +void start_nested_vmx(struct hvm_function_table *hvm_function_table); #endif /* _HVM_NESTEDHVM_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:22:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719905.1122762 (Exim 4.92) (envelope-from ) id 1s5R8X-0001Tb-VU; Fri, 10 May 2024 14:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719905.1122762; Fri, 10 May 2024 14: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 1s5R8X-0001TT-Rh; Fri, 10 May 2024 14:22:13 +0000 Received: by outflank-mailman (input) for mailman id 719905; Fri, 10 May 2024 14:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8W-0001TK-F0 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8W-0006zm-EC for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R8W-0006HY-BY for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=pKhupo8J7w6Xw1xGe95dSHGgtlGNeOVm3gTkWkQRKZk=; b=EYTiL5lLfYP/9I5M2H5EGqP6Uw IxiY30U5yekBOb2OICpfabOg808LPXaC/RCXnmMNpS/nQs/hQ/cKv3Ff0HV5mEh5OHGdBWLFL4m7Q hYgJKaT2VZOoCvFk7mVVCP8qxKu5jDZEKSr1afkPX4i/CPPu/D0w9oAT2hR99b2gC2uI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: tag MISRA C Rule 8.2 as clean. Message-Id: Date: Fri, 10 May 2024 14:22:12 +0000 commit 0c79b7bc9b61fb7bfe2350308955e0ba29a5e3b9 Author: Nicola Vetrini AuthorDate: Thu May 9 14:04:07 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 automation/eclair_analysis: tag MISRA C Rule 8.2 as clean. Tag the rule as clean, as there are no more violations in the codebase since e8e8afee990a ("svm: Fix MISRA 8.2 violation"). Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index bdf94ed996..a014500a41 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:22:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719906.1122765 (Exim 4.92) (envelope-from ) id 1s5R8h-0001WF-WF; Fri, 10 May 2024 14:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719906.1122765; Fri, 10 May 2024 14: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 1s5R8h-0001W6-T3; Fri, 10 May 2024 14:22:23 +0000 Received: by outflank-mailman (input) for mailman id 719906; Fri, 10 May 2024 14:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8g-0001Vo-JI for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8g-00070D-Ha for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R8g-0006I3-GC for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=K1EULYCzlb7pMCf8Y55kyHn16bbIp2VhJoW4k//0bEg=; b=C0aZ6tMgeGK51hWoCMA5j7y22J Qr/gTt5uIx8UU5On4Xrtu/5z31O3riOAgavpzvGVwOPkgvjDXhup9VBzhBRsJWo/F6WKGmuU2BR9a DTKvNMvvgLq2oS6c0BP0+NGCeSGilfRxsqV+wZ1HRYQ/AqI99tp69f3GdYjbGEjrnEfs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: unblock pipelines from certain repositories Message-Id: Date: Fri, 10 May 2024 14:22:22 +0000 commit 3c228e24b2f1c936e773ce83497fe46d5cb1a887 Author: Nicola Vetrini AuthorDate: Mon May 6 10:52:31 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 automation/eclair_analysis: unblock pipelines from certain repositories Repositories under people/* only execute the analyze step if manually triggered, but in order to avoid blocking the rest of the pipeline if such step is not run, allow it to fail. Reported-by: Andrew Cooper Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/analyze.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analyze.yaml index 32bf570149..02e0ea692c 100644 --- a/automation/gitlab-ci/analyze.yaml +++ b/automation/gitlab-ci/analyze.yaml @@ -31,6 +31,7 @@ when: never - if: $WTOKEN && $CI_PROJECT_PATH =~ /^xen-project\/people\/.*$/ when: manual + allow_failure: true - !reference [.eclair-analysis, rules] eclair-x86_64: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:22:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719907.1122769 (Exim 4.92) (envelope-from ) id 1s5R8s-0001Yg-0s; Fri, 10 May 2024 14:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719907.1122769; Fri, 10 May 2024 14:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8r-0001YY-UX; Fri, 10 May 2024 14:22:33 +0000 Received: by outflank-mailman (input) for mailman id 719907; Fri, 10 May 2024 14:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8q-0001YQ-LW for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R8q-00070K-Kc for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R8q-0006JL-Jn for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=xH388D3yuPuwI0Z2xySVU4KMZu39f3UyMmDtoV6j4Ow=; b=YaCXbF0bJf6bvrLTaXzZMMxOwa Wy3sPsSkKhKREjc6qOTwtqLNm6PAwpDoxdVyJ8nhBM3xpabuI9p7y136+yDVq4+0eLBGc7/2K6k6g FFL4WL5VE6pZdX2zzV4ZzEFXCpR3Rdyl2HLKinPKaeU+Kt54RYVv4OdzJiuyejTLBnK8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ucode: Distinguish "ucode already up to date" Message-Id: Date: Fri, 10 May 2024 14:22:32 +0000 commit 648db37a155aca6f66d4cf3bb118417a728c3579 Author: Andrew Cooper AuthorDate: Wed May 8 16:56:12 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/ucode: Distinguish "ucode already up to date" Right now, Xen returns -ENOENT for both "the provided blob isn't correct for this CPU", and "the blob isn't newer than what's loaded". This in turn causes xen-ucode to exit with an error, when "nothing to do" is more commonly a success condition. Handle EEXIST specially and exit cleanly. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- tools/misc/xen-ucode.c | 5 ++++- xen/arch/x86/cpu/microcode/core.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index c6ae6498d6..390969db3d 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -125,8 +125,11 @@ int main(int argc, char *argv[]) exit(1); } + errno = 0; ret = xc_microcode_update(xch, buf, len); - if ( ret ) + if ( ret == -1 && errno == EEXIST ) + printf("Microcode already up to date\n"); + else if ( ret ) { fprintf(stderr, "Failed to update microcode. (err: %s)\n", strerror(errno)); diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index e738a88f5c..762111838f 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -640,7 +640,7 @@ static long cf_check microcode_update_helper(void *data) "microcode: couldn't find any newer%s revision in the provided blob!\n", opt_ucode_allow_same ? " (or the same)" : ""); microcode_free_patch(patch); - ret = -ENOENT; + ret = -EEXIST; goto put; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:22:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719908.1122773 (Exim 4.92) (envelope-from ) id 1s5R92-0001bT-2D; Fri, 10 May 2024 14:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719908.1122773; Fri, 10 May 2024 14: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 1s5R91-0001bL-Vv; Fri, 10 May 2024 14:22:43 +0000 Received: by outflank-mailman (input) for mailman id 719908; Fri, 10 May 2024 14:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R90-0001bB-Oe for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R90-00070X-Nr for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R90-0006KL-Ms for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=nO0qEcrdAOhM4iczwCiCZJ7tno/uEFlyzzVv0/o0X2U=; b=517Lxv2LSQmAIjV1EsZZf/EASq lhvorXs/YeTc5Jvd3oxgWBlK9LEWoPaiaRR27onj6j+4elCPDBI69J6Dn36W6SKF3hKY0cZj8tvlx guyXN0WUvUpSKhMCKBd+FqRo4sWjfP3B++1i7EUMemC1mKB7/fX0dcI8fVRritrNWilI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gunzip: don't leak memory on error paths Message-Id: Date: Fri, 10 May 2024 14:22:42 +0000 commit 473156eec61c162ae73778222283dcc599144030 Author: Jan Beulich AuthorDate: Mon May 6 10:08:40 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: don't leak memory on error paths While decompression errors are likely going to be fatal to Xen's boot process anyway, the latest with the goal of doing multiple decompressor runs it is likely better to avoid leaks even on error paths. All the more when this way code size actually shrinks a tiny bit. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/common/gzip/inflate.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 220d2ff4d9..b5b70bfb70 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -757,16 +757,14 @@ static int noinline __init inflate_fixed(void) } /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) { - free(l); - return 1; - } + i = inflate_codes(tl, td, bl, bd); /* free the decoding tables, return */ free(l); huft_free(tl); huft_free(td); - return 0; + + return !!i; } /* @@ -940,19 +938,17 @@ static int noinline __init inflate_dynamic(void) DEBG("dyn6 "); /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) { - ret = 1; - goto out; - } + ret = !!inflate_codes(tl, td, bl, bd); - DEBG("dyn7 "); + if ( !ret ) + DEBG("dyn7 "); /* free the decoding tables, return */ huft_free(tl); huft_free(td); - DEBG(">"); - ret = 0; + if ( !ret ) + DEBG(">"); out: free(ll); return ret; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:22:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719909.1122777 (Exim 4.92) (envelope-from ) id 1s5R9C-0001eI-4C; Fri, 10 May 2024 14:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719909.1122777; Fri, 10 May 2024 14: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 1s5R9C-0001eA-18; Fri, 10 May 2024 14:22:54 +0000 Received: by outflank-mailman (input) for mailman id 719909; Fri, 10 May 2024 14:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9A-0001e2-Rg for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9A-00070j-Qt for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R9A-0006Kp-Q9 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=TKHZoDpIImXuUx6IlTV7qNBCRz8xb5MrMFdDJ1mpGNE=; b=rDCZF76Xl4ooTTgg+POXAgT42+ xW4Ut+UX0/JAsEao37ziM19Alod5KAEGYJ9pIQPSHd161k1YhaIs5A7UUr9deR1qJ30VAbuzYlKOv RY/512yMYA1A8fbYt4LV0+xQ8gdOjoLd+4tD1hjSpJ3aiBW4V7FzrvAvqIRCv0pwkHco=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gunzip: Introduce struct gunzip_state and refactor window Message-Id: Date: Fri, 10 May 2024 14:22:52 +0000 commit 02e32883f3caa7b40908c405d7dffc92512a0a59 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:17 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Introduce struct gunzip_state and refactor window Introduce struct gunzip_state so the state can be per-instance rather than global. Allocate and free the structure in perform_gunzip(). Move the window (output) pointer into gunzip_state first, which involves plumbing the state pointer all the way down into flush_window(). Drop the 'slide' alias, and the flush_output() macro too as it hides at least one "wp = wp" assignment. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 23 +++++++++++----- xen/common/gzip/inflate.c | 69 ++++++++++++++++++++++++----------------------- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index d07c451cd8..9892564973 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -4,10 +4,12 @@ #include #include -static unsigned char *__initdata window; - #define WSIZE 0x80000000U +struct gunzip_state { + unsigned char *window; +}; + static unsigned char *__initdata inbuf; static unsigned int __initdata insize; @@ -45,7 +47,7 @@ typedef unsigned long ulg; #endif static long __initdata bytes_out; -static void flush_window(void); +static void flush_window(struct gunzip_state *s); static __init void error(const char *x) { @@ -60,7 +62,7 @@ static __init int fill_inbuf(void) #include "inflate.c" -static __init void flush_window(void) +static __init void flush_window(struct gunzip_state *s) { /* * The window is equal to the output buffer therefore only need to @@ -70,7 +72,7 @@ static __init void flush_window(void) unsigned int n; unsigned char *in, ch; - in = window; + in = s->window; for ( n = 0; n < outcnt; n++ ) { ch = *in++; @@ -97,12 +99,17 @@ __init int gzip_check(char *image, unsigned long image_len) __init int perform_gunzip(char *output, char *image, unsigned long image_len) { + struct gunzip_state *s; int rc; if ( !gzip_check(image, image_len) ) return 1; - window = (unsigned char *)output; + s = malloc(sizeof(struct gunzip_state)); + if ( !s ) + return -ENOMEM; + + s->window = (unsigned char *)output; inbuf = (unsigned char *)image; insize = image_len; inptr = 0; @@ -110,7 +117,7 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) makecrc(); - if ( gunzip() < 0 ) + if ( gunzip(s) < 0 ) { rc = -EINVAL; } @@ -119,6 +126,8 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) rc = 0; } + free(s); + return rc; } diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index b5b70bfb70..ccfb2c718c 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -119,8 +119,6 @@ static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #"; #endif /* !__XEN__ */ -#define slide window - /* * Huffman code lookup table entry--this entry is four bytes for machines * that have 16-bit pointers (e.g. PC's in the small or medium model). @@ -143,12 +141,13 @@ struct huft { static int huft_build(unsigned *, unsigned, unsigned, const ush *, const ush *, struct huft **, int *); static int huft_free(struct huft *); -static int inflate_codes(struct huft *, struct huft *, int, int); -static int inflate_stored(void); -static int inflate_fixed(void); -static int inflate_dynamic(void); -static int inflate_block(int *); -static int inflate(void); +static int inflate_codes( + struct gunzip_state *s, struct huft *tl, struct huft *td, int bl, int bd); +static int inflate_stored(struct gunzip_state *s); +static int inflate_fixed(struct gunzip_state *s); +static int inflate_dynamic(struct gunzip_state *s); +static int inflate_block(struct gunzip_state *s, int *e); +static int inflate(struct gunzip_state *s); /* * The inflate algorithm uses a sliding 32 K byte window on the uncompressed @@ -163,7 +162,6 @@ static int inflate(void); */ /* unsigned wp; current position in slide */ #define wp outcnt -#define flush_output(w) (wp=(w),flush_window()) /* Tables for deflate from PKZIP's appnote.txt. */ static const unsigned border[] = { /* Order of the bit length code lengths */ @@ -545,7 +543,7 @@ static int __init huft_free(struct huft *t) * @param bd Number of bits decoded by td[] */ static int __init inflate_codes( - struct huft *tl, struct huft *td, int bl, int bd) + struct gunzip_state *s, struct huft *tl, struct huft *td, int bl, int bd) { register unsigned e; /* table entry flag/number of extra bits */ unsigned n, d; /* length and index for copy */ @@ -578,11 +576,12 @@ static int __init inflate_codes( DUMPBITS(t->b); if (e == 16) /* then it's a literal */ { - slide[w++] = (uch)t->v.n; - Tracevv((stderr, "%c", slide[w-1])); + s->window[w++] = (uch)t->v.n; + Tracevv((stderr, "%c", s->window[w-1])); if (w == WSIZE) { - flush_output(w); + wp = w; + flush_window(s); w = 0; } } @@ -618,18 +617,19 @@ static int __init inflate_codes( n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e); if (w - d >= e) /* (this test assumes unsigned comparison) */ { - memcpy(slide + w, slide + d, e); + memcpy(s->window + w, s->window + d, e); w += e; d += e; } else /* do it slow to avoid memcpy() overlap */ do { - slide[w++] = slide[d++]; - Tracevv((stderr, "%c", slide[w-1])); + s->window[w++] = s->window[d++]; + Tracevv((stderr, "%c", s->window[w-1])); } while (--e); if (w == WSIZE) { - flush_output(w); + wp = w; + flush_window(s); w = 0; } } while (n); @@ -649,7 +649,7 @@ static int __init inflate_codes( } /* "decompress" an inflated type 0 (stored) block. */ -static int __init inflate_stored(void) +static int __init inflate_stored(struct gunzip_state *s) { unsigned n; /* number of bytes in block */ unsigned w; /* current window position */ @@ -682,10 +682,11 @@ static int __init inflate_stored(void) while (n--) { NEEDBITS(8); - slide[w++] = (uch)b; + s->window[w++] = (uch)b; if (w == WSIZE) { - flush_output(w); + wp = w; + flush_window(s); w = 0; } DUMPBITS(8); @@ -713,7 +714,7 @@ static int __init inflate_stored(void) * either replace this with a custom decoder, or at least precompute the * Huffman tables. */ -static int noinline __init inflate_fixed(void) +static int noinline __init inflate_fixed(struct gunzip_state *s) { int i; /* temporary variable */ struct huft *tl; /* literal/length code table */ @@ -757,7 +758,7 @@ static int noinline __init inflate_fixed(void) } /* decompress until an end-of-block code */ - i = inflate_codes(tl, td, bl, bd); + i = inflate_codes(s, tl, td, bl, bd); /* free the decoding tables, return */ free(l); @@ -772,7 +773,7 @@ static int noinline __init inflate_fixed(void) */ /* decompress an inflated type 2 (dynamic Huffman codes) block. */ -static int noinline __init inflate_dynamic(void) +static int noinline __init inflate_dynamic(struct gunzip_state *s) { int i; /* temporary variables */ unsigned j; @@ -938,7 +939,7 @@ static int noinline __init inflate_dynamic(void) DEBG("dyn6 "); /* decompress until an end-of-block code */ - ret = !!inflate_codes(tl, td, bl, bd); + ret = !!inflate_codes(s, tl, td, bl, bd); if ( !ret ) DEBG("dyn7 "); @@ -963,7 +964,7 @@ static int noinline __init inflate_dynamic(void) * * @param e Last block flag */ -static int __init inflate_block(int *e) +static int __init inflate_block(struct gunzip_state *s, int *e) { unsigned t; /* block type */ register ulg b; /* bit buffer */ @@ -991,11 +992,11 @@ static int __init inflate_block(int *e) /* inflate that block type */ if (t == 2) - return inflate_dynamic(); + return inflate_dynamic(s); if (t == 0) - return inflate_stored(); + return inflate_stored(s); if (t == 1) - return inflate_fixed(); + return inflate_fixed(s); DEBG(">"); @@ -1007,7 +1008,7 @@ static int __init inflate_block(int *e) } /* decompress an inflated entry */ -static int __init inflate(void) +static int __init inflate(struct gunzip_state *s) { int e; /* last block flag */ int r; /* result code */ @@ -1019,7 +1020,7 @@ static int __init inflate(void) /* decompress until the last block */ do { - r = inflate_block(&e); + r = inflate_block(s, &e); if (r) return r; } while (!e); @@ -1032,8 +1033,7 @@ static int __init inflate(void) inptr--; } - /* flush out slide */ - flush_output(wp); + flush_window(s); /* return success */ return 0; @@ -1101,7 +1101,7 @@ static void __init makecrc(void) /* * Do the uncompression! */ -static int __init gunzip(void) +static int __init gunzip(struct gunzip_state *s) { uch flags; unsigned char magic[2]; /* magic header */ @@ -1165,7 +1165,8 @@ static int __init gunzip(void) } /* Decompress */ - if ((res = inflate())) { + if ( (res = inflate(s)) ) + { switch (res) { case 0: break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:23:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719910.1122781 (Exim 4.92) (envelope-from ) id 1s5R9M-0001iJ-7s; Fri, 10 May 2024 14:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719910.1122781; Fri, 10 May 2024 14: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 1s5R9M-0001iB-4E; Fri, 10 May 2024 14:23:04 +0000 Received: by outflank-mailman (input) for mailman id 719910; Fri, 10 May 2024 14:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9K-0001hs-Ud for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9K-00071B-Ts for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R9K-0006LW-T2 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=kpFg7GSZnILnQMaqDrO2HGzEk/iTTwNxeYrpSXavjpI=; b=bYYMEY6H/bsW3y7+QsJGoNYpI6 KFOETDQjUgUV6ZXIzc3oqz1gQw6yuAntKfKyp3nVMuGsHZSsoj1ywDefq1bnuJHCLR9/5QgHvW6f0 na5Gb1kFgwPP77KK/YChLi0Gmq5i7z8YS6E3yuByiORs/NOSAkYpJocqnfmWcGRTJ9qg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gunzip: Move window position into gunzip_state Message-Id: Date: Fri, 10 May 2024 14:23:02 +0000 commit 461eacc76b539f0631828c44e4c2ed38fbe3fe91 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:18 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move window position into gunzip_state Move the window position, outcnt/wp, into struct gunzip_state. This removes 'outcnt' and it's alias 'wp'. Consistently use the term "position" which is better than "pointer" given that this is is a plain integer field. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 12 ++++++------ xen/common/gzip/inflate.c | 18 ++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index 9892564973..f2c3a5b6cd 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -8,6 +8,9 @@ struct gunzip_state { unsigned char *window; + + /* window position */ + unsigned int wp; }; static unsigned char *__initdata inbuf; @@ -16,9 +19,6 @@ static unsigned int __initdata insize; /* Index of next byte to be processed in inbuf: */ static unsigned int __initdata inptr; -/* Bytes in output buffer: */ -static unsigned int __initdata outcnt; - #define malloc(a) xmalloc_bytes(a) #define free(a) xfree(a) #define memzero(s, n) memset((s), 0, (n)) @@ -73,15 +73,15 @@ static __init void flush_window(struct gunzip_state *s) unsigned char *in, ch; in = s->window; - for ( n = 0; n < outcnt; n++ ) + for ( n = 0; n < s->wp; n++ ) { ch = *in++; c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); } crc = c; - bytes_out += (unsigned long)outcnt; - outcnt = 0; + bytes_out += s->wp; + s->wp = 0; } __init int gzip_check(char *image, unsigned long image_len) diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index ccfb2c718c..651056ef24 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -160,8 +160,6 @@ static int inflate(struct gunzip_state *s); * "uch *slide;" and then malloc'ed in the latter case. The definition * must be in unzip.h, included above. */ -/* unsigned wp; current position in slide */ -#define wp outcnt /* Tables for deflate from PKZIP's appnote.txt. */ static const unsigned border[] = { /* Order of the bit length code lengths */ @@ -557,7 +555,7 @@ static int __init inflate_codes( /* make local copies of globals */ b = bb; /* initialize bit buffer */ k = bk; - w = wp; /* initialize window position */ + w = s->wp; /* initialize window position */ /* inflate the coded data */ ml = mask_bits[bl]; /* precompute masks for speed */ @@ -580,7 +578,7 @@ static int __init inflate_codes( Tracevv((stderr, "%c", s->window[w-1])); if (w == WSIZE) { - wp = w; + s->wp = w; flush_window(s); w = 0; } @@ -628,7 +626,7 @@ static int __init inflate_codes( } while (--e); if (w == WSIZE) { - wp = w; + s->wp = w; flush_window(s); w = 0; } @@ -637,7 +635,7 @@ static int __init inflate_codes( } /* restore the globals from the locals */ - wp = w; /* restore global window pointer */ + s->wp = w; /* restore global window position */ bb = b; /* restore global bit buffer */ bk = k; @@ -661,7 +659,7 @@ static int __init inflate_stored(struct gunzip_state *s) /* make local copies of globals */ b = bb; /* initialize bit buffer */ k = bk; - w = wp; /* initialize window position */ + w = s->wp; /* initialize window position */ /* go to byte boundary */ @@ -685,7 +683,7 @@ static int __init inflate_stored(struct gunzip_state *s) s->window[w++] = (uch)b; if (w == WSIZE) { - wp = w; + s->wp = w; flush_window(s); w = 0; } @@ -693,7 +691,7 @@ static int __init inflate_stored(struct gunzip_state *s) } /* restore the globals from the locals */ - wp = w; /* restore global window pointer */ + s->wp = w; /* restore global window position */ bb = b; /* restore global bit buffer */ bk = k; @@ -1014,7 +1012,7 @@ static int __init inflate(struct gunzip_state *s) int r; /* result code */ /* initialize window, bit buffer */ - wp = 0; + s->wp = 0; bk = 0; bb = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:23:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:23:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719913.1122794 (Exim 4.92) (envelope-from ) id 1s5R9X-00020R-GU; Fri, 10 May 2024 14:23:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719913.1122794; Fri, 10 May 2024 14:23:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9X-00020J-D0; Fri, 10 May 2024 14:23:15 +0000 Received: by outflank-mailman (input) for mailman id 719913; Fri, 10 May 2024 14:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9V-0001lN-1W for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9V-00071N-0i for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R9U-0006Lx-W1 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=Vwd+FuFScpxFhik+kf8Xm2wtpRJeouH/tI3UGfyJiB0=; b=ZfypAlceSpsu2sBWGyxgOHb2e8 YS0dv4mX9KhacpIIe9M7faiVCdMWry9KxBB6gEmy9ciKMqnThN23NCtpqjPq17adlhQ84mMOG4QI3 UopY72t3xNQrCwkUmNjD+zBrLh0+Zw5imedPp2WzPxvk6xqIYGvuq1vXLczbF7APLyjg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gunzip: Move input buffer handling into gunzip_state Message-Id: Date: Fri, 10 May 2024 14:23:12 +0000 commit fd273a5690f4ca4d19b79c42562e8b53c3197327 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:19 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move input buffer handling into gunzip_state Move the input buffer handling, buffer pointer(inbuf), size(insize), and index(inptr), into gunzip_state. Adjust functions and macros that consumed the input buffer to accept a struct gunzip_state reference. Convert get_byte() into a real function and subsume fill_inbuf(). Fix the failure path to work correctly when error() stops being a plain panic(). Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 30 ++++++++------- xen/common/gzip/inflate.c | 97 +++++++++++++++++++++++++---------------------- 2 files changed, 67 insertions(+), 60 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index f2c3a5b6cd..a04ddd7445 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -11,13 +11,12 @@ struct gunzip_state { /* window position */ unsigned int wp; -}; - -static unsigned char *__initdata inbuf; -static unsigned int __initdata insize; -/* Index of next byte to be processed in inbuf: */ -static unsigned int __initdata inptr; + unsigned char *inbuf; + unsigned int insize; + /* Index of next byte to be processed in inbuf: */ + unsigned int inptr; +}; #define malloc(a) xmalloc_bytes(a) #define free(a) xfree(a) @@ -27,8 +26,6 @@ typedef unsigned char uch; typedef unsigned short ush; typedef unsigned long ulg; -#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf()) - /* Diagnostic functions */ #ifdef DEBUG # define Assert(cond, msg) do { if (!(cond)) error(msg); } while (0) @@ -54,10 +51,15 @@ static __init void error(const char *x) panic("%s\n", x); } -static __init int fill_inbuf(void) +static __init int get_byte(struct gunzip_state *s) { - error("ran out of input data"); - return 0; + if ( s->inptr >= s->insize ) + { + error("ran out of input data"); + return -1; + } + + return s->inbuf[s->inptr++]; } #include "inflate.c" @@ -110,9 +112,9 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) return -ENOMEM; s->window = (unsigned char *)output; - inbuf = (unsigned char *)image; - insize = image_len; - inptr = 0; + s->inbuf = (unsigned char *)image; + s->insize = image_len; + s->inptr = 0; bytes_out = 0; makecrc(); diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 651056ef24..62179e6ed6 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -220,8 +220,8 @@ static const ush mask_bits[] = { 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff }; -#define NEXTBYTE() ({ int v = get_byte(); if (v < 0) goto underrun; (uch)v; }) -#define NEEDBITS(n) {while(k<(n)){b|=((ulg)NEXTBYTE())<>=(n);k-=(n);} /* @@ -562,14 +562,14 @@ static int __init inflate_codes( md = mask_bits[bd]; for (;;) /* do until end of block */ { - NEEDBITS((unsigned)bl); + NEEDBITS(s, (unsigned)bl); if ((e = (t = tl + ((unsigned)b & ml))->e) > 16) do { if (e == 99) return 1; DUMPBITS(t->b); e -= 16; - NEEDBITS(e); + NEEDBITS(s, e); } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); DUMPBITS(t->b); if (e == 16) /* then it's a literal */ @@ -590,22 +590,22 @@ static int __init inflate_codes( break; /* get length of block to copy */ - NEEDBITS(e); + NEEDBITS(s, e); n = t->v.n + ((unsigned)b & mask_bits[e]); DUMPBITS(e); /* decode distance of block to copy */ - NEEDBITS((unsigned)bd); + NEEDBITS(s, (unsigned)bd); if ((e = (t = td + ((unsigned)b & md))->e) > 16) do { if (e == 99) return 1; DUMPBITS(t->b); e -= 16; - NEEDBITS(e); + NEEDBITS(s, e); } while ((e = (t = t->v.t + ((unsigned)b & mask_bits[e]))->e) > 16); DUMPBITS(t->b); - NEEDBITS(e); + NEEDBITS(s, e); d = w - t->v.n - ((unsigned)b & mask_bits[e]); DUMPBITS(e); Tracevv((stderr,"\\[%d,%d]", w-d, n)); @@ -668,10 +668,10 @@ static int __init inflate_stored(struct gunzip_state *s) /* get the length and its complement */ - NEEDBITS(16); + NEEDBITS(s, 16); n = ((unsigned)b & 0xffff); DUMPBITS(16); - NEEDBITS(16); + NEEDBITS(s, 16); if (n != (unsigned)((~b) & 0xffff)) return 1; /* error in compressed data */ DUMPBITS(16); @@ -679,7 +679,7 @@ static int __init inflate_stored(struct gunzip_state *s) /* read and output the compressed data */ while (n--) { - NEEDBITS(8); + NEEDBITS(s, 8); s->window[w++] = (uch)b; if (w == WSIZE) { @@ -802,13 +802,13 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) k = bk; /* read in table lengths */ - NEEDBITS(5); + NEEDBITS(s, 5); nl = 257 + ((unsigned)b & 0x1f); /* number of literal/length codes */ DUMPBITS(5); - NEEDBITS(5); + NEEDBITS(s, 5); nd = 1 + ((unsigned)b & 0x1f); /* number of distance codes */ DUMPBITS(5); - NEEDBITS(4); + NEEDBITS(s, 4); nb = 4 + ((unsigned)b & 0xf); /* number of bit length codes */ DUMPBITS(4); if (nl > 286 || nd > 30) @@ -822,7 +822,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) /* read in bit-length-code lengths */ for (j = 0; j < nb; j++) { - NEEDBITS(3); + NEEDBITS(s, 3); ll[border[j]] = (unsigned)b & 7; DUMPBITS(3); } @@ -849,7 +849,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) i = l = 0; while ((unsigned)i < n) { - NEEDBITS((unsigned)bl); + NEEDBITS(s, (unsigned)bl); j = (td = tl + ((unsigned)b & m))->b; DUMPBITS(j); j = td->v.n; @@ -857,7 +857,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) ll[i++] = l = j; /* save last length in l */ else if (j == 16) /* repeat last length 3 to 6 times */ { - NEEDBITS(2); + NEEDBITS(s, 2); j = 3 + ((unsigned)b & 3); DUMPBITS(2); if ((unsigned)i + j > n) { @@ -869,7 +869,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) } else if (j == 17) /* 3 to 10 zero length codes */ { - NEEDBITS(3); + NEEDBITS(s, 3); j = 3 + ((unsigned)b & 7); DUMPBITS(3); if ((unsigned)i + j > n) { @@ -882,7 +882,7 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) } else /* j == 18: 11 to 138 zero length codes */ { - NEEDBITS(7); + NEEDBITS(s, 7); j = 11 + ((unsigned)b & 0x7f); DUMPBITS(7); if ((unsigned)i + j > n) { @@ -975,12 +975,12 @@ static int __init inflate_block(struct gunzip_state *s, int *e) k = bk; /* read in last block bit */ - NEEDBITS(1); + NEEDBITS(s, 1); *e = (int)b & 1; DUMPBITS(1); /* read in block type */ - NEEDBITS(2); + NEEDBITS(s, 2); t = (unsigned)b & 3; DUMPBITS(2); @@ -1028,7 +1028,7 @@ static int __init inflate(struct gunzip_state *s) */ while (bk >= 8) { bk -= 8; - inptr--; + s->inptr--; } flush_window(s); @@ -1108,9 +1108,9 @@ static int __init gunzip(struct gunzip_state *s) ulg orig_len = 0; /* original uncompressed length */ int res; - magic[0] = NEXTBYTE(); - magic[1] = NEXTBYTE(); - method = NEXTBYTE(); + magic[0] = NEXTBYTE(s); + magic[1] = NEXTBYTE(s); + method = NEXTBYTE(s); if (magic[0] != 037 || /* octal-ok */ ((magic[1] != 0213) && (magic[1] != 0236))) { /* octal-ok */ @@ -1124,7 +1124,7 @@ static int __init gunzip(struct gunzip_state *s) return -1; } - flags = (uch)get_byte(); + flags = (uch)get_byte(s); if ((flags & ENCRYPTED) != 0) { error("Input is encrypted"); return -1; @@ -1137,29 +1137,34 @@ static int __init gunzip(struct gunzip_state *s) error("Input has invalid flags"); return -1; } - NEXTBYTE(); /* Get timestamp */ - NEXTBYTE(); - NEXTBYTE(); - NEXTBYTE(); + NEXTBYTE(s); /* Get timestamp */ + NEXTBYTE(s); + NEXTBYTE(s); + NEXTBYTE(s); - (void)NEXTBYTE(); /* Ignore extra flags for the moment */ - (void)NEXTBYTE(); /* Ignore OS type for the moment */ + NEXTBYTE(s); /* Ignore extra flags for the moment */ + NEXTBYTE(s); /* Ignore OS type for the moment */ if ((flags & EXTRA_FIELD) != 0) { - unsigned len = (unsigned)NEXTBYTE(); - len |= ((unsigned)NEXTBYTE())<<8; - while (len--) (void)NEXTBYTE(); + unsigned int len = NEXTBYTE(s); + + len |= (unsigned int)NEXTBYTE(s) << 8; + + while ( len-- ) + NEXTBYTE(s); } /* Get original file name if it was truncated */ if ((flags & ORIG_NAME) != 0) { /* Discard the old name */ - while (NEXTBYTE() != 0) /* null */ ; + while ( NEXTBYTE(s) != 0) /* null */ + ; } /* Discard file comment if any */ if ((flags & COMMENT) != 0) { - while (NEXTBYTE() != 0) /* null */ ; + while ( NEXTBYTE(s) != 0 ) /* null */ + ; } /* Decompress */ @@ -1190,15 +1195,15 @@ static int __init gunzip(struct gunzip_state *s) /* crc32 (see algorithm.doc) * uncompressed input size modulo 2^32 */ - orig_crc = (ulg) NEXTBYTE(); - orig_crc |= (ulg) NEXTBYTE() << 8; - orig_crc |= (ulg) NEXTBYTE() << 16; - orig_crc |= (ulg) NEXTBYTE() << 24; - - orig_len = (ulg) NEXTBYTE(); - orig_len |= (ulg) NEXTBYTE() << 8; - orig_len |= (ulg) NEXTBYTE() << 16; - orig_len |= (ulg) NEXTBYTE() << 24; + orig_crc = (ulg) NEXTBYTE(s); + orig_crc |= (ulg) NEXTBYTE(s) << 8; + orig_crc |= (ulg) NEXTBYTE(s) << 16; + orig_crc |= (ulg) NEXTBYTE(s) << 24; + + orig_len = (ulg) NEXTBYTE(s); + orig_len |= (ulg) NEXTBYTE(s) << 8; + orig_len |= (ulg) NEXTBYTE(s) << 16; + orig_len |= (ulg) NEXTBYTE(s) << 24; /* Validate decompression */ if (orig_crc != CRC_VALUE) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:23:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719915.1122799 (Exim 4.92) (envelope-from ) id 1s5R9g-00026y-I4; Fri, 10 May 2024 14:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719915.1122799; Fri, 10 May 2024 14: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 1s5R9g-00026o-FI; Fri, 10 May 2024 14:23:24 +0000 Received: by outflank-mailman (input) for mailman id 719915; Fri, 10 May 2024 14:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9f-00026B-4e for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9f-00071p-3q for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R9f-0006Ma-2w for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=CQUKZb3wrw1COeCc1frqGyEhIfZhclBuweBzpwyjA7I=; b=sVEcW7SloqlcTKabqnXYXar7HT WpsP2k4r0W+SrcpE7dD5wi2BqlUDDOL7kfuAH9JrDwgJ8JZfb5CYhqz+sM9mNXxxZ3PIVLulXJokX CZ6eXToyl6XkgfTpFUYaj9eToiyItmLRVJw0NyinQX73oH6dCFbX5LrLkcSre0fep4xs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gunzip: Move output count into gunzip_state Message-Id: Date: Fri, 10 May 2024 14:23:23 +0000 commit d386a383dd6fe937cbd05ea9502f5e6059ad3036 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:20 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move output count into gunzip_state Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 7 ++++--- xen/common/gzip/inflate.c | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index a04ddd7445..8770430312 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -16,6 +16,8 @@ struct gunzip_state { unsigned int insize; /* Index of next byte to be processed in inbuf: */ unsigned int inptr; + + unsigned long bytes_out; }; #define malloc(a) xmalloc_bytes(a) @@ -43,7 +45,6 @@ typedef unsigned long ulg; # define Tracecv(c, x) #endif -static long __initdata bytes_out; static void flush_window(struct gunzip_state *s); static __init void error(const char *x) @@ -82,7 +83,7 @@ static __init void flush_window(struct gunzip_state *s) } crc = c; - bytes_out += s->wp; + s->bytes_out += s->wp; s->wp = 0; } @@ -115,7 +116,7 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) s->inbuf = (unsigned char *)image; s->insize = image_len; s->inptr = 0; - bytes_out = 0; + s->bytes_out = 0; makecrc(); diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 62179e6ed6..2d53391e74 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -1210,7 +1210,9 @@ static int __init gunzip(struct gunzip_state *s) error("crc error"); return -1; } - if (orig_len != bytes_out) { + + if ( orig_len != s->bytes_out ) + { error("length error"); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:23:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719916.1122802 (Exim 4.92) (envelope-from ) id 1s5R9q-0002Hq-JY; Fri, 10 May 2024 14:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719916.1122802; Fri, 10 May 2024 14: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 1s5R9q-0002Hi-Gk; Fri, 10 May 2024 14:23:34 +0000 Received: by outflank-mailman (input) for mailman id 719916; Fri, 10 May 2024 14:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9p-0002GA-7Q for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9p-00071y-6e for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R9p-0006NK-5x for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=M+XBv1Hshp6wlha7p2QdqQEptp3018hLAVnfHZJTvCc=; b=qybQtpanvDlz7dhm2994O5ZqAN CT1dNe+oyWAoaqYpP4xx618XRdvWqtwwqmr092F8BwFzuMtt+M6nE19C7k+ZL8i/tpm4U/d6O3D5M uxf20mHWk+eoYB0F1PIsznpQyZpEbKZ59wslnpvqwBlLlQJPNViugUce4vcynVUFtE4U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gunzip: Move bitbuffer into gunzip_state Message-Id: Date: Fri, 10 May 2024 14:23:33 +0000 commit 7a4483358f6171c4fab3ef5a56161eb90f6668f4 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:21 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move bitbuffer into gunzip_state Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 3 +++ xen/common/gzip/inflate.c | 44 +++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index 8770430312..134144a184 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -18,6 +18,9 @@ struct gunzip_state { unsigned int inptr; unsigned long bytes_out; + + unsigned long bb; /* bit buffer */ + unsigned int bk; /* bits in bit buffer */ }; #define malloc(a) xmalloc_bytes(a) diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 2d53391e74..7487616442 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -211,9 +211,6 @@ static const ush cpdext[] = { /* Extra bits for distance codes */ * the stream. */ -static ulg __initdata bb; /* bit buffer */ -static unsigned __initdata bk; /* bits in bit buffer */ - static const ush mask_bits[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, @@ -553,8 +550,8 @@ static int __init inflate_codes( /* make local copies of globals */ - b = bb; /* initialize bit buffer */ - k = bk; + b = s->bb; /* initialize bit buffer */ + k = s->bk; w = s->wp; /* initialize window position */ /* inflate the coded data */ @@ -636,8 +633,8 @@ static int __init inflate_codes( /* restore the globals from the locals */ s->wp = w; /* restore global window position */ - bb = b; /* restore global bit buffer */ - bk = k; + s->bb = b; /* restore global bit buffer */ + s->bk = k; /* done */ return 0; @@ -657,8 +654,8 @@ static int __init inflate_stored(struct gunzip_state *s) DEBG("bb; /* initialize bit buffer */ + k = s->bk; w = s->wp; /* initialize window position */ @@ -692,8 +689,8 @@ static int __init inflate_stored(struct gunzip_state *s) /* restore the globals from the locals */ s->wp = w; /* restore global window position */ - bb = b; /* restore global bit buffer */ - bk = k; + s->bb = b; /* restore global bit buffer */ + s->bk = k; DEBG(">"); return 0; @@ -798,8 +795,8 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) return 1; /* make local bit buffer */ - b = bb; - k = bk; + b = s->bb; + k = s->bk; /* read in table lengths */ NEEDBITS(s, 5); @@ -903,8 +900,8 @@ static int noinline __init inflate_dynamic(struct gunzip_state *s) DEBG("dyn5 "); /* restore the global bit buffer */ - bb = b; - bk = k; + s->bb = b; + s->bk = k; DEBG("dyn5a "); @@ -971,8 +968,8 @@ static int __init inflate_block(struct gunzip_state *s, int *e) DEBG("bb; + k = s->bk; /* read in last block bit */ NEEDBITS(s, 1); @@ -985,8 +982,8 @@ static int __init inflate_block(struct gunzip_state *s, int *e) DUMPBITS(2); /* restore the global bit buffer */ - bb = b; - bk = k; + s->bb = b; + s->bk = k; /* inflate that block type */ if (t == 2) @@ -1013,8 +1010,8 @@ static int __init inflate(struct gunzip_state *s) /* initialize window, bit buffer */ s->wp = 0; - bk = 0; - bb = 0; + s->bk = 0; + s->bb = 0; /* decompress until the last block */ do { @@ -1026,8 +1023,9 @@ static int __init inflate(struct gunzip_state *s) /* Undo too much lookahead. The next read will be byte aligned so we * can discard unused bits in the last meaningful byte. */ - while (bk >= 8) { - bk -= 8; + while ( s->bk >= 8 ) + { + s->bk -= 8; s->inptr--; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:23:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:23:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719918.1122807 (Exim 4.92) (envelope-from ) id 1s5R9z-0002W7-NR; Fri, 10 May 2024 14:23:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719918.1122807; Fri, 10 May 2024 14:23: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 1s5R9z-0002Vz-KQ; Fri, 10 May 2024 14:23:43 +0000 Received: by outflank-mailman (input) for mailman id 719918; Fri, 10 May 2024 14:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9z-0002Vl-AH for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5R9z-000729-9Z for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5R9z-0006Nl-8s for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=q8iC/P2hMtIv7c1dCO1fbyn6le79H/zgTra4WoBJIYc=; b=EGo8lquQDiIY8e4S7anqaICowt l1nLu5SP8YjzbsvFptN0hiI5Gq42ybuzNHwiq0XAUECEd3GQ5yNsAYWxMz7sN+4n8xKFP+9KFBgOQ K+FfG4DQ/SlGPBUVP7Zu7SGb2g7iWDEDdu0w1SJLoyXC5XeNpfhRpWOI2OeYA8WrgV5U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/gunzip: Move crc state into gunzip_state Message-Id: Date: Fri, 10 May 2024 14:23:43 +0000 commit 1c6112b8f5c5d6f2c5ff1c84887cd9241c891732 Author: Daniel P. Smith AuthorDate: Wed Apr 24 12:34:22 2024 -0400 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/gunzip: Move crc state into gunzip_state Move the crc and its state into struct gunzip_state. In the process, expand the only use of CRC_VALUE as it is hides what is being compared. Furthermore, all variables here should be uint32_t rather than unsigned long, which halves the storage space required. Filter the typechanges through the logic. Adjust the logic to hold crc in a positive form, and negate it for update in flush_window(). This is the more normal way to write CRC algorithms, and avoids weird-to-follow logic in gunzip(). Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/common/gzip/gunzip.c | 11 +++++++---- xen/common/gzip/inflate.c | 16 ++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/xen/common/gzip/gunzip.c b/xen/common/gzip/gunzip.c index 134144a184..89f45d4050 100644 --- a/xen/common/gzip/gunzip.c +++ b/xen/common/gzip/gunzip.c @@ -21,6 +21,9 @@ struct gunzip_state { unsigned long bb; /* bit buffer */ unsigned int bk; /* bits in bit buffer */ + + uint32_t crc_32_tab[256]; + uint32_t crc; }; #define malloc(a) xmalloc_bytes(a) @@ -74,7 +77,7 @@ static __init void flush_window(struct gunzip_state *s) * The window is equal to the output buffer therefore only need to * compute the crc. */ - unsigned long c = crc; + uint32_t c = ~s->crc; unsigned int n; unsigned char *in, ch; @@ -82,9 +85,9 @@ static __init void flush_window(struct gunzip_state *s) for ( n = 0; n < s->wp; n++ ) { ch = *in++; - c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); + c = s->crc_32_tab[(c ^ ch) & 0xff] ^ (c >> 8); } - crc = c; + s->crc = ~c; s->bytes_out += s->wp; s->wp = 0; @@ -121,7 +124,7 @@ __init int perform_gunzip(char *output, char *image, unsigned long image_len) s->inptr = 0; s->bytes_out = 0; - makecrc(); + makecrc(s); if ( gunzip(s) < 0 ) { diff --git a/xen/common/gzip/inflate.c b/xen/common/gzip/inflate.c index 7487616442..b9a2d7a23a 100644 --- a/xen/common/gzip/inflate.c +++ b/xen/common/gzip/inflate.c @@ -1041,16 +1041,12 @@ static int __init inflate(struct gunzip_state *s) * **********************************************************************/ -static ulg __initdata crc_32_tab[256]; -static ulg __initdata crc; /* initialized in makecrc() so it'll reside in bss */ -#define CRC_VALUE (crc ^ 0xffffffffUL) - /* * Code to compute the CRC-32 table. Borrowed from * gzip-1.0.3/makecrc.c. */ -static void __init makecrc(void) +static void __init makecrc(struct gunzip_state *s) { /* Not copyrighted 1990 Mark Adler */ @@ -1067,7 +1063,7 @@ static void __init makecrc(void) for (i = 0; i < sizeof(p)/sizeof(int); i++) e |= 1L << (31 - p[i]); - crc_32_tab[0] = 0; + s->crc_32_tab[0] = 0; for (i = 1; i < 256; i++) { @@ -1078,11 +1074,10 @@ static void __init makecrc(void) if (k & 1) c ^= e; } - crc_32_tab[i] = c; + s->crc_32_tab[i] = c; } - /* this is initialized here so this code could reside in ROM */ - crc = (ulg)0xffffffffUL; /* shift register contents */ + s->crc = 0; } /* gzip flag byte */ @@ -1204,7 +1199,8 @@ static int __init gunzip(struct gunzip_state *s) orig_len |= (ulg) NEXTBYTE(s) << 24; /* Validate decompression */ - if (orig_crc != CRC_VALUE) { + if ( orig_crc != s->crc ) + { error("crc error"); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:23:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:23:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719920.1122811 (Exim 4.92) (envelope-from ) id 1s5RA9-0002lm-Oe; Fri, 10 May 2024 14:23:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719920.1122811; Fri, 10 May 2024 14:23: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 1s5RA9-0002lf-Lw; Fri, 10 May 2024 14:23:53 +0000 Received: by outflank-mailman (input) for mailman id 719920; Fri, 10 May 2024 14:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RA9-0002lW-DJ for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RA9-00072K-CV for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RA9-0006OE-Bm for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=xFohjJ8PFO2Zs4Gz1Ua0TNpinqVK+YIEhvI3HfOsbAM=; b=3FrCBhWWKzkQSGQ7qVYr4w9ckN 3fNQq8vNkg+gJz4dpDlY4nSIfNmMM+GvRzDbXNCbD6bqH1QnMMKQEuIhNm1ACn6T7MY5gG/jFDDRV JtEFQWWDFY9nfmysccleT3v6q3+3Xxg+zCzIvo7BOQJoClpVWC6grbKPNFcXdKcq6E94=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/hvmloader: Move various helpers to being static inlines Message-Id: Date: Fri, 10 May 2024 14:23:53 +0000 commit 754a29cacf8eb3bbfeeff00a46b2b9dec512936f Author: Andrew Cooper AuthorDate: Wed Aug 24 11:08:28 2022 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 tools/hvmloader: Move various helpers to being static inlines The IO port, MSR, IO-APIC and LAPIC accessors compile typically to single or pairs of instructions, which is less overhead than even the stack manipulation to call the helpers. Move the implementations from util.c to being static inlines in util.h In addition, turn ioapic_base_address into a constant as it is never modified from 0xfec00000 (substantially shrinks the IO-APIC logic), and make use of the "A" constraint for WRMSR/RDMSR like we already do for RDTSC. Bloat-o-meter reports a net: add/remove: 0/13 grow/shrink: 0/18 up/down: 0/-790 (-790) No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/firmware/hvmloader/config.h | 1 - tools/firmware/hvmloader/hvmloader.c | 1 - tools/firmware/hvmloader/mp_tables.c | 2 +- tools/firmware/hvmloader/util.c | 78 +------------------------ tools/firmware/hvmloader/util.h | 110 +++++++++++++++++++++++++++++++---- 5 files changed, 100 insertions(+), 92 deletions(-) diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index c82adf6dc5..cd716bf392 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -44,7 +44,6 @@ extern struct bios_config ovmf_config; #define PAGE_SHIFT 12 #define PAGE_SIZE (1ul << PAGE_SHIFT) -extern uint32_t ioapic_base_address; extern uint8_t ioapic_version; #define IOAPIC_ID 0x01 diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index c58841e5b5..f8af88fabf 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -113,7 +113,6 @@ asm ( unsigned long scratch_start = SCRATCH_PHYSICAL_ADDRESS; -uint32_t ioapic_base_address = 0xfec00000; uint8_t ioapic_version; bool acpi_enabled; diff --git a/tools/firmware/hvmloader/mp_tables.c b/tools/firmware/hvmloader/mp_tables.c index d207ecbf00..77d3010406 100644 --- a/tools/firmware/hvmloader/mp_tables.c +++ b/tools/firmware/hvmloader/mp_tables.c @@ -229,7 +229,7 @@ static void fill_mp_ioapic_entry(struct mp_ioapic_entry *mpie) mpie->ioapic_id = IOAPIC_ID; mpie->ioapic_version = ioapic_version; mpie->ioapic_flags = 1; /* enabled */ - mpie->ioapic_addr = ioapic_base_address; + mpie->ioapic_addr = IOAPIC_BASE_ADDRESS; } diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index e82047d993..c34f077b38 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -42,60 +42,6 @@ bool check_overlap(uint64_t start, uint64_t size, (start < reserved_start + reserved_size); } -void wrmsr(uint32_t idx, uint64_t v) -{ - asm volatile ( - "wrmsr" - : : "c" (idx), "a" ((uint32_t)v), "d" ((uint32_t)(v>>32)) ); -} - -uint64_t rdmsr(uint32_t idx) -{ - uint32_t lo, hi; - - asm volatile ( - "rdmsr" - : "=a" (lo), "=d" (hi) : "c" (idx) ); - - return (lo | ((uint64_t)hi << 32)); -} - -void outb(uint16_t addr, uint8_t val) -{ - asm volatile ( "outb %%al, %%dx" : : "d" (addr), "a" (val) ); -} - -void outw(uint16_t addr, uint16_t val) -{ - asm volatile ( "outw %%ax, %%dx" : : "d" (addr), "a" (val) ); -} - -void outl(uint16_t addr, uint32_t val) -{ - asm volatile ( "outl %%eax, %%dx" : : "d" (addr), "a" (val) ); -} - -uint8_t inb(uint16_t addr) -{ - uint8_t val; - asm volatile ( "inb %%dx,%%al" : "=a" (val) : "d" (addr) ); - return val; -} - -uint16_t inw(uint16_t addr) -{ - uint16_t val; - asm volatile ( "inw %%dx,%%ax" : "=a" (val) : "d" (addr) ); - return val; -} - -uint32_t inl(uint16_t addr) -{ - uint32_t val; - asm volatile ( "inl %%dx,%%eax" : "=a" (val) : "d" (addr) ); - return val; -} - uint8_t cmos_inb(uint8_t idx) { outb(0x70, idx); @@ -493,28 +439,6 @@ void *scratch_alloc(uint32_t size, uint32_t align) return (void *)(unsigned long)s; } -uint32_t ioapic_read(uint32_t reg) -{ - *(volatile uint32_t *)(ioapic_base_address + 0x00) = reg; - return *(volatile uint32_t *)(ioapic_base_address + 0x10); -} - -void ioapic_write(uint32_t reg, uint32_t val) -{ - *(volatile uint32_t *)(ioapic_base_address + 0x00) = reg; - *(volatile uint32_t *)(ioapic_base_address + 0x10) = val; -} - -uint32_t lapic_read(uint32_t reg) -{ - return *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg); -} - -void lapic_write(uint32_t reg, uint32_t val) -{ - *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg) = val; -} - #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3)) @@ -945,7 +869,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, config->lapic_base_address = LAPIC_BASE_ADDRESS; config->lapic_id = acpi_lapic_id; - config->ioapic_base_address = ioapic_base_address; + config->ioapic_base_address = IOAPIC_BASE_ADDRESS; config->ioapic_id = IOAPIC_ID; config->pci_isa_irq_mask = PCI_ISA_IRQ_MASK; diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 14078bde1e..deb823a892 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -7,6 +7,7 @@ #include #include #include +#include "config.h" #include "e820.h" #include @@ -54,28 +55,113 @@ static inline int test_and_clear_bit(int nr, volatile void *addr) } /* MSR access */ -void wrmsr(uint32_t idx, uint64_t v); -uint64_t rdmsr(uint32_t idx); +static inline void wrmsr(uint32_t idx, uint64_t v) +{ + asm volatile ( "wrmsr" :: "c" (idx), "A" (v) ); +} + +static inline uint64_t rdmsr(uint32_t idx) +{ + uint64_t res; + + asm volatile ( "rdmsr" : "=A" (res) : "c" (idx) ); + + return res; +} /* I/O output */ -void outb(uint16_t addr, uint8_t val); -void outw(uint16_t addr, uint16_t val); -void outl(uint16_t addr, uint32_t val); +static inline void outb(uint16_t port, uint8_t val) +{ + asm volatile ( "outb %[val], %[port]" + : + : [port] "Nd" (port), + [val] "a" (val) + : "memory" ); +} + +static inline void outw(uint16_t port, uint16_t val) +{ + asm volatile ( "outw %[val], %[port]" + : + : [port] "Nd" (port), + [val] "a" (val) + : "memory" ); +} + +static inline void outl(uint16_t port, uint32_t val) +{ + asm volatile ( "outl %[val], %[port]" + : + : [port] "Nd" (port), + [val] "a" (val) + : "memory" ); +} /* I/O input */ -uint8_t inb(uint16_t addr); -uint16_t inw(uint16_t addr); -uint32_t inl(uint16_t addr); +static inline uint8_t inb(uint16_t port) +{ + uint8_t val; + + asm volatile ( "inb %[port], %[val]" + : [val] "=a" (val) + : [port] "Nd" (port) + : "memory" ); + + return val; +} + +static inline uint16_t inw(uint16_t port) +{ + uint16_t val; + + asm volatile ( "inw %[port], %[val]" + : [val] "=a" (val) + : [port] "Nd" (port) + : "memory" ); + + return val; +} + +static inline uint32_t inl(uint16_t port) +{ + uint32_t val; + + asm volatile ( "inl %[port], %[val]" + : [val] "=a" (val) + : [port] "Nd" (port) + : "memory" ); + + return val; +} /* CMOS access */ uint8_t cmos_inb(uint8_t idx); void cmos_outb(uint8_t idx, uint8_t val); /* APIC access */ -uint32_t ioapic_read(uint32_t reg); -void ioapic_write(uint32_t reg, uint32_t val); -uint32_t lapic_read(uint32_t reg); -void lapic_write(uint32_t reg, uint32_t val); +#define IOAPIC_BASE_ADDRESS 0xfec00000 +static inline uint32_t ioapic_read(uint32_t reg) +{ + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x00) = reg; + return *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x10); +} + +static inline void ioapic_write(uint32_t reg, uint32_t val) +{ + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x00) = reg; + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x10) = val; +} + +#define LAPIC_BASE_ADDRESS 0xfee00000 +static inline uint32_t lapic_read(uint32_t reg) +{ + return *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg); +} + +static inline void lapic_write(uint32_t reg, uint32_t val) +{ + *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg) = val; +} /* PCI access */ uint32_t pci_read(uint32_t devfn, uint32_t reg, uint32_t len); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:24:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:24:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719921.1122815 (Exim 4.92) (envelope-from ) id 1s5RAK-0002sk-QH; Fri, 10 May 2024 14:24:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719921.1122815; Fri, 10 May 2024 14: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 1s5RAK-0002sa-NW; Fri, 10 May 2024 14:24:04 +0000 Received: by outflank-mailman (input) for mailman id 719921; Fri, 10 May 2024 14:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAJ-0002sM-GC for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAJ-00072e-FQ for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RAJ-0006PZ-Ef for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=4XWTmNRgGR9rBKMk8jnSKrocY5tTvPgQiErUJNHcoso=; b=iuU1nJQBuNpS6F/vtlam2biPx1 9/fzwAsbYtATN6syH12z0QfSKAwsKjWhPQgm+7ZTBhFrRWWrvzMoWVVLY0unMfjFmKcRge1JAM1zI ILZK+Hn9ZxwNDhiA5Gq8HGKZN07EHWQ6qaqta4gXa3I7mE1gZyLCxOvSZ/yGgA2XttiU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/hvmloader: Wake APs with hypercalls rather than INIT+SIPI+SIPI Message-Id: Date: Fri, 10 May 2024 14:24:03 +0000 commit 752ec9a9b195759aa7f6059e65155d404654e316 Author: Alejandro Vallejo AuthorDate: Wed May 8 13:39:23 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 tools/hvmloader: Wake APs with hypercalls rather than INIT+SIPI+SIPI ... in order to change how LAPIC_ID handling works. Importantly, this allows us to start APs by vCPU ID in order to query the LAPIC_ID, rather than needing to know the APIC_ID in order to wake them. Other improvements avoid: * The 16bit entry stub * A LMSW insn, which has no decode assist on AMD and needs emulating fully * 13 vLAPIC emulations when 3 hypercalls can do * 4 pages of stack when 1 in plenty Signed-off-by: Alejandro Vallejo Reviewed-by: Andrew Cooper --- tools/firmware/hvmloader/smp.c | 112 +++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 66 deletions(-) diff --git a/tools/firmware/hvmloader/smp.c b/tools/firmware/hvmloader/smp.c index 082b17f138..6ebf0b60fa 100644 --- a/tools/firmware/hvmloader/smp.c +++ b/tools/firmware/hvmloader/smp.c @@ -22,88 +22,71 @@ #include "util.h" #include "config.h" #include "apic_regs.h" +#include "hypercall.h" -#define AP_BOOT_EIP 0x1000 -extern char ap_boot_start[], ap_boot_end[]; +#include +#include + +#include static int ap_callin, ap_cpuid; -asm ( - " .text \n" - " .code16 \n" - "ap_boot_start: .code16 \n" - " mov %cs,%ax \n" - " mov %ax,%ds \n" - " lgdt gdt_desr-ap_boot_start\n" - " xor %ax, %ax \n" - " inc %ax \n" - " lmsw %ax \n" - " ljmpl $0x08,$1f \n" - "gdt_desr: \n" - " .word gdt_end - gdt - 1 \n" - " .long gdt \n" - "ap_boot_end: .code32 \n" - "1: mov $0x10,%eax \n" - " mov %eax,%ds \n" - " mov %eax,%es \n" - " mov %eax,%ss \n" - " movl $stack_top,%esp \n" - " movl %esp,%ebp \n" - " call ap_start \n" - "1: hlt \n" - " jmp 1b \n" - " \n" - " .align 8 \n" - "gdt: \n" - " .quad 0x0000000000000000 \n" - " .quad 0x00cf9a000000ffff \n" /* 0x08: Flat code segment */ - " .quad 0x00cf92000000ffff \n" /* 0x10: Flat data segment */ - "gdt_end: \n" - " \n" - " .bss \n" - " .align 8 \n" - "stack: \n" - " .skip 0x4000 \n" - "stack_top: \n" - " .text \n" - ); - -void ap_start(void); /* non-static avoids unused-function compiler warning */ -/*static*/ void ap_start(void) +static void ap_start(void) { printf(" - CPU%d ... ", ap_cpuid); cacheattr_init(); printf("done.\n"); + + if ( !ap_cpuid ) /* Used on the BSP too */ + return; + wmb(); ap_callin = 1; -} -static void lapic_wait_ready(void) -{ - while ( lapic_read(APIC_ICR) & APIC_ICR_BUSY ) - cpu_relax(); + /* After this point, the BSP will shut us down. */ + + for ( ;; ) + asm volatile ( "hlt" ); } static void boot_cpu(unsigned int cpu) { - unsigned int icr2 = SET_APIC_DEST_FIELD(LAPIC_ID(cpu)); + static uint8_t ap_stack[PAGE_SIZE] __attribute__ ((aligned (16))); + static struct vcpu_hvm_context ap; /* Initialise shared variables. */ ap_cpuid = cpu; ap_callin = 0; wmb(); - /* Wake up the secondary processor: INIT-SIPI-SIPI... */ - lapic_wait_ready(); - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_INIT); - lapic_wait_ready(); - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_STARTUP | (AP_BOOT_EIP >> 12)); - lapic_wait_ready(); - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_STARTUP | (AP_BOOT_EIP >> 12)); - lapic_wait_ready(); + /* Wake up the secondary processor */ + ap = (struct vcpu_hvm_context) { + .mode = VCPU_HVM_MODE_32B, + .cpu_regs.x86_32 = { + .eip = (unsigned long)ap_start, + .esp = (unsigned long)ap_stack + ARRAY_SIZE(ap_stack), + + /* Protected Mode, no paging. */ + .cr0 = X86_CR0_PE, + + /* 32bit Flat Mode */ + .cs_limit = -1U, + .ds_limit = -1U, + .ss_limit = -1U, + .es_limit = -1U, + .tr_limit = 0x67, + .cs_ar = 0xc9b, + .ds_ar = 0xc93, + .es_ar = 0xc93, + .ss_ar = 0xc93, + .tr_ar = 0x8b, + }, + }; + + if ( hypercall_vcpu_op(VCPUOP_initialise, cpu, &ap) ) + BUG(); + if ( hypercall_vcpu_op(VCPUOP_up, cpu, NULL) ) + BUG(); /* * Wait for the secondary processor to complete initialisation. @@ -113,17 +96,14 @@ static void boot_cpu(unsigned int cpu) cpu_relax(); /* Take the secondary processor offline. */ - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_INIT); - lapic_wait_ready(); + if ( hypercall_vcpu_op(VCPUOP_down, cpu, NULL) ) + BUG(); } void smp_initialise(void) { unsigned int i, nr_cpus = hvm_info->nr_vcpus; - memcpy((void *)AP_BOOT_EIP, ap_boot_start, ap_boot_end - ap_boot_start); - printf("Multiprocessor initialisation:\n"); ap_start(); for ( i = 1; i < nr_cpus; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:24:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:24:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719922.1122819 (Exim 4.92) (envelope-from ) id 1s5RAU-00032C-Ro; Fri, 10 May 2024 14:24:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719922.1122819; Fri, 10 May 2024 14: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 1s5RAU-000322-Oz; Fri, 10 May 2024 14:24:14 +0000 Received: by outflank-mailman (input) for mailman id 719922; Fri, 10 May 2024 14:24:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAT-00031g-JH for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAT-00072m-IZ for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RAT-0006Q1-Hi for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14: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=brsSNgQzhOyFMPzScF0OSBQ5miU+wPPdqTQsBDjUB10=; b=FgO4dZ+ePMdAdKt5exE8nlGEG3 ZKVtjzAax2rGfErm+56/6+Kf7pz/L497tft499myMFrUAAr1nM6JoC7G9oJb93lfKkFXKnhDtJMgj W7ZBs/FRBKGwgSaNepR1yb7L/y7Nw0WWKNAX37hhI61uiOYZXMwWWsJKzp05KK2LprXQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Defer the size calculation in hvm_save_cpu_xsave_states() Message-Id: Date: Fri, 10 May 2024 14:24:13 +0000 commit 1dd6b50dc48a704388a1107f38bfcb87235b9016 Author: Andrew Cooper AuthorDate: Mon Apr 29 17:31:03 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/hvm: Defer the size calculation in hvm_save_cpu_xsave_states() HVM_CPU_XSAVE_SIZE() may rewrite %xcr0 twice. Defer the calculation until after we've decided to write out an XSAVE record. Note in hvm_load_cpu_xsave_states() that there were versions of Xen which wrote out a useless XSAVE record. This sadly limits out ability to tidy up the existing infrastructure. Also leave a note in xstate_ctxt_size() that 0 still needs tolerating for now. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 10 ++++++++-- xen/arch/x86/xstate.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0ce45b177c..9594e0a5c5 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1197,12 +1197,13 @@ static int cf_check hvm_save_cpu_xsave_states( struct vcpu *v, hvm_domain_context_t *h) { struct hvm_hw_cpu_xsave *ctxt; - unsigned int size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); + unsigned int size; int err; - if ( !cpu_has_xsave || !xsave_enabled(v) ) + if ( !xsave_enabled(v) ) return 0; /* do nothing */ + size = HVM_CPU_XSAVE_SIZE(v->arch.xcr0_accum); err = _hvm_init_entry(h, CPU_XSAVE_CODE, v->vcpu_id, size); if ( err ) return err; @@ -1255,6 +1256,11 @@ static int cf_check hvm_load_cpu_xsave_states( if ( !cpu_has_xsave ) return -EOPNOTSUPP; + /* + * Note: Xen prior to 4.12 would write out empty XSAVE records for VMs + * running on XSAVE-capable hardware but without XSAVE active. + */ + /* Customized checking for entry since our entry is of variable length */ desc = (struct hvm_save_descriptor *)&h->data[h->cur]; if ( sizeof (*desc) > h->size - h->cur) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index cf94761d05..99cedb4f5e 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -573,7 +573,7 @@ unsigned int xstate_ctxt_size(u64 xcr0) if ( xcr0 == xfeature_mask ) return xsave_cntxt_size; - if ( xcr0 == 0 ) + if ( xcr0 == 0 ) /* TODO: clean up paths passing 0 in here. */ return 0; return hw_uncompressed_size(xcr0); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:24:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:24:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719923.1122823 (Exim 4.92) (envelope-from ) id 1s5RAe-0003D0-Tj; Fri, 10 May 2024 14:24:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719923.1122823; Fri, 10 May 2024 14:24:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAe-0003Cr-Qi; Fri, 10 May 2024 14:24:24 +0000 Received: by outflank-mailman (input) for mailman id 719923; Fri, 10 May 2024 14:24:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAd-0003Cb-MG for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAd-000736-LU for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RAd-0006QY-Ki for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EPxMR9ZfasMJjekKMlX27pryvumCaaISUmCv7pbXGW4=; b=ONHzSlJyZPGg3JJAEBH5DwuVEE oLEddnrPljsFcuKSCaJI+nD2nED8qK13+DOQTq3Nqg6GN321t7bIwrNu/uM3YTrX0KZlJZvD2Y5IS yYlAwlNm5LBcf5NjUK7mUdW34UdwQHKMEJ+E4KdHviFjUtWOsP3/CO9r0j4sP67gNYfU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/unaligned: address violation of MISRA C Rule 20.7 Message-Id: Date: Fri, 10 May 2024 14:24:23 +0000 commit 8e22c78e171bcc71dc4f7f6549a0a60c958f1465 Author: Nicola Vetrini AuthorDate: Tue Apr 30 16:28:15 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/unaligned: address violation of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- tools/include/xen-tools/common-macros.h | 2 +- xen/include/xen/unaligned.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 07aed92684..60912225cb 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -102,7 +102,7 @@ #define put_unaligned_t(type, val, ptr) do { \ struct { type x; } __packed *ptr_ = (typeof(ptr_))(ptr); \ - ptr_->x = val; \ + ptr_->x = (val); \ } while (0) #define get_unaligned(ptr) get_unaligned_t(typeof(*(ptr)), ptr) diff --git a/xen/include/xen/unaligned.h b/xen/include/xen/unaligned.h index 3eda0ece11..d9bb599e65 100644 --- a/xen/include/xen/unaligned.h +++ b/xen/include/xen/unaligned.h @@ -19,7 +19,7 @@ #define put_unaligned_t(type, val, ptr) do { \ struct { type x; } __packed *ptr_ = (typeof(ptr_))(ptr); \ - ptr_->x = val; \ + ptr_->x = (val); \ } while (0) #define get_unaligned(ptr) get_unaligned_t(typeof(*(ptr)), ptr) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:24:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:24:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719924.1122826 (Exim 4.92) (envelope-from ) id 1s5RAo-0003I8-WA; Fri, 10 May 2024 14:24:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719924.1122826; Fri, 10 May 2024 14:24:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAo-0003I1-Ta; Fri, 10 May 2024 14:24:34 +0000 Received: by outflank-mailman (input) for mailman id 719924; Fri, 10 May 2024 14:24:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAn-0003Hm-P5 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAn-00073D-ON for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RAn-0006Rk-Nd for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tQZzU8W614PqANjkxalj3dTDDOFMoWea7jIPQ6C360c=; b=wHomoJkBQr5hhTmNCEnca3Y6aI x0nTc0baxAlT4a67w2B+y9PoCgEuadBkny01H9HXjj1uYkW/RkHMcxeBtj9FXaPuL//afKAStcAW3 MGs9lOzWFsuyQzdhdiHMSkEaOlbTtd3IWL3BhsXY4QycJfE5KXYUkjW9hGYuY43IR0fE=; 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 Rule 20.7 Message-Id: Date: Fri, 10 May 2024 14:24:33 +0000 commit 14424d90e1ca432eceafafac603ea8e9cfb84dd3 Author: Nicola Vetrini AuthorDate: Tue Apr 30 16:28:16 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 xen/pci: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- xen/include/xen/pci_regs.h | 6 +++--- xen/include/xen/vpci.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index 9909b27425..0bc18efabb 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -445,9 +445,9 @@ #define PCI_EXP_RTSTA 32 /* Root Status */ /* Extended Capabilities (PCI-X 2.0 and Express) */ -#define PCI_EXT_CAP_ID(header) (header & 0x0000ffff) -#define PCI_EXT_CAP_VER(header) ((header >> 16) & 0xf) -#define PCI_EXT_CAP_NEXT(header) ((header >> 20) & 0xffc) +#define PCI_EXT_CAP_ID(header) ((header) & 0x0000ffff) +#define PCI_EXT_CAP_VER(header) (((header) >> 16) & 0xf) +#define PCI_EXT_CAP_NEXT(header) (((header) >> 20) & 0xffc) #define PCI_EXT_CAP_ID_ERR 1 #define PCI_EXT_CAP_ID_VC 2 diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index e89c571890..6e4c972f35 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -23,7 +23,7 @@ typedef int vpci_register_init_t(struct pci_dev *dev); #define REGISTER_VPCI_INIT(x, p) \ static vpci_register_init_t *const x##_entry \ - __used_section(".data.vpci." p) = x + __used_section(".data.vpci." p) = (x) /* Assign vPCI to device by adding handlers. */ int __must_check vpci_assign_device(struct pci_dev *pdev); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:24:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:24:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719925.1122831 (Exim 4.92) (envelope-from ) id 1s5RAz-0003L9-1j; Fri, 10 May 2024 14:24:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719925.1122831; Fri, 10 May 2024 14:24:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAy-0003L1-VE; Fri, 10 May 2024 14:24:44 +0000 Received: by outflank-mailman (input) for mailman id 719925; Fri, 10 May 2024 14:24:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAx-0003Ks-S7 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RAx-00073K-RG for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RAx-0006SB-QT for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KohRAmzexr8PGaYuo5yroLgQGFJOfVvcnIIeK4mw/cM=; b=E4rZOlU/ahDuZHjzY5zXbO0SXs jqrlxCYrOuT64quJ5zPMcsAm01B6KKaw0tIWAWMGJ7v1u4nAJQgTr6v5Jl9qSMxHwpnXytPjfktoB gTjxfmNM49/Scv/DKILXBy1cc5w7EnhVR3dgRYIt6FZmmWOUuDTocufiqA5OsPvFhFTA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: add deviation of MISRA C:2012 Rule 14.4 Message-Id: Date: Fri, 10 May 2024 14:24:43 +0000 commit 3d1033c9117f9c0b53cb3d1faded7969c5c065b7 Author: Federico Serafini AuthorDate: Thu May 2 15:11:15 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 automation/eclair: add deviation of MISRA C:2012 Rule 14.4 Update ECLAIR configuration to take into account the deviations agreed during MISRA meetings. Amend an existing entry of Rule 14.4 in deviations-rst: it is not a project-wide deviation. Tag Rule 14.4 as clean for arm. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 4 ++++ automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- docs/misra/deviations.rst | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index f09ad71acf..5eb7368a73 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -343,6 +343,10 @@ statements are deliberate" -config=MC3R1.R14.3,statements={deliberate , "wrapped(any(),node(if_stmt))" } -doc_end +-doc_begin="A controlling expression of 'if' and iteration statements having integer, character or pointer type has a semantics that is well-known to all Xen developers." +-config=MC3R1.R14.4,etypes+={deliberate, "any()", "src_type(integer||character)||src_expr(type(desugar(pointer(any()))))"} +-doc_end + -doc_begin="The XEN team relies on the fact that the enum is_dying has the constant with assigned value 0 act as false and the other ones as true, therefore have the same behavior of a boolean" diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index a014500a41..1e13258fa9 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -29,7 +29,7 @@ if(string_equal(target,"x86_64"), ) if(string_equal(target,"arm64"), - service_selector({"additional_clean_guidelines","MC3R1.R16.6||MC3R1.R20.12||MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.2||MC3R1.R7.3||MC3R1.R8.6||MC3R1.R9.3"}) + service_selector({"additional_clean_guidelines","MC3R1.R14.4||MC3R1.R16.6||MC3R1.R20.12||MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.2||MC3R1.R7.3||MC3R1.R8.6||MC3R1.R9.3"}) ) -reports+={clean:added,"service(clean_guidelines_common||additional_clean_guidelines)"} diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 39cc321a27..161134771c 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -290,11 +290,17 @@ Deviations related to MISRA C:2012 Rules: statements are deliberate. - Project-wide deviation; tagged as `disapplied` for ECLAIR. + * - R14.4 + - A controlling expression of 'if' and iteration statements having + integer, character or pointer type has a semantics that is well-known to + all Xen developers. + - Tagged as `deliberate` for ECLAIR. + * - R14.4 - The XEN team relies on the fact that the enum is_dying has the constant with assigned value 0 act as false and the other ones as true, therefore have the same behavior of a boolean. - - Project-wide deviation; tagged as `deliberate` for ECLAIR. + - Tagged as `deliberate` for ECLAIR. * - R16.2 - Complying with the Rule would entail a lot of code duplication in the -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:24:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:24:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719926.1122834 (Exim 4.92) (envelope-from ) id 1s5RB9-0003OD-39; Fri, 10 May 2024 14:24:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719926.1122834; Fri, 10 May 2024 14:24:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RB9-0003O5-0R; Fri, 10 May 2024 14:24:55 +0000 Received: by outflank-mailman (input) for mailman id 719926; Fri, 10 May 2024 14:24:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RB7-0003Np-V4 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RB7-00073T-UO for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RB7-0006Sy-Tj for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:24:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d8XsO3/yVVyd57AndKhXkY2nSgAV19kBMk1niZJ4Cew=; b=61UAIv6TTmbIltslojBMJ+Zb07 LSvoWPkK1D2SVHLAmlbB7HIKQ1Ptlu4iMLXKOWVq5JXPNYidJcTQbRj8+p9XNJLWycXrZjP/TdL/o RKT+sKOWwCDGCR5i7Z3PDbnA8iMvJM6iO45A+Ln+U4Vec8/vnwBW2JT5tJW5u/meqLn8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/IOMMU: address violations of MISRA C:2012 Rule 14.4 Message-Id: Date: Fri, 10 May 2024 14:24:53 +0000 commit fcefb2a2471a9b9d6997c62e9be461f17c390ebf Author: Maria Celeste Cesario AuthorDate: Wed May 8 20:46:21 2024 +0200 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/IOMMU: address violations of MISRA C:2012 Rule 14.4 The xen sources contain violations of MISRA C:2012 Rule 14.4 whose headline states: "The controlling expression of an if statement and the controlling expression of an iteration-statement shall have essentially Boolean type". Add comparisons to avoid using enum constants as controlling expressions to comply with Rule 14.4. Amend the comment in the enum definition to reflect the fact that boolean uses of iommu_intremap are no longer allowed. No functional change. Signed-off-by: Maria Celeste Cesario Signed-off-by: Simone Ballarin Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Andrew Cooper --- xen/arch/x86/hpet.c | 6 +++--- xen/arch/x86/msi.c | 4 ++-- xen/drivers/passthrough/amd/iommu_init.c | 4 ++-- xen/drivers/passthrough/vtd/iommu.c | 4 ++-- xen/drivers/passthrough/vtd/quirks.c | 2 +- xen/include/xen/iommu.h | 4 ---- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c index 0759eae055..2f54d31889 100644 --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -278,7 +278,7 @@ static int hpet_msi_write(struct hpet_event_channel *ch, struct msi_msg *msg) { ch->msi.msg = *msg; - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { int rc = iommu_update_ire_from_msi(&ch->msi, msg); @@ -352,7 +352,7 @@ static int __init hpet_setup_msi_irq(struct hpet_event_channel *ch) u32 cfg = hpet_read32(HPET_Tn_CFG(ch->idx)); irq_desc_t *desc = irq_to_desc(ch->msi.irq); - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { ch->msi.hpet_id = hpet_blockid; ret = iommu_setup_hpet_msi(&ch->msi); @@ -371,7 +371,7 @@ static int __init hpet_setup_msi_irq(struct hpet_event_channel *ch) ret = __hpet_setup_msi_irq(desc); if ( ret < 0 ) { - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) iommu_update_ire_from_msi(&ch->msi, NULL); return ret; } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e721aaf5c0..3009ce109f 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -189,7 +189,7 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) { entry->msg = *msg; - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { int rc; @@ -555,7 +555,7 @@ int msi_free_irq(struct msi_desc *entry) destroy_irq(entry[nr].irq); /* Free the unused IRTE if intr remap enabled */ - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) iommu_update_ire_from_msi(entry + nr, NULL); } diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 358c8cbad9..6c0dc2d5cb 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1483,7 +1483,7 @@ int __init amd_iommu_init(bool xt) goto error_out; } - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) register_keyhandler('V', &amd_iommu_dump_intremap_tables, "dump IOMMU intremap tables", 0); @@ -1501,7 +1501,7 @@ int __init amd_iommu_init_late(void) /* Further initialize the device table(s). */ pci_init = true; - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) rc = iterate_ivrs_mappings(amd_iommu_setup_device_table); for_each_amd_iommu ( iommu ) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index c7110af7c9..e13be244c1 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2540,7 +2540,7 @@ static int __must_check init_vtd_hw(bool resume) /* * Enable interrupt remapping */ - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { int apic; for ( apic = 0; apic < nr_ioapics; apic++ ) @@ -2556,7 +2556,7 @@ static int __must_check init_vtd_hw(bool resume) } } } - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) { for_each_drhd_unit ( drhd ) { diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 5a56565ea8..950dcd56ef 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -392,7 +392,7 @@ void __init platform_quirks_init(void) map_igd_reg(); /* Tylersburg interrupt remap quirk */ - if ( iommu_intremap ) + if ( iommu_intremap != iommu_intremap_off ) tylersburg_intremap_quirk(); } diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 92db6f124f..442ae5322d 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -60,10 +60,6 @@ extern uint8_t iommu_quarantine; #ifdef CONFIG_X86 extern enum __packed iommu_intremap { - /* - * In order to allow traditional boolean uses of the iommu_intremap - * variable, the "off" value has to come first (yielding a value of zero). - */ iommu_intremap_off, /* * Interrupt remapping enabled, but only able to generate interrupts -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:25:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:25:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719927.1122838 (Exim 4.92) (envelope-from ) id 1s5RBJ-0003RB-4h; Fri, 10 May 2024 14:25:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719927.1122838; Fri, 10 May 2024 14:25:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RBJ-0003R3-21; Fri, 10 May 2024 14:25:05 +0000 Received: by outflank-mailman (input) for mailman id 719927; Fri, 10 May 2024 14:25:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RBI-0003Qk-1x for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:25:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RBI-00073o-1H for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:25:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RBI-0006Tv-0U for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:25:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zOLXDIT4DVEdYewf3jlRnrOyv0a2bsjQkqLnKxUknpE=; b=h2RxCGFQ3GFCWvrTg+EXe/YJid 9yZ0lsGiOCSq6dwiOhZb5eIyyb95LLNc9xqUKnQwjZUmjOzOQMGmmjHwOntbwtQv/Z7SmZbMp5QU/ K0NOje32CNTJvRHsKwm5klhoxS0JUB8TyEB+qtTwUCfBOM4JNE35CAv7qmVJgG5LAHqU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Explain how moving mod[0] works Message-Id: Date: Fri, 10 May 2024 14:25:04 +0000 commit 49c810e86799211bf15e67ddff8dca4e29166ca2 Author: Andrew Cooper AuthorDate: Tue Apr 23 16:45:36 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/boot: Explain how moving mod[0] works modules_headroom is a misleading name as it applies strictly to mod[0] only, and the movement loop is deeply unintuitive and completely undocumented. Provide help to whomever needs to look at this code next. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/setup.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index caf235c628..f84e1cd79c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1432,6 +1432,11 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) /* Is the region suitable for relocating the multiboot modules? */ for ( j = mbi->mods_count - 1; j >= 0; j-- ) { + /* + * 'headroom' is a guess for the decompressed size and + * decompressor overheads of mod[0] (the dom0 kernel). When we + * move mod[0], we incorporate this as extra space at the start. + */ unsigned long headroom = j ? 0 : modules_headroom; unsigned long size = PAGE_ALIGN(headroom + mod[j].mod_end); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 14:25:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 14:25:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.719928.1122844 (Exim 4.92) (envelope-from ) id 1s5RBT-0003Ub-7H; Fri, 10 May 2024 14:25:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 719928.1122844; Fri, 10 May 2024 14:25:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RBT-0003UU-3P; Fri, 10 May 2024 14:25:15 +0000 Received: by outflank-mailman (input) for mailman id 719928; Fri, 10 May 2024 14:25:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RBS-0003UO-50 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:25:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5RBS-00073z-4G for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:25:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5RBS-0006UO-3S for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 14:25:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OXzKdPcj5N8plo7Efp98JFlANBIjaKjrZp8cJuk3E9U=; b=xKUc/Dr75b9ITIQa6yHXhvUZX/ Br4ZL6has+yGdZCRQaWt5kb8kUeSN+nzqpXXh3JaPzrv5BtsaVtje4g0cy4OT/42FIKPcpI7yHTlU HqM2noTXfW12xZqUXdZZ8T05gb4lCQkMn5ko3LOLll/GFIdEz6R3Q0VsvOUkKG08qdlE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Refactor pvh_load_kernel() to have an initrd_len local Message-Id: Date: Fri, 10 May 2024 14:25:14 +0000 commit 53959cb8309919fc2f157a1c99e0af2ce280cb84 Author: Andrew Cooper AuthorDate: Tue Apr 23 12:42:47 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 9 18:19:49 2024 +0100 x86/boot: Refactor pvh_load_kernel() to have an initrd_len local The expression get more complicated when ->mod_end isn't being abused as a size field. Introduce and use a initrd_len local variable. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/dom0_build.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index ac71d43a6b..b0cb96c3bc 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -650,6 +650,7 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, { void *image_start = image_base + image_headroom; unsigned long image_len = image->mod_end; + unsigned long initrd_len = initrd ? initrd->mod_end : 0; struct elf_binary elf; struct elf_dom_parms parms; paddr_t last_addr; @@ -710,7 +711,7 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, * simplify it. */ last_addr = find_memory(d, &elf, sizeof(start_info) + - (initrd ? ROUNDUP(initrd->mod_end, PAGE_SIZE) + + (initrd ? ROUNDUP(initrd_len, PAGE_SIZE) + sizeof(mod) : 0) + (cmdline ? ROUNDUP(strlen(cmdline) + 1, @@ -725,7 +726,7 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, if ( initrd != NULL ) { rc = hvm_copy_to_guest_phys(last_addr, mfn_to_virt(initrd->mod_start), - initrd->mod_end, v); + initrd_len, v); if ( rc ) { printk("Unable to copy initrd to guest\n"); @@ -733,8 +734,8 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image, } mod.paddr = last_addr; - mod.size = initrd->mod_end; - last_addr += ROUNDUP(initrd->mod_end, elf_64bit(&elf) ? 8 : 4); + mod.size = initrd_len; + last_addr += ROUNDUP(initrd_len, elf_64bit(&elf) ? 8 : 4); if ( initrd->string ) { char *str = __va(initrd->string); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 21:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 21:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720060.1123006 (Exim 4.92) (envelope-from ) id 1s5XWC-0007l9-BD; Fri, 10 May 2024 21:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720060.1123006; Fri, 10 May 2024 21:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWC-0007l2-8L; Fri, 10 May 2024 21:11:04 +0000 Received: by outflank-mailman (input) for mailman id 720060; Fri, 10 May 2024 21:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWA-0007kw-BN for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWA-0006tV-9w for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5XWA-0000H8-92 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d9TOtfcyz0hPLK4m254qYiavXyztPdAaIJgYS8fnm0s=; b=QwSjOoE/D/pnOhMwBFKSx92uc3 RGriq1vmy/av/EYiGhReI5TsWCFADTKeY5EkHaYGS6fqK2zjDO0qos3mn3Riyw6d+FoMq8CEg+/hu +0SM9X+SotbPr29QD8WQj/Yyp94V5C0IO7H2WGboQI6CzYRlgateHFVfIAERBuambreE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/kernel.h: Import __struct_group from Linux Message-Id: Date: Fri, 10 May 2024 21:11:02 +0000 commit 1672df9ebd80edb0832eb4671f946a4d98bfdd42 Author: Luca Fancellu AuthorDate: Tue Apr 30 12:09:21 2024 +0100 Commit: Stefano Stabellini CommitDate: Thu May 9 17:59:15 2024 -0700 xen/kernel.h: Import __struct_group from Linux Import __struct_group from Linux, commit 50d7bd38c3aa ("stddef: Introduce struct_group() helper macro"), in order to allow the access through the anonymous structure to the members without having to write also the name, e.g: struct foo { int one; struct { int two; int three, four; } thing; int five; }; would become: struct foo { int one; __struct_group(/* None */, thing, /* None */, int two; int three, four; ); int five; }; Allowing the users of this structure to access the .thing members by using .two/.three/.four on the struct foo. This construct will become useful in order to have some generalized interfaces that shares some common members. Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 50d7bd38c3aa Reported-by: Nicola Vetrini Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/include/xen/kernel.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/xen/include/xen/kernel.h b/xen/include/xen/kernel.h index bb6b0f3891..bc2440b5f9 100644 --- a/xen/include/xen/kernel.h +++ b/xen/include/xen/kernel.h @@ -54,6 +54,27 @@ typeof_field(type, member) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) +/** + * __struct_group() - Create a mirrored named and anonyomous struct + * + * @TAG: The tag name for the named sub-struct (usually empty) + * @NAME: The identifier name of the mirrored sub-struct + * @ATTRS: Any struct attributes (usually empty) + * @MEMBERS: The member declarations for the mirrored structs + * + * Used to create an anonymous union of two structs with identical layout + * and size: one anonymous and one named. The former's members can be used + * normally without sub-struct naming, and the latter can be used to + * reason about the start, end, and size of the group of struct members. + * The named struct can also be explicitly tagged for layer reuse, as well + * as both having struct attributes appended. + */ +#define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ + union { \ + struct { MEMBERS } ATTRS; \ + struct TAG { MEMBERS } ATTRS NAME; \ + } ATTRS + /* * Check at compile time that something is of a particular type. * Always evaluates to 1 so you may use it easily in comparisons. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 21:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 21:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720061.1123011 (Exim 4.92) (envelope-from ) id 1s5XWM-0007ng-Ey; Fri, 10 May 2024 21:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720061.1123011; Fri, 10 May 2024 21:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWM-0007nZ-CC; Fri, 10 May 2024 21:11:14 +0000 Received: by outflank-mailman (input) for mailman id 720061; Fri, 10 May 2024 21:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWK-0007nM-Dv for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWK-0006th-D5 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5XWK-0000Hm-CE for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=j9lUmORMzNpGXKxq3ELrtwokvmIqZbvq3SU0uIwMFBE=; b=Q6jThUq6jUj+3cW2khi5eXrWv7 YbPoWR1s8aeVBB4r3Dsurf0FvT+n6nc06QwN42jZZaUeQFvsO5VcXeIdERt9jGx4aSsWS1YiI4Ptr 6ocjqHZ83HCV3hAhP16Szb6fcTsGJ84/GjH03fkR4uSQMEy1ysHgV3IQ46E04yTG+w0w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Fix MISRA regression on R1.1, flexible array member not at the end Message-Id: Date: Fri, 10 May 2024 21:11:12 +0000 commit 93c27d54dd236f19bc5319303790952305edceaf Author: Luca Fancellu AuthorDate: Tue Apr 30 12:09:22 2024 +0100 Commit: Stefano Stabellini CommitDate: Thu May 9 17:59:25 2024 -0700 xen/arm: Fix MISRA regression on R1.1, flexible array member not at the end Commit 2209c1e35b47 ("xen/arm: Introduce a generic way to access memory bank structures") introduced a MISRA regression for Rule 1.1 because a flexible array member is introduced in the middle of a struct, furthermore this is using a GCC extension that is going to be deprecated in GCC 14 and a warning to identify such cases will be present (-Wflex-array-member-not-at-end) to identify such cases. In order to fix this issue, use the macro __struct_group to create a structure 'struct membanks_hdr' which will hold the common data among structures using the 'struct membanks' interface. Modify the 'struct shared_meminfo' and 'struct meminfo' to use this new structure, effectively removing the flexible array member from the middle of the structure and modify the code accessing the .common field to use the macro container_of to maintain the functionality of the interface. Given this change, container_of needs to be supplied with a type and so the macro 'kernel_info_get_mem' inside arm/include/asm/kernel.h can't be an option since it uses const and non-const types for struct membanks, so introduce two static inline, one of which will keep the const qualifier. Given the complexity of the interface, which carries a lot of benefit but on the other hand could be prone to developer confusion if the access is open-coded, introduce two static inline helper for the 'struct kernel_info' .shm_mem member and get rid the open-coding shm_mem.common access. Fixes: 2209c1e35b47 ("xen/arm: Introduce a generic way to access memory bank structures") Reported-by: Nicola Vetrini Signed-off-by: Luca Fancellu --- xen/arch/arm/acpi/domain_build.c | 2 +- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/arm/include/asm/kernel.h | 11 ++++++++++- xen/arch/arm/include/asm/setup.h | 18 ++++++++++-------- xen/arch/arm/include/asm/static-shmem.h | 12 ++++++++++++ xen/arch/arm/static-shmem.c | 19 +++++++++---------- 6 files changed, 45 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c index ed895dd8f9..2ce75543d0 100644 --- a/xen/arch/arm/acpi/domain_build.c +++ b/xen/arch/arm/acpi/domain_build.c @@ -451,7 +451,7 @@ static int __init estimate_acpi_efi_size(struct domain *d, struct acpi_table_rsdp *rsdp_tbl; struct acpi_table_header *table; - efi_size = estimate_efi_size(kernel_info_get_mem(kinfo)->nr_banks); + efi_size = estimate_efi_size(kernel_info_get_mem_const(kinfo)->nr_banks); acpi_size = ROUNDUP(sizeof(struct acpi_table_fadt), 8); acpi_size += ROUNDUP(sizeof(struct acpi_table_stao), 8); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 0784e4c5e3..f6550809cf 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -805,7 +805,7 @@ int __init make_memory_node(const struct kernel_info *kinfo, int addrcells, * static shared memory banks need to be listed as /memory node, so when * this function is handling the normal memory, add the banks. */ - if ( mem == kernel_info_get_mem(kinfo) ) + if ( mem == kernel_info_get_mem_const(kinfo) ) shm_mem_node_fill_reg_range(kinfo, reg, &nr_cells, addrcells, sizecells); @@ -884,7 +884,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, { const struct membanks *mem = bootinfo_get_mem(); const struct membanks *mem_banks[] = { - kernel_info_get_mem(kinfo), + kernel_info_get_mem_const(kinfo), bootinfo_get_reserved_mem(), #ifdef CONFIG_STATIC_SHM bootinfo_get_shmem(), @@ -1108,7 +1108,7 @@ static int __init find_domU_holes(const struct kernel_info *kinfo, uint64_t bankend; const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; - const struct membanks *kinfo_mem = kernel_info_get_mem(kinfo); + const struct membanks *kinfo_mem = kernel_info_get_mem_const(kinfo); int res = -ENOENT; for ( i = 0; i < GUEST_RAM_BANKS; i++ ) diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/kernel.h index 16a2bfc01e..7e6e3c82a4 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -80,7 +80,16 @@ struct kernel_info { }; }; -#define kernel_info_get_mem(kinfo) (&(kinfo)->mem.common) +static inline struct membanks *kernel_info_get_mem(struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, const struct membanks, common); +} #ifdef CONFIG_STATIC_SHM #define KERNEL_INFO_SHM_MEM_INIT .shm_mem.common.max_banks = NR_SHMEM_BANKS, diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 28fb659fe9..61c15806a7 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -64,18 +64,20 @@ struct membank { }; struct membanks { - unsigned int nr_banks; - unsigned int max_banks; + __struct_group(membanks_hdr, common, , + unsigned int nr_banks; + unsigned int max_banks; + ); struct membank bank[]; }; struct meminfo { - struct membanks common; + struct membanks_hdr common; struct membank bank[NR_MEM_BANKS]; }; struct shared_meminfo { - struct membanks common; + struct membanks_hdr common; struct membank bank[NR_SHMEM_BANKS]; struct shmem_membank_extra extra[NR_SHMEM_BANKS]; }; @@ -166,25 +168,25 @@ extern domid_t max_init_domid; static inline struct membanks *bootinfo_get_mem(void) { - return &bootinfo.mem.common; + return container_of(&bootinfo.mem.common, struct membanks, common); } static inline struct membanks *bootinfo_get_reserved_mem(void) { - return &bootinfo.reserved_mem.common; + return container_of(&bootinfo.reserved_mem.common, struct membanks, common); } #ifdef CONFIG_ACPI static inline struct membanks *bootinfo_get_acpi(void) { - return &bootinfo.acpi.common; + return container_of(&bootinfo.acpi.common, struct membanks, common); } #endif #ifdef CONFIG_STATIC_SHM static inline struct membanks *bootinfo_get_shmem(void) { - return &bootinfo.shmem.common; + return container_of(&bootinfo.shmem.common, struct membanks, common); } static inline struct shmem_membank_extra *bootinfo_get_shmem_extra(void) diff --git a/xen/arch/arm/include/asm/static-shmem.h b/xen/arch/arm/include/asm/static-shmem.h index 3b6569e570..806ee41cfc 100644 --- a/xen/arch/arm/include/asm/static-shmem.h +++ b/xen/arch/arm/include/asm/static-shmem.h @@ -45,6 +45,18 @@ int make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, void shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, int *nr_cells, int addrcells, int sizecells); +static inline struct membanks * +kernel_info_get_shm_mem(struct kernel_info *kinfo) +{ + return container_of(&kinfo->shm_mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_shm_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->shm_mem.common, const struct membanks, common); +} + #else /* !CONFIG_STATIC_SHM */ /* Worst case /memory node reg element: (addrcells + sizecells) */ diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 09f474ec60..78881dd1d3 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -172,16 +172,16 @@ static int __init assign_shared_memory(struct domain *d, } static int __init -append_shm_bank_to_domain(struct shared_meminfo *kinfo_shm_mem, paddr_t start, +append_shm_bank_to_domain(struct kernel_info *kinfo, paddr_t start, paddr_t size, const char *shm_id) { - struct membanks *shm_mem = &kinfo_shm_mem->common; + struct membanks *shm_mem = kernel_info_get_shm_mem(kinfo); struct shmem_membank_extra *shm_mem_extra; if ( shm_mem->nr_banks >= shm_mem->max_banks ) return -ENOMEM; - shm_mem_extra = &kinfo_shm_mem->extra[shm_mem->nr_banks]; + shm_mem_extra = &kinfo->shm_mem.extra[shm_mem->nr_banks]; shm_mem->bank[shm_mem->nr_banks].start = start; shm_mem->bank[shm_mem->nr_banks].size = size; @@ -289,8 +289,7 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, * Record static shared memory region info for later setting * up shm-node in guest device tree. */ - ret = append_shm_bank_to_domain(&kinfo->shm_mem, gbase, psize, - shm_id); + ret = append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); if ( ret ) return ret; } @@ -301,7 +300,7 @@ int __init process_shm(struct domain *d, struct kernel_info *kinfo, int __init make_shm_resv_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells) { - const struct membanks *mem = &kinfo->shm_mem.common; + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); void *fdt = kinfo->fdt; unsigned int i = 0; int res = 0; @@ -517,7 +516,7 @@ int __init process_shm_node(const void *fdt, int node, uint32_t address_cells, int __init make_resv_memory_node(const struct kernel_info *kinfo, int addrcells, int sizecells) { - const struct membanks *mem = &kinfo->shm_mem.common; + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); void *fdt = kinfo->fdt; int res = 0; /* Placeholder for reserved-memory\0 */ @@ -579,7 +578,7 @@ void __init init_sharedmem_pages(void) int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, struct rangeset *rangeset) { - const struct membanks *shm_mem = &kinfo->shm_mem.common; + const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); unsigned int i; /* Remove static shared memory regions */ @@ -607,7 +606,7 @@ int __init remove_shm_from_rangeset(const struct kernel_info *kinfo, int __init remove_shm_holes_for_domU(const struct kernel_info *kinfo, struct membanks *ext_regions) { - const struct membanks *shm_mem = &kinfo->shm_mem.common; + const struct membanks *shm_mem = kernel_info_get_shm_mem_const(kinfo); struct rangeset *guest_holes; unsigned int i; paddr_t start; @@ -673,7 +672,7 @@ void __init shm_mem_node_fill_reg_range(const struct kernel_info *kinfo, __be32 *reg, int *nr_cells, int addrcells, int sizecells) { - const struct membanks *mem = &kinfo->shm_mem.common; + const struct membanks *mem = kernel_info_get_shm_mem_const(kinfo); unsigned int i; __be32 *cells; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 21:11:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 21:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720062.1123014 (Exim 4.92) (envelope-from ) id 1s5XWW-0007qS-GJ; Fri, 10 May 2024 21:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720062.1123014; Fri, 10 May 2024 21:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWW-0007qL-Dr; Fri, 10 May 2024 21:11:24 +0000 Received: by outflank-mailman (input) for mailman id 720062; Fri, 10 May 2024 21:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWU-0007qB-Go for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWU-0006ts-G0 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5XWU-0000ID-FA for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=J0N6WcoY3u4ljS0nYFKvekJYwTHGtOcb0tGVFOMKywU=; b=tmGpZbuPmFvQDtDaSX5ut55nD7 drrdaob9KgNNd0lXvcYtFcswF/nZBx1BJ3dx0Nn5qa+qlPC8llvMUk2zvqplcG7W31gNPimNM0EMR 15wQUKKXApW9RArOA5/sPpRDEH77zNv06l8n6bGkzGbfxbC0a9gguQ+MuaAB/a8ulvCw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: amend configuration for some MISRA rules Message-Id: Date: Fri, 10 May 2024 21:11:22 +0000 commit f4cd14e502bafe773d8c808010c53e99c750290f Author: Alessandro Zucchelli AuthorDate: Thu May 9 18:02:17 2024 -0700 Commit: Stefano Stabellini CommitDate: Thu May 9 18:02:17 2024 -0700 automation/eclair_analysis: amend configuration for some MISRA rules Adjust ECLAIR configuration for rules: R21.14, R21.15, R21.16 by taking into account mem* macros defined in the Xen sources as if they were equivalent to the ones in Standard Library. Signed-off-by: Alessandro Zucchelli Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/analysis.ecl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 66ed7f952c..d4628d582c 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -19,6 +19,23 @@ map_strings("scheduled-analysis",analysis_kind) -enable=B.EXPLAIN +-doc_begin="These configurations serve the purpose of recognizing the 'mem*' macros as +their Standard Library equivalents." + +-config=MC3R1.R21.14,call_select+= +{"macro(^memcmp$)&&any_arg(1..2, skip(__non_syntactic_paren_cast_stmts, node(string_literal)))", + "any()", violation, "%{__callslct_any_base_fmt()}", {{arg, "%{__callslct_arg_fmt()}"}}} + +-config=MC3R1.R21.15,call_args+= +{"macro(^mem(cmp|move|cpy)$)", {1, 2}, "unqual_pointee_compatible", + "%{__argscmpr_culprit_fmt()}", "%{__argscmpr_evidence_fmt()}"} + +-config=MC3R1.R21.16,call_select+= +{"macro(^memcmp$)&&any_arg(1..2, skip(__non_syntactic_paren_stmts, type(canonical(__memcmp_pte_types))))", + "any()", violation, "%{__callslct_any_base_fmt()}", {{arg,"%{__callslct_arg_type_fmt()}"}}} + +-doc_end + -eval_file=toolchain.ecl -eval_file=public_APIs.ecl -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 21:11:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 21:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720064.1123029 (Exim 4.92) (envelope-from ) id 1s5XWf-00088L-S1; Fri, 10 May 2024 21:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720064.1123029; Fri, 10 May 2024 21:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWf-00088D-PK; Fri, 10 May 2024 21:11:33 +0000 Received: by outflank-mailman (input) for mailman id 720064; Fri, 10 May 2024 21:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWe-00087b-Kv for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5XWe-0006uT-Ip for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5XWe-0000Ie-I3 for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ULNrMpmQrDAJbJbiox5mKKMyJQB4PoF595K/tJ7NyPE=; b=iJ9cEGsYuBjJgevM2lNr6YOFsx JyPIp0ImH6WMGng2s0zL5xQ48oGT4ynEq00s/nuANze7dz/fKimTtZmUOBp0gU83wAYL5FnNlwpuO T9vbpebIA+znEWrfQuCSrQZGYqIHT5BXayh4W13x6tT2V2xIIp0K5HOAoOUxblrwDvjY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair: hide reports coming from adopted code in scheduled analysis Message-Id: Date: Fri, 10 May 2024 21:11:32 +0000 commit b0082b908391b29b7c4dd5e6c389ebd6481926f8 Author: Federico Serafini AuthorDate: Fri May 3 15:14:11 2024 +0200 Commit: Stefano Stabellini CommitDate: Thu May 9 18:03:24 2024 -0700 automation/eclair: hide reports coming from adopted code in scheduled analysis To improve clarity and ease of navigation do not show reports related to adopted code in the scheduled analysis. Configuration options are commented out because they may be useful in the future. Signed-off-by: Simone Ballarin Signed-off-by: Federico Serafini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/analysis.ecl | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index d4628d582c..9134e59617 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -4,11 +4,11 @@ setq(data_dir,getenv("ECLAIR_DATA_DIR")) setq(analysis_kind,getenv("ANALYSIS_KIND")) -setq(scheduled_analysis,nil) +# setq(scheduled_analysis,nil) -strings_map("scheduled-analysis",500,"","^.*scheduled$",0,setq(scheduled_analysis,t)) -strings_map("scheduled-analysis",500,"","^.*$",0) -map_strings("scheduled-analysis",analysis_kind) +# strings_map("scheduled-analysis",500,"","^.*scheduled$",0,setq(scheduled_analysis,t)) +# strings_map("scheduled-analysis",500,"","^.*$",0) +# map_strings("scheduled-analysis",analysis_kind) -verbose @@ -42,12 +42,16 @@ their Standard Library equivalents." -doc="Initially, there are no files tagged as adopted." -file_tag+={adopted,"none()"} -if(not(scheduled_analysis), - eval_file("adopted.ecl") -) -if(not(scheduled_analysis), - eval_file("out_of_scope.ecl") -) +# if(not(scheduled_analysis), +# eval_file("adopted.ecl") +# ) +# if(not(scheduled_analysis), +# eval_file("out_of_scope.ecl") +# ) + +-eval_file=adopted.ecl +-eval_file=out_of_scope.ecl + -eval_file=deviations.ecl -eval_file=call_properties.ecl -eval_file=tagging.ecl -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 10 21:22:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 May 2024 21:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720074.1123053 (Exim 4.92) (envelope-from ) id 1s5Xgr-0002IQ-1p; Fri, 10 May 2024 21:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720074.1123053; Fri, 10 May 2024 21:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5Xgq-0002II-VQ; Fri, 10 May 2024 21:22:04 +0000 Received: by outflank-mailman (input) for mailman id 720074; Fri, 10 May 2024 21:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5Xgp-0002Hl-VH for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5Xgp-00078Z-QY for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5Xgp-0001Ki-PY for xen-changelog@lists.xenproject.org; Fri, 10 May 2024 21:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ndj5WT8qn7OspGBak2AcyguxGIz58HdQ40iJJ4Bo/44=; b=ACxeQ2bpXQ7MQQ4TYJvIPELFFa 9+vkOB2M7IOneh3obl/GEpJlcyoDzb1fx/CWTEA5Y1ib97jWx1QYY4kLVjqnZIKRUq39rgkm+INlK 0WhnOLwoTVyG6SnPtQ2gGfCmCDczlV/PryUTImO3JHki4SPF/xAYNY6MujH0bUptJBl8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: allow up to 16383 cpus Message-Id: Date: Fri, 10 May 2024 21:22:03 +0000 commit 996576b965ccdf0de17aafa14282925e408e1200 Author: Juergen Gross AuthorDate: Fri May 10 16:16:36 2024 +0200 Commit: Julien Grall CommitDate: Fri May 10 22:15:44 2024 +0100 xen: allow up to 16383 cpus With lock handling now allowing up to 16384 cpus (spinlocks can handle 65535 cpus, rwlocks can handle 16384 cpus), raise the allowed limit for the number of cpus to be configured to 16383. The new limit is imposed by IOMMU_CMD_BUFFER_MAX_ENTRIES and QINVAL_MAX_ENTRY_NR required to be larger than 2 * CONFIG_NR_CPUS. Add a support limit of physical CPUs to SUPPORT.md (4096 on x86, 128 on ARM). Signed-off-by: Juergen Gross Acked-by: Jan Beulich Acked-by: Julien Grall --- CHANGELOG.md | 2 ++ SUPPORT.md | 5 +++++ xen/arch/Kconfig | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8041cfb7d2..c43c45d8d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - HVM PIRQs are disabled by default. - Reduce IOMMU setup time for hardware domain. - xl/libxl configures vkb=[] for HVM domains with priority over vkb_device. + - Increase the maximum number of CPUs Xen can be built for from 4095 to + 16383. ### Added - On x86: diff --git a/SUPPORT.md b/SUPPORT.md index e10d46d924..d5d60c62ec 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -61,6 +61,11 @@ For the Cortex A77 r0p0 - r1p0, see Errata 1508412. Status, x86: Supported +### Physical CPUs + + Status, x86: Supported up to 4096 + Status, ARM: Supported up to 128 + ### Host ACPI (via Domain 0) Status, x86 PV: Supported diff --git a/xen/arch/Kconfig b/xen/arch/Kconfig index 67ba38f32f..308ce129a8 100644 --- a/xen/arch/Kconfig +++ b/xen/arch/Kconfig @@ -6,7 +6,7 @@ config PHYS_ADDR_T_32 config NR_CPUS int "Maximum number of CPUs" - range 1 4095 + range 1 16383 default "256" if X86 default "8" if ARM && RCAR3 default "4" if ARM && QEMU -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:22:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720133.1123166 (Exim 4.92) (envelope-from ) id 1s5aV3-0003BC-Jr; Sat, 11 May 2024 00:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720133.1123166; Sat, 11 May 2024 00:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aV3-0003B5-HI; Sat, 11 May 2024 00:22:05 +0000 Received: by outflank-mailman (input) for mailman id 720133; Sat, 11 May 2024 00:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aV1-0003Az-M1 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aV1-0002eX-G6 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aV1-0002oS-Dq for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jeynEM4lSQkcMzQg+l2ziRXqFpmp6Drw5FddSTlHFP0=; b=M3+GIEFK/I2iSeKXZC3JLlTU8b sClfpcnkXZWD5rjEjUW36IIIHdXlNbHxR732v0aWmOfK/xi2EgMpM8A37wkGxG+xrbYjhUeDUaTEN br+Z8eQEqpY1L+QYXujerdIPWuBlAaTwztJQeK9GMdSGbcoRQosssRndNohxEcQJ6X4Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: fix population of the online vCPU bitmap for PVH Message-Id: Date: Sat, 11 May 2024 00:22:03 +0000 commit 5cc7347b04b2d0a3133754c7a9b936f614ec656a Author: Roger Pau Monne AuthorDate: Fri May 10 14:49:13 2024 +0200 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 libxl: fix population of the online vCPU bitmap for PVH libxl passes some information to libacpi to create the ACPI table for a PVH guest, and among that information it's a bitmap of which vCPUs are online which can be less than the maximum number of vCPUs assigned to the domain. While the population of the bitmap is done correctly for HVM based on the number of online vCPUs, for PVH the population of the bitmap is done based on the number of maximum vCPUs allowed. This leads to all local APIC entries in the MADT being set as enabled, which contradicts the data in xenstore if vCPUs is different than maximum vCPUs. Fix by copying the internal libxl bitmap that's populated based on the vCPUs parameter. Reported-by: Arthur Borsboom Link: https://gitlab.com/libvirt/libvirt/-/issues/399 Reported-by: Leigh Brown Fixes: 14c0d328da2b ('libxl/acpi: Build ACPI tables for HVMlite guests') Signed-off-by: Roger Pau Monné Tested-by: Leigh Brown Acked-by: Andrew Cooper --- tools/libs/light/libxl_x86_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libs/light/libxl_x86_acpi.c b/tools/libs/light/libxl_x86_acpi.c index 620f3c700c..5cf261bd67 100644 --- a/tools/libs/light/libxl_x86_acpi.c +++ b/tools/libs/light/libxl_x86_acpi.c @@ -89,7 +89,7 @@ static int init_acpi_config(libxl__gc *gc, uint32_t domid = dom->guest_domid; xc_domaininfo_t info; struct hvm_info_table *hvminfo; - int i, r, rc; + int r, rc; config->dsdt_anycpu = config->dsdt_15cpu = dsdt_pvh; config->dsdt_anycpu_len = config->dsdt_15cpu_len = dsdt_pvh_len; @@ -138,8 +138,8 @@ static int init_acpi_config(libxl__gc *gc, hvminfo->nr_vcpus = info.max_vcpu_id + 1; } - for (i = 0; i < hvminfo->nr_vcpus; i++) - hvminfo->vcpu_online[i / 8] |= 1 << (i & 7); + memcpy(hvminfo->vcpu_online, b_info->avail_vcpus.map, + b_info->avail_vcpus.size); config->hvminfo = hvminfo; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:22:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720134.1123173 (Exim 4.92) (envelope-from ) id 1s5aVC-0003DW-O6; Sat, 11 May 2024 00:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720134.1123173; Sat, 11 May 2024 00:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVC-0003DO-Ku; Sat, 11 May 2024 00:22:14 +0000 Received: by outflank-mailman (input) for mailman id 720134; Sat, 11 May 2024 00:22:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVB-0003DB-Ki for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVB-0002ef-Js for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aVB-0002pA-IC for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e3N7w7qIyMdgv2BZUVFjyAlJcsLTgo+1PuPLJkbUTlI=; b=Ns31JlZTOV5jJVxCvqJaWknetw HuOejJk09mEiCo/jI7ydggTOEikpuRRWLgnplRoFF9mG5Q+zWIYS03nj9bY06O0hrLp8P9dj90yMW VIuzVJ32mk5aQlGTEuTioI9Th4gaI+VhgVk1C6xiQLZJSSV95ExQO+eLHIliedmQm48o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msi: Extend per-domain/device warning mechanism Message-Id: Date: Sat, 11 May 2024 00:22:13 +0000 commit e9607d4061eee971987a989c710c809ccc408ce7 Author: Marek Marczykowski-Górecki AuthorDate: Fri May 10 05:53:21 2024 +0200 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 x86/msi: Extend per-domain/device warning mechanism The arch_msix struct had a single "warned" field with a domid for which warning was issued. Upcoming patch will need similar mechanism for few more warnings, so change it to save a bit field of issued warnings. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/msi.h | 18 +++++++++++++++++- xen/arch/x86/msi.c | 5 +---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/msi.h b/xen/arch/x86/include/asm/msi.h index 997ccb87be..b64cb93c0c 100644 --- a/xen/arch/x86/include/asm/msi.h +++ b/xen/arch/x86/include/asm/msi.h @@ -208,6 +208,16 @@ struct msg_address { PCI_MSIX_ENTRY_SIZE + \ (~PCI_MSIX_BIRMASK & (PAGE_SIZE - 1))) +#define MSIX_CHECK_WARN(msix, domid, which) \ + ({ \ + if ( (msix)->warned_domid != (domid) ) \ + { \ + (msix)->warned_domid = (domid); \ + (msix)->warned_kind.all = 0; \ + } \ + (msix)->warned_kind.which ? false : ((msix)->warned_kind.which = true); \ + }) + struct arch_msix { unsigned int nr_entries, used_entries; struct { @@ -217,7 +227,13 @@ struct arch_msix { int table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t table_lock; bool host_maskall, guest_maskall; - domid_t warned; + domid_t warned_domid; + union { + uint8_t all; + struct { + bool maskall : 1; + }; + } warned_kind; }; void early_msi_init(void); diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 3009ce109f..fb0fab60f1 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -364,13 +364,10 @@ static bool msi_set_mask_bit(struct irq_desc *desc, bool host, bool guest) domid_t domid = pdev->domain->domain_id; maskall = true; - if ( pdev->msix->warned != domid ) - { - pdev->msix->warned = domid; + if ( MSIX_CHECK_WARN(pdev->msix, domid, maskall) ) printk(XENLOG_G_WARNING "cannot mask IRQ %d: masking MSI-X on Dom%d's %pp\n", desc->irq, domid, &pdev->sbdf); - } } pdev->msix->host_maskall = maskall; if ( maskall || pdev->msix->guest_maskall ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:22:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720135.1123174 (Exim 4.92) (envelope-from ) id 1s5aVM-0003GQ-P4; Sat, 11 May 2024 00:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720135.1123174; Sat, 11 May 2024 00:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVM-0003GI-MK; Sat, 11 May 2024 00:22:24 +0000 Received: by outflank-mailman (input) for mailman id 720135; Sat, 11 May 2024 00:22:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVL-0003G7-Px for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVL-0002ep-OH for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aVL-0002py-M3 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=P8+eqAwMkcrmAWTfWOskSR3b7r3j/rXu8PgdVxIG1K0=; b=Q/kLQKXKUMcf2+SiQEssexFYk0 f1ylhKzQbpcTJx4TMFOB6pdAfPCr7Y1GZgPeujL6EwP1mQLQEcAkd9E0zh+vt3pK7jH4BWSrfECcB 3z6M3687SGrapxHBpM+YUQtv4ShvWiklXHamPY4su6g02BlUZXzQxFBT3XUgvUlF9BmY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm: Allow access to registers on the same page as MSI-X table Message-Id: Date: Sat, 11 May 2024 00:22:23 +0000 commit b2cd07a0447bfa25e96ae13e190225b61a3670cb Author: Marek Marczykowski-Górecki AuthorDate: Fri May 10 05:53:22 2024 +0200 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 x86/hvm: Allow access to registers on the same page as MSI-X table Some devices (notably Intel Wifi 6 AX210 card) keep auxiliary registers on the same page as MSI-X table. Device model (especially one in stubdomain) cannot really handle those, as direct writes to that page is refused (page is on the mmio_ro_ranges list). Instead, extend msixtbl_mmio_ops to handle such accesses too. Doing this, requires correlating read/write location with guest MSI-X table address. Since QEMU doesn't map MSI-X table to the guest, it requires msixtbl_entry->gtable, which is HVM-only. Similar feature for PV would need to be done separately. This will be also used to read Pending Bit Array, if it lives on the same page, making QEMU not needing /dev/mem access at all (especially helpful with lockdown enabled in dom0). If PBA lives on another page, QEMU will map it to the guest directly. If PBA lives on the same page, discard writes and log a message. Technically, writes outside of PBA could be allowed, but at this moment the precise location of PBA isn't saved, and also no known device abuses the spec in this way (at least yet). To access those registers, msixtbl_mmio_ops need the relevant page mapped. MSI handling already has infrastructure for that, using fixmap, so try to map first/last page of the MSI-X table (if necessary) and save their fixmap indexes. Note that msix_get_fixmap() does reference counting and reuses existing mapping, so just call it directly, even if the page was mapped before. Also, it uses a specific range of fixmap indexes which doesn't include 0, so use 0 as default ("not mapped") value - which simplifies code a bit. Based on assumption that all MSI-X page accesses are handled by Xen, do not forward adjacent accesses to other hypothetical ioreq servers, even if the access wasn't handled for some reason (failure to map pages etc). Relevant places log a message about that already. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/vmsi.c | 206 +++++++++++++++++++++++++++++++++++++++-- xen/arch/x86/include/asm/msi.h | 5 + xen/arch/x86/msi.c | 42 +++++++++ 3 files changed, 243 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 9999179837..fd83abb929 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -180,6 +180,10 @@ static bool msixtbl_initialised(const struct domain *d) return d->arch.hvm.msixtbl_list.next; } +/* + * Lookup an msixtbl_entry on the same page as given addr. It's up to the + * caller to check if address is strictly part of the table - if relevant. + */ static struct msixtbl_entry *msixtbl_find_entry( struct vcpu *v, unsigned long addr) { @@ -187,8 +191,8 @@ static struct msixtbl_entry *msixtbl_find_entry( struct domain *d = v->domain; list_for_each_entry( entry, &d->arch.hvm.msixtbl_list, list ) - if ( addr >= entry->gtable && - addr < entry->gtable + entry->table_len ) + if ( PFN_DOWN(addr) >= PFN_DOWN(entry->gtable) && + PFN_DOWN(addr) <= PFN_DOWN(entry->gtable + entry->table_len - 1) ) return entry; return NULL; @@ -203,6 +207,10 @@ static struct msi_desc *msixtbl_addr_to_desc( if ( !entry || !entry->pdev ) return NULL; + if ( addr < entry->gtable || + addr >= entry->gtable + entry->table_len ) + return NULL; + nr_entry = (addr - entry->gtable) / PCI_MSIX_ENTRY_SIZE; list_for_each_entry( desc, &entry->pdev->msi_list, list ) @@ -213,6 +221,153 @@ static struct msi_desc *msixtbl_addr_to_desc( return NULL; } +/* + * Returns: + * - 0 (FIX_RESERVED) if no handling should be done + * - a fixmap idx to use for handling + */ +static unsigned int get_adjacent_idx( + const struct msixtbl_entry *entry, unsigned long addr, bool write) +{ + unsigned int adj_type; + struct arch_msix *msix; + + if ( !entry || !entry->pdev ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + if ( PFN_DOWN(addr) == PFN_DOWN(entry->gtable) && addr < entry->gtable ) + adj_type = ADJ_IDX_FIRST; + else if ( PFN_DOWN(addr) == PFN_DOWN(entry->gtable + entry->table_len - 1) && + addr >= entry->gtable + entry->table_len ) + adj_type = ADJ_IDX_LAST; + else + { + /* All callers should already do equivalent range checking. */ + ASSERT_UNREACHABLE(); + return 0; + } + + msix = entry->pdev->msix; + if ( !msix ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + if ( !msix->adj_access_idx[adj_type] ) + { + if ( MSIX_CHECK_WARN(msix, entry->pdev->domain->domain_id, + adjacent_not_initialized) ) + gprintk(XENLOG_WARNING, + "%pp: Page for adjacent(%d) MSI-X table access not initialized (addr %#lx, gtable %#lx)\n", + &entry->pdev->sbdf, adj_type, addr, entry->gtable); + return 0; + } + + /* If PBA lives on the same page too, discard writes. */ + if ( write && + ((adj_type == ADJ_IDX_LAST && + msix->table.last == msix->pba.first) || + (adj_type == ADJ_IDX_FIRST && + msix->table.first == msix->pba.last)) ) + { + if ( MSIX_CHECK_WARN(msix, entry->pdev->domain->domain_id, + adjacent_pba) ) + gprintk(XENLOG_WARNING, + "%pp: MSI-X table and PBA share a page, " + "discard write to adjacent memory (%#lx)\n", + &entry->pdev->sbdf, addr); + return 0; + } + + return msix->adj_access_idx[adj_type]; +} + +static void adjacent_read( + const struct msixtbl_entry *entry, + paddr_t address, unsigned int len, uint64_t *pval) +{ + const void __iomem *hwaddr; + unsigned int fixmap_idx; + + ASSERT(IS_ALIGNED(address, len)); + + *pval = ~0UL; + + fixmap_idx = get_adjacent_idx(entry, address, false); + + if ( !fixmap_idx ) + return; + + hwaddr = fix_to_virt(fixmap_idx) + PAGE_OFFSET(address); + + switch ( len ) + { + case 1: + *pval = readb(hwaddr); + break; + + case 2: + *pval = readw(hwaddr); + break; + + case 4: + *pval = readl(hwaddr); + break; + + case 8: + *pval = readq(hwaddr); + break; + + default: + ASSERT_UNREACHABLE(); + break; + } +} + +static void adjacent_write( + const struct msixtbl_entry *entry, + paddr_t address, unsigned int len, uint64_t val) +{ + void __iomem *hwaddr; + unsigned int fixmap_idx; + + ASSERT(IS_ALIGNED(address, len)); + + fixmap_idx = get_adjacent_idx(entry, address, true); + + if ( !fixmap_idx ) + return; + + hwaddr = fix_to_virt(fixmap_idx) + PAGE_OFFSET(address); + + switch ( len ) + { + case 1: + writeb(val, hwaddr); + break; + + case 2: + writew(val, hwaddr); + break; + + case 4: + writel(val, hwaddr); + break; + + case 8: + writeq(val, hwaddr); + break; + + default: + ASSERT_UNREACHABLE(); + break; + } +} + static int cf_check msixtbl_read( const struct hvm_io_handler *handler, uint64_t address, uint32_t len, uint64_t *pval) @@ -222,7 +377,7 @@ static int cf_check msixtbl_read( unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; - if ( (len != 4 && len != 8) || (address & (len - 1)) ) + if ( !IS_ALIGNED(address, len) ) return r; rcu_read_lock(&msixtbl_rcu_lock); @@ -230,6 +385,18 @@ static int cf_check msixtbl_read( entry = msixtbl_find_entry(current, address); if ( !entry ) goto out; + + if ( address < entry->gtable || + address >= entry->gtable + entry->table_len ) + { + adjacent_read(entry, address, len, pval); + r = X86EMUL_OKAY; + goto out; + } + + if ( len != 4 && len != 8 ) + goto out; + offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -291,6 +458,18 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, entry = msixtbl_find_entry(v, address); if ( !entry ) goto out; + + if ( address < entry->gtable || + address >= entry->gtable + entry->table_len ) + { + adjacent_write(entry, address, len, val); + r = X86EMUL_OKAY; + goto out; + } + + if ( len != 4 && len != 8 ) + goto out; + nr_entry = array_index_nospec(((address - entry->gtable) / PCI_MSIX_ENTRY_SIZE), MAX_MSIX_TABLE_ENTRIES); @@ -356,8 +535,8 @@ static int cf_check _msixtbl_write( const struct hvm_io_handler *handler, uint64_t address, uint32_t len, uint64_t val) { - /* Ignore invalid length or unaligned writes. */ - if ( (len != 4 && len != 8) || !IS_ALIGNED(address, len) ) + /* Ignore unaligned writes. */ + if ( !IS_ALIGNED(address, len) ) return X86EMUL_OKAY; /* @@ -374,16 +553,23 @@ static bool cf_check msixtbl_range( { struct vcpu *curr = current; unsigned long addr = r->addr; - const struct msi_desc *desc; + const struct msixtbl_entry *entry; + bool ret = false; ASSERT(r->type == IOREQ_TYPE_COPY); rcu_read_lock(&msixtbl_rcu_lock); - desc = msixtbl_addr_to_desc(msixtbl_find_entry(curr, addr), addr); + entry = msixtbl_find_entry(curr, addr); + if ( entry && + /* Adjacent access. */ + (addr < entry->gtable || addr >= entry->gtable + entry->table_len || + /* Otherwise check if there is a matching msi_desc. */ + msixtbl_addr_to_desc(entry, addr)) ) + ret = true; rcu_read_unlock(&msixtbl_rcu_lock); - if ( desc ) - return 1; + if ( ret ) + return ret; if ( r->state == STATE_IOREQ_READY && r->dir == IOREQ_WRITE ) { @@ -429,7 +615,7 @@ static bool cf_check msixtbl_range( } } - return 0; + return false; } static const struct hvm_io_ops msixtbl_mmio_ops = { diff --git a/xen/arch/x86/include/asm/msi.h b/xen/arch/x86/include/asm/msi.h index b64cb93c0c..748bc3cd6d 100644 --- a/xen/arch/x86/include/asm/msi.h +++ b/xen/arch/x86/include/asm/msi.h @@ -225,6 +225,9 @@ struct arch_msix { } table, pba; int table_refcnt[MAX_MSIX_TABLE_PAGES]; int table_idx[MAX_MSIX_TABLE_PAGES]; +#define ADJ_IDX_FIRST 0 +#define ADJ_IDX_LAST 1 + unsigned int adj_access_idx[2]; spinlock_t table_lock; bool host_maskall, guest_maskall; domid_t warned_domid; @@ -232,6 +235,8 @@ struct arch_msix { uint8_t all; struct { bool maskall : 1; + bool adjacent_not_initialized : 1; + bool adjacent_pba : 1; }; } warned_kind; }; diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index fb0fab60f1..19830528b6 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -913,6 +913,37 @@ static int msix_capability_init(struct pci_dev *dev, list_add_tail(&entry->list, &dev->msi_list); *desc = entry; } + else + { + /* + * If the MSI-X table doesn't start at the page boundary, map the first page for + * passthrough accesses. + */ + if ( PAGE_OFFSET(table_paddr) ) + { + int idx = msix_get_fixmap(msix, table_paddr, table_paddr); + + if ( idx > 0 ) + msix->adj_access_idx[ADJ_IDX_FIRST] = idx; + else + gprintk(XENLOG_ERR, "%pp: Failed to map first MSI-X table page: %d\n", &dev->sbdf, idx); + } + /* + * If the MSI-X table doesn't end on the page boundary, map the last page + * for passthrough accesses. + */ + if ( PAGE_OFFSET(table_paddr + msix->nr_entries * PCI_MSIX_ENTRY_SIZE) ) + { + uint64_t entry_paddr = table_paddr + + (msix->nr_entries - 1) * PCI_MSIX_ENTRY_SIZE; + int idx = msix_get_fixmap(msix, table_paddr, entry_paddr); + + if ( idx > 0 ) + msix->adj_access_idx[ADJ_IDX_LAST] = idx; + else + gprintk(XENLOG_ERR, "%pp: Failed to map last MSI-X table page: %d\n", &dev->sbdf, idx); + } + } if ( !msix->used_entries ) { @@ -1079,6 +1110,17 @@ static void _pci_cleanup_msix(struct arch_msix *msix) msix->table.first = 0; msix->table.last = 0; + if ( msix->adj_access_idx[ADJ_IDX_FIRST] ) + { + msix_put_fixmap(msix, msix->adj_access_idx[ADJ_IDX_FIRST]); + msix->adj_access_idx[ADJ_IDX_FIRST] = 0; + } + if ( msix->adj_access_idx[ADJ_IDX_LAST] ) + { + msix_put_fixmap(msix, msix->adj_access_idx[ADJ_IDX_LAST]); + msix->adj_access_idx[ADJ_IDX_LAST] = 0; + } + if ( rangeset_remove_range(mmio_ro_ranges, msix->pba.first, msix->pba.last) ) WARN(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:22:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720136.1123179 (Exim 4.92) (envelope-from ) id 1s5aVW-0003JC-QY; Sat, 11 May 2024 00:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720136.1123179; Sat, 11 May 2024 00:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVW-0003J4-Np; Sat, 11 May 2024 00:22:34 +0000 Received: by outflank-mailman (input) for mailman id 720136; Sat, 11 May 2024 00:22:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVV-0003In-SD for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVV-0002fD-RP for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aVV-0002qd-QV for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6ProjJ9Fw0P4TL22uh77CYloE0sD6nrbp7/i5BUqOB0=; b=Wmdx/uggLrfM7RkeRSr2uRsVoG cRhq/86JOaALMVZ1Dcztrs3zFDBNNrTbaFts00yHjdPGyMGflNS9KNfJcIT6fgQD96Jh5n0MFu/BO TDIKr8URYZZm4NQ5JTljvCiMof3mT9Oii5UPVR7OrDnJo9Tygh6Q9OZAFYTGKun7s+9w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: Fix handling XenStore errors in device creation Message-Id: Date: Sat, 11 May 2024 00:22:33 +0000 commit 531d3bea5e9357357eaf6d40f5784a1b4c29b910 Author: Demi Marie Obenour AuthorDate: Fri Apr 26 22:17:03 2024 -0400 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 libxl: Fix handling XenStore errors in device creation If xenstored runs out of memory it is possible for it to fail operations that should succeed. libxl wasn't robust against this, and could fail to ensure that the TTY path of a non-initial console was created and read-only for guests. This doesn't qualify for an XSA because guests should not be able to run xenstored out of memory, but it still needs to be fixed. Add the missing error checks to ensure that all errors are properly handled and that at no point can a guest make the TTY path of its frontend directory writable. Signed-off-by: Demi Marie Obenour Reviewed-by: Juergen Gross --- tools/libs/light/libxl_console.c | 11 +++--- tools/libs/light/libxl_device.c | 72 +++++++++++++++++++++++++--------------- tools/libs/light/libxl_xshelp.c | 13 +++++--- 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/tools/libs/light/libxl_console.c b/tools/libs/light/libxl_console.c index cd7412a327..a563c9d3c7 100644 --- a/tools/libs/light/libxl_console.c +++ b/tools/libs/light/libxl_console.c @@ -351,11 +351,10 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, flexarray_append(front, "protocol"); flexarray_append(front, LIBXL_XENCONSOLE_PROTOCOL); } - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - libxl__xs_kvs_of_flexarray(gc, ro_front)); - rc = 0; + rc = libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back), + libxl__xs_kvs_of_flexarray(gc, front), + libxl__xs_kvs_of_flexarray(gc, ro_front)); out: return rc; } @@ -665,6 +664,8 @@ int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid, */ if (!val) val = "/NO-SUCH-PATH"; channelinfo->u.pty.path = strdup(val); + if (channelinfo->u.pty.path == NULL) + abort(); break; default: break; diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index a3d9f6f7df..4faa5fa3bd 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -177,8 +177,13 @@ int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, ro_frontend_perms[1].perms = backend_perms[1].perms = XS_PERM_READ; retry_transaction: - if (create_transaction) + if (create_transaction) { t = xs_transaction_start(ctx->xsh); + if (t == XBT_NULL) { + LOGED(ERROR, device->domid, "xs_transaction_start failed"); + return ERROR_FAIL; + } + } /* FIXME: read frontend_path and check state before removing stuff */ @@ -195,42 +200,55 @@ retry_transaction: if (rc) goto out; } - /* xxx much of this function lacks error checks! */ - if (fents || ro_fents) { - xs_rm(ctx->xsh, t, frontend_path); - xs_mkdir(ctx->xsh, t, frontend_path); + if (!xs_rm(ctx->xsh, t, frontend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, frontend_path)) + goto out; /* Console 0 is a special case. It doesn't use the regular PV * state machine but also the frontend directory has * historically contained other information, such as the * vnc-port, which we don't want the guest fiddling with. */ if ((device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) || - (device->kind == LIBXL__DEVICE_KIND_VUART)) - xs_set_permissions(ctx->xsh, t, frontend_path, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); - else - xs_set_permissions(ctx->xsh, t, frontend_path, - frontend_perms, ARRAY_SIZE(frontend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), - backend_path, strlen(backend_path)); - if (fents) - libxl__xs_writev_perms(gc, t, frontend_path, fents, - frontend_perms, ARRAY_SIZE(frontend_perms)); - if (ro_fents) - libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + (device->kind == LIBXL__DEVICE_KIND_VUART)) { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms))) + goto out; + } else { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + frontend_perms, ARRAY_SIZE(frontend_perms))) + goto out; + } + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), + backend_path, strlen(backend_path))) + goto out; + if (fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, fents, + frontend_perms, ARRAY_SIZE(frontend_perms)); + if (rc) goto out; + } + if (ro_fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + if (rc) goto out; + } } if (bents) { if (!libxl_only) { - xs_rm(ctx->xsh, t, backend_path); - xs_mkdir(ctx->xsh, t, backend_path); - xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, - ARRAY_SIZE(backend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), - frontend_path, strlen(frontend_path)); - libxl__xs_writev(gc, t, backend_path, bents); + if (!xs_rm(ctx->xsh, t, backend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, backend_path)) + goto out; + if (!xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, + ARRAY_SIZE(backend_perms))) + goto out; + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), + frontend_path, strlen(frontend_path))) + goto out; + rc = libxl__xs_writev(gc, t, backend_path, bents); + if (rc) goto out; } /* @@ -276,7 +294,7 @@ retry_transaction: out: if (create_transaction && t) libxl__xs_transaction_abort(gc, &t); - return rc; + return rc != 0 ? rc : ERROR_FAIL; } typedef struct { diff --git a/tools/libs/light/libxl_xshelp.c b/tools/libs/light/libxl_xshelp.c index 751cd942d9..a6e34ab10f 100644 --- a/tools/libs/light/libxl_xshelp.c +++ b/tools/libs/light/libxl_xshelp.c @@ -60,10 +60,15 @@ int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, for (i = 0; kvs[i] != NULL; i += 2) { path = GCSPRINTF("%s/%s", dir, kvs[i]); if (path && kvs[i + 1]) { - int length = strlen(kvs[i + 1]); - xs_write(ctx->xsh, t, path, kvs[i + 1], length); - if (perms) - xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + size_t length = strlen(kvs[i + 1]); + if (length > UINT_MAX) + return ERROR_FAIL; + if (!xs_write(ctx->xsh, t, path, kvs[i + 1], length)) + return ERROR_FAIL; + if (perms) { + if (!xs_set_permissions(ctx->xsh, t, path, perms, num_perms)) + return ERROR_FAIL; + } } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:22:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:22:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720137.1123182 (Exim 4.92) (envelope-from ) id 1s5aVg-0003Mf-TG; Sat, 11 May 2024 00:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720137.1123182; Sat, 11 May 2024 00: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 1s5aVg-0003MX-Qe; Sat, 11 May 2024 00:22:44 +0000 Received: by outflank-mailman (input) for mailman id 720137; Sat, 11 May 2024 00:22:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVf-0003MP-VX for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVf-0002fQ-Uk for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aVf-0002rg-Ty for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RUWpAtOvvHXnNJTad5Oj1QapGbLL41IZ5LTtLBGsMZ0=; b=XtFiRs4fujg8tPkC/2GuGxjryM zvPA5WeRjE0lFZ5DDIT5TG6X3pqhaEWl7u+ul8EN8xRu+um3NzPnOqWrs8Tdm55J2FiVMPE3VLIl/ 6dGreHASREV/Y75EnUMS3ZnEWEtch9zbaKdAVg4rGPyhS1V+nzOeY6ZQ2CzKgvNtrCdA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: tag MISRA C Rule 1.1 as clean Message-Id: Date: Sat, 11 May 2024 00:22:43 +0000 commit d31d0665f1c5f91741604c99f8cc5c6a05fa1636 Author: Nicola Vetrini AuthorDate: Fri May 10 20:03:36 2024 +0200 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 automation/eclair_analysis: tag MISRA C Rule 1.1 as clean Tag the rule as clean, as there are no more violations in the codebase since 93c27d54dd23 ("xen/arm: Fix MISRA regression on R1.1, flexible array member not at the end"). Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index 1e13258fa9..a14bda5033 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:22:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720138.1123186 (Exim 4.92) (envelope-from ) id 1s5aVq-0003PF-UW; Sat, 11 May 2024 00:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720138.1123186; Sat, 11 May 2024 00: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 1s5aVq-0003P8-S6; Sat, 11 May 2024 00:22:54 +0000 Received: by outflank-mailman (input) for mailman id 720138; Sat, 11 May 2024 00:22:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVq-0003P0-3H for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aVq-0002fb-1h for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aVq-0002sP-0k for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:22: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=nwsu29Vx2DmPA9nxsVXsVh+2lVzhL5mdTvm/o/5UWKc=; b=VEW5DTcS7Amy/LOFJS5q/jGSu4 JlF9aLuI/IrprZPQw5OOX3WqZ9EK318UY726v/TYKp7XuvH/uAacA/IOFeEU7l30OtfUMOjCAVirs 6EI5d7PO3QaME86QIcWszUl4qvpk0H8Pq6XS/iXgJmGHHzpPRbU8vCF+XejmAaIgdjxM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Use -Wflex-array-member-not-at-end when available Message-Id: Date: Sat, 11 May 2024 00:22:54 +0000 commit 0b01395c44234e2961ca389a1f1fa510ce90b2b8 Author: Andrew Cooper AuthorDate: Sat Jan 13 17:40:48 2024 +0000 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 xen: Use -Wflex-array-member-not-at-end when available This option is new in GCC-14, and maps to MISRA Rule 1.1. The codebase is clean to it, and Eclair is blocking. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/Makefile b/xen/Makefile index b6c39fc6ae..71f0cb5071 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -396,6 +396,7 @@ CFLAGS += -nostdinc -fno-builtin -fno-common CFLAGS += -Werror -Wredundant-decls -Wwrite-strings -Wno-pointer-arith CFLAGS += -Wdeclaration-after-statement $(call cc-option-add,CFLAGS,CC,-Wvla) +$(call cc-option-add,CFLAGS,CC,-Wflex-array-member-not-at-end) CFLAGS += -pipe -D__XEN__ -include $(srctree)/include/xen/config.h CFLAGS-$(CONFIG_DEBUG_INFO) += -g -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:23:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:23:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720139.1123191 (Exim 4.92) (envelope-from ) id 1s5aW1-0003S0-0H; Sat, 11 May 2024 00:23:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720139.1123191; Sat, 11 May 2024 00: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 1s5aW0-0003Rt-TZ; Sat, 11 May 2024 00:23:04 +0000 Received: by outflank-mailman (input) for mailman id 720139; Sat, 11 May 2024 00:23:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aW0-0003Rh-5Y for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aW0-0002g3-4j for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aW0-0002t4-3u for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zEB3wq7F7ypaA9NmzrLPvSEfD+wntDPiLrR6jZA+wmU=; b=bqJsBZd/p32SbYdlnkSJIoGdhI VxBZ23CV2FVXX0Vc9M6WzebDvSp/NIiLL9Z5TSIC15i/X8ZzA62FUoLfCKNn+b+aob7aYnL/eVYqF F+NAqusmpshqOWTcYvEbB8x4G4NFa20+RQ05rkBjt0EUVnHgjBYDOpKUwGbdYi7dhExI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Use -Wuninitialized and -Winit-self Message-Id: Date: Sat, 11 May 2024 00:23:04 +0000 commit 90a1bc9e825fa087331c63aa12bb64683bd75020 Author: Andrew Cooper AuthorDate: Fri May 10 23:56:52 2024 +0100 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 xen: Use -Wuninitialized and -Winit-self Assigning a variable to itself is an anti-pattern. It introduces definite UB in an attempt to silence a warning about possible UB. As it's definite undefined behaviour, it also mis-compiles in simple cases, using whatever stale value happened to be in the allocated register. Clang includes -Wuninitialized within -Wall, but GCC only includes it in -Wextra, which is not used by Xen at this time. Furthermore, the specific pattern of assigning a variable to itself in its declaration is only diagnosed by GCC with -Winit-self. Clang does diagnose simple forms of this pattern with a plain -Wuninitialized, but it fails to diagnose the instances in Xen that GCC manages to find. GCC, with -Wuninitialized and -Winit-self notices: arch/x86/time.c: In function ‘read_pt_and_tsc’: arch/x86/time.c:297:14: error: ‘best’ is used uninitialized in this function [-Werror=uninitialized] 297 | uint32_t best = best; | ^~~~ arch/x86/time.c: In function ‘read_pt_and_tmcct’: arch/x86/time.c:1022:14: error: ‘best’ is used uninitialized in this function [-Werror=uninitialized] 1022 | uint64_t best = best; | ^~~~ Fix these up to start with a value of ~0, which is also more robust in the case that something goes wrong. Fixes: 23658e823238 ("x86/time: further improve TSC / CPU freq calibration accuracy") Fixes: 3f3906b462d5 ("x86/APIC: calibrate against platform timer when possible") Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/Makefile | 3 ++- xen/arch/x86/time.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 71f0cb5071..da8855f3c3 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -394,9 +394,10 @@ CFLAGS-$(CONFIG_CC_SPLIT_SECTIONS) += -ffunction-sections -fdata-sections CFLAGS += -nostdinc -fno-builtin -fno-common CFLAGS += -Werror -Wredundant-decls -Wwrite-strings -Wno-pointer-arith -CFLAGS += -Wdeclaration-after-statement +CFLAGS += -Wdeclaration-after-statement -Wuninitialized $(call cc-option-add,CFLAGS,CC,-Wvla) $(call cc-option-add,CFLAGS,CC,-Wflex-array-member-not-at-end) +$(call cc-option-add,CFLAGS,CC,-Winit-self) CFLAGS += -pipe -D__XEN__ -include $(srctree)/include/xen/config.h CFLAGS-$(CONFIG_DEBUG_INFO) += -g diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 6f136f4b14..78ea095e3e 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -293,7 +293,7 @@ static uint32_t __init read_pt_and_tsc(uint64_t *tsc, const struct platform_timesource *pts) { uint64_t tsc_prev = *tsc = rdtsc_ordered(), tsc_min = ~0; - uint32_t best = best; + uint32_t best = ~0; unsigned int i; for ( i = 0; ; ++i ) @@ -1018,7 +1018,7 @@ static u64 __init init_platform_timer(void) static uint64_t __init read_pt_and_tmcct(uint32_t *tmcct) { uint32_t tmcct_prev = *tmcct = apic_tmcct_read(), tmcct_min = ~0; - uint64_t best = best; + uint64_t best = ~0; unsigned int i; for ( i = 0; ; ++i ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:23:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:23:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720140.1123195 (Exim 4.92) (envelope-from ) id 1s5aWB-0003Um-1q; Sat, 11 May 2024 00:23:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720140.1123195; Sat, 11 May 2024 00:23:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aWA-0003Ue-VK; Sat, 11 May 2024 00:23:14 +0000 Received: by outflank-mailman (input) for mailman id 720140; Sat, 11 May 2024 00:23:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aWA-0003UQ-8Q for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aWA-0002gA-7g for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aWA-0002tb-6o for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EC107JEjzWVTovB5sYAMT1VjtvzfsyAsZlHDEDb76iM=; b=tcphJc88k4F7XHdayts9rkmhUm QD+PFFcwM8sk5s7mLM2c+ZeNxJlIcMDhN61CgnVkgFkzo89ZeQ7nfEfZJhDvTR2vISLti0knHzzfE TXgql3oXwVYUiKfylZ0YKlYJ+7KZFEJy26Q2qQmsWouiL1leXtLnmcUQZEfYRlkbkKcE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert "evtchn: refuse EVTCHNOP_status for Xen-bound event channels" Message-Id: Date: Sat, 11 May 2024 00:23:14 +0000 commit 2d8d7481ca261d86c33e27e2294ed8c9ef5a0fc3 Author: Andrew Cooper AuthorDate: Tue Apr 2 15:50:19 2024 +0100 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 Revert "evtchn: refuse EVTCHNOP_status for Xen-bound event channels" The commit makes a claim without justification. The claim is false; it broke lsevtchn in dom0, a debugging utility which absolutely does care about all of the domain's event channels. Whether to return information about a xen-owned evtchn is a matter of policy, and it's not acceptable to subvert Xen's security subsystem on the decision. This reverts commit f60ab5337f968e2f10c639ab59db7afb0fe4f7c3. Fixes: f60ab5337f96 ("evtchn: refuse EVTCHNOP_status for Xen-bound event channels") Signed-off-by: Andrew Cooper Acked-by: Daniel P. Smith --- xen/common/event_channel.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index aceee0695f..a67feff989 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -1041,12 +1041,6 @@ int evtchn_status(evtchn_status_t *status) read_lock(&d->event_lock); - if ( consumer_is_xen(chn) ) - { - rc = -EACCES; - goto out; - } - rc = xsm_evtchn_status(XSM_TARGET, d, chn); if ( rc ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:23:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:23:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720141.1123199 (Exim 4.92) (envelope-from ) id 1s5aWL-0003XV-3L; Sat, 11 May 2024 00:23:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720141.1123199; Sat, 11 May 2024 00:23:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aWL-0003XM-0c; Sat, 11 May 2024 00:23:25 +0000 Received: by outflank-mailman (input) for mailman id 720141; Sat, 11 May 2024 00:23:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aWK-0003XC-BJ for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aWK-0002gH-AV for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aWK-0002uG-9g for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ks6AnVoXpNNRr5rqmbRHRic6z1VofVI5PB73Y/ybh+k=; b=LFdUHJ2/dpdv1qJE9M12XDRYMH KRE3ER3ZMfd70ja68tQUgdtwtjgFSYWNkPzrRbR532EKV7/ep7Fxhb0ydE6ihpW8Kk44XaFnEJNNM GPKgwWLy1BG6gpKIpMsDXlGOT0STU+uy3CtGc5lo4DhKgxk63/QCZyL8ssb6eKsf0dzg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/io: Don't cast away constness in read{b..q}() Message-Id: Date: Sat, 11 May 2024 00:23:24 +0000 commit 9110072b764b5abdddb574ece1da4ffd1b34caf2 Author: Andrew Cooper AuthorDate: Fri May 10 20:23:40 2024 +0100 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 x86/io: Don't cast away constness in read{b..q}() Addresses various MISRA R11.8 violations. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/arch/x86/include/asm/io.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/io.h b/xen/arch/x86/include/asm/io.h index 9b19d2d389..1cb4217cff 100644 --- a/xen/arch/x86/include/asm/io.h +++ b/xen/arch/x86/include/asm/io.h @@ -4,10 +4,10 @@ #include #include -#define readb(x) (*(volatile uint8_t *)(x)) -#define readw(x) (*(volatile uint16_t *)(x)) -#define readl(x) (*(volatile uint32_t *)(x)) -#define readq(x) (*(volatile uint64_t *)(x)) +#define readb(x) (*(const volatile uint8_t *)(x)) +#define readw(x) (*(const volatile uint16_t *)(x)) +#define readl(x) (*(const volatile uint32_t *)(x)) +#define readq(x) (*(const volatile uint64_t *)(x)) #define writeb(d,x) (*(volatile uint8_t *)(x) = (d)) #define writew(d,x) (*(volatile uint16_t *)(x) = (d)) #define writel(d,x) (*(volatile uint32_t *)(x) = (d)) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 00:23:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 00:23:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720142.1123203 (Exim 4.92) (envelope-from ) id 1s5aWV-0003cH-4k; Sat, 11 May 2024 00:23:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720142.1123203; Sat, 11 May 2024 00:23: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 1s5aWV-0003c9-21; Sat, 11 May 2024 00:23:35 +0000 Received: by outflank-mailman (input) for mailman id 720142; Sat, 11 May 2024 00:23:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aWU-0003a1-EB for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5aWU-0002gj-DR for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5aWU-0002un-Cb for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 00:23:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ANDVlYi98e7wmxXLOkXhlkbEGE9uHAxcouUfCdk+CpE=; b=22k5Q/8Ub71NiKJYAdnAaNalh+ xXLxdWC7+aK9TLK7u1YgXm+pRzUp2gxXuRqp/xKwkHakCwu66yGe9zP6q/SMJSEQQnLyrqqPHHyMS IKVTc7u4UyX9dVNwSkm760+S6Ry5xFcnVJ95vKw7l25XVLw8gRoxSu9bAjXKBlcX8KUg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/misra: add R21.6 R21.9 R21.10 R21.14 R21.15 R21.16 Message-Id: Date: Sat, 11 May 2024 00:23:34 +0000 commit 46aa3031ae89ac1771f4159972edab65710e7349 Author: Stefano Stabellini AuthorDate: Fri Apr 26 14:36:28 2024 -0700 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 docs/misra: add R21.6 R21.9 R21.10 R21.14 R21.15 R21.16 Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- docs/misra/rules.rst | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index d3b70fdf04..80e5e972ad 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -651,12 +651,48 @@ maintainers if you want to suggest a change. declared - See comment for Rule 21.1 + * - `Rule 21.6 `_ + - Required + - The Standard Library input/output routines shall not be used + - Xen doesn't provide, use, or link against a Standard Library [#xen-stdlib]_ + + * - `Rule 21.9 `_ + - Required + - The library functions bsearch and qsort of shall not be used + - Xen doesn't provide, use, or link against a Standard Library [#xen-stdlib]_ + + * - `Rule 21.10 `_ + - Required + - The Standard Library time and date routines shall not be used + - Xen doesn't provide, use, or link against a Standard Library [#xen-stdlib]_ + * - `Rule 21.13 `_ - Mandatory - Any value passed to a function in shall be representable as an unsigned char or be the value EOF - + * - `Rule 21.14 `_ + - Required + - The Standard Library function memcmp shall not be used to compare + null terminated strings + - + + * - `Rule 21.15 `_ + - Required + - The pointer arguments to the Standard Library functions memcpy, + memmove and memcmp shall be pointers to qualified or unqualified + versions of compatible types + - + + * - `Rule 21.16 `_ + - Required + - The pointer arguments to the Standard Library function memcmp + shall point to either a pointer type, an essentially signed type, + an essentially unsigned type, an essentially Boolean type or an + essentially enum type + - void* arguments are allowed + * - `Rule 21.17 `_ - Mandatory - Use of the string handling functions from shall not result in @@ -722,3 +758,10 @@ A *switch clause* can be defined as: case/default labels". A formal definition is available within the amplification of MISRA C:2012 Rule 16.1. + +.. rubric:: Footnotes + +.. [#xen-stdlib] Xen implements itself a few functions with names that match + the corresponding function names of the Standard Library for developers' + convenience. These functions are part of the Xen code and subject to + analysis. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 11 10:11:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 10:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720281.1123396 (Exim 4.92) (envelope-from ) id 1s5jh0-0005AV-RC; Sat, 11 May 2024 10:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720281.1123396; Sat, 11 May 2024 10:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5jh0-0005AM-OJ; Sat, 11 May 2024 10:11:02 +0000 Received: by outflank-mailman (input) for mailman id 720281; Sat, 11 May 2024 10:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5jh0-00059u-1W for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 10:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5jh0-0005uW-0g for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 10:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5jgz-0001jx-Vy for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 10: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=lJ5unhoHlkS7SqdIXH6TOsdtt9FgxJImALYnJVKKUEg=; b=3foWheiOeFYkn13GjOVDCBIzVd /A1Fo02eFO+THXmtA5GCXdqVcRqO3xBW6yWRg2l708nPfu/qHtw4zaxb7Iw4qYcRaxGWV7tFGPIhl E343bg/XlB5wzAgS4NNY2TvTfAOWT1RxNMSLFrdGrr95iLo/CDnGs39mFuSRHbZiOc88=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: allow up to 16383 cpus Message-Id: Date: Sat, 11 May 2024 10:11:01 +0000 commit 996576b965ccdf0de17aafa14282925e408e1200 Author: Juergen Gross AuthorDate: Fri May 10 16:16:36 2024 +0200 Commit: Julien Grall CommitDate: Fri May 10 22:15:44 2024 +0100 xen: allow up to 16383 cpus With lock handling now allowing up to 16384 cpus (spinlocks can handle 65535 cpus, rwlocks can handle 16384 cpus), raise the allowed limit for the number of cpus to be configured to 16383. The new limit is imposed by IOMMU_CMD_BUFFER_MAX_ENTRIES and QINVAL_MAX_ENTRY_NR required to be larger than 2 * CONFIG_NR_CPUS. Add a support limit of physical CPUs to SUPPORT.md (4096 on x86, 128 on ARM). Signed-off-by: Juergen Gross Acked-by: Jan Beulich Acked-by: Julien Grall --- CHANGELOG.md | 2 ++ SUPPORT.md | 5 +++++ xen/arch/Kconfig | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8041cfb7d2..c43c45d8d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - HVM PIRQs are disabled by default. - Reduce IOMMU setup time for hardware domain. - xl/libxl configures vkb=[] for HVM domains with priority over vkb_device. + - Increase the maximum number of CPUs Xen can be built for from 4095 to + 16383. ### Added - On x86: diff --git a/SUPPORT.md b/SUPPORT.md index e10d46d924..d5d60c62ec 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -61,6 +61,11 @@ For the Cortex A77 r0p0 - r1p0, see Errata 1508412. Status, x86: Supported +### Physical CPUs + + Status, x86: Supported up to 4096 + Status, ARM: Supported up to 128 + ### Host ACPI (via Domain 0) Status, x86 PV: Supported diff --git a/xen/arch/Kconfig b/xen/arch/Kconfig index 67ba38f32f..308ce129a8 100644 --- a/xen/arch/Kconfig +++ b/xen/arch/Kconfig @@ -6,7 +6,7 @@ config PHYS_ADDR_T_32 config NR_CPUS int "Maximum number of CPUs" - range 1 4095 + range 1 16383 default "256" if X86 default "8" if ARM && RCAR3 default "4" if ARM && QEMU -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:00:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:00:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720411.1123441 (Exim 4.92) (envelope-from ) id 1s5rww-0004hS-MK; Sat, 11 May 2024 19:00:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720411.1123441; Sat, 11 May 2024 19: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 1s5rww-0004h1-JU; Sat, 11 May 2024 19:00:02 +0000 Received: by outflank-mailman (input) for mailman id 720411; Sat, 11 May 2024 19:00:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rwv-0004Wo-Tj for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rwv-0007bx-S9 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5rwv-0000aQ-QF for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6ibvvzP/czue5KNlNqSmbnf0HdSFru3HBNAZhotD7+o=; b=IbQNn8syjRaBXcpaF0e8f47u07 n1izI/azNLNo2o6zVpBrfwH70wAbAULNFM/0Mzb42yJoHzL7veejpQEOAUL/SkEfGNYhDnHtg5sBT 0OraY1ZuQ5cO/Q30D+PwdkscNteDdwmR5TWwD5bfk8Cgkjmw1glEY29xcYTbZRcaws8c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: fix population of the online vCPU bitmap for PVH Message-Id: Date: Sat, 11 May 2024 19:00:01 +0000 commit 5cc7347b04b2d0a3133754c7a9b936f614ec656a Author: Roger Pau Monne AuthorDate: Fri May 10 14:49:13 2024 +0200 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 libxl: fix population of the online vCPU bitmap for PVH libxl passes some information to libacpi to create the ACPI table for a PVH guest, and among that information it's a bitmap of which vCPUs are online which can be less than the maximum number of vCPUs assigned to the domain. While the population of the bitmap is done correctly for HVM based on the number of online vCPUs, for PVH the population of the bitmap is done based on the number of maximum vCPUs allowed. This leads to all local APIC entries in the MADT being set as enabled, which contradicts the data in xenstore if vCPUs is different than maximum vCPUs. Fix by copying the internal libxl bitmap that's populated based on the vCPUs parameter. Reported-by: Arthur Borsboom Link: https://gitlab.com/libvirt/libvirt/-/issues/399 Reported-by: Leigh Brown Fixes: 14c0d328da2b ('libxl/acpi: Build ACPI tables for HVMlite guests') Signed-off-by: Roger Pau Monné Tested-by: Leigh Brown Acked-by: Andrew Cooper --- tools/libs/light/libxl_x86_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libs/light/libxl_x86_acpi.c b/tools/libs/light/libxl_x86_acpi.c index 620f3c700c..5cf261bd67 100644 --- a/tools/libs/light/libxl_x86_acpi.c +++ b/tools/libs/light/libxl_x86_acpi.c @@ -89,7 +89,7 @@ static int init_acpi_config(libxl__gc *gc, uint32_t domid = dom->guest_domid; xc_domaininfo_t info; struct hvm_info_table *hvminfo; - int i, r, rc; + int r, rc; config->dsdt_anycpu = config->dsdt_15cpu = dsdt_pvh; config->dsdt_anycpu_len = config->dsdt_15cpu_len = dsdt_pvh_len; @@ -138,8 +138,8 @@ static int init_acpi_config(libxl__gc *gc, hvminfo->nr_vcpus = info.max_vcpu_id + 1; } - for (i = 0; i < hvminfo->nr_vcpus; i++) - hvminfo->vcpu_online[i / 8] |= 1 << (i & 7); + memcpy(hvminfo->vcpu_online, b_info->avail_vcpus.map, + b_info->avail_vcpus.size); config->hvminfo = hvminfo; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:00:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720412.1123444 (Exim 4.92) (envelope-from ) id 1s5rx7-0005NT-NO; Sat, 11 May 2024 19:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720412.1123444; Sat, 11 May 2024 19: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 1s5rx7-0005NM-Kw; Sat, 11 May 2024 19:00:13 +0000 Received: by outflank-mailman (input) for mailman id 720412; Sat, 11 May 2024 19:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rx6-0005NE-2Q for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rx6-0007c4-1Z for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5rx5-0000c2-UG for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19: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=7MoPVhvZCToaeyP2wIF/SCxxtjVLygGvuuR0TG/fqdk=; b=0YZoddFtwnij+SI5MpPqZKOxGY bsmZivOcrMJu4PicD/sbBqWqQc5CMo376NyD6oPiiJ8WV2DYLBbDbcFYje4NT+pYJZU2RZ1Bs6+SU ja0BMdteyVLc1kRd40eauasna+E+dUc+RHuB/SnN9ciYJnR76RNOhzVFJNwUTDacLFco=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msi: Extend per-domain/device warning mechanism Message-Id: Date: Sat, 11 May 2024 19:00:11 +0000 commit e9607d4061eee971987a989c710c809ccc408ce7 Author: Marek Marczykowski-Górecki AuthorDate: Fri May 10 05:53:21 2024 +0200 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 x86/msi: Extend per-domain/device warning mechanism The arch_msix struct had a single "warned" field with a domid for which warning was issued. Upcoming patch will need similar mechanism for few more warnings, so change it to save a bit field of issued warnings. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/msi.h | 18 +++++++++++++++++- xen/arch/x86/msi.c | 5 +---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/msi.h b/xen/arch/x86/include/asm/msi.h index 997ccb87be..b64cb93c0c 100644 --- a/xen/arch/x86/include/asm/msi.h +++ b/xen/arch/x86/include/asm/msi.h @@ -208,6 +208,16 @@ struct msg_address { PCI_MSIX_ENTRY_SIZE + \ (~PCI_MSIX_BIRMASK & (PAGE_SIZE - 1))) +#define MSIX_CHECK_WARN(msix, domid, which) \ + ({ \ + if ( (msix)->warned_domid != (domid) ) \ + { \ + (msix)->warned_domid = (domid); \ + (msix)->warned_kind.all = 0; \ + } \ + (msix)->warned_kind.which ? false : ((msix)->warned_kind.which = true); \ + }) + struct arch_msix { unsigned int nr_entries, used_entries; struct { @@ -217,7 +227,13 @@ struct arch_msix { int table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t table_lock; bool host_maskall, guest_maskall; - domid_t warned; + domid_t warned_domid; + union { + uint8_t all; + struct { + bool maskall : 1; + }; + } warned_kind; }; void early_msi_init(void); diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 3009ce109f..fb0fab60f1 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -364,13 +364,10 @@ static bool msi_set_mask_bit(struct irq_desc *desc, bool host, bool guest) domid_t domid = pdev->domain->domain_id; maskall = true; - if ( pdev->msix->warned != domid ) - { - pdev->msix->warned = domid; + if ( MSIX_CHECK_WARN(pdev->msix, domid, maskall) ) printk(XENLOG_G_WARNING "cannot mask IRQ %d: masking MSI-X on Dom%d's %pp\n", desc->irq, domid, &pdev->sbdf); - } } pdev->msix->host_maskall = maskall; if ( maskall || pdev->msix->guest_maskall ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:00:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720413.1123449 (Exim 4.92) (envelope-from ) id 1s5rxH-0005Pt-PD; Sat, 11 May 2024 19:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720413.1123449; Sat, 11 May 2024 19: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 1s5rxH-0005Pk-MQ; Sat, 11 May 2024 19:00:23 +0000 Received: by outflank-mailman (input) for mailman id 720413; Sat, 11 May 2024 19:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxG-0005Pc-5m for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxG-0007cF-4v for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5rxG-0000cX-3t for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YQLr+m7T1hA8gDO11yrRUZN52zkATOwLfgmBDI53EZs=; b=EOQYRrf/RdjLqUMQPnlGHE1tRE ZM3MuhbgP9mPT6/m7N8hssV9XBMjSv+/Zhyn+3D4Ftd1s/cA5jpUFgHURMohC+lUK8LaTxf7GzQLk O/qN9kXvoChbN9Wa1jZPmdeSlzFOjP7KfIOEcVx637BBNrjOYMVmsezaj9chmBX7hqZk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Allow access to registers on the same page as MSI-X table Message-Id: Date: Sat, 11 May 2024 19:00:22 +0000 commit b2cd07a0447bfa25e96ae13e190225b61a3670cb Author: Marek Marczykowski-Górecki AuthorDate: Fri May 10 05:53:22 2024 +0200 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 x86/hvm: Allow access to registers on the same page as MSI-X table Some devices (notably Intel Wifi 6 AX210 card) keep auxiliary registers on the same page as MSI-X table. Device model (especially one in stubdomain) cannot really handle those, as direct writes to that page is refused (page is on the mmio_ro_ranges list). Instead, extend msixtbl_mmio_ops to handle such accesses too. Doing this, requires correlating read/write location with guest MSI-X table address. Since QEMU doesn't map MSI-X table to the guest, it requires msixtbl_entry->gtable, which is HVM-only. Similar feature for PV would need to be done separately. This will be also used to read Pending Bit Array, if it lives on the same page, making QEMU not needing /dev/mem access at all (especially helpful with lockdown enabled in dom0). If PBA lives on another page, QEMU will map it to the guest directly. If PBA lives on the same page, discard writes and log a message. Technically, writes outside of PBA could be allowed, but at this moment the precise location of PBA isn't saved, and also no known device abuses the spec in this way (at least yet). To access those registers, msixtbl_mmio_ops need the relevant page mapped. MSI handling already has infrastructure for that, using fixmap, so try to map first/last page of the MSI-X table (if necessary) and save their fixmap indexes. Note that msix_get_fixmap() does reference counting and reuses existing mapping, so just call it directly, even if the page was mapped before. Also, it uses a specific range of fixmap indexes which doesn't include 0, so use 0 as default ("not mapped") value - which simplifies code a bit. Based on assumption that all MSI-X page accesses are handled by Xen, do not forward adjacent accesses to other hypothetical ioreq servers, even if the access wasn't handled for some reason (failure to map pages etc). Relevant places log a message about that already. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/vmsi.c | 206 +++++++++++++++++++++++++++++++++++++++-- xen/arch/x86/include/asm/msi.h | 5 + xen/arch/x86/msi.c | 42 +++++++++ 3 files changed, 243 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 9999179837..fd83abb929 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -180,6 +180,10 @@ static bool msixtbl_initialised(const struct domain *d) return d->arch.hvm.msixtbl_list.next; } +/* + * Lookup an msixtbl_entry on the same page as given addr. It's up to the + * caller to check if address is strictly part of the table - if relevant. + */ static struct msixtbl_entry *msixtbl_find_entry( struct vcpu *v, unsigned long addr) { @@ -187,8 +191,8 @@ static struct msixtbl_entry *msixtbl_find_entry( struct domain *d = v->domain; list_for_each_entry( entry, &d->arch.hvm.msixtbl_list, list ) - if ( addr >= entry->gtable && - addr < entry->gtable + entry->table_len ) + if ( PFN_DOWN(addr) >= PFN_DOWN(entry->gtable) && + PFN_DOWN(addr) <= PFN_DOWN(entry->gtable + entry->table_len - 1) ) return entry; return NULL; @@ -203,6 +207,10 @@ static struct msi_desc *msixtbl_addr_to_desc( if ( !entry || !entry->pdev ) return NULL; + if ( addr < entry->gtable || + addr >= entry->gtable + entry->table_len ) + return NULL; + nr_entry = (addr - entry->gtable) / PCI_MSIX_ENTRY_SIZE; list_for_each_entry( desc, &entry->pdev->msi_list, list ) @@ -213,6 +221,153 @@ static struct msi_desc *msixtbl_addr_to_desc( return NULL; } +/* + * Returns: + * - 0 (FIX_RESERVED) if no handling should be done + * - a fixmap idx to use for handling + */ +static unsigned int get_adjacent_idx( + const struct msixtbl_entry *entry, unsigned long addr, bool write) +{ + unsigned int adj_type; + struct arch_msix *msix; + + if ( !entry || !entry->pdev ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + if ( PFN_DOWN(addr) == PFN_DOWN(entry->gtable) && addr < entry->gtable ) + adj_type = ADJ_IDX_FIRST; + else if ( PFN_DOWN(addr) == PFN_DOWN(entry->gtable + entry->table_len - 1) && + addr >= entry->gtable + entry->table_len ) + adj_type = ADJ_IDX_LAST; + else + { + /* All callers should already do equivalent range checking. */ + ASSERT_UNREACHABLE(); + return 0; + } + + msix = entry->pdev->msix; + if ( !msix ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + if ( !msix->adj_access_idx[adj_type] ) + { + if ( MSIX_CHECK_WARN(msix, entry->pdev->domain->domain_id, + adjacent_not_initialized) ) + gprintk(XENLOG_WARNING, + "%pp: Page for adjacent(%d) MSI-X table access not initialized (addr %#lx, gtable %#lx)\n", + &entry->pdev->sbdf, adj_type, addr, entry->gtable); + return 0; + } + + /* If PBA lives on the same page too, discard writes. */ + if ( write && + ((adj_type == ADJ_IDX_LAST && + msix->table.last == msix->pba.first) || + (adj_type == ADJ_IDX_FIRST && + msix->table.first == msix->pba.last)) ) + { + if ( MSIX_CHECK_WARN(msix, entry->pdev->domain->domain_id, + adjacent_pba) ) + gprintk(XENLOG_WARNING, + "%pp: MSI-X table and PBA share a page, " + "discard write to adjacent memory (%#lx)\n", + &entry->pdev->sbdf, addr); + return 0; + } + + return msix->adj_access_idx[adj_type]; +} + +static void adjacent_read( + const struct msixtbl_entry *entry, + paddr_t address, unsigned int len, uint64_t *pval) +{ + const void __iomem *hwaddr; + unsigned int fixmap_idx; + + ASSERT(IS_ALIGNED(address, len)); + + *pval = ~0UL; + + fixmap_idx = get_adjacent_idx(entry, address, false); + + if ( !fixmap_idx ) + return; + + hwaddr = fix_to_virt(fixmap_idx) + PAGE_OFFSET(address); + + switch ( len ) + { + case 1: + *pval = readb(hwaddr); + break; + + case 2: + *pval = readw(hwaddr); + break; + + case 4: + *pval = readl(hwaddr); + break; + + case 8: + *pval = readq(hwaddr); + break; + + default: + ASSERT_UNREACHABLE(); + break; + } +} + +static void adjacent_write( + const struct msixtbl_entry *entry, + paddr_t address, unsigned int len, uint64_t val) +{ + void __iomem *hwaddr; + unsigned int fixmap_idx; + + ASSERT(IS_ALIGNED(address, len)); + + fixmap_idx = get_adjacent_idx(entry, address, true); + + if ( !fixmap_idx ) + return; + + hwaddr = fix_to_virt(fixmap_idx) + PAGE_OFFSET(address); + + switch ( len ) + { + case 1: + writeb(val, hwaddr); + break; + + case 2: + writew(val, hwaddr); + break; + + case 4: + writel(val, hwaddr); + break; + + case 8: + writeq(val, hwaddr); + break; + + default: + ASSERT_UNREACHABLE(); + break; + } +} + static int cf_check msixtbl_read( const struct hvm_io_handler *handler, uint64_t address, uint32_t len, uint64_t *pval) @@ -222,7 +377,7 @@ static int cf_check msixtbl_read( unsigned int nr_entry, index; int r = X86EMUL_UNHANDLEABLE; - if ( (len != 4 && len != 8) || (address & (len - 1)) ) + if ( !IS_ALIGNED(address, len) ) return r; rcu_read_lock(&msixtbl_rcu_lock); @@ -230,6 +385,18 @@ static int cf_check msixtbl_read( entry = msixtbl_find_entry(current, address); if ( !entry ) goto out; + + if ( address < entry->gtable || + address >= entry->gtable + entry->table_len ) + { + adjacent_read(entry, address, len, pval); + r = X86EMUL_OKAY; + goto out; + } + + if ( len != 4 && len != 8 ) + goto out; + offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -291,6 +458,18 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, entry = msixtbl_find_entry(v, address); if ( !entry ) goto out; + + if ( address < entry->gtable || + address >= entry->gtable + entry->table_len ) + { + adjacent_write(entry, address, len, val); + r = X86EMUL_OKAY; + goto out; + } + + if ( len != 4 && len != 8 ) + goto out; + nr_entry = array_index_nospec(((address - entry->gtable) / PCI_MSIX_ENTRY_SIZE), MAX_MSIX_TABLE_ENTRIES); @@ -356,8 +535,8 @@ static int cf_check _msixtbl_write( const struct hvm_io_handler *handler, uint64_t address, uint32_t len, uint64_t val) { - /* Ignore invalid length or unaligned writes. */ - if ( (len != 4 && len != 8) || !IS_ALIGNED(address, len) ) + /* Ignore unaligned writes. */ + if ( !IS_ALIGNED(address, len) ) return X86EMUL_OKAY; /* @@ -374,16 +553,23 @@ static bool cf_check msixtbl_range( { struct vcpu *curr = current; unsigned long addr = r->addr; - const struct msi_desc *desc; + const struct msixtbl_entry *entry; + bool ret = false; ASSERT(r->type == IOREQ_TYPE_COPY); rcu_read_lock(&msixtbl_rcu_lock); - desc = msixtbl_addr_to_desc(msixtbl_find_entry(curr, addr), addr); + entry = msixtbl_find_entry(curr, addr); + if ( entry && + /* Adjacent access. */ + (addr < entry->gtable || addr >= entry->gtable + entry->table_len || + /* Otherwise check if there is a matching msi_desc. */ + msixtbl_addr_to_desc(entry, addr)) ) + ret = true; rcu_read_unlock(&msixtbl_rcu_lock); - if ( desc ) - return 1; + if ( ret ) + return ret; if ( r->state == STATE_IOREQ_READY && r->dir == IOREQ_WRITE ) { @@ -429,7 +615,7 @@ static bool cf_check msixtbl_range( } } - return 0; + return false; } static const struct hvm_io_ops msixtbl_mmio_ops = { diff --git a/xen/arch/x86/include/asm/msi.h b/xen/arch/x86/include/asm/msi.h index b64cb93c0c..748bc3cd6d 100644 --- a/xen/arch/x86/include/asm/msi.h +++ b/xen/arch/x86/include/asm/msi.h @@ -225,6 +225,9 @@ struct arch_msix { } table, pba; int table_refcnt[MAX_MSIX_TABLE_PAGES]; int table_idx[MAX_MSIX_TABLE_PAGES]; +#define ADJ_IDX_FIRST 0 +#define ADJ_IDX_LAST 1 + unsigned int adj_access_idx[2]; spinlock_t table_lock; bool host_maskall, guest_maskall; domid_t warned_domid; @@ -232,6 +235,8 @@ struct arch_msix { uint8_t all; struct { bool maskall : 1; + bool adjacent_not_initialized : 1; + bool adjacent_pba : 1; }; } warned_kind; }; diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index fb0fab60f1..19830528b6 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -913,6 +913,37 @@ static int msix_capability_init(struct pci_dev *dev, list_add_tail(&entry->list, &dev->msi_list); *desc = entry; } + else + { + /* + * If the MSI-X table doesn't start at the page boundary, map the first page for + * passthrough accesses. + */ + if ( PAGE_OFFSET(table_paddr) ) + { + int idx = msix_get_fixmap(msix, table_paddr, table_paddr); + + if ( idx > 0 ) + msix->adj_access_idx[ADJ_IDX_FIRST] = idx; + else + gprintk(XENLOG_ERR, "%pp: Failed to map first MSI-X table page: %d\n", &dev->sbdf, idx); + } + /* + * If the MSI-X table doesn't end on the page boundary, map the last page + * for passthrough accesses. + */ + if ( PAGE_OFFSET(table_paddr + msix->nr_entries * PCI_MSIX_ENTRY_SIZE) ) + { + uint64_t entry_paddr = table_paddr + + (msix->nr_entries - 1) * PCI_MSIX_ENTRY_SIZE; + int idx = msix_get_fixmap(msix, table_paddr, entry_paddr); + + if ( idx > 0 ) + msix->adj_access_idx[ADJ_IDX_LAST] = idx; + else + gprintk(XENLOG_ERR, "%pp: Failed to map last MSI-X table page: %d\n", &dev->sbdf, idx); + } + } if ( !msix->used_entries ) { @@ -1079,6 +1110,17 @@ static void _pci_cleanup_msix(struct arch_msix *msix) msix->table.first = 0; msix->table.last = 0; + if ( msix->adj_access_idx[ADJ_IDX_FIRST] ) + { + msix_put_fixmap(msix, msix->adj_access_idx[ADJ_IDX_FIRST]); + msix->adj_access_idx[ADJ_IDX_FIRST] = 0; + } + if ( msix->adj_access_idx[ADJ_IDX_LAST] ) + { + msix_put_fixmap(msix, msix->adj_access_idx[ADJ_IDX_LAST]); + msix->adj_access_idx[ADJ_IDX_LAST] = 0; + } + if ( rangeset_remove_range(mmio_ro_ranges, msix->pba.first, msix->pba.last) ) WARN(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:00:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720414.1123453 (Exim 4.92) (envelope-from ) id 1s5rxR-0005Sj-Qf; Sat, 11 May 2024 19:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720414.1123453; Sat, 11 May 2024 19: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 1s5rxR-0005Sa-Ny; Sat, 11 May 2024 19:00:33 +0000 Received: by outflank-mailman (input) for mailman id 720414; Sat, 11 May 2024 19:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxQ-0005S5-A3 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxQ-0007cM-91 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5rxQ-0000ep-79 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=z8b/eBVMX3zKeDDbe3+n/LYxIE+4rfvJT3KNdp+Kcnw=; b=iQxg1390yL5wcldfkSo/WRenKu oMqHG9JZ3argO86OCZk8DJ4gnC+gYrkY3kCZc9LDl4IjWCNSQ1rUl5E34z/Us2IgtsP0YYHcI872g mKZWIdP4BkN4W09pBt2+H0AaUyC71l7Jp2dWKM4uqQ6lmcVguQUjWWubYtuuG+YTHGcU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: Fix handling XenStore errors in device creation Message-Id: Date: Sat, 11 May 2024 19:00:32 +0000 commit 531d3bea5e9357357eaf6d40f5784a1b4c29b910 Author: Demi Marie Obenour AuthorDate: Fri Apr 26 22:17:03 2024 -0400 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 libxl: Fix handling XenStore errors in device creation If xenstored runs out of memory it is possible for it to fail operations that should succeed. libxl wasn't robust against this, and could fail to ensure that the TTY path of a non-initial console was created and read-only for guests. This doesn't qualify for an XSA because guests should not be able to run xenstored out of memory, but it still needs to be fixed. Add the missing error checks to ensure that all errors are properly handled and that at no point can a guest make the TTY path of its frontend directory writable. Signed-off-by: Demi Marie Obenour Reviewed-by: Juergen Gross --- tools/libs/light/libxl_console.c | 11 +++--- tools/libs/light/libxl_device.c | 72 +++++++++++++++++++++++++--------------- tools/libs/light/libxl_xshelp.c | 13 +++++--- 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/tools/libs/light/libxl_console.c b/tools/libs/light/libxl_console.c index cd7412a327..a563c9d3c7 100644 --- a/tools/libs/light/libxl_console.c +++ b/tools/libs/light/libxl_console.c @@ -351,11 +351,10 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, flexarray_append(front, "protocol"); flexarray_append(front, LIBXL_XENCONSOLE_PROTOCOL); } - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - libxl__xs_kvs_of_flexarray(gc, ro_front)); - rc = 0; + rc = libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back), + libxl__xs_kvs_of_flexarray(gc, front), + libxl__xs_kvs_of_flexarray(gc, ro_front)); out: return rc; } @@ -665,6 +664,8 @@ int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid, */ if (!val) val = "/NO-SUCH-PATH"; channelinfo->u.pty.path = strdup(val); + if (channelinfo->u.pty.path == NULL) + abort(); break; default: break; diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index a3d9f6f7df..4faa5fa3bd 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -177,8 +177,13 @@ int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, ro_frontend_perms[1].perms = backend_perms[1].perms = XS_PERM_READ; retry_transaction: - if (create_transaction) + if (create_transaction) { t = xs_transaction_start(ctx->xsh); + if (t == XBT_NULL) { + LOGED(ERROR, device->domid, "xs_transaction_start failed"); + return ERROR_FAIL; + } + } /* FIXME: read frontend_path and check state before removing stuff */ @@ -195,42 +200,55 @@ retry_transaction: if (rc) goto out; } - /* xxx much of this function lacks error checks! */ - if (fents || ro_fents) { - xs_rm(ctx->xsh, t, frontend_path); - xs_mkdir(ctx->xsh, t, frontend_path); + if (!xs_rm(ctx->xsh, t, frontend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, frontend_path)) + goto out; /* Console 0 is a special case. It doesn't use the regular PV * state machine but also the frontend directory has * historically contained other information, such as the * vnc-port, which we don't want the guest fiddling with. */ if ((device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) || - (device->kind == LIBXL__DEVICE_KIND_VUART)) - xs_set_permissions(ctx->xsh, t, frontend_path, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); - else - xs_set_permissions(ctx->xsh, t, frontend_path, - frontend_perms, ARRAY_SIZE(frontend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), - backend_path, strlen(backend_path)); - if (fents) - libxl__xs_writev_perms(gc, t, frontend_path, fents, - frontend_perms, ARRAY_SIZE(frontend_perms)); - if (ro_fents) - libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + (device->kind == LIBXL__DEVICE_KIND_VUART)) { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms))) + goto out; + } else { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + frontend_perms, ARRAY_SIZE(frontend_perms))) + goto out; + } + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), + backend_path, strlen(backend_path))) + goto out; + if (fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, fents, + frontend_perms, ARRAY_SIZE(frontend_perms)); + if (rc) goto out; + } + if (ro_fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + if (rc) goto out; + } } if (bents) { if (!libxl_only) { - xs_rm(ctx->xsh, t, backend_path); - xs_mkdir(ctx->xsh, t, backend_path); - xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, - ARRAY_SIZE(backend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), - frontend_path, strlen(frontend_path)); - libxl__xs_writev(gc, t, backend_path, bents); + if (!xs_rm(ctx->xsh, t, backend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, backend_path)) + goto out; + if (!xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, + ARRAY_SIZE(backend_perms))) + goto out; + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), + frontend_path, strlen(frontend_path))) + goto out; + rc = libxl__xs_writev(gc, t, backend_path, bents); + if (rc) goto out; } /* @@ -276,7 +294,7 @@ retry_transaction: out: if (create_transaction && t) libxl__xs_transaction_abort(gc, &t); - return rc; + return rc != 0 ? rc : ERROR_FAIL; } typedef struct { diff --git a/tools/libs/light/libxl_xshelp.c b/tools/libs/light/libxl_xshelp.c index 751cd942d9..a6e34ab10f 100644 --- a/tools/libs/light/libxl_xshelp.c +++ b/tools/libs/light/libxl_xshelp.c @@ -60,10 +60,15 @@ int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, for (i = 0; kvs[i] != NULL; i += 2) { path = GCSPRINTF("%s/%s", dir, kvs[i]); if (path && kvs[i + 1]) { - int length = strlen(kvs[i + 1]); - xs_write(ctx->xsh, t, path, kvs[i + 1], length); - if (perms) - xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + size_t length = strlen(kvs[i + 1]); + if (length > UINT_MAX) + return ERROR_FAIL; + if (!xs_write(ctx->xsh, t, path, kvs[i + 1], length)) + return ERROR_FAIL; + if (perms) { + if (!xs_set_permissions(ctx->xsh, t, path, perms, num_perms)) + return ERROR_FAIL; + } } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:00:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720415.1123457 (Exim 4.92) (envelope-from ) id 1s5rxb-0005WV-TX; Sat, 11 May 2024 19:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720415.1123457; Sat, 11 May 2024 19: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 1s5rxb-0005WN-Qh; Sat, 11 May 2024 19:00:43 +0000 Received: by outflank-mailman (input) for mailman id 720415; Sat, 11 May 2024 19:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxa-0005Vv-Ct for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxa-0007cj-Bw for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5rxa-0000ft-B8 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SzvfMVQ7e/qzJoBt49XHd8oB5191+zB60JF2mwD0B4k=; b=l0QbHFPdCVFuhlk3ZvRqz/cvIq hKpnvc1Vqlu98YCDG87519wmFDwk5kW0WhgUlDquiCz9RaXV0fptMlqb5HfQgn+P0+8GGjxAeqGWb MfUHlN1jucwJl5h6zNeo+ZJD1jUrVy/YJhoB5OvRGw6rRb1Dc8s0vwxj8cgJECcDkjPA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: tag MISRA C Rule 1.1 as clean Message-Id: Date: Sat, 11 May 2024 19:00:42 +0000 commit d31d0665f1c5f91741604c99f8cc5c6a05fa1636 Author: Nicola Vetrini AuthorDate: Fri May 10 20:03:36 2024 +0200 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 automation/eclair_analysis: tag MISRA C Rule 1.1 as clean Tag the rule as clean, as there are no more violations in the codebase since 93c27d54dd23 ("xen/arm: Fix MISRA regression on R1.1, flexible array member not at the end"). Signed-off-by: Nicola Vetrini Acked-by: Andrew Cooper --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index 1e13258fa9..a14bda5033 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common,"MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:00:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:00:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720416.1123461 (Exim 4.92) (envelope-from ) id 1s5rxl-0005a2-Um; Sat, 11 May 2024 19:00:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720416.1123461; Sat, 11 May 2024 19: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 1s5rxl-0005Zs-SD; Sat, 11 May 2024 19:00:53 +0000 Received: by outflank-mailman (input) for mailman id 720416; Sat, 11 May 2024 19:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxk-0005Zc-Fg for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxk-0007eT-Ev for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5rxk-0000go-EA for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:00:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=U6544M5WHBpqX9lSq2YuQYn3UFfpwdhO/jLa5e1FoHA=; b=gOQzxuV60oaHcflhXPkyXefRgv c6Rab8sdMHa5ISGTVxfXDPdTYcty3bNZdP6gA/yeZP12kDka+2ICMXNgHCizP6cfmt7eq5MW43tf7 ugR/tysf5dJF8kbLXxHl4DmWU7pz7Ks9o1VeeTSZaSU5GbGbIvCAh1UGWm6bG2KIUzU4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Use -Wflex-array-member-not-at-end when available Message-Id: Date: Sat, 11 May 2024 19:00:52 +0000 commit 0b01395c44234e2961ca389a1f1fa510ce90b2b8 Author: Andrew Cooper AuthorDate: Sat Jan 13 17:40:48 2024 +0000 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 xen: Use -Wflex-array-member-not-at-end when available This option is new in GCC-14, and maps to MISRA Rule 1.1. The codebase is clean to it, and Eclair is blocking. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/Makefile b/xen/Makefile index b6c39fc6ae..71f0cb5071 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -396,6 +396,7 @@ CFLAGS += -nostdinc -fno-builtin -fno-common CFLAGS += -Werror -Wredundant-decls -Wwrite-strings -Wno-pointer-arith CFLAGS += -Wdeclaration-after-statement $(call cc-option-add,CFLAGS,CC,-Wvla) +$(call cc-option-add,CFLAGS,CC,-Wflex-array-member-not-at-end) CFLAGS += -pipe -D__XEN__ -include $(srctree)/include/xen/config.h CFLAGS-$(CONFIG_DEBUG_INFO) += -g -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:01:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720417.1123465 (Exim 4.92) (envelope-from ) id 1s5rxw-0005d0-0H; Sat, 11 May 2024 19:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720417.1123465; Sat, 11 May 2024 19: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 1s5rxv-0005cs-Ti; Sat, 11 May 2024 19:01:03 +0000 Received: by outflank-mailman (input) for mailman id 720417; Sat, 11 May 2024 19:01:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxu-0005ch-Jx for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5rxu-0007en-I6 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5rxu-0000i1-H9 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19: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=8nT/q0HOHbYvxUHHEQtiDRSsPx3kzJLBXF5zBon2q5Q=; b=CBWktfJuDWgvHZ8qSqBxlQXzlz 7Cl8q9IGK3XcWcMgRF9JSSN9pFCBjvRL2nwO1U462aoV/jMuFU0o/wrn1NkptcgptQ/H37+sRiQhH pqnbuo+Lnl7g29PkOBmYqN7FUtPsyn+FxzOyrMkGU3jdqmxvjv7q7xyPBeoj0uh4nD68=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Use -Wuninitialized and -Winit-self Message-Id: Date: Sat, 11 May 2024 19:01:02 +0000 commit 90a1bc9e825fa087331c63aa12bb64683bd75020 Author: Andrew Cooper AuthorDate: Fri May 10 23:56:52 2024 +0100 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 xen: Use -Wuninitialized and -Winit-self Assigning a variable to itself is an anti-pattern. It introduces definite UB in an attempt to silence a warning about possible UB. As it's definite undefined behaviour, it also mis-compiles in simple cases, using whatever stale value happened to be in the allocated register. Clang includes -Wuninitialized within -Wall, but GCC only includes it in -Wextra, which is not used by Xen at this time. Furthermore, the specific pattern of assigning a variable to itself in its declaration is only diagnosed by GCC with -Winit-self. Clang does diagnose simple forms of this pattern with a plain -Wuninitialized, but it fails to diagnose the instances in Xen that GCC manages to find. GCC, with -Wuninitialized and -Winit-self notices: arch/x86/time.c: In function ‘read_pt_and_tsc’: arch/x86/time.c:297:14: error: ‘best’ is used uninitialized in this function [-Werror=uninitialized] 297 | uint32_t best = best; | ^~~~ arch/x86/time.c: In function ‘read_pt_and_tmcct’: arch/x86/time.c:1022:14: error: ‘best’ is used uninitialized in this function [-Werror=uninitialized] 1022 | uint64_t best = best; | ^~~~ Fix these up to start with a value of ~0, which is also more robust in the case that something goes wrong. Fixes: 23658e823238 ("x86/time: further improve TSC / CPU freq calibration accuracy") Fixes: 3f3906b462d5 ("x86/APIC: calibrate against platform timer when possible") Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/Makefile | 3 ++- xen/arch/x86/time.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 71f0cb5071..da8855f3c3 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -394,9 +394,10 @@ CFLAGS-$(CONFIG_CC_SPLIT_SECTIONS) += -ffunction-sections -fdata-sections CFLAGS += -nostdinc -fno-builtin -fno-common CFLAGS += -Werror -Wredundant-decls -Wwrite-strings -Wno-pointer-arith -CFLAGS += -Wdeclaration-after-statement +CFLAGS += -Wdeclaration-after-statement -Wuninitialized $(call cc-option-add,CFLAGS,CC,-Wvla) $(call cc-option-add,CFLAGS,CC,-Wflex-array-member-not-at-end) +$(call cc-option-add,CFLAGS,CC,-Winit-self) CFLAGS += -pipe -D__XEN__ -include $(srctree)/include/xen/config.h CFLAGS-$(CONFIG_DEBUG_INFO) += -g diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 6f136f4b14..78ea095e3e 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -293,7 +293,7 @@ static uint32_t __init read_pt_and_tsc(uint64_t *tsc, const struct platform_timesource *pts) { uint64_t tsc_prev = *tsc = rdtsc_ordered(), tsc_min = ~0; - uint32_t best = best; + uint32_t best = ~0; unsigned int i; for ( i = 0; ; ++i ) @@ -1018,7 +1018,7 @@ static u64 __init init_platform_timer(void) static uint64_t __init read_pt_and_tmcct(uint32_t *tmcct) { uint32_t tmcct_prev = *tmcct = apic_tmcct_read(), tmcct_min = ~0; - uint64_t best = best; + uint64_t best = ~0; unsigned int i; for ( i = 0; ; ++i ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:01:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:01:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720418.1123469 (Exim 4.92) (envelope-from ) id 1s5ry6-0005fh-1l; Sat, 11 May 2024 19:01:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720418.1123469; Sat, 11 May 2024 19: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 1s5ry5-0005fX-VB; Sat, 11 May 2024 19:01:13 +0000 Received: by outflank-mailman (input) for mailman id 720418; Sat, 11 May 2024 19:01:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5ry4-0005fN-Lw for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5ry4-0007ew-L9 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5ry4-0000j3-KI for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19: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=/vPl5upvuFYdvD5KzdL/8i9dfkloJme9Leq1AKtVyUA=; b=0u6B6gNTZY8xSW//dxpqBdGUH2 tCN9L9/bDQESGy3D+7Fz5MM6IbHAJaHbmW8RSN21TJC0EMK0U6YI1ztC+S0mhcjhjxEAtea0v2D5u JggZEUQdk67ZnvSj6al4iLnvI14L/SJmuV/ehZQpd/JKd2xXsXsK7DJNjcNkcV9wVrZs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "evtchn: refuse EVTCHNOP_status for Xen-bound event channels" Message-Id: Date: Sat, 11 May 2024 19:01:12 +0000 commit 2d8d7481ca261d86c33e27e2294ed8c9ef5a0fc3 Author: Andrew Cooper AuthorDate: Tue Apr 2 15:50:19 2024 +0100 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 Revert "evtchn: refuse EVTCHNOP_status for Xen-bound event channels" The commit makes a claim without justification. The claim is false; it broke lsevtchn in dom0, a debugging utility which absolutely does care about all of the domain's event channels. Whether to return information about a xen-owned evtchn is a matter of policy, and it's not acceptable to subvert Xen's security subsystem on the decision. This reverts commit f60ab5337f968e2f10c639ab59db7afb0fe4f7c3. Fixes: f60ab5337f96 ("evtchn: refuse EVTCHNOP_status for Xen-bound event channels") Signed-off-by: Andrew Cooper Acked-by: Daniel P. Smith --- xen/common/event_channel.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index aceee0695f..a67feff989 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -1041,12 +1041,6 @@ int evtchn_status(evtchn_status_t *status) read_lock(&d->event_lock); - if ( consumer_is_xen(chn) ) - { - rc = -EACCES; - goto out; - } - rc = xsm_evtchn_status(XSM_TARGET, d, chn); if ( rc ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:01:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:01:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720419.1123473 (Exim 4.92) (envelope-from ) id 1s5ryG-0005iV-31; Sat, 11 May 2024 19:01:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720419.1123473; Sat, 11 May 2024 19: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 1s5ryG-0005iN-0P; Sat, 11 May 2024 19:01:24 +0000 Received: by outflank-mailman (input) for mailman id 720419; Sat, 11 May 2024 19:01:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5ryE-0005i4-Oz for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5ryE-0007f6-OF for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5ryE-0000jv-NI for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19: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=s5KqTbejyXlBnnV7pFGDqfazL8OKlEPkNuq8VkYchy8=; b=G4nIP88ObbMk9HkitQJzN0oNqt rSsX91dwNCOUupL0YLk3HEyE+aRPIhQbOs5rZu1vcg391DQ6QNSOnK/dVZRH+3I0OIM1j5sHs+vLw ciDK9euw/r5i+lysKc28pDMgmZIsx6o/YM3ZC0R3X77DEvvlUq8omP6AOrH4Vpn9O72g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/io: Don't cast away constness in read{b..q}() Message-Id: Date: Sat, 11 May 2024 19:01:22 +0000 commit 9110072b764b5abdddb574ece1da4ffd1b34caf2 Author: Andrew Cooper AuthorDate: Fri May 10 20:23:40 2024 +0100 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 x86/io: Don't cast away constness in read{b..q}() Addresses various MISRA R11.8 violations. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- xen/arch/x86/include/asm/io.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/io.h b/xen/arch/x86/include/asm/io.h index 9b19d2d389..1cb4217cff 100644 --- a/xen/arch/x86/include/asm/io.h +++ b/xen/arch/x86/include/asm/io.h @@ -4,10 +4,10 @@ #include #include -#define readb(x) (*(volatile uint8_t *)(x)) -#define readw(x) (*(volatile uint16_t *)(x)) -#define readl(x) (*(volatile uint32_t *)(x)) -#define readq(x) (*(volatile uint64_t *)(x)) +#define readb(x) (*(const volatile uint8_t *)(x)) +#define readw(x) (*(const volatile uint16_t *)(x)) +#define readl(x) (*(const volatile uint32_t *)(x)) +#define readq(x) (*(const volatile uint64_t *)(x)) #define writeb(d,x) (*(volatile uint8_t *)(x) = (d)) #define writew(d,x) (*(volatile uint16_t *)(x) = (d)) #define writel(d,x) (*(volatile uint32_t *)(x) = (d)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 11 19:01:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 May 2024 19:01:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.720420.1123477 (Exim 4.92) (envelope-from ) id 1s5ryQ-0005lI-4V; Sat, 11 May 2024 19:01:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 720420.1123477; Sat, 11 May 2024 19: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 1s5ryQ-0005lA-1r; Sat, 11 May 2024 19:01:34 +0000 Received: by outflank-mailman (input) for mailman id 720420; Sat, 11 May 2024 19:01:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5ryO-0005ku-Rv for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5ryO-0007fE-R9 for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s5ryO-0000kl-QI for xen-changelog@lists.xenproject.org; Sat, 11 May 2024 19:01:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ROtcXuBIWM/xg4IDwyKFP5pRdP0H0b3so7HRjXu0NQs=; b=HDSxWCtpc/+LZAwe+2bpG43xZ7 JFT3gWcLmpPx1zWuItDCSJYXDzWOoW2GoW8vHRECi/Uc/m+bBn1MC2XwU9H5JW0bhV74Xl5jvOq3+ uIznnzKLtK09MVXayT6NbL+WVtCA9CpLAvzeylftU2ZtOh4wDrrhVNyLkSwC0Qe6qCqo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add R21.6 R21.9 R21.10 R21.14 R21.15 R21.16 Message-Id: Date: Sat, 11 May 2024 19:01:32 +0000 commit 46aa3031ae89ac1771f4159972edab65710e7349 Author: Stefano Stabellini AuthorDate: Fri Apr 26 14:36:28 2024 -0700 Commit: Andrew Cooper CommitDate: Sat May 11 00:13:43 2024 +0100 docs/misra: add R21.6 R21.9 R21.10 R21.14 R21.15 R21.16 Signed-off-by: Stefano Stabellini Acked-by: Andrew Cooper --- docs/misra/rules.rst | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index d3b70fdf04..80e5e972ad 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -651,12 +651,48 @@ maintainers if you want to suggest a change. declared - See comment for Rule 21.1 + * - `Rule 21.6 `_ + - Required + - The Standard Library input/output routines shall not be used + - Xen doesn't provide, use, or link against a Standard Library [#xen-stdlib]_ + + * - `Rule 21.9 `_ + - Required + - The library functions bsearch and qsort of shall not be used + - Xen doesn't provide, use, or link against a Standard Library [#xen-stdlib]_ + + * - `Rule 21.10 `_ + - Required + - The Standard Library time and date routines shall not be used + - Xen doesn't provide, use, or link against a Standard Library [#xen-stdlib]_ + * - `Rule 21.13 `_ - Mandatory - Any value passed to a function in shall be representable as an unsigned char or be the value EOF - + * - `Rule 21.14 `_ + - Required + - The Standard Library function memcmp shall not be used to compare + null terminated strings + - + + * - `Rule 21.15 `_ + - Required + - The pointer arguments to the Standard Library functions memcpy, + memmove and memcmp shall be pointers to qualified or unqualified + versions of compatible types + - + + * - `Rule 21.16 `_ + - Required + - The pointer arguments to the Standard Library function memcmp + shall point to either a pointer type, an essentially signed type, + an essentially unsigned type, an essentially Boolean type or an + essentially enum type + - void* arguments are allowed + * - `Rule 21.17 `_ - Mandatory - Use of the string handling functions from shall not result in @@ -722,3 +758,10 @@ A *switch clause* can be defined as: case/default labels". A formal definition is available within the amplification of MISRA C:2012 Rule 16.1. + +.. rubric:: Footnotes + +.. [#xen-stdlib] Xen implements itself a few functions with names that match + the corresponding function names of the Standard Library for developers' + convenience. These functions are part of the Xen code and subject to + analysis. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 14 22:55:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 May 2024 22:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.721819.1125492 (Exim 4.92) (envelope-from ) id 1s7132-0004GH-Oj; Tue, 14 May 2024 22:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721819.1125492; Tue, 14 May 2024 22: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 1s7132-0004G9-MC; Tue, 14 May 2024 22:55:04 +0000 Received: by outflank-mailman (input) for mailman id 721819; Tue, 14 May 2024 22:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7131-0004G3-V4 for xen-changelog@lists.xenproject.org; Tue, 14 May 2024 22:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7131-00010Z-Rr for xen-changelog@lists.xenproject.org; Tue, 14 May 2024 22:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7131-0006si-QU for xen-changelog@lists.xenproject.org; Tue, 14 May 2024 22:55:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2cu8Irh5+L0kodoeGuBZcx3S2HMvpUflNApXGWx6spk=; b=kSCH0j1SGv+oU1RbxXbrufgbBi OQlffEFthmpcsypaNog8khdNHcdjt1fUQDHw+J5aBkOpenA2k7Lg10b5+CF3nOqfOZL08i9MsTcpN o7+xJzCPR2hqQTw3EoIdumAl2oiE+6E+YPwYW5f2h83QabaUtrGfVDZaSYEbTmVVnHas=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/console: fix Rule 10.2 violation Message-Id: Date: Tue, 14 May 2024 22:55:03 +0000 commit 319a5125ca2649e6eb95670b4d721260025c187d Author: Stefano Stabellini AuthorDate: Fri May 10 16:37:11 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue May 14 15:38:53 2024 -0700 xen/console: fix Rule 10.2 violation Change opt_conswitch to char to fix a violation of Rule 10.2. Signed-off-by: Stefano Stabellini Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/drivers/char/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2c363d9c1d..3a3a97bcbe 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -49,7 +49,7 @@ string_param("console", opt_console); /* Char 1: CTRL+ is used to switch console input between Xen and DOM0 */ /* Char 2: If this character is 'x', then do not auto-switch to DOM0 when it */ /* boots. Any other value, or omitting the char, enables auto-switch */ -static unsigned char __read_mostly opt_conswitch[3] = "a"; +static char __read_mostly opt_conswitch[3] = "a"; string_runtime_param("conswitch", opt_conswitch); /* sync_console: force synchronous console output (useful for debugging). */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 15 18:55:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 18:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722579.1126678 (Exim 4.92) (envelope-from ) id 1s7JmJ-0006RN-2L; Wed, 15 May 2024 18:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722579.1126678; Wed, 15 May 2024 18:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7JmI-0006RF-Vy; Wed, 15 May 2024 18:55:02 +0000 Received: by outflank-mailman (input) for mailman id 722579; Wed, 15 May 2024 18:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7JmH-0006Qr-RR for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 18:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7JmH-0008BJ-Ot for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 18:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7JmH-00049G-MW for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 18:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/kbH/0pjaoZ2xBTf13QHhKkgOd+iyrg5VdxhirEgygM=; b=0NYlPZE8Sjctcs/hdIot/QKl+9 s+pTwOWCd0FIfF5ZXV6600IZhC+lUOcAb0hyvgo5Y8irpARnI55qArsEE3bS2Gr7WPhaLv7Mc8EVP Z64KhxGf39Jt229XgO/dojVOja8ERzqF14y2QsTjdMzEyZk5lgQD/hND8xLGPDXe/mMs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/console: fix Rule 10.2 violation Message-Id: Date: Wed, 15 May 2024 18:55:01 +0000 commit 319a5125ca2649e6eb95670b4d721260025c187d Author: Stefano Stabellini AuthorDate: Fri May 10 16:37:11 2024 -0700 Commit: Stefano Stabellini CommitDate: Tue May 14 15:38:53 2024 -0700 xen/console: fix Rule 10.2 violation Change opt_conswitch to char to fix a violation of Rule 10.2. Signed-off-by: Stefano Stabellini Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/drivers/char/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2c363d9c1d..3a3a97bcbe 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -49,7 +49,7 @@ string_param("console", opt_console); /* Char 1: CTRL+ is used to switch console input between Xen and DOM0 */ /* Char 2: If this character is 'x', then do not auto-switch to DOM0 when it */ /* boots. Any other value, or omitting the char, enables auto-switch */ -static unsigned char __read_mostly opt_conswitch[3] = "a"; +static char __read_mostly opt_conswitch[3] = "a"; string_runtime_param("conswitch", opt_conswitch); /* sync_console: force synchronous console output (useful for debugging). */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 15 19:22:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 19:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722595.1126701 (Exim 4.92) (envelope-from ) id 1s7KCT-0003LC-Da; Wed, 15 May 2024 19:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722595.1126701; Wed, 15 May 2024 19:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCT-0003L5-Ax; Wed, 15 May 2024 19:22:05 +0000 Received: by outflank-mailman (input) for mailman id 722595; Wed, 15 May 2024 19:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCS-0003Kj-4E for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCR-0000Cw-Vn for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7KCR-0005xT-Un for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RmPV1xRMZ27T3cfsQ9VFYy3TOxRnrFYqh4Hw2O+oMIg=; b=TjOi7vCkbaGJ/D+zuZH+Ma9bXr apVF2gsX9Nef0eN4Pee7MeT76tNQ6K4NREaQnDobd+CqDZflNavkKJ0Uo/nL08Fm3LJzvD0hKC7Gc dQSSZhr2z1aE54K72CDlKcumUYCmepafEKfPC0R6Tjc/QpaWODSLKa+bGbrR0x0oRUs8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sched: set all sched_resource data inside locked region for new cpu Message-Id: Date: Wed, 15 May 2024 19:22:03 +0000 commit d104a07524ffc92ae7a70dfe192c291de2a563cc Author: Juergen Gross AuthorDate: Wed May 15 17:25:39 2024 +0200 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 xen/sched: set all sched_resource data inside locked region for new cpu When adding a cpu to a scheduler, set all data items of struct sched_resource inside the locked region, as otherwise a race might happen (e.g. when trying to access the cpupool of the cpu): (XEN) ----[ Xen-4.19.0-1-d x86_64 debug=y Tainted: H ]---- (XEN) CPU: 45 (XEN) RIP: e008:[] common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) RFLAGS: 0000000000010092 CONTEXT: hypervisor (XEN) rax: ffff82d040981618 rbx: ffff82d040981618 rcx: 0000000000000000 (XEN) rdx: 0000003ff68cd000 rsi: 000000000000002d rdi: ffff83103723d450 (XEN) rbp: ffff83207caa7d48 rsp: ffff83207caa7b98 r8: 0000000000000000 (XEN) r9: ffff831037253cf0 r10: ffff83103767c3f0 r11: 0000000000000009 (XEN) r12: ffff831037237990 r13: ffff831037237990 r14: ffff831037253720 (XEN) r15: 0000000000000000 cr0: 000000008005003b cr4: 0000000000f526e0 (XEN) cr3: 000000005bc2f000 cr2: 0000000000000010 (XEN) fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) Xen code around (common/sched/credit.c#csched_load_balance+0x41/0x877): (XEN) 48 8b 0c 10 48 8b 49 08 <48> 8b 79 10 48 89 bd b8 fe ff ff 49 8b 4e 28 48 (XEN) Xen call trace: (XEN) [] R common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) [] F common/sched/credit.c#csched_schedule+0x36a/0x69f (XEN) [] F common/sched/core.c#do_schedule+0xe8/0x433 (XEN) [] F common/sched/core.c#schedule+0x2e5/0x2f9 (XEN) [] F common/softirq.c#__do_softirq+0x94/0xbe (XEN) [] F do_softirq+0x13/0x15 (XEN) [] F arch/x86/domain.c#idle_loop+0x92/0xe6 (XEN) (XEN) Pagetable walk from 0000000000000010: (XEN) L4[0x000] = 000000103ff61063 ffffffffffffffff (XEN) L3[0x000] = 000000103ff60063 ffffffffffffffff (XEN) L2[0x000] = 0000001033dff063 ffffffffffffffff (XEN) L1[0x000] = 0000000000000000 ffffffffffffffff (XEN) (XEN) **************************************** (XEN) Panic on CPU 45: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000010 (XEN) **************************************** Reported-by: Andrew Cooper Fixes: a8c6c623192e ("sched: clarify use cases of schedule_cpu_switch()") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/common/sched/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 0cb33831d2..babac7aad6 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3176,6 +3176,8 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) sr->scheduler = new_ops; sr->sched_priv = ppriv; + sr->granularity = cpupool_get_granularity(c); + sr->cpupool = c; /* * Reroute the lock to the per pCPU lock as /last/ thing. In fact, @@ -3188,8 +3190,6 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) /* _Not_ pcpu_schedule_unlock(): schedule_lock has changed! */ spin_unlock_irqrestore(old_lock, flags); - sr->granularity = cpupool_get_granularity(c); - sr->cpupool = c; /* The cpu is added to a pool, trigger it to go pick up some work */ cpu_raise_softirq(cpu, SCHEDULE_SOFTIRQ); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 15 19:22:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 19:22:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722596.1126706 (Exim 4.92) (envelope-from ) id 1s7KCd-0003N3-FM; Wed, 15 May 2024 19:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722596.1126706; Wed, 15 May 2024 19:22:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCd-0003Ms-CM; Wed, 15 May 2024 19:22:15 +0000 Received: by outflank-mailman (input) for mailman id 722596; Wed, 15 May 2024 19:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCc-0003Mg-4R for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCc-0000DK-3b for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7KCc-0005xy-1l for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qpDZ7pBnwkf3oIHrWHYBQioV57UV8m9Nay3tS52ObDQ=; b=VmHK8VLYl8l0E36VOTNBrAZoVD 75ZId4tR9yY/CW6E2ESbxTFnRCxLzLZWLDtOZn1ekwKNpARiRUGAQAuw8Wy5XtiRpfSltcQiKFXiz pkcBRxRA1DsQcnvmFJPF6trHUUhXAgG3txRZvxEjyIk8WhjonTLc8ZUkFb/ZyZmZJ2VA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: respect mapcache_domain_init() failing Message-Id: Date: Wed, 15 May 2024 19:22:14 +0000 commit 7270fdc7a0028d4b7b26fd1b36c6b9e97abcf3da Author: Jan Beulich AuthorDate: Wed May 15 15:35:15 2024 +0200 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 x86: respect mapcache_domain_init() failing The function itself properly handles and hands onwards failure from create_perdomain_mapping(). Therefore its caller should respect possible failure, too. Fixes: 4b28bf6ae90b ("x86: re-introduce map_domain_page() et al") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 20e83cf38b..00a3aaa576 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -858,7 +858,8 @@ int arch_domain_create(struct domain *d, } else if ( is_pv_domain(d) ) { - mapcache_domain_init(d); + if ( (rc = mapcache_domain_init(d)) != 0 ) + goto fail; if ( (rc = pv_domain_initialise(d)) != 0 ) goto fail; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 15 19:22:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 19:22:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722597.1126710 (Exim 4.92) (envelope-from ) id 1s7KCn-0003Pw-GI; Wed, 15 May 2024 19:22:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722597.1126710; Wed, 15 May 2024 19:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCn-0003Pp-Dr; Wed, 15 May 2024 19:22:25 +0000 Received: by outflank-mailman (input) for mailman id 722597; Wed, 15 May 2024 19:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCm-0003Pb-80 for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCm-0000DR-6o for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7KCm-0005yc-61 for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qHLVNFUexcPcpdx33nLIjbqajrTNgQ38GTOyz+TxKk0=; b=YVSL7wkDC1no4WNtAnEH0v3AJQ udLH2tvaCk4XOl69YYzPew9NPtCNeXT+ej/mUOa45xAaxi1y+n2qDWPNNs3bI+GcRY7MbVc8VXiO/ 0316eTCgOoj2eLIIb7Xn4Ki0xHysMhSyrCbZqsGDpzRbyDMiw/xngs/QRXVaRk8GwDMY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpufreq: Rename cpuid variable/parameters to cpu Message-Id: Date: Wed, 15 May 2024 19:22:24 +0000 commit 8a78d898811cf6ee6f5a885ee9b3a71419084ade Author: Andrew Cooper AuthorDate: Sat May 11 19:25:00 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 x86/cpufreq: Rename cpuid variable/parameters to cpu Various functions have a parameter or local variable called cpuid, but this triggers a MISRA R5.3 violation because we also have a function called cpuid() which wraps the real CPUID instruction. In all these cases, it's a Xen cpu index, which is far more commonly named just cpu in our code. While adjusting these, fix a couple of other issues: * cpufreq_cpu_init() is on the end of a hypercall (with in-memory parameters, even), making EFAULT the wrong error to use. Use EOPNOTSUPP instead. * check_est_cpu() is wrong to tie EIST to just Intel, and nowhere else using EIST makes this restriction. Just check the feature itself, which is more succinctly done after being folded into its single caller. * In powernow_cpufreq_update(), replace an opencoded cpu_online(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 14 +++++----- xen/arch/x86/acpi/cpufreq/cpufreq.c | 24 ++++------------- xen/arch/x86/acpi/cpufreq/hwp.c | 6 ++--- xen/arch/x86/acpi/cpufreq/powernow.c | 6 ++--- xen/drivers/cpufreq/cpufreq.c | 20 +++++++------- xen/drivers/cpufreq/utility.c | 43 ++++++++++++++----------------- xen/include/acpi/cpufreq/cpufreq.h | 6 ++--- xen/include/acpi/cpufreq/processor_perf.h | 8 +++--- xen/include/xen/pmstat.h | 6 ++--- 9 files changed, 58 insertions(+), 75 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index cfce4cc040..c8db1aa991 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1498,14 +1498,14 @@ static void amd_cpuidle_init(struct acpi_processor_power *power) vendor_override = -1; } -uint32_t pmstat_get_cx_nr(uint32_t cpuid) +uint32_t pmstat_get_cx_nr(unsigned int cpu) { - return processor_powers[cpuid] ? processor_powers[cpuid]->count : 0; + return processor_powers[cpu] ? processor_powers[cpu]->count : 0; } -int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) +int pmstat_get_cx_stat(unsigned int cpu, struct pm_cx_stat *stat) { - struct acpi_processor_power *power = processor_powers[cpuid]; + struct acpi_processor_power *power = processor_powers[cpu]; uint64_t idle_usage = 0, idle_res = 0; uint64_t last_state_update_tick, current_stime, current_tick; uint64_t usage[ACPI_PROCESSOR_MAX_POWER] = { 0 }; @@ -1522,7 +1522,7 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) return 0; } - stat->idle_time = get_cpu_idle_time(cpuid); + stat->idle_time = get_cpu_idle_time(cpu); nr = min(stat->nr, power->count); /* mimic the stat when detail info hasn't been registered by dom0 */ @@ -1572,7 +1572,7 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) idle_res += res[i]; } - get_hw_residencies(cpuid, &hw_res); + get_hw_residencies(cpu, &hw_res); #define PUT_xC(what, n) do { \ if ( stat->nr_##what >= n && \ @@ -1613,7 +1613,7 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) return 0; } -int pmstat_reset_cx_stat(uint32_t cpuid) +int pmstat_reset_cx_stat(unsigned int cpu) { return 0; } diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index 2b6ef99678..a341f2f020 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -55,17 +55,6 @@ struct acpi_cpufreq_data *cpufreq_drv_data[NR_CPUS]; static bool __read_mostly acpi_pstate_strict; boolean_param("acpi_pstate_strict", acpi_pstate_strict); -static int check_est_cpu(unsigned int cpuid) -{ - struct cpuinfo_x86 *cpu = &cpu_data[cpuid]; - - if (cpu->x86_vendor != X86_VENDOR_INTEL || - !cpu_has(cpu, X86_FEATURE_EIST)) - return 0; - - return 1; -} - static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data) { struct processor_performance *perf; @@ -530,7 +519,7 @@ static int cf_check acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) if (cpufreq_verbose) printk("xen_pminfo: @acpi_cpufreq_cpu_init," "HARDWARE addr space\n"); - if (!check_est_cpu(cpu)) { + if (!cpu_has(c, X86_FEATURE_EIST)) { result = -ENODEV; goto err_unreg; } @@ -690,15 +679,12 @@ static int __init cf_check cpufreq_driver_late_init(void) } __initcall(cpufreq_driver_late_init); -int cpufreq_cpu_init(unsigned int cpuid) +int cpufreq_cpu_init(unsigned int cpu) { - int ret; - /* Currently we only handle Intel, AMD and Hygon processor */ if ( boot_cpu_data.x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD | X86_VENDOR_HYGON) ) - ret = cpufreq_add_cpu(cpuid); - else - ret = -EFAULT; - return ret; + return cpufreq_add_cpu(cpu); + + return -EOPNOTSUPP; } diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index e61212803e..59b57a4cef 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -506,11 +506,11 @@ static void cf_check hwp_set_misc_turbo(void *info) } } -static int cf_check hwp_cpufreq_update(int cpuid, struct cpufreq_policy *policy) +static int cf_check hwp_cpufreq_update(unsigned int cpu, struct cpufreq_policy *policy) { - on_selected_cpus(cpumask_of(cpuid), hwp_set_misc_turbo, policy, 1); + on_selected_cpus(cpumask_of(cpu), hwp_set_misc_turbo, policy, 1); - return per_cpu(hwp_drv_data, cpuid)->ret; + return per_cpu(hwp_drv_data, cpu)->ret; } static const struct cpufreq_driver __initconst_cf_clobber diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index 8a27ee82a5..69364e1855 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -68,12 +68,12 @@ static void cf_check update_cpb(void *data) } static int cf_check powernow_cpufreq_update( - int cpuid, struct cpufreq_policy *policy) + unsigned int cpu, struct cpufreq_policy *policy) { - if (!cpumask_test_cpu(cpuid, &cpu_online_map)) + if ( !cpu_online(cpu) ) return -EINVAL; - on_selected_cpus(cpumask_of(cpuid), update_cpb, policy, 1); + on_selected_cpus(cpumask_of(cpu), update_cpb, policy, 1); return 0; } diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 36c800f4fa..8659ad3aee 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -459,21 +459,21 @@ static void print_PPC(unsigned int platform_limit) int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) { - int ret=0, cpuid; + int ret = 0, cpu; struct processor_pminfo *pmpt; struct processor_performance *pxpt; - cpuid = get_cpu_id(acpi_id); - if ( cpuid < 0 || !perf ) + cpu = get_cpu_id(acpi_id); + if ( cpu < 0 || !perf ) { ret = -EINVAL; goto out; } if ( cpufreq_verbose ) - printk("Set CPU acpi_id(%d) cpuid(%d) Px State info:\n", - acpi_id, cpuid); + printk("Set CPU acpi_id(%d) cpu(%d) Px State info:\n", + acpi_id, cpu); - pmpt = processor_pminfo[cpuid]; + pmpt = processor_pminfo[cpu]; if ( !pmpt ) { pmpt = xzalloc(struct processor_pminfo); @@ -482,11 +482,11 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) ret = -ENOMEM; goto out; } - processor_pminfo[cpuid] = pmpt; + processor_pminfo[cpu] = pmpt; } pxpt = &pmpt->perf; pmpt->acpi_id = acpi_id; - pmpt->id = cpuid; + pmpt->id = cpu; if ( perf->flags & XEN_PX_PCT ) { @@ -564,7 +564,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) if ( pxpt->init == XEN_PX_INIT ) { - ret = cpufreq_limit_change(cpuid); + ret = cpufreq_limit_change(cpu); goto out; } } @@ -573,7 +573,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) { pxpt->init = XEN_PX_INIT; - ret = cpufreq_cpu_init(cpuid); + ret = cpufreq_cpu_init(cpu); goto out; } diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index dbf8985969..6d2413b32a 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -86,13 +86,12 @@ void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) spin_unlock(cpufreq_statistic_lock); } -int cpufreq_statistic_init(unsigned int cpuid) +int cpufreq_statistic_init(unsigned int cpu) { uint32_t i, count; struct pm_px *pxpt; - const struct processor_pminfo *pmpt = processor_pminfo[cpuid]; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpuid); + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); spin_lock_init(cpufreq_statistic_lock); @@ -101,7 +100,7 @@ int cpufreq_statistic_init(unsigned int cpuid) spin_lock(cpufreq_statistic_lock); - pxpt = per_cpu(cpufreq_statistic_data, cpuid); + pxpt = per_cpu(cpufreq_statistic_data, cpu); if ( pxpt ) { spin_unlock(cpufreq_statistic_lock); return 0; @@ -114,7 +113,7 @@ int cpufreq_statistic_init(unsigned int cpuid) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpuid) = pxpt; + per_cpu(cpufreq_statistic_data, cpu) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) { @@ -138,22 +137,21 @@ int cpufreq_statistic_init(unsigned int cpuid) pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpuid); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); spin_unlock(cpufreq_statistic_lock); return 0; } -void cpufreq_statistic_exit(unsigned int cpuid) +void cpufreq_statistic_exit(unsigned int cpu) { struct pm_px *pxpt; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpuid); + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); spin_lock(cpufreq_statistic_lock); - pxpt = per_cpu(cpufreq_statistic_data, cpuid); + pxpt = per_cpu(cpufreq_statistic_data, cpu); if (!pxpt) { spin_unlock(cpufreq_statistic_lock); return; @@ -162,22 +160,21 @@ void cpufreq_statistic_exit(unsigned int cpuid) xfree(pxpt->u.trans_pt); xfree(pxpt->u.pt); xfree(pxpt); - per_cpu(cpufreq_statistic_data, cpuid) = NULL; + per_cpu(cpufreq_statistic_data, cpu) = NULL; spin_unlock(cpufreq_statistic_lock); } -void cpufreq_statistic_reset(unsigned int cpuid) +void cpufreq_statistic_reset(unsigned int cpu) { uint32_t i, j, count; struct pm_px *pxpt; - const struct processor_pminfo *pmpt = processor_pminfo[cpuid]; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpuid); + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); spin_lock(cpufreq_statistic_lock); - pxpt = per_cpu(cpufreq_statistic_data, cpuid); + pxpt = per_cpu(cpufreq_statistic_data, cpu); if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) { spin_unlock(cpufreq_statistic_lock); return; @@ -194,7 +191,7 @@ void cpufreq_statistic_reset(unsigned int cpuid) } pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpuid); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); spin_unlock(cpufreq_statistic_lock); } @@ -389,7 +386,7 @@ int cpufreq_driver_getavg(unsigned int cpu, unsigned int flag) return policy->cur; } -int cpufreq_update_turbo(int cpuid, int new_state) +int cpufreq_update_turbo(unsigned int cpu, int new_state) { struct cpufreq_policy *policy; int curr_state; @@ -399,7 +396,7 @@ int cpufreq_update_turbo(int cpuid, int new_state) new_state != CPUFREQ_TURBO_DISABLED) return -EINVAL; - policy = per_cpu(cpufreq_cpu_policy, cpuid); + policy = per_cpu(cpufreq_cpu_policy, cpu); if (!policy) return -EACCES; @@ -413,7 +410,7 @@ int cpufreq_update_turbo(int cpuid, int new_state) policy->turbo = new_state; if (cpufreq_driver.update) { - ret = alternative_call(cpufreq_driver.update, cpuid, policy); + ret = alternative_call(cpufreq_driver.update, cpu, policy); if (ret) policy->turbo = curr_state; } @@ -422,11 +419,11 @@ int cpufreq_update_turbo(int cpuid, int new_state) } -int cpufreq_get_turbo_status(int cpuid) +int cpufreq_get_turbo_status(unsigned int cpu) { struct cpufreq_policy *policy; - policy = per_cpu(cpufreq_cpu_policy, cpuid); + policy = per_cpu(cpufreq_cpu_policy, cpu); return policy && policy->turbo == CPUFREQ_TURBO_ENABLED; } diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index b4685a9085..443427153b 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -145,8 +145,8 @@ extern int cpufreq_driver_getavg(unsigned int cpu, unsigned int flag); #define CPUFREQ_TURBO_UNSUPPORTED 0 #define CPUFREQ_TURBO_ENABLED 1 -extern int cpufreq_update_turbo(int cpuid, int new_state); -extern int cpufreq_get_turbo_status(int cpuid); +int cpufreq_update_turbo(unsigned int cpu, int new_state); +int cpufreq_get_turbo_status(unsigned int cpu); static inline int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event) @@ -167,7 +167,7 @@ struct cpufreq_driver { int (*init)(struct cpufreq_policy *policy); int (*verify)(struct cpufreq_policy *policy); int (*setpolicy)(struct cpufreq_policy *policy); - int (*update)(int cpuid, struct cpufreq_policy *policy); + int (*update)(unsigned int cpu, struct cpufreq_policy *policy); int (*target)(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation); diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 7cd2400619..5f48aceadb 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -12,9 +12,9 @@ unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); void cpufreq_residency_update(unsigned int cpu, uint8_t state); void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to); -int cpufreq_statistic_init(unsigned int cpuid); -void cpufreq_statistic_exit(unsigned int cpuid); -void cpufreq_statistic_reset(unsigned int cpuid); +int cpufreq_statistic_init(unsigned int cpu); +void cpufreq_statistic_exit(unsigned int cpu); +void cpufreq_statistic_reset(unsigned int cpu); int cpufreq_limit_change(unsigned int cpu); @@ -59,5 +59,5 @@ struct pm_px { DECLARE_PER_CPU(struct pm_px *, cpufreq_statistic_data); -int cpufreq_cpu_init(unsigned int cpuid); +int cpufreq_cpu_init(unsigned int cpu); #endif /* __XEN_PROCESSOR_PM_H__ */ diff --git a/xen/include/xen/pmstat.h b/xen/include/xen/pmstat.h index 43b826ad4d..e6ab1423a9 100644 --- a/xen/include/xen/pmstat.h +++ b/xen/include/xen/pmstat.h @@ -7,9 +7,9 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf); long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power); -uint32_t pmstat_get_cx_nr(uint32_t cpuid); -int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat); -int pmstat_reset_cx_stat(uint32_t cpuid); +uint32_t pmstat_get_cx_nr(unsigned int cpu); +int pmstat_get_cx_stat(unsigned int cpu, struct pm_cx_stat *stat); +int pmstat_reset_cx_stat(unsigned int cpu); int do_get_pm_info(struct xen_sysctl_get_pmstat *op); int do_pm_op(struct xen_sysctl_pm_op *op); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 15 19:22:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 19:22:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722598.1126714 (Exim 4.92) (envelope-from ) id 1s7KCx-0003TH-JX; Wed, 15 May 2024 19:22:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722598.1126714; Wed, 15 May 2024 19:22:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCx-0003T7-Go; Wed, 15 May 2024 19:22:35 +0000 Received: by outflank-mailman (input) for mailman id 722598; Wed, 15 May 2024 19:22:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCw-0003Sv-Aj for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KCw-0000DY-9x for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7KCw-0005z3-8y for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZIjILoUeDACZar8OxRFI0g+37L97ZxeSM16n/Zr6gVI=; b=Ps2hpqhefpPf+mtCjP5IavyRNx tJnbYJBuxsFyrS7ora7QUzIUlFVYGfQHWYBnCUUIHY5X4c9+3XRYIhaRcSiJ18d+hbwpu76s/sbdb rYSh7lEv4rmMgELAHySyUCKRsEJyXx7TnqiixSVx8rgr/+Dge6WrzsqzSX8/kLUZR8Jw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/hvmloader: Further simplify SMP setup Message-Id: Date: Wed, 15 May 2024 19:22:34 +0000 commit 9b7d793889438ecb5fc6e48fa973c244f9832248 Author: Andrew Cooper AuthorDate: Thu May 9 18:40:11 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 tools/hvmloader: Further simplify SMP setup Now that we're using hypercalls to start APs, we can replace the 'ap_cpuid' global with a regular function parameter. This requires telling the compiler that we'd like the parameter in a register rather than on the stack. While adjusting, rename to cpu_setup(). It's always been used on the BSP, making the name ap_start() specifically misleading. Signed-off-by: Andrew Cooper Reviewed-by: Alejandro Vallejo --- tools/firmware/hvmloader/smp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/smp.c b/tools/firmware/hvmloader/smp.c index 6ebf0b60fa..5d46eee1c5 100644 --- a/tools/firmware/hvmloader/smp.c +++ b/tools/firmware/hvmloader/smp.c @@ -29,15 +29,15 @@ #include -static int ap_callin, ap_cpuid; +static int ap_callin; -static void ap_start(void) +static void __attribute__((regparm(1))) cpu_setup(unsigned int cpu) { - printf(" - CPU%d ... ", ap_cpuid); + printf(" - CPU%d ... ", cpu); cacheattr_init(); printf("done.\n"); - if ( !ap_cpuid ) /* Used on the BSP too */ + if ( !cpu ) /* Used on the BSP too */ return; wmb(); @@ -55,7 +55,6 @@ static void boot_cpu(unsigned int cpu) static struct vcpu_hvm_context ap; /* Initialise shared variables. */ - ap_cpuid = cpu; ap_callin = 0; wmb(); @@ -63,9 +62,11 @@ static void boot_cpu(unsigned int cpu) ap = (struct vcpu_hvm_context) { .mode = VCPU_HVM_MODE_32B, .cpu_regs.x86_32 = { - .eip = (unsigned long)ap_start, + .eip = (unsigned long)cpu_setup, .esp = (unsigned long)ap_stack + ARRAY_SIZE(ap_stack), + .eax = cpu, + /* Protected Mode, no paging. */ .cr0 = X86_CR0_PE, @@ -105,7 +106,7 @@ void smp_initialise(void) unsigned int i, nr_cpus = hvm_info->nr_vcpus; printf("Multiprocessor initialisation:\n"); - ap_start(); + cpu_setup(0); for ( i = 1; i < nr_cpus; i++ ) boot_cpu(i); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 15 19:22:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 19:22:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722599.1126718 (Exim 4.92) (envelope-from ) id 1s7KD7-0003WD-Kn; Wed, 15 May 2024 19:22:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722599.1126718; Wed, 15 May 2024 19:22:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KD7-0003W5-IG; Wed, 15 May 2024 19:22:45 +0000 Received: by outflank-mailman (input) for mailman id 722599; Wed, 15 May 2024 19:22:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KD6-0003Vt-DY for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KD6-0000Dj-Cm for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7KD6-0005zz-C5 for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+wE1m4Gw1i8iBnXmU07mYzZIv/9e3QalMXV0GOuR3VM=; b=Gic7FoivCz7rhjMawVjHEr8dT9 AOgmiXxeAh9UN2FvGenWFPAtpIFEojG93dn42kQRwhIwTwesSVpSGUICCEENm75MNf20O+jWUyZcy kRgl3hteYY0s9a+PetadxHyL1UVMTEs8gtaAfvoWdztckdJxfN9QCXOE3zbN6tX/exkg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xentop: Fix cpu% sort order Message-Id: Date: Wed, 15 May 2024 19:22:44 +0000 commit e27fc7d15eab79e604e8b8728778594accc23cf1 Author: Leigh Brown AuthorDate: Tue May 14 09:13:44 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 tools/xentop: Fix cpu% sort order In compare_cpu_pct(), there is a double -> unsigned long long converion when calling compare(). In C, this discards the fractional part, resulting in an out-of order sorting such as: NAME STATE CPU(sec) CPU(%) xendd --b--- 4020 5.7 icecream --b--- 2600 3.8 Domain-0 -----r 1060 1.5 neon --b--- 827 1.1 cheese --b--- 225 0.7 pizza --b--- 359 0.5 cassini --b--- 490 0.4 fusilli --b--- 159 0.2 bob --b--- 502 0.2 blender --b--- 121 0.2 bread --b--- 69 0.1 chickpea --b--- 67 0.1 lentil --b--- 67 0.1 Introduce compare_dbl() function and update compare_cpu_pct() to call it. Fixes: 49839b535b78 ("Add xenstat framework.") Signed-off-by: Leigh Brown Reviewed-by: Andrew Cooper --- tools/xentop/xentop.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index f5a456fd4d..f5d6c19cf9 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -85,6 +85,7 @@ static void set_delay(const char *value); static void set_prompt(const char *new_prompt, void (*func)(const char *)); static int handle_key(int); static int compare(unsigned long long, unsigned long long); +static int compare_dbl(double, double); static int compare_domains(xenstat_domain **, xenstat_domain **); static unsigned long long tot_net_bytes( xenstat_domain *, int); static bool tot_vbd_reqs(xenstat_domain *, int, unsigned long long *); @@ -424,6 +425,16 @@ static int compare(unsigned long long i1, unsigned long long i2) return 0; } +/* Compares two double precision numbers, returning -1,0,1 for <,=,> */ +static int compare_dbl(double d1, double d2) +{ + if (d1 < d2) + return -1; + if (d1 > d2) + return 1; + return 0; +} + /* Comparison function for use with qsort. Compares two domains using the * current sort field. */ static int compare_domains(xenstat_domain **domain1, xenstat_domain **domain2) @@ -525,7 +536,7 @@ static double get_cpu_pct(xenstat_domain *domain) static int compare_cpu_pct(xenstat_domain *domain1, xenstat_domain *domain2) { - return -compare(get_cpu_pct(domain1), get_cpu_pct(domain2)); + return -compare_dbl(get_cpu_pct(domain1), get_cpu_pct(domain2)); } /* Prints cpu percentage statistic */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 15 19:22:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 19:22:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722600.1126722 (Exim 4.92) (envelope-from ) id 1s7KDH-0003Z1-MZ; Wed, 15 May 2024 19:22:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722600.1126722; Wed, 15 May 2024 19:22:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDH-0003Yt-Jl; Wed, 15 May 2024 19:22:55 +0000 Received: by outflank-mailman (input) for mailman id 722600; Wed, 15 May 2024 19:22:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDG-0003Yi-HH for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDG-0000Dq-GP for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7KDG-00060c-Ey for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:22: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=aFOYfg/IkP7GATuQBSnmpHw88GStkc60hEtn0xHhdr4=; b=pgrWHT6v4fhUULhUzKfj+dODNB JT6amM8ke8IqdosNf7PD20fM+jb5x6l567jFvRl03TFHiITzAKFeCqg6v9KgCc0Mn3rl64YLtW0pm M+IgWow3kwUmbPmhxVEe1O0phpcR7YuGe1PSvD+Mr1vzqvxFJbSvTuDxToVYh3vZYNxM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libs/light: Add vlan field to libxl_device_nic Message-Id: Date: Wed, 15 May 2024 19:22:54 +0000 commit 3bc14e4fa4b9832888710759a7dbe5f0d239f33b Author: Leigh Brown AuthorDate: Wed May 8 22:38:20 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 tools/libs/light: Add vlan field to libxl_device_nic Add `vlan' string field to libxl_device_nic, to allow a VLAN configuration to be specified for the VIF when adding it to the bridge device. Update libxl_nic.c to read and write the vlan field from the xenstore. This provides the capability for supported operating systems (e.g. Linux) to perform VLAN filtering on bridge ports. The Xen hotplug scripts need to be updated to read this information from the xenstore and perform the required configuration. Signed-off-by: Leigh Brown Reviewed-by: Jason Andryuk --- tools/libs/light/libxl_nic.c | 10 ++++++++++ tools/libs/light/libxl_types.idl | 1 + 2 files changed, 11 insertions(+) diff --git a/tools/libs/light/libxl_nic.c b/tools/libs/light/libxl_nic.c index d6bf06fc34..d861e3726d 100644 --- a/tools/libs/light/libxl_nic.c +++ b/tools/libs/light/libxl_nic.c @@ -233,6 +233,11 @@ static int libxl__set_xenstore_nic(libxl__gc *gc, uint32_t domid, flexarray_append(back, GCSPRINTF("%u", nic->mtu)); } + if (nic->vlan) { + flexarray_append(back, "vlan"); + flexarray_append(back, libxl__strdup(gc, nic->vlan)); + } + flexarray_append(back, "bridge"); flexarray_append(back, libxl__strdup(gc, nic->bridge)); flexarray_append(back, "handle"); @@ -313,6 +318,11 @@ static int libxl__nic_from_xenstore(libxl__gc *gc, const char *libxl_path, nic->mtu = LIBXL_DEVICE_NIC_MTU_DEFAULT; } + rc = libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/vlan", libxl_path), + (const char **)(&nic->vlan)); + if (rc) goto out; + rc = libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/mac", libxl_path), &tmp); if (rc) goto out; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 470122e768..79e9c656cc 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -817,6 +817,7 @@ libxl_device_nic = Struct("device_nic", [ ("backend_domname", string), ("devid", libxl_devid), ("mtu", integer), + ("vlan", string), ("model", string), ("mac", libxl_mac), ("ip", string), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 15 19:23:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 19:23:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722601.1126726 (Exim 4.92) (envelope-from ) id 1s7KDR-0003c4-O8; Wed, 15 May 2024 19:23:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722601.1126726; Wed, 15 May 2024 19:23:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDR-0003bx-LC; Wed, 15 May 2024 19:23:05 +0000 Received: by outflank-mailman (input) for mailman id 722601; Wed, 15 May 2024 19:23:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDQ-0003bj-KE for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:23:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDQ-0000EF-JU for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:23:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7KDQ-00061E-Id for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:23:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0CBB/DV1ZbK7a/fLfk0knfVDdrqy6Wtjlh4wFRJgvxU=; b=3iKvvA3fuctur5BUZdT7iofzjf Dr5jOZpvF0X6Er3ebQQQgn4FdeGvAt9gpk94GZAdhB/qXY1dwLqbpk8p8fNWyfFAfZh38SQll6jgc jZrfFN4rv4y0yw+hNId/zOAGS1U+v+Vz4DHhnQKHg6QyoKcljsyoTf+NuDFDRlW4joiw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xl: add vlan keyword to vif option Message-Id: Date: Wed, 15 May 2024 19:23:04 +0000 commit 0cc01c603f4287233715a526b056bc20e0e97412 Author: Leigh Brown AuthorDate: Wed May 8 22:38:21 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 tools/xl: add vlan keyword to vif option Update parse_nic_config() to support a new `vlan' keyword. This keyword specifies the VLAN configuration to assign to the VIF when attaching it to the bridge port, on operating systems that support the capability (e.g. Linux). The vlan keyword will allow one or more VLANs to be configured on the VIF when adding it to the bridge port. This will be done by the vif-bridge script and functions. Signed-off-by: Leigh Brown Reviewed-by: Jason Andryuk --- docs/man/xl-network-configuration.5.pod.in | 38 ++++++++++++++++++++++++++++++ tools/xl/xl_parse.c | 2 ++ 2 files changed, 40 insertions(+) diff --git a/docs/man/xl-network-configuration.5.pod.in b/docs/man/xl-network-configuration.5.pod.in index f3e379bcf8..324ee9bbf8 100644 --- a/docs/man/xl-network-configuration.5.pod.in +++ b/docs/man/xl-network-configuration.5.pod.in @@ -259,6 +259,44 @@ Specifies the MTU (i.e. the maximum size of an IP payload, exclusing headers). T default value is 1500 but, if the VIF is attached to a bridge, it will be set to match unless overridden by this parameter. +=head2 vlan + +Specifies the VLAN configuration. The format of this parameter is one or more +VLAN IDs or ranges separated by forward slashes. Each term can be: + +=over + +=item * + +B - a single VLAN ID in the range 1 to 4094. This can optionally followed +by a B

to indicate the PVID or by a B to indicate an untagged VLAN. C

+implies B. + +=item * + +B-B - a range of VLAN IDs from B to B, both between +1 and 4094 and B being less than or equal to B. This can be +optionally followed by a B to indicate that the range of VLANs are untagged. + +=item * + +B+BxB - describing a range of VLAN IDs starting at B +with B additional entries, each incremented by B. This can be +optionally followed by a B to indicate that the range of VLANs are untagged. + +=back + +Note, one VLAN ID must be marked as the PVID. In the case of a vlan +specification consisting of a single VLAN ID (e.g. C), the B

suffix +may be omitted. Specifying more than one untagged VLAN ID is an advanced +configuration - use with caution. + +For example: + + 'vlan=10' -- meaning a single VLAN that is the PVID. + 'vlan=10p/20' -- VLAN 10 is the PVID and VLAN 20 is tagged. + 'vlan=10p/100+10x4' -- VLANs 10, 100, 110, 120, 130, 140, 150. + =head2 trusted / untrusted An advisory setting for the frontend driver on whether the backend should be diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index ab09d0288b..c504ab3711 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -565,6 +565,8 @@ int parse_nic_config(libxl_device_nic *nic, XLU_Config **config, char *token) nic->devid = parse_ulong(oparg); } else if (MATCH_OPTION("mtu", token, oparg)) { nic->mtu = parse_ulong(oparg); + } else if (MATCH_OPTION("vlan", token, oparg)) { + replace_string(&nic->vlan, oparg); } else if (!strcmp("trusted", token)) { libxl_defbool_set(&nic->trusted, true); } else if (!strcmp("untrusted", token)) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 15 19:23:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 May 2024 19:23:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722602.1126729 (Exim 4.92) (envelope-from ) id 1s7KDb-0003eV-PQ; Wed, 15 May 2024 19:23:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722602.1126729; Wed, 15 May 2024 19:23:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDb-0003eO-Mu; Wed, 15 May 2024 19:23:15 +0000 Received: by outflank-mailman (input) for mailman id 722602; Wed, 15 May 2024 19:23:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDa-0003eB-Nf for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:23:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7KDa-0000Ef-MR for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:23:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7KDa-00061f-La for xen-changelog@lists.xenproject.org; Wed, 15 May 2024 19:23:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+4F7+BANfi7pbytqHOgo37/UIE9OqjHbPNr+ORzrFHA=; b=RnYO5Oq4eVJkuFwhL/ojchoAhY yzqrWnrmOirBeDiiWdJd1yVBW+J0ct8e8SXZRVSkCDAiQNo6nzQPVQGdiUlmpmO2S3PsOvYGtQwTq /4KsZ/Cps3QdqVQlFYNWCFN9B/LGSYJ/lJWchJmgf3WA6E8S0jxpMvQNUj7eHCXScnpw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mtrr: avoid system wide rendezvous when setting AP MTRRs Message-Id: Date: Wed, 15 May 2024 19:23:14 +0000 commit abd00b037da5ffa4e8c4508a5df0cd6eabb805a4 Author: Roger Pau Monne AuthorDate: Mon May 13 10:59:25 2024 +0200 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 x86/mtrr: avoid system wide rendezvous when setting AP MTRRs There's no point in forcing a system wide update of the MTRRs on all processors when there are no changes to be propagated. On AP startup it's only the AP that needs to write the system wide MTRR values in order to match the rest of the already online CPUs. We have occasionally seen the watchdog trigger during `xen-hptool cpu-online` in one Intel Cascade Lake box with 448 CPUs due to the re-setting of the MTRRs on all the CPUs in the system. While there adjust the comment to clarify why the system-wide resetting of the MTRR registers is not needed for the purposes of mtrr_ap_init(). Signed-off-by: Roger Pau Monné Release-acked-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/x86/cpu/mtrr/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index 90b235f57e..0a44ebbcb0 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -573,14 +573,15 @@ void mtrr_ap_init(void) if (!mtrr_if || hold_mtrr_updates_on_aps) return; /* - * Ideally we should hold mtrr_mutex here to avoid mtrr entries changed, - * but this routine will be called in cpu boot time, holding the lock - * breaks it. This routine is called in two cases: 1.very earily time - * of software resume, when there absolutely isn't mtrr entry changes; - * 2.cpu hotadd time. We let mtrr_add/del_page hold cpuhotplug lock to - * prevent mtrr entry changes + * hold_mtrr_updates_on_aps takes care of preventing unnecessary MTRR + * updates when batch starting the CPUs (see + * mtrr_aps_sync_{begin,end}()). + * + * Otherwise just apply the current system wide MTRR values to this AP. + * Note this doesn't require synchronization with the other CPUs, as + * there are strictly no modifications of the current MTRR values. */ - set_mtrr(~0U, 0, 0, 0); + mtrr_set_all(); } /** -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 00:11:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 00:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722702.1126914 (Exim 4.92) (envelope-from ) id 1s7OiA-0007os-GB; Thu, 16 May 2024 00:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722702.1126914; Thu, 16 May 2024 00:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7OiA-0007ok-DE; Thu, 16 May 2024 00:11:06 +0000 Received: by outflank-mailman (input) for mailman id 722702; Thu, 16 May 2024 00:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7Oi8-0007mJ-9Q for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 00:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7Oi8-0006FC-7U for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 00:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7Oi8-0004oW-6S for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 00:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PPA7aEPBqLaoLiDO3o8JpviXc8ctOY9/DVqnunnhRw0=; b=ZGdYq4rGQ9v7djfqkJ4YT0X4md w8iIWWnABlh9Kb10rdXoGL0JXNVabzkCzLjofwKTsDYa2lf8rSWmxUgbxnB3ZdrcqwktOMK1lm4DD rRsTwQWaomU0QTx9CZnQQkCPE/n23I6rmsd6i3fnCerWp46U+s0PG5r7PAbTR5tCrVhA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: fully deviate MISRA C Rules 21.9 and 21.10 Message-Id: Date: Thu, 16 May 2024 00:11:04 +0000 commit 7fe9679db962926977ae2097a07bfc51a9ac6bad Author: Nicola Vetrini AuthorDate: Wed May 15 09:51:59 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 15 16:58:06 2024 -0700 automation/eclair_analysis: fully deviate MISRA C Rules 21.9 and 21.10 These rules are concerned with the use of facilities provided by the C Standard Library (qsort, bsearch for rule 21.9, and those provided by for rule 21.10). Xen provides in its source code its own implementation of some of these functions and macros, therefore a justification is provided for allowing uses of these functions in the project. The rules are also marked as clean as a consequence. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 14 ++++++++++++++ automation/eclair_analysis/ECLAIR/monitored.ecl | 2 ++ automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- docs/misra/deviations.rst | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 5eb7368a73..1478c64a5a 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -477,6 +477,20 @@ leads to a violation of the Rule are deviated." -config=MC3R1.R20.12,macros+={deliberate, "name(GENERATE_CASE)&&loc(file(deliberate_generate_case))"} -doc_end +# +# Series 21. +# + +-doc_begin="Xen does not use the functions provided by the Standard Library, but +implements a set of functions that share the same names as their Standard Library equivalent. +The implementation of these functions is available in source form, so the undefined, unspecified +or implementation-defined behaviors contemplated by the C Standard do not apply. +If some undefined or unspecified behavior does arise in the implementation, it +falls under the jurisdiction of other MISRA rules." +-config=MC3R1.R21.9,reports+={deliberate, "any()"} +-config=MC3R1.R21.10,reports+={deliberate, "any()"} +-doc_end + # # General # diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl index 69308ea51c..9da709dc88 100644 --- a/automation/eclair_analysis/ECLAIR/monitored.ecl +++ b/automation/eclair_analysis/ECLAIR/monitored.ecl @@ -36,12 +36,14 @@ -enable=MC3R1.R20.4 -enable=MC3R1.R20.9 -enable=MC3R1.R2.1 +-enable=MC3R1.R21.10 -enable=MC3R1.R21.13 -enable=MC3R1.R21.17 -enable=MC3R1.R21.18 -enable=MC3R1.R21.19 -enable=MC3R1.R21.20 -enable=MC3R1.R21.21 +-enable=MC3R1.R21.9 -enable=MC3R1.R2.2 -enable=MC3R1.R22.2 -enable=MC3R1.R22.4 diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index a14bda5033..acea15f486 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.10||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R21.9||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 161134771c..b5450c38f6 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -411,6 +411,24 @@ Deviations related to MISRA C:2012 Rules: construct is deviated only in Translation Units that present a violation of the Rule due to uses of this macro. - Tagged as `deliberate` for ECLAIR. + + * - R21.9 + - Xen does not use the `bsearch` and `qsort` functions provided by the C + Standard Library, but provides in source form its own implementation, + therefore any unspecified or undefined behavior associated to the + functions provided by the Standard Library does not apply. Any such + behavior that may exist in such functions is therefore under the + jurisdiction of other MISRA C rules. + - Project-wide deviation, tagged as `deliberate` for ECLAIR. + + * - R21.10 + - Xen does not use the facilities provided by the `\` provided by the C + Standard Library, but provides in source form its own implementation, + therefore any unspecified, undefined or implementation-defined behavior + associated to the functions provided by the Standard Library does not + apply. Any such behavior that may exist in such functions is therefore + under the jurisdiction of other MISRA C rules. + - Project-wide deviation, tagged as `deliberate` for ECLAIR. Other deviations: ----------------- -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 00:11:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 00:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722703.1126918 (Exim 4.92) (envelope-from ) id 1s7OiJ-0007uO-JN; Thu, 16 May 2024 00:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722703.1126918; Thu, 16 May 2024 00:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7OiJ-0007uG-Gj; Thu, 16 May 2024 00:11:15 +0000 Received: by outflank-mailman (input) for mailman id 722703; Thu, 16 May 2024 00:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7OiI-0007u6-DB for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 00:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7OiI-0006FZ-AQ for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 00:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7OiI-0004p6-9d for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 00:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=X/xMS1mKb84Z1hAAK5gQI9g4uaeWnfZZJ0ZGIseG4JU=; b=ABQp/SIQKGyk5RB+eI7rNlslYo 4jrzoIdb5jtbQOOGNOz/wJJt4hS6SDtIX68CX5NnfUXqDIKfM3fON7uZeixBHWSfQ4qobRtqJdjLD tvMr0R+wNloFhtoUhSQ+3HfL5a5gkwwHCqBZ923/pjnAqDsWEBsSPSh7NBjyBhgohuIM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: deviate macro count_args_ for MISRA Rule 20.7 Message-Id: Date: Thu, 16 May 2024 00:11:14 +0000 commit 762a848223e0fd61aa87b4e040c83dd2c490fb79 Author: Nicola Vetrini AuthorDate: Tue Apr 23 17:12:45 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 15 16:58:44 2024 -0700 automation/eclair_analysis: deviate macro count_args_ for MISRA Rule 20.7 The count_args_ macro violates Rule 20.7, but it can't be made compliant with Rule 20.7 without breaking its functionality. Since it's very unlikely for this macro to be misused, it is deviated. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 6 ++++++ docs/misra/deviations.rst | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 1478c64a5a..b9b377c56b 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -457,6 +457,12 @@ not to parenthesize their arguments." -config=MC3R1.R20.7,reports+={safe, "any_area(any_loc(any_exp(macro(^alternative_(v)?call[0-9]$))))"} -doc_end +-doc_begin="The argument 'x' of the count_args_ macro can't be parenthesized as +the rule would require, without breaking the functionality of the macro. The uses +of this macro do not lead to developer confusion, and can thus be deviated." +-config=MC3R1.R20.7,reports+={safe, "any_area(any_loc(any_exp(macro(^count_args_$))))"} +-doc_end + -doc_begin="Uses of variadic macros that have one of their arguments defined as a macro and used within the body for both ordinary parameter expansion and as an operand to the # or ## operators have a behavior that is well-understood and diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index b5450c38f6..36959aa44a 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -390,6 +390,12 @@ Deviations related to MISRA C:2012 Rules: sanity checks in place. - Tagged as `safe` for ECLAIR. + * - R20.7 + - The macro `count_args_` is not compliant with the rule, but is not likely + to incur in the risk of being misused or lead to developer confusion, and + refactoring it to add parentheses breaks its functionality. + - Tagged as `safe` for ECLAIR. + * - R20.12 - Variadic macros that use token pasting often employ the gcc extension `ext_paste_comma`, as detailed in `C-language-toolchain.rst`, which is -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:22:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722883.1127242 (Exim 4.92) (envelope-from ) id 1s7WNH-0003r1-81; Thu, 16 May 2024 08:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722883.1127242; Thu, 16 May 2024 08: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 1s7WNH-0003qo-5G; Thu, 16 May 2024 08:22:03 +0000 Received: by outflank-mailman (input) for mailman id 722883; Thu, 16 May 2024 08:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNG-0003qh-3u for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNG-00077P-0p for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WNF-0008OF-UR for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2yWkDkry9E1x9o/gEZ085OoHj5Mu3RnWhaWGjniRj8Q=; b=CW1LxhPPnXjLT3qbqzOpzqqnpK iQPjxJXYo7Sy0BjXoEdNthn6RxHKiNFUqa08LxquNSKLaCRzDQkDk2PQZMaMHClgTFP1OMpyU/FBN O+7cHHkxgSzXnbsbGIoefLVJZaVFcBTNzp/mkP2GF8/Mv23Ylr7R71OeOXHsMW2szpG8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sched: set all sched_resource data inside locked region for new cpu Message-Id: Date: Thu, 16 May 2024 08:22:01 +0000 commit d104a07524ffc92ae7a70dfe192c291de2a563cc Author: Juergen Gross AuthorDate: Wed May 15 17:25:39 2024 +0200 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 xen/sched: set all sched_resource data inside locked region for new cpu When adding a cpu to a scheduler, set all data items of struct sched_resource inside the locked region, as otherwise a race might happen (e.g. when trying to access the cpupool of the cpu): (XEN) ----[ Xen-4.19.0-1-d x86_64 debug=y Tainted: H ]---- (XEN) CPU: 45 (XEN) RIP: e008:[] common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) RFLAGS: 0000000000010092 CONTEXT: hypervisor (XEN) rax: ffff82d040981618 rbx: ffff82d040981618 rcx: 0000000000000000 (XEN) rdx: 0000003ff68cd000 rsi: 000000000000002d rdi: ffff83103723d450 (XEN) rbp: ffff83207caa7d48 rsp: ffff83207caa7b98 r8: 0000000000000000 (XEN) r9: ffff831037253cf0 r10: ffff83103767c3f0 r11: 0000000000000009 (XEN) r12: ffff831037237990 r13: ffff831037237990 r14: ffff831037253720 (XEN) r15: 0000000000000000 cr0: 000000008005003b cr4: 0000000000f526e0 (XEN) cr3: 000000005bc2f000 cr2: 0000000000000010 (XEN) fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) Xen code around (common/sched/credit.c#csched_load_balance+0x41/0x877): (XEN) 48 8b 0c 10 48 8b 49 08 <48> 8b 79 10 48 89 bd b8 fe ff ff 49 8b 4e 28 48 (XEN) Xen call trace: (XEN) [] R common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) [] F common/sched/credit.c#csched_schedule+0x36a/0x69f (XEN) [] F common/sched/core.c#do_schedule+0xe8/0x433 (XEN) [] F common/sched/core.c#schedule+0x2e5/0x2f9 (XEN) [] F common/softirq.c#__do_softirq+0x94/0xbe (XEN) [] F do_softirq+0x13/0x15 (XEN) [] F arch/x86/domain.c#idle_loop+0x92/0xe6 (XEN) (XEN) Pagetable walk from 0000000000000010: (XEN) L4[0x000] = 000000103ff61063 ffffffffffffffff (XEN) L3[0x000] = 000000103ff60063 ffffffffffffffff (XEN) L2[0x000] = 0000001033dff063 ffffffffffffffff (XEN) L1[0x000] = 0000000000000000 ffffffffffffffff (XEN) (XEN) **************************************** (XEN) Panic on CPU 45: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000010 (XEN) **************************************** Reported-by: Andrew Cooper Fixes: a8c6c623192e ("sched: clarify use cases of schedule_cpu_switch()") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/common/sched/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 0cb33831d2..babac7aad6 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3176,6 +3176,8 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) sr->scheduler = new_ops; sr->sched_priv = ppriv; + sr->granularity = cpupool_get_granularity(c); + sr->cpupool = c; /* * Reroute the lock to the per pCPU lock as /last/ thing. In fact, @@ -3188,8 +3190,6 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) /* _Not_ pcpu_schedule_unlock(): schedule_lock has changed! */ spin_unlock_irqrestore(old_lock, flags); - sr->granularity = cpupool_get_granularity(c); - sr->cpupool = c; /* The cpu is added to a pool, trigger it to go pick up some work */ cpu_raise_softirq(cpu, SCHEDULE_SOFTIRQ); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:22:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722884.1127246 (Exim 4.92) (envelope-from ) id 1s7WNR-0003ug-9P; Thu, 16 May 2024 08:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722884.1127246; Thu, 16 May 2024 08: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 1s7WNR-0003uZ-6k; Thu, 16 May 2024 08:22:13 +0000 Received: by outflank-mailman (input) for mailman id 722884; Thu, 16 May 2024 08:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNQ-0003uO-4h for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNQ-00077W-3s for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WNQ-0008PC-32 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08: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=KnO+FrciBZ6NxGBe8UKq4HZEpVxvzm/3RCFyxThTZZU=; b=AtnCjNZK9wsXv841tu9YiNf/6X xxFFfVjbr8OyeNM+9peblvhOwmkw67KitoHmhTvfoOcLDR56dLDZoUr4xkod6/5Y8HgcdiXWsxKdc r2oV7xOH3cEMniU4C2vCX20xDf8HxPZfPiYTfAYZ843jpIRLZToq2dfH/YwOZUdcDZiI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: respect mapcache_domain_init() failing Message-Id: Date: Thu, 16 May 2024 08:22:12 +0000 commit 7270fdc7a0028d4b7b26fd1b36c6b9e97abcf3da Author: Jan Beulich AuthorDate: Wed May 15 15:35:15 2024 +0200 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 x86: respect mapcache_domain_init() failing The function itself properly handles and hands onwards failure from create_perdomain_mapping(). Therefore its caller should respect possible failure, too. Fixes: 4b28bf6ae90b ("x86: re-introduce map_domain_page() et al") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 20e83cf38b..00a3aaa576 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -858,7 +858,8 @@ int arch_domain_create(struct domain *d, } else if ( is_pv_domain(d) ) { - mapcache_domain_init(d); + if ( (rc = mapcache_domain_init(d)) != 0 ) + goto fail; if ( (rc = pv_domain_initialise(d)) != 0 ) goto fail; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:22:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722885.1127250 (Exim 4.92) (envelope-from ) id 1s7WNc-0003yO-Bt; Thu, 16 May 2024 08:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722885.1127250; Thu, 16 May 2024 08:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNc-0003yH-8N; Thu, 16 May 2024 08:22:24 +0000 Received: by outflank-mailman (input) for mailman id 722885; Thu, 16 May 2024 08:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNa-0003xG-7y for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNa-00077u-7B for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WNa-0008Pp-6G for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08: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=kFsr9PTbIIc+pLGwU9gsXEuc+B4SYN8yRX9IkCU7G8k=; b=fg8NaI2Ti+M7dfavOl+Rm7k36U kToeIsSWejEKAm8AYhZDMtv7AHD2kNX7sZFNKLHEEIFue5C+til98leJuH9vIpu4tL0m0XAMRr0n/ F3liZ69k/R/BfNExk6CTeYXwnhmDjx+FEAq7BNR50dDsMdTV1TUaXApwZkj+vIJSXN9A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpufreq: Rename cpuid variable/parameters to cpu Message-Id: Date: Thu, 16 May 2024 08:22:22 +0000 commit 8a78d898811cf6ee6f5a885ee9b3a71419084ade Author: Andrew Cooper AuthorDate: Sat May 11 19:25:00 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 x86/cpufreq: Rename cpuid variable/parameters to cpu Various functions have a parameter or local variable called cpuid, but this triggers a MISRA R5.3 violation because we also have a function called cpuid() which wraps the real CPUID instruction. In all these cases, it's a Xen cpu index, which is far more commonly named just cpu in our code. While adjusting these, fix a couple of other issues: * cpufreq_cpu_init() is on the end of a hypercall (with in-memory parameters, even), making EFAULT the wrong error to use. Use EOPNOTSUPP instead. * check_est_cpu() is wrong to tie EIST to just Intel, and nowhere else using EIST makes this restriction. Just check the feature itself, which is more succinctly done after being folded into its single caller. * In powernow_cpufreq_update(), replace an opencoded cpu_online(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 14 +++++----- xen/arch/x86/acpi/cpufreq/cpufreq.c | 24 ++++------------- xen/arch/x86/acpi/cpufreq/hwp.c | 6 ++--- xen/arch/x86/acpi/cpufreq/powernow.c | 6 ++--- xen/drivers/cpufreq/cpufreq.c | 20 +++++++------- xen/drivers/cpufreq/utility.c | 43 ++++++++++++++----------------- xen/include/acpi/cpufreq/cpufreq.h | 6 ++--- xen/include/acpi/cpufreq/processor_perf.h | 8 +++--- xen/include/xen/pmstat.h | 6 ++--- 9 files changed, 58 insertions(+), 75 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index cfce4cc040..c8db1aa991 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1498,14 +1498,14 @@ static void amd_cpuidle_init(struct acpi_processor_power *power) vendor_override = -1; } -uint32_t pmstat_get_cx_nr(uint32_t cpuid) +uint32_t pmstat_get_cx_nr(unsigned int cpu) { - return processor_powers[cpuid] ? processor_powers[cpuid]->count : 0; + return processor_powers[cpu] ? processor_powers[cpu]->count : 0; } -int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) +int pmstat_get_cx_stat(unsigned int cpu, struct pm_cx_stat *stat) { - struct acpi_processor_power *power = processor_powers[cpuid]; + struct acpi_processor_power *power = processor_powers[cpu]; uint64_t idle_usage = 0, idle_res = 0; uint64_t last_state_update_tick, current_stime, current_tick; uint64_t usage[ACPI_PROCESSOR_MAX_POWER] = { 0 }; @@ -1522,7 +1522,7 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) return 0; } - stat->idle_time = get_cpu_idle_time(cpuid); + stat->idle_time = get_cpu_idle_time(cpu); nr = min(stat->nr, power->count); /* mimic the stat when detail info hasn't been registered by dom0 */ @@ -1572,7 +1572,7 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) idle_res += res[i]; } - get_hw_residencies(cpuid, &hw_res); + get_hw_residencies(cpu, &hw_res); #define PUT_xC(what, n) do { \ if ( stat->nr_##what >= n && \ @@ -1613,7 +1613,7 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) return 0; } -int pmstat_reset_cx_stat(uint32_t cpuid) +int pmstat_reset_cx_stat(unsigned int cpu) { return 0; } diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index 2b6ef99678..a341f2f020 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -55,17 +55,6 @@ struct acpi_cpufreq_data *cpufreq_drv_data[NR_CPUS]; static bool __read_mostly acpi_pstate_strict; boolean_param("acpi_pstate_strict", acpi_pstate_strict); -static int check_est_cpu(unsigned int cpuid) -{ - struct cpuinfo_x86 *cpu = &cpu_data[cpuid]; - - if (cpu->x86_vendor != X86_VENDOR_INTEL || - !cpu_has(cpu, X86_FEATURE_EIST)) - return 0; - - return 1; -} - static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data) { struct processor_performance *perf; @@ -530,7 +519,7 @@ static int cf_check acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) if (cpufreq_verbose) printk("xen_pminfo: @acpi_cpufreq_cpu_init," "HARDWARE addr space\n"); - if (!check_est_cpu(cpu)) { + if (!cpu_has(c, X86_FEATURE_EIST)) { result = -ENODEV; goto err_unreg; } @@ -690,15 +679,12 @@ static int __init cf_check cpufreq_driver_late_init(void) } __initcall(cpufreq_driver_late_init); -int cpufreq_cpu_init(unsigned int cpuid) +int cpufreq_cpu_init(unsigned int cpu) { - int ret; - /* Currently we only handle Intel, AMD and Hygon processor */ if ( boot_cpu_data.x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_AMD | X86_VENDOR_HYGON) ) - ret = cpufreq_add_cpu(cpuid); - else - ret = -EFAULT; - return ret; + return cpufreq_add_cpu(cpu); + + return -EOPNOTSUPP; } diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index e61212803e..59b57a4cef 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -506,11 +506,11 @@ static void cf_check hwp_set_misc_turbo(void *info) } } -static int cf_check hwp_cpufreq_update(int cpuid, struct cpufreq_policy *policy) +static int cf_check hwp_cpufreq_update(unsigned int cpu, struct cpufreq_policy *policy) { - on_selected_cpus(cpumask_of(cpuid), hwp_set_misc_turbo, policy, 1); + on_selected_cpus(cpumask_of(cpu), hwp_set_misc_turbo, policy, 1); - return per_cpu(hwp_drv_data, cpuid)->ret; + return per_cpu(hwp_drv_data, cpu)->ret; } static const struct cpufreq_driver __initconst_cf_clobber diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index 8a27ee82a5..69364e1855 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -68,12 +68,12 @@ static void cf_check update_cpb(void *data) } static int cf_check powernow_cpufreq_update( - int cpuid, struct cpufreq_policy *policy) + unsigned int cpu, struct cpufreq_policy *policy) { - if (!cpumask_test_cpu(cpuid, &cpu_online_map)) + if ( !cpu_online(cpu) ) return -EINVAL; - on_selected_cpus(cpumask_of(cpuid), update_cpb, policy, 1); + on_selected_cpus(cpumask_of(cpu), update_cpb, policy, 1); return 0; } diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 36c800f4fa..8659ad3aee 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -459,21 +459,21 @@ static void print_PPC(unsigned int platform_limit) int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) { - int ret=0, cpuid; + int ret = 0, cpu; struct processor_pminfo *pmpt; struct processor_performance *pxpt; - cpuid = get_cpu_id(acpi_id); - if ( cpuid < 0 || !perf ) + cpu = get_cpu_id(acpi_id); + if ( cpu < 0 || !perf ) { ret = -EINVAL; goto out; } if ( cpufreq_verbose ) - printk("Set CPU acpi_id(%d) cpuid(%d) Px State info:\n", - acpi_id, cpuid); + printk("Set CPU acpi_id(%d) cpu(%d) Px State info:\n", + acpi_id, cpu); - pmpt = processor_pminfo[cpuid]; + pmpt = processor_pminfo[cpu]; if ( !pmpt ) { pmpt = xzalloc(struct processor_pminfo); @@ -482,11 +482,11 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) ret = -ENOMEM; goto out; } - processor_pminfo[cpuid] = pmpt; + processor_pminfo[cpu] = pmpt; } pxpt = &pmpt->perf; pmpt->acpi_id = acpi_id; - pmpt->id = cpuid; + pmpt->id = cpu; if ( perf->flags & XEN_PX_PCT ) { @@ -564,7 +564,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) if ( pxpt->init == XEN_PX_INIT ) { - ret = cpufreq_limit_change(cpuid); + ret = cpufreq_limit_change(cpu); goto out; } } @@ -573,7 +573,7 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf) { pxpt->init = XEN_PX_INIT; - ret = cpufreq_cpu_init(cpuid); + ret = cpufreq_cpu_init(cpu); goto out; } diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index dbf8985969..6d2413b32a 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -86,13 +86,12 @@ void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) spin_unlock(cpufreq_statistic_lock); } -int cpufreq_statistic_init(unsigned int cpuid) +int cpufreq_statistic_init(unsigned int cpu) { uint32_t i, count; struct pm_px *pxpt; - const struct processor_pminfo *pmpt = processor_pminfo[cpuid]; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpuid); + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); spin_lock_init(cpufreq_statistic_lock); @@ -101,7 +100,7 @@ int cpufreq_statistic_init(unsigned int cpuid) spin_lock(cpufreq_statistic_lock); - pxpt = per_cpu(cpufreq_statistic_data, cpuid); + pxpt = per_cpu(cpufreq_statistic_data, cpu); if ( pxpt ) { spin_unlock(cpufreq_statistic_lock); return 0; @@ -114,7 +113,7 @@ int cpufreq_statistic_init(unsigned int cpuid) spin_unlock(cpufreq_statistic_lock); return -ENOMEM; } - per_cpu(cpufreq_statistic_data, cpuid) = pxpt; + per_cpu(cpufreq_statistic_data, cpu) = pxpt; pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); if (!pxpt->u.trans_pt) { @@ -138,22 +137,21 @@ int cpufreq_statistic_init(unsigned int cpuid) pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpuid); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); spin_unlock(cpufreq_statistic_lock); return 0; } -void cpufreq_statistic_exit(unsigned int cpuid) +void cpufreq_statistic_exit(unsigned int cpu) { struct pm_px *pxpt; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpuid); + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); spin_lock(cpufreq_statistic_lock); - pxpt = per_cpu(cpufreq_statistic_data, cpuid); + pxpt = per_cpu(cpufreq_statistic_data, cpu); if (!pxpt) { spin_unlock(cpufreq_statistic_lock); return; @@ -162,22 +160,21 @@ void cpufreq_statistic_exit(unsigned int cpuid) xfree(pxpt->u.trans_pt); xfree(pxpt->u.pt); xfree(pxpt); - per_cpu(cpufreq_statistic_data, cpuid) = NULL; + per_cpu(cpufreq_statistic_data, cpu) = NULL; spin_unlock(cpufreq_statistic_lock); } -void cpufreq_statistic_reset(unsigned int cpuid) +void cpufreq_statistic_reset(unsigned int cpu) { uint32_t i, j, count; struct pm_px *pxpt; - const struct processor_pminfo *pmpt = processor_pminfo[cpuid]; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpuid); + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); spin_lock(cpufreq_statistic_lock); - pxpt = per_cpu(cpufreq_statistic_data, cpuid); + pxpt = per_cpu(cpufreq_statistic_data, cpu); if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) { spin_unlock(cpufreq_statistic_lock); return; @@ -194,7 +191,7 @@ void cpufreq_statistic_reset(unsigned int cpuid) } pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpuid); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); spin_unlock(cpufreq_statistic_lock); } @@ -389,7 +386,7 @@ int cpufreq_driver_getavg(unsigned int cpu, unsigned int flag) return policy->cur; } -int cpufreq_update_turbo(int cpuid, int new_state) +int cpufreq_update_turbo(unsigned int cpu, int new_state) { struct cpufreq_policy *policy; int curr_state; @@ -399,7 +396,7 @@ int cpufreq_update_turbo(int cpuid, int new_state) new_state != CPUFREQ_TURBO_DISABLED) return -EINVAL; - policy = per_cpu(cpufreq_cpu_policy, cpuid); + policy = per_cpu(cpufreq_cpu_policy, cpu); if (!policy) return -EACCES; @@ -413,7 +410,7 @@ int cpufreq_update_turbo(int cpuid, int new_state) policy->turbo = new_state; if (cpufreq_driver.update) { - ret = alternative_call(cpufreq_driver.update, cpuid, policy); + ret = alternative_call(cpufreq_driver.update, cpu, policy); if (ret) policy->turbo = curr_state; } @@ -422,11 +419,11 @@ int cpufreq_update_turbo(int cpuid, int new_state) } -int cpufreq_get_turbo_status(int cpuid) +int cpufreq_get_turbo_status(unsigned int cpu) { struct cpufreq_policy *policy; - policy = per_cpu(cpufreq_cpu_policy, cpuid); + policy = per_cpu(cpufreq_cpu_policy, cpu); return policy && policy->turbo == CPUFREQ_TURBO_ENABLED; } diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index b4685a9085..443427153b 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -145,8 +145,8 @@ extern int cpufreq_driver_getavg(unsigned int cpu, unsigned int flag); #define CPUFREQ_TURBO_UNSUPPORTED 0 #define CPUFREQ_TURBO_ENABLED 1 -extern int cpufreq_update_turbo(int cpuid, int new_state); -extern int cpufreq_get_turbo_status(int cpuid); +int cpufreq_update_turbo(unsigned int cpu, int new_state); +int cpufreq_get_turbo_status(unsigned int cpu); static inline int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event) @@ -167,7 +167,7 @@ struct cpufreq_driver { int (*init)(struct cpufreq_policy *policy); int (*verify)(struct cpufreq_policy *policy); int (*setpolicy)(struct cpufreq_policy *policy); - int (*update)(int cpuid, struct cpufreq_policy *policy); + int (*update)(unsigned int cpu, struct cpufreq_policy *policy); int (*target)(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation); diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 7cd2400619..5f48aceadb 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -12,9 +12,9 @@ unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); void cpufreq_residency_update(unsigned int cpu, uint8_t state); void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to); -int cpufreq_statistic_init(unsigned int cpuid); -void cpufreq_statistic_exit(unsigned int cpuid); -void cpufreq_statistic_reset(unsigned int cpuid); +int cpufreq_statistic_init(unsigned int cpu); +void cpufreq_statistic_exit(unsigned int cpu); +void cpufreq_statistic_reset(unsigned int cpu); int cpufreq_limit_change(unsigned int cpu); @@ -59,5 +59,5 @@ struct pm_px { DECLARE_PER_CPU(struct pm_px *, cpufreq_statistic_data); -int cpufreq_cpu_init(unsigned int cpuid); +int cpufreq_cpu_init(unsigned int cpu); #endif /* __XEN_PROCESSOR_PM_H__ */ diff --git a/xen/include/xen/pmstat.h b/xen/include/xen/pmstat.h index 43b826ad4d..e6ab1423a9 100644 --- a/xen/include/xen/pmstat.h +++ b/xen/include/xen/pmstat.h @@ -7,9 +7,9 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf); long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power); -uint32_t pmstat_get_cx_nr(uint32_t cpuid); -int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat); -int pmstat_reset_cx_stat(uint32_t cpuid); +uint32_t pmstat_get_cx_nr(unsigned int cpu); +int pmstat_get_cx_stat(unsigned int cpu, struct pm_cx_stat *stat); +int pmstat_reset_cx_stat(unsigned int cpu); int do_get_pm_info(struct xen_sysctl_get_pmstat *op); int do_pm_op(struct xen_sysctl_pm_op *op); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:22:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722886.1127253 (Exim 4.92) (envelope-from ) id 1s7WNm-00041n-EB; Thu, 16 May 2024 08:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722886.1127253; Thu, 16 May 2024 08:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNm-00041g-BE; Thu, 16 May 2024 08:22:34 +0000 Received: by outflank-mailman (input) for mailman id 722886; Thu, 16 May 2024 08:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNk-00041R-Cs for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNk-000781-C6 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WNk-0008QI-9N for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08: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=rLZeiGfrMlhhDjo9Ai6+Ii17h4mjEniEyFsm79OHD6o=; b=G9UpmOo63/+qoYc1ZNWfoK8aOQ 1NmE+K8R/dgWgtKYIe3hP0TtbrG2IJ1jYEawINDV7N9Aqs+aUYxuQ30h4IDql1hGcYw9ZuVoXr9FB A8xlRlf3oQ2/yukcjUggc+CIYNFM+N+ifcIxEr+xVuRTX0oQamwHdRPg/JokTUOxTgU0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/hvmloader: Further simplify SMP setup Message-Id: Date: Thu, 16 May 2024 08:22:32 +0000 commit 9b7d793889438ecb5fc6e48fa973c244f9832248 Author: Andrew Cooper AuthorDate: Thu May 9 18:40:11 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 tools/hvmloader: Further simplify SMP setup Now that we're using hypercalls to start APs, we can replace the 'ap_cpuid' global with a regular function parameter. This requires telling the compiler that we'd like the parameter in a register rather than on the stack. While adjusting, rename to cpu_setup(). It's always been used on the BSP, making the name ap_start() specifically misleading. Signed-off-by: Andrew Cooper Reviewed-by: Alejandro Vallejo --- tools/firmware/hvmloader/smp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/smp.c b/tools/firmware/hvmloader/smp.c index 6ebf0b60fa..5d46eee1c5 100644 --- a/tools/firmware/hvmloader/smp.c +++ b/tools/firmware/hvmloader/smp.c @@ -29,15 +29,15 @@ #include -static int ap_callin, ap_cpuid; +static int ap_callin; -static void ap_start(void) +static void __attribute__((regparm(1))) cpu_setup(unsigned int cpu) { - printf(" - CPU%d ... ", ap_cpuid); + printf(" - CPU%d ... ", cpu); cacheattr_init(); printf("done.\n"); - if ( !ap_cpuid ) /* Used on the BSP too */ + if ( !cpu ) /* Used on the BSP too */ return; wmb(); @@ -55,7 +55,6 @@ static void boot_cpu(unsigned int cpu) static struct vcpu_hvm_context ap; /* Initialise shared variables. */ - ap_cpuid = cpu; ap_callin = 0; wmb(); @@ -63,9 +62,11 @@ static void boot_cpu(unsigned int cpu) ap = (struct vcpu_hvm_context) { .mode = VCPU_HVM_MODE_32B, .cpu_regs.x86_32 = { - .eip = (unsigned long)ap_start, + .eip = (unsigned long)cpu_setup, .esp = (unsigned long)ap_stack + ARRAY_SIZE(ap_stack), + .eax = cpu, + /* Protected Mode, no paging. */ .cr0 = X86_CR0_PE, @@ -105,7 +106,7 @@ void smp_initialise(void) unsigned int i, nr_cpus = hvm_info->nr_vcpus; printf("Multiprocessor initialisation:\n"); - ap_start(); + cpu_setup(0); for ( i = 1; i < nr_cpus; i++ ) boot_cpu(i); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:22:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722887.1127257 (Exim 4.92) (envelope-from ) id 1s7WNw-00044b-Ff; Thu, 16 May 2024 08:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722887.1127257; Thu, 16 May 2024 08: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 1s7WNw-00044T-Cv; Thu, 16 May 2024 08:22:44 +0000 Received: by outflank-mailman (input) for mailman id 722887; Thu, 16 May 2024 08:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNu-00044F-GO for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WNu-000788-Fa for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WNu-0008Qv-EF for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08: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=a1uKauz1aZy+x3mMojk6xmm5Jhy6u0BWK7izbJ22t9o=; b=QQRPtlRD+o1j4XEXnqHkgiUoOg D5HxvLebdTLmTlOvpN+YEn08marXghk6qdGUaNtai9g6QN2LmnnD6xQRCWezT7hgYiZOdXpZiKMdH YaNcSIwMXhdf6fbELY0J8dTLMdVsX0ECxAiuQJzmtwhkvqa/RBCUoyiUnlyd68RRxkBk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xentop: Fix cpu% sort order Message-Id: Date: Thu, 16 May 2024 08:22:42 +0000 commit e27fc7d15eab79e604e8b8728778594accc23cf1 Author: Leigh Brown AuthorDate: Tue May 14 09:13:44 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 tools/xentop: Fix cpu% sort order In compare_cpu_pct(), there is a double -> unsigned long long converion when calling compare(). In C, this discards the fractional part, resulting in an out-of order sorting such as: NAME STATE CPU(sec) CPU(%) xendd --b--- 4020 5.7 icecream --b--- 2600 3.8 Domain-0 -----r 1060 1.5 neon --b--- 827 1.1 cheese --b--- 225 0.7 pizza --b--- 359 0.5 cassini --b--- 490 0.4 fusilli --b--- 159 0.2 bob --b--- 502 0.2 blender --b--- 121 0.2 bread --b--- 69 0.1 chickpea --b--- 67 0.1 lentil --b--- 67 0.1 Introduce compare_dbl() function and update compare_cpu_pct() to call it. Fixes: 49839b535b78 ("Add xenstat framework.") Signed-off-by: Leigh Brown Reviewed-by: Andrew Cooper --- tools/xentop/xentop.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index f5a456fd4d..f5d6c19cf9 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -85,6 +85,7 @@ static void set_delay(const char *value); static void set_prompt(const char *new_prompt, void (*func)(const char *)); static int handle_key(int); static int compare(unsigned long long, unsigned long long); +static int compare_dbl(double, double); static int compare_domains(xenstat_domain **, xenstat_domain **); static unsigned long long tot_net_bytes( xenstat_domain *, int); static bool tot_vbd_reqs(xenstat_domain *, int, unsigned long long *); @@ -424,6 +425,16 @@ static int compare(unsigned long long i1, unsigned long long i2) return 0; } +/* Compares two double precision numbers, returning -1,0,1 for <,=,> */ +static int compare_dbl(double d1, double d2) +{ + if (d1 < d2) + return -1; + if (d1 > d2) + return 1; + return 0; +} + /* Comparison function for use with qsort. Compares two domains using the * current sort field. */ static int compare_domains(xenstat_domain **domain1, xenstat_domain **domain2) @@ -525,7 +536,7 @@ static double get_cpu_pct(xenstat_domain *domain) static int compare_cpu_pct(xenstat_domain *domain1, xenstat_domain *domain2) { - return -compare(get_cpu_pct(domain1), get_cpu_pct(domain2)); + return -compare_dbl(get_cpu_pct(domain1), get_cpu_pct(domain2)); } /* Prints cpu percentage statistic */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:22:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722888.1127262 (Exim 4.92) (envelope-from ) id 1s7WO6-00048F-H1; Thu, 16 May 2024 08:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722888.1127262; Thu, 16 May 2024 08: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 1s7WO6-000488-EL; Thu, 16 May 2024 08:22:54 +0000 Received: by outflank-mailman (input) for mailman id 722888; Thu, 16 May 2024 08:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WO4-00047o-Ja for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WO4-00078K-Io for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WO4-0008SE-Ho for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08: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=xBykp8tKSaJGxVY/D92zhXDbTkFDAzhz6tD3OZkvSqc=; b=ULlAr57jxbPWIsFlYwnVc7/rCZ KtjFgtMllFHFNqWn1j1zvPZwbAB4UhcKVsuRiVfRxrtQopv03r633QGDnIPJY+k7pU423q7W+EiNK w09Pu0ePWZdEe3ux474L65vABcq3SGoqKg7RAfjWE3NV9wC1vsgoEjjSK4M8HEPuL/tU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/light: Add vlan field to libxl_device_nic Message-Id: Date: Thu, 16 May 2024 08:22:52 +0000 commit 3bc14e4fa4b9832888710759a7dbe5f0d239f33b Author: Leigh Brown AuthorDate: Wed May 8 22:38:20 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 tools/libs/light: Add vlan field to libxl_device_nic Add `vlan' string field to libxl_device_nic, to allow a VLAN configuration to be specified for the VIF when adding it to the bridge device. Update libxl_nic.c to read and write the vlan field from the xenstore. This provides the capability for supported operating systems (e.g. Linux) to perform VLAN filtering on bridge ports. The Xen hotplug scripts need to be updated to read this information from the xenstore and perform the required configuration. Signed-off-by: Leigh Brown Reviewed-by: Jason Andryuk --- tools/libs/light/libxl_nic.c | 10 ++++++++++ tools/libs/light/libxl_types.idl | 1 + 2 files changed, 11 insertions(+) diff --git a/tools/libs/light/libxl_nic.c b/tools/libs/light/libxl_nic.c index d6bf06fc34..d861e3726d 100644 --- a/tools/libs/light/libxl_nic.c +++ b/tools/libs/light/libxl_nic.c @@ -233,6 +233,11 @@ static int libxl__set_xenstore_nic(libxl__gc *gc, uint32_t domid, flexarray_append(back, GCSPRINTF("%u", nic->mtu)); } + if (nic->vlan) { + flexarray_append(back, "vlan"); + flexarray_append(back, libxl__strdup(gc, nic->vlan)); + } + flexarray_append(back, "bridge"); flexarray_append(back, libxl__strdup(gc, nic->bridge)); flexarray_append(back, "handle"); @@ -313,6 +318,11 @@ static int libxl__nic_from_xenstore(libxl__gc *gc, const char *libxl_path, nic->mtu = LIBXL_DEVICE_NIC_MTU_DEFAULT; } + rc = libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/vlan", libxl_path), + (const char **)(&nic->vlan)); + if (rc) goto out; + rc = libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/mac", libxl_path), &tmp); if (rc) goto out; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 470122e768..79e9c656cc 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -817,6 +817,7 @@ libxl_device_nic = Struct("device_nic", [ ("backend_domname", string), ("devid", libxl_devid), ("mtu", integer), + ("vlan", string), ("model", string), ("mac", libxl_mac), ("ip", string), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:23:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722889.1127265 (Exim 4.92) (envelope-from ) id 1s7WOG-0004As-Ie; Thu, 16 May 2024 08:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722889.1127265; Thu, 16 May 2024 08: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 1s7WOG-0004An-G6; Thu, 16 May 2024 08:23:04 +0000 Received: by outflank-mailman (input) for mailman id 722889; Thu, 16 May 2024 08:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOE-0004AY-Mc for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOE-00078l-Lt for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WOE-0008Sz-L4 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08: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=ZJOrG8H1dFCyqlOzWU9bRDA6xs/9aqaqqbIHjkmZZzU=; b=Oic73NDrRTJumw4/eX/daVlFCB 5qNiEOhy5hkOC6Zrw9GTRJjFDBEumL0YU5/S5dWPwkUX62KssYm3PrjBGtzpUKxWuYgf2GKvdMurw nEtCnn1Lq1Trh4uXkcJWkfb/t9MQ9OyCCiSjaAhHi5/ooYKj8SC+1yZN6xEpxZuXJGI0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: add vlan keyword to vif option Message-Id: Date: Thu, 16 May 2024 08:23:02 +0000 commit 0cc01c603f4287233715a526b056bc20e0e97412 Author: Leigh Brown AuthorDate: Wed May 8 22:38:21 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 tools/xl: add vlan keyword to vif option Update parse_nic_config() to support a new `vlan' keyword. This keyword specifies the VLAN configuration to assign to the VIF when attaching it to the bridge port, on operating systems that support the capability (e.g. Linux). The vlan keyword will allow one or more VLANs to be configured on the VIF when adding it to the bridge port. This will be done by the vif-bridge script and functions. Signed-off-by: Leigh Brown Reviewed-by: Jason Andryuk --- docs/man/xl-network-configuration.5.pod.in | 38 ++++++++++++++++++++++++++++++ tools/xl/xl_parse.c | 2 ++ 2 files changed, 40 insertions(+) diff --git a/docs/man/xl-network-configuration.5.pod.in b/docs/man/xl-network-configuration.5.pod.in index f3e379bcf8..324ee9bbf8 100644 --- a/docs/man/xl-network-configuration.5.pod.in +++ b/docs/man/xl-network-configuration.5.pod.in @@ -259,6 +259,44 @@ Specifies the MTU (i.e. the maximum size of an IP payload, exclusing headers). T default value is 1500 but, if the VIF is attached to a bridge, it will be set to match unless overridden by this parameter. +=head2 vlan + +Specifies the VLAN configuration. The format of this parameter is one or more +VLAN IDs or ranges separated by forward slashes. Each term can be: + +=over + +=item * + +B - a single VLAN ID in the range 1 to 4094. This can optionally followed +by a B

to indicate the PVID or by a B to indicate an untagged VLAN. C

+implies B. + +=item * + +B-B - a range of VLAN IDs from B to B, both between +1 and 4094 and B being less than or equal to B. This can be +optionally followed by a B to indicate that the range of VLANs are untagged. + +=item * + +B+BxB - describing a range of VLAN IDs starting at B +with B additional entries, each incremented by B. This can be +optionally followed by a B to indicate that the range of VLANs are untagged. + +=back + +Note, one VLAN ID must be marked as the PVID. In the case of a vlan +specification consisting of a single VLAN ID (e.g. C), the B

suffix +may be omitted. Specifying more than one untagged VLAN ID is an advanced +configuration - use with caution. + +For example: + + 'vlan=10' -- meaning a single VLAN that is the PVID. + 'vlan=10p/20' -- VLAN 10 is the PVID and VLAN 20 is tagged. + 'vlan=10p/100+10x4' -- VLANs 10, 100, 110, 120, 130, 140, 150. + =head2 trusted / untrusted An advisory setting for the frontend driver on whether the backend should be diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index ab09d0288b..c504ab3711 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -565,6 +565,8 @@ int parse_nic_config(libxl_device_nic *nic, XLU_Config **config, char *token) nic->devid = parse_ulong(oparg); } else if (MATCH_OPTION("mtu", token, oparg)) { nic->mtu = parse_ulong(oparg); + } else if (MATCH_OPTION("vlan", token, oparg)) { + replace_string(&nic->vlan, oparg); } else if (!strcmp("trusted", token)) { libxl_defbool_set(&nic->trusted, true); } else if (!strcmp("untrusted", token)) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:23:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722890.1127269 (Exim 4.92) (envelope-from ) id 1s7WOP-0004Dg-KE; Thu, 16 May 2024 08:23:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722890.1127269; Thu, 16 May 2024 08:23:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOP-0004DY-HZ; Thu, 16 May 2024 08:23:13 +0000 Received: by outflank-mailman (input) for mailman id 722890; Thu, 16 May 2024 08:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOO-0004DP-PP for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOO-00078s-Oi for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WOO-0008Ts-Nv for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08: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=p6rr56T7juBKqbDjRe8a4LoOdx/+sDBgKMt1Z7GZLVo=; b=XUTydy9hAITowuPamfn5mgZJgY SmB1yyotx9lnQPXpJluxDcSIIneyzLOHrneJQwscx58PoMq0El8AwYGOs00EaUWG6+axkNyzfl7aI NzNw2t3QGGic0EKwQNbnA+1NyGiBPYcRaYD5IZ105woiTQMns/MCQyMQSgLajp5UKcYY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mtrr: avoid system wide rendezvous when setting AP MTRRs Message-Id: Date: Thu, 16 May 2024 08:23:12 +0000 commit abd00b037da5ffa4e8c4508a5df0cd6eabb805a4 Author: Roger Pau Monne AuthorDate: Mon May 13 10:59:25 2024 +0200 Commit: Andrew Cooper CommitDate: Wed May 15 19:59:52 2024 +0100 x86/mtrr: avoid system wide rendezvous when setting AP MTRRs There's no point in forcing a system wide update of the MTRRs on all processors when there are no changes to be propagated. On AP startup it's only the AP that needs to write the system wide MTRR values in order to match the rest of the already online CPUs. We have occasionally seen the watchdog trigger during `xen-hptool cpu-online` in one Intel Cascade Lake box with 448 CPUs due to the re-setting of the MTRRs on all the CPUs in the system. While there adjust the comment to clarify why the system-wide resetting of the MTRR registers is not needed for the purposes of mtrr_ap_init(). Signed-off-by: Roger Pau Monné Release-acked-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/x86/cpu/mtrr/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index 90b235f57e..0a44ebbcb0 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -573,14 +573,15 @@ void mtrr_ap_init(void) if (!mtrr_if || hold_mtrr_updates_on_aps) return; /* - * Ideally we should hold mtrr_mutex here to avoid mtrr entries changed, - * but this routine will be called in cpu boot time, holding the lock - * breaks it. This routine is called in two cases: 1.very earily time - * of software resume, when there absolutely isn't mtrr entry changes; - * 2.cpu hotadd time. We let mtrr_add/del_page hold cpuhotplug lock to - * prevent mtrr entry changes + * hold_mtrr_updates_on_aps takes care of preventing unnecessary MTRR + * updates when batch starting the CPUs (see + * mtrr_aps_sync_{begin,end}()). + * + * Otherwise just apply the current system wide MTRR values to this AP. + * Note this doesn't require synchronization with the other CPUs, as + * there are strictly no modifications of the current MTRR values. */ - set_mtrr(~0U, 0, 0, 0); + mtrr_set_all(); } /** -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:23:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:23:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722891.1127275 (Exim 4.92) (envelope-from ) id 1s7WOb-0004Gf-MM; Thu, 16 May 2024 08:23:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722891.1127275; Thu, 16 May 2024 08:23:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOb-0004GW-JG; Thu, 16 May 2024 08:23:25 +0000 Received: by outflank-mailman (input) for mailman id 722891; Thu, 16 May 2024 08:23:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOa-0004GQ-TK for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOa-00079J-SY for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WOa-0000CS-Rt for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bnwIuyJPa5WvWFf05rjvL0bP9l4UsvrsYSplRI+N+3g=; b=JVR8QzB2nk0IEtCAR3JJ1M/0T/ iClJloxo7lh5LvNh0Gt6ef1c/tfGZShpFY4Lh0FFkXCxVVR7mIv5IC+VUegWgZJ//Iz70qFAnT4yj WmrBjed73B07m+WN8nC70ADMq5LH7K+Az2mXyYhGTbBnXzf5Q5FEPSaBz44tLQ5sgBAw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: allow to suppress port-alias probing Message-Id: Date: Thu, 16 May 2024 08:23:24 +0000 commit c09960a1a28ef7ef65d7b090646b605f62fccb77 Author: Jan Beulich AuthorDate: Thu May 16 10:02:34 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 10:02:34 2024 +0200 x86: allow to suppress port-alias probing By default there's already no use for this when we run in shim mode. Plus there may also be a need to suppress the probing in case of issues with it. Before introducing further port alias probing, introduce a command line option allowing to bypass it, default it to on when in shim mode, and gate RTC/CMOS port alias probing on it. Requested-by: Roger Pau Monné Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- docs/misc/xen-command-line.pandoc | 11 +++++++++++ xen/arch/x86/include/asm/setup.h | 1 + xen/arch/x86/setup.c | 6 ++++++ xen/arch/x86/time.c | 3 ++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index e760f3266e..1dea7431fa 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2004,6 +2004,17 @@ INVPCID is supported and not disabled via `invpcid=false`. This is a mask of C-states which are to be used preferably. This option is applicable only on hardware were certain C-states are exclusive of one another. +### probe-port-aliases (x86) +> `= ` + +> Default: `true` outside of shim mode, `false` in shim mode + +Certain devices accessible by I/O ports may be accessible also through "alias" +ports (originally a result of incomplete address decoding). When such devices +are solely under Xen's control, Xen disallows even Dom0 access to the "primary" +ports. When alias probing is active and aliases are detected, "alias" ports +would then be treated similar to the "primary" ones. + ### psr (Intel) > `= List of ( cmt: | rmid_max: | cat: | cos_max: | cdp: )` diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index 1849e60cd6..e48b9d01e9 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -49,6 +49,7 @@ extern unsigned long highmem_start; #endif extern int8_t opt_smt; +extern int8_t opt_probe_port_aliases; #ifdef CONFIG_SHADOW_PAGING extern bool opt_dom0_shadow; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f84e1cd79c..b50c9c84af 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -76,6 +76,9 @@ static bool __initdata opt_invpcid = true; boolean_param("invpcid", opt_invpcid); bool __read_mostly use_invpcid; +int8_t __initdata opt_probe_port_aliases = -1; +boolean_param("probe-port-aliases", opt_probe_port_aliases); + /* Only used in asm code and within this source file */ unsigned long asmlinkage __read_mostly cr4_pv32_mask; @@ -1860,6 +1863,9 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) /* Low mappings were only needed for some BIOS table parsing. */ zap_low_mappings(); + if ( opt_probe_port_aliases < 0 ) + opt_probe_port_aliases = !pv_shim; + init_apic_mappings(); normalise_cpu_order(); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 78ea095e3e..9655971269 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1252,7 +1252,8 @@ static int __init cf_check probe_cmos_alias(void) { unsigned int offs; - if ( acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC ) + if ( (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) || + !opt_probe_port_aliases ) return 0; for ( offs = 2; offs < 8; offs <<= 1 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:23:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:23:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722892.1127277 (Exim 4.92) (envelope-from ) id 1s7WOl-0004JK-NK; Thu, 16 May 2024 08:23:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722892.1127277; Thu, 16 May 2024 08:23: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 1s7WOl-0004JD-Kd; Thu, 16 May 2024 08:23:35 +0000 Received: by outflank-mailman (input) for mailman id 722892; Thu, 16 May 2024 08:23:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOl-0004J3-0C for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOk-00079U-VM for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WOk-0000DO-Ua for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hbz4jM8BbO3IWEni5NxmSoY5nnu8vYfm5Db16IYGxQ4=; b=d1p0guzCfIClVUrJSPxGeHCPW8 oR0Of2JcuhUWYaRdUYEo9T1lApO/LeJ8ZEQbyZykLUwwZe6XbPk24iLiJgRZRHdd3p45D3HwtWvu2 SAMrPnZPUJ0eNhiHAP8YLLNhuLf7+rw7JMrKcJThHPlR+13zavBPWFYgX4+Ftnv2roX4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: detect PIC aliasing on ports other than 0x[2A][01] Message-Id: Date: Thu, 16 May 2024 08:23:34 +0000 commit d0c611405890a81dcb62439eb82a1da7873d747f Author: Jan Beulich AuthorDate: Thu May 16 10:03:16 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 10:03:16 2024 +0200 x86: detect PIC aliasing on ports other than 0x[2A][01] ... in order to also deny Dom0 access through the alias ports (commonly observed on Intel chipsets). Without this it is only giving the impression of denying access to both PICs. Unlike for CMOS/RTC, do detection very early, to avoid disturbing normal operation later on. Like for CMOS/RTC a fundamental assumption of the probing is that reads from the probed alias port won't have side effects in case it does not alias the respective PIC's one. Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/dom0_build.c | 16 ++++++++---- xen/arch/x86/i8259.c | 55 ++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/setup.h | 2 ++ 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 0276924ba2..4288957b2b 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -467,7 +467,7 @@ static void __init process_dom0_ioports_disable(struct domain *dom0) int __init dom0_setup_permissions(struct domain *d) { unsigned long mfn; - unsigned int i; + unsigned int i, offs; int rc; if ( pv_shim ) @@ -480,10 +480,16 @@ int __init dom0_setup_permissions(struct domain *d) /* Modify I/O port access permissions. */ - /* Master Interrupt Controller (PIC). */ - rc |= ioports_deny_access(d, 0x20, 0x21); - /* Slave Interrupt Controller (PIC). */ - rc |= ioports_deny_access(d, 0xA0, 0xA1); + for ( offs = 0, i = ISOLATE_LSB(i8259A_alias_mask) ?: 2; + offs <= i8259A_alias_mask; offs += i ) + { + if ( offs & ~i8259A_alias_mask ) + continue; + /* Master Interrupt Controller (PIC). */ + rc |= ioports_deny_access(d, 0x20 + offs, 0x21 + offs); + /* Slave Interrupt Controller (PIC). */ + rc |= ioports_deny_access(d, 0xA0 + offs, 0xA1 + offs); + } /* ELCR of both PICs. */ rc |= ioports_deny_access(d, 0x4D0, 0x4D1); diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index e0fa1f96b4..10ddd2b0fb 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -333,6 +334,58 @@ void __init make_8259A_irq(unsigned int irq) irq_to_desc(irq)->handler = &i8259A_irq_type; } +unsigned int __initdata i8259A_alias_mask; + +static void __init probe_8259A_alias(void) +{ + unsigned int mask = 0x1e; + uint8_t val = 0; + + if ( !opt_probe_port_aliases ) + return; + + /* + * The only properly r/w register is OCW1. While keeping the master + * fully masked (thus also masking anything coming through the slave), + * write all possible 256 values to the slave's base port, and check + * whether the same value can then be read back through any of the + * possible alias ports. Probing just the slave of course builds on the + * assumption that aliasing is identical for master and slave. + */ + + outb(0xff, 0x21); /* Fully mask master. */ + + do { + unsigned int offs; + + outb(val, 0xa1); + + /* Try to make sure we're actually having a PIC here. */ + if ( inb(0xa1) != val ) + { + mask = 0; + break; + } + + for ( offs = ISOLATE_LSB(mask); offs <= mask; offs <<= 1 ) + { + if ( !(mask & offs) ) + continue; + if ( inb(0xa1 + offs) != val ) + mask &= ~offs; + } + } while ( mask && (val += 0x0d) ); /* Arbitrary uneven number. */ + + outb(cached_A1, 0xa1); /* Restore slave IRQ mask. */ + outb(cached_21, 0x21); /* Restore master IRQ mask. */ + + if ( mask ) + { + dprintk(XENLOG_INFO, "PIC aliasing mask: %02x\n", mask); + i8259A_alias_mask = mask; + } +} + static struct irqaction __read_mostly cascade = { no_action, "cascade", NULL}; void __init init_IRQ(void) @@ -343,6 +396,8 @@ void __init init_IRQ(void) init_8259A(0); + probe_8259A_alias(); + for (irq = 0; platform_legacy_irq(irq); irq++) { struct irq_desc *desc = irq_to_desc(irq); diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index e48b9d01e9..471aed92c2 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -48,6 +48,8 @@ extern uint8_t kbd_shift_flags; extern unsigned long highmem_start; #endif +extern unsigned int i8259A_alias_mask; + extern int8_t opt_smt; extern int8_t opt_probe_port_aliases; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 08:23:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 08:23:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.722893.1127282 (Exim 4.92) (envelope-from ) id 1s7WOv-0004MV-QC; Thu, 16 May 2024 08:23:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 722893.1127282; Thu, 16 May 2024 08:23:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOv-0004MN-NU; Thu, 16 May 2024 08:23:45 +0000 Received: by outflank-mailman (input) for mailman id 722893; Thu, 16 May 2024 08:23:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOv-0004MD-2r for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7WOv-00079e-25 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7WOv-0000Dq-1N for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 08:23:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ivh/uB0Gs+Mn0yFiLQ+1udwylm7NY9Y9cflL5gYo/NY=; b=Nr4+eYTen6ZzXF+ey0IzrF5+Qy Rz/aPxpRBONojr33/sgaNFt9bjNomvMqarcaHWzWtRjKISHcU5q0oUJeRMINYolsz/k3U2f6r9Ngs A864cOd4hDMIJEdTifNhH0KhsVjLgp08HYRymPr4TWixy8qibIYfu2KftHacbzx+tMS8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: put __ffs() into linux compatible header Message-Id: Date: Thu, 16 May 2024 08:23:45 +0000 commit 6628bacc81f35b41bca18948fe9f405da441906f Author: Oleksii Kurochko AuthorDate: Thu May 16 10:08:37 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 10:08:37 2024 +0200 xen/bitops: put __ffs() into linux compatible header The mentioned macros exist only because of Linux compatible purpose. The patch defines __ffs() in terms of Xen bitops and it is safe to define in this way ( as __ffs() - 1 ) as considering that __ffs() was defined as __builtin_ctzl(x), which has undefined behavior when x=0, so it is assumed that such cases are not encountered in the current code. To not include to Xen library files __ffs() and __ffz() were defined locally in find-next-bit.c. Except __ffs() usage in find-next-bit.c only one usage of __ffs() leave in smmu-v3.c. It seems that it __ffs can be changed to ffsl(x)-1 in this file, but to keep smmu-v3.c looks close to linux it was deciced just to define __ffs() in xen/linux-compat.h and include it in smmu-v3.c Signed-off-by: Oleksii Kurochko Acked-by: Shawn Anastasio Reviewed-by: Jan Beulich Acked-by: Michal Orzel Acked-by: Rahul Singh --- xen/arch/arm/include/asm/arm64/bitops.h | 21 --------------------- xen/arch/ppc/include/asm/bitops.h | 21 --------------------- xen/drivers/passthrough/arm/smmu-v3.c | 2 ++ xen/include/xen/linux-compat.h | 2 ++ xen/lib/find-next-bit.c | 3 +++ 5 files changed, 7 insertions(+), 42 deletions(-) diff --git a/xen/arch/arm/include/asm/arm64/bitops.h b/xen/arch/arm/include/asm/arm64/bitops.h index 0efde29068..906d84e5f2 100644 --- a/xen/arch/arm/include/asm/arm64/bitops.h +++ b/xen/arch/arm/include/asm/arm64/bitops.h @@ -1,27 +1,6 @@ #ifndef _ARM_ARM64_BITOPS_H #define _ARM_ARM64_BITOPS_H -/* 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); -} - -/* 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)) - static inline int flsl(unsigned long x) { uint64_t ret; diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index 5820b9ce7b..bea655796d 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -176,15 +176,6 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #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 @@ -196,18 +187,6 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #define hweight16(x) __builtin_popcount((uint16_t)(x)) #define hweight8(x) __builtin_popcount((uint8_t)(x)) -/* 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 diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index b1c40c2c0a..6904962467 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -72,12 +72,14 @@ */ #include +#include #include #include #include #include #include #include +#include #include #include #include diff --git a/xen/include/xen/linux-compat.h b/xen/include/xen/linux-compat.h index 62ba71485c..b289dfd894 100644 --- a/xen/include/xen/linux-compat.h +++ b/xen/include/xen/linux-compat.h @@ -19,4 +19,6 @@ typedef int64_t __s64; typedef paddr_t phys_addr_t; +#define __ffs(x) (ffsl(x) - 1UL) + #endif /* __XEN_LINUX_COMPAT_H__ */ diff --git a/xen/lib/find-next-bit.c b/xen/lib/find-next-bit.c index ca6f82277e..761b027398 100644 --- a/xen/lib/find-next-bit.c +++ b/xen/lib/find-next-bit.c @@ -12,6 +12,9 @@ #include +#define __ffs(x) (ffsl(x) - 1) +#define ffz(x) __ffs(~(x)) + #ifndef find_next_bit /* * Find the next set bit in a memory region. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 11:44:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 11:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723219.1127867 (Exim 4.92) (envelope-from ) id 1s7ZWm-0000ZH-RC; Thu, 16 May 2024 11:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723219.1127867; Thu, 16 May 2024 11:44:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZWm-0000Z9-Oc; Thu, 16 May 2024 11:44:04 +0000 Received: by outflank-mailman (input) for mailman id 723219; Thu, 16 May 2024 11:44:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZWl-0000Z3-Iy for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZWl-0002Lu-Fa for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7ZWl-0003RL-E8 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YEDycSSMeHfg8Ox7v3Es/6hO13pNlgaVk7Yrr4yqHB4=; b=5dwUoz1ikOLVtdvoHyqS519Thp 3u2GCUHz+BsW2bx7Q+RgBUzuIPUuTF/fWDrFIL0quav09eE4SvHzVSbYP42atAan2GpD2d2lrDIuz gWHH7gClvB8Hs9krk3j+OUNsBigI2bHbzt5OrhupFFCBAQ50aMjBI43Uc7oS1pvIHhBk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vpmu: separate amd/intel vPMU code Message-Id: Date: Thu, 16 May 2024 11:44:03 +0000 commit a3ec23a940d4df47045408ba682cdc4bf5e902c8 Author: Sergiy Kibrik AuthorDate: Thu May 16 13:34:54 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 13:34:54 2024 +0200 x86/vpmu: separate amd/intel vPMU code Build AMD vPMU when CONFIG_AMD is on, and Intel vPMU when CONFIG_INTEL is on respectively, allowing for a plaftorm-specific build. No functional change intended. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/Makefile | 4 +++- xen/arch/x86/cpu/vpmu.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/Makefile b/xen/arch/x86/cpu/Makefile index 35561fe51d..eafce5f204 100644 --- a/xen/arch/x86/cpu/Makefile +++ b/xen/arch/x86/cpu/Makefile @@ -10,4 +10,6 @@ obj-y += intel.o obj-y += intel_cacheinfo.o obj-y += mwait-idle.o obj-y += shanghai.o -obj-y += vpmu.o vpmu_amd.o vpmu_intel.o +obj-y += vpmu.o +obj-$(CONFIG_AMD) += vpmu_amd.o +obj-$(CONFIG_INTEL) += vpmu_intel.o diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index b2e9881e06..a7bc0cd1fc 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -827,6 +827,7 @@ static int __init cf_check vpmu_init(void) switch ( vendor ) { +#ifdef CONFIG_AMD case X86_VENDOR_AMD: ops = amd_vpmu_init(); break; @@ -834,10 +835,13 @@ static int __init cf_check vpmu_init(void) case X86_VENDOR_HYGON: ops = hygon_vpmu_init(); break; +#endif +#ifdef CONFIG_INTEL case X86_VENDOR_INTEL: ops = core2_vpmu_init(); break; +#endif default: printk(XENLOG_WARNING "VPMU: Unknown CPU vendor: %d. " -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 11:44:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 11:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723220.1127871 (Exim 4.92) (envelope-from ) id 1s7ZWw-0000eU-SV; Thu, 16 May 2024 11:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723220.1127871; Thu, 16 May 2024 11: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 1s7ZWw-0000eM-Py; Thu, 16 May 2024 11:44:14 +0000 Received: by outflank-mailman (input) for mailman id 723220; Thu, 16 May 2024 11:44:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZWv-0000e6-Jx for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZWv-0002M2-Im for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7ZWv-0003Ru-Hi for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EflxhDbhVx+qEuzv316/mre+I+sqI4tLIAR2Gk4a3dQ=; b=uyJiDXsFCz1OvyTZGTPnnX8wrF 33S7ATWos6gxrE01uak11mbKHLRwH7kR8zDZnHT8yQXK2p/nh701j2QmCs5mXiRn9oVPHiW3WOffl FPQgJRAzJeSVJKTMTyQAcOaLAes/wNPLYJy9P7rP3LcT3dRfW3fz9YtrKnzkfwYy8gjQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/MCE: guard access to Intel/AMD-specific MCA MSRs Message-Id: Date: Thu, 16 May 2024 11:44:13 +0000 commit 71b5eccbddb4cb94e816ed8e911f3aa00f866e5b Author: Sergiy Kibrik AuthorDate: Thu May 16 13:35:34 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 13:35:34 2024 +0200 x86/MCE: guard access to Intel/AMD-specific MCA MSRs Add build-time checks for newly introduced INTEL/AMD config options when calling vmce_{intel/amd}_{rdmsr/wrmsr}() routines. This way a platform-specific code can be omitted in vmce code, if this platform is disabled in config. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/vmce.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index 353d4f19b2..4da6f4a3e4 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -138,16 +138,20 @@ static int bank_mce_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) default: switch ( boot_cpu_data.x86_vendor ) { +#ifdef CONFIG_INTEL case X86_VENDOR_CENTAUR: case X86_VENDOR_SHANGHAI: case X86_VENDOR_INTEL: ret = vmce_intel_rdmsr(v, msr, val); break; +#endif +#ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: ret = vmce_amd_rdmsr(v, msr, val); break; +#endif default: ret = 0; @@ -271,14 +275,18 @@ static int bank_mce_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) default: switch ( boot_cpu_data.x86_vendor ) { +#ifdef CONFIG_INTEL case X86_VENDOR_INTEL: ret = vmce_intel_wrmsr(v, msr, val); break; +#endif +#ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: ret = vmce_amd_wrmsr(v, msr, val); break; +#endif default: ret = 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 11:44:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 11:44:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723221.1127874 (Exim 4.92) (envelope-from ) id 1s7ZX7-0000lU-Tu; Thu, 16 May 2024 11:44:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723221.1127874; Thu, 16 May 2024 11:44:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZX7-0000lL-RP; Thu, 16 May 2024 11:44:25 +0000 Received: by outflank-mailman (input) for mailman id 723221; Thu, 16 May 2024 11:44:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZX5-0000l1-Mo for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZX5-0002MY-Lv for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7ZX5-0003Sb-Kv for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GCAoUG0vKwbS0SfpE7Ktosj/01bSgbf4mvlOaFrLtac=; b=h7w9K1qm47tfdi5MiKSABUgIyu zDuYp8jUjke0iq4MxV4f56FeaQGw2LTQOzDW60wFgh5SDDW+uYBkIlP+xhzYrEmNrtjjjO/O9dI7V bWfhzNZMIN2ItN84pIhuFLUHNEGku+8aU3Q7Gu4MLN94iIoBVI4hNh2rUOPx0rpuavZk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/MCE: guard {intel/amd}_mcheck_init() calls Message-Id: Date: Thu, 16 May 2024 11:44:23 +0000 commit f1fa994d890295b2c2535483a54b4bd03ae31f34 Author: Sergiy Kibrik AuthorDate: Thu May 16 13:35:54 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 13:35:54 2024 +0200 x86/MCE: guard {intel/amd}_mcheck_init() calls Guard calls to CPU-specific mcheck init routines in common MCE code using new INTEL/AMD config options. The purpose is not to build platform-specific mcheck code and calls to it, if this platform is disabled in config. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index d179e6b068..fb9dec5b89 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -760,11 +760,14 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp) switch ( c->x86_vendor ) { +#ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: inited = amd_mcheck_init(c, bsp); break; +#endif +#ifdef CONFIG_INTEL case X86_VENDOR_INTEL: switch ( c->x86 ) { @@ -774,6 +777,7 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp) break; } break; +#endif default: break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 11:44:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 11:44:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723222.1127879 (Exim 4.92) (envelope-from ) id 1s7ZXH-0000rE-Vk; Thu, 16 May 2024 11:44:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723222.1127879; Thu, 16 May 2024 11:44:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZXH-0000r7-Sw; Thu, 16 May 2024 11:44:35 +0000 Received: by outflank-mailman (input) for mailman id 723222; Thu, 16 May 2024 11:44:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZXF-0000qq-Qi for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7ZXF-0002Mf-P3 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7ZXF-0003Uo-O6 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 11:44:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oU/Hs4UhuPsuagWk6F2rfx+0+Mpmvui3isW2JXKToNI=; b=M4QSWHq8Wf+uCQb5i1VQDAQGzI x0j62uSBMoszsn3y7pTTN7VHJelw1nEWJ1zxfxHUwRuOqQAj++U02pXlb0/TJIKSuj05VWYopv4AL 9j9XfO+Jq8Tvr/DYHs73FLRtkkWua4eSYTnVsOgRIql5GUuYOtB1DzNZWqJotTtS8kWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/p2m: move altp2m-related code to separate file Message-Id: Date: Thu, 16 May 2024 11:44:33 +0000 commit ae7584f63678cd9adc1c2f3a1e813b67a6b24544 Author: Sergiy Kibrik AuthorDate: Thu May 16 13:36:22 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 13:36:22 2024 +0200 x86/p2m: move altp2m-related code to separate file Move altp2m code from generic p2m.c file to altp2m.c, so it is kept separately and can possibly be disabled in the build. We may want to disable it when building for specific platform only, that doesn't support alternate p2m. No functional change intended. Signed-off-by: Sergiy Kibrik Acked-by: Jan Beulich --- xen/arch/x86/mm/altp2m.c | 630 ++++++++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm/p2m.c | 632 +---------------------------------------------- xen/arch/x86/mm/p2m.h | 3 + 3 files changed, 635 insertions(+), 630 deletions(-) diff --git a/xen/arch/x86/mm/altp2m.c b/xen/arch/x86/mm/altp2m.c index a04297b646..6fe1e9ed6b 100644 --- a/xen/arch/x86/mm/altp2m.c +++ b/xen/arch/x86/mm/altp2m.c @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include "mm-locks.h" #include "p2m.h" @@ -151,6 +153,634 @@ void p2m_teardown_altp2m(struct domain *d) } } +int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn, + p2m_type_t *t, p2m_access_t *a, + bool prepopulate) +{ + *mfn = ap2m->get_entry(ap2m, gfn, t, a, 0, NULL, NULL); + + /* Check host p2m if no valid entry in alternate */ + if ( !mfn_valid(*mfn) && !p2m_is_hostp2m(ap2m) ) + { + struct p2m_domain *hp2m = p2m_get_hostp2m(ap2m->domain); + unsigned int page_order; + int rc; + + *mfn = p2m_get_gfn_type_access(hp2m, gfn, t, a, P2M_ALLOC | P2M_UNSHARE, + &page_order, 0); + + rc = -ESRCH; + if ( !mfn_valid(*mfn) || *t != p2m_ram_rw ) + return rc; + + /* If this is a superpage, copy that first */ + if ( prepopulate && page_order != PAGE_ORDER_4K ) + { + unsigned long mask = ~((1UL << page_order) - 1); + gfn_t gfn_aligned = _gfn(gfn_x(gfn) & mask); + mfn_t mfn_aligned = _mfn(mfn_x(*mfn) & mask); + + rc = ap2m->set_entry(ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a, 1); + if ( rc ) + return rc; + } + } + + return 0; +} + +void p2m_altp2m_check(struct vcpu *v, uint16_t idx) +{ + if ( altp2m_active(v->domain) ) + p2m_switch_vcpu_altp2m_by_id(v, idx); +} + +bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx) +{ + struct domain *d = v->domain; + bool rc = false; + + if ( idx >= MAX_ALTP2M ) + return rc; + + altp2m_list_lock(d); + + if ( d->arch.altp2m_eptp[idx] != mfn_x(INVALID_MFN) ) + { + if ( p2m_set_altp2m(v, idx) ) + altp2m_vcpu_update_p2m(v); + rc = 1; + } + + altp2m_list_unlock(d); + return rc; +} + +/* + * Read info about the gfn in an altp2m, locking the gfn. + * + * If the entry is valid, pass the results back to the caller. + * + * If the entry was invalid, and the host's entry is also invalid, + * return to the caller without any changes. + * + * If the entry is invalid, and the host entry was valid, propagate + * the host's entry to the altp2m (retaining page order), and indicate + * that the caller should re-try the faulting instruction. + */ +bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, + mfn_t *mfn, p2m_type_t *p2mt, + p2m_access_t *p2ma, unsigned int *page_order) +{ + p2m_type_t ap2mt; + p2m_access_t ap2ma; + unsigned int cur_order; + unsigned long mask; + gfn_t gfn; + mfn_t amfn; + int rc; + + /* + * NB we must get the full lock on the altp2m here, in addition to + * the lock on the individual gfn, since we may change a range of + * gfns below. + */ + p2m_lock(ap2m); + + amfn = get_gfn_type_access(ap2m, gfn_l, &ap2mt, &ap2ma, 0, &cur_order); + + if ( cur_order > *page_order ) + cur_order = *page_order; + + if ( !mfn_eq(amfn, INVALID_MFN) ) + { + p2m_unlock(ap2m); + *mfn = amfn; + *p2mt = ap2mt; + *p2ma = ap2ma; + *page_order = cur_order; + return false; + } + + /* Host entry is also invalid; don't bother setting the altp2m entry. */ + if ( mfn_eq(*mfn, INVALID_MFN) ) + { + p2m_unlock(ap2m); + *page_order = cur_order; + return false; + } + + /* + * If this is a superpage mapping, round down both frame numbers + * to the start of the superpage. NB that we repupose `amfn` + * here. + */ + mask = ~((1UL << cur_order) - 1); + amfn = _mfn(mfn_x(*mfn) & mask); + gfn = _gfn(gfn_l & mask); + + /* Override the altp2m entry with its default access. */ + *p2ma = ap2m->default_access; + + rc = p2m_set_entry(ap2m, gfn, amfn, cur_order, *p2mt, *p2ma); + p2m_unlock(ap2m); + + if ( rc ) + { + gprintk(XENLOG_ERR, + "failed to set entry for %"PRI_gfn" -> %"PRI_mfn" altp2m %u, rc %d\n", + gfn_l, mfn_x(amfn), vcpu_altp2m(current).p2midx, rc); + domain_crash(ap2m->domain); + } + + return true; +} + +enum altp2m_reset_type { + ALTP2M_RESET, + ALTP2M_DEACTIVATE +}; + +static void p2m_reset_altp2m(struct domain *d, unsigned int idx, + enum altp2m_reset_type reset_type) +{ + struct p2m_domain *p2m; + + ASSERT(idx < MAX_ALTP2M); + p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + + p2m_lock(p2m); + + p2m_flush_table_locked(p2m); + + if ( reset_type == ALTP2M_DEACTIVATE ) + p2m_free_logdirty(p2m); + + /* Uninit and reinit ept to force TLB shootdown */ + ept_p2m_uninit(p2m); + ept_p2m_init(p2m); + + p2m->min_remapped_gfn = gfn_x(INVALID_GFN); + p2m->max_remapped_gfn = 0; + + p2m_unlock(p2m); +} + +void p2m_flush_altp2m(struct domain *d) +{ + unsigned int i; + + altp2m_list_lock(d); + + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + p2m_reset_altp2m(d, i, ALTP2M_DEACTIVATE); + d->arch.altp2m_eptp[i] = mfn_x(INVALID_MFN); + d->arch.altp2m_visible_eptp[i] = mfn_x(INVALID_MFN); + } + + altp2m_list_unlock(d); +} + +static int p2m_activate_altp2m(struct domain *d, unsigned int idx, + p2m_access_t hvmmem_default_access) +{ + struct p2m_domain *hostp2m, *p2m; + int rc; + + ASSERT(idx < MAX_ALTP2M); + + p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + hostp2m = p2m_get_hostp2m(d); + + p2m_lock(p2m); + + rc = p2m_init_logdirty(p2m); + + if ( rc ) + goto out; + + /* The following is really just a rangeset copy. */ + rc = rangeset_merge(p2m->logdirty_ranges, hostp2m->logdirty_ranges); + + if ( rc ) + { + p2m_free_logdirty(p2m); + goto out; + } + + p2m->default_access = hvmmem_default_access; + p2m->domain = hostp2m->domain; + p2m->global_logdirty = hostp2m->global_logdirty; + p2m->min_remapped_gfn = gfn_x(INVALID_GFN); + p2m->max_mapped_pfn = p2m->max_remapped_gfn = 0; + + p2m_init_altp2m_ept(d, idx); + + out: + p2m_unlock(p2m); + + return rc; +} + +int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx) +{ + int rc = -EINVAL; + struct p2m_domain *hostp2m = p2m_get_hostp2m(d); + + if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + return rc; + + altp2m_list_lock(d); + + if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + rc = p2m_activate_altp2m(d, idx, hostp2m->default_access); + + altp2m_list_unlock(d); + return rc; +} + +int p2m_init_next_altp2m(struct domain *d, uint16_t *idx, + xenmem_access_t hvmmem_default_access) +{ + int rc = -EINVAL; + unsigned int i; + p2m_access_t a; + struct p2m_domain *hostp2m = p2m_get_hostp2m(d); + + if ( hvmmem_default_access > XENMEM_access_default || + !xenmem_access_to_p2m_access(hostp2m, hvmmem_default_access, &a) ) + return rc; + + altp2m_list_lock(d); + + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) + continue; + + rc = p2m_activate_altp2m(d, i, a); + + if ( !rc ) + *idx = i; + + break; + } + + altp2m_list_unlock(d); + return rc; +} + +int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) +{ + struct p2m_domain *p2m; + int rc = -EBUSY; + + if ( !idx || idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + return rc; + + rc = domain_pause_except_self(d); + if ( rc ) + return rc; + + rc = -EBUSY; + altp2m_list_lock(d); + + if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] != + mfn_x(INVALID_MFN) ) + { + p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + + if ( !_atomic_read(p2m->active_vcpus) ) + { + p2m_reset_altp2m(d, idx, ALTP2M_DEACTIVATE); + d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] = + mfn_x(INVALID_MFN); + d->arch.altp2m_visible_eptp[array_index_nospec(idx, MAX_EPTP)] = + mfn_x(INVALID_MFN); + rc = 0; + } + } + + altp2m_list_unlock(d); + + domain_unpause_except_self(d); + + return rc; +} + +int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) +{ + struct vcpu *v; + int rc = -EINVAL; + + if ( idx >= MAX_ALTP2M ) + return rc; + + rc = domain_pause_except_self(d); + if ( rc ) + return rc; + + rc = -EINVAL; + altp2m_list_lock(d); + + if ( d->arch.altp2m_visible_eptp[idx] != mfn_x(INVALID_MFN) ) + { + for_each_vcpu( d, v ) + if ( p2m_set_altp2m(v, idx) ) + altp2m_vcpu_update_p2m(v); + + rc = 0; + } + + altp2m_list_unlock(d); + + domain_unpause_except_self(d); + + return rc; +} + +int p2m_change_altp2m_gfn(struct domain *d, unsigned int idx, + gfn_t old_gfn, gfn_t new_gfn) +{ + struct p2m_domain *hp2m, *ap2m; + p2m_access_t a; + p2m_type_t t; + mfn_t mfn; + int rc = -EINVAL; + + if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || + d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + return rc; + + hp2m = p2m_get_hostp2m(d); + ap2m = array_access_nospec(d->arch.altp2m_p2m, idx); + + p2m_lock(hp2m); + p2m_lock(ap2m); + + if ( gfn_eq(new_gfn, INVALID_GFN) ) + { + mfn = ap2m->get_entry(ap2m, old_gfn, &t, &a, 0, NULL, NULL); + rc = mfn_valid(mfn) + ? p2m_remove_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K) + : 0; + goto out; + } + + rc = altp2m_get_effective_entry(ap2m, old_gfn, &mfn, &t, &a, + AP2MGET_prepopulate); + if ( rc ) + goto out; + + rc = altp2m_get_effective_entry(ap2m, new_gfn, &mfn, &t, &a, + AP2MGET_query); + if ( rc ) + goto out; + + if ( !ap2m->set_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K, t, a, + (current->domain != d)) ) + { + rc = 0; + + if ( gfn_x(new_gfn) < ap2m->min_remapped_gfn ) + ap2m->min_remapped_gfn = gfn_x(new_gfn); + if ( gfn_x(new_gfn) > ap2m->max_remapped_gfn ) + ap2m->max_remapped_gfn = gfn_x(new_gfn); + } + + out: + p2m_unlock(ap2m); + p2m_unlock(hp2m); + return rc; +} + +int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, + mfn_t mfn, unsigned int page_order, + p2m_type_t p2mt, p2m_access_t p2ma) +{ + struct p2m_domain *p2m; + unsigned int i; + unsigned int reset_count = 0; + unsigned int last_reset_idx = ~0; + int ret = 0; + + if ( !altp2m_active(d) ) + return 0; + + altp2m_list_lock(d); + + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + p2m_type_t t; + p2m_access_t a; + + if ( d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) + continue; + + p2m = d->arch.altp2m_p2m[i]; + + /* Check for a dropped page that may impact this altp2m */ + if ( mfn_eq(mfn, INVALID_MFN) && + gfn_x(gfn) + (1UL << page_order) > p2m->min_remapped_gfn && + gfn_x(gfn) <= p2m->max_remapped_gfn ) + { + if ( !reset_count++ ) + { + p2m_reset_altp2m(d, i, ALTP2M_RESET); + last_reset_idx = i; + } + else + { + /* At least 2 altp2m's impacted, so reset everything */ + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + if ( i == last_reset_idx || + d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) + continue; + + p2m_reset_altp2m(d, i, ALTP2M_RESET); + } + + ret = 0; + break; + } + } + else if ( !mfn_eq(get_gfn_type_access(p2m, gfn_x(gfn), &t, &a, 0, + NULL), INVALID_MFN) ) + { + int rc = p2m_set_entry(p2m, gfn, mfn, page_order, p2mt, p2ma); + + /* Best effort: Don't bail on error. */ + if ( !ret ) + ret = rc; + + p2m_put_gfn(p2m, gfn); + } + else + p2m_put_gfn(p2m, gfn); + } + + altp2m_list_unlock(d); + + return ret; +} + +/* + * Set/clear the #VE suppress bit for a page. Only available on VMX. + */ +int p2m_set_suppress_ve(struct domain *d, gfn_t gfn, bool suppress_ve, + unsigned int altp2m_idx) +{ + int rc; + struct xen_hvm_altp2m_suppress_ve_multi sve = { + altp2m_idx, suppress_ve, 0, 0, gfn_x(gfn), gfn_x(gfn), 0 + }; + + if ( !(rc = p2m_set_suppress_ve_multi(d, &sve)) ) + rc = sve.first_error; + + return rc; +} + +/* + * Set/clear the #VE suppress bit for multiple pages. Only available on VMX. + */ +int p2m_set_suppress_ve_multi(struct domain *d, + struct xen_hvm_altp2m_suppress_ve_multi *sve) +{ + struct p2m_domain *host_p2m = p2m_get_hostp2m(d); + struct p2m_domain *ap2m = NULL; + struct p2m_domain *p2m = host_p2m; + uint64_t start = sve->first_gfn; + int rc = 0; + + if ( sve->view > 0 ) + { + if ( sve->view >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || + d->arch.altp2m_eptp[array_index_nospec(sve->view, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + return -EINVAL; + + p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, sve->view); + } + + p2m_lock(host_p2m); + + if ( ap2m ) + p2m_lock(ap2m); + + while ( sve->last_gfn >= start ) + { + p2m_access_t a; + p2m_type_t t; + mfn_t mfn; + int err = 0; + + if ( (err = altp2m_get_effective_entry(p2m, _gfn(start), &mfn, &t, &a, + AP2MGET_query)) && + !sve->first_error ) + { + sve->first_error_gfn = start; /* Save the gfn of the first error */ + sve->first_error = err; /* Save the first error code */ + } + + if ( !err && (err = p2m->set_entry(p2m, _gfn(start), mfn, + PAGE_ORDER_4K, t, a, + sve->suppress_ve)) && + !sve->first_error ) + { + sve->first_error_gfn = start; /* Save the gfn of the first error */ + sve->first_error = err; /* Save the first error code */ + } + + /* Check for continuation if it's not the last iteration. */ + if ( sve->last_gfn >= ++start && hypercall_preempt_check() ) + { + rc = -ERESTART; + break; + } + } + + sve->first_gfn = start; + + if ( ap2m ) + p2m_unlock(ap2m); + + p2m_unlock(host_p2m); + + return rc; +} + +int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve, + unsigned int altp2m_idx) +{ + struct p2m_domain *host_p2m = p2m_get_hostp2m(d); + struct p2m_domain *ap2m = NULL; + struct p2m_domain *p2m; + mfn_t mfn; + p2m_access_t a; + p2m_type_t t; + int rc = 0; + + if ( altp2m_idx > 0 ) + { + if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || + d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + return -EINVAL; + + p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + } + else + p2m = host_p2m; + + gfn_lock(host_p2m, gfn, 0); + + if ( ap2m ) + p2m_lock(ap2m); + + mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL, suppress_ve); + if ( !mfn_valid(mfn) ) + rc = -ESRCH; + + if ( ap2m ) + p2m_unlock(ap2m); + + gfn_unlock(host_p2m, gfn, 0); + + return rc; +} + +int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, + uint8_t visible) +{ + int rc = 0; + + altp2m_list_lock(d); + + /* + * Eptp index is correlated with altp2m index and should not exceed + * min(MAX_ALTP2M, MAX_EPTP). + */ + if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || + d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + rc = -EINVAL; + else if ( visible ) + d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = + d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)]; + else + d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = + mfn_x(INVALID_MFN); + + altp2m_list_unlock(d); + + return rc; +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index ce742c12e0..4a4620e870 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -500,7 +500,7 @@ int p2m_alloc_table(struct p2m_domain *p2m) return 0; } -static int __must_check +int p2m_remove_entry(struct p2m_domain *p2m, gfn_t gfn, mfn_t mfn, unsigned int page_order) { @@ -1329,7 +1329,7 @@ p2m_getlru_nestedp2m(struct domain *d, struct p2m_domain *p2m) return p2m; } -static void +void p2m_flush_table_locked(struct p2m_domain *p2m) { struct page_info *top, *pg; @@ -1729,481 +1729,6 @@ int unmap_mmio_regions(struct domain *d, return i == nr ? 0 : i ?: ret; } -int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn, - p2m_type_t *t, p2m_access_t *a, - bool prepopulate) -{ - *mfn = ap2m->get_entry(ap2m, gfn, t, a, 0, NULL, NULL); - - /* Check host p2m if no valid entry in alternate */ - if ( !mfn_valid(*mfn) && !p2m_is_hostp2m(ap2m) ) - { - struct p2m_domain *hp2m = p2m_get_hostp2m(ap2m->domain); - unsigned int page_order; - int rc; - - *mfn = p2m_get_gfn_type_access(hp2m, gfn, t, a, P2M_ALLOC | P2M_UNSHARE, - &page_order, 0); - - rc = -ESRCH; - if ( !mfn_valid(*mfn) || *t != p2m_ram_rw ) - return rc; - - /* If this is a superpage, copy that first */ - if ( prepopulate && page_order != PAGE_ORDER_4K ) - { - unsigned long mask = ~((1UL << page_order) - 1); - gfn_t gfn_aligned = _gfn(gfn_x(gfn) & mask); - mfn_t mfn_aligned = _mfn(mfn_x(*mfn) & mask); - - rc = ap2m->set_entry(ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a, 1); - if ( rc ) - return rc; - } - } - - return 0; -} - -void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -{ - if ( altp2m_active(v->domain) ) - p2m_switch_vcpu_altp2m_by_id(v, idx); -} - -bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx) -{ - struct domain *d = v->domain; - bool rc = false; - - if ( idx >= MAX_ALTP2M ) - return rc; - - altp2m_list_lock(d); - - if ( d->arch.altp2m_eptp[idx] != mfn_x(INVALID_MFN) ) - { - if ( p2m_set_altp2m(v, idx) ) - altp2m_vcpu_update_p2m(v); - rc = 1; - } - - altp2m_list_unlock(d); - return rc; -} - -/* - * Read info about the gfn in an altp2m, locking the gfn. - * - * If the entry is valid, pass the results back to the caller. - * - * If the entry was invalid, and the host's entry is also invalid, - * return to the caller without any changes. - * - * If the entry is invalid, and the host entry was valid, propagate - * the host's entry to the altp2m (retaining page order), and indicate - * that the caller should re-try the faulting instruction. - */ -bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, - mfn_t *mfn, p2m_type_t *p2mt, - p2m_access_t *p2ma, unsigned int *page_order) -{ - p2m_type_t ap2mt; - p2m_access_t ap2ma; - unsigned int cur_order; - unsigned long mask; - gfn_t gfn; - mfn_t amfn; - int rc; - - /* - * NB we must get the full lock on the altp2m here, in addition to - * the lock on the individual gfn, since we may change a range of - * gfns below. - */ - p2m_lock(ap2m); - - amfn = get_gfn_type_access(ap2m, gfn_l, &ap2mt, &ap2ma, 0, &cur_order); - - if ( cur_order > *page_order ) - cur_order = *page_order; - - if ( !mfn_eq(amfn, INVALID_MFN) ) - { - p2m_unlock(ap2m); - *mfn = amfn; - *p2mt = ap2mt; - *p2ma = ap2ma; - *page_order = cur_order; - return false; - } - - /* Host entry is also invalid; don't bother setting the altp2m entry. */ - if ( mfn_eq(*mfn, INVALID_MFN) ) - { - p2m_unlock(ap2m); - *page_order = cur_order; - return false; - } - - /* - * If this is a superpage mapping, round down both frame numbers - * to the start of the superpage. NB that we repupose `amfn` - * here. - */ - mask = ~((1UL << cur_order) - 1); - amfn = _mfn(mfn_x(*mfn) & mask); - gfn = _gfn(gfn_l & mask); - - /* Override the altp2m entry with its default access. */ - *p2ma = ap2m->default_access; - - rc = p2m_set_entry(ap2m, gfn, amfn, cur_order, *p2mt, *p2ma); - p2m_unlock(ap2m); - - if ( rc ) - { - gprintk(XENLOG_ERR, - "failed to set entry for %"PRI_gfn" -> %"PRI_mfn" altp2m %u, rc %d\n", - gfn_l, mfn_x(amfn), vcpu_altp2m(current).p2midx, rc); - domain_crash(ap2m->domain); - } - - return true; -} - -enum altp2m_reset_type { - ALTP2M_RESET, - ALTP2M_DEACTIVATE -}; - -static void p2m_reset_altp2m(struct domain *d, unsigned int idx, - enum altp2m_reset_type reset_type) -{ - struct p2m_domain *p2m; - - ASSERT(idx < MAX_ALTP2M); - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); - - p2m_lock(p2m); - - p2m_flush_table_locked(p2m); - - if ( reset_type == ALTP2M_DEACTIVATE ) - p2m_free_logdirty(p2m); - - /* Uninit and reinit ept to force TLB shootdown */ - ept_p2m_uninit(p2m); - ept_p2m_init(p2m); - - p2m->min_remapped_gfn = gfn_x(INVALID_GFN); - p2m->max_remapped_gfn = 0; - - p2m_unlock(p2m); -} - -void p2m_flush_altp2m(struct domain *d) -{ - unsigned int i; - - altp2m_list_lock(d); - - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - p2m_reset_altp2m(d, i, ALTP2M_DEACTIVATE); - d->arch.altp2m_eptp[i] = mfn_x(INVALID_MFN); - d->arch.altp2m_visible_eptp[i] = mfn_x(INVALID_MFN); - } - - altp2m_list_unlock(d); -} - -static int p2m_activate_altp2m(struct domain *d, unsigned int idx, - p2m_access_t hvmmem_default_access) -{ - struct p2m_domain *hostp2m, *p2m; - int rc; - - ASSERT(idx < MAX_ALTP2M); - - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); - hostp2m = p2m_get_hostp2m(d); - - p2m_lock(p2m); - - rc = p2m_init_logdirty(p2m); - - if ( rc ) - goto out; - - /* The following is really just a rangeset copy. */ - rc = rangeset_merge(p2m->logdirty_ranges, hostp2m->logdirty_ranges); - - if ( rc ) - { - p2m_free_logdirty(p2m); - goto out; - } - - p2m->default_access = hvmmem_default_access; - p2m->domain = hostp2m->domain; - p2m->global_logdirty = hostp2m->global_logdirty; - p2m->min_remapped_gfn = gfn_x(INVALID_GFN); - p2m->max_mapped_pfn = p2m->max_remapped_gfn = 0; - - p2m_init_altp2m_ept(d, idx); - - out: - p2m_unlock(p2m); - - return rc; -} - -int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx) -{ - int rc = -EINVAL; - struct p2m_domain *hostp2m = p2m_get_hostp2m(d); - - if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) - return rc; - - altp2m_list_lock(d); - - if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - rc = p2m_activate_altp2m(d, idx, hostp2m->default_access); - - altp2m_list_unlock(d); - return rc; -} - -int p2m_init_next_altp2m(struct domain *d, uint16_t *idx, - xenmem_access_t hvmmem_default_access) -{ - int rc = -EINVAL; - unsigned int i; - p2m_access_t a; - struct p2m_domain *hostp2m = p2m_get_hostp2m(d); - - if ( hvmmem_default_access > XENMEM_access_default || - !xenmem_access_to_p2m_access(hostp2m, hvmmem_default_access, &a) ) - return rc; - - altp2m_list_lock(d); - - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) - continue; - - rc = p2m_activate_altp2m(d, i, a); - - if ( !rc ) - *idx = i; - - break; - } - - altp2m_list_unlock(d); - return rc; -} - -int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) -{ - struct p2m_domain *p2m; - int rc = -EBUSY; - - if ( !idx || idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) - return rc; - - rc = domain_pause_except_self(d); - if ( rc ) - return rc; - - rc = -EBUSY; - altp2m_list_lock(d); - - if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] != - mfn_x(INVALID_MFN) ) - { - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); - - if ( !_atomic_read(p2m->active_vcpus) ) - { - p2m_reset_altp2m(d, idx, ALTP2M_DEACTIVATE); - d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] = - mfn_x(INVALID_MFN); - d->arch.altp2m_visible_eptp[array_index_nospec(idx, MAX_EPTP)] = - mfn_x(INVALID_MFN); - rc = 0; - } - } - - altp2m_list_unlock(d); - - domain_unpause_except_self(d); - - return rc; -} - -int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) -{ - struct vcpu *v; - int rc = -EINVAL; - - if ( idx >= MAX_ALTP2M ) - return rc; - - rc = domain_pause_except_self(d); - if ( rc ) - return rc; - - rc = -EINVAL; - altp2m_list_lock(d); - - if ( d->arch.altp2m_visible_eptp[idx] != mfn_x(INVALID_MFN) ) - { - for_each_vcpu( d, v ) - if ( p2m_set_altp2m(v, idx) ) - altp2m_vcpu_update_p2m(v); - - rc = 0; - } - - altp2m_list_unlock(d); - - domain_unpause_except_self(d); - - return rc; -} - -int p2m_change_altp2m_gfn(struct domain *d, unsigned int idx, - gfn_t old_gfn, gfn_t new_gfn) -{ - struct p2m_domain *hp2m, *ap2m; - p2m_access_t a; - p2m_type_t t; - mfn_t mfn; - int rc = -EINVAL; - - if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - return rc; - - hp2m = p2m_get_hostp2m(d); - ap2m = array_access_nospec(d->arch.altp2m_p2m, idx); - - p2m_lock(hp2m); - p2m_lock(ap2m); - - if ( gfn_eq(new_gfn, INVALID_GFN) ) - { - mfn = ap2m->get_entry(ap2m, old_gfn, &t, &a, 0, NULL, NULL); - rc = mfn_valid(mfn) - ? p2m_remove_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K) - : 0; - goto out; - } - - rc = altp2m_get_effective_entry(ap2m, old_gfn, &mfn, &t, &a, - AP2MGET_prepopulate); - if ( rc ) - goto out; - - rc = altp2m_get_effective_entry(ap2m, new_gfn, &mfn, &t, &a, - AP2MGET_query); - if ( rc ) - goto out; - - if ( !ap2m->set_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K, t, a, - (current->domain != d)) ) - { - rc = 0; - - if ( gfn_x(new_gfn) < ap2m->min_remapped_gfn ) - ap2m->min_remapped_gfn = gfn_x(new_gfn); - if ( gfn_x(new_gfn) > ap2m->max_remapped_gfn ) - ap2m->max_remapped_gfn = gfn_x(new_gfn); - } - - out: - p2m_unlock(ap2m); - p2m_unlock(hp2m); - return rc; -} - -int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, - mfn_t mfn, unsigned int page_order, - p2m_type_t p2mt, p2m_access_t p2ma) -{ - struct p2m_domain *p2m; - unsigned int i; - unsigned int reset_count = 0; - unsigned int last_reset_idx = ~0; - int ret = 0; - - if ( !altp2m_active(d) ) - return 0; - - altp2m_list_lock(d); - - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - p2m_type_t t; - p2m_access_t a; - - if ( d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) - continue; - - p2m = d->arch.altp2m_p2m[i]; - - /* Check for a dropped page that may impact this altp2m */ - if ( mfn_eq(mfn, INVALID_MFN) && - gfn_x(gfn) + (1UL << page_order) > p2m->min_remapped_gfn && - gfn_x(gfn) <= p2m->max_remapped_gfn ) - { - if ( !reset_count++ ) - { - p2m_reset_altp2m(d, i, ALTP2M_RESET); - last_reset_idx = i; - } - else - { - /* At least 2 altp2m's impacted, so reset everything */ - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - if ( i == last_reset_idx || - d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) - continue; - - p2m_reset_altp2m(d, i, ALTP2M_RESET); - } - - ret = 0; - break; - } - } - else if ( !mfn_eq(get_gfn_type_access(p2m, gfn_x(gfn), &t, &a, 0, - NULL), INVALID_MFN) ) - { - int rc = p2m_set_entry(p2m, gfn, mfn, page_order, p2mt, p2ma); - - /* Best effort: Don't bail on error. */ - if ( !ret ) - ret = rc; - - p2m_put_gfn(p2m, gfn); - } - else - p2m_put_gfn(p2m, gfn); - } - - altp2m_list_unlock(d); - - return ret; -} - /*** Audit ***/ #if P2M_AUDIT @@ -2540,159 +2065,6 @@ int xenmem_add_to_physmap_one( return rc; } -/* - * Set/clear the #VE suppress bit for a page. Only available on VMX. - */ -int p2m_set_suppress_ve(struct domain *d, gfn_t gfn, bool suppress_ve, - unsigned int altp2m_idx) -{ - int rc; - struct xen_hvm_altp2m_suppress_ve_multi sve = { - altp2m_idx, suppress_ve, 0, 0, gfn_x(gfn), gfn_x(gfn), 0 - }; - - if ( !(rc = p2m_set_suppress_ve_multi(d, &sve)) ) - rc = sve.first_error; - - return rc; -} - -/* - * Set/clear the #VE suppress bit for multiple pages. Only available on VMX. - */ -int p2m_set_suppress_ve_multi(struct domain *d, - struct xen_hvm_altp2m_suppress_ve_multi *sve) -{ - struct p2m_domain *host_p2m = p2m_get_hostp2m(d); - struct p2m_domain *ap2m = NULL; - struct p2m_domain *p2m = host_p2m; - uint64_t start = sve->first_gfn; - int rc = 0; - - if ( sve->view > 0 ) - { - if ( sve->view >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(sve->view, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - return -EINVAL; - - p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, sve->view); - } - - p2m_lock(host_p2m); - - if ( ap2m ) - p2m_lock(ap2m); - - while ( sve->last_gfn >= start ) - { - p2m_access_t a; - p2m_type_t t; - mfn_t mfn; - int err = 0; - - if ( (err = altp2m_get_effective_entry(p2m, _gfn(start), &mfn, &t, &a, - AP2MGET_query)) && - !sve->first_error ) - { - sve->first_error_gfn = start; /* Save the gfn of the first error */ - sve->first_error = err; /* Save the first error code */ - } - - if ( !err && (err = p2m->set_entry(p2m, _gfn(start), mfn, - PAGE_ORDER_4K, t, a, - sve->suppress_ve)) && - !sve->first_error ) - { - sve->first_error_gfn = start; /* Save the gfn of the first error */ - sve->first_error = err; /* Save the first error code */ - } - - /* Check for continuation if it's not the last iteration. */ - if ( sve->last_gfn >= ++start && hypercall_preempt_check() ) - { - rc = -ERESTART; - break; - } - } - - sve->first_gfn = start; - - if ( ap2m ) - p2m_unlock(ap2m); - - p2m_unlock(host_p2m); - - return rc; -} - -int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve, - unsigned int altp2m_idx) -{ - struct p2m_domain *host_p2m = p2m_get_hostp2m(d); - struct p2m_domain *ap2m = NULL; - struct p2m_domain *p2m; - mfn_t mfn; - p2m_access_t a; - p2m_type_t t; - int rc = 0; - - if ( altp2m_idx > 0 ) - { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - return -EINVAL; - - p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); - } - else - p2m = host_p2m; - - gfn_lock(host_p2m, gfn, 0); - - if ( ap2m ) - p2m_lock(ap2m); - - mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL, suppress_ve); - if ( !mfn_valid(mfn) ) - rc = -ESRCH; - - if ( ap2m ) - p2m_unlock(ap2m); - - gfn_unlock(host_p2m, gfn, 0); - - return rc; -} - -int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, - uint8_t visible) -{ - int rc = 0; - - altp2m_list_lock(d); - - /* - * Eptp index is correlated with altp2m index and should not exceed - * min(MAX_ALTP2M, MAX_EPTP). - */ - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - rc = -EINVAL; - else if ( visible ) - d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)]; - else - d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = - mfn_x(INVALID_MFN); - - altp2m_list_unlock(d); - - return rc; -} - /* * Local variables: * mode: C diff --git a/xen/arch/x86/mm/p2m.h b/xen/arch/x86/mm/p2m.h index 04308cfb6d..635f5a7f45 100644 --- a/xen/arch/x86/mm/p2m.h +++ b/xen/arch/x86/mm/p2m.h @@ -22,6 +22,9 @@ static inline void p2m_free_logdirty(struct p2m_domain *p2m) {} int p2m_init_altp2m(struct domain *d); void p2m_teardown_altp2m(struct domain *d); +void p2m_flush_table_locked(struct p2m_domain *p2m); +int __must_check p2m_remove_entry(struct p2m_domain *p2m, gfn_t gfn, mfn_t mfn, + unsigned int page_order); void p2m_nestedp2m_init(struct p2m_domain *p2m); int p2m_init_nestedp2m(struct domain *d); void p2m_teardown_nestedp2m(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 13:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 13:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723308.1128042 (Exim 4.92) (envelope-from ) id 1s7asx-0000VO-VG; Thu, 16 May 2024 13:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723308.1128042; Thu, 16 May 2024 13:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7asx-0000VG-Sg; Thu, 16 May 2024 13:11:03 +0000 Received: by outflank-mailman (input) for mailman id 723308; Thu, 16 May 2024 13:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7asx-0000VA-Dh for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 13:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7asx-0003qK-BY for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 13:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7asx-0000N4-8o for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 13:11:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MocHFOtP5kM42wSxZSf7yOLzUrR4krQDaYdboxBIN60=; b=gE8nyGADyuh5cVuQqOjqqXa6RS dtpT1cjO2Y+wfWtX9W6o/DrmYeB767nh6nDcobQqxbNfvkkbqjZcYMTyMFVBJYPtqSuA7aPDbm052 zN5xHmC6lXzf9qshjHBzSFOZo80GUmspdzpDd95ptVdhToRhSy+X+3iV5hyH+Me8PW4I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/ucode: Further fixes to identify "ucode already up to date" Message-Id: Date: Thu, 16 May 2024 13:11:03 +0000 commit 977d98e67c2e929c62aa1f495fc4c6341c45abb5 Author: Andrew Cooper AuthorDate: Thu May 16 12:09:39 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 16 13:59:11 2024 +0100 x86/ucode: Further fixes to identify "ucode already up to date" When the revision in hardware is newer than anything Xen has to hand, 'microcode_cache' isn't set up. Then, `xen-ucode` initiates the update because it doesn't know whether the revisions across the system are symmetric or not. This involves the patch getting all the way into the apply_microcode() hooks before being found to be too old. This is all a giant mess and needs an overhaul, but in the short term simply adjust the apply_microcode() to return -EEXIST. Also, unconditionally print the preexisting microcode revision on boot. It's relevant information which is otherwise unavailable if Xen doesn't find new microcode to use. Fixes: 648db37a155a ("x86/ucode: Distinguish "ucode already up to date"") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/microcode/amd.c | 7 +++++-- xen/arch/x86/cpu/microcode/core.c | 2 ++ xen/arch/x86/cpu/microcode/intel.c | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 17e68697d5..f76a563c8b 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -222,12 +222,15 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) uint32_t rev, old_rev = sig->rev; enum microcode_match_result result = microcode_fits(patch); + if ( result == MIS_UCODE ) + return -EINVAL; + /* * Allow application of the same revision to pick up SMT-specific changes * even if the revision of the other SMT thread is already up-to-date. */ - if ( result != NEW_UCODE && result != SAME_UCODE ) - return -EINVAL; + if ( result == OLD_UCODE ) + return -EEXIST; if ( check_final_patch_levels(sig) ) { diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 762111838f..e90055772a 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -881,6 +881,8 @@ int __init early_microcode_init(unsigned long *module_map, ucode_ops.collect_cpu_info(); + printk(XENLOG_INFO "BSP microcode revision: 0x%08x\n", this_cpu(cpu_sig).rev); + /* * Some hypervisors deliberately report a microcode revision of -1 to * mean that they will not accept microcode updates. diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index 96f34b336b..f505aa1b78 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -294,10 +294,13 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) result = microcode_update_match(patch); - if ( result != NEW_UCODE && - !(opt_ucode_allow_same && result == SAME_UCODE) ) + if ( result == MIS_UCODE ) return -EINVAL; + if ( result == OLD_UCODE || + (result == SAME_UCODE && !opt_ucode_allow_same) ) + return -EEXIST; + wbinvd(); wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)patch->data); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 20:44:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 20:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723627.1128614 (Exim 4.92) (envelope-from ) id 1s7hxL-0004kd-6D; Thu, 16 May 2024 20:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723627.1128614; Thu, 16 May 2024 20: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 1s7hxL-0004kV-2u; Thu, 16 May 2024 20:44:03 +0000 Received: by outflank-mailman (input) for mailman id 723627; Thu, 16 May 2024 20:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7hxK-0004kP-BO for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 20:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7hxK-0003wy-AU for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 20:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7hxK-0004xL-8G for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 20: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=ocmoLiMM9OnAIGSfj8EBF3gENhcrMTcQEMaTRhErRWY=; b=lQW8EaWAlS2MnwuROudy6sXlxz NtlUAZH917hiiJR/eHPAtgCRjTNaZDDmNVrvf23zugbtQvd+pi/FzaAMJ/jtP/OV2Gcptszrudj9I oh3Xt8EJFs1bmxxO4jKP/9mR640alOTW/FPw3vTXgMrQfRTaELjypN8cy2nEa8S3vCeY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: fully deviate MISRA C Rules 21.9 and 21.10 Message-Id: Date: Thu, 16 May 2024 20:44:02 +0000 commit 7fe9679db962926977ae2097a07bfc51a9ac6bad Author: Nicola Vetrini AuthorDate: Wed May 15 09:51:59 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 15 16:58:06 2024 -0700 automation/eclair_analysis: fully deviate MISRA C Rules 21.9 and 21.10 These rules are concerned with the use of facilities provided by the C Standard Library (qsort, bsearch for rule 21.9, and those provided by for rule 21.10). Xen provides in its source code its own implementation of some of these functions and macros, therefore a justification is provided for allowing uses of these functions in the project. The rules are also marked as clean as a consequence. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 14 ++++++++++++++ automation/eclair_analysis/ECLAIR/monitored.ecl | 2 ++ automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- docs/misra/deviations.rst | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 5eb7368a73..1478c64a5a 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -477,6 +477,20 @@ leads to a violation of the Rule are deviated." -config=MC3R1.R20.12,macros+={deliberate, "name(GENERATE_CASE)&&loc(file(deliberate_generate_case))"} -doc_end +# +# Series 21. +# + +-doc_begin="Xen does not use the functions provided by the Standard Library, but +implements a set of functions that share the same names as their Standard Library equivalent. +The implementation of these functions is available in source form, so the undefined, unspecified +or implementation-defined behaviors contemplated by the C Standard do not apply. +If some undefined or unspecified behavior does arise in the implementation, it +falls under the jurisdiction of other MISRA rules." +-config=MC3R1.R21.9,reports+={deliberate, "any()"} +-config=MC3R1.R21.10,reports+={deliberate, "any()"} +-doc_end + # # General # diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl index 69308ea51c..9da709dc88 100644 --- a/automation/eclair_analysis/ECLAIR/monitored.ecl +++ b/automation/eclair_analysis/ECLAIR/monitored.ecl @@ -36,12 +36,14 @@ -enable=MC3R1.R20.4 -enable=MC3R1.R20.9 -enable=MC3R1.R2.1 +-enable=MC3R1.R21.10 -enable=MC3R1.R21.13 -enable=MC3R1.R21.17 -enable=MC3R1.R21.18 -enable=MC3R1.R21.19 -enable=MC3R1.R21.20 -enable=MC3R1.R21.21 +-enable=MC3R1.R21.9 -enable=MC3R1.R2.2 -enable=MC3R1.R22.2 -enable=MC3R1.R22.4 diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index a14bda5033..acea15f486 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.10||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R21.9||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index 161134771c..b5450c38f6 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -411,6 +411,24 @@ Deviations related to MISRA C:2012 Rules: construct is deviated only in Translation Units that present a violation of the Rule due to uses of this macro. - Tagged as `deliberate` for ECLAIR. + + * - R21.9 + - Xen does not use the `bsearch` and `qsort` functions provided by the C + Standard Library, but provides in source form its own implementation, + therefore any unspecified or undefined behavior associated to the + functions provided by the Standard Library does not apply. Any such + behavior that may exist in such functions is therefore under the + jurisdiction of other MISRA C rules. + - Project-wide deviation, tagged as `deliberate` for ECLAIR. + + * - R21.10 + - Xen does not use the facilities provided by the `\` provided by the C + Standard Library, but provides in source form its own implementation, + therefore any unspecified, undefined or implementation-defined behavior + associated to the functions provided by the Standard Library does not + apply. Any such behavior that may exist in such functions is therefore + under the jurisdiction of other MISRA C rules. + - Project-wide deviation, tagged as `deliberate` for ECLAIR. Other deviations: ----------------- -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 20:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 20:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723628.1128616 (Exim 4.92) (envelope-from ) id 1s7hxV-0004mT-6s; Thu, 16 May 2024 20:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723628.1128616; Thu, 16 May 2024 20: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 1s7hxV-0004mM-4Q; Thu, 16 May 2024 20:44:13 +0000 Received: by outflank-mailman (input) for mailman id 723628; Thu, 16 May 2024 20:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7hxU-0004mE-EU for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 20:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7hxU-0003x6-Dc for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 20:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7hxU-0004y8-Cd for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 20: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=/oIo2ytUEeuIUdQYUWtrsmXr9HiGsnXAtawWAx6Rq6M=; b=Vipj+GbCO7mScPM1o4eW4ApMdb oRkOYceu7MZ6EYR1ckADTfFW5upLYMV+v8Z/Mt2VVvRCIeGNPV7RaI0tF6QA5Uf7/ZKuaj+UE8fUf V2zQuebE0BlJHoHGwhjFle6+lhhUP6juKdtVkVhVnF0eOFNpP50NC76pIgKKM+XOjSBQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: deviate macro count_args_ for MISRA Rule 20.7 Message-Id: Date: Thu, 16 May 2024 20:44:12 +0000 commit 762a848223e0fd61aa87b4e040c83dd2c490fb79 Author: Nicola Vetrini AuthorDate: Tue Apr 23 17:12:45 2024 +0200 Commit: Stefano Stabellini CommitDate: Wed May 15 16:58:44 2024 -0700 automation/eclair_analysis: deviate macro count_args_ for MISRA Rule 20.7 The count_args_ macro violates Rule 20.7, but it can't be made compliant with Rule 20.7 without breaking its functionality. Since it's very unlikely for this macro to be misused, it is deviated. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 6 ++++++ docs/misra/deviations.rst | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index 1478c64a5a..b9b377c56b 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -457,6 +457,12 @@ not to parenthesize their arguments." -config=MC3R1.R20.7,reports+={safe, "any_area(any_loc(any_exp(macro(^alternative_(v)?call[0-9]$))))"} -doc_end +-doc_begin="The argument 'x' of the count_args_ macro can't be parenthesized as +the rule would require, without breaking the functionality of the macro. The uses +of this macro do not lead to developer confusion, and can thus be deviated." +-config=MC3R1.R20.7,reports+={safe, "any_area(any_loc(any_exp(macro(^count_args_$))))"} +-doc_end + -doc_begin="Uses of variadic macros that have one of their arguments defined as a macro and used within the body for both ordinary parameter expansion and as an operand to the # or ## operators have a behavior that is well-understood and diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst index b5450c38f6..36959aa44a 100644 --- a/docs/misra/deviations.rst +++ b/docs/misra/deviations.rst @@ -390,6 +390,12 @@ Deviations related to MISRA C:2012 Rules: sanity checks in place. - Tagged as `safe` for ECLAIR. + * - R20.7 + - The macro `count_args_` is not compliant with the rule, but is not likely + to incur in the risk of being misused or lead to developer confusion, and + refactoring it to add parentheses breaks its functionality. + - Tagged as `safe` for ECLAIR. + * - R20.12 - Variadic macros that use token pasting often employ the gcc extension `ext_paste_comma`, as detailed in `C-language-toolchain.rst`, which is -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:11:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723634.1128631 (Exim 4.92) (envelope-from ) id 1s7iNU-0001Yi-6o; Thu, 16 May 2024 21:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723634.1128631; Thu, 16 May 2024 21:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNU-0001Yb-4B; Thu, 16 May 2024 21:11:04 +0000 Received: by outflank-mailman (input) for mailman id 723634; Thu, 16 May 2024 21:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNT-0001YV-Os for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNT-0004iU-M9 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iNT-0006ka-Kv for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wyncxR2QG/nROzUr1kPen/LHjz+UFu3/K63sK46h++8=; b=XXzYInqjagCvEhaat3A8AwLWgI zrW02eAmxNejIA2jYThZd5l4re1lD7nTaT2pfVz8+hirvT8K/fv1fcvbu51GTHtGN/Ep261NysN+2 egPPPyx2bqRJERL7Zv6sPpEIlCYW9sCjMUNvBskvLVGK4fKjG79T6BKDeT/QokMT+ZDQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: entry: Add missing code symbol annotations Message-Id: Date: Thu, 16 May 2024 21:11:03 +0000 commit 1125f3529c5859a10b241db68844db6ca51b130e Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:06 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: entry: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/entry.S | 78 +++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index f963c923bb..6251135ebd 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -289,21 +289,25 @@ b do_bad_mode .endm -hyp_sync_invalid: +FUNC_LOCAL(hyp_sync_invalid) entry hyp=1 invalid BAD_SYNC +END(hyp_sync_invalid) -hyp_irq_invalid: +FUNC_LOCAL(hyp_irq_invalid) entry hyp=1 invalid BAD_IRQ +END(hyp_irq_invalid) -hyp_fiq_invalid: +FUNC_LOCAL(hyp_fiq_invalid) entry hyp=1 invalid BAD_FIQ +END(hyp_fiq_invalid) -hyp_error_invalid: +FUNC_LOCAL(hyp_error_invalid) entry hyp=1 invalid BAD_ERROR +END(hyp_error_invalid) /* * SError received while running in the hypervisor mode. @@ -313,11 +317,12 @@ hyp_error_invalid: * simplicity, as SError should be rare and potentially fatal, * all interrupts are kept masked. */ -hyp_error: +FUNC_LOCAL(hyp_error) entry hyp=1 mov x0, sp bl do_trap_hyp_serror exit hyp=1 +END(hyp_error) /* * Synchronous exception received while running in the hypervisor mode. @@ -327,7 +332,7 @@ hyp_error: * some of them. So we want to inherit the state from the interrupted * context. */ -hyp_sync: +FUNC_LOCAL(hyp_sync) entry hyp=1 /* Inherit interrupts */ @@ -338,6 +343,7 @@ hyp_sync: mov x0, sp bl do_trap_hyp_sync exit hyp=1 +END(hyp_sync) /* * IRQ received while running in the hypervisor mode. @@ -352,7 +358,7 @@ hyp_sync: * would require some rework in some paths (e.g. panic, livepatch) to * ensure the ordering is enforced everywhere. */ -hyp_irq: +FUNC_LOCAL(hyp_irq) entry hyp=1 /* Inherit D, A, F interrupts and keep I masked */ @@ -365,8 +371,9 @@ hyp_irq: mov x0, sp bl do_trap_irq exit hyp=1 +END(hyp_irq) -guest_sync: +FUNC_LOCAL(guest_sync) /* * Save x0, x1 in advance */ @@ -413,8 +420,9 @@ fastpath_out_workaround: mov x1, xzr eret sb +END(guest_sync) -wa2_ssbd: +FUNC_LOCAL(wa2_ssbd) #ifdef CONFIG_ARM_SSBD alternative_cb arm_enable_wa2_handling b wa2_end @@ -450,42 +458,55 @@ wa2_end: mov x0, xzr eret sb -guest_sync_slowpath: +END(wa2_ssbd) + +FUNC_LOCAL(guest_sync_slowpath) /* * x0/x1 may have been scratch by the fast path above, so avoid * to save them. */ guest_vector compat=0, iflags=IFLAGS__AI_, trap=guest_sync, save_x0_x1=0 +END(guest_sync_slowpath) -guest_irq: +FUNC_LOCAL(guest_irq) guest_vector compat=0, iflags=IFLAGS__A__, trap=irq +END(guest_irq) -guest_fiq_invalid: +FUNC_LOCAL(guest_fiq_invalid) entry hyp=0, compat=0 invalid BAD_FIQ +END(guest_fiq_invalid) -guest_error: +FUNC_LOCAL(guest_error) guest_vector compat=0, iflags=IFLAGS__AI_, trap=guest_serror +END(guest_error) -guest_sync_compat: +FUNC_LOCAL(guest_sync_compat) guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_sync +END(guest_sync_compat) -guest_irq_compat: +FUNC_LOCAL(guest_irq_compat) guest_vector compat=1, iflags=IFLAGS__A__, trap=irq +END(guest_irq_compat) -guest_fiq_invalid_compat: +FUNC_LOCAL(guest_fiq_invalid_compat) entry hyp=0, compat=1 invalid BAD_FIQ +END(guest_fiq_invalid_compat) -guest_error_compat: +FUNC_LOCAL(guest_error_compat) guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_serror +END(guest_error_compat) -ENTRY(return_to_new_vcpu32) +FUNC(return_to_new_vcpu32) exit hyp=0, compat=1 -ENTRY(return_to_new_vcpu64) +END(return_to_new_vcpu32) + +FUNC(return_to_new_vcpu64) exit hyp=0, compat=0 +END(return_to_new_vcpu64) -return_from_trap: +FUNC_LOCAL(return_from_trap) msr daifset, #IFLAGS___I_ /* Mask interrupts */ ldr x21, [sp, #UREGS_PC] /* load ELR */ @@ -524,6 +545,7 @@ return_from_trap: eret sb +END(return_from_trap) /* * Consume pending SError generated by the guest if any. @@ -536,7 +558,7 @@ return_from_trap: * it. So the function will unmask SError exception for a small window and * then mask it again. */ -check_pending_guest_serror: +FUNC_LOCAL(check_pending_guest_serror) /* * Save elr_el2 to check whether the pending SError exception takes * place while we are doing this sync exception. @@ -562,13 +584,11 @@ check_pending_guest_serror: * exception handler, and the elr_el2 will be set to * abort_guest_exit_start or abort_guest_exit_end. */ - .global abort_guest_exit_start -abort_guest_exit_start: +LABEL(abort_guest_exit_start) isb - .global abort_guest_exit_end -abort_guest_exit_end: +LABEL(abort_guest_exit_end) /* Mask PSTATE asynchronous abort bit, close the checking window. */ msr daifset, #IFLAGS__A__ @@ -586,7 +606,7 @@ abort_guest_exit_end: cset x19, ne ret -ENDPROC(check_pending_guest_serror) +END(check_pending_guest_serror) /* * Exception vectors. @@ -597,7 +617,7 @@ ENDPROC(check_pending_guest_serror) .endm .align 11 -ENTRY(hyp_traps_vector) +FUNC(hyp_traps_vector) ventry hyp_sync_invalid /* Synchronous EL2t */ ventry hyp_irq_invalid /* IRQ EL2t */ ventry hyp_fiq_invalid /* FIQ EL2t */ @@ -617,6 +637,7 @@ ENTRY(hyp_traps_vector) ventry guest_irq_compat /* IRQ 32-bit EL0/EL1 */ ventry guest_fiq_invalid_compat /* FIQ 32-bit EL0/EL1 */ ventry guest_error_compat /* Error 32-bit EL0/EL1 */ +END(hyp_traps_vector) /* * struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next) @@ -626,7 +647,7 @@ ENTRY(hyp_traps_vector) * * Returns prev in x0 */ -ENTRY(__context_switch) +FUNC(__context_switch) add x8, x0, #VCPU_arch_saved_context mov x9, sp stp x19, x20, [x8], #16 /* store callee-saved registers */ @@ -647,6 +668,7 @@ ENTRY(__context_switch) ldr lr, [x8] mov sp, x9 ret +END(__context_switch) /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:11:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723635.1128634 (Exim 4.92) (envelope-from ) id 1s7iNf-0001ao-8G; Thu, 16 May 2024 21:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723635.1128634; Thu, 16 May 2024 21:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNf-0001ag-5k; Thu, 16 May 2024 21:11:15 +0000 Received: by outflank-mailman (input) for mailman id 723635; Thu, 16 May 2024 21:11:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNd-0001aV-Qb for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNd-0004id-PP for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iNd-0006lO-OH for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LSvUG9PQRW92f74VPVJ/xi4C+24H/IuUolt8LG1kGaA=; b=Jeu6jcOuX75PqTK/+a+VT4tRmf +xu5p+DGO8USUeZ7n1tlOkG25TP8qXrWTK8Yvvu5ceP12/3XfwCdAJ34MEfQATuR0wrs8z2J9qLar qU1cg9xwS30bdt1Z8LWlxk4pXKEJpPT07k/eW5muNb8P4iZLY0DgKZ3zDEpWZvI35x5E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: smc: Add missing code symbol annotations Message-Id: Date: Thu, 16 May 2024 21:11:13 +0000 commit 8d92a26a41d11b561e36b9321996809045ff2ec4 Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:07 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: smc: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/smc.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/smc.S b/xen/arch/arm/arm64/smc.S index fc6b676e2e..68b05e8ddd 100644 --- a/xen/arch/arm/arm64/smc.S +++ b/xen/arch/arm/arm64/smc.S @@ -19,7 +19,7 @@ * register_t a6, register_t a7, * struct arm_smccc_res *res) */ -ENTRY(__arm_smccc_1_0_smc) +FUNC(__arm_smccc_1_0_smc) smc #0 ldr x4, [sp] cbz x4, 1f /* No need to store the result */ @@ -27,12 +27,13 @@ ENTRY(__arm_smccc_1_0_smc) stp x2, x3, [x4, #SMCCC_RES_a2] 1: ret +END(__arm_smccc_1_0_smc) /* * void arm_smccc_1_2_smc(const struct arm_smccc_1_2_regs *args, * struct arm_smccc_1_2_regs *res) */ -ENTRY(arm_smccc_1_2_smc) +FUNC(arm_smccc_1_2_smc) /* Save `res` and free a GPR that won't be clobbered by SMC call */ stp x1, x19, [sp, #-16]! @@ -69,3 +70,4 @@ ENTRY(arm_smccc_1_2_smc) /* Restore original x19 */ ldp xzr, x19, [sp], #16 ret +END(arm_smccc_1_2_smc) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:11:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723636.1128639 (Exim 4.92) (envelope-from ) id 1s7iNp-0001eS-B0; Thu, 16 May 2024 21:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723636.1128639; Thu, 16 May 2024 21:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNp-0001eK-8Y; Thu, 16 May 2024 21:11:25 +0000 Received: by outflank-mailman (input) for mailman id 723636; Thu, 16 May 2024 21:11:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNn-0001e3-T3 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNn-0004iz-SF for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iNn-0006lv-RO for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6AGx0c1Tw64+5KIpWF5ZmoVQX7CsHR42hWTpIqcpD7c=; b=ehok9mRwyoAAPLch12F8GNcG+y sXUAclKTnMb6e0XCgM92jwPdj1ifDNdWNacvQnwWy1bT3rtsEFTIQUip1+dcS6Dr3CyhnkmIYAxa2 S2LcANiY9Mh2SCER3v0L4ffw9oULDcY8EVbtHGbLz2luhIEf2/cFADRocDD9O4xQ/3rI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: sve: Add missing code symbol annotations Message-Id: Date: Thu, 16 May 2024 21:11:23 +0000 commit 78ce1dc625ce494909b26e57dd909732b5a8605e Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:08 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: sve: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/sve-asm.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/arm64/sve-asm.S b/xen/arch/arm/arm64/sve-asm.S index 59dbefbbb2..2d8b895f07 100644 --- a/xen/arch/arm/arm64/sve-asm.S +++ b/xen/arch/arm/arm64/sve-asm.S @@ -161,9 +161,10 @@ .endm /* Gets the current vector register size in bytes */ -GLOBAL(sve_get_hw_vl) +FUNC(sve_get_hw_vl) _sve_rdvl 0, 1 ret +END(sve_get_hw_vl) /* * Save the SVE context @@ -172,9 +173,10 @@ GLOBAL(sve_get_hw_vl) * x1 - pointer to buffer for P0-15 * x2 - Save FFR if non-zero */ -GLOBAL(sve_save_ctx) +FUNC(sve_save_ctx) sve_save 0, 1, x2 ret +END(sve_save_ctx) /* * Load the SVE context @@ -183,9 +185,10 @@ GLOBAL(sve_save_ctx) * x1 - pointer to buffer for P0-15 * x2 - Restore FFR if non-zero */ -GLOBAL(sve_load_ctx) +FUNC(sve_load_ctx) sve_load 0, 1, x2 ret +END(sve_load_ctx) /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:11:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:11:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723637.1128644 (Exim 4.92) (envelope-from ) id 1s7iNz-0001h9-DC; Thu, 16 May 2024 21:11:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723637.1128644; Thu, 16 May 2024 21:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNz-0001h1-9w; Thu, 16 May 2024 21:11:35 +0000 Received: by outflank-mailman (input) for mailman id 723637; Thu, 16 May 2024 21:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNy-0001gi-0f for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iNx-0004jZ-WC for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iNx-0006mS-UN for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=w1EZosud67MGrDEVgmC2b3TFNh3KxwQjrS+Y1Jix4zs=; b=dE9hmgt+mYTz6Fuxkmn33Khc/f kfkzWhGwXsZdalOyn2oVa6fw3M1MFOSQLzo15lKIM2SohEC/npx7NoXNktl8EEpn3K2SLfdvm8aY0 pparoqapDFLKKvmOjR/ZK+wg9cxk9Y3yvmPPrrsc2+kKGZa3t8qLGJFFUrbNV6kl+XXQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: head: Add missing code symbol annotations Message-Id: Date: Thu, 16 May 2024 21:11:33 +0000 commit fba250ae604e9d67f5f762e6dbb85a01750cc12a Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:09 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: head: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/head.S | 51 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index fb297e9eb5..2fa07dc3a0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -90,7 +90,7 @@ * 4K-aligned address. */ -GLOBAL(start) +FUNC(start) /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ @@ -102,6 +102,7 @@ efi_head: */ add x13, x18, #0x16 b real_start /* branch to kernel start */ +END(start) .quad 0 /* Image load offset from start of RAM */ .quad _end - start /* Effective size of kernel image, little-endian */ .quad __HEAD_FLAGS /* Informative flags, little-endian */ @@ -223,7 +224,7 @@ section_table: .align 5 #endif /* CONFIG_ARM_EFI */ -real_start: +FUNC_LOCAL(real_start) /* BSS should be zeroed when booting without EFI */ mov x26, #0 /* x26 := skip_zero_bss */ @@ -263,9 +264,9 @@ primary_switched: mov x1, x21 /* x1 := paddr(FDT) */ ldr x2, =start_xen b launch -ENDPROC(real_start) +END(real_start) -GLOBAL(init_secondary) +FUNC(init_secondary) msr DAIFSet, 0xf /* Disable all interrupts */ /* Find out where we are */ @@ -304,7 +305,7 @@ secondary_switched: /* Jump to C world */ ldr x2, =start_secondary b launch -ENDPROC(init_secondary) +END(init_secondary) /* * Check if the CPU has been booted in Hypervisor mode. @@ -313,7 +314,7 @@ ENDPROC(init_secondary) * * Clobbers x0 - x5 */ -check_cpu_mode: +FUNC_LOCAL(check_cpu_mode) PRINT_ID("- Current EL ") mrs x5, CurrentEL print_reg x5 @@ -329,7 +330,7 @@ check_cpu_mode: PRINT_ID("- Xen must be entered in NS EL2 mode -\r\n") PRINT_ID("- Please update the bootloader -\r\n") b fail -ENDPROC(check_cpu_mode) +END(check_cpu_mode) /* * Zero BSS @@ -339,7 +340,7 @@ ENDPROC(check_cpu_mode) * * Clobbers x0 - x3 */ -zero_bss: +FUNC_LOCAL(zero_bss) /* Zero BSS only when requested */ cbnz x26, skip_bss @@ -353,14 +354,14 @@ zero_bss: skip_bss: ret -ENDPROC(zero_bss) +END(zero_bss) /* * Initialize the processor for turning the MMU on. * * Clobbers x0 - x3 */ -cpu_init: +FUNC_LOCAL(cpu_init) PRINT_ID("- Initialize CPU -\r\n") /* Set up memory attribute type tables */ @@ -399,7 +400,7 @@ cpu_init: */ msr spsel, #1 ret -ENDPROC(cpu_init) +END(cpu_init) /* * Setup the initial stack and jump to the C world @@ -411,7 +412,7 @@ ENDPROC(cpu_init) * * Clobbers x3 */ -launch: +FUNC_LOCAL(launch) ldr x3, =init_data add x3, x3, #INITINFO_stack /* Find the boot-time stack */ ldr x3, [x3] @@ -421,13 +422,14 @@ launch: /* Jump to C world */ br x2 -ENDPROC(launch) +END(launch) /* Fail-stop */ -fail: PRINT_ID("- Boot failed -\r\n") +FUNC_LOCAL(fail) + PRINT_ID("- Boot failed -\r\n") 1: wfe b 1b -ENDPROC(fail) +END(fail) #ifdef CONFIG_EARLY_PRINTK /* @@ -438,14 +440,14 @@ ENDPROC(fail) * * Clobbers x0 - x1 */ -init_uart: +FUNC_LOCAL(init_uart) ldr x23, =CONFIG_EARLY_UART_BASE_ADDRESS #ifdef CONFIG_EARLY_UART_INIT early_uart_init x23, 0 #endif PRINT("- UART enabled -\r\n") ret -ENDPROC(init_uart) +END(init_uart) /* * Print early debug messages. @@ -454,7 +456,7 @@ ENDPROC(init_uart) * x23: Early UART base address * Clobbers x0-x1 */ -ENTRY(asm_puts) +FUNC(asm_puts) early_uart_ready x23, 1 ldrb w1, [x0], #1 /* Load next char */ cbz w1, 1f /* Exit on nul */ @@ -462,7 +464,7 @@ ENTRY(asm_puts) b asm_puts 1: ret -ENDPROC(asm_puts) +END(asm_puts) /* * Print a 64-bit number in hex. @@ -471,7 +473,7 @@ ENDPROC(asm_puts) * x23: Early UART base address * Clobbers x0-x3 */ -ENTRY(asm_putn) +FUNC(asm_putn) adr_l x1, hex mov x3, #16 1: @@ -484,7 +486,7 @@ ENTRY(asm_putn) subs x3, x3, #1 b.ne 1b ret -ENDPROC(asm_putn) +END(asm_putn) RODATA_SECT(.rodata.idmap, hex, "0123456789abcdef") @@ -493,16 +495,17 @@ RODATA_SECT(.rodata.idmap, hex, "0123456789abcdef") /* This provides a C-API version of __lookup_processor_type * TODO: For now, the implementation return NULL every time */ -ENTRY(lookup_processor_type) +FUNC(lookup_processor_type) mov x0, #0 ret +END(lookup_processor_type) #ifdef CONFIG_ARM_EFI /* * Function to transition from EFI loader in C, to Xen entry point. * void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); */ -ENTRY(efi_xen_start) +FUNC(efi_xen_start) /* * Preserve x0 (fdt pointer) across call to __flush_dcache_area, * restore for entry into Xen. @@ -554,7 +557,7 @@ ENTRY(efi_xen_start) mov x26, #1 /* x26 := skip_zero_bss */ b real_start_efi -ENDPROC(efi_xen_start) +END(efi_xen_start) #endif /* CONFIG_ARM_EFI */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:11:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:11:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723639.1128647 (Exim 4.92) (envelope-from ) id 1s7iO9-0001wf-E2; Thu, 16 May 2024 21:11:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723639.1128647; Thu, 16 May 2024 21:11: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 1s7iO9-0001wX-BV; Thu, 16 May 2024 21:11:45 +0000 Received: by outflank-mailman (input) for mailman id 723639; Thu, 16 May 2024 21:11:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iO8-0001wK-4V for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iO8-0004ji-3e for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iO8-0006ms-2D for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eeMhe7VUjqH2fVIhBHQ/x3FUzSbZlO0wJ7UDES4bovc=; b=DWrliTvJMZGURp9UcYGsrSkxE8 dJ8JODqDcMY7TxSZNhwPyBfMOs4oprPrXTgVeKjl9tnrZz7z9rG2yfQV+QeSkApfpiPWja/Xf1YWQ nyzrZYQHWIxL6QQzgNG2GR5orlvLbHWthpOvrqGREozp0m+hS3jK++41u50gdyDfN7LU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: debug: Add missing code symbol annotations Message-Id: Date: Thu, 16 May 2024 21:11:44 +0000 commit fdba3ff11fc181bb5eaeb095426a7451e199052e Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:10 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: debug: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/debug.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S index 71cad9d762..c3d02c33d7 100644 --- a/xen/arch/arm/arm64/debug.S +++ b/xen/arch/arm/arm64/debug.S @@ -27,17 +27,19 @@ * Print a character on the UART - this function is called by C * x0: character to print */ -GLOBAL(early_putch) +FUNC(early_putch) ldr x15, =EARLY_UART_VIRTUAL_ADDRESS early_uart_ready x15, 1 early_uart_transmit x15, w0 ret +END(early_putch) /* Flush the UART - this function is called by C */ -GLOBAL(early_flush) +FUNC(early_flush) ldr x15, =EARLY_UART_VIRTUAL_ADDRESS /* x15 := VA UART base address */ early_uart_ready x15, 1 ret +END(early_flush) /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:11:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:11:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723640.1128651 (Exim 4.92) (envelope-from ) id 1s7iOJ-00022i-FX; Thu, 16 May 2024 21:11:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723640.1128651; Thu, 16 May 2024 21:11: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 1s7iOJ-00022b-Ct; Thu, 16 May 2024 21:11:55 +0000 Received: by outflank-mailman (input) for mailman id 723640; Thu, 16 May 2024 21:11:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOI-00022O-7w for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOI-0004k1-7D for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iOI-0006nM-5e for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:11:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3aFtKTycd1K1Kfjud2M0nWkE9Kv4p7GV7DYI+xbrGtM=; b=P4ZUCznD5GDebBnWMJdsBxe6vu IMukyOio+A+W9JF5pXk304b4hThIY7TYK4BRfjuK7Xcg1tOdWG4e6JwThhUcXAx1pn5ZYAfEVtpTo uYzdjAsCGdyJGwhUNTKasju4Qs6c60nrixp+qU6V/ixqxaOpVtf7bFrFNxB58+dsYDIQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: bpi: Add missing code symbol annotations Message-Id: Date: Thu, 16 May 2024 21:11:54 +0000 commit 8151fe503c6f624fbf118efe01888f16fd27c413 Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:11 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: bpi: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/bpi.S | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm64/bpi.S b/xen/arch/arm/arm64/bpi.S index 4e63825220..d6b8defb80 100644 --- a/xen/arch/arm/arm64/bpi.S +++ b/xen/arch/arm/arm64/bpi.S @@ -52,14 +52,15 @@ * micro-architectures in a system. */ .align 11 -ENTRY(__bp_harden_hyp_vecs_start) +FUNC(__bp_harden_hyp_vecs_start) .rept 4 vectors hyp_traps_vector .endr -ENTRY(__bp_harden_hyp_vecs_end) +LABEL(__bp_harden_hyp_vecs_end) +END(__bp_harden_hyp_vecs_start) .macro mitigate_spectre_bhb_loop count -ENTRY(__mitigate_spectre_bhb_loop_start_\count) +FUNC(__mitigate_spectre_bhb_loop_start_\count) stp x0, x1, [sp, #-16]! mov x0, \count .Lspectre_bhb_loop\@: @@ -68,11 +69,12 @@ ENTRY(__mitigate_spectre_bhb_loop_start_\count) b.ne .Lspectre_bhb_loop\@ sb ldp x0, x1, [sp], #16 -ENTRY(__mitigate_spectre_bhb_loop_end_\count) +LABEL(__mitigate_spectre_bhb_loop_end_\count) +END(__mitigate_spectre_bhb_loop_start_\count) .endm .macro smccc_workaround num smcc_id -ENTRY(__smccc_workaround_smc_start_\num) +FUNC(__smccc_workaround_smc_start_\num) sub sp, sp, #(8 * 4) stp x0, x1, [sp, #(8 * 2)] stp x2, x3, [sp, #(8 * 0)] @@ -81,13 +83,15 @@ ENTRY(__smccc_workaround_smc_start_\num) ldp x2, x3, [sp, #(8 * 0)] ldp x0, x1, [sp, #(8 * 2)] add sp, sp, #(8 * 4) -ENTRY(__smccc_workaround_smc_end_\num) +LABEL(__smccc_workaround_smc_end_\num) +END(__smccc_workaround_smc_start_\num) .endm -ENTRY(__mitigate_spectre_bhb_clear_insn_start) +FUNC(__mitigate_spectre_bhb_clear_insn_start) clearbhb isb -ENTRY(__mitigate_spectre_bhb_clear_insn_end) +LABEL(__mitigate_spectre_bhb_clear_insn_end) +END(__mitigate_spectre_bhb_clear_insn_start) mitigate_spectre_bhb_loop 8 mitigate_spectre_bhb_loop 24 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:12:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:12:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723641.1128655 (Exim 4.92) (envelope-from ) id 1s7iOT-00026e-HP; Thu, 16 May 2024 21:12:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723641.1128655; Thu, 16 May 2024 21:12: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 1s7iOT-00026U-Ec; Thu, 16 May 2024 21:12:05 +0000 Received: by outflank-mailman (input) for mailman id 723641; Thu, 16 May 2024 21:12:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOS-00026H-Bb for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOS-0004kN-Ax for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iOS-0006od-9L for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I2Fg3uPY4m5vgoYEtmI/PtgZO7MBlea54vith3ygeWA=; b=fZwl86P+TfACJnnVoOoN2WrPYj APatApqFP2s5yAhsLV+Y6+WIcnXX/4lzhQhO+Nl54hs9tH4x6dcyhsidqQHa25t4jTAArNwHiHjZ5 vRcS/sFwd50Onbo3/27Rof1PthpsyoYHUxim5xsN+RbPtRDekyWz6BR4bWLqr46PQyg0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: mmu/head: Add missing code symbol annotations Message-Id: Date: Thu, 16 May 2024 21:12:04 +0000 commit c9906bd79eb150cd46121b6163991a228432a175 Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:12 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: mmu/head: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/mmu/head.S | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S index fa40b696dd..665a51a337 100644 --- a/xen/arch/arm/arm64/mmu/head.S +++ b/xen/arch/arm/arm64/mmu/head.S @@ -138,7 +138,7 @@ * * Clobbers x0 - x4 */ -create_page_tables: +FUNC_LOCAL(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 @@ -260,7 +260,7 @@ 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) +END(create_page_tables) /* * Turn on the Data Cache and the MMU. The function will return on the 1:1 @@ -273,7 +273,7 @@ ENDPROC(create_page_tables) * * Clobbers x0 - x5 */ -enable_mmu: +FUNC_LOCAL(enable_mmu) mov x4, x0 mov x5, x1 PRINT_ID("- Turning on paging -\r\n") @@ -304,7 +304,7 @@ enable_mmu: PRINT_ID("- Paging turned on -\r\n") ret -ENDPROC(enable_mmu) +END(enable_mmu) /* * Enable mm (turn on the data cache and the MMU) for secondary CPUs. @@ -316,7 +316,7 @@ ENDPROC(enable_mmu) * * Clobbers x0 - x6 */ -ENTRY(enable_secondary_cpu_mm) +FUNC(enable_secondary_cpu_mm) mov x6, lr load_paddr x0, init_ttbr @@ -328,7 +328,7 @@ ENTRY(enable_secondary_cpu_mm) /* Return to the virtual address requested by the caller. */ ret -ENDPROC(enable_secondary_cpu_mm) +END(enable_secondary_cpu_mm) /* * Enable mm (turn on the data cache and the MMU) for the boot CPU. @@ -340,7 +340,7 @@ ENDPROC(enable_secondary_cpu_mm) * * Clobbers x0 - x6 */ -ENTRY(enable_boot_cpu_mm) +FUNC(enable_boot_cpu_mm) mov x6, lr bl create_page_tables @@ -365,7 +365,7 @@ ENTRY(enable_boot_cpu_mm) * by the caller. */ b remove_identity_mapping -ENDPROC(enable_boot_cpu_mm) +END(enable_boot_cpu_mm) /* * Remove the 1:1 map from the page-tables. It is not easy to keep track @@ -377,7 +377,7 @@ ENDPROC(enable_boot_cpu_mm) * * Clobbers x0 - x1 */ -remove_identity_mapping: +FUNC_LOCAL(remove_identity_mapping) /* * Find the zeroeth slot used. Remove the entry from zeroeth * table if the slot is not XEN_ZEROETH_SLOT. @@ -419,20 +419,21 @@ identity_mapping_removed: flush_xen_tlb_local ret -ENDPROC(remove_identity_mapping) +END(remove_identity_mapping) /* Fail-stop */ -fail: PRINT("- Boot failed -\r\n") +FUNC_LOCAL(fail) + PRINT("- Boot failed -\r\n") 1: wfe b 1b -ENDPROC(fail) +END(fail) /* * Switch TTBR * * x0 ttbr */ -ENTRY(switch_ttbr_id) +FUNC(switch_ttbr_id) /* 1) Ensure any previous read/write have completed */ dsb ish isb @@ -464,7 +465,7 @@ ENTRY(switch_ttbr_id) isb ret -ENDPROC(switch_ttbr_id) +END(switch_ttbr_id) /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:12:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:12:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723642.1128658 (Exim 4.92) (envelope-from ) id 1s7iOd-00029W-Il; Thu, 16 May 2024 21:12:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723642.1128658; Thu, 16 May 2024 21:12:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOd-00029O-G3; Thu, 16 May 2024 21:12:15 +0000 Received: by outflank-mailman (input) for mailman id 723642; Thu, 16 May 2024 21:12:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOc-00029F-Et for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOc-0004kc-Dj for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iOc-0006pE-D2 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QyYC2d0h5iKPh6A6XWQXA5YzHf8xkfoMO02BrwTvxVs=; b=BATWogU8Sv1pMqRd4KSFRyFAzM k6nMsFBz1ESYM5tnP6VLpYVL/7MSke+Zg1e7ETaRbTYdyc5hEFoL0hBt/DNZYyMtlj1GM00cBkQ1+ wzrbm4zbIEYDrIRV9H6NzXKOsq3bZ8DLV4JwdGDqORIqv7pbuKzDUYitfvPxuQfS0iTQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: cache: Use the generic xen/linkage.h macros Message-Id: Date: Thu, 16 May 2024 21:12:14 +0000 commit fe1b97d32139b00631377d7d252fec53eb3a7176 Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:13 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: cache: Use the generic xen/linkage.h macros Use the generic xen/linkage.h macros to annotate code symbols. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/cache.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S index 9a88a2b497..66ed85f735 100644 --- a/xen/arch/arm/arm64/cache.S +++ b/xen/arch/arm/arm64/cache.S @@ -40,7 +40,7 @@ * - kaddr - kernel address * - size - size in question */ -ENTRY(__flush_dcache_area) +FUNC(__flush_dcache_area) dcache_line_size x2, x3 add x1, x0, x1 sub x3, x2, #1 @@ -51,4 +51,4 @@ ENTRY(__flush_dcache_area) b.lo 1b dsb sy ret -ENDPROC(__flush_dcache_area) +END(__flush_dcache_area) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:12:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:12:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723643.1128662 (Exim 4.92) (envelope-from ) id 1s7iOn-0002CR-KC; Thu, 16 May 2024 21:12:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723643.1128662; Thu, 16 May 2024 21:12:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOn-0002CK-Hb; Thu, 16 May 2024 21:12:25 +0000 Received: by outflank-mailman (input) for mailman id 723643; Thu, 16 May 2024 21:12:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOm-0002C9-HU for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iOm-0004ku-Gl for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iOm-0006pf-G0 for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:12:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O+WH7sILYDpyzT14Gqm3U2A5NgMo6NyciPYS8GwKtMY=; b=6g1vIuqnk/Wv+32jpYO0JpKufI 8DO3dVbz7jq7g9rntj03Np3RXMhzNgVKXJiKsOKROMlR+d7sx4DsEiaC1rgLqIdGAOUbjoPhHpLbf beZq7wRUjen40emQu173+p3yI44WULCOWzjFsV3TeYQ6BnudqhUzrtXkhA0i/5eWrloE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: lib: Use the generic xen/linkage.h macros Message-Id: Date: Thu, 16 May 2024 21:12:24 +0000 commit d946787a277257c50405e12918c4dc5c330ef95d Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:14 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: lib: Use the generic xen/linkage.h macros Use the generic xen/linkage.h macros to annotate code symbols. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/lib/memchr.S | 4 ++-- xen/arch/arm/arm64/lib/memcmp.S | 4 ++-- xen/arch/arm/arm64/lib/memcpy.S | 4 ++-- xen/arch/arm/arm64/lib/memmove.S | 4 ++-- xen/arch/arm/arm64/lib/memset.S | 4 ++-- xen/arch/arm/arm64/lib/strchr.S | 4 ++-- xen/arch/arm/arm64/lib/strcmp.S | 4 ++-- xen/arch/arm/arm64/lib/strlen.S | 4 ++-- xen/arch/arm/arm64/lib/strncmp.S | 4 ++-- xen/arch/arm/arm64/lib/strnlen.S | 4 ++-- xen/arch/arm/arm64/lib/strrchr.S | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/arm64/lib/memchr.S b/xen/arch/arm/arm64/lib/memchr.S index 81f113bb1c..3d8aeca3ca 100644 --- a/xen/arch/arm/arm64/lib/memchr.S +++ b/xen/arch/arm/arm64/lib/memchr.S @@ -29,7 +29,7 @@ * Returns: * x0 - address of first occurrence of 'c' or 0 */ -ENTRY(memchr) +FUNC(memchr) and w1, w1, #0xff 1: subs x2, x2, #1 b.mi 2f @@ -40,4 +40,4 @@ ENTRY(memchr) ret 2: mov x0, #0 ret -ENDPROC(memchr) +END(memchr) diff --git a/xen/arch/arm/arm64/lib/memcmp.S b/xen/arch/arm/arm64/lib/memcmp.S index 87c2537ffe..d77dd4ce52 100644 --- a/xen/arch/arm/arm64/lib/memcmp.S +++ b/xen/arch/arm/arm64/lib/memcmp.S @@ -57,7 +57,7 @@ pos .req x11 limit_wd .req x12 mask .req x13 -ENTRY(memcmp) +FUNC(memcmp) cbz limit, .Lret0 eor tmp1, src1, src2 tst tmp1, #7 @@ -254,4 +254,4 @@ CPU_LE( rev data2, data2 ) .Lret0: mov result, #0 ret -ENDPROC(memcmp) +END(memcmp) diff --git a/xen/arch/arm/arm64/lib/memcpy.S b/xen/arch/arm/arm64/lib/memcpy.S index d90d20ef3e..1e04b79010 100644 --- a/xen/arch/arm/arm64/lib/memcpy.S +++ b/xen/arch/arm/arm64/lib/memcpy.S @@ -55,7 +55,7 @@ C_h .req x12 D_l .req x13 D_h .req x14 -ENTRY(memcpy) +FUNC(memcpy) mov dst, dstin cmp count, #16 /*When memory length is less than 16, the accessed are not aligned.*/ @@ -197,4 +197,4 @@ ENTRY(memcpy) tst count, #0x3f b.ne .Ltail63 ret -ENDPROC(memcpy) +END(memcpy) diff --git a/xen/arch/arm/arm64/lib/memmove.S b/xen/arch/arm/arm64/lib/memmove.S index a49de845d0..14438dbe9c 100644 --- a/xen/arch/arm/arm64/lib/memmove.S +++ b/xen/arch/arm/arm64/lib/memmove.S @@ -56,7 +56,7 @@ C_h .req x12 D_l .req x13 D_h .req x14 -ENTRY(memmove) +FUNC(memmove) cmp dstin, src b.lo memcpy add tmp1, src, count @@ -193,4 +193,4 @@ ENTRY(memmove) tst count, #0x3f b.ne .Ltail63 ret -ENDPROC(memmove) +END(memmove) diff --git a/xen/arch/arm/arm64/lib/memset.S b/xen/arch/arm/arm64/lib/memset.S index 5bf751521b..367fa60175 100644 --- a/xen/arch/arm/arm64/lib/memset.S +++ b/xen/arch/arm/arm64/lib/memset.S @@ -53,7 +53,7 @@ dst .req x8 tmp3w .req w9 tmp3 .req x9 -ENTRY(memset) +FUNC(memset) mov dst, dstin /* Preserve return value. */ and A_lw, val, #255 orr A_lw, A_lw, A_lw, lsl #8 @@ -212,4 +212,4 @@ ENTRY(memset) ands count, count, zva_bits_x b.ne .Ltail_maybe_long ret -ENDPROC(memset) +END(memset) diff --git a/xen/arch/arm/arm64/lib/strchr.S b/xen/arch/arm/arm64/lib/strchr.S index 0506b0ff7f..83fd81e8ef 100644 --- a/xen/arch/arm/arm64/lib/strchr.S +++ b/xen/arch/arm/arm64/lib/strchr.S @@ -27,7 +27,7 @@ * Returns: * x0 - address of first occurrence of 'c' or 0 */ -ENTRY(strchr) +FUNC(strchr) and w1, w1, #0xff 1: ldrb w2, [x0], #1 cmp w2, w1 @@ -37,4 +37,4 @@ ENTRY(strchr) cmp w2, w1 csel x0, x0, xzr, eq ret -ENDPROC(strchr) +END(strchr) diff --git a/xen/arch/arm/arm64/lib/strcmp.S b/xen/arch/arm/arm64/lib/strcmp.S index c6f42dd255..7677108e26 100644 --- a/xen/arch/arm/arm64/lib/strcmp.S +++ b/xen/arch/arm/arm64/lib/strcmp.S @@ -59,7 +59,7 @@ tmp3 .req x9 zeroones .req x10 pos .req x11 -ENTRY(strcmp) +FUNC(strcmp) eor tmp1, src1, src2 mov zeroones, #REP8_01 tst tmp1, #7 @@ -230,4 +230,4 @@ CPU_BE( orr syndrome, diff, has_nul ) lsr data1, data1, #56 sub result, data1, data2, lsr #56 ret -ENDPROC(strcmp) +END(strcmp) diff --git a/xen/arch/arm/arm64/lib/strlen.S b/xen/arch/arm/arm64/lib/strlen.S index fb6aaf1a6a..10feedaf81 100644 --- a/xen/arch/arm/arm64/lib/strlen.S +++ b/xen/arch/arm/arm64/lib/strlen.S @@ -56,7 +56,7 @@ pos .req x12 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -ENTRY(strlen) +FUNC(strlen) mov zeroones, #REP8_01 bic src, srcin, #15 ands tmp1, srcin, #15 @@ -123,4 +123,4 @@ CPU_LE( lsr tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ csinv data1, data1, xzr, le csel data2, data2, data2a, le b .Lrealigned -ENDPROC(strlen) +END(strlen) diff --git a/xen/arch/arm/arm64/lib/strncmp.S b/xen/arch/arm/arm64/lib/strncmp.S index a4a0f779f5..c00a641fc7 100644 --- a/xen/arch/arm/arm64/lib/strncmp.S +++ b/xen/arch/arm/arm64/lib/strncmp.S @@ -64,7 +64,7 @@ limit_wd .req x13 mask .req x14 endloop .req x15 -ENTRY(strncmp) +FUNC(strncmp) cbz limit, .Lret0 eor tmp1, src1, src2 mov zeroones, #REP8_01 @@ -307,4 +307,4 @@ CPU_BE( orr syndrome, diff, has_nul ) .Lret0: mov result, #0 ret -ENDPROC(strncmp) +END(strncmp) diff --git a/xen/arch/arm/arm64/lib/strnlen.S b/xen/arch/arm/arm64/lib/strnlen.S index 81c8e8b54e..2059ba782c 100644 --- a/xen/arch/arm/arm64/lib/strnlen.S +++ b/xen/arch/arm/arm64/lib/strnlen.S @@ -59,7 +59,7 @@ limit_wd .req x14 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -ENTRY(strnlen) +FUNC(strnlen) cbz limit, .Lhit_limit mov zeroones, #REP8_01 bic src, srcin, #15 @@ -168,4 +168,4 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ .Lhit_limit: mov len, limit ret -ENDPROC(strnlen) +END(strnlen) diff --git a/xen/arch/arm/arm64/lib/strrchr.S b/xen/arch/arm/arm64/lib/strrchr.S index 07059983f8..81033c0822 100644 --- a/xen/arch/arm/arm64/lib/strrchr.S +++ b/xen/arch/arm/arm64/lib/strrchr.S @@ -26,7 +26,7 @@ * Returns: * x0 - address of last occurrence of 'c' or 0 */ -ENTRY(strrchr) +FUNC(strrchr) mov x3, #0 and w1, w1, #0xff 1: ldrb w2, [x0], #1 @@ -37,4 +37,4 @@ ENTRY(strrchr) b 1b 2: mov x0, x3 ret -ENDPROC(strrchr) +END(strrchr) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 16 21:33:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 May 2024 21:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723651.1128677 (Exim 4.92) (envelope-from ) id 1s7iin-0006AH-Ad; Thu, 16 May 2024 21:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723651.1128677; Thu, 16 May 2024 21:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iin-0006AA-7s; Thu, 16 May 2024 21:33:05 +0000 Received: by outflank-mailman (input) for mailman id 723651; Thu, 16 May 2024 21:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iim-0006A4-0Y for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7iil-0005EN-UY for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7iil-0007nv-Sq for xen-changelog@lists.xenproject.org; Thu, 16 May 2024 21:33:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=f7emdfrS9C2P4LCfTjxULpBLztcgZZXCfneOecnPY2M=; b=mZdY8ssfrRj2Cm2hdXNz74EWSm TKqogwBr4rbobMZW13hScXdT9cfF6WBmHUORwSzlvbqc7QPfPUYY9fahcMHLnVA94cFU1e8nATz9o tU5ztPrkvTAq8ghgfxOy1eLY3RtzMOYrkgnBmGQ/ESou/pbK3EPZPIf4Qwy+m1P3TcXU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add DT reserve map regions to bootinfo.reserved_mem Message-Id: Date: Thu, 16 May 2024 21:33:03 +0000 commit 53dc37829c31edf02e8fc56aeccca8d60f6e2f5e Author: Luca Fancellu AuthorDate: Thu Apr 25 14:11:18 2024 +0100 Commit: Julien Grall CommitDate: Thu May 16 22:09:13 2024 +0100 xen/arm: Add DT reserve map regions to bootinfo.reserved_mem Currently the code is listing device tree reserve map regions as reserved memory for Xen, but they are not added into bootinfo.reserved_mem and they are fetched in multiple places using the same code sequence, causing duplication. Fix this by adding them to the bootinfo.reserved_mem at early stage. Signed-off-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/arm32/mmu/mm.c | 29 +--------------------- xen/arch/arm/bootfdt.c | 51 +++++++++++++++++++++++--------------- xen/arch/arm/domain_build.c | 3 ++- xen/arch/arm/include/asm/setup.h | 5 ++++ xen/arch/arm/setup.c | 53 +++++++++++----------------------------- 5 files changed, 53 insertions(+), 88 deletions(-) diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index 23150122f7..be480c31ea 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -73,33 +73,6 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, } } - /* Now check any fdt reserved areas. */ - - nr = fdt_num_mem_rsv(device_tree_flattened); - - for ( ; i < mi->nr_mods + nr; i++ ) - { - paddr_t mod_s, mod_e; - - if ( fdt_get_mem_rsv_paddr(device_tree_flattened, - i - mi->nr_mods, - &mod_s, &mod_e ) < 0 ) - /* If we can't read it, pretend it doesn't exist... */ - continue; - - /* fdt_get_mem_rsv_paddr returns length */ - mod_e += mod_s; - - if ( s < mod_e && mod_s < e ) - { - mod_e = consider_modules(mod_e, e, size, align, i+1); - if ( mod_e ) - return mod_e; - - return consider_modules(s, mod_s, size, align, i+1); - } - } - /* * i is the current bootmodule we are evaluating, across all * possible kinds of bootmodules. @@ -108,7 +81,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, * need to index the reserved_mem bank starting from 0, and only counting * the reserved-memory modules. Hence, we need to use i - nr. */ - nr += mi->nr_mods; + nr = mi->nr_mods; for ( ; i - nr < reserved_mem->nr_banks; i++ ) { paddr_t r_s = reserved_mem->bank[i - nr].start; diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 4d708442a1..6e060111d9 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -475,8 +475,7 @@ static void __init early_print_info(void) const struct membanks *mem_resv = bootinfo_get_reserved_mem(); struct bootmodules *mods = &bootinfo.modules; struct bootcmdlines *cmds = &bootinfo.cmdlines; - unsigned int i, j; - int nr_rsvd; + unsigned int i; for ( i = 0; i < mi->nr_banks; i++ ) printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", @@ -490,26 +489,11 @@ static void __init early_print_info(void) mods->module[i].start + mods->module[i].size, boot_module_kind_as_string(mods->module[i].kind)); - nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); - if ( nr_rsvd < 0 ) - panic("Parsing FDT memory reserve map failed (%d)\n", nr_rsvd); - - for ( i = 0; i < nr_rsvd; i++ ) - { - paddr_t s, e; - - if ( fdt_get_mem_rsv_paddr(device_tree_flattened, i, &s, &e) < 0 ) - continue; - - /* fdt_get_mem_rsv_paddr returns length */ - e += s; - printk(" RESVD[%u]: %"PRIpaddr" - %"PRIpaddr"\n", i, s, e); - } - for ( j = 0; j < mem_resv->nr_banks; j++, i++ ) + for ( i = 0; i < mem_resv->nr_banks; i++ ) { printk(" RESVD[%u]: %"PRIpaddr" - %"PRIpaddr"\n", i, - mem_resv->bank[j].start, - mem_resv->bank[j].start + mem_resv->bank[j].size - 1); + mem_resv->bank[i].start, + mem_resv->bank[i].start + mem_resv->bank[i].size - 1); } early_print_info_shmem(); printk("\n"); @@ -550,7 +534,10 @@ static void __init swap_memory_node(void *_a, void *_b, size_t size) */ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) { + struct membanks *reserved_mem = bootinfo_get_reserved_mem(); struct membanks *mem = bootinfo_get_mem(); + unsigned int i; + int nr_rsvd; int ret; ret = fdt_check_header(fdt); @@ -559,6 +546,30 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) add_boot_module(BOOTMOD_FDT, paddr, fdt_totalsize(fdt), false); + nr_rsvd = fdt_num_mem_rsv(fdt); + if ( nr_rsvd < 0 ) + panic("Parsing FDT memory reserve map failed (%d)\n", nr_rsvd); + + for ( i = 0; i < nr_rsvd; i++ ) + { + struct membank *bank; + paddr_t s, sz; + + if ( fdt_get_mem_rsv_paddr(device_tree_flattened, i, &s, &sz) < 0 ) + continue; + + if ( reserved_mem->nr_banks < reserved_mem->max_banks ) + { + bank = &reserved_mem->bank[reserved_mem->nr_banks]; + bank->start = s; + bank->size = sz; + bank->type = MEMBANK_FDT_RESVMEM; + reserved_mem->nr_banks++; + } + else + panic("Cannot allocate reserved memory bank\n"); + } + ret = device_tree_for_each_node(fdt, 0, early_scan_node, NULL); if ( ret ) panic("Early FDT parsing failed (%d)\n", ret); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f6550809cf..968c497efc 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -793,7 +793,8 @@ int __init make_memory_node(const struct kernel_info *kinfo, int addrcells, u64 start = mem->bank[i].start; u64 size = mem->bank[i].size; - if ( mem->bank[i].type == MEMBANK_STATIC_DOMAIN ) + if ( (mem->bank[i].type == MEMBANK_STATIC_DOMAIN) || + (mem->bank[i].type == MEMBANK_FDT_RESVMEM) ) continue; nr_cells += reg_size; diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 61c15806a7..c34179da93 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -42,6 +42,11 @@ enum membank_type { * in reserved_mem. */ MEMBANK_STATIC_HEAP, + /* + * The MEMBANK_FDT_RESVMEM type is used to indicate whether the memory + * bank is from the FDT reserve map. + */ + MEMBANK_FDT_RESVMEM, }; /* Indicates the maximum number of characters(\0 included) for shm_id */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d242674381..c4e5c19b11 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -210,48 +210,18 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e, const struct membanks *reserved_mem = bootinfo_get_reserved_mem(); #ifdef CONFIG_STATIC_SHM const struct membanks *shmem = bootinfo_get_shmem(); + unsigned int offset; #endif - unsigned int i, nr; - int rc; - - rc = fdt_num_mem_rsv(device_tree_flattened); - if ( rc < 0 ) - panic("Unable to retrieve the number of reserved regions (rc=%d)\n", - rc); - - nr = rc; - - for ( i = first; i < nr ; i++ ) - { - paddr_t r_s, r_e; - - if ( fdt_get_mem_rsv_paddr(device_tree_flattened, i, &r_s, &r_e ) < 0 ) - /* If we can't read it, pretend it doesn't exist... */ - continue; - - r_e += r_s; /* fdt_get_mem_rsv_paddr returns length */ - - if ( s < r_e && r_s < e ) - { - dt_unreserved_regions(r_e, e, cb, i+1); - dt_unreserved_regions(s, r_s, cb, i+1); - return; - } - } + unsigned int i; /* * i is the current bootmodule we are evaluating across all possible * kinds. - * - * When retrieving the corresponding reserved-memory addresses - * below, we need to index the reserved_mem->bank starting - * from 0, and only counting the reserved-memory modules. Hence, - * we need to use i - nr. */ - for ( ; i - nr < reserved_mem->nr_banks; i++ ) + for ( i = first; i < reserved_mem->nr_banks; i++ ) { - paddr_t r_s = reserved_mem->bank[i - nr].start; - paddr_t r_e = r_s + reserved_mem->bank[i - nr].size; + paddr_t r_s = reserved_mem->bank[i].start; + paddr_t r_e = r_s + reserved_mem->bank[i].size; if ( s < r_e && r_s < e ) { @@ -262,11 +232,16 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e, } #ifdef CONFIG_STATIC_SHM - nr += reserved_mem->nr_banks; - for ( ; i - nr < shmem->nr_banks; i++ ) + /* + * When retrieving the corresponding shared memory addresses + * below, we need to index the shmem->bank starting from 0, hence + * we need to use i - reserved_mem->nr_banks. + */ + offset = reserved_mem->nr_banks; + for ( ; i - offset < shmem->nr_banks; i++ ) { - paddr_t r_s = shmem->bank[i - nr].start; - paddr_t r_e = r_s + shmem->bank[i - nr].size; + paddr_t r_s = shmem->bank[i - offset].start; + paddr_t r_e = r_s + shmem->bank[i - offset].size; if ( s < r_e && r_s < e ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 17 01:11:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 01:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723728.1128762 (Exim 4.92) (envelope-from ) id 1s7m7l-0002zm-CL; Fri, 17 May 2024 01:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723728.1128762; Fri, 17 May 2024 01:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7m7l-0002zd-9O; Fri, 17 May 2024 01:11:05 +0000 Received: by outflank-mailman (input) for mailman id 723728; Fri, 17 May 2024 01:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7m7j-0002zX-OD for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 01:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7m7j-0000TI-K6 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 01:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7m7j-0003FJ-IV for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 01:11:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Q4QHYwg8se7Da4KoR1+2zKmfXT142XzGsOghf/XFHwA=; b=joxEdd6wk7M91Cy9GQz1GDdoEP yTsdJg2vPULQA+y+NWdZ38WiAWyq+JicV0in1evbnbRW1cuNjXWE32di4beigxkb2Ei0bgC/K/fMS 7qItBmrWZV1n6LIfey1A4Fl56eRM0F/JKbGcRYQN62APfLBm7Mm2DuQq2ltdUKT1bsjQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] include/ctype.h: fix MISRA R10.2 violation Message-Id: Date: Fri, 17 May 2024 01:11:03 +0000 commit 21611c68702dae2e18cb519a6e166cdceeaff4ca Author: Stefano Stabellini AuthorDate: Wed May 15 15:52:04 2024 -0700 Commit: Stefano Stabellini CommitDate: Thu May 16 18:03:27 2024 -0700 include/ctype.h: fix MISRA R10.2 violation The value returned by __toupper is used in arithmetic operations causing MISRA C 10.2 violations. Cast to plain char in the toupper macro. Also do the same in tolower for consistency. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/include/xen/ctype.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/ctype.h b/xen/include/xen/ctype.h index 6dec944a37..773ac27aa4 100644 --- a/xen/include/xen/ctype.h +++ b/xen/include/xen/ctype.h @@ -48,7 +48,7 @@ static inline unsigned char __toupper(unsigned char c) return c; } -#define tolower(c) __tolower(c) -#define toupper(c) __toupper(c) +#define tolower(c) ((char)__tolower(c)) +#define toupper(c) ((char)__toupper(c)) #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 17 07:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 07:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723852.1128964 (Exim 4.92) (envelope-from ) id 1s7rk8-0000sg-8a; Fri, 17 May 2024 07:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723852.1128964; Fri, 17 May 2024 07:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rk8-0000sY-62; Fri, 17 May 2024 07:11:04 +0000 Received: by outflank-mailman (input) for mailman id 723852; Fri, 17 May 2024 07:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rk6-0000sS-C0 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rk6-0007ln-AM for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7rk6-0000Lz-9K for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IAa4Cf+07T3hqruh28xx78r6prUHRPz95oP8KlACUxQ=; b=T/ZMQT8Zz+2nnSzP2bMq5QXWJD hGwrs2cEu3Qn8Mk4e9KK5JeeON+1BC/CnWUrbF0csfzto02p1xMw+5KrcnMIArb/W6seQiLmCjUM1 kEVr2KgYdun7FI5tnaHp/GUPu4DzBCziELkAQ9/Lnr6SeSmUmLglLeXudnKG4Z0JXy5c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: allow to suppress port-alias probing Message-Id: Date: Fri, 17 May 2024 07:11:02 +0000 commit c09960a1a28ef7ef65d7b090646b605f62fccb77 Author: Jan Beulich AuthorDate: Thu May 16 10:02:34 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 10:02:34 2024 +0200 x86: allow to suppress port-alias probing By default there's already no use for this when we run in shim mode. Plus there may also be a need to suppress the probing in case of issues with it. Before introducing further port alias probing, introduce a command line option allowing to bypass it, default it to on when in shim mode, and gate RTC/CMOS port alias probing on it. Requested-by: Roger Pau Monné Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- docs/misc/xen-command-line.pandoc | 11 +++++++++++ xen/arch/x86/include/asm/setup.h | 1 + xen/arch/x86/setup.c | 6 ++++++ xen/arch/x86/time.c | 3 ++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index e760f3266e..1dea7431fa 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2004,6 +2004,17 @@ INVPCID is supported and not disabled via `invpcid=false`. This is a mask of C-states which are to be used preferably. This option is applicable only on hardware were certain C-states are exclusive of one another. +### probe-port-aliases (x86) +> `= ` + +> Default: `true` outside of shim mode, `false` in shim mode + +Certain devices accessible by I/O ports may be accessible also through "alias" +ports (originally a result of incomplete address decoding). When such devices +are solely under Xen's control, Xen disallows even Dom0 access to the "primary" +ports. When alias probing is active and aliases are detected, "alias" ports +would then be treated similar to the "primary" ones. + ### psr (Intel) > `= List of ( cmt: | rmid_max: | cat: | cos_max: | cdp: )` diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index 1849e60cd6..e48b9d01e9 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -49,6 +49,7 @@ extern unsigned long highmem_start; #endif extern int8_t opt_smt; +extern int8_t opt_probe_port_aliases; #ifdef CONFIG_SHADOW_PAGING extern bool opt_dom0_shadow; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f84e1cd79c..b50c9c84af 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -76,6 +76,9 @@ static bool __initdata opt_invpcid = true; boolean_param("invpcid", opt_invpcid); bool __read_mostly use_invpcid; +int8_t __initdata opt_probe_port_aliases = -1; +boolean_param("probe-port-aliases", opt_probe_port_aliases); + /* Only used in asm code and within this source file */ unsigned long asmlinkage __read_mostly cr4_pv32_mask; @@ -1860,6 +1863,9 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) /* Low mappings were only needed for some BIOS table parsing. */ zap_low_mappings(); + if ( opt_probe_port_aliases < 0 ) + opt_probe_port_aliases = !pv_shim; + init_apic_mappings(); normalise_cpu_order(); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 78ea095e3e..9655971269 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1252,7 +1252,8 @@ static int __init cf_check probe_cmos_alias(void) { unsigned int offs; - if ( acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC ) + if ( (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) || + !opt_probe_port_aliases ) return 0; for ( offs = 2; offs < 8; offs <<= 1 ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 07:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 07:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723855.1128969 (Exim 4.92) (envelope-from ) id 1s7rkI-0000un-Aa; Fri, 17 May 2024 07:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723855.1128969; Fri, 17 May 2024 07:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkI-0000ug-85; Fri, 17 May 2024 07:11:14 +0000 Received: by outflank-mailman (input) for mailman id 723855; Fri, 17 May 2024 07:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkG-0000uS-EO for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkG-0007lx-Db for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7rkG-0000Mi-Ce for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RxmbmpByK7pd3z//svGcq+0OR3+BDWEyv7QGfEbBpCc=; b=u3Qm35Pgh65VHyXBUHmvL/ltXc cp61iEJQ0SERWiWRQjMPJb9A8fyL/80tVF61ww6cJN3Nuv/jhlaDjPO7T3NqHI/Oj/Q3AhwgxQUwE w4oJP0iiOsBbBThb5TIwEdnUkl0rKT7sbqCxlY7PcwksACt5fXvZDwQ91MbBKCSYixlA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: detect PIC aliasing on ports other than 0x[2A][01] Message-Id: Date: Fri, 17 May 2024 07:11:12 +0000 commit d0c611405890a81dcb62439eb82a1da7873d747f Author: Jan Beulich AuthorDate: Thu May 16 10:03:16 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 10:03:16 2024 +0200 x86: detect PIC aliasing on ports other than 0x[2A][01] ... in order to also deny Dom0 access through the alias ports (commonly observed on Intel chipsets). Without this it is only giving the impression of denying access to both PICs. Unlike for CMOS/RTC, do detection very early, to avoid disturbing normal operation later on. Like for CMOS/RTC a fundamental assumption of the probing is that reads from the probed alias port won't have side effects in case it does not alias the respective PIC's one. Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/dom0_build.c | 16 ++++++++---- xen/arch/x86/i8259.c | 55 ++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/include/asm/setup.h | 2 ++ 3 files changed, 68 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 0276924ba2..4288957b2b 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -467,7 +467,7 @@ static void __init process_dom0_ioports_disable(struct domain *dom0) int __init dom0_setup_permissions(struct domain *d) { unsigned long mfn; - unsigned int i; + unsigned int i, offs; int rc; if ( pv_shim ) @@ -480,10 +480,16 @@ int __init dom0_setup_permissions(struct domain *d) /* Modify I/O port access permissions. */ - /* Master Interrupt Controller (PIC). */ - rc |= ioports_deny_access(d, 0x20, 0x21); - /* Slave Interrupt Controller (PIC). */ - rc |= ioports_deny_access(d, 0xA0, 0xA1); + for ( offs = 0, i = ISOLATE_LSB(i8259A_alias_mask) ?: 2; + offs <= i8259A_alias_mask; offs += i ) + { + if ( offs & ~i8259A_alias_mask ) + continue; + /* Master Interrupt Controller (PIC). */ + rc |= ioports_deny_access(d, 0x20 + offs, 0x21 + offs); + /* Slave Interrupt Controller (PIC). */ + rc |= ioports_deny_access(d, 0xA0 + offs, 0xA1 + offs); + } /* ELCR of both PICs. */ rc |= ioports_deny_access(d, 0x4D0, 0x4D1); diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index e0fa1f96b4..10ddd2b0fb 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -333,6 +334,58 @@ void __init make_8259A_irq(unsigned int irq) irq_to_desc(irq)->handler = &i8259A_irq_type; } +unsigned int __initdata i8259A_alias_mask; + +static void __init probe_8259A_alias(void) +{ + unsigned int mask = 0x1e; + uint8_t val = 0; + + if ( !opt_probe_port_aliases ) + return; + + /* + * The only properly r/w register is OCW1. While keeping the master + * fully masked (thus also masking anything coming through the slave), + * write all possible 256 values to the slave's base port, and check + * whether the same value can then be read back through any of the + * possible alias ports. Probing just the slave of course builds on the + * assumption that aliasing is identical for master and slave. + */ + + outb(0xff, 0x21); /* Fully mask master. */ + + do { + unsigned int offs; + + outb(val, 0xa1); + + /* Try to make sure we're actually having a PIC here. */ + if ( inb(0xa1) != val ) + { + mask = 0; + break; + } + + for ( offs = ISOLATE_LSB(mask); offs <= mask; offs <<= 1 ) + { + if ( !(mask & offs) ) + continue; + if ( inb(0xa1 + offs) != val ) + mask &= ~offs; + } + } while ( mask && (val += 0x0d) ); /* Arbitrary uneven number. */ + + outb(cached_A1, 0xa1); /* Restore slave IRQ mask. */ + outb(cached_21, 0x21); /* Restore master IRQ mask. */ + + if ( mask ) + { + dprintk(XENLOG_INFO, "PIC aliasing mask: %02x\n", mask); + i8259A_alias_mask = mask; + } +} + static struct irqaction __read_mostly cascade = { no_action, "cascade", NULL}; void __init init_IRQ(void) @@ -343,6 +396,8 @@ void __init init_IRQ(void) init_8259A(0); + probe_8259A_alias(); + for (irq = 0; platform_legacy_irq(irq); irq++) { struct irq_desc *desc = irq_to_desc(irq); diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index e48b9d01e9..471aed92c2 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -48,6 +48,8 @@ extern uint8_t kbd_shift_flags; extern unsigned long highmem_start; #endif +extern unsigned int i8259A_alias_mask; + extern int8_t opt_smt; extern int8_t opt_probe_port_aliases; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 07:11:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 07:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723856.1128973 (Exim 4.92) (envelope-from ) id 1s7rkS-0000y0-CF; Fri, 17 May 2024 07:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723856.1128973; Fri, 17 May 2024 07:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkS-0000xs-9a; Fri, 17 May 2024 07:11:24 +0000 Received: by outflank-mailman (input) for mailman id 723856; Fri, 17 May 2024 07:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkQ-0000xQ-In for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkQ-0007m7-Ho for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7rkQ-0000NB-G1 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mUIjvDiqFgSxyMTzy1wPIxbQFgQYBRZJExfVKH6OyjM=; b=Z7iLjtn+GB/00YVVAo5UvFblpz g7vIWmel3ldoZrhTusoIJ87Qp2w6cXs2IHFb2D7d/kiMDZC57HdGHqHZcyTH43NxwDUbox1UWcjhD 8mQPbZO24eHPrgGthnc0bvr6dTQHZa09fgNAZ9vrBCBiLmKv0oJa+ESrw7wPVooI8b0o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: put __ffs() into linux compatible header Message-Id: Date: Fri, 17 May 2024 07:11:22 +0000 commit 6628bacc81f35b41bca18948fe9f405da441906f Author: Oleksii Kurochko AuthorDate: Thu May 16 10:08:37 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 10:08:37 2024 +0200 xen/bitops: put __ffs() into linux compatible header The mentioned macros exist only because of Linux compatible purpose. The patch defines __ffs() in terms of Xen bitops and it is safe to define in this way ( as __ffs() - 1 ) as considering that __ffs() was defined as __builtin_ctzl(x), which has undefined behavior when x=0, so it is assumed that such cases are not encountered in the current code. To not include to Xen library files __ffs() and __ffz() were defined locally in find-next-bit.c. Except __ffs() usage in find-next-bit.c only one usage of __ffs() leave in smmu-v3.c. It seems that it __ffs can be changed to ffsl(x)-1 in this file, but to keep smmu-v3.c looks close to linux it was deciced just to define __ffs() in xen/linux-compat.h and include it in smmu-v3.c Signed-off-by: Oleksii Kurochko Acked-by: Shawn Anastasio Reviewed-by: Jan Beulich Acked-by: Michal Orzel Acked-by: Rahul Singh --- xen/arch/arm/include/asm/arm64/bitops.h | 21 --------------------- xen/arch/ppc/include/asm/bitops.h | 21 --------------------- xen/drivers/passthrough/arm/smmu-v3.c | 2 ++ xen/include/xen/linux-compat.h | 2 ++ xen/lib/find-next-bit.c | 3 +++ 5 files changed, 7 insertions(+), 42 deletions(-) diff --git a/xen/arch/arm/include/asm/arm64/bitops.h b/xen/arch/arm/include/asm/arm64/bitops.h index 0efde29068..906d84e5f2 100644 --- a/xen/arch/arm/include/asm/arm64/bitops.h +++ b/xen/arch/arm/include/asm/arm64/bitops.h @@ -1,27 +1,6 @@ #ifndef _ARM_ARM64_BITOPS_H #define _ARM_ARM64_BITOPS_H -/* 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); -} - -/* 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)) - static inline int flsl(unsigned long x) { uint64_t ret; diff --git a/xen/arch/ppc/include/asm/bitops.h b/xen/arch/ppc/include/asm/bitops.h index 5820b9ce7b..bea655796d 100644 --- a/xen/arch/ppc/include/asm/bitops.h +++ b/xen/arch/ppc/include/asm/bitops.h @@ -176,15 +176,6 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #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 @@ -196,18 +187,6 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) #define hweight16(x) __builtin_popcount((uint16_t)(x)) #define hweight8(x) __builtin_popcount((uint8_t)(x)) -/* 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 diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index b1c40c2c0a..6904962467 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -72,12 +72,14 @@ */ #include +#include #include #include #include #include #include #include +#include #include #include #include diff --git a/xen/include/xen/linux-compat.h b/xen/include/xen/linux-compat.h index 62ba71485c..b289dfd894 100644 --- a/xen/include/xen/linux-compat.h +++ b/xen/include/xen/linux-compat.h @@ -19,4 +19,6 @@ typedef int64_t __s64; typedef paddr_t phys_addr_t; +#define __ffs(x) (ffsl(x) - 1UL) + #endif /* __XEN_LINUX_COMPAT_H__ */ diff --git a/xen/lib/find-next-bit.c b/xen/lib/find-next-bit.c index ca6f82277e..761b027398 100644 --- a/xen/lib/find-next-bit.c +++ b/xen/lib/find-next-bit.c @@ -12,6 +12,9 @@ #include +#define __ffs(x) (ffsl(x) - 1) +#define ffz(x) __ffs(~(x)) + #ifndef find_next_bit /* * Find the next set bit in a memory region. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 07:11:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 07:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723857.1128977 (Exim 4.92) (envelope-from ) id 1s7rkb-00011X-Gf; Fri, 17 May 2024 07:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723857.1128977; Fri, 17 May 2024 07:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkb-00011P-Dk; Fri, 17 May 2024 07:11:33 +0000 Received: by outflank-mailman (input) for mailman id 723857; Fri, 17 May 2024 07:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rka-000118-Lc for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rka-0007mG-Km for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7rka-0000Nx-Jw for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xDdYm3JDJqOR9AcFGRFslv9LIZ6n5VhfBEQepviW1CE=; b=YLwOcimOQN3WjQEfy0oDagpZns 8ciOWug/w0xaowg2RjLCwKVIweYKiblcX91IOLpk+2LrlLk5rTYi+VBEvukstTjNbAskDr7CBynM7 CLJ5AnAEGzJ2XhydRGnCC7obDfXJs9xErD2eV6znugeb6YugmXDKkjCERd4YhkbzQ07M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vpmu: separate amd/intel vPMU code Message-Id: Date: Fri, 17 May 2024 07:11:32 +0000 commit a3ec23a940d4df47045408ba682cdc4bf5e902c8 Author: Sergiy Kibrik AuthorDate: Thu May 16 13:34:54 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 13:34:54 2024 +0200 x86/vpmu: separate amd/intel vPMU code Build AMD vPMU when CONFIG_AMD is on, and Intel vPMU when CONFIG_INTEL is on respectively, allowing for a plaftorm-specific build. No functional change intended. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/Makefile | 4 +++- xen/arch/x86/cpu/vpmu.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/Makefile b/xen/arch/x86/cpu/Makefile index 35561fe51d..eafce5f204 100644 --- a/xen/arch/x86/cpu/Makefile +++ b/xen/arch/x86/cpu/Makefile @@ -10,4 +10,6 @@ obj-y += intel.o obj-y += intel_cacheinfo.o obj-y += mwait-idle.o obj-y += shanghai.o -obj-y += vpmu.o vpmu_amd.o vpmu_intel.o +obj-y += vpmu.o +obj-$(CONFIG_AMD) += vpmu_amd.o +obj-$(CONFIG_INTEL) += vpmu_intel.o diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index b2e9881e06..a7bc0cd1fc 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -827,6 +827,7 @@ static int __init cf_check vpmu_init(void) switch ( vendor ) { +#ifdef CONFIG_AMD case X86_VENDOR_AMD: ops = amd_vpmu_init(); break; @@ -834,10 +835,13 @@ static int __init cf_check vpmu_init(void) case X86_VENDOR_HYGON: ops = hygon_vpmu_init(); break; +#endif +#ifdef CONFIG_INTEL case X86_VENDOR_INTEL: ops = core2_vpmu_init(); break; +#endif default: printk(XENLOG_WARNING "VPMU: Unknown CPU vendor: %d. " -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 07:11:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 07:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723858.1128981 (Exim 4.92) (envelope-from ) id 1s7rkl-00014U-Hs; Fri, 17 May 2024 07:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723858.1128981; Fri, 17 May 2024 07:11:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkl-00014M-FH; Fri, 17 May 2024 07:11:43 +0000 Received: by outflank-mailman (input) for mailman id 723858; Fri, 17 May 2024 07:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkk-00014A-Ob for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkk-0007mg-Np for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7rkk-0000ON-N1 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zD6pwbzZJKEN9kEcUIBFOjntE/SP3KtEr8x2fHqUKLY=; b=f3NmNdPD+gH/rogCRonUuRBn0C xmk09ea2R6M3gex10wU39YXi4x85oSDgEF8EJfmWN3FY0WKDyEx4Ikf4HKmgfXbP8KcWBSrXbUeAw FVLtK8JJ9JIGGQUg2MtW8v4+MIIYBXEXa3QE9UhGwxBc800l8fK15yDEwQqZbJTYeu9g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/MCE: guard access to Intel/AMD-specific MCA MSRs Message-Id: Date: Fri, 17 May 2024 07:11:42 +0000 commit 71b5eccbddb4cb94e816ed8e911f3aa00f866e5b Author: Sergiy Kibrik AuthorDate: Thu May 16 13:35:34 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 13:35:34 2024 +0200 x86/MCE: guard access to Intel/AMD-specific MCA MSRs Add build-time checks for newly introduced INTEL/AMD config options when calling vmce_{intel/amd}_{rdmsr/wrmsr}() routines. This way a platform-specific code can be omitted in vmce code, if this platform is disabled in config. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/vmce.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index 353d4f19b2..4da6f4a3e4 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -138,16 +138,20 @@ static int bank_mce_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) default: switch ( boot_cpu_data.x86_vendor ) { +#ifdef CONFIG_INTEL case X86_VENDOR_CENTAUR: case X86_VENDOR_SHANGHAI: case X86_VENDOR_INTEL: ret = vmce_intel_rdmsr(v, msr, val); break; +#endif +#ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: ret = vmce_amd_rdmsr(v, msr, val); break; +#endif default: ret = 0; @@ -271,14 +275,18 @@ static int bank_mce_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) default: switch ( boot_cpu_data.x86_vendor ) { +#ifdef CONFIG_INTEL case X86_VENDOR_INTEL: ret = vmce_intel_wrmsr(v, msr, val); break; +#endif +#ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: ret = vmce_amd_wrmsr(v, msr, val); break; +#endif default: ret = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 07:11:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 07:11:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723859.1128984 (Exim 4.92) (envelope-from ) id 1s7rkv-00017J-JB; Fri, 17 May 2024 07:11:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723859.1128984; Fri, 17 May 2024 07:11:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rkv-00017B-Gi; Fri, 17 May 2024 07:11:53 +0000 Received: by outflank-mailman (input) for mailman id 723859; Fri, 17 May 2024 07:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rku-00016v-RZ for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rku-0007mu-Qq for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7rku-0000P5-Q3 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:11:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=b2/QtoK9a2WgaZ63u+5c0bQz/03BOmILgxa5tBt19Fo=; b=oWDAo6BsV4r4PdnEL4eh0KSGsu 0NXO7bn2liganj4/JCRZZbZ2o8nfljuspt77zyH7EXkoZZxPNkasEMD86CYHPwCk1J7t9CBHP+j2P Gf4k4GhtNGB/dKMV7gnWNGTwDgNfVTZoYgfDGD4R4e545UBR6iOid1mMU+DnCpmW3fm8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/MCE: guard {intel/amd}_mcheck_init() calls Message-Id: Date: Fri, 17 May 2024 07:11:52 +0000 commit f1fa994d890295b2c2535483a54b4bd03ae31f34 Author: Sergiy Kibrik AuthorDate: Thu May 16 13:35:54 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 13:35:54 2024 +0200 x86/MCE: guard {intel/amd}_mcheck_init() calls Guard calls to CPU-specific mcheck init routines in common MCE code using new INTEL/AMD config options. The purpose is not to build platform-specific mcheck code and calls to it, if this platform is disabled in config. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index d179e6b068..fb9dec5b89 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -760,11 +760,14 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp) switch ( c->x86_vendor ) { +#ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: inited = amd_mcheck_init(c, bsp); break; +#endif +#ifdef CONFIG_INTEL case X86_VENDOR_INTEL: switch ( c->x86 ) { @@ -774,6 +777,7 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp) break; } break; +#endif default: break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 07:12:03 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 07:12:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.723861.1129000 (Exim 4.92) (envelope-from ) id 1s7rl5-0001RX-TR; Fri, 17 May 2024 07:12:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723861.1129000; Fri, 17 May 2024 07:12:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rl5-0001RP-P7; Fri, 17 May 2024 07:12:03 +0000 Received: by outflank-mailman (input) for mailman id 723861; Fri, 17 May 2024 07:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rl4-0001QJ-Uw for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7rl4-0007nI-U6 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s7rl4-0000QH-T6 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 07: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=OcmNzma7EqLbKH75NmKaFQs7l55gE6FTbEXXfGWA6bU=; b=C80XNdr8AUFfes/m9LSBxDQhyU a7W0SBHconDYxTJAHMQxM4Z58DC1d77aD3n6hbx4C3ZQ804rRd9XdrEwT7hdzQKg3XkMa5Mlf0vVB Seih+Zu8U1BxPLeADF4btZt6aBxP/+OwaYBQMLpvCKlfj/LZAYWK3mJluVIBNsvQV1lo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: move altp2m-related code to separate file Message-Id: Date: Fri, 17 May 2024 07:12:02 +0000 commit ae7584f63678cd9adc1c2f3a1e813b67a6b24544 Author: Sergiy Kibrik AuthorDate: Thu May 16 13:36:22 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 16 13:36:22 2024 +0200 x86/p2m: move altp2m-related code to separate file Move altp2m code from generic p2m.c file to altp2m.c, so it is kept separately and can possibly be disabled in the build. We may want to disable it when building for specific platform only, that doesn't support alternate p2m. No functional change intended. Signed-off-by: Sergiy Kibrik Acked-by: Jan Beulich --- xen/arch/x86/mm/altp2m.c | 630 ++++++++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm/p2m.c | 632 +---------------------------------------------- xen/arch/x86/mm/p2m.h | 3 + 3 files changed, 635 insertions(+), 630 deletions(-) diff --git a/xen/arch/x86/mm/altp2m.c b/xen/arch/x86/mm/altp2m.c index a04297b646..6fe1e9ed6b 100644 --- a/xen/arch/x86/mm/altp2m.c +++ b/xen/arch/x86/mm/altp2m.c @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include "mm-locks.h" #include "p2m.h" @@ -151,6 +153,634 @@ void p2m_teardown_altp2m(struct domain *d) } } +int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn, + p2m_type_t *t, p2m_access_t *a, + bool prepopulate) +{ + *mfn = ap2m->get_entry(ap2m, gfn, t, a, 0, NULL, NULL); + + /* Check host p2m if no valid entry in alternate */ + if ( !mfn_valid(*mfn) && !p2m_is_hostp2m(ap2m) ) + { + struct p2m_domain *hp2m = p2m_get_hostp2m(ap2m->domain); + unsigned int page_order; + int rc; + + *mfn = p2m_get_gfn_type_access(hp2m, gfn, t, a, P2M_ALLOC | P2M_UNSHARE, + &page_order, 0); + + rc = -ESRCH; + if ( !mfn_valid(*mfn) || *t != p2m_ram_rw ) + return rc; + + /* If this is a superpage, copy that first */ + if ( prepopulate && page_order != PAGE_ORDER_4K ) + { + unsigned long mask = ~((1UL << page_order) - 1); + gfn_t gfn_aligned = _gfn(gfn_x(gfn) & mask); + mfn_t mfn_aligned = _mfn(mfn_x(*mfn) & mask); + + rc = ap2m->set_entry(ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a, 1); + if ( rc ) + return rc; + } + } + + return 0; +} + +void p2m_altp2m_check(struct vcpu *v, uint16_t idx) +{ + if ( altp2m_active(v->domain) ) + p2m_switch_vcpu_altp2m_by_id(v, idx); +} + +bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx) +{ + struct domain *d = v->domain; + bool rc = false; + + if ( idx >= MAX_ALTP2M ) + return rc; + + altp2m_list_lock(d); + + if ( d->arch.altp2m_eptp[idx] != mfn_x(INVALID_MFN) ) + { + if ( p2m_set_altp2m(v, idx) ) + altp2m_vcpu_update_p2m(v); + rc = 1; + } + + altp2m_list_unlock(d); + return rc; +} + +/* + * Read info about the gfn in an altp2m, locking the gfn. + * + * If the entry is valid, pass the results back to the caller. + * + * If the entry was invalid, and the host's entry is also invalid, + * return to the caller without any changes. + * + * If the entry is invalid, and the host entry was valid, propagate + * the host's entry to the altp2m (retaining page order), and indicate + * that the caller should re-try the faulting instruction. + */ +bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, + mfn_t *mfn, p2m_type_t *p2mt, + p2m_access_t *p2ma, unsigned int *page_order) +{ + p2m_type_t ap2mt; + p2m_access_t ap2ma; + unsigned int cur_order; + unsigned long mask; + gfn_t gfn; + mfn_t amfn; + int rc; + + /* + * NB we must get the full lock on the altp2m here, in addition to + * the lock on the individual gfn, since we may change a range of + * gfns below. + */ + p2m_lock(ap2m); + + amfn = get_gfn_type_access(ap2m, gfn_l, &ap2mt, &ap2ma, 0, &cur_order); + + if ( cur_order > *page_order ) + cur_order = *page_order; + + if ( !mfn_eq(amfn, INVALID_MFN) ) + { + p2m_unlock(ap2m); + *mfn = amfn; + *p2mt = ap2mt; + *p2ma = ap2ma; + *page_order = cur_order; + return false; + } + + /* Host entry is also invalid; don't bother setting the altp2m entry. */ + if ( mfn_eq(*mfn, INVALID_MFN) ) + { + p2m_unlock(ap2m); + *page_order = cur_order; + return false; + } + + /* + * If this is a superpage mapping, round down both frame numbers + * to the start of the superpage. NB that we repupose `amfn` + * here. + */ + mask = ~((1UL << cur_order) - 1); + amfn = _mfn(mfn_x(*mfn) & mask); + gfn = _gfn(gfn_l & mask); + + /* Override the altp2m entry with its default access. */ + *p2ma = ap2m->default_access; + + rc = p2m_set_entry(ap2m, gfn, amfn, cur_order, *p2mt, *p2ma); + p2m_unlock(ap2m); + + if ( rc ) + { + gprintk(XENLOG_ERR, + "failed to set entry for %"PRI_gfn" -> %"PRI_mfn" altp2m %u, rc %d\n", + gfn_l, mfn_x(amfn), vcpu_altp2m(current).p2midx, rc); + domain_crash(ap2m->domain); + } + + return true; +} + +enum altp2m_reset_type { + ALTP2M_RESET, + ALTP2M_DEACTIVATE +}; + +static void p2m_reset_altp2m(struct domain *d, unsigned int idx, + enum altp2m_reset_type reset_type) +{ + struct p2m_domain *p2m; + + ASSERT(idx < MAX_ALTP2M); + p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + + p2m_lock(p2m); + + p2m_flush_table_locked(p2m); + + if ( reset_type == ALTP2M_DEACTIVATE ) + p2m_free_logdirty(p2m); + + /* Uninit and reinit ept to force TLB shootdown */ + ept_p2m_uninit(p2m); + ept_p2m_init(p2m); + + p2m->min_remapped_gfn = gfn_x(INVALID_GFN); + p2m->max_remapped_gfn = 0; + + p2m_unlock(p2m); +} + +void p2m_flush_altp2m(struct domain *d) +{ + unsigned int i; + + altp2m_list_lock(d); + + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + p2m_reset_altp2m(d, i, ALTP2M_DEACTIVATE); + d->arch.altp2m_eptp[i] = mfn_x(INVALID_MFN); + d->arch.altp2m_visible_eptp[i] = mfn_x(INVALID_MFN); + } + + altp2m_list_unlock(d); +} + +static int p2m_activate_altp2m(struct domain *d, unsigned int idx, + p2m_access_t hvmmem_default_access) +{ + struct p2m_domain *hostp2m, *p2m; + int rc; + + ASSERT(idx < MAX_ALTP2M); + + p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + hostp2m = p2m_get_hostp2m(d); + + p2m_lock(p2m); + + rc = p2m_init_logdirty(p2m); + + if ( rc ) + goto out; + + /* The following is really just a rangeset copy. */ + rc = rangeset_merge(p2m->logdirty_ranges, hostp2m->logdirty_ranges); + + if ( rc ) + { + p2m_free_logdirty(p2m); + goto out; + } + + p2m->default_access = hvmmem_default_access; + p2m->domain = hostp2m->domain; + p2m->global_logdirty = hostp2m->global_logdirty; + p2m->min_remapped_gfn = gfn_x(INVALID_GFN); + p2m->max_mapped_pfn = p2m->max_remapped_gfn = 0; + + p2m_init_altp2m_ept(d, idx); + + out: + p2m_unlock(p2m); + + return rc; +} + +int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx) +{ + int rc = -EINVAL; + struct p2m_domain *hostp2m = p2m_get_hostp2m(d); + + if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + return rc; + + altp2m_list_lock(d); + + if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + rc = p2m_activate_altp2m(d, idx, hostp2m->default_access); + + altp2m_list_unlock(d); + return rc; +} + +int p2m_init_next_altp2m(struct domain *d, uint16_t *idx, + xenmem_access_t hvmmem_default_access) +{ + int rc = -EINVAL; + unsigned int i; + p2m_access_t a; + struct p2m_domain *hostp2m = p2m_get_hostp2m(d); + + if ( hvmmem_default_access > XENMEM_access_default || + !xenmem_access_to_p2m_access(hostp2m, hvmmem_default_access, &a) ) + return rc; + + altp2m_list_lock(d); + + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) + continue; + + rc = p2m_activate_altp2m(d, i, a); + + if ( !rc ) + *idx = i; + + break; + } + + altp2m_list_unlock(d); + return rc; +} + +int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) +{ + struct p2m_domain *p2m; + int rc = -EBUSY; + + if ( !idx || idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + return rc; + + rc = domain_pause_except_self(d); + if ( rc ) + return rc; + + rc = -EBUSY; + altp2m_list_lock(d); + + if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] != + mfn_x(INVALID_MFN) ) + { + p2m = array_access_nospec(d->arch.altp2m_p2m, idx); + + if ( !_atomic_read(p2m->active_vcpus) ) + { + p2m_reset_altp2m(d, idx, ALTP2M_DEACTIVATE); + d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] = + mfn_x(INVALID_MFN); + d->arch.altp2m_visible_eptp[array_index_nospec(idx, MAX_EPTP)] = + mfn_x(INVALID_MFN); + rc = 0; + } + } + + altp2m_list_unlock(d); + + domain_unpause_except_self(d); + + return rc; +} + +int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) +{ + struct vcpu *v; + int rc = -EINVAL; + + if ( idx >= MAX_ALTP2M ) + return rc; + + rc = domain_pause_except_self(d); + if ( rc ) + return rc; + + rc = -EINVAL; + altp2m_list_lock(d); + + if ( d->arch.altp2m_visible_eptp[idx] != mfn_x(INVALID_MFN) ) + { + for_each_vcpu( d, v ) + if ( p2m_set_altp2m(v, idx) ) + altp2m_vcpu_update_p2m(v); + + rc = 0; + } + + altp2m_list_unlock(d); + + domain_unpause_except_self(d); + + return rc; +} + +int p2m_change_altp2m_gfn(struct domain *d, unsigned int idx, + gfn_t old_gfn, gfn_t new_gfn) +{ + struct p2m_domain *hp2m, *ap2m; + p2m_access_t a; + p2m_type_t t; + mfn_t mfn; + int rc = -EINVAL; + + if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || + d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + return rc; + + hp2m = p2m_get_hostp2m(d); + ap2m = array_access_nospec(d->arch.altp2m_p2m, idx); + + p2m_lock(hp2m); + p2m_lock(ap2m); + + if ( gfn_eq(new_gfn, INVALID_GFN) ) + { + mfn = ap2m->get_entry(ap2m, old_gfn, &t, &a, 0, NULL, NULL); + rc = mfn_valid(mfn) + ? p2m_remove_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K) + : 0; + goto out; + } + + rc = altp2m_get_effective_entry(ap2m, old_gfn, &mfn, &t, &a, + AP2MGET_prepopulate); + if ( rc ) + goto out; + + rc = altp2m_get_effective_entry(ap2m, new_gfn, &mfn, &t, &a, + AP2MGET_query); + if ( rc ) + goto out; + + if ( !ap2m->set_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K, t, a, + (current->domain != d)) ) + { + rc = 0; + + if ( gfn_x(new_gfn) < ap2m->min_remapped_gfn ) + ap2m->min_remapped_gfn = gfn_x(new_gfn); + if ( gfn_x(new_gfn) > ap2m->max_remapped_gfn ) + ap2m->max_remapped_gfn = gfn_x(new_gfn); + } + + out: + p2m_unlock(ap2m); + p2m_unlock(hp2m); + return rc; +} + +int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, + mfn_t mfn, unsigned int page_order, + p2m_type_t p2mt, p2m_access_t p2ma) +{ + struct p2m_domain *p2m; + unsigned int i; + unsigned int reset_count = 0; + unsigned int last_reset_idx = ~0; + int ret = 0; + + if ( !altp2m_active(d) ) + return 0; + + altp2m_list_lock(d); + + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + p2m_type_t t; + p2m_access_t a; + + if ( d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) + continue; + + p2m = d->arch.altp2m_p2m[i]; + + /* Check for a dropped page that may impact this altp2m */ + if ( mfn_eq(mfn, INVALID_MFN) && + gfn_x(gfn) + (1UL << page_order) > p2m->min_remapped_gfn && + gfn_x(gfn) <= p2m->max_remapped_gfn ) + { + if ( !reset_count++ ) + { + p2m_reset_altp2m(d, i, ALTP2M_RESET); + last_reset_idx = i; + } + else + { + /* At least 2 altp2m's impacted, so reset everything */ + for ( i = 0; i < MAX_ALTP2M; i++ ) + { + if ( i == last_reset_idx || + d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) + continue; + + p2m_reset_altp2m(d, i, ALTP2M_RESET); + } + + ret = 0; + break; + } + } + else if ( !mfn_eq(get_gfn_type_access(p2m, gfn_x(gfn), &t, &a, 0, + NULL), INVALID_MFN) ) + { + int rc = p2m_set_entry(p2m, gfn, mfn, page_order, p2mt, p2ma); + + /* Best effort: Don't bail on error. */ + if ( !ret ) + ret = rc; + + p2m_put_gfn(p2m, gfn); + } + else + p2m_put_gfn(p2m, gfn); + } + + altp2m_list_unlock(d); + + return ret; +} + +/* + * Set/clear the #VE suppress bit for a page. Only available on VMX. + */ +int p2m_set_suppress_ve(struct domain *d, gfn_t gfn, bool suppress_ve, + unsigned int altp2m_idx) +{ + int rc; + struct xen_hvm_altp2m_suppress_ve_multi sve = { + altp2m_idx, suppress_ve, 0, 0, gfn_x(gfn), gfn_x(gfn), 0 + }; + + if ( !(rc = p2m_set_suppress_ve_multi(d, &sve)) ) + rc = sve.first_error; + + return rc; +} + +/* + * Set/clear the #VE suppress bit for multiple pages. Only available on VMX. + */ +int p2m_set_suppress_ve_multi(struct domain *d, + struct xen_hvm_altp2m_suppress_ve_multi *sve) +{ + struct p2m_domain *host_p2m = p2m_get_hostp2m(d); + struct p2m_domain *ap2m = NULL; + struct p2m_domain *p2m = host_p2m; + uint64_t start = sve->first_gfn; + int rc = 0; + + if ( sve->view > 0 ) + { + if ( sve->view >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || + d->arch.altp2m_eptp[array_index_nospec(sve->view, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + return -EINVAL; + + p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, sve->view); + } + + p2m_lock(host_p2m); + + if ( ap2m ) + p2m_lock(ap2m); + + while ( sve->last_gfn >= start ) + { + p2m_access_t a; + p2m_type_t t; + mfn_t mfn; + int err = 0; + + if ( (err = altp2m_get_effective_entry(p2m, _gfn(start), &mfn, &t, &a, + AP2MGET_query)) && + !sve->first_error ) + { + sve->first_error_gfn = start; /* Save the gfn of the first error */ + sve->first_error = err; /* Save the first error code */ + } + + if ( !err && (err = p2m->set_entry(p2m, _gfn(start), mfn, + PAGE_ORDER_4K, t, a, + sve->suppress_ve)) && + !sve->first_error ) + { + sve->first_error_gfn = start; /* Save the gfn of the first error */ + sve->first_error = err; /* Save the first error code */ + } + + /* Check for continuation if it's not the last iteration. */ + if ( sve->last_gfn >= ++start && hypercall_preempt_check() ) + { + rc = -ERESTART; + break; + } + } + + sve->first_gfn = start; + + if ( ap2m ) + p2m_unlock(ap2m); + + p2m_unlock(host_p2m); + + return rc; +} + +int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve, + unsigned int altp2m_idx) +{ + struct p2m_domain *host_p2m = p2m_get_hostp2m(d); + struct p2m_domain *ap2m = NULL; + struct p2m_domain *p2m; + mfn_t mfn; + p2m_access_t a; + p2m_type_t t; + int rc = 0; + + if ( altp2m_idx > 0 ) + { + if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || + d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + return -EINVAL; + + p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + } + else + p2m = host_p2m; + + gfn_lock(host_p2m, gfn, 0); + + if ( ap2m ) + p2m_lock(ap2m); + + mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL, suppress_ve); + if ( !mfn_valid(mfn) ) + rc = -ESRCH; + + if ( ap2m ) + p2m_unlock(ap2m); + + gfn_unlock(host_p2m, gfn, 0); + + return rc; +} + +int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, + uint8_t visible) +{ + int rc = 0; + + altp2m_list_lock(d); + + /* + * Eptp index is correlated with altp2m index and should not exceed + * min(MAX_ALTP2M, MAX_EPTP). + */ + if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || + d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == + mfn_x(INVALID_MFN) ) + rc = -EINVAL; + else if ( visible ) + d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = + d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)]; + else + d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = + mfn_x(INVALID_MFN); + + altp2m_list_unlock(d); + + return rc; +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index ce742c12e0..4a4620e870 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -500,7 +500,7 @@ int p2m_alloc_table(struct p2m_domain *p2m) return 0; } -static int __must_check +int p2m_remove_entry(struct p2m_domain *p2m, gfn_t gfn, mfn_t mfn, unsigned int page_order) { @@ -1329,7 +1329,7 @@ p2m_getlru_nestedp2m(struct domain *d, struct p2m_domain *p2m) return p2m; } -static void +void p2m_flush_table_locked(struct p2m_domain *p2m) { struct page_info *top, *pg; @@ -1729,481 +1729,6 @@ int unmap_mmio_regions(struct domain *d, return i == nr ? 0 : i ?: ret; } -int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *mfn, - p2m_type_t *t, p2m_access_t *a, - bool prepopulate) -{ - *mfn = ap2m->get_entry(ap2m, gfn, t, a, 0, NULL, NULL); - - /* Check host p2m if no valid entry in alternate */ - if ( !mfn_valid(*mfn) && !p2m_is_hostp2m(ap2m) ) - { - struct p2m_domain *hp2m = p2m_get_hostp2m(ap2m->domain); - unsigned int page_order; - int rc; - - *mfn = p2m_get_gfn_type_access(hp2m, gfn, t, a, P2M_ALLOC | P2M_UNSHARE, - &page_order, 0); - - rc = -ESRCH; - if ( !mfn_valid(*mfn) || *t != p2m_ram_rw ) - return rc; - - /* If this is a superpage, copy that first */ - if ( prepopulate && page_order != PAGE_ORDER_4K ) - { - unsigned long mask = ~((1UL << page_order) - 1); - gfn_t gfn_aligned = _gfn(gfn_x(gfn) & mask); - mfn_t mfn_aligned = _mfn(mfn_x(*mfn) & mask); - - rc = ap2m->set_entry(ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a, 1); - if ( rc ) - return rc; - } - } - - return 0; -} - -void p2m_altp2m_check(struct vcpu *v, uint16_t idx) -{ - if ( altp2m_active(v->domain) ) - p2m_switch_vcpu_altp2m_by_id(v, idx); -} - -bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx) -{ - struct domain *d = v->domain; - bool rc = false; - - if ( idx >= MAX_ALTP2M ) - return rc; - - altp2m_list_lock(d); - - if ( d->arch.altp2m_eptp[idx] != mfn_x(INVALID_MFN) ) - { - if ( p2m_set_altp2m(v, idx) ) - altp2m_vcpu_update_p2m(v); - rc = 1; - } - - altp2m_list_unlock(d); - return rc; -} - -/* - * Read info about the gfn in an altp2m, locking the gfn. - * - * If the entry is valid, pass the results back to the caller. - * - * If the entry was invalid, and the host's entry is also invalid, - * return to the caller without any changes. - * - * If the entry is invalid, and the host entry was valid, propagate - * the host's entry to the altp2m (retaining page order), and indicate - * that the caller should re-try the faulting instruction. - */ -bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, - mfn_t *mfn, p2m_type_t *p2mt, - p2m_access_t *p2ma, unsigned int *page_order) -{ - p2m_type_t ap2mt; - p2m_access_t ap2ma; - unsigned int cur_order; - unsigned long mask; - gfn_t gfn; - mfn_t amfn; - int rc; - - /* - * NB we must get the full lock on the altp2m here, in addition to - * the lock on the individual gfn, since we may change a range of - * gfns below. - */ - p2m_lock(ap2m); - - amfn = get_gfn_type_access(ap2m, gfn_l, &ap2mt, &ap2ma, 0, &cur_order); - - if ( cur_order > *page_order ) - cur_order = *page_order; - - if ( !mfn_eq(amfn, INVALID_MFN) ) - { - p2m_unlock(ap2m); - *mfn = amfn; - *p2mt = ap2mt; - *p2ma = ap2ma; - *page_order = cur_order; - return false; - } - - /* Host entry is also invalid; don't bother setting the altp2m entry. */ - if ( mfn_eq(*mfn, INVALID_MFN) ) - { - p2m_unlock(ap2m); - *page_order = cur_order; - return false; - } - - /* - * If this is a superpage mapping, round down both frame numbers - * to the start of the superpage. NB that we repupose `amfn` - * here. - */ - mask = ~((1UL << cur_order) - 1); - amfn = _mfn(mfn_x(*mfn) & mask); - gfn = _gfn(gfn_l & mask); - - /* Override the altp2m entry with its default access. */ - *p2ma = ap2m->default_access; - - rc = p2m_set_entry(ap2m, gfn, amfn, cur_order, *p2mt, *p2ma); - p2m_unlock(ap2m); - - if ( rc ) - { - gprintk(XENLOG_ERR, - "failed to set entry for %"PRI_gfn" -> %"PRI_mfn" altp2m %u, rc %d\n", - gfn_l, mfn_x(amfn), vcpu_altp2m(current).p2midx, rc); - domain_crash(ap2m->domain); - } - - return true; -} - -enum altp2m_reset_type { - ALTP2M_RESET, - ALTP2M_DEACTIVATE -}; - -static void p2m_reset_altp2m(struct domain *d, unsigned int idx, - enum altp2m_reset_type reset_type) -{ - struct p2m_domain *p2m; - - ASSERT(idx < MAX_ALTP2M); - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); - - p2m_lock(p2m); - - p2m_flush_table_locked(p2m); - - if ( reset_type == ALTP2M_DEACTIVATE ) - p2m_free_logdirty(p2m); - - /* Uninit and reinit ept to force TLB shootdown */ - ept_p2m_uninit(p2m); - ept_p2m_init(p2m); - - p2m->min_remapped_gfn = gfn_x(INVALID_GFN); - p2m->max_remapped_gfn = 0; - - p2m_unlock(p2m); -} - -void p2m_flush_altp2m(struct domain *d) -{ - unsigned int i; - - altp2m_list_lock(d); - - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - p2m_reset_altp2m(d, i, ALTP2M_DEACTIVATE); - d->arch.altp2m_eptp[i] = mfn_x(INVALID_MFN); - d->arch.altp2m_visible_eptp[i] = mfn_x(INVALID_MFN); - } - - altp2m_list_unlock(d); -} - -static int p2m_activate_altp2m(struct domain *d, unsigned int idx, - p2m_access_t hvmmem_default_access) -{ - struct p2m_domain *hostp2m, *p2m; - int rc; - - ASSERT(idx < MAX_ALTP2M); - - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); - hostp2m = p2m_get_hostp2m(d); - - p2m_lock(p2m); - - rc = p2m_init_logdirty(p2m); - - if ( rc ) - goto out; - - /* The following is really just a rangeset copy. */ - rc = rangeset_merge(p2m->logdirty_ranges, hostp2m->logdirty_ranges); - - if ( rc ) - { - p2m_free_logdirty(p2m); - goto out; - } - - p2m->default_access = hvmmem_default_access; - p2m->domain = hostp2m->domain; - p2m->global_logdirty = hostp2m->global_logdirty; - p2m->min_remapped_gfn = gfn_x(INVALID_GFN); - p2m->max_mapped_pfn = p2m->max_remapped_gfn = 0; - - p2m_init_altp2m_ept(d, idx); - - out: - p2m_unlock(p2m); - - return rc; -} - -int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx) -{ - int rc = -EINVAL; - struct p2m_domain *hostp2m = p2m_get_hostp2m(d); - - if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) - return rc; - - altp2m_list_lock(d); - - if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - rc = p2m_activate_altp2m(d, idx, hostp2m->default_access); - - altp2m_list_unlock(d); - return rc; -} - -int p2m_init_next_altp2m(struct domain *d, uint16_t *idx, - xenmem_access_t hvmmem_default_access) -{ - int rc = -EINVAL; - unsigned int i; - p2m_access_t a; - struct p2m_domain *hostp2m = p2m_get_hostp2m(d); - - if ( hvmmem_default_access > XENMEM_access_default || - !xenmem_access_to_p2m_access(hostp2m, hvmmem_default_access, &a) ) - return rc; - - altp2m_list_lock(d); - - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) - continue; - - rc = p2m_activate_altp2m(d, i, a); - - if ( !rc ) - *idx = i; - - break; - } - - altp2m_list_unlock(d); - return rc; -} - -int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) -{ - struct p2m_domain *p2m; - int rc = -EBUSY; - - if ( !idx || idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) - return rc; - - rc = domain_pause_except_self(d); - if ( rc ) - return rc; - - rc = -EBUSY; - altp2m_list_lock(d); - - if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] != - mfn_x(INVALID_MFN) ) - { - p2m = array_access_nospec(d->arch.altp2m_p2m, idx); - - if ( !_atomic_read(p2m->active_vcpus) ) - { - p2m_reset_altp2m(d, idx, ALTP2M_DEACTIVATE); - d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] = - mfn_x(INVALID_MFN); - d->arch.altp2m_visible_eptp[array_index_nospec(idx, MAX_EPTP)] = - mfn_x(INVALID_MFN); - rc = 0; - } - } - - altp2m_list_unlock(d); - - domain_unpause_except_self(d); - - return rc; -} - -int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) -{ - struct vcpu *v; - int rc = -EINVAL; - - if ( idx >= MAX_ALTP2M ) - return rc; - - rc = domain_pause_except_self(d); - if ( rc ) - return rc; - - rc = -EINVAL; - altp2m_list_lock(d); - - if ( d->arch.altp2m_visible_eptp[idx] != mfn_x(INVALID_MFN) ) - { - for_each_vcpu( d, v ) - if ( p2m_set_altp2m(v, idx) ) - altp2m_vcpu_update_p2m(v); - - rc = 0; - } - - altp2m_list_unlock(d); - - domain_unpause_except_self(d); - - return rc; -} - -int p2m_change_altp2m_gfn(struct domain *d, unsigned int idx, - gfn_t old_gfn, gfn_t new_gfn) -{ - struct p2m_domain *hp2m, *ap2m; - p2m_access_t a; - p2m_type_t t; - mfn_t mfn; - int rc = -EINVAL; - - if ( idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - return rc; - - hp2m = p2m_get_hostp2m(d); - ap2m = array_access_nospec(d->arch.altp2m_p2m, idx); - - p2m_lock(hp2m); - p2m_lock(ap2m); - - if ( gfn_eq(new_gfn, INVALID_GFN) ) - { - mfn = ap2m->get_entry(ap2m, old_gfn, &t, &a, 0, NULL, NULL); - rc = mfn_valid(mfn) - ? p2m_remove_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K) - : 0; - goto out; - } - - rc = altp2m_get_effective_entry(ap2m, old_gfn, &mfn, &t, &a, - AP2MGET_prepopulate); - if ( rc ) - goto out; - - rc = altp2m_get_effective_entry(ap2m, new_gfn, &mfn, &t, &a, - AP2MGET_query); - if ( rc ) - goto out; - - if ( !ap2m->set_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K, t, a, - (current->domain != d)) ) - { - rc = 0; - - if ( gfn_x(new_gfn) < ap2m->min_remapped_gfn ) - ap2m->min_remapped_gfn = gfn_x(new_gfn); - if ( gfn_x(new_gfn) > ap2m->max_remapped_gfn ) - ap2m->max_remapped_gfn = gfn_x(new_gfn); - } - - out: - p2m_unlock(ap2m); - p2m_unlock(hp2m); - return rc; -} - -int p2m_altp2m_propagate_change(struct domain *d, gfn_t gfn, - mfn_t mfn, unsigned int page_order, - p2m_type_t p2mt, p2m_access_t p2ma) -{ - struct p2m_domain *p2m; - unsigned int i; - unsigned int reset_count = 0; - unsigned int last_reset_idx = ~0; - int ret = 0; - - if ( !altp2m_active(d) ) - return 0; - - altp2m_list_lock(d); - - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - p2m_type_t t; - p2m_access_t a; - - if ( d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) - continue; - - p2m = d->arch.altp2m_p2m[i]; - - /* Check for a dropped page that may impact this altp2m */ - if ( mfn_eq(mfn, INVALID_MFN) && - gfn_x(gfn) + (1UL << page_order) > p2m->min_remapped_gfn && - gfn_x(gfn) <= p2m->max_remapped_gfn ) - { - if ( !reset_count++ ) - { - p2m_reset_altp2m(d, i, ALTP2M_RESET); - last_reset_idx = i; - } - else - { - /* At least 2 altp2m's impacted, so reset everything */ - for ( i = 0; i < MAX_ALTP2M; i++ ) - { - if ( i == last_reset_idx || - d->arch.altp2m_eptp[i] == mfn_x(INVALID_MFN) ) - continue; - - p2m_reset_altp2m(d, i, ALTP2M_RESET); - } - - ret = 0; - break; - } - } - else if ( !mfn_eq(get_gfn_type_access(p2m, gfn_x(gfn), &t, &a, 0, - NULL), INVALID_MFN) ) - { - int rc = p2m_set_entry(p2m, gfn, mfn, page_order, p2mt, p2ma); - - /* Best effort: Don't bail on error. */ - if ( !ret ) - ret = rc; - - p2m_put_gfn(p2m, gfn); - } - else - p2m_put_gfn(p2m, gfn); - } - - altp2m_list_unlock(d); - - return ret; -} - /*** Audit ***/ #if P2M_AUDIT @@ -2540,159 +2065,6 @@ int xenmem_add_to_physmap_one( return rc; } -/* - * Set/clear the #VE suppress bit for a page. Only available on VMX. - */ -int p2m_set_suppress_ve(struct domain *d, gfn_t gfn, bool suppress_ve, - unsigned int altp2m_idx) -{ - int rc; - struct xen_hvm_altp2m_suppress_ve_multi sve = { - altp2m_idx, suppress_ve, 0, 0, gfn_x(gfn), gfn_x(gfn), 0 - }; - - if ( !(rc = p2m_set_suppress_ve_multi(d, &sve)) ) - rc = sve.first_error; - - return rc; -} - -/* - * Set/clear the #VE suppress bit for multiple pages. Only available on VMX. - */ -int p2m_set_suppress_ve_multi(struct domain *d, - struct xen_hvm_altp2m_suppress_ve_multi *sve) -{ - struct p2m_domain *host_p2m = p2m_get_hostp2m(d); - struct p2m_domain *ap2m = NULL; - struct p2m_domain *p2m = host_p2m; - uint64_t start = sve->first_gfn; - int rc = 0; - - if ( sve->view > 0 ) - { - if ( sve->view >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(sve->view, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - return -EINVAL; - - p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, sve->view); - } - - p2m_lock(host_p2m); - - if ( ap2m ) - p2m_lock(ap2m); - - while ( sve->last_gfn >= start ) - { - p2m_access_t a; - p2m_type_t t; - mfn_t mfn; - int err = 0; - - if ( (err = altp2m_get_effective_entry(p2m, _gfn(start), &mfn, &t, &a, - AP2MGET_query)) && - !sve->first_error ) - { - sve->first_error_gfn = start; /* Save the gfn of the first error */ - sve->first_error = err; /* Save the first error code */ - } - - if ( !err && (err = p2m->set_entry(p2m, _gfn(start), mfn, - PAGE_ORDER_4K, t, a, - sve->suppress_ve)) && - !sve->first_error ) - { - sve->first_error_gfn = start; /* Save the gfn of the first error */ - sve->first_error = err; /* Save the first error code */ - } - - /* Check for continuation if it's not the last iteration. */ - if ( sve->last_gfn >= ++start && hypercall_preempt_check() ) - { - rc = -ERESTART; - break; - } - } - - sve->first_gfn = start; - - if ( ap2m ) - p2m_unlock(ap2m); - - p2m_unlock(host_p2m); - - return rc; -} - -int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve, - unsigned int altp2m_idx) -{ - struct p2m_domain *host_p2m = p2m_get_hostp2m(d); - struct p2m_domain *ap2m = NULL; - struct p2m_domain *p2m; - mfn_t mfn; - p2m_access_t a; - p2m_type_t t; - int rc = 0; - - if ( altp2m_idx > 0 ) - { - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - return -EINVAL; - - p2m = ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); - } - else - p2m = host_p2m; - - gfn_lock(host_p2m, gfn, 0); - - if ( ap2m ) - p2m_lock(ap2m); - - mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL, suppress_ve); - if ( !mfn_valid(mfn) ) - rc = -ESRCH; - - if ( ap2m ) - p2m_unlock(ap2m); - - gfn_unlock(host_p2m, gfn, 0); - - return rc; -} - -int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_idx, - uint8_t visible) -{ - int rc = 0; - - altp2m_list_lock(d); - - /* - * Eptp index is correlated with altp2m index and should not exceed - * min(MAX_ALTP2M, MAX_EPTP). - */ - if ( altp2m_idx >= min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] == - mfn_x(INVALID_MFN) ) - rc = -EINVAL; - else if ( visible ) - d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)]; - else - d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] = - mfn_x(INVALID_MFN); - - altp2m_list_unlock(d); - - return rc; -} - /* * Local variables: * mode: C diff --git a/xen/arch/x86/mm/p2m.h b/xen/arch/x86/mm/p2m.h index 04308cfb6d..635f5a7f45 100644 --- a/xen/arch/x86/mm/p2m.h +++ b/xen/arch/x86/mm/p2m.h @@ -22,6 +22,9 @@ static inline void p2m_free_logdirty(struct p2m_domain *p2m) {} int p2m_init_altp2m(struct domain *d); void p2m_teardown_altp2m(struct domain *d); +void p2m_flush_table_locked(struct p2m_domain *p2m); +int __must_check p2m_remove_entry(struct p2m_domain *p2m, gfn_t gfn, mfn_t mfn, + unsigned int page_order); void p2m_nestedp2m_init(struct p2m_domain *p2m); int p2m_init_nestedp2m(struct domain *d); void p2m_teardown_nestedp2m(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:22:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724395.1129643 (Exim 4.92) (envelope-from ) id 1s82DS-0007E3-RD; Fri, 17 May 2024 18:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724395.1129643; Fri, 17 May 2024 18: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 1s82DS-0007Dv-OW; Fri, 17 May 2024 18:22:02 +0000 Received: by outflank-mailman (input) for mailman id 724395; Fri, 17 May 2024 18:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82DR-0007Dp-Jj for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82DR-0004Am-Fk for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82DR-00006y-Eq for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18: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=PZzDW0X01bCIiOSIRpamR4F0iVbTV63M+pmF0i3vbgw=; b=EJYV0ZpogYpvTllw5VtNP+QotO TwXXPgvKpHNeONvmhIImdqydd9EmUJLr6vCZyi9OOrA9YGpziGUY715XWMhlV1nTtaG+YvQ8WFTa2 IWc+9pFfvV33WEJxJO5ApVP4IPXaXBpAxaIpIc1w3QzLSIzslVjtCESiAe5/C07M+7lk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ucode: Further fixes to identify "ucode already up to date" Message-Id: Date: Fri, 17 May 2024 18:22:01 +0000 commit 977d98e67c2e929c62aa1f495fc4c6341c45abb5 Author: Andrew Cooper AuthorDate: Thu May 16 12:09:39 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 16 13:59:11 2024 +0100 x86/ucode: Further fixes to identify "ucode already up to date" When the revision in hardware is newer than anything Xen has to hand, 'microcode_cache' isn't set up. Then, `xen-ucode` initiates the update because it doesn't know whether the revisions across the system are symmetric or not. This involves the patch getting all the way into the apply_microcode() hooks before being found to be too old. This is all a giant mess and needs an overhaul, but in the short term simply adjust the apply_microcode() to return -EEXIST. Also, unconditionally print the preexisting microcode revision on boot. It's relevant information which is otherwise unavailable if Xen doesn't find new microcode to use. Fixes: 648db37a155a ("x86/ucode: Distinguish "ucode already up to date"") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/microcode/amd.c | 7 +++++-- xen/arch/x86/cpu/microcode/core.c | 2 ++ xen/arch/x86/cpu/microcode/intel.c | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 17e68697d5..f76a563c8b 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -222,12 +222,15 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) uint32_t rev, old_rev = sig->rev; enum microcode_match_result result = microcode_fits(patch); + if ( result == MIS_UCODE ) + return -EINVAL; + /* * Allow application of the same revision to pick up SMT-specific changes * even if the revision of the other SMT thread is already up-to-date. */ - if ( result != NEW_UCODE && result != SAME_UCODE ) - return -EINVAL; + if ( result == OLD_UCODE ) + return -EEXIST; if ( check_final_patch_levels(sig) ) { diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 762111838f..e90055772a 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -881,6 +881,8 @@ int __init early_microcode_init(unsigned long *module_map, ucode_ops.collect_cpu_info(); + printk(XENLOG_INFO "BSP microcode revision: 0x%08x\n", this_cpu(cpu_sig).rev); + /* * Some hypervisors deliberately report a microcode revision of -1 to * mean that they will not accept microcode updates. diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index 96f34b336b..f505aa1b78 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -294,10 +294,13 @@ static int cf_check apply_microcode(const struct microcode_patch *patch) result = microcode_update_match(patch); - if ( result != NEW_UCODE && - !(opt_ucode_allow_same && result == SAME_UCODE) ) + if ( result == MIS_UCODE ) return -EINVAL; + if ( result == OLD_UCODE || + (result == SAME_UCODE && !opt_ucode_allow_same) ) + return -EEXIST; + wbinvd(); wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)patch->data); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:22:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724396.1129648 (Exim 4.92) (envelope-from ) id 1s82Dc-0007HI-TY; Fri, 17 May 2024 18:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724396.1129648; Fri, 17 May 2024 18:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Dc-0007H9-Q5; Fri, 17 May 2024 18:22:12 +0000 Received: by outflank-mailman (input) for mailman id 724396; Fri, 17 May 2024 18:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Db-0007H1-Jd for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Db-0004B6-Io for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82Db-00007m-Hw for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dD3cZYyYL1uFNYVLhnyNomaMuQi6CaJ4jLzjyePNXyM=; b=InZwNQEPrr25nL0SErZnGAXtHd VYePzo0MOEBZ++LpySi9eZP6zk/tWsIlseQUV1nzmnDIqNfYUHp6bFUEAVf2LJkXvVV9pnd+Y7eRj gWI+i5vCYkpRKTPjpD6EzvhCB0gG4nbU5Di907b940dvih113joLKMN79Zvia29aEN0s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: entry: Add missing code symbol annotations Message-Id: Date: Fri, 17 May 2024 18:22:11 +0000 commit 1125f3529c5859a10b241db68844db6ca51b130e Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:06 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: entry: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/entry.S | 78 +++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index f963c923bb..6251135ebd 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -289,21 +289,25 @@ b do_bad_mode .endm -hyp_sync_invalid: +FUNC_LOCAL(hyp_sync_invalid) entry hyp=1 invalid BAD_SYNC +END(hyp_sync_invalid) -hyp_irq_invalid: +FUNC_LOCAL(hyp_irq_invalid) entry hyp=1 invalid BAD_IRQ +END(hyp_irq_invalid) -hyp_fiq_invalid: +FUNC_LOCAL(hyp_fiq_invalid) entry hyp=1 invalid BAD_FIQ +END(hyp_fiq_invalid) -hyp_error_invalid: +FUNC_LOCAL(hyp_error_invalid) entry hyp=1 invalid BAD_ERROR +END(hyp_error_invalid) /* * SError received while running in the hypervisor mode. @@ -313,11 +317,12 @@ hyp_error_invalid: * simplicity, as SError should be rare and potentially fatal, * all interrupts are kept masked. */ -hyp_error: +FUNC_LOCAL(hyp_error) entry hyp=1 mov x0, sp bl do_trap_hyp_serror exit hyp=1 +END(hyp_error) /* * Synchronous exception received while running in the hypervisor mode. @@ -327,7 +332,7 @@ hyp_error: * some of them. So we want to inherit the state from the interrupted * context. */ -hyp_sync: +FUNC_LOCAL(hyp_sync) entry hyp=1 /* Inherit interrupts */ @@ -338,6 +343,7 @@ hyp_sync: mov x0, sp bl do_trap_hyp_sync exit hyp=1 +END(hyp_sync) /* * IRQ received while running in the hypervisor mode. @@ -352,7 +358,7 @@ hyp_sync: * would require some rework in some paths (e.g. panic, livepatch) to * ensure the ordering is enforced everywhere. */ -hyp_irq: +FUNC_LOCAL(hyp_irq) entry hyp=1 /* Inherit D, A, F interrupts and keep I masked */ @@ -365,8 +371,9 @@ hyp_irq: mov x0, sp bl do_trap_irq exit hyp=1 +END(hyp_irq) -guest_sync: +FUNC_LOCAL(guest_sync) /* * Save x0, x1 in advance */ @@ -413,8 +420,9 @@ fastpath_out_workaround: mov x1, xzr eret sb +END(guest_sync) -wa2_ssbd: +FUNC_LOCAL(wa2_ssbd) #ifdef CONFIG_ARM_SSBD alternative_cb arm_enable_wa2_handling b wa2_end @@ -450,42 +458,55 @@ wa2_end: mov x0, xzr eret sb -guest_sync_slowpath: +END(wa2_ssbd) + +FUNC_LOCAL(guest_sync_slowpath) /* * x0/x1 may have been scratch by the fast path above, so avoid * to save them. */ guest_vector compat=0, iflags=IFLAGS__AI_, trap=guest_sync, save_x0_x1=0 +END(guest_sync_slowpath) -guest_irq: +FUNC_LOCAL(guest_irq) guest_vector compat=0, iflags=IFLAGS__A__, trap=irq +END(guest_irq) -guest_fiq_invalid: +FUNC_LOCAL(guest_fiq_invalid) entry hyp=0, compat=0 invalid BAD_FIQ +END(guest_fiq_invalid) -guest_error: +FUNC_LOCAL(guest_error) guest_vector compat=0, iflags=IFLAGS__AI_, trap=guest_serror +END(guest_error) -guest_sync_compat: +FUNC_LOCAL(guest_sync_compat) guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_sync +END(guest_sync_compat) -guest_irq_compat: +FUNC_LOCAL(guest_irq_compat) guest_vector compat=1, iflags=IFLAGS__A__, trap=irq +END(guest_irq_compat) -guest_fiq_invalid_compat: +FUNC_LOCAL(guest_fiq_invalid_compat) entry hyp=0, compat=1 invalid BAD_FIQ +END(guest_fiq_invalid_compat) -guest_error_compat: +FUNC_LOCAL(guest_error_compat) guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_serror +END(guest_error_compat) -ENTRY(return_to_new_vcpu32) +FUNC(return_to_new_vcpu32) exit hyp=0, compat=1 -ENTRY(return_to_new_vcpu64) +END(return_to_new_vcpu32) + +FUNC(return_to_new_vcpu64) exit hyp=0, compat=0 +END(return_to_new_vcpu64) -return_from_trap: +FUNC_LOCAL(return_from_trap) msr daifset, #IFLAGS___I_ /* Mask interrupts */ ldr x21, [sp, #UREGS_PC] /* load ELR */ @@ -524,6 +545,7 @@ return_from_trap: eret sb +END(return_from_trap) /* * Consume pending SError generated by the guest if any. @@ -536,7 +558,7 @@ return_from_trap: * it. So the function will unmask SError exception for a small window and * then mask it again. */ -check_pending_guest_serror: +FUNC_LOCAL(check_pending_guest_serror) /* * Save elr_el2 to check whether the pending SError exception takes * place while we are doing this sync exception. @@ -562,13 +584,11 @@ check_pending_guest_serror: * exception handler, and the elr_el2 will be set to * abort_guest_exit_start or abort_guest_exit_end. */ - .global abort_guest_exit_start -abort_guest_exit_start: +LABEL(abort_guest_exit_start) isb - .global abort_guest_exit_end -abort_guest_exit_end: +LABEL(abort_guest_exit_end) /* Mask PSTATE asynchronous abort bit, close the checking window. */ msr daifset, #IFLAGS__A__ @@ -586,7 +606,7 @@ abort_guest_exit_end: cset x19, ne ret -ENDPROC(check_pending_guest_serror) +END(check_pending_guest_serror) /* * Exception vectors. @@ -597,7 +617,7 @@ ENDPROC(check_pending_guest_serror) .endm .align 11 -ENTRY(hyp_traps_vector) +FUNC(hyp_traps_vector) ventry hyp_sync_invalid /* Synchronous EL2t */ ventry hyp_irq_invalid /* IRQ EL2t */ ventry hyp_fiq_invalid /* FIQ EL2t */ @@ -617,6 +637,7 @@ ENTRY(hyp_traps_vector) ventry guest_irq_compat /* IRQ 32-bit EL0/EL1 */ ventry guest_fiq_invalid_compat /* FIQ 32-bit EL0/EL1 */ ventry guest_error_compat /* Error 32-bit EL0/EL1 */ +END(hyp_traps_vector) /* * struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next) @@ -626,7 +647,7 @@ ENTRY(hyp_traps_vector) * * Returns prev in x0 */ -ENTRY(__context_switch) +FUNC(__context_switch) add x8, x0, #VCPU_arch_saved_context mov x9, sp stp x19, x20, [x8], #16 /* store callee-saved registers */ @@ -647,6 +668,7 @@ ENTRY(__context_switch) ldr lr, [x8] mov sp, x9 ret +END(__context_switch) /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:22:22 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724397.1129651 (Exim 4.92) (envelope-from ) id 1s82Dm-0007KE-UX; Fri, 17 May 2024 18:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724397.1129651; Fri, 17 May 2024 18: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 1s82Dm-0007K7-RW; Fri, 17 May 2024 18:22:22 +0000 Received: by outflank-mailman (input) for mailman id 724397; Fri, 17 May 2024 18:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Dl-0007Jj-N3 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Dl-0004BG-Ln for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82Dl-00008J-Kr for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ErP5Wbcst+Rh3IFaQH43GAJixCaYULmTWO35N0Z50zo=; b=uBLTB28JbegWdtV6dx3jkzmL6z 9hGg1MYYC3crboDUyCHQdUdX9TjYn1j01Z1A07xehClIfen9ba96qnSmbaHOrEohj/gvLkGPHFiys wx7UKtN9IaucCkkKwvPoPI2BP4GmxvJ+jo4/2F48hKzTA5vufr5EGW9OfKAresTJ1mss=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: smc: Add missing code symbol annotations Message-Id: Date: Fri, 17 May 2024 18:22:21 +0000 commit 8d92a26a41d11b561e36b9321996809045ff2ec4 Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:07 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: smc: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/smc.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/smc.S b/xen/arch/arm/arm64/smc.S index fc6b676e2e..68b05e8ddd 100644 --- a/xen/arch/arm/arm64/smc.S +++ b/xen/arch/arm/arm64/smc.S @@ -19,7 +19,7 @@ * register_t a6, register_t a7, * struct arm_smccc_res *res) */ -ENTRY(__arm_smccc_1_0_smc) +FUNC(__arm_smccc_1_0_smc) smc #0 ldr x4, [sp] cbz x4, 1f /* No need to store the result */ @@ -27,12 +27,13 @@ ENTRY(__arm_smccc_1_0_smc) stp x2, x3, [x4, #SMCCC_RES_a2] 1: ret +END(__arm_smccc_1_0_smc) /* * void arm_smccc_1_2_smc(const struct arm_smccc_1_2_regs *args, * struct arm_smccc_1_2_regs *res) */ -ENTRY(arm_smccc_1_2_smc) +FUNC(arm_smccc_1_2_smc) /* Save `res` and free a GPR that won't be clobbered by SMC call */ stp x1, x19, [sp, #-16]! @@ -69,3 +70,4 @@ ENTRY(arm_smccc_1_2_smc) /* Restore original x19 */ ldp xzr, x19, [sp], #16 ret +END(arm_smccc_1_2_smc) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:22:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724398.1129656 (Exim 4.92) (envelope-from ) id 1s82Dx-0007NR-02; Fri, 17 May 2024 18:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724398.1129656; Fri, 17 May 2024 18: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 1s82Dw-0007NH-T6; Fri, 17 May 2024 18:22:32 +0000 Received: by outflank-mailman (input) for mailman id 724398; Fri, 17 May 2024 18:22:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Dv-0007N5-Pe for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Dv-0004BS-Ok for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82Dv-00008s-Nu for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zXUt/x3QGqFPrqeU4ekGROtchawWMb0TWvZupylt2lk=; b=6RFMNbD0WqnQsNFPSJQUJ+wX0u ObgtZe18O3+DBH5yCRMjsQCvgvNZn5rs+kGO6QRknYHl9qwalHtPlZUiEj5yeJ9zXXtXnngIWT7tD b3Lwp+Meyv+1bDhSDaSRtGqqf5JJwfNeb2/0kVcoYa60qe/IZWg+aD2kIVw5GQf09tU4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: sve: Add missing code symbol annotations Message-Id: Date: Fri, 17 May 2024 18:22:31 +0000 commit 78ce1dc625ce494909b26e57dd909732b5a8605e Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:08 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: sve: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/sve-asm.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/arm64/sve-asm.S b/xen/arch/arm/arm64/sve-asm.S index 59dbefbbb2..2d8b895f07 100644 --- a/xen/arch/arm/arm64/sve-asm.S +++ b/xen/arch/arm/arm64/sve-asm.S @@ -161,9 +161,10 @@ .endm /* Gets the current vector register size in bytes */ -GLOBAL(sve_get_hw_vl) +FUNC(sve_get_hw_vl) _sve_rdvl 0, 1 ret +END(sve_get_hw_vl) /* * Save the SVE context @@ -172,9 +173,10 @@ GLOBAL(sve_get_hw_vl) * x1 - pointer to buffer for P0-15 * x2 - Save FFR if non-zero */ -GLOBAL(sve_save_ctx) +FUNC(sve_save_ctx) sve_save 0, 1, x2 ret +END(sve_save_ctx) /* * Load the SVE context @@ -183,9 +185,10 @@ GLOBAL(sve_save_ctx) * x1 - pointer to buffer for P0-15 * x2 - Restore FFR if non-zero */ -GLOBAL(sve_load_ctx) +FUNC(sve_load_ctx) sve_load 0, 1, x2 ret +END(sve_load_ctx) /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:22:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724399.1129658 (Exim 4.92) (envelope-from ) id 1s82E7-0007QM-0h; Fri, 17 May 2024 18:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724399.1129658; Fri, 17 May 2024 18:22: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 1s82E6-0007QE-UV; Fri, 17 May 2024 18:22:42 +0000 Received: by outflank-mailman (input) for mailman id 724399; Fri, 17 May 2024 18:22:41 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82E5-0007Q3-Sg for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82E5-0004BZ-Rn for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82E5-00009c-Qt for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22: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=ngDQkHAcIGfarCAtyClTmG7laHGCRVI6RlNOYIsw4x0=; b=u8hnHoV5JNeAypeuoz3qQh71vA OjgG/PmIvlc0tv9RYhRtS+pKU7ibHKs/88VObg+rELOVdbbiXqMqVj/CQc066u+smHa7JsczezrLM Vz/WcqHKne1lto9csV2AuPAX8DCo1GvxcihJI1Ectxlp+KuoWeMKGYcls1Z8aouno690=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head: Add missing code symbol annotations Message-Id: Date: Fri, 17 May 2024 18:22:41 +0000 commit fba250ae604e9d67f5f762e6dbb85a01750cc12a Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:09 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: head: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/head.S | 51 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index fb297e9eb5..2fa07dc3a0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -90,7 +90,7 @@ * 4K-aligned address. */ -GLOBAL(start) +FUNC(start) /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ @@ -102,6 +102,7 @@ efi_head: */ add x13, x18, #0x16 b real_start /* branch to kernel start */ +END(start) .quad 0 /* Image load offset from start of RAM */ .quad _end - start /* Effective size of kernel image, little-endian */ .quad __HEAD_FLAGS /* Informative flags, little-endian */ @@ -223,7 +224,7 @@ section_table: .align 5 #endif /* CONFIG_ARM_EFI */ -real_start: +FUNC_LOCAL(real_start) /* BSS should be zeroed when booting without EFI */ mov x26, #0 /* x26 := skip_zero_bss */ @@ -263,9 +264,9 @@ primary_switched: mov x1, x21 /* x1 := paddr(FDT) */ ldr x2, =start_xen b launch -ENDPROC(real_start) +END(real_start) -GLOBAL(init_secondary) +FUNC(init_secondary) msr DAIFSet, 0xf /* Disable all interrupts */ /* Find out where we are */ @@ -304,7 +305,7 @@ secondary_switched: /* Jump to C world */ ldr x2, =start_secondary b launch -ENDPROC(init_secondary) +END(init_secondary) /* * Check if the CPU has been booted in Hypervisor mode. @@ -313,7 +314,7 @@ ENDPROC(init_secondary) * * Clobbers x0 - x5 */ -check_cpu_mode: +FUNC_LOCAL(check_cpu_mode) PRINT_ID("- Current EL ") mrs x5, CurrentEL print_reg x5 @@ -329,7 +330,7 @@ check_cpu_mode: PRINT_ID("- Xen must be entered in NS EL2 mode -\r\n") PRINT_ID("- Please update the bootloader -\r\n") b fail -ENDPROC(check_cpu_mode) +END(check_cpu_mode) /* * Zero BSS @@ -339,7 +340,7 @@ ENDPROC(check_cpu_mode) * * Clobbers x0 - x3 */ -zero_bss: +FUNC_LOCAL(zero_bss) /* Zero BSS only when requested */ cbnz x26, skip_bss @@ -353,14 +354,14 @@ zero_bss: skip_bss: ret -ENDPROC(zero_bss) +END(zero_bss) /* * Initialize the processor for turning the MMU on. * * Clobbers x0 - x3 */ -cpu_init: +FUNC_LOCAL(cpu_init) PRINT_ID("- Initialize CPU -\r\n") /* Set up memory attribute type tables */ @@ -399,7 +400,7 @@ cpu_init: */ msr spsel, #1 ret -ENDPROC(cpu_init) +END(cpu_init) /* * Setup the initial stack and jump to the C world @@ -411,7 +412,7 @@ ENDPROC(cpu_init) * * Clobbers x3 */ -launch: +FUNC_LOCAL(launch) ldr x3, =init_data add x3, x3, #INITINFO_stack /* Find the boot-time stack */ ldr x3, [x3] @@ -421,13 +422,14 @@ launch: /* Jump to C world */ br x2 -ENDPROC(launch) +END(launch) /* Fail-stop */ -fail: PRINT_ID("- Boot failed -\r\n") +FUNC_LOCAL(fail) + PRINT_ID("- Boot failed -\r\n") 1: wfe b 1b -ENDPROC(fail) +END(fail) #ifdef CONFIG_EARLY_PRINTK /* @@ -438,14 +440,14 @@ ENDPROC(fail) * * Clobbers x0 - x1 */ -init_uart: +FUNC_LOCAL(init_uart) ldr x23, =CONFIG_EARLY_UART_BASE_ADDRESS #ifdef CONFIG_EARLY_UART_INIT early_uart_init x23, 0 #endif PRINT("- UART enabled -\r\n") ret -ENDPROC(init_uart) +END(init_uart) /* * Print early debug messages. @@ -454,7 +456,7 @@ ENDPROC(init_uart) * x23: Early UART base address * Clobbers x0-x1 */ -ENTRY(asm_puts) +FUNC(asm_puts) early_uart_ready x23, 1 ldrb w1, [x0], #1 /* Load next char */ cbz w1, 1f /* Exit on nul */ @@ -462,7 +464,7 @@ ENTRY(asm_puts) b asm_puts 1: ret -ENDPROC(asm_puts) +END(asm_puts) /* * Print a 64-bit number in hex. @@ -471,7 +473,7 @@ ENDPROC(asm_puts) * x23: Early UART base address * Clobbers x0-x3 */ -ENTRY(asm_putn) +FUNC(asm_putn) adr_l x1, hex mov x3, #16 1: @@ -484,7 +486,7 @@ ENTRY(asm_putn) subs x3, x3, #1 b.ne 1b ret -ENDPROC(asm_putn) +END(asm_putn) RODATA_SECT(.rodata.idmap, hex, "0123456789abcdef") @@ -493,16 +495,17 @@ RODATA_SECT(.rodata.idmap, hex, "0123456789abcdef") /* This provides a C-API version of __lookup_processor_type * TODO: For now, the implementation return NULL every time */ -ENTRY(lookup_processor_type) +FUNC(lookup_processor_type) mov x0, #0 ret +END(lookup_processor_type) #ifdef CONFIG_ARM_EFI /* * Function to transition from EFI loader in C, to Xen entry point. * void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); */ -ENTRY(efi_xen_start) +FUNC(efi_xen_start) /* * Preserve x0 (fdt pointer) across call to __flush_dcache_area, * restore for entry into Xen. @@ -554,7 +557,7 @@ ENTRY(efi_xen_start) mov x26, #1 /* x26 := skip_zero_bss */ b real_start_efi -ENDPROC(efi_xen_start) +END(efi_xen_start) #endif /* CONFIG_ARM_EFI */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:22:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724400.1129663 (Exim 4.92) (envelope-from ) id 1s82EI-0007Sz-2z; Fri, 17 May 2024 18:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724400.1129663; Fri, 17 May 2024 18: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 1s82EH-0007Ss-W2; Fri, 17 May 2024 18:22:53 +0000 Received: by outflank-mailman (input) for mailman id 724400; Fri, 17 May 2024 18:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82EF-0007Se-Vw for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:51 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82EF-0004Bz-Ul for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:51 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82EF-0000AH-Tw for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:22:51 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QjTJ7JxOG+Lc8okOfl0D7CxmXdTSpxKwhijgBu+MfN0=; b=ZrCvMoh6ZmerNfZJaCywcTjxRI d1asiBFIelUEKphVj7/dtoo3JRO0/iLCVhXmmzCZNIWP0OJQnM1P7c6PCdLM/rCzZp+UeJMLTFxQr aNDs/P4achIN0vXBzXYlhW76bMothQ6+oD0bthEcs4ptAfp0C1HVeMix/pG4ERsZqNRA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: debug: Add missing code symbol annotations Message-Id: Date: Fri, 17 May 2024 18:22:51 +0000 commit fdba3ff11fc181bb5eaeb095426a7451e199052e Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:10 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: debug: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/debug.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S index 71cad9d762..c3d02c33d7 100644 --- a/xen/arch/arm/arm64/debug.S +++ b/xen/arch/arm/arm64/debug.S @@ -27,17 +27,19 @@ * Print a character on the UART - this function is called by C * x0: character to print */ -GLOBAL(early_putch) +FUNC(early_putch) ldr x15, =EARLY_UART_VIRTUAL_ADDRESS early_uart_ready x15, 1 early_uart_transmit x15, w0 ret +END(early_putch) /* Flush the UART - this function is called by C */ -GLOBAL(early_flush) +FUNC(early_flush) ldr x15, =EARLY_UART_VIRTUAL_ADDRESS /* x15 := VA UART base address */ early_uart_ready x15, 1 ret +END(early_flush) /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:23:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724401.1129667 (Exim 4.92) (envelope-from ) id 1s82ES-0007WR-66; Fri, 17 May 2024 18:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724401.1129667; Fri, 17 May 2024 18: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 1s82ES-0007WJ-3W; Fri, 17 May 2024 18:23:04 +0000 Received: by outflank-mailman (input) for mailman id 724401; Fri, 17 May 2024 18:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82EQ-0007Vw-1z for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82EQ-0004CP-1K for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82EQ-0000BW-0c for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18: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=TVi5BIe4TGnjup7n6f5v/qq/Mig5ELy/XZQauA/Zr5k=; b=LS6UZZatefLhUkMbzBILNHlznO DyqjrvKbOFGZzdCj7r6bCDEXW71xZ7Ff3keyQ9CNsB29fiViZBytCfGPQwrlaIJuRrF1gmkOLXsb5 3l7kzlWSnCUU7X59V+Bo1IcvhYFzcMxu5EtniAgYRX7ZOCLosUJyNirGvmvUIGvwniJk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: bpi: Add missing code symbol annotations Message-Id: Date: Fri, 17 May 2024 18:23:02 +0000 commit 8151fe503c6f624fbf118efe01888f16fd27c413 Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:11 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: bpi: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/bpi.S | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm64/bpi.S b/xen/arch/arm/arm64/bpi.S index 4e63825220..d6b8defb80 100644 --- a/xen/arch/arm/arm64/bpi.S +++ b/xen/arch/arm/arm64/bpi.S @@ -52,14 +52,15 @@ * micro-architectures in a system. */ .align 11 -ENTRY(__bp_harden_hyp_vecs_start) +FUNC(__bp_harden_hyp_vecs_start) .rept 4 vectors hyp_traps_vector .endr -ENTRY(__bp_harden_hyp_vecs_end) +LABEL(__bp_harden_hyp_vecs_end) +END(__bp_harden_hyp_vecs_start) .macro mitigate_spectre_bhb_loop count -ENTRY(__mitigate_spectre_bhb_loop_start_\count) +FUNC(__mitigate_spectre_bhb_loop_start_\count) stp x0, x1, [sp, #-16]! mov x0, \count .Lspectre_bhb_loop\@: @@ -68,11 +69,12 @@ ENTRY(__mitigate_spectre_bhb_loop_start_\count) b.ne .Lspectre_bhb_loop\@ sb ldp x0, x1, [sp], #16 -ENTRY(__mitigate_spectre_bhb_loop_end_\count) +LABEL(__mitigate_spectre_bhb_loop_end_\count) +END(__mitigate_spectre_bhb_loop_start_\count) .endm .macro smccc_workaround num smcc_id -ENTRY(__smccc_workaround_smc_start_\num) +FUNC(__smccc_workaround_smc_start_\num) sub sp, sp, #(8 * 4) stp x0, x1, [sp, #(8 * 2)] stp x2, x3, [sp, #(8 * 0)] @@ -81,13 +83,15 @@ ENTRY(__smccc_workaround_smc_start_\num) ldp x2, x3, [sp, #(8 * 0)] ldp x0, x1, [sp, #(8 * 2)] add sp, sp, #(8 * 4) -ENTRY(__smccc_workaround_smc_end_\num) +LABEL(__smccc_workaround_smc_end_\num) +END(__smccc_workaround_smc_start_\num) .endm -ENTRY(__mitigate_spectre_bhb_clear_insn_start) +FUNC(__mitigate_spectre_bhb_clear_insn_start) clearbhb isb -ENTRY(__mitigate_spectre_bhb_clear_insn_end) +LABEL(__mitigate_spectre_bhb_clear_insn_end) +END(__mitigate_spectre_bhb_clear_insn_start) mitigate_spectre_bhb_loop 8 mitigate_spectre_bhb_loop 24 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:23:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724402.1129671 (Exim 4.92) (envelope-from ) id 1s82Eb-0007Yt-7j; Fri, 17 May 2024 18:23:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724402.1129671; Fri, 17 May 2024 18:23:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Eb-0007Ym-4w; Fri, 17 May 2024 18:23:13 +0000 Received: by outflank-mailman (input) for mailman id 724402; Fri, 17 May 2024 18:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Ea-0007Ya-5A for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Ea-0004CW-4M for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82Ea-0000C6-3V for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18: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=mnUvv0N8dzDv7yOKbgKcqDLGYrSK/GA5yom9jViwJzg=; b=jLNLlPa21t/QD9XYfStJGVOIdq oyVxP8LpPhtNqYXyZvZ3SooxHqMhkt5Dn/aCycrNzedNMW7gikHkxrrb024AmUAUOO24rGZnHiCFW vM1wCL1QKSxaGx5GYiwIxa9Ysh1khuSCg+gP2+ufQ273c2+os0P450cRSXNzvakrTN8I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: mmu/head: Add missing code symbol annotations Message-Id: Date: Fri, 17 May 2024 18:23:12 +0000 commit c9906bd79eb150cd46121b6163991a228432a175 Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:12 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: mmu/head: Add missing code symbol annotations Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/mmu/head.S | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S index fa40b696dd..665a51a337 100644 --- a/xen/arch/arm/arm64/mmu/head.S +++ b/xen/arch/arm/arm64/mmu/head.S @@ -138,7 +138,7 @@ * * Clobbers x0 - x4 */ -create_page_tables: +FUNC_LOCAL(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 @@ -260,7 +260,7 @@ 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) +END(create_page_tables) /* * Turn on the Data Cache and the MMU. The function will return on the 1:1 @@ -273,7 +273,7 @@ ENDPROC(create_page_tables) * * Clobbers x0 - x5 */ -enable_mmu: +FUNC_LOCAL(enable_mmu) mov x4, x0 mov x5, x1 PRINT_ID("- Turning on paging -\r\n") @@ -304,7 +304,7 @@ enable_mmu: PRINT_ID("- Paging turned on -\r\n") ret -ENDPROC(enable_mmu) +END(enable_mmu) /* * Enable mm (turn on the data cache and the MMU) for secondary CPUs. @@ -316,7 +316,7 @@ ENDPROC(enable_mmu) * * Clobbers x0 - x6 */ -ENTRY(enable_secondary_cpu_mm) +FUNC(enable_secondary_cpu_mm) mov x6, lr load_paddr x0, init_ttbr @@ -328,7 +328,7 @@ ENTRY(enable_secondary_cpu_mm) /* Return to the virtual address requested by the caller. */ ret -ENDPROC(enable_secondary_cpu_mm) +END(enable_secondary_cpu_mm) /* * Enable mm (turn on the data cache and the MMU) for the boot CPU. @@ -340,7 +340,7 @@ ENDPROC(enable_secondary_cpu_mm) * * Clobbers x0 - x6 */ -ENTRY(enable_boot_cpu_mm) +FUNC(enable_boot_cpu_mm) mov x6, lr bl create_page_tables @@ -365,7 +365,7 @@ ENTRY(enable_boot_cpu_mm) * by the caller. */ b remove_identity_mapping -ENDPROC(enable_boot_cpu_mm) +END(enable_boot_cpu_mm) /* * Remove the 1:1 map from the page-tables. It is not easy to keep track @@ -377,7 +377,7 @@ ENDPROC(enable_boot_cpu_mm) * * Clobbers x0 - x1 */ -remove_identity_mapping: +FUNC_LOCAL(remove_identity_mapping) /* * Find the zeroeth slot used. Remove the entry from zeroeth * table if the slot is not XEN_ZEROETH_SLOT. @@ -419,20 +419,21 @@ identity_mapping_removed: flush_xen_tlb_local ret -ENDPROC(remove_identity_mapping) +END(remove_identity_mapping) /* Fail-stop */ -fail: PRINT("- Boot failed -\r\n") +FUNC_LOCAL(fail) + PRINT("- Boot failed -\r\n") 1: wfe b 1b -ENDPROC(fail) +END(fail) /* * Switch TTBR * * x0 ttbr */ -ENTRY(switch_ttbr_id) +FUNC(switch_ttbr_id) /* 1) Ensure any previous read/write have completed */ dsb ish isb @@ -464,7 +465,7 @@ ENTRY(switch_ttbr_id) isb ret -ENDPROC(switch_ttbr_id) +END(switch_ttbr_id) /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:23:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:23:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724406.1129685 (Exim 4.92) (envelope-from ) id 1s82El-0007rS-H7; Fri, 17 May 2024 18:23:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724406.1129685; Fri, 17 May 2024 18:23:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82El-0007rJ-EO; Fri, 17 May 2024 18:23:23 +0000 Received: by outflank-mailman (input) for mailman id 724406; Fri, 17 May 2024 18:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Ek-0007qo-8B for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Ek-0004Ck-7J for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82Ek-0000Cb-6X for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18: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=BObAEgiBIJO+W/Ou0EleBmh9Rh5aqi0rsSP9FrWTB8Y=; b=Bzgm1hFTeecU0r9DYbz9kqpNYR cxJ0Q9p5Eatu4Ai6WtUojGW32YsZgL8r6X/4/lgwWTm2zqkVb2U6Ks4ZJLcWeWQPOX+8Fiz6dRnzm 6yfz1qBVEU6t7t8rmVUpwT+qr7XxrWfjXJGuGJKXC7VYWWggzDFnhVSAmbvRz1769vXw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: cache: Use the generic xen/linkage.h macros Message-Id: Date: Fri, 17 May 2024 18:23:22 +0000 commit fe1b97d32139b00631377d7d252fec53eb3a7176 Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:13 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: cache: Use the generic xen/linkage.h macros Use the generic xen/linkage.h macros to annotate code symbols. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/cache.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S index 9a88a2b497..66ed85f735 100644 --- a/xen/arch/arm/arm64/cache.S +++ b/xen/arch/arm/arm64/cache.S @@ -40,7 +40,7 @@ * - kaddr - kernel address * - size - size in question */ -ENTRY(__flush_dcache_area) +FUNC(__flush_dcache_area) dcache_line_size x2, x3 add x1, x0, x1 sub x3, x2, #1 @@ -51,4 +51,4 @@ ENTRY(__flush_dcache_area) b.lo 1b dsb sy ret -ENDPROC(__flush_dcache_area) +END(__flush_dcache_area) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:23:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:23:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724407.1129689 (Exim 4.92) (envelope-from ) id 1s82Ev-0007y8-Is; Fri, 17 May 2024 18:23:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724407.1129689; Fri, 17 May 2024 18:23: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 1s82Ev-0007y0-G0; Fri, 17 May 2024 18:23:33 +0000 Received: by outflank-mailman (input) for mailman id 724407; Fri, 17 May 2024 18:23:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Eu-0007xX-B4 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82Eu-0004D1-A9 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82Eu-0000D7-9Q for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23: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=j1TRNke7pV7mcgvxA9R3UWOUZ43vmovSpn6xzdxl/SU=; b=NinvXtpoSQ28WzJh2GmAZMjOqy Jp7yWzISJE6OAd+uqDthktFzx1FaOVRxQoXCZDNnBdxRRNRlXjUd6KmeGJwja+FoQgRcR8v//F8+k GsG3EEOnZQ6EQEP7EyE5LAV0YQsHRkoKCmNJujlbGE1mVu8CqAFm6oh0hL6MJiH68VRE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: lib: Use the generic xen/linkage.h macros Message-Id: Date: Fri, 17 May 2024 18:23:32 +0000 commit d946787a277257c50405e12918c4dc5c330ef95d Author: Edgar E. Iglesias AuthorDate: Sat May 4 13:55:14 2024 +0200 Commit: Julien Grall CommitDate: Thu May 16 22:06:01 2024 +0100 xen/arm64: lib: Use the generic xen/linkage.h macros Use the generic xen/linkage.h macros to annotate code symbols. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/lib/memchr.S | 4 ++-- xen/arch/arm/arm64/lib/memcmp.S | 4 ++-- xen/arch/arm/arm64/lib/memcpy.S | 4 ++-- xen/arch/arm/arm64/lib/memmove.S | 4 ++-- xen/arch/arm/arm64/lib/memset.S | 4 ++-- xen/arch/arm/arm64/lib/strchr.S | 4 ++-- xen/arch/arm/arm64/lib/strcmp.S | 4 ++-- xen/arch/arm/arm64/lib/strlen.S | 4 ++-- xen/arch/arm/arm64/lib/strncmp.S | 4 ++-- xen/arch/arm/arm64/lib/strnlen.S | 4 ++-- xen/arch/arm/arm64/lib/strrchr.S | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/arm64/lib/memchr.S b/xen/arch/arm/arm64/lib/memchr.S index 81f113bb1c..3d8aeca3ca 100644 --- a/xen/arch/arm/arm64/lib/memchr.S +++ b/xen/arch/arm/arm64/lib/memchr.S @@ -29,7 +29,7 @@ * Returns: * x0 - address of first occurrence of 'c' or 0 */ -ENTRY(memchr) +FUNC(memchr) and w1, w1, #0xff 1: subs x2, x2, #1 b.mi 2f @@ -40,4 +40,4 @@ ENTRY(memchr) ret 2: mov x0, #0 ret -ENDPROC(memchr) +END(memchr) diff --git a/xen/arch/arm/arm64/lib/memcmp.S b/xen/arch/arm/arm64/lib/memcmp.S index 87c2537ffe..d77dd4ce52 100644 --- a/xen/arch/arm/arm64/lib/memcmp.S +++ b/xen/arch/arm/arm64/lib/memcmp.S @@ -57,7 +57,7 @@ pos .req x11 limit_wd .req x12 mask .req x13 -ENTRY(memcmp) +FUNC(memcmp) cbz limit, .Lret0 eor tmp1, src1, src2 tst tmp1, #7 @@ -254,4 +254,4 @@ CPU_LE( rev data2, data2 ) .Lret0: mov result, #0 ret -ENDPROC(memcmp) +END(memcmp) diff --git a/xen/arch/arm/arm64/lib/memcpy.S b/xen/arch/arm/arm64/lib/memcpy.S index d90d20ef3e..1e04b79010 100644 --- a/xen/arch/arm/arm64/lib/memcpy.S +++ b/xen/arch/arm/arm64/lib/memcpy.S @@ -55,7 +55,7 @@ C_h .req x12 D_l .req x13 D_h .req x14 -ENTRY(memcpy) +FUNC(memcpy) mov dst, dstin cmp count, #16 /*When memory length is less than 16, the accessed are not aligned.*/ @@ -197,4 +197,4 @@ ENTRY(memcpy) tst count, #0x3f b.ne .Ltail63 ret -ENDPROC(memcpy) +END(memcpy) diff --git a/xen/arch/arm/arm64/lib/memmove.S b/xen/arch/arm/arm64/lib/memmove.S index a49de845d0..14438dbe9c 100644 --- a/xen/arch/arm/arm64/lib/memmove.S +++ b/xen/arch/arm/arm64/lib/memmove.S @@ -56,7 +56,7 @@ C_h .req x12 D_l .req x13 D_h .req x14 -ENTRY(memmove) +FUNC(memmove) cmp dstin, src b.lo memcpy add tmp1, src, count @@ -193,4 +193,4 @@ ENTRY(memmove) tst count, #0x3f b.ne .Ltail63 ret -ENDPROC(memmove) +END(memmove) diff --git a/xen/arch/arm/arm64/lib/memset.S b/xen/arch/arm/arm64/lib/memset.S index 5bf751521b..367fa60175 100644 --- a/xen/arch/arm/arm64/lib/memset.S +++ b/xen/arch/arm/arm64/lib/memset.S @@ -53,7 +53,7 @@ dst .req x8 tmp3w .req w9 tmp3 .req x9 -ENTRY(memset) +FUNC(memset) mov dst, dstin /* Preserve return value. */ and A_lw, val, #255 orr A_lw, A_lw, A_lw, lsl #8 @@ -212,4 +212,4 @@ ENTRY(memset) ands count, count, zva_bits_x b.ne .Ltail_maybe_long ret -ENDPROC(memset) +END(memset) diff --git a/xen/arch/arm/arm64/lib/strchr.S b/xen/arch/arm/arm64/lib/strchr.S index 0506b0ff7f..83fd81e8ef 100644 --- a/xen/arch/arm/arm64/lib/strchr.S +++ b/xen/arch/arm/arm64/lib/strchr.S @@ -27,7 +27,7 @@ * Returns: * x0 - address of first occurrence of 'c' or 0 */ -ENTRY(strchr) +FUNC(strchr) and w1, w1, #0xff 1: ldrb w2, [x0], #1 cmp w2, w1 @@ -37,4 +37,4 @@ ENTRY(strchr) cmp w2, w1 csel x0, x0, xzr, eq ret -ENDPROC(strchr) +END(strchr) diff --git a/xen/arch/arm/arm64/lib/strcmp.S b/xen/arch/arm/arm64/lib/strcmp.S index c6f42dd255..7677108e26 100644 --- a/xen/arch/arm/arm64/lib/strcmp.S +++ b/xen/arch/arm/arm64/lib/strcmp.S @@ -59,7 +59,7 @@ tmp3 .req x9 zeroones .req x10 pos .req x11 -ENTRY(strcmp) +FUNC(strcmp) eor tmp1, src1, src2 mov zeroones, #REP8_01 tst tmp1, #7 @@ -230,4 +230,4 @@ CPU_BE( orr syndrome, diff, has_nul ) lsr data1, data1, #56 sub result, data1, data2, lsr #56 ret -ENDPROC(strcmp) +END(strcmp) diff --git a/xen/arch/arm/arm64/lib/strlen.S b/xen/arch/arm/arm64/lib/strlen.S index fb6aaf1a6a..10feedaf81 100644 --- a/xen/arch/arm/arm64/lib/strlen.S +++ b/xen/arch/arm/arm64/lib/strlen.S @@ -56,7 +56,7 @@ pos .req x12 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -ENTRY(strlen) +FUNC(strlen) mov zeroones, #REP8_01 bic src, srcin, #15 ands tmp1, srcin, #15 @@ -123,4 +123,4 @@ CPU_LE( lsr tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ csinv data1, data1, xzr, le csel data2, data2, data2a, le b .Lrealigned -ENDPROC(strlen) +END(strlen) diff --git a/xen/arch/arm/arm64/lib/strncmp.S b/xen/arch/arm/arm64/lib/strncmp.S index a4a0f779f5..c00a641fc7 100644 --- a/xen/arch/arm/arm64/lib/strncmp.S +++ b/xen/arch/arm/arm64/lib/strncmp.S @@ -64,7 +64,7 @@ limit_wd .req x13 mask .req x14 endloop .req x15 -ENTRY(strncmp) +FUNC(strncmp) cbz limit, .Lret0 eor tmp1, src1, src2 mov zeroones, #REP8_01 @@ -307,4 +307,4 @@ CPU_BE( orr syndrome, diff, has_nul ) .Lret0: mov result, #0 ret -ENDPROC(strncmp) +END(strncmp) diff --git a/xen/arch/arm/arm64/lib/strnlen.S b/xen/arch/arm/arm64/lib/strnlen.S index 81c8e8b54e..2059ba782c 100644 --- a/xen/arch/arm/arm64/lib/strnlen.S +++ b/xen/arch/arm/arm64/lib/strnlen.S @@ -59,7 +59,7 @@ limit_wd .req x14 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -ENTRY(strnlen) +FUNC(strnlen) cbz limit, .Lhit_limit mov zeroones, #REP8_01 bic src, srcin, #15 @@ -168,4 +168,4 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ .Lhit_limit: mov len, limit ret -ENDPROC(strnlen) +END(strnlen) diff --git a/xen/arch/arm/arm64/lib/strrchr.S b/xen/arch/arm/arm64/lib/strrchr.S index 07059983f8..81033c0822 100644 --- a/xen/arch/arm/arm64/lib/strrchr.S +++ b/xen/arch/arm/arm64/lib/strrchr.S @@ -26,7 +26,7 @@ * Returns: * x0 - address of last occurrence of 'c' or 0 */ -ENTRY(strrchr) +FUNC(strrchr) mov x3, #0 and w1, w1, #0xff 1: ldrb w2, [x0], #1 @@ -37,4 +37,4 @@ ENTRY(strrchr) b 1b 2: mov x0, x3 ret -ENDPROC(strrchr) +END(strrchr) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 17 18:23:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 May 2024 18:23:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724408.1129693 (Exim 4.92) (envelope-from ) id 1s82F5-000876-KI; Fri, 17 May 2024 18:23:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724408.1129693; Fri, 17 May 2024 18:23: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 1s82F5-00086y-Hg; Fri, 17 May 2024 18:23:43 +0000 Received: by outflank-mailman (input) for mailman id 724408; Fri, 17 May 2024 18:23:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82F4-00086k-Dm for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s82F4-0004DA-D8 for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s82F4-0000De-CW for xen-changelog@lists.xenproject.org; Fri, 17 May 2024 18:23: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=6ZaJvcQq8isVY+DTiEWPmxPedQ/XQtQAbqmNZIgNYKk=; b=ze/AXAa4PqbVdWd3nxYooRUR2/ 7VPw/dQw3Diegi9Qp/o+nlzjWc5Bk1GXBgwRvBuDpPGnvqjFJkVDaeHMgTi79gGza6+PPc3IwPAIb BVMGsWiXG5v30I6hzYRtpyszjXctpUKx91/OBXoZHIaCmzvyQl1xAb8FCCVitTzQoiOI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add DT reserve map regions to bootinfo.reserved_mem Message-Id: Date: Fri, 17 May 2024 18:23:42 +0000 commit 53dc37829c31edf02e8fc56aeccca8d60f6e2f5e Author: Luca Fancellu AuthorDate: Thu Apr 25 14:11:18 2024 +0100 Commit: Julien Grall CommitDate: Thu May 16 22:09:13 2024 +0100 xen/arm: Add DT reserve map regions to bootinfo.reserved_mem Currently the code is listing device tree reserve map regions as reserved memory for Xen, but they are not added into bootinfo.reserved_mem and they are fetched in multiple places using the same code sequence, causing duplication. Fix this by adding them to the bootinfo.reserved_mem at early stage. Signed-off-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/arm32/mmu/mm.c | 29 +--------------------- xen/arch/arm/bootfdt.c | 51 +++++++++++++++++++++++--------------- xen/arch/arm/domain_build.c | 3 ++- xen/arch/arm/include/asm/setup.h | 5 ++++ xen/arch/arm/setup.c | 53 +++++++++++----------------------------- 5 files changed, 53 insertions(+), 88 deletions(-) diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index 23150122f7..be480c31ea 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -73,33 +73,6 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, } } - /* Now check any fdt reserved areas. */ - - nr = fdt_num_mem_rsv(device_tree_flattened); - - for ( ; i < mi->nr_mods + nr; i++ ) - { - paddr_t mod_s, mod_e; - - if ( fdt_get_mem_rsv_paddr(device_tree_flattened, - i - mi->nr_mods, - &mod_s, &mod_e ) < 0 ) - /* If we can't read it, pretend it doesn't exist... */ - continue; - - /* fdt_get_mem_rsv_paddr returns length */ - mod_e += mod_s; - - if ( s < mod_e && mod_s < e ) - { - mod_e = consider_modules(mod_e, e, size, align, i+1); - if ( mod_e ) - return mod_e; - - return consider_modules(s, mod_s, size, align, i+1); - } - } - /* * i is the current bootmodule we are evaluating, across all * possible kinds of bootmodules. @@ -108,7 +81,7 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, * need to index the reserved_mem bank starting from 0, and only counting * the reserved-memory modules. Hence, we need to use i - nr. */ - nr += mi->nr_mods; + nr = mi->nr_mods; for ( ; i - nr < reserved_mem->nr_banks; i++ ) { paddr_t r_s = reserved_mem->bank[i - nr].start; diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 4d708442a1..6e060111d9 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -475,8 +475,7 @@ static void __init early_print_info(void) const struct membanks *mem_resv = bootinfo_get_reserved_mem(); struct bootmodules *mods = &bootinfo.modules; struct bootcmdlines *cmds = &bootinfo.cmdlines; - unsigned int i, j; - int nr_rsvd; + unsigned int i; for ( i = 0; i < mi->nr_banks; i++ ) printk("RAM: %"PRIpaddr" - %"PRIpaddr"\n", @@ -490,26 +489,11 @@ static void __init early_print_info(void) mods->module[i].start + mods->module[i].size, boot_module_kind_as_string(mods->module[i].kind)); - nr_rsvd = fdt_num_mem_rsv(device_tree_flattened); - if ( nr_rsvd < 0 ) - panic("Parsing FDT memory reserve map failed (%d)\n", nr_rsvd); - - for ( i = 0; i < nr_rsvd; i++ ) - { - paddr_t s, e; - - if ( fdt_get_mem_rsv_paddr(device_tree_flattened, i, &s, &e) < 0 ) - continue; - - /* fdt_get_mem_rsv_paddr returns length */ - e += s; - printk(" RESVD[%u]: %"PRIpaddr" - %"PRIpaddr"\n", i, s, e); - } - for ( j = 0; j < mem_resv->nr_banks; j++, i++ ) + for ( i = 0; i < mem_resv->nr_banks; i++ ) { printk(" RESVD[%u]: %"PRIpaddr" - %"PRIpaddr"\n", i, - mem_resv->bank[j].start, - mem_resv->bank[j].start + mem_resv->bank[j].size - 1); + mem_resv->bank[i].start, + mem_resv->bank[i].start + mem_resv->bank[i].size - 1); } early_print_info_shmem(); printk("\n"); @@ -550,7 +534,10 @@ static void __init swap_memory_node(void *_a, void *_b, size_t size) */ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) { + struct membanks *reserved_mem = bootinfo_get_reserved_mem(); struct membanks *mem = bootinfo_get_mem(); + unsigned int i; + int nr_rsvd; int ret; ret = fdt_check_header(fdt); @@ -559,6 +546,30 @@ size_t __init boot_fdt_info(const void *fdt, paddr_t paddr) add_boot_module(BOOTMOD_FDT, paddr, fdt_totalsize(fdt), false); + nr_rsvd = fdt_num_mem_rsv(fdt); + if ( nr_rsvd < 0 ) + panic("Parsing FDT memory reserve map failed (%d)\n", nr_rsvd); + + for ( i = 0; i < nr_rsvd; i++ ) + { + struct membank *bank; + paddr_t s, sz; + + if ( fdt_get_mem_rsv_paddr(device_tree_flattened, i, &s, &sz) < 0 ) + continue; + + if ( reserved_mem->nr_banks < reserved_mem->max_banks ) + { + bank = &reserved_mem->bank[reserved_mem->nr_banks]; + bank->start = s; + bank->size = sz; + bank->type = MEMBANK_FDT_RESVMEM; + reserved_mem->nr_banks++; + } + else + panic("Cannot allocate reserved memory bank\n"); + } + ret = device_tree_for_each_node(fdt, 0, early_scan_node, NULL); if ( ret ) panic("Early FDT parsing failed (%d)\n", ret); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f6550809cf..968c497efc 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -793,7 +793,8 @@ int __init make_memory_node(const struct kernel_info *kinfo, int addrcells, u64 start = mem->bank[i].start; u64 size = mem->bank[i].size; - if ( mem->bank[i].type == MEMBANK_STATIC_DOMAIN ) + if ( (mem->bank[i].type == MEMBANK_STATIC_DOMAIN) || + (mem->bank[i].type == MEMBANK_FDT_RESVMEM) ) continue; nr_cells += reg_size; diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 61c15806a7..c34179da93 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -42,6 +42,11 @@ enum membank_type { * in reserved_mem. */ MEMBANK_STATIC_HEAP, + /* + * The MEMBANK_FDT_RESVMEM type is used to indicate whether the memory + * bank is from the FDT reserve map. + */ + MEMBANK_FDT_RESVMEM, }; /* Indicates the maximum number of characters(\0 included) for shm_id */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d242674381..c4e5c19b11 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -210,48 +210,18 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e, const struct membanks *reserved_mem = bootinfo_get_reserved_mem(); #ifdef CONFIG_STATIC_SHM const struct membanks *shmem = bootinfo_get_shmem(); + unsigned int offset; #endif - unsigned int i, nr; - int rc; - - rc = fdt_num_mem_rsv(device_tree_flattened); - if ( rc < 0 ) - panic("Unable to retrieve the number of reserved regions (rc=%d)\n", - rc); - - nr = rc; - - for ( i = first; i < nr ; i++ ) - { - paddr_t r_s, r_e; - - if ( fdt_get_mem_rsv_paddr(device_tree_flattened, i, &r_s, &r_e ) < 0 ) - /* If we can't read it, pretend it doesn't exist... */ - continue; - - r_e += r_s; /* fdt_get_mem_rsv_paddr returns length */ - - if ( s < r_e && r_s < e ) - { - dt_unreserved_regions(r_e, e, cb, i+1); - dt_unreserved_regions(s, r_s, cb, i+1); - return; - } - } + unsigned int i; /* * i is the current bootmodule we are evaluating across all possible * kinds. - * - * When retrieving the corresponding reserved-memory addresses - * below, we need to index the reserved_mem->bank starting - * from 0, and only counting the reserved-memory modules. Hence, - * we need to use i - nr. */ - for ( ; i - nr < reserved_mem->nr_banks; i++ ) + for ( i = first; i < reserved_mem->nr_banks; i++ ) { - paddr_t r_s = reserved_mem->bank[i - nr].start; - paddr_t r_e = r_s + reserved_mem->bank[i - nr].size; + paddr_t r_s = reserved_mem->bank[i].start; + paddr_t r_e = r_s + reserved_mem->bank[i].size; if ( s < r_e && r_s < e ) { @@ -262,11 +232,16 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e, } #ifdef CONFIG_STATIC_SHM - nr += reserved_mem->nr_banks; - for ( ; i - nr < shmem->nr_banks; i++ ) + /* + * When retrieving the corresponding shared memory addresses + * below, we need to index the shmem->bank starting from 0, hence + * we need to use i - reserved_mem->nr_banks. + */ + offset = reserved_mem->nr_banks; + for ( ; i - offset < shmem->nr_banks; i++ ) { - paddr_t r_s = shmem->bank[i - nr].start; - paddr_t r_e = r_s + shmem->bank[i - nr].size; + paddr_t r_s = shmem->bank[i - offset].start; + paddr_t r_e = r_s + shmem->bank[i - offset].size; if ( s < r_e && r_s < e ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 18 06:55:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 May 2024 06:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.724628.1129876 (Exim 4.92) (envelope-from ) id 1s8DyB-0007Uu-HP; Sat, 18 May 2024 06:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 724628.1129876; Sat, 18 May 2024 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 1s8DyB-0007Un-Er; Sat, 18 May 2024 06:55:03 +0000 Received: by outflank-mailman (input) for mailman id 724628; Sat, 18 May 2024 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 1s8DyA-0007U7-3S for xen-changelog@lists.xenproject.org; Sat, 18 May 2024 06:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s8DyA-0001MX-2X for xen-changelog@lists.xenproject.org; Sat, 18 May 2024 06:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s8DyA-0006BA-1D for xen-changelog@lists.xenproject.org; Sat, 18 May 2024 06: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=3TuY93mf1cOr6Y+LrEzkR6FknDWbvqNi2ecZaPPF5L4=; b=L9aKrrzmHZ1vyD6FYS+v0TKOoE 4eZDFV8lzEkeXiW1Fknzj3ZtYvGzgxgw6H0n7eAVYVFsyF0nSic1GuG1K8EfjZcbgVQQySeu1gICz iNcAXNobEEA7hQdaN2XGQBlX5yb7C/JKqvXsd3chgrLFbhsOY3PHgAdkM3eO+jNeyAwE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] include/ctype.h: fix MISRA R10.2 violation Message-Id: Date: Sat, 18 May 2024 06:55:02 +0000 commit 21611c68702dae2e18cb519a6e166cdceeaff4ca Author: Stefano Stabellini AuthorDate: Wed May 15 15:52:04 2024 -0700 Commit: Stefano Stabellini CommitDate: Thu May 16 18:03:27 2024 -0700 include/ctype.h: fix MISRA R10.2 violation The value returned by __toupper is used in arithmetic operations causing MISRA C 10.2 violations. Cast to plain char in the toupper macro. Also do the same in tolower for consistency. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/include/xen/ctype.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/ctype.h b/xen/include/xen/ctype.h index 6dec944a37..773ac27aa4 100644 --- a/xen/include/xen/ctype.h +++ b/xen/include/xen/ctype.h @@ -48,7 +48,7 @@ static inline unsigned char __toupper(unsigned char c) return c; } -#define tolower(c) __tolower(c) -#define toupper(c) __toupper(c) +#define tolower(c) ((char)__tolower(c)) +#define toupper(c) ((char)__toupper(c)) #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 20 13:44:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 13:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726130.1130387 (Exim 4.92) (envelope-from ) id 1s93J6-0003OY-Rd; Mon, 20 May 2024 13:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726130.1130387; Mon, 20 May 2024 13: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 1s93J6-0003OQ-P4; Mon, 20 May 2024 13:44:04 +0000 Received: by outflank-mailman (input) for mailman id 726130; Mon, 20 May 2024 13:44:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s93J5-0003OK-JM for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 13:44:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s93J5-00035k-HU for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 13:44:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s93J5-0005DU-Fd for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 13:44:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4SAbbC9ZfNPdWgrZdJqyVyszRaLvJMQVpoS8DGcPMLY=; b=E6YJORCeg7U3vy+xj3EPlq6X/F ZSNGQzKwIOV1GzZUYIasGrzIeOiy7D/I80Ifw/f13yGoK8mkL1DwUd/sCYIanpnqf1ctGZHsuBEBH WLz7SnrTqStqeoMNe4TzqJvexrMqQITJITT5DJ3CJgswfJoL2FYtpmM8SmhmcY1LzIw8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/msi: prevent watchdog triggering when dumping MSI state Message-Id: Date: Mon, 20 May 2024 13:44:03 +0000 commit 594b22ca5be681ec1b42c34f321cc2600d582210 Author: Roger Pau Monné AuthorDate: Fri May 17 15:56:05 2024 +0200 Commit: Andrew Cooper CommitDate: Mon May 20 14:29:44 2024 +0100 x86/msi: prevent watchdog triggering when dumping MSI state Use the same check that's used in dump_irqs(). Signed-off-by: Roger Pau Monné Release-acked-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/x86/msi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 19830528b6..0c97fbb3fc 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -1451,6 +1452,9 @@ static void cf_check dump_msi(unsigned char key) unsigned long flags; const char *type = "???"; + if ( !(irq & 0x1f) ) + process_pending_softirqs(); + if ( !irq_desc_initialized(desc) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 13:44:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 13:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726131.1130391 (Exim 4.92) (envelope-from ) id 1s93JG-0003QM-TG; Mon, 20 May 2024 13:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726131.1130391; Mon, 20 May 2024 13: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 1s93JG-0003QE-QV; Mon, 20 May 2024 13:44:14 +0000 Received: by outflank-mailman (input) for mailman id 726131; Mon, 20 May 2024 13:44:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s93JF-0003Q3-LW for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 13:44:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s93JF-00035s-Kh for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 13:44:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s93JF-0005Dx-Jo for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 13:44:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iV0PnrPG4JSdQicjtv+tTT3wYADli3kFd7vJCgZQzo0=; b=w9WzNv/hDE9p2iQxCmP5wgq8mz UZt4tODhykxP3oxcoCM35w4Wytk0bxA2fHthGUvzoh3/Sz/LGjCf0GhXh9bU8kNnjuNvOveRe42nd Gi3APZuwGZJ9dLCh+sQ73X7V3WMEEuQUgz3CUfclFEYAcG0xHybiwpUCM2Q8Zr6+sRrQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/golang: Add missing golang bindings for vlan Message-Id: Date: Mon, 20 May 2024 13:44:13 +0000 commit 54aa34fc89151c943550541e0af47664fb6e8676 Author: Henry Wang AuthorDate: Mon May 20 16:21:45 2024 +0800 Commit: Andrew Cooper CommitDate: Mon May 20 14:29:44 2024 +0100 tools/golang: Add missing golang bindings for vlan It is noticed that commit: 3bc14e4fa4b9 ("tools/libs/light: Add vlan field to libxl_device_nic") introduces a new "vlan" string field to libxl_device_nic. But the golang bindings are missing. Add it in this patch. Fixes: 3bc14e4fa4b9 ("tools/libs/light: Add vlan field to libxl_device_nic") Signed-off-by: Henry Wang Acked-by: George Dunlap --- tools/golang/xenlight/helpers.gen.go | 3 +++ tools/golang/xenlight/types.gen.go | 1 + 2 files changed, 4 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 78bdb08b15..b9cb5b33c7 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1963,6 +1963,7 @@ func (x *DeviceNic) fromC(xc *C.libxl_device_nic) error { x.BackendDomname = C.GoString(xc.backend_domname) x.Devid = Devid(xc.devid) x.Mtu = int(xc.mtu) +x.Vlan = C.GoString(xc.vlan) x.Model = C.GoString(xc.model) if err := x.Mac.fromC(&xc.mac);err != nil { return fmt.Errorf("converting field Mac: %v", err) @@ -2040,6 +2041,8 @@ if x.BackendDomname != "" { xc.backend_domname = C.CString(x.BackendDomname)} xc.devid = C.libxl_devid(x.Devid) xc.mtu = C.int(x.Mtu) +if x.Vlan != "" { +xc.vlan = C.CString(x.Vlan)} if x.Model != "" { xc.model = C.CString(x.Model)} if err := x.Mac.toC(&xc.mac); err != nil { diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index ccfe18019e..5b293755d7 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -756,6 +756,7 @@ BackendDomid Domid BackendDomname string Devid Devid Mtu int +Vlan string Model string Mac Mac Ip string -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 16:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 16:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726254.1130516 (Exim 4.92) (envelope-from ) id 1s95bM-0006AE-SJ; Mon, 20 May 2024 16:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726254.1130516; Mon, 20 May 2024 16:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bM-0006A6-P4; Mon, 20 May 2024 16:11:04 +0000 Received: by outflank-mailman (input) for mailman id 726254; Mon, 20 May 2024 16:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bM-00068E-8v for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bM-00067g-40 for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s95bM-0005JF-1L for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Cd0LrWRrgL9Lnp46P99fZ+tEeA6LMnr4plNo+AZxSww=; b=BtRpI4eNHQKj7de0OD6LiHIsnD hwy5E4wg3+9EgQxt09BHJ2OiiIilmuiTWRK32EdcMQ8dIj9H14tTfTsYccudtW86fQctGEmcIuYDG 7Cekkji1QkoOn0aY3MLpe9YA62Lz/bf7OVWPZI9xljxlZnpK2nj4/HcumkmXfFDyLI9c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/gen-cpuid: Minor cleanup Message-Id: Date: Mon, 20 May 2024 16:11:04 +0000 commit f79189cb2951c491ac8a285320bdc552cc3f6a79 Author: Andrew Cooper AuthorDate: Fri May 10 20:04:51 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 17:01:20 2024 +0100 x86/gen-cpuid: Minor cleanup Rename INIT_FEATURE_NAMES to INIT_FEATURE_NAME_TO_VAL as we're about to gain a inverse mapping of the same thing. Use dict.items() unconditionally. iteritems() is a marginal perf optimsiation for Python2 only, and simply not worth the effort on a script this small. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- tools/libs/light/libxl_cpuid.c | 2 +- xen/arch/x86/cpu-policy.c | 2 +- xen/tools/gen-cpuid.py | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index ce4f3c7095..063fe86eb7 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -296,7 +296,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) {NULL, 0, NA, CPUID_REG_INV, 0, 0} }; - static const struct feature_name features[] = INIT_FEATURE_NAMES; + static const struct feature_name features[] = INIT_FEATURE_NAME_TO_VAL; /* * NB: if we switch to using a cpu_policy derived object instead of a * libxl_cpuid_policy_list we could get rid of the featureset -> cpuid leaf diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 99871b8e0e..b96f4ee55c 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -43,7 +43,7 @@ static const uint32_t deep_features[] = INIT_DEEP_FEATURES; static const struct feature_name { const char *name; unsigned int bit; -} feature_names[] __initconstrel = INIT_FEATURE_NAMES; +} feature_names[] __initconstrel = INIT_FEATURE_NAME_TO_VAL; /* * Parse a list of cpuid feature names -> bool, calling the callback for any diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 380b9d973a..79d7f5c8e1 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -459,15 +459,10 @@ def write_results(state): state.output.write( """} -#define INIT_FEATURE_NAMES { \\ +#define INIT_FEATURE_NAME_TO_VAL { \\ """) - try: - _tmp = state.values.iteritems() - except AttributeError: - _tmp = state.values.items() - - for name, bit in sorted(_tmp): + for name, bit in sorted(state.values.items()): state.output.write( ' { "%s", %sU },\\\n' % (name, bit) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 16:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 16:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726256.1130519 (Exim 4.92) (envelope-from ) id 1s95bW-0006FD-T4; Mon, 20 May 2024 16:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726256.1130519; Mon, 20 May 2024 16:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bW-0006F5-QS; Mon, 20 May 2024 16:11:14 +0000 Received: by outflank-mailman (input) for mailman id 726256; Mon, 20 May 2024 16:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bW-0006Ex-9T for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bW-00067o-7M for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s95bW-0005Kc-67 for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jT0asU1jBEFsdNNneruB0aWZd/Vcn52SiVyQ9zHQxng=; b=IgKm5AwgoaOnW4ASMFNxlKE/jq eA6CzSO1bAmGCbTu/GUHwB1SngozfjqX3k/byILv7zmiEjohG3ULJm+h3J2bM1gOQ12/wuZQSbAYp PyPsP6nNlh/FmfXvCLzV1epNPFOHMm/oqMXwbYXtsWGT54cK7Mm3PULECJJ5hzGjnm2w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xen-cpuid: Rename decodes[] to leaf_info[] Message-Id: Date: Mon, 20 May 2024 16:11:14 +0000 commit e96fefdb06dbd6b401ce10b41a166ec90af82c8f Author: Roger Pau Monné AuthorDate: Thu May 2 12:49:22 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 17:01:20 2024 +0100 tools/xen-cpuid: Rename decodes[] to leaf_info[] Split out of subsequent patch to aid legibility. No functional change. Signed-off-by: Roger Pau Monné Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- tools/misc/xen-cpuid.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 8893547beb..6ee835b229 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -268,8 +268,7 @@ static const struct { const char *name; const char *abbr; const char *const *strs; -} decodes[] = -{ +} leaf_info[] = { { "CPUID 0x00000001.edx", "1d", str_1d }, { "CPUID 0x00000001.ecx", "1c", str_1c }, { "CPUID 0x80000001.edx", "e1d", str_e1d }, @@ -336,11 +335,11 @@ static void decode_featureset(const uint32_t *features, if ( !detail ) return; - for ( i = 0; i < length && i < ARRAY_SIZE(decodes); ++i ) + for ( i = 0; i < length && i < ARRAY_SIZE(leaf_info); ++i ) { - printf(" [%02u] %-"COL_ALIGN"s", i, decodes[i].name ?: ""); - if ( decodes[i].name ) - dump_leaf(features[i], decodes[i].strs); + printf(" [%02u] %-"COL_ALIGN"s", i, leaf_info[i].name ?: ""); + if ( leaf_info[i].name ) + dump_leaf(features[i], leaf_info[i].strs); printf("\n"); } } @@ -355,8 +354,8 @@ static void dump_info(xc_interface *xch, bool detail) if ( !detail ) { printf(" %"COL_ALIGN"s ", "KEY"); - for ( i = 0; i < ARRAY_SIZE(decodes); ++i ) - printf("%-8s ", decodes[i].abbr ?: "???"); + for ( i = 0; i < ARRAY_SIZE(leaf_info); ++i ) + printf("%-8s ", leaf_info[i].abbr ?: "???"); printf("\n"); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 16:11:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 16:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726257.1130523 (Exim 4.92) (envelope-from ) id 1s95bg-0006Lr-Ua; Mon, 20 May 2024 16:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726257.1130523; Mon, 20 May 2024 16:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bg-0006Lj-Rx; Mon, 20 May 2024 16:11:24 +0000 Received: by outflank-mailman (input) for mailman id 726257; Mon, 20 May 2024 16:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bg-0006LZ-BD for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bg-00067z-AS for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s95bg-0005L9-9X for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=o6MtpJRomsFE8V7CiI4A0pZRTY8qBm9cNLP5nHXvMO8=; b=4DqSPbK/5H6xboKxyP2JC2vwd1 gZBAicnQ1g/BnUJZ0kDn1Pk7QpiyT5zcd5iOIQGVXKNYFC+HELT9WqS5WeZHUi6mLnW9vLHgzGfuT w6PPwcW+AMmXOjFRW4v4zeQI6QbnM0Dit9wpBC5sGkdO6SRLDveSqisnBfT9OqQYzDkY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xen-cpuid: Use automatically generated feature names Message-Id: Date: Mon, 20 May 2024 16:11:24 +0000 commit bbb5c171d730eb524d21c7348726f06e95f6db19 Author: Roger Pau Monné AuthorDate: Thu May 2 12:49:22 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 17:01:20 2024 +0100 tools/xen-cpuid: Use automatically generated feature names Have gen-cpuid.py write out INIT_FEATURE_VAL_TO_NAME, derived from the same data source as INIT_FEATURE_NAME_TO_VAL, although both aliases of common_1d are needed. In xen-cpuid.c, sanity check at build time that leaf_info[] and feature_names[] are of sensible length. As dump_leaf() rendered missing names as numbers, always dump leaves even if we don't have the leaf name. This conversion was argumably missed in commit 59afdb8a81d6 ("tools/misc: Tweak reserved bit handling for xen-cpuid"). Signed-off-by: Roger Pau Monné Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- tools/misc/xen-cpuid.c | 16 ++++++++-------- xen/tools/gen-cpuid.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 6ee835b229..51009683da 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -11,6 +11,7 @@ #include #include +#include static uint32_t nr_features; @@ -291,6 +292,8 @@ static const struct { #define COL_ALIGN "24" +static const char *const feature_names[] = INIT_FEATURE_VAL_TO_NAME; + static const char *const fs_names[] = { [XEN_SYSCTL_cpu_featureset_raw] = "Raw", [XEN_SYSCTL_cpu_featureset_host] = "Host", @@ -304,12 +307,6 @@ static void dump_leaf(uint32_t leaf, const char *const *strs) { unsigned i; - if ( !strs ) - { - printf(" ???"); - return; - } - for ( i = 0; i < 32; ++i ) if ( leaf & (1u << i) ) { @@ -327,6 +324,10 @@ static void decode_featureset(const uint32_t *features, { unsigned int i; + /* If this trips, you probably need to extend leaf_info[] above. */ + BUILD_BUG_ON(ARRAY_SIZE(leaf_info) != FEATURESET_NR_ENTRIES); + BUILD_BUG_ON(ARRAY_SIZE(feature_names) != FEATURESET_NR_ENTRIES * 32); + printf("%-"COL_ALIGN"s ", name); for ( i = 0; i < length; ++i ) printf("%08x%c", features[i], @@ -338,8 +339,7 @@ static void decode_featureset(const uint32_t *features, for ( i = 0; i < length && i < ARRAY_SIZE(leaf_info); ++i ) { printf(" [%02u] %-"COL_ALIGN"s", i, leaf_info[i].name ?: ""); - if ( leaf_info[i].name ) - dump_leaf(features[i], leaf_info[i].strs); + dump_leaf(features[i], &feature_names[i * 32]); printf("\n"); } } diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 79d7f5c8e1..601eec6089 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -470,6 +470,35 @@ def write_results(state): state.output.write( """} +""") + + state.output.write( +""" +#define INIT_FEATURE_VAL_TO_NAME { \\ +""") + + for name, bit in sorted(state.values.items()): + state.output.write( + ' [%s] = "%s",\\\n' % (bit, name) + ) + + # Add the other alias for 1d/e1d common bits. 64 is the difference + # between 1d and e1d. + if bit in state.common_1d: + state.output.write( + ' [%s] = "%s",\\\n' % (64 + bit, name) + ) + + # Pad to an exact multiple of FEATURESET_SIZE if necessary + pad_feat = state.nr_entries * 32 - 1 + if not state.names.get(pad_feat): + state.output.write( + ' [%s] = NULL,\\\n' % (pad_feat, ) + ) + + state.output.write( +"""} + """) for idx, text in enumerate(state.bitfields): -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 16:11:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 16:11:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726259.1130529 (Exim 4.92) (envelope-from ) id 1s95br-0006RC-0S; Mon, 20 May 2024 16:11:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726259.1130529; Mon, 20 May 2024 16:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bq-0006R3-TQ; Mon, 20 May 2024 16:11:34 +0000 Received: by outflank-mailman (input) for mailman id 726259; Mon, 20 May 2024 16:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bq-0006Qr-EL for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s95bq-00068W-DU for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s95bq-0005Li-Cd for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 16:11:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4mSSa1HSCxg3kd9LWnNf9dKKQ/acxWlDUljU7usgFeI=; b=X5kGv4t87X7YbcJO73JYKvbV+i Bfl3CmJBL0eIRiLD8aSS2aYWWOmDl5yMY2OBiCdICYSdqL4n6svoFQFb5L1VNA6AzvqHNIpVj3/un SoubA8mUihZ8ImcGAVfymOdE6Mm+fgvF4UDpD9GUasSAFDIO0T1+By6XUJ6UgNNlWqH8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xen-cpuid: Drop old names Message-Id: Date: Mon, 20 May 2024 16:11:34 +0000 commit 26b122e3bf8f3921d87312fbf5e7e13872ae92b0 Author: Roger Pau Monné AuthorDate: Thu May 2 13:49:22 2024 +0200 Commit: Andrew Cooper CommitDate: Mon May 20 17:01:20 2024 +0100 tools/xen-cpuid: Drop old names Not used any more. Split out of previous patch to aid legibility. Signed-off-by: Roger Pau Monné Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- tools/misc/xen-cpuid.c | 287 ++++--------------------------------------------- 1 file changed, 18 insertions(+), 269 deletions(-) diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 51009683da..4c4593528d 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -15,279 +15,28 @@ static uint32_t nr_features; -static const char *const str_1d[32] = -{ - [ 0] = "fpu", [ 1] = "vme", - [ 2] = "de", [ 3] = "pse", - [ 4] = "tsc", [ 5] = "msr", - [ 6] = "pae", [ 7] = "mce", - [ 8] = "cx8", [ 9] = "apic", - /* [10] */ [11] = "sysenter", - [12] = "mtrr", [13] = "pge", - [14] = "mca", [15] = "cmov", - [16] = "pat", [17] = "pse36", - [18] = "psn", [19] = "clflush", - /* [20] */ [21] = "ds", - [22] = "acpi", [23] = "mmx", - [24] = "fxsr", [25] = "sse", - [26] = "sse2", [27] = "ss", - [28] = "htt", [29] = "tm", - [30] = "ia64", [31] = "pbe", -}; - -static const char *const str_1c[32] = -{ - [ 0] = "sse3", [ 1] = "pclmulqdq", - [ 2] = "dtes64", [ 3] = "monitor", - [ 4] = "ds-cpl", [ 5] = "vmx", - [ 6] = "smx", [ 7] = "est", - [ 8] = "tm2", [ 9] = "ssse3", - [10] = "cntx-id", [11] = "sdgb", - [12] = "fma", [13] = "cx16", - [14] = "xtpr", [15] = "pdcm", - /* [16] */ [17] = "pcid", - [18] = "dca", [19] = "sse41", - [20] = "sse42", [21] = "x2apic", - [22] = "movebe", [23] = "popcnt", - [24] = "tsc-dl", [25] = "aesni", - [26] = "xsave", [27] = "osxsave", - [28] = "avx", [29] = "f16c", - [30] = "rdrnd", [31] = "hyper", -}; - -static const char *const str_e1d[32] = -{ - [ 0] = "fpu", [ 1] = "vme", - [ 2] = "de", [ 3] = "pse", - [ 4] = "tsc", [ 5] = "msr", - [ 6] = "pae", [ 7] = "mce", - [ 8] = "cx8", [ 9] = "apic", - /* [10] */ [11] = "syscall", - [12] = "mtrr", [13] = "pge", - [14] = "mca", [15] = "cmov", - [16] = "fcmov", [17] = "pse36", - /* [18] */ [19] = "mp", - [20] = "nx", /* [21] */ - [22] = "mmx+", [23] = "mmx", - [24] = "fxsr", [25] = "fxsr+", - [26] = "pg1g", [27] = "rdtscp", - /* [28] */ [29] = "lm", - [30] = "3dnow+", [31] = "3dnow", -}; - -static const char *const str_e1c[32] = -{ - [ 0] = "lahf-lm", [ 1] = "cmp", - [ 2] = "svm", [ 3] = "extapic", - [ 4] = "cr8d", [ 5] = "lzcnt", - [ 6] = "sse4a", [ 7] = "msse", - [ 8] = "3dnowpf", [ 9] = "osvw", - [10] = "ibs", [11] = "xop", - [12] = "skinit", [13] = "wdt", - /* [14] */ [15] = "lwp", - [16] = "fma4", [17] = "tce", - /* [18] */ [19] = "nodeid", - /* [20] */ [21] = "tbm", - [22] = "topoext", [23] = "perfctr-core", - [24] = "perfctr-nb", /* [25] */ - [26] = "dbx", [27] = "perftsc", - [28] = "pcx-l2i", [29] = "monitorx", - [30] = "addr-msk-ext", -}; - -static const char *const str_7b0[32] = -{ - [ 0] = "fsgsbase", [ 1] = "tsc-adj", - [ 2] = "sgx", [ 3] = "bmi1", - [ 4] = "hle", [ 5] = "avx2", - [ 6] = "fdp-exn", [ 7] = "smep", - [ 8] = "bmi2", [ 9] = "erms", - [10] = "invpcid", [11] = "rtm", - [12] = "pqm", [13] = "depfpp", - [14] = "mpx", [15] = "pqe", - [16] = "avx512f", [17] = "avx512dq", - [18] = "rdseed", [19] = "adx", - [20] = "smap", [21] = "avx512-ifma", - [22] = "pcommit", [23] = "clflushopt", - [24] = "clwb", [25] = "proc-trace", - [26] = "avx512pf", [27] = "avx512er", - [28] = "avx512cd", [29] = "sha", - [30] = "avx512bw", [31] = "avx512vl", -}; - -static const char *const str_Da1[32] = -{ - [ 0] = "xsaveopt", [ 1] = "xsavec", - [ 2] = "xgetbv1", [ 3] = "xsaves", -}; - -static const char *const str_7c0[32] = -{ - [ 0] = "prefetchwt1", [ 1] = "avx512-vbmi", - [ 2] = "umip", [ 3] = "pku", - [ 4] = "ospke", [ 5] = "waitpkg", - [ 6] = "avx512-vbmi2", [ 7] = "cet-ss", - [ 8] = "gfni", [ 9] = "vaes", - [10] = "vpclmulqdq", [11] = "avx512-vnni", - [12] = "avx512-bitalg", - [14] = "avx512-vpopcntdq", - - [22] = "rdpid", - /* 24 */ [25] = "cldemote", - /* 26 */ [27] = "movdiri", - [28] = "movdir64b", [29] = "enqcmd", - [30] = "sgx-lc", [31] = "pks", -}; - -static const char *const str_e7d[32] = -{ - /* 6 */ [ 7] = "hw-pstate", - [ 8] = "itsc", [ 9] = "cpb", - [10] = "efro", -}; - -static const char *const str_e8b[32] = -{ - [ 0] = "clzero", - [ 2] = "rstr-fp-err-ptrs", - - /* [ 8] */ [ 9] = "wbnoinvd", - - [12] = "ibpb", - [14] = "ibrs", [15] = "amd-stibp", - [16] = "ibrs-always", [17] = "stibp-always", - [18] = "ibrs-fast", [19] = "ibrs-same-mode", - - [20] = "no-lmsl", - /* [22] */ [23] = "ppin", - [24] = "amd-ssbd", [25] = "virt-ssbd", - [26] = "ssb-no", - [28] = "psfd", [29] = "btc-no", - [30] = "ibpb-ret", -}; - -static const char *const str_7d0[32] = -{ - [ 2] = "avx512-4vnniw", [ 3] = "avx512-4fmaps", - [ 4] = "fsrm", - - [ 8] = "avx512-vp2intersect", [ 9] = "srbds-ctrl", - [10] = "md-clear", [11] = "rtm-always-abort", - /* 12 */ [13] = "tsx-force-abort", - [14] = "serialize", [15] = "hybrid", - [16] = "tsxldtrk", - [18] = "pconfig", - [20] = "cet-ibt", - /* 22 */ [23] = "avx512-fp16", - - [26] = "ibrsb", [27] = "stibp", - [28] = "l1d-flush", [29] = "arch-caps", - [30] = "core-caps", [31] = "ssbd", -}; - -static const char *const str_7a1[32] = -{ - [ 0] = "sha512", [ 1] = "sm3", - [ 2] = "sm4", - [ 4] = "avx-vnni", [ 5] = "avx512-bf16", - - [10] = "fzrm", [11] = "fsrs", - [12] = "fsrcs", - - /* 18 */ [19] = "wrmsrns", - - /* 22 */ [23] = "avx-ifma", -}; - -static const char *const str_e21a[32] = -{ - [ 0] = "no-nest-bp", [ 1] = "fs-gs-ns", - [ 2] = "lfence+", - [ 6] = "nscb", - [ 8] = "auto-ibrs", - [10] = "amd-fsrs", [11] = "amd-fsrc", - - /* 16 */ [17] = "cpuid-user-dis", - [18] = "epsf", [19] = "fsrsc", - [20] = "amd-prefetchi", - - /* 26 */ [27] = "sbpb", - [28] = "ibpb-brtype", [29] = "srso-no", -}; - -static const char *const str_7b1[32] = -{ - [ 0] = "ppin", -}; - -static const char *const str_7c1[32] = -{ -}; - -static const char *const str_7d1[32] = -{ - [ 4] = "avx-vnni-int8", [ 5] = "avx-ne-convert", - - [10] = "avx-vnni-int16", - - [14] = "prefetchi", - - [18] = "cet-sss", -}; - -static const char *const str_7d2[32] = -{ - [ 0] = "intel-psfd", [ 1] = "ipred-ctrl", - [ 2] = "rrsba-ctrl", [ 3] = "ddp-ctrl", - [ 4] = "bhi-ctrl", [ 5] = "mcdt-no", -}; - -static const char *const str_m10Al[32] = -{ - [ 0] = "rdcl-no", [ 1] = "eibrs", - [ 2] = "rsba", [ 3] = "skip-l1dfl", - [ 4] = "intel-ssb-no", [ 5] = "mds-no", - [ 6] = "if-pschange-mc-no", [ 7] = "tsx-ctrl", - [ 8] = "taa-no", [ 9] = "mcu-ctrl", - [10] = "misc-pkg-ctrl", [11] = "energy-ctrl", - [12] = "doitm", [13] = "sbdr-ssdp-no", - [14] = "fbsdp-no", [15] = "psdp-no", - /* 16 */ [17] = "fb-clear", - [18] = "fb-clear-ctrl", [19] = "rrsba", - [20] = "bhi-no", [21] = "xapic-status", - /* 22 */ [23] = "ovrclk-status", - [24] = "pbrsb-no", [25] = "gds-ctrl", - [26] = "gds-no", [27] = "rfds-no", - [28] = "rfds-clear", -}; - -static const char *const str_m10Ah[32] = -{ -}; - static const struct { const char *name; const char *abbr; - const char *const *strs; } leaf_info[] = { - { "CPUID 0x00000001.edx", "1d", str_1d }, - { "CPUID 0x00000001.ecx", "1c", str_1c }, - { "CPUID 0x80000001.edx", "e1d", str_e1d }, - { "CPUID 0x80000001.ecx", "e1c", str_e1c }, - { "CPUID 0x0000000d:1.eax", "Da1", str_Da1 }, - { "CPUID 0x00000007:0.ebx", "7b0", str_7b0 }, - { "CPUID 0x00000007:0.ecx", "7c0", str_7c0 }, - { "CPUID 0x80000007.edx", "e7d", str_e7d }, - { "CPUID 0x80000008.ebx", "e8b", str_e8b }, - { "CPUID 0x00000007:0.edx", "7d0", str_7d0 }, - { "CPUID 0x00000007:1.eax", "7a1", str_7a1 }, - { "CPUID 0x80000021.eax", "e21a", str_e21a }, - { "CPUID 0x00000007:1.ebx", "7b1", str_7b1 }, - { "CPUID 0x00000007:2.edx", "7d2", str_7d2 }, - { "CPUID 0x00000007:1.ecx", "7c1", str_7c1 }, - { "CPUID 0x00000007:1.edx", "7d1", str_7d1 }, - { "MSR_ARCH_CAPS.lo", "m10Al", str_m10Al }, - { "MSR_ARCH_CAPS.hi", "m10Ah", str_m10Ah }, + { "CPUID 0x00000001.edx", "1d" }, + { "CPUID 0x00000001.ecx", "1c" }, + { "CPUID 0x80000001.edx", "e1d" }, + { "CPUID 0x80000001.ecx", "e1c" }, + { "CPUID 0x0000000d:1.eax", "Da1" }, + { "CPUID 0x00000007:0.ebx", "7b0" }, + { "CPUID 0x00000007:0.ecx", "7c0" }, + { "CPUID 0x80000007.edx", "e7d" }, + { "CPUID 0x80000008.ebx", "e8b" }, + { "CPUID 0x00000007:0.edx", "7d0" }, + { "CPUID 0x00000007:1.eax", "7a1" }, + { "CPUID 0x80000021.eax", "e21a" }, + { "CPUID 0x00000007:1.ebx", "7b1" }, + { "CPUID 0x00000007:2.edx", "7d2" }, + { "CPUID 0x00000007:1.ecx", "7c1" }, + { "CPUID 0x00000007:1.edx", "7d1" }, + { "MSR_ARCH_CAPS.lo", "m10Al" }, + { "MSR_ARCH_CAPS.hi", "m10Ah" }, }; #define COL_ALIGN "24" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 21:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 21:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726367.1130641 (Exim 4.92) (envelope-from ) id 1s9AHg-0000jX-Ah; Mon, 20 May 2024 21:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726367.1130641; Mon, 20 May 2024 21:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AHg-0000jP-84; Mon, 20 May 2024 21:11:04 +0000 Received: by outflank-mailman (input) for mailman id 726367; Mon, 20 May 2024 21:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AHf-0000jJ-Gx for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AHf-0002tc-DV for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9AHf-0001Ik-CQ for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0MGWNQ+HrhTW0kUXwzf2xdNtBYh/IM2ulIoAmhD77Jw=; b=fcXn2+B4VUf0v8nIIqKOqH1HDO hbhNxC3rrA7oYyVkM8akVmQ5h/wMlyLLfZVEnZbbZvXQxPPREjslqJAX+zu2hIIPZ4/9YZSnxWPBo WDwvPWHJpB256wX2Z+ca9jWeLkPpF0JJWa+ckunkpxX9868CbALJ9CR2yfCp0yW3pNFU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/trace: Introduce new API Message-Id: Date: Mon, 20 May 2024 21:11:03 +0000 commit e978b462ec9a74ec90788fca0b9d37707e1f79c4 Author: Andrew Cooper AuthorDate: Mon Sep 20 13:36:12 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/trace: Introduce new API trace() and trace_time(), in function form for struct arguments, and macro form for simple uint32_t list arguments. This will be used to clean up the mess of macros which exists throughout the codebase, as well as eventually dropping __trace_var(). There is intentionally no macro to split a 64-bit parameter in the new API, for MISRA reasons. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap --- xen/common/trace.c | 5 +++++ xen/include/xen/trace.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/xen/common/trace.c b/xen/common/trace.c index 4e7b080e61..c94ce1f7dc 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -808,6 +808,11 @@ unlock: tasklet_schedule(&trace_notify_dom0_tasklet); } +void trace(uint32_t event, unsigned int extra, const void *extra_data) +{ + __trace_var(event, event & TRC_HD_CYCLE_FLAG, extra, extra_data); +} + void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) { diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index 055883287e..9dc7e3d621 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -37,6 +37,9 @@ int tb_control(struct xen_sysctl_tbuf_op *tbc); int trace_will_trace_event(u32 event); +/* Create a trace record, with pre-constructed additional parameters. */ +void trace(uint32_t event, unsigned int extra, const void *extra_data); + void __trace_var(uint32_t event, bool cycles, unsigned int extra, const void *); static inline void trace_var(uint32_t event, bool cycles, unsigned int extra, @@ -66,6 +69,9 @@ static inline int trace_will_trace_event(uint32_t event) return 0; } +static inline void trace( + uint32_t event, unsigned int extra, const void *extra_data) {} + static inline void trace_var(uint32_t event, bool cycles, unsigned int extra, const void *extra_data) {} static inline void __trace_var(uint32_t event, bool cycles, unsigned int extra, @@ -74,6 +80,30 @@ static inline void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) {} #endif /* CONFIG_TRACEBUFFER */ +/* Create a trace record with time included. */ +static inline void trace_time( + uint32_t event, unsigned int extra, const void *extra_data) +{ + trace(event | TRC_HD_CYCLE_FLAG, extra, extra_data); +} + +/* + * Create a trace record, packaging up to 7 additional parameters into a + * uint32_t array. + */ +#define TRACE(_e, ...) \ + do { \ + if ( unlikely(tb_init_done) ) \ + { \ + uint32_t _d[] = { __VA_ARGS__ }; \ + BUILD_BUG_ON(ARRAY_SIZE(_d) > TRACE_EXTRA_MAX); \ + trace(_e, sizeof(_d), sizeof(_d) ? _d : NULL); \ + } \ + } while ( 0 ) + +/* Create a trace record with time included. */ +#define TRACE_TIME(_e, ...) TRACE((_e) | TRC_HD_CYCLE_FLAG, ## __VA_ARGS__) + /* Convenience macros for calling the trace function. */ #define TRACE_0D(_e) \ do { \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 21:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 21:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726368.1130645 (Exim 4.92) (envelope-from ) id 1s9AHq-0000lT-C5; Mon, 20 May 2024 21:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726368.1130645; Mon, 20 May 2024 21:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AHq-0000lL-9U; Mon, 20 May 2024 21:11:14 +0000 Received: by outflank-mailman (input) for mailman id 726368; Mon, 20 May 2024 21:11:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AHp-0000lF-JZ for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AHp-0002tl-Ij for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9AHp-0001JT-Fo for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kK/P1GmoI7vMQlLfPwtRe6a8Eq3lImldMr0YHIStses=; b=zaWqnyvHhPP8LSPvf+ZlciGJ1z K7MW36gB5HueGdeFIK9PZnMLcoSBZw25wrJsQCeMYdtKyLjyNG3Bv40vBlLJBP/k3BaMQdGL/RmWZ eRKOPoKqElDDXOtM1/UUFqqYPVgV3lsOnzXVW2CS5YwZko+4vK8JnsHJE7whh/c/fcwE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/credit2: Clean up trace handling Message-Id: Date: Mon, 20 May 2024 21:11:13 +0000 commit ab8bc198507de47429e0b06dfd4e31c0d9461a34 Author: Andrew Cooper AuthorDate: Wed Sep 15 17:01:43 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/credit2: Clean up trace handling There is no need for bitfields anywhere - use types with an explicit width instead. There is also no need to cast 'd' to (unsigned char *) before passing it to a function taking void *. Switch to new trace_time() API. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Dario Faggioli --- xen/common/sched/credit2.c | 303 ++++++++++++++++++++++----------------------- 1 file changed, 148 insertions(+), 155 deletions(-) diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index 0962b52415..685929c290 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -1085,13 +1085,13 @@ static void update_max_weight(struct csched2_runqueue_data *rqd, int new_weight, if ( unlikely(tb_init_done) ) { struct { - unsigned rqi:16, max_weight:16; - } d; - d.rqi = rqd->id; - d.max_weight = rqd->max_weight; - __trace_var(TRC_CSCHED2_RUNQ_MAX_WEIGHT, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t rqi, max_weight; + } d = { + .rqi = rqd->id, + .max_weight = rqd->max_weight, + }; + + trace_time(TRC_CSCHED2_RUNQ_MAX_WEIGHT, sizeof(d), &d); } } @@ -1119,9 +1119,7 @@ _runq_assign(struct csched2_unit *svc, struct csched2_runqueue_data *rqd) .rqi = rqd->id, }; - __trace_var(TRC_CSCHED2_RUNQ_ASSIGN, 1, - sizeof(d), - (unsigned char *)&d); + trace_time(TRC_CSCHED2_RUNQ_ASSIGN, sizeof(d), &d); } } @@ -1354,9 +1352,7 @@ update_runq_load(const struct scheduler *ops, .shift = P, }; - __trace_var(TRC_CSCHED2_UPDATE_RUNQ_LOAD, 1, - sizeof(d), - (unsigned char *)&d); + trace_time(TRC_CSCHED2_UPDATE_RUNQ_LOAD, sizeof(d), &d); } } @@ -1406,16 +1402,16 @@ update_svc_load(const struct scheduler *ops, { struct { uint64_t v_avgload; - unsigned unit:16, dom:16; - unsigned shift; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.v_avgload = svc->avgload; - d.shift = P; - __trace_var(TRC_CSCHED2_UPDATE_UNIT_LOAD, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t shift; + } d = { + .v_avgload = svc->avgload, + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .shift = P, + }; + + trace_time(TRC_CSCHED2_UPDATE_UNIT_LOAD, sizeof(d), &d); } } @@ -1424,7 +1420,7 @@ update_load(const struct scheduler *ops, struct csched2_runqueue_data *rqd, struct csched2_unit *svc, int change, s_time_t now) { - trace_var(TRC_CSCHED2_UPDATE_LOAD, 1, 0, NULL); + TRACE_TIME(TRC_CSCHED2_UPDATE_LOAD); update_runq_load(ops, rqd, change, now); if ( svc ) @@ -1462,15 +1458,15 @@ static void runq_insert(struct csched2_unit *svc) if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned pos; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.pos = pos; - __trace_var(TRC_CSCHED2_RUNQ_POS, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t pos; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .pos = pos, + }; + + trace_time(TRC_CSCHED2_RUNQ_POS, sizeof(d), &d); } } @@ -1563,16 +1559,16 @@ static s_time_t tickle_score(const struct scheduler *ops, s_time_t now, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - int credit, score; - } d; - d.dom = cur->unit->domain->domain_id; - d.unit = cur->unit->unit_id; - d.credit = cur->credit; - d.score = score; - __trace_var(TRC_CSCHED2_TICKLE_CHECK, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + int32_t credit, score; + } d = { + .unit = cur->unit->unit_id, + .dom = cur->unit->domain->domain_id, + .credit = cur->credit, + .score = score, + }; + + trace_time(TRC_CSCHED2_TICKLE_CHECK, sizeof(d), &d); } return score; @@ -1610,17 +1606,17 @@ runq_tickle(const struct scheduler *ops, struct csched2_unit *new, s_time_t now) if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned processor; - int credit; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.processor = cpu; - d.credit = new->credit; - __trace_var(TRC_CSCHED2_TICKLE_NEW, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t processor; + int32_t credit; + } d = { + .dom = unit->domain->domain_id, + .unit = unit->unit_id, + .processor = cpu, + .credit = new->credit, + }; + + trace_time(TRC_CSCHED2_TICKLE_NEW, sizeof(d), &d); } /* @@ -1759,12 +1755,12 @@ runq_tickle(const struct scheduler *ops, struct csched2_unit *new, s_time_t now) if ( unlikely(tb_init_done) ) { struct { - unsigned cpu:16, pad:16; - } d; - d.cpu = ipid; d.pad = 0; - __trace_var(TRC_CSCHED2_TICKLE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t cpu, _pad; + } d = { + .cpu = ipid, + }; + + trace_time(TRC_CSCHED2_TICKLE, sizeof(d), &d); } tickle_cpu(ipid, rqd); @@ -1840,16 +1836,16 @@ static void reset_credit(int cpu, s_time_t now, struct csched2_unit *snext) if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - int credit_start, credit_end; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.credit_start = start_credit; - d.credit_end = svc->credit; - __trace_var(TRC_CSCHED2_CREDIT_RESET, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + int32_t credit_start, credit_end; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .credit_start = start_credit, + .credit_end = svc->credit, + }; + + trace_time(TRC_CSCHED2_CREDIT_RESET, sizeof(d), &d); } } @@ -1895,18 +1891,17 @@ void burn_credits(struct csched2_runqueue_data *rqd, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - int credit, budget; - int delta; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.credit = svc->credit; - d.budget = has_cap(svc) ? svc->budget : INT_MIN; - d.delta = delta; - __trace_var(TRC_CSCHED2_CREDIT_BURN, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + int32_t credit, budget, delta; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .credit = svc->credit, + .budget = has_cap(svc) ? svc->budget : INT_MIN, + .delta = delta, + }; + + trace_time(TRC_CSCHED2_CREDIT_BURN, sizeof(d), &d); } } @@ -2551,17 +2546,17 @@ csched2_res_pick(const struct scheduler *ops, const struct sched_unit *unit) { struct { uint64_t b_avgload; - unsigned unit:16, dom:16; - unsigned rq_id:16, new_cpu:16; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.rq_id = min_rqd ? min_rqd->id : -1; - d.b_avgload = min_avgload; - d.new_cpu = new_cpu; - __trace_var(TRC_CSCHED2_PICKED_CPU, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint16_t rq_id, new_cpu; + } d = { + .b_avgload = min_avgload, + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .rq_id = min_rqd ? min_rqd->id : -1, + .new_cpu = new_cpu, + }; + + trace_time(TRC_CSCHED2_PICKED_CPU, sizeof(d), &d); } return get_sched_res(new_cpu); @@ -2622,16 +2617,16 @@ static void migrate(const struct scheduler *ops, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned rqi:16, trqi:16; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.rqi = svc->rqd->id; - d.trqi = trqd->id; - __trace_var(TRC_CSCHED2_MIGRATE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint16_t rqi, trqi; + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .rqi = svc->rqd->id, + .trqi = trqd->id, + }; + + trace_time(TRC_CSCHED2_MIGRATE, sizeof(d), &d); } if ( svc->flags & CSFLAG_scheduled ) @@ -2768,15 +2763,15 @@ retry: if ( unlikely(tb_init_done) ) { struct { - unsigned lrq_id:16, orq_id:16; - unsigned load_delta; - } d; - d.lrq_id = st.lrqd->id; - d.orq_id = st.orqd->id; - d.load_delta = st.load_delta; - __trace_var(TRC_CSCHED2_LOAD_CHECK, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t lrq_id, orq_id; + uint32_t load_delta; + } d = { + .lrq_id = st.lrqd->id, + .orq_id = st.orqd->id, + .load_delta = st.load_delta, + }; + + trace_time(TRC_CSCHED2_LOAD_CHECK, sizeof(d), &d); } /* @@ -2820,9 +2815,7 @@ retry: .orq_id = st.orqd->id, }; - __trace_var(TRC_CSCHED2_LOAD_BALANCE, 1, - sizeof(d), - (unsigned char *)&d); + trace_time(TRC_CSCHED2_LOAD_BALANCE, sizeof(d), &d); } SCHED_STAT_CRANK(acct_load_balance); @@ -3407,15 +3400,15 @@ runq_candidate(struct csched2_runqueue_data *rqd, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned runtime; - } d; - d.dom = scurr->unit->domain->domain_id; - d.unit = scurr->unit->unit_id; - d.runtime = now - scurr->unit->state_entry_time; - __trace_var(TRC_CSCHED2_RATELIMIT, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t runtime; + } d = { + .unit = scurr->unit->unit_id, + .dom = scurr->unit->domain->domain_id, + .runtime = now - scurr->unit->state_entry_time, + }; + + trace_time(TRC_CSCHED2_RATELIMIT, sizeof(d), &d); } return scurr; } @@ -3468,13 +3461,13 @@ runq_candidate(struct csched2_runqueue_data *rqd, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - __trace_var(TRC_CSCHED2_RUNQ_CAND_CHECK, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + }; + + trace_time(TRC_CSCHED2_RUNQ_CAND_CHECK, sizeof(d), &d); } /* @@ -3542,17 +3535,17 @@ runq_candidate(struct csched2_runqueue_data *rqd, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned tickled_cpu; - int credit; - } d; - d.dom = snext->unit->domain->domain_id; - d.unit = snext->unit->unit_id; - d.credit = snext->credit; - d.tickled_cpu = snext->tickled_cpu; - __trace_var(TRC_CSCHED2_RUNQ_CANDIDATE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t tickled_cpu; + int32_t credit; + } d = { + .unit = snext->unit->unit_id, + .dom = snext->unit->domain->domain_id, + .tickled_cpu = snext->tickled_cpu, + .credit = snext->credit, + }; + + trace_time(TRC_CSCHED2_RUNQ_CANDIDATE, sizeof(d), &d); } if ( unlikely(snext->tickled_cpu != -1 && snext->tickled_cpu != cpu) ) @@ -3608,18 +3601,18 @@ static void cf_check csched2_schedule( if ( unlikely(tb_init_done) ) { struct { - unsigned cpu:16, rq_id:16; - unsigned tasklet:8, idle:8, smt_idle:8, tickled:8; - } d; - d.cpu = cur_cpu; - d.rq_id = c2r(sched_cpu); - d.tasklet = tasklet_work_scheduled; - d.idle = is_idle_unit(currunit); - d.smt_idle = cpumask_test_cpu(sched_cpu, &rqd->smt_idle); - d.tickled = tickled; - __trace_var(TRC_CSCHED2_SCHEDULE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t cpu, rq_id; + uint8_t tasklet, idle, smt_idle, tickled; + } d = { + .cpu = cur_cpu, + .rq_id = c2r(sched_cpu), + .tasklet = tasklet_work_scheduled, + .idle = is_idle_unit(currunit), + .smt_idle = cpumask_test_cpu(sched_cpu, &rqd->smt_idle), + .tickled = tickled, + }; + + trace_time(TRC_CSCHED2_SCHEDULE, sizeof(d), &d); } /* Update credits (and budget, if necessary). */ @@ -3654,7 +3647,7 @@ static void cf_check csched2_schedule( if ( tasklet_work_scheduled ) { __clear_bit(__CSFLAG_unit_yield, &scurr->flags); - trace_var(TRC_CSCHED2_SCHED_TASKLET, 1, 0, NULL); + TRACE_TIME(TRC_CSCHED2_SCHED_TASKLET); snext = csched2_unit(sched_idle_unit(sched_cpu)); } else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 21:11:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 21:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726369.1130649 (Exim 4.92) (envelope-from ) id 1s9AI1-0000oq-Dp; Mon, 20 May 2024 21:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726369.1130649; Mon, 20 May 2024 21:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AI1-0000og-B2; Mon, 20 May 2024 21:11:25 +0000 Received: by outflank-mailman (input) for mailman id 726369; Mon, 20 May 2024 21:11:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AHz-0000oU-Ny for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AHz-0002tx-Lx for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9AHz-0001KF-Kw for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2oQKhZeS80Y+E7Kl+3WTxDvPTXwxMf2Zu3Y9/LyqgQ8=; b=WMUKEF4kMNJBG4KVIPImziLjXa 6z6adxpXZxuZvxJVM44RlYQgqCqWZosBva/b0YJZRaKe/dQPPU9WEXSGqsqBc3cHYfs7BXsOcQEdZ lDhw8ZUMIJAYKP73T0b6fMtOHNDQGXD/sUG9ddoG1oFoFSBYwdNYLhvUfUNY+yv5yH28=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/rt: Clean up trace handling Message-Id: Date: Mon, 20 May 2024 21:11:23 +0000 commit df50666449a4ef0bc28f3118dc8adf1ecf5ba4a1 Author: Andrew Cooper AuthorDate: Fri Sep 17 16:28:19 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/rt: Clean up trace handling Most uses of bitfields and __packed are unnecessary. There is also no need to cast 'd' to (unsigned char *) before passing it to a function taking void *. Switch to new trace_time() API. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched/rt.c | 99 ++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 52 deletions(-) diff --git a/xen/common/sched/rt.c b/xen/common/sched/rt.c index b279f957f6..f368e0fdd5 100644 --- a/xen/common/sched/rt.c +++ b/xen/common/sched/rt.c @@ -455,21 +455,21 @@ rt_update_deadline(s_time_t now, struct rt_unit *svc) svc->cur_budget = svc->budget; svc->priority_level = 0; - /* TRACE */ + if ( unlikely(tb_init_done) ) { - struct __packed { - unsigned unit:16, dom:16; - unsigned priority_level; + struct { + uint16_t unit, dom; + uint32_t priority_level; uint64_t cur_deadline, cur_budget; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.priority_level = svc->priority_level; - d.cur_deadline = (uint64_t) svc->cur_deadline; - d.cur_budget = (uint64_t) svc->cur_budget; - trace_var(TRC_RTDS_BUDGET_REPLENISH, 1, - sizeof(d), - (unsigned char *) &d); + } d = { + .dom = svc->unit->domain->domain_id, + .unit = svc->unit->unit_id, + .priority_level = svc->priority_level, + .cur_deadline = svc->cur_deadline, + .cur_budget = svc->cur_budget, + }; + + trace_time(TRC_RTDS_BUDGET_REPLENISH, sizeof(d), &d); } return; @@ -986,7 +986,7 @@ burn_budget(const struct scheduler *ops, struct rt_unit *svc, s_time_t now) } } - /* TRACE */ + if ( unlikely(tb_init_done) ) { struct __packed { uint16_t unit, dom; @@ -1003,9 +1003,7 @@ burn_budget(const struct scheduler *ops, struct rt_unit *svc, s_time_t now) .has_extratime = !!(svc->flags & RTDS_extratime), }; - trace_var(TRC_RTDS_BUDGET_BURN, 1, - sizeof(d), - (unsigned char *) &d); + trace_time(TRC_RTDS_BUDGET_BURN, sizeof(d), &d); } } @@ -1040,22 +1038,19 @@ runq_pick(const struct scheduler *ops, const cpumask_t *mask, unsigned int cpu) break; } - /* TRACE */ + if ( unlikely(tb_init_done) && svc ) { - if( svc != NULL ) - { - struct __packed { - unsigned unit:16, dom:16; - uint64_t cur_deadline, cur_budget; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.cur_deadline = (uint64_t) svc->cur_deadline; - d.cur_budget = (uint64_t) svc->cur_budget; - trace_var(TRC_RTDS_RUNQ_PICK, 1, - sizeof(d), - (unsigned char *) &d); - } + struct __packed { + uint16_t unit, dom; + uint64_t cur_deadline, cur_budget; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .cur_deadline = svc->cur_deadline, + .cur_budget = svc->cur_budget, + }; + + trace_time(TRC_RTDS_RUNQ_PICK, sizeof(d), &d); } return svc; @@ -1076,18 +1071,19 @@ rt_schedule(const struct scheduler *ops, struct sched_unit *currunit, struct rt_unit *snext = NULL; bool migrated = false; - /* TRACE */ + if ( unlikely(tb_init_done) ) { - struct __packed { - unsigned cpu:16, tasklet:8, tickled:4, idle:4; - } d; - d.cpu = cur_cpu; - d.tasklet = tasklet_work_scheduled; - d.tickled = cpumask_test_cpu(sched_cpu, &prv->tickled); - d.idle = is_idle_unit(currunit); - trace_var(TRC_RTDS_SCHEDULE, 1, - sizeof(d), - (unsigned char *)&d); + struct { + uint16_t cpu; + uint8_t tasklet, tickled:4, idle:4; + } d = { + .cpu = cur_cpu, + .tasklet = tasklet_work_scheduled, + .tickled = cpumask_test_cpu(sched_cpu, &prv->tickled), + .idle = is_idle_unit(currunit), + }; + + trace_time(TRC_RTDS_SCHEDULE, sizeof(d), &d); } /* clear ticked bit now that we've been scheduled */ @@ -1098,7 +1094,7 @@ rt_schedule(const struct scheduler *ops, struct sched_unit *currunit, if ( tasklet_work_scheduled ) { - trace_var(TRC_RTDS_SCHED_TASKLET, 1, 0, NULL); + TRACE_TIME(TRC_RTDS_SCHED_TASKLET); snext = rt_unit(sched_idle_unit(sched_cpu)); } else @@ -1250,16 +1246,15 @@ runq_tickle(const struct scheduler *ops, const struct rt_unit *new) SCHED_STAT_CRANK(tickled_no_cpu); return; out: - /* TRACE */ + if ( unlikely(tb_init_done) ) { struct { - unsigned cpu:16, pad:16; - } d; - d.cpu = cpu_to_tickle; - d.pad = 0; - trace_var(TRC_RTDS_TICKLE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t cpu, _pad; + } d = { + .cpu = cpu_to_tickle, + }; + + trace_time(TRC_RTDS_TICKLE, sizeof(d), &d); } cpumask_set_cpu(cpu_to_tickle, &prv->tickled); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 21:11:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 21:11:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726370.1130653 (Exim 4.92) (envelope-from ) id 1s9AIB-0000sA-Gq; Mon, 20 May 2024 21:11:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726370.1130653; Mon, 20 May 2024 21:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AIB-0000s2-Dv; Mon, 20 May 2024 21:11:35 +0000 Received: by outflank-mailman (input) for mailman id 726370; Mon, 20 May 2024 21:11:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AI9-0000rl-Qf for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AI9-0002u5-Pp for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9AI9-0001Km-OS for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V4UK7ifgpffkP8RqHLfaTXF52jdTmFbyL2poN/OJ2qw=; b=wVfS/dU2oJybc+JHyRz8c0nNqj BlTzhl7kjTeNRuWjbqMFsKMw5XsZD0RtMinfoThGHn7SrWK+lrt/G0Posa7T3ooThSlGZ5JqvFcJI RJNdpqc7Vui7EY/SnRl8PMN7p08nvgQhYK1kbNuV5WKkVXZRLb9AUkhAfRVODdywdLh4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/sched: Clean up trace handling Message-Id: Date: Mon, 20 May 2024 21:11:33 +0000 commit d64693df1ab98f5278cf32ab3e0c12295237c42b Author: Andrew Cooper AuthorDate: Mon Sep 20 14:07:43 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/sched: Clean up trace handling There is no need for bitfields anywhere - use more sensible types. There is also no need to cast 'd' to (unsigned char *) before passing it to a function taking void *. Switch to new trace_time() API. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched/core.c | 56 ++++++++++++++++++------------------- xen/common/sched/credit.c | 70 ++++++++++++++++++++++------------------------- xen/common/sched/null.c | 63 ++++++++++++++++++++++++------------------ 3 files changed, 97 insertions(+), 92 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index babac7aad6..d84b65f197 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -205,7 +205,7 @@ static inline struct scheduler *vcpu_scheduler(const struct vcpu *v) static inline void trace_runstate_change(const struct vcpu *v, int new_state) { - struct { uint32_t vcpu:16, domain:16; } d; + struct { uint16_t vcpu, domain; } d; uint32_t event; if ( likely(!tb_init_done) ) @@ -218,12 +218,12 @@ static inline void trace_runstate_change(const struct vcpu *v, int new_state) event |= ( v->runstate.state & 0x3 ) << 8; event |= ( new_state & 0x3 ) << 4; - __trace_var(event, 1/*tsc*/, sizeof(d), &d); + trace_time(event, sizeof(d), &d); } static inline void trace_continue_running(const struct vcpu *v) { - struct { uint32_t vcpu:16, domain:16; } d; + struct { uint16_t vcpu, domain; } d; if ( likely(!tb_init_done) ) return; @@ -231,7 +231,7 @@ static inline void trace_continue_running(const struct vcpu *v) d.vcpu = v->vcpu_id; d.domain = v->domain->domain_id; - __trace_var(TRC_SCHED_CONTINUE_RUNNING, 1/*tsc*/, sizeof(d), &d); + trace_time(TRC_SCHED_CONTINUE_RUNNING, sizeof(d), &d); } static inline void vcpu_urgent_count_update(struct vcpu *v) @@ -872,7 +872,7 @@ int sched_init_domain(struct domain *d, unsigned int poolid) return ret; SCHED_STAT_CRANK(dom_init); - TRACE_1D(TRC_SCHED_DOM_ADD, d->domain_id); + TRACE_TIME(TRC_SCHED_DOM_ADD, d->domain_id); rcu_read_lock(&sched_res_rculock); @@ -895,7 +895,7 @@ void sched_destroy_domain(struct domain *d) if ( d->cpupool ) { SCHED_STAT_CRANK(dom_destroy); - TRACE_1D(TRC_SCHED_DOM_REM, d->domain_id); + TRACE_TIME(TRC_SCHED_DOM_REM, d->domain_id); rcu_read_lock(&sched_res_rculock); @@ -936,7 +936,7 @@ void vcpu_sleep_nosync(struct vcpu *v) unsigned long flags; spinlock_t *lock; - TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); + TRACE_TIME(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); rcu_read_lock(&sched_res_rculock); @@ -965,7 +965,7 @@ void vcpu_wake(struct vcpu *v) spinlock_t *lock; struct sched_unit *unit = v->sched_unit; - TRACE_2D(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id); + TRACE_TIME(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id); rcu_read_lock(&sched_res_rculock); @@ -1425,7 +1425,7 @@ void vcpu_block(void) } else { - TRACE_2D(TRC_SCHED_BLOCK, v->domain->domain_id, v->vcpu_id); + TRACE_TIME(TRC_SCHED_BLOCK, v->domain->domain_id, v->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); } } @@ -1498,7 +1498,7 @@ static long do_poll(const struct sched_poll *sched_poll) if ( sched_poll->timeout != 0 ) set_timer(&v->poll_timer, sched_poll->timeout); - TRACE_2D(TRC_SCHED_BLOCK, d->domain_id, v->vcpu_id); + TRACE_TIME(TRC_SCHED_BLOCK, d->domain_id, v->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); return 0; @@ -1526,7 +1526,7 @@ long vcpu_yield(void) SCHED_STAT_CRANK(vcpu_yield); - TRACE_2D(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id); + TRACE_TIME(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); return 0; } @@ -1904,9 +1904,8 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&sched_shutdown, arg, 1) ) break; - TRACE_3D(TRC_SCHED_SHUTDOWN, - current->domain->domain_id, current->vcpu_id, - sched_shutdown.reason); + TRACE_TIME(TRC_SCHED_SHUTDOWN, current->domain->domain_id, + current->vcpu_id, sched_shutdown.reason); ret = domain_shutdown(current->domain, (u8)sched_shutdown.reason); break; @@ -1921,8 +1920,8 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&sched_shutdown, arg, 1) ) break; - TRACE_3D(TRC_SCHED_SHUTDOWN_CODE, - d->domain_id, current->vcpu_id, sched_shutdown.reason); + TRACE_TIME(TRC_SCHED_SHUTDOWN_CODE, d->domain_id, current->vcpu_id, + sched_shutdown.reason); spin_lock(&d->shutdown_lock); if ( d->shutdown_code == SHUTDOWN_CODE_INVALID ) @@ -2086,7 +2085,7 @@ long sched_adjust(struct domain *d, struct xen_domctl_scheduler_op *op) rcu_read_lock(&sched_res_rculock); if ( (ret = sched_adjust_dom(dom_scheduler(d), d, op)) == 0 ) - TRACE_1D(TRC_SCHED_ADJDOM, d->domain_id); + TRACE_TIME(TRC_SCHED_ADJDOM, d->domain_id); rcu_read_unlock(&sched_res_rculock); @@ -2181,14 +2180,13 @@ static void sched_switch_units(struct sched_resource *sr, sr->curr = next; sr->prev = prev; - TRACE_3D(TRC_SCHED_SWITCH_INFPREV, prev->domain->domain_id, - prev->unit_id, now - prev->state_entry_time); - TRACE_4D(TRC_SCHED_SWITCH_INFNEXT, next->domain->domain_id, - next->unit_id, - (next->vcpu_list->runstate.state == RUNSTATE_runnable) ? - (now - next->state_entry_time) : 0, prev->next_time); - TRACE_4D(TRC_SCHED_SWITCH, prev->domain->domain_id, prev->unit_id, - next->domain->domain_id, next->unit_id); + TRACE_TIME(TRC_SCHED_SWITCH_INFPREV, prev->domain->domain_id, + prev->unit_id, now - prev->state_entry_time); + TRACE_TIME(TRC_SCHED_SWITCH_INFNEXT, next->domain->domain_id, next->unit_id, + (next->vcpu_list->runstate.state == RUNSTATE_runnable) ? + (now - next->state_entry_time) : 0, prev->next_time); + TRACE_TIME(TRC_SCHED_SWITCH, prev->domain->domain_id, prev->unit_id, + next->domain->domain_id, next->unit_id); ASSERT(!unit_running(next)); @@ -2379,10 +2377,10 @@ static void sched_context_switch(struct vcpu *vprev, struct vcpu *vnext, { if ( unlikely(vprev == vnext) ) { - TRACE_4D(TRC_SCHED_SWITCH_INFCONT, - vnext->domain->domain_id, vnext->sched_unit->unit_id, - now - vprev->runstate.state_entry_time, - vprev->sched_unit->next_time); + TRACE_TIME(TRC_SCHED_SWITCH_INFCONT, + vnext->domain->domain_id, vnext->sched_unit->unit_id, + now - vprev->runstate.state_entry_time, + vprev->sched_unit->next_time); sched_context_switched(vprev, vnext); /* diff --git a/xen/common/sched/credit.c b/xen/common/sched/credit.c index a72d071527..020f44595e 100644 --- a/xen/common/sched/credit.c +++ b/xen/common/sched/credit.c @@ -493,7 +493,7 @@ static inline void __runq_tickle(const struct csched_unit *new) { /* Avoid TRACE_*: saves checking !tb_init_done each step */ for_each_cpu(cpu, &mask) - __trace_var(TRC_CSCHED_TICKLE, 1, sizeof(cpu), &cpu); + trace_time(TRC_CSCHED_TICKLE, sizeof(cpu), &cpu); } /* @@ -862,8 +862,7 @@ _csched_cpu_pick(const struct scheduler *ops, const struct sched_unit *unit, if ( commit && spc ) spc->idle_bias = cpu; - TRACE_3D(TRC_CSCHED_PICKED_CPU, unit->domain->domain_id, unit->unit_id, - cpu); + TRACE_TIME(TRC_CSCHED_PICKED_CPU, unit->domain->domain_id, unit->unit_id, cpu); return cpu; } @@ -907,8 +906,8 @@ __csched_unit_acct_start(struct csched_private *prv, struct csched_unit *svc) } } - TRACE_3D(TRC_CSCHED_ACCOUNT_START, sdom->dom->domain_id, - svc->unit->unit_id, sdom->active_unit_count); + TRACE_TIME(TRC_CSCHED_ACCOUNT_START, sdom->dom->domain_id, + svc->unit->unit_id, sdom->active_unit_count); spin_unlock_irqrestore(&prv->lock, flags); } @@ -933,8 +932,8 @@ __csched_unit_acct_stop_locked(struct csched_private *prv, list_del_init(&sdom->active_sdom_elem); } - TRACE_3D(TRC_CSCHED_ACCOUNT_STOP, sdom->dom->domain_id, - svc->unit->unit_id, sdom->active_unit_count); + TRACE_TIME(TRC_CSCHED_ACCOUNT_STOP, sdom->dom->domain_id, + svc->unit->unit_id, sdom->active_unit_count); } static void @@ -957,8 +956,8 @@ csched_unit_acct(struct csched_private *prv, unsigned int cpu) if ( svc->pri == CSCHED_PRI_TS_BOOST ) { svc->pri = CSCHED_PRI_TS_UNDER; - TRACE_2D(TRC_CSCHED_BOOST_END, svc->sdom->dom->domain_id, - svc->unit->unit_id); + TRACE_TIME(TRC_CSCHED_BOOST_END, svc->sdom->dom->domain_id, + svc->unit->unit_id); } /* @@ -1164,8 +1163,7 @@ csched_unit_wake(const struct scheduler *ops, struct sched_unit *unit) if ( !migrating && svc->pri == CSCHED_PRI_TS_UNDER && !test_bit(CSCHED_FLAG_UNIT_PARKED, &svc->flags) ) { - TRACE_2D(TRC_CSCHED_BOOST_START, unit->domain->domain_id, - unit->unit_id); + TRACE_TIME(TRC_CSCHED_BOOST_START, unit->domain->domain_id, unit->unit_id); SCHED_STAT_CRANK(unit_boost); svc->pri = CSCHED_PRI_TS_BOOST; } @@ -1671,8 +1669,8 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int balance_step) if ( __csched_unit_is_migrateable(prv, unit, cpu, cpumask_scratch) ) { /* We got a candidate. Grab it! */ - TRACE_3D(TRC_CSCHED_STOLEN_UNIT, peer_cpu, - unit->domain->domain_id, unit->unit_id); + TRACE_TIME(TRC_CSCHED_STOLEN_UNIT, peer_cpu, + unit->domain->domain_id, unit->unit_id); SCHED_UNIT_STAT_CRANK(speer, migrate_q); SCHED_STAT_CRANK(migrate_queued); runq_remove(speer); @@ -1783,7 +1781,7 @@ csched_load_balance(struct csched_private *prv, int cpu, */ if ( CSCHED_PCPU(peer_cpu)->nr_runnable <= 1 ) { - TRACE_2D(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* skipp'n */ 0); + TRACE_TIME(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* skipp'n */ 0); goto next_cpu; } @@ -1799,11 +1797,11 @@ csched_load_balance(struct csched_private *prv, int cpu, if ( !lock ) { SCHED_STAT_CRANK(steal_trylock_failed); - TRACE_2D(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* skip */ 0); + TRACE_TIME(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* skip */ 0); goto next_cpu; } - TRACE_2D(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* checked */ 1); + TRACE_TIME(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* checked */ 1); /* Any work over there to steal? */ speer = cpumask_test_cpu(peer_cpu, online) ? @@ -1860,21 +1858,18 @@ static void cf_check csched_schedule( SCHED_STAT_CRANK(schedule); CSCHED_UNIT_CHECK(unit); - /* - * Here in Credit1 code, we usually just call TRACE_nD() helpers, and - * don't care about packing. But scheduling happens very often, so it - * actually is important that the record is as small as possible. - */ if ( unlikely(tb_init_done) ) { struct { - unsigned cpu:16, tasklet:8, idle:8; - } d; - d.cpu = cur_cpu; - d.tasklet = tasklet_work_scheduled; - d.idle = is_idle_unit(unit); - __trace_var(TRC_CSCHED_SCHEDULE, 1, sizeof(d), - (unsigned char *)&d); + uint16_t cpu; + uint8_t tasklet, idle; + } d = { + .cpu = cur_cpu, + .tasklet = tasklet_work_scheduled, + .idle = is_idle_unit(unit), + }; + + trace_time(TRC_CSCHED_SCHEDULE, sizeof(d), &d); } runtime = now - unit->state_entry_time; @@ -1936,14 +1931,15 @@ static void cf_check csched_schedule( if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned runtime; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.runtime = runtime; - __trace_var(TRC_CSCHED_RATELIMIT, 1, sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t runtime; + } d = { + .dom = unit->domain->domain_id, + .unit = unit->unit_id, + .runtime = runtime, + }; + + trace_time(TRC_CSCHED_RATELIMIT, sizeof(d), &d); } goto out; @@ -1968,7 +1964,7 @@ static void cf_check csched_schedule( /* Tasklet work (which runs in idle UNIT context) overrides all else. */ if ( tasklet_work_scheduled ) { - TRACE_0D(TRC_CSCHED_SCHED_TASKLET); + TRACE_TIME(TRC_CSCHED_SCHED_TASKLET); snext = CSCHED_UNIT(sched_idle_unit(sched_cpu)); snext->pri = CSCHED_PRI_TS_BOOST; } diff --git a/xen/common/sched/null.c b/xen/common/sched/null.c index 2091337fcd..7e31440e5b 100644 --- a/xen/common/sched/null.c +++ b/xen/common/sched/null.c @@ -331,11 +331,13 @@ pick_res(const struct null_private *prv, const struct sched_unit *unit) struct { uint16_t unit, dom; uint32_t new_cpu; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.new_cpu = new_cpu; - __trace_var(TRC_SNULL_PICKED_CPU, 1, sizeof(d), &d); + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .new_cpu = new_cpu, + }; + + trace_time(TRC_SNULL_PICKED_CPU, sizeof(d), &d); } return get_sched_res(new_cpu); @@ -359,11 +361,13 @@ static void unit_assign(struct null_private *prv, struct sched_unit *unit, struct { uint16_t unit, dom; uint32_t cpu; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.cpu = cpu; - __trace_var(TRC_SNULL_UNIT_ASSIGN, 1, sizeof(d), &d); + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .cpu = cpu, + }; + + trace_time(TRC_SNULL_UNIT_ASSIGN, sizeof(d), &d); } } @@ -390,11 +394,13 @@ static bool unit_deassign(struct null_private *prv, const struct sched_unit *uni struct { uint16_t unit, dom; uint32_t cpu; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.cpu = cpu; - __trace_var(TRC_SNULL_UNIT_DEASSIGN, 1, sizeof(d), &d); + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .cpu = cpu, + }; + + trace_time(TRC_SNULL_UNIT_DEASSIGN, sizeof(d), &d); } spin_lock(&prv->waitq_lock); @@ -695,12 +701,14 @@ static void cf_check null_unit_migrate( struct { uint16_t unit, dom; uint16_t cpu, new_cpu; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.cpu = sched_unit_master(unit); - d.new_cpu = new_cpu; - __trace_var(TRC_SNULL_MIGRATE, 1, sizeof(d), &d); + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .cpu = sched_unit_master(unit), + .new_cpu = new_cpu, + }; + + trace_time(TRC_SNULL_MIGRATE, sizeof(d), &d); } /* @@ -824,9 +832,11 @@ static void cf_check null_schedule( struct { uint16_t tasklet, cpu; int16_t unit, dom; - } d; - d.cpu = cur_cpu; - d.tasklet = tasklet_work_scheduled; + } d = { + .tasklet = tasklet_work_scheduled, + .cpu = cur_cpu, + }; + if ( npc->unit == NULL ) { d.unit = d.dom = -1; @@ -836,12 +846,13 @@ static void cf_check null_schedule( d.unit = npc->unit->unit_id; d.dom = npc->unit->domain->domain_id; } - __trace_var(TRC_SNULL_SCHEDULE, 1, sizeof(d), &d); + + trace_time(TRC_SNULL_SCHEDULE, sizeof(d), &d); } if ( tasklet_work_scheduled ) { - trace_var(TRC_SNULL_TASKLET, 1, 0, NULL); + TRACE_TIME(TRC_SNULL_TASKLET); prev->next_task = sched_idle_unit(sched_cpu); } else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 21:11:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 21:11:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726374.1130657 (Exim 4.92) (envelope-from ) id 1s9AIL-0000v2-IQ; Mon, 20 May 2024 21:11:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726374.1130657; Mon, 20 May 2024 21:11: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 1s9AIL-0000uv-FV; Mon, 20 May 2024 21:11:45 +0000 Received: by outflank-mailman (input) for mailman id 726374; Mon, 20 May 2024 21:11:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AIJ-0000uj-VC for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AIJ-0002uU-UR for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9AIJ-0001LD-TQ for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11: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=EcZTb/0WhXYPiUy6WR1500uEXtCv+qL7As+Lxp6nPnU=; b=Y9GocVLE6B02LdtSOvvVVAW/5Q 5Vy5ymbfpQ/R+1LYIUnx8RITiorPGImCHB+LNX2H7g3EiazFhIUOoPoQrFidC0VOHk2cj+wQBltHs pRpxwdVVMokDcJtY0NjNwFYESQ5FIXfSIpdg9y/icQQGbwjLCy+aiYSn2tEZAmvqcltw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Switch to new TRACE() API Message-Id: Date: Mon, 20 May 2024 21:11:43 +0000 commit 26da08059eef35e6ce1a308dbe276e8ef6a6c5b1 Author: Andrew Cooper AuthorDate: Sat Sep 18 00:31:27 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen: Switch to new TRACE() API (Almost) no functional change. * In irq_move_cleanup_interrupt(), use the 'me' local variable rather than calling smp_processor_id() again. This manifests as a minor code improvement. * In vlapic_update_timer() and lapic_rearm(), introduce a new 'timer_period' local variable to simplify the expressions used for both the trace and create_periodic_time() calls. All other differences in the compiled binary are to do with line numbers changing. Some conversion notes: * HVMTRACE_LONG_[234]D() and TRACE_2_LONG_[234]D() were latently buggy. They blindly discard extra parameters, but luckily no users are impacted. They are also obfuscated wrappers, depending on exactly one or two parameters being TRC_PAR_LONG() to compile successfully. * HVMTRACE_LONG_1D() behaves unlike its named companions, and takes exactly one 64bit parameter which it splits manually. It's one user, vmx_cr_access()'s LMSW path, is gets adjusted. * TRACE_?D() and TRACE_2_LONG_*() change to TRACE_TIME() as cycles is always enabled. * HVMTRACE_ND() is opencoded for VMENTRY/VMEXIT records to include cycles. These are converted to TRACE_TIME(), with the old modifier parameter expressed as an OR at the callsite. One callsite, svm_vmenter_helper() had a nested tb_init_done check, which is dropped. (The optimiser also spotted this, which is why it doesn't manifest as a binary difference.) * All uses of *LONG() are either opencoded or swapped to using a struct, to avoid MISRA issues. * All HVMTRACE_?D() change to TRACE() as cycles is explicitly skipped. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap --- xen/arch/x86/acpi/cpu_idle.c | 12 +++++----- xen/arch/x86/compat.c | 4 ++-- xen/arch/x86/cpu/mwait-idle.c | 6 ++--- xen/arch/x86/emul-i8254.c | 14 +++++------ xen/arch/x86/hvm/emulate.c | 8 +++---- xen/arch/x86/hvm/hpet.c | 6 ++--- xen/arch/x86/hvm/hvm.c | 16 ++++++------- xen/arch/x86/hvm/rtc.c | 12 +++++----- xen/arch/x86/hvm/svm/intr.c | 6 ++--- xen/arch/x86/hvm/svm/svm.c | 40 +++++++++++++++----------------- xen/arch/x86/hvm/vlapic.c | 43 +++++++++++++++++++--------------- xen/arch/x86/hvm/vmx/intr.c | 6 ++--- xen/arch/x86/hvm/vmx/vmx.c | 54 +++++++++++++++++++++---------------------- xen/arch/x86/hvm/vpic.c | 13 +++++------ xen/arch/x86/irq.c | 14 +++++------ xen/arch/x86/traps.c | 2 +- xen/common/domain.c | 4 ++-- xen/common/grant_table.c | 6 ++--- xen/drivers/cpufreq/utility.c | 2 +- 19 files changed, 133 insertions(+), 135 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index c8db1aa991..57ac984790 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -767,7 +767,7 @@ static void cf_check acpi_processor_idle(void) /* Get start time (ticks) */ t1 = alternative_call(cpuidle_get_tick); /* Trace cpu idle entry */ - TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); + TRACE_TIME(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); update_last_cx_stat(power, cx, t1); @@ -777,8 +777,8 @@ static void cf_check acpi_processor_idle(void) t2 = alternative_call(cpuidle_get_tick); trace_exit_reason(irq_traced); /* Trace cpu idle exit */ - TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, - irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + TRACE_TIME(TRC_PM_IDLE_EXIT, cx->idx, t2, + irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); /* Update statistics */ update_idle_stats(power, cx, t1, t2); /* Re-enable interrupts */ @@ -798,7 +798,7 @@ static void cf_check acpi_processor_idle(void) /* Get start time (ticks) */ t1 = alternative_call(cpuidle_get_tick); /* Trace cpu idle entry */ - TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); + TRACE_TIME(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); update_last_cx_stat(power, cx, t1); @@ -853,8 +853,8 @@ static void cf_check acpi_processor_idle(void) cstate_restore_tsc(); trace_exit_reason(irq_traced); /* Trace cpu idle exit */ - TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, - irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + TRACE_TIME(TRC_PM_IDLE_EXIT, cx->idx, t2, + irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); /* Update statistics */ update_idle_stats(power, cx, t1, t2); diff --git a/xen/arch/x86/compat.c b/xen/arch/x86/compat.c index a031062830..217b5b1fcc 100644 --- a/xen/arch/x86/compat.c +++ b/xen/arch/x86/compat.c @@ -37,8 +37,8 @@ long do_sched_op_compat(int cmd, unsigned long arg) return do_sched_op(cmd, guest_handle_from_ptr(NULL, void)); case SCHEDOP_shutdown: - TRACE_3D(TRC_SCHED_SHUTDOWN, - current->domain->domain_id, current->vcpu_id, arg); + TRACE_TIME(TRC_SCHED_SHUTDOWN, + current->domain->domain_id, current->vcpu_id, arg); domain_shutdown(current->domain, (u8)arg); break; diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index ff5c808bc9..ae69871171 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -962,7 +962,7 @@ static void cf_check mwait_idle(void) lapic_timer_off(); before = alternative_call(cpuidle_get_tick); - TRACE_4D(TRC_PM_IDLE_ENTRY, cx->type, before, exp, pred); + TRACE_TIME(TRC_PM_IDLE_ENTRY, cx->type, before, exp, pred); update_last_cx_stat(power, cx, before); @@ -986,8 +986,8 @@ static void cf_check mwait_idle(void) local_irq_enable(); - TRACE_6D(TRC_PM_IDLE_EXIT, cx->type, after, - irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + TRACE_TIME(TRC_PM_IDLE_EXIT, cx->type, after, + irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); if (!(lapic_timer_reliable_states & (1 << cx->type))) lapic_timer_on(); diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 0191f80ba2..144aa168a3 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -94,7 +94,7 @@ static void cf_check pit_time_fired(struct vcpu *v, void *priv) { uint64_t *count_load_time = priv; - TRACE_0D(TRC_HVM_EMUL_PIT_TIMER_CB); + TRACE_TIME(TRC_HVM_EMUL_PIT_TIMER_CB); *count_load_time = get_guest_time(v); } @@ -128,19 +128,19 @@ static void pit_load_count(PITState *pit, int channel, int val) case 2: case 3: /* Periodic timer. */ - TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, period); + TRACE_TIME(TRC_HVM_EMUL_PIT_START_TIMER, period, period); create_periodic_time(v, &pit->pt0, period, period, 0, pit_time_fired, &pit->count_load_time[channel], false); break; case 1: case 4: /* One-shot timer. */ - TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, 0); + TRACE_TIME(TRC_HVM_EMUL_PIT_START_TIMER, period, 0); create_periodic_time(v, &pit->pt0, period, 0, 0, pit_time_fired, &pit->count_load_time[channel], false); break; default: - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_PIT_STOP_TIMER); destroy_periodic_time(&pit->pt0); break; } @@ -404,7 +404,7 @@ void pit_stop_channel0_irq(PITState *pit) if ( !has_vpit(current->domain) ) return; - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_PIT_STOP_TIMER); spin_lock(&pit->lock); destroy_periodic_time(&pit->pt0); spin_unlock(&pit->lock); @@ -615,7 +615,7 @@ void pit_reset(struct domain *d) if ( is_hvm_domain(d) ) { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_PIT_STOP_TIMER); destroy_periodic_time(&pit->pt0); pit->pt0.source = PTSRC_isa; } @@ -660,7 +660,7 @@ void pit_deinit(struct domain *d) if ( is_hvm_domain(d) ) { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_PIT_STOP_TIMER); destroy_periodic_time(&pit->pt0); } } diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index ab1bc51683..d8f36206a7 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -2181,7 +2181,7 @@ static int cf_check hvmemul_read_cr( case 3: case 4: *val = current->arch.hvm.guest_cr[reg]; - HVMTRACE_LONG_2D(CR_READ, reg, TRC_PAR_LONG(*val)); + TRACE(TRC_HVM_CR_READ64, reg, *val, *val >> 32); return X86EMUL_OKAY; default: break; @@ -2197,7 +2197,7 @@ static int cf_check hvmemul_write_cr( { int rc; - HVMTRACE_LONG_2D(CR_WRITE, reg, TRC_PAR_LONG(val)); + TRACE(TRC_HVM_CR_WRITE64, reg, val, val >> 32); switch ( reg ) { case 0: @@ -2242,7 +2242,7 @@ static int cf_check hvmemul_read_xcr( int rc = x86emul_read_xcr(reg, val, ctxt); if ( rc == X86EMUL_OKAY ) - HVMTRACE_LONG_2D(XCR_READ, reg, TRC_PAR_LONG(*val)); + TRACE(TRC_HVM_XCR_READ64, reg, *val, *val >> 32); return rc; } @@ -2252,7 +2252,7 @@ static int cf_check hvmemul_write_xcr( uint64_t val, struct x86_emulate_ctxt *ctxt) { - HVMTRACE_LONG_2D(XCR_WRITE, reg, TRC_PAR_LONG(val)); + TRACE(TRC_HVM_XCR_WRITE64, reg, val, val >> 32); return x86emul_write_xcr(reg, val, ctxt); } diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 5f456221cb..4c5b171922 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -201,7 +201,7 @@ static void hpet_stop_timer(HPETState *h, unsigned int tn, { ASSERT(tn < HPET_TIMER_NUM); ASSERT(rw_is_write_locked(&h->lock)); - TRACE_1D(TRC_HVM_EMUL_HPET_STOP_TIMER, tn); + TRACE_TIME(TRC_HVM_EMUL_HPET_STOP_TIMER, tn); destroy_periodic_time(&h->pt[tn]); /* read the comparator to get it updated so a read while stopped will * return the expected value. */ @@ -305,8 +305,8 @@ static void hpet_set_timer(HPETState *h, unsigned int tn, if ( !oneshot ) period_ns = hpet_tick_to_ns(h, h->hpet.period[tn]); - TRACE_2_LONG_4D(TRC_HVM_EMUL_HPET_START_TIMER, tn, irq, - TRC_PAR_LONG(diff_ns), TRC_PAR_LONG(period_ns)); + TRACE_TIME(TRC_HVM_EMUL_HPET_START_TIMER, tn, irq, + diff_ns, diff_ns >> 32, period_ns, period_ns >> 32); create_periodic_time(vhpet_vcpu(h), &h->pt[tn], diff_ns, period_ns, irq, timer_level(h, tn) ? hpet_timer_fired : NULL, diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 9594e0a5c5..2c92e751cb 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1705,7 +1705,7 @@ void hvm_hlt(unsigned int eflags) do_sched_op(SCHEDOP_block, guest_handle_from_ptr(NULL, void)); - HVMTRACE_1D(HLT, /* pending = */ vcpu_runnable(curr)); + TRACE(TRC_HVM_HLT, /* pending = */ vcpu_runnable(curr)); } void hvm_triple_fault(void) @@ -2159,7 +2159,7 @@ int hvm_mov_to_cr(unsigned int cr, unsigned int gpr) unsigned long val = *decode_gpr(guest_cpu_user_regs(), gpr); int rc; - HVMTRACE_LONG_2D(CR_WRITE, cr, TRC_PAR_LONG(val)); + TRACE(TRC_HVM_CR_WRITE64, cr, val, val >> 32); HVM_DBG_LOG(DBG_LEVEL_1, "CR%u, value = %lx", cr, val); switch ( cr ) @@ -2224,7 +2224,7 @@ int hvm_mov_from_cr(unsigned int cr, unsigned int gpr) } *reg = val; - HVMTRACE_LONG_2D(CR_READ, cr, TRC_PAR_LONG(val)); + TRACE(TRC_HVM_CR_READ64, cr, val, val >> 32); HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR%u, value = %lx", cr, val); return X86EMUL_OKAY; @@ -3514,7 +3514,7 @@ int hvm_vmexit_cpuid(struct cpu_user_regs *regs, unsigned int inst_len) } guest_cpuid(curr, leaf, subleaf, &res); - HVMTRACE_6D(CPUID, leaf, subleaf, res.a, res.b, res.c, res.d); + TRACE(TRC_HVM_CPUID, leaf, subleaf, res.a, res.b, res.c, res.d); regs->rax = res.a; regs->rbx = res.b; @@ -3528,7 +3528,7 @@ void hvm_rdtsc_intercept(struct cpu_user_regs *regs) { msr_split(regs, hvm_get_guest_tsc(current)); - HVMTRACE_2D(RDTSC, regs->eax, regs->edx); + TRACE(TRC_HVM_RDTSC, regs->eax, regs->edx); } int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) @@ -3635,8 +3635,7 @@ int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) } out: - HVMTRACE_3D(MSR_READ, msr, - (uint32_t)*msr_content, (uint32_t)(*msr_content >> 32)); + TRACE(TRC_HVM_MSR_READ, msr, *msr_content, *msr_content >> 32); return ret; gp_fault: @@ -3652,8 +3651,7 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content, struct domain *d = v->domain; int ret; - HVMTRACE_3D(MSR_WRITE, msr, - (uint32_t)msr_content, (uint32_t)(msr_content >> 32)); + TRACE(TRC_HVM_MSR_WRITE, msr, msr_content, msr_content >> 32); if ( may_defer && unlikely(monitored_msr(v->domain, msr)) ) { diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 4bb1c75055..cba8532a5a 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -91,7 +91,7 @@ static void cf_check rtc_pf_callback(struct vcpu *v, void *opaque) && ++(s->pt_dead_ticks) >= 10 ) { /* VM is ignoring its RTC; no point in running the timer */ - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); s->period = 0; } @@ -154,7 +154,7 @@ static void rtc_timer_update(RTCState *s) delta = period - ((now - s->start_time) % period); if ( s->hw.cmos_data[RTC_REG_B] & RTC_PIE ) { - TRACE_2D(TRC_HVM_EMUL_RTC_START_TIMER, delta, period); + TRACE_TIME(TRC_HVM_EMUL_RTC_START_TIMER, delta, period); create_periodic_time(v, &s->pt, delta, period, RTC_IRQ, rtc_pf_callback, s, false); } @@ -165,7 +165,7 @@ static void rtc_timer_update(RTCState *s) } /* fall through */ default: - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); s->period = 0; break; @@ -553,7 +553,7 @@ static int rtc_ioport_write(void *opaque, uint32_t addr, uint32_t data) rtc_update_irq(s); if ( (data ^ orig) & RTC_PIE ) { - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); s->period = 0; rtc_timer_update(s); @@ -807,7 +807,7 @@ void rtc_reset(struct domain *d) if ( !has_vrtc(d) ) return; - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); s->period = 0; s->pt.source = PTSRC_isa; @@ -892,7 +892,7 @@ void rtc_deinit(struct domain *d) spin_barrier(&s->lock); - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); kill_timer(&s->update_timer); kill_timer(&s->update_timer2); diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c index 4805c55672..dc684fdc84 100644 --- a/xen/arch/x86/hvm/svm/intr.c +++ b/xen/arch/x86/hvm/svm/intr.c @@ -90,8 +90,8 @@ static void svm_enable_intr_window(struct vcpu *v, struct hvm_intack intack) } } - HVMTRACE_3D(INTR_WINDOW, intack.vector, intack.source, - vmcb->event_inj.v ? vmcb->event_inj.vector : -1); + TRACE(TRC_HVM_INTR_WINDOW, intack.vector, intack.source, + vmcb->event_inj.v ? vmcb->event_inj.vector : -1); /* * Create a dummy virtual interrupt to intercept as soon as the @@ -206,7 +206,7 @@ void asmlinkage svm_intr_assist(void) } else { - HVMTRACE_2D(INJ_VIRQ, intack.vector, /*fake=*/ 0); + TRACE(TRC_HVM_INJ_VIRQ, intack.vector, /*fake=*/ 0); svm_inject_extint(v, intack.vector); pt_intr_post(v, intack); } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 4719fffae5..6103c171d2 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1019,10 +1019,8 @@ void asmlinkage svm_vmenter_helper(void) svm_asid_handle_vmrun(); - if ( unlikely(tb_init_done) ) - HVMTRACE_ND(VMENTRY, - nestedhvm_vcpu_in_guestmode(curr) ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/); + TRACE_TIME(TRC_HVM_VMENTRY | + (nestedhvm_vcpu_in_guestmode(curr) ? TRC_HVM_NESTEDFLAG : 0)); svm_sync_vmcb(curr, vmcb_needs_vmsave); @@ -1394,10 +1392,10 @@ static void cf_check svm_inject_event(const struct x86_event *event) if ( _event.vector == X86_EXC_PF && _event.type == X86_EVENTTYPE_HW_EXCEPTION ) - HVMTRACE_LONG_2D(PF_INJECT, _event.error_code, - TRC_PAR_LONG(_event.cr2)); + TRACE(TRC_HVM_PF_INJECT64, _event.error_code, + _event.cr2, _event.cr2 >> 32); else - HVMTRACE_2D(INJ_EXC, _event.vector, _event.error_code); + TRACE(TRC_HVM_INJ_EXC, _event.vector, _event.error_code); } static bool cf_check svm_event_pending(const struct vcpu *v) @@ -1704,7 +1702,7 @@ static void svm_dr_access(struct vcpu *v, struct cpu_user_regs *regs) { struct vmcb_struct *vmcb = vcpu_nestedhvm(v).nv_n1vmcx; - HVMTRACE_0D(DR_WRITE); + TRACE(TRC_HVM_DR_WRITE); __restore_debug_registers(vmcb, v); } @@ -2345,7 +2343,7 @@ static void svm_invlpga_intercept( static void svm_invlpg_intercept(unsigned long linear) { - HVMTRACE_LONG_2D(INVLPG, 0, TRC_PAR_LONG(linear)); + TRACE(TRC_HVM_INVLPG64, 0, linear, linear >> 32); paging_invlpg(current, linear); } @@ -2574,11 +2572,11 @@ void asmlinkage svm_vmexit_handler(void) exit_reason = vmcb->exitcode; if ( hvm_long_mode_active(v) ) - HVMTRACE_ND(VMEXIT64, vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/, exit_reason, TRC_PAR_LONG(regs->rip)); + TRACE_TIME(TRC_HVM_VMEXIT64 | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), + exit_reason, regs->rip, regs->rip >> 32); else - HVMTRACE_ND(VMEXIT, vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/, exit_reason, regs->eip); + TRACE_TIME(TRC_HVM_VMEXIT | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), + exit_reason, regs->eip); if ( vcpu_guestmode ) { @@ -2673,17 +2671,17 @@ void asmlinkage svm_vmexit_handler(void) { case VMEXIT_INTR: /* Asynchronous event, handled when we STGI'd after the VMEXIT. */ - HVMTRACE_0D(INTR); + TRACE(TRC_HVM_INTR); break; case VMEXIT_NMI: /* Asynchronous event, handled when we STGI'd after the VMEXIT. */ - HVMTRACE_0D(NMI); + TRACE(TRC_HVM_NMI); break; case VMEXIT_SMI: /* Asynchronous event, handled when we STGI'd after the VMEXIT. */ - HVMTRACE_0D(SMI); + TRACE(TRC_HVM_SMI); break; case VMEXIT_ICEBP: @@ -2771,9 +2769,9 @@ void asmlinkage svm_vmexit_handler(void) if ( trace_will_trace_event(TRC_SHADOW) ) break; if ( hvm_long_mode_active(v) ) - HVMTRACE_LONG_2D(PF_XEN, regs->error_code, TRC_PAR_LONG(va)); + TRACE(TRC_HVM_PF_XEN64, regs->error_code, va, va >> 32); else - HVMTRACE_2D(PF_XEN, regs->error_code, va); + TRACE(TRC_HVM_PF_XEN, regs->error_code, va); break; } @@ -2782,7 +2780,7 @@ void asmlinkage svm_vmexit_handler(void) } case VMEXIT_EXCEPTION_AC: - HVMTRACE_1D(TRAP, X86_EXC_AC); + TRACE(TRC_HVM_TRAP, X86_EXC_AC); hvm_inject_hw_exception(X86_EXC_AC, vmcb->ei.exc.ec); break; @@ -2792,7 +2790,7 @@ void asmlinkage svm_vmexit_handler(void) /* Asynchronous event, handled when we STGI'd after the VMEXIT. */ case VMEXIT_EXCEPTION_MC: - HVMTRACE_0D(MCE); + TRACE(TRC_HVM_MCE); svm_vmexit_mce_intercept(v, regs); break; @@ -2938,7 +2936,7 @@ void asmlinkage svm_vmexit_handler(void) if ( (insn_len = svm_get_insn_len(v, INSTR_VMCALL)) == 0 ) break; BUG_ON(vcpu_guestmode); - HVMTRACE_1D(VMMCALL, regs->eax); + TRACE(TRC_HVM_VMMCALL, regs->eax); if ( hvm_hypercall(regs) == HVM_HCALL_completed ) __update_guest_eip(regs, insn_len); diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 05072a21bf..4f5e714aa4 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -682,7 +682,7 @@ int guest_rdmsr_x2apic(const struct vcpu *v, uint32_t msr, uint64_t *val) static void cf_check vlapic_pt_cb(struct vcpu *v, void *data) { - TRACE_0D(TRC_HVM_EMUL_LAPIC_TIMER_CB); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_TIMER_CB); *(s_time_t *)data = hvm_get_guest_time(v); } @@ -729,6 +729,8 @@ static void vlapic_update_timer(struct vlapic *vlapic, uint32_t lvtt, if ( delta && (is_oneshot || is_periodic) ) { + uint64_t timer_period = 0; + if ( vlapic->hw.timer_divisor != old_divisor ) { period = (uint64_t)vlapic_get_reg(vlapic, APIC_TMICT) @@ -736,12 +738,14 @@ static void vlapic_update_timer(struct vlapic *vlapic, uint32_t lvtt, delta = delta * vlapic->hw.timer_divisor / old_divisor; } - TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(delta), - TRC_PAR_LONG(is_periodic ? period : 0), - vlapic->pt.irq); + if ( is_periodic ) + timer_period = period; + + TRACE_TIME(TRC_HVM_EMUL_LAPIC_START_TIMER, delta, delta >> 32, + timer_period, timer_period >> 32, vlapic->pt.irq); create_periodic_time(current, &vlapic->pt, delta, - is_periodic ? period : 0, vlapic->pt.irq, + timer_period, vlapic->pt.irq, is_periodic ? vlapic_pt_cb : NULL, &vlapic->timer_last_update, false); @@ -758,7 +762,7 @@ static void vlapic_update_timer(struct vlapic *vlapic, uint32_t lvtt, } else { - TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); /* * From now, TMCCT should return 0 until TMICT is set again. @@ -1208,8 +1212,8 @@ void vlapic_tdt_msr_set(struct vlapic *vlapic, uint64_t value) vlapic->hw.tdt_msr = value; /* .... reprogram tdt timer */ - TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(delta), - TRC_PAR_LONG(0LL), vlapic->pt.irq); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_START_TIMER, delta, delta >> 32, + 0, 0, vlapic->pt.irq); create_periodic_time(v, &vlapic->pt, delta, 0, vlapic->pt.irq, vlapic_tdt_pt_cb, &vlapic->timer_last_update, false); @@ -1222,8 +1226,8 @@ void vlapic_tdt_msr_set(struct vlapic *vlapic, uint64_t value) /* trigger a timer event if needed */ if ( value > 0 ) { - TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(0LL), - TRC_PAR_LONG(0LL), vlapic->pt.irq); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_START_TIMER, 0, 0, + 0, 0, vlapic->pt.irq); create_periodic_time(v, &vlapic->pt, 0, 0, vlapic->pt.irq, vlapic_tdt_pt_cb, &vlapic->timer_last_update, false); @@ -1232,7 +1236,7 @@ void vlapic_tdt_msr_set(struct vlapic *vlapic, uint64_t value) else { /* .... stop tdt timer */ - TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); } @@ -1282,7 +1286,7 @@ int vlapic_accept_pic_intr(struct vcpu *v) if ( target ) accept = __vlapic_accept_pic_intr(v); - TRACE_2D(TRC_HVM_EMUL_LAPIC_PIC_INTR, target, accept); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_PIC_INTR, target, accept); return target && accept; } @@ -1433,7 +1437,7 @@ static void vlapic_do_init(struct vlapic *vlapic) vlapic_set_reg(vlapic, APIC_SPIV, 0xff); vlapic->hw.disabled |= VLAPIC_SW_DISABLED; - TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); } @@ -1457,7 +1461,7 @@ void vlapic_reset(struct vlapic *vlapic) static void lapic_rearm(struct vlapic *s) { unsigned long tmict; - uint64_t period, tdt_msr; + uint64_t period, timer_period = 0, tdt_msr; bool is_periodic; s->pt.irq = vlapic_get_reg(s, APIC_LVTT) & APIC_VECTOR_MASK; @@ -1476,11 +1480,14 @@ static void lapic_rearm(struct vlapic *s) (uint32_t)tmict * s->hw.timer_divisor); is_periodic = vlapic_lvtt_period(s); - TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(period), - TRC_PAR_LONG(is_periodic ? period : 0LL), s->pt.irq); + if ( is_periodic ) + timer_period = period; + + TRACE_TIME(TRC_HVM_EMUL_LAPIC_START_TIMER, period, period >> 32, + timer_period, timer_period >> 32, s->pt.irq); create_periodic_time(vlapic_vcpu(s), &s->pt, period, - is_periodic ? period : 0, + timer_period, s->pt.irq, is_periodic ? vlapic_pt_cb : NULL, &s->timer_last_update, false); @@ -1669,7 +1676,7 @@ void vlapic_destroy(struct vcpu *v) return; tasklet_kill(&vlapic->init_sipi.tasklet); - TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); unmap_domain_page_global(vlapic->regs); free_domheap_page(vlapic->regs_page); diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 8beeaab151..d36498d831 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -67,8 +67,8 @@ static void vmx_enable_intr_window(struct vcpu *v, struct hvm_intack intack) unsigned long intr; __vmread(VM_ENTRY_INTR_INFO, &intr); - HVMTRACE_3D(INTR_WINDOW, intack.vector, intack.source, - (intr & INTR_INFO_VALID_MASK) ? intr & 0xff : -1); + TRACE(TRC_HVM_INTR_WINDOW, intack.vector, intack.source, + (intr & INTR_INFO_VALID_MASK) ? intr & 0xff : -1); } if ( (intack.source == hvm_intsrc_nmi) && cpu_has_vmx_vnmi ) @@ -390,7 +390,7 @@ void asmlinkage vmx_intr_assist(void) } else { - HVMTRACE_2D(INJ_VIRQ, intack.vector, /*fake=*/ 0); + TRACE(TRC_HVM_INJ_VIRQ, intack.vector, /*fake=*/ 0); vmx_inject_extint(intack.vector, intack.source); pt_intr_post(v, intack); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5f67a48592..165a85a25b 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2112,10 +2112,10 @@ static void cf_check vmx_inject_event(const struct x86_event *event) if ( (_event.vector == X86_EXC_PF) && (_event.type == X86_EVENTTYPE_HW_EXCEPTION) ) - HVMTRACE_LONG_2D(PF_INJECT, _event.error_code, - TRC_PAR_LONG(curr->arch.hvm.guest_cr[2])); + TRACE(TRC_HVM_PF_INJECT64, _event.error_code, + curr->arch.hvm.guest_cr[2], curr->arch.hvm.guest_cr[2] >> 32); else - HVMTRACE_2D(INJ_EXC, _event.vector, _event.error_code); + TRACE(TRC_HVM_INJ_EXC, _event.vector, _event.error_code); } static bool cf_check vmx_event_pending(const struct vcpu *v) @@ -3125,7 +3125,7 @@ static void vmx_dr_access(unsigned long exit_qualification, { struct vcpu *v = current; - HVMTRACE_0D(DR_WRITE); + TRACE(TRC_HVM_DR_WRITE); if ( !v->arch.hvm.flag_dr_dirty ) __restore_debug_registers(v); @@ -3137,7 +3137,7 @@ static void vmx_dr_access(unsigned long exit_qualification, static void vmx_invlpg_intercept(unsigned long linear) { - HVMTRACE_LONG_2D(INVLPG, /*invlpga=*/ 0, TRC_PAR_LONG(linear)); + TRACE(TRC_HVM_INVLPG64, /*invlpga=*/ 0, linear, linear >> 32); paging_invlpg(current, linear); } @@ -3185,7 +3185,7 @@ static int vmx_cr_access(cr_access_qual_t qual) hvm_monitor_crX(CR0, value, old); curr->arch.hvm.guest_cr[0] = value; vmx_update_guest_cr(curr, 0, 0); - HVMTRACE_0D(CLTS); + TRACE(TRC_HVM_CLTS); break; } @@ -3198,7 +3198,7 @@ static int vmx_cr_access(cr_access_qual_t qual) value = (value & ~(X86_CR0_MP|X86_CR0_EM|X86_CR0_TS)) | (qual.lmsw_data & (X86_CR0_PE|X86_CR0_MP|X86_CR0_EM|X86_CR0_TS)); - HVMTRACE_LONG_1D(LMSW, value); + TRACE(TRC_HVM_LMSW64, value, value >> 32); if ( (rc = hvm_set_cr0(value, true)) == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(X86_EXC_GP, 0); @@ -3751,7 +3751,7 @@ static void vmx_do_extint(struct cpu_user_regs *regs) BUG_ON(!(vector & INTR_INFO_VALID_MASK)); vector &= INTR_INFO_VECTOR_MASK; - HVMTRACE_1D(INTR, vector); + TRACE(TRC_HVM_INTR, vector); regs->entry_vector = vector; do_IRQ(regs); @@ -3891,7 +3891,7 @@ static void vmx_failed_vmentry(unsigned int exit_reason, case EXIT_REASON_MCE_DURING_VMENTRY: printk("MCE\n"); - HVMTRACE_0D(MCE); + TRACE(TRC_HVM_MCE); /* Already handled. */ break; @@ -3932,7 +3932,7 @@ static int vmx_handle_eoi_write(void) { update_guest_eip(); /* Safe: APIC data write */ vlapic_EOI_set(vcpu_vlapic(current)); - HVMTRACE_0D(VLAPIC); + TRACE(TRC_HVM_VLAPIC); return 1; } @@ -4106,10 +4106,9 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) __vmread(VM_EXIT_REASON, &exit_reason); if ( hvm_long_mode_active(v) ) - HVMTRACE_ND(VMEXIT64, 0, 1/*cycles*/, exit_reason, - TRC_PAR_LONG(regs->rip)); + TRACE_TIME(TRC_HVM_VMEXIT64, exit_reason, regs->rip, regs->rip >> 32); else - HVMTRACE_ND(VMEXIT, 0, 1/*cycles*/, exit_reason, regs->eip); + TRACE_TIME(TRC_HVM_VMEXIT, exit_reason, regs->eip); perfc_incra(vmexits, (uint16_t)exit_reason); @@ -4226,7 +4225,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) default: perfc_incr(realmode_exits); v->arch.hvm.vmx.vmx_emulate = 1; - HVMTRACE_0D(REALMODE_EMULATE); + TRACE(TRC_HVM_REALMODE_EMULATE); return; } case EXIT_REASON_EXTERNAL_INTERRUPT: @@ -4283,7 +4282,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) * Table 23-1, "Exit Qualification for Debug Exceptions"). */ __vmread(EXIT_QUALIFICATION, &exit_qualification); - HVMTRACE_1D(TRAP_DEBUG, exit_qualification); + TRACE(TRC_HVM_TRAP_DEBUG, exit_qualification); __restore_debug_registers(v); write_debugreg(6, exit_qualification | DR_STATUS_RESERVED_ONE); @@ -4345,7 +4344,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) domain_pause_for_debugger(); break; case X86_EXC_BP: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); if ( !v->domain->debugger_attached ) { unsigned long insn_len; @@ -4370,7 +4369,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) } break; case X86_EXC_NM: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); vmx_fpu_dirty_intercept(); break; case X86_EXC_PF: @@ -4388,37 +4387,36 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) if ( trace_will_trace_event(TRC_SHADOW) ) break; if ( hvm_long_mode_active(v) ) - HVMTRACE_LONG_2D(PF_XEN, regs->error_code, - TRC_PAR_LONG(exit_qualification) ); + TRACE(TRC_HVM_PF_XEN64, regs->error_code, + exit_qualification, exit_qualification >> 32); else - HVMTRACE_2D(PF_XEN, - regs->error_code, exit_qualification ); + TRACE(TRC_HVM_PF_XEN, regs->error_code, exit_qualification); break; } hvm_inject_page_fault(regs->error_code, exit_qualification); break; case X86_EXC_AC: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); vmx_propagate_intr(intr_info); break; case X86_EXC_NMI: if ( MASK_EXTR(intr_info, INTR_INFO_INTR_TYPE_MASK) != X86_EVENTTYPE_NMI ) goto exit_and_crash; - HVMTRACE_0D(NMI); + TRACE(TRC_HVM_NMI); /* Already handled above. */ break; case X86_EXC_MC: - HVMTRACE_0D(MCE); + TRACE(TRC_HVM_MCE); /* Already handled above. */ break; case X86_EXC_UD: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); hvm_ud_intercept(regs); break; default: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); goto exit_and_crash; } break; @@ -4504,7 +4502,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) break; case EXIT_REASON_VMCALL: - HVMTRACE_1D(VMMCALL, regs->eax); + TRACE(TRC_HVM_VMMCALL, regs->eax); if ( hvm_hypercall(regs) == HVM_HCALL_completed ) update_guest_eip(); /* Safe: VMCALL */ @@ -4912,7 +4910,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) if ( unlikely(curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_MASK) ) lbr_fixup(); - HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/); + TRACE_TIME(TRC_HVM_VMENTRY); __vmwrite(GUEST_RIP, regs->rip); __vmwrite(GUEST_RSP, regs->rsp); diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 4e23247a46..7c3b5c7254 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -99,8 +99,7 @@ static void vpic_update_int_output(struct hvm_hw_vpic *vpic) ASSERT(vpic_is_locked(vpic)); irq = vpic_get_highest_priority_irq(vpic); - TRACE_3D(TRC_HVM_EMUL_PIC_INT_OUTPUT, vpic->int_output, vpic->is_master, - irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_INT_OUTPUT, vpic->int_output, vpic->is_master, irq); if ( vpic->int_output == (!vpic->init_state && irq >= 0) ) return; @@ -119,7 +118,7 @@ static void vpic_update_int_output(struct hvm_hw_vpic *vpic) if ( v != NULL ) { - TRACE_1D(TRC_HVM_EMUL_PIC_KICK, irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_KICK, irq); vcpu_kick(v); } } @@ -144,7 +143,7 @@ static void __vpic_intack(struct hvm_hw_vpic *vpic, int irq) ASSERT(vpic_is_locked(vpic)); - TRACE_2D(TRC_HVM_EMUL_PIC_INTACK, vpic->is_master, irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_INTACK, vpic->is_master, irq); /* Edge-triggered: clear the IRR (forget the edge). */ if ( !(vpic->elcr & mask) ) vpic->irr &= ~mask; @@ -526,7 +525,7 @@ void vpic_irq_positive_edge(struct domain *d, int irq) ASSERT(irq <= 15); ASSERT(vpic_is_locked(vpic)); - TRACE_1D(TRC_HVM_EMUL_PIC_POSEDGE, irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_POSEDGE, irq); if ( irq == 2 ) return; @@ -544,7 +543,7 @@ void vpic_irq_negative_edge(struct domain *d, int irq) ASSERT(irq <= 15); ASSERT(vpic_is_locked(vpic)); - TRACE_1D(TRC_HVM_EMUL_PIC_NEGEDGE, irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_NEGEDGE, irq); if ( irq == 2 ) return; @@ -562,7 +561,7 @@ int vpic_ack_pending_irq(struct vcpu *v) accept = vlapic_accept_pic_intr(v); - TRACE_2D(TRC_HVM_EMUL_PIC_PEND_IRQ_CALL, accept, vpic->int_output); + TRACE_TIME(TRC_HVM_EMUL_PIC_PEND_IRQ_CALL, accept, vpic->int_output); if ( !accept || !vpic->int_output ) return -1; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 80ba8d9fe9..da54ca0f17 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -229,7 +229,7 @@ static void _clear_irq_vector(struct irq_desc *desc) for_each_cpu(cpu, tmp_mask) { ASSERT(per_cpu(vector_irq, cpu)[old_vector] == irq); - TRACE_3D(TRC_HW_IRQ_MOVE_FINISH, irq, old_vector, cpu); + TRACE_TIME(TRC_HW_IRQ_MOVE_FINISH, irq, old_vector, cpu); per_cpu(vector_irq, cpu)[old_vector] = ~irq; } @@ -796,13 +796,11 @@ void cf_check irq_move_cleanup_interrupt(void) goto unlock; } send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); - TRACE_3D(TRC_HW_IRQ_MOVE_CLEANUP_DELAY, - irq, vector, smp_processor_id()); + TRACE_TIME(TRC_HW_IRQ_MOVE_CLEANUP_DELAY, irq, vector, me); goto unlock; } - TRACE_3D(TRC_HW_IRQ_MOVE_CLEANUP, - irq, vector, smp_processor_id()); + TRACE_TIME(TRC_HW_IRQ_MOVE_CLEANUP, irq, vector, me); per_cpu(vector_irq, me)[vector] = ~irq; desc->arch.move_cleanup_count--; @@ -1943,7 +1941,7 @@ void do_IRQ(struct cpu_user_regs *regs) spin_unlock(&desc->lock); } } - TRACE_1D(TRC_HW_IRQ_UNMAPPED_VECTOR, vector); + TRACE_TIME(TRC_HW_IRQ_UNMAPPED_VECTOR, vector); } goto out_no_unlock; } @@ -1984,7 +1982,7 @@ void do_IRQ(struct cpu_user_regs *regs) tsc_in = tb_init_done ? get_cycles() : 0; do_IRQ_guest(desc, vector); - TRACE_3D(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles()); + TRACE_TIME(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles()); goto out_no_end; } @@ -2008,7 +2006,7 @@ void do_IRQ(struct cpu_user_regs *regs) tsc_in = tb_init_done ? get_cycles() : 0; action->handler(irq, action->dev_id); - TRACE_3D(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles()); + TRACE_TIME(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles()); spin_lock_irq(&desc->lock); } diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index d554c9d41e..468a036081 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1899,7 +1899,7 @@ void asmlinkage do_device_not_available(struct cpu_user_regs *regs) curr->arch.pv.ctrlreg[0] &= ~X86_CR0_TS; } else - TRACE_0D(TRC_PV_MATH_STATE_RESTORE); + TRACE_TIME(TRC_PV_MATH_STATE_RESTORE); #else ASSERT_UNREACHABLE(); #endif diff --git a/xen/common/domain.c b/xen/common/domain.c index 6773f7fb90..67cadb7c3f 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -626,7 +626,7 @@ struct domain *domain_create(domid_t domid, hardware_domain = d; } - TRACE_1D(TRC_DOM0_DOM_ADD, d->domain_id); + TRACE_TIME(TRC_DOM0_DOM_ADD, d->domain_id); lock_profile_register_struct(LOCKPROF_TYPE_PERDOM, d, domid); @@ -1223,7 +1223,7 @@ void domain_destroy(struct domain *d) if ( atomic_cmpxchg(&d->refcnt, 0, DOMAIN_DESTROYED) != 0 ) return; - TRACE_1D(TRC_DOM0_DOM_REM, d->domain_id); + TRACE_TIME(TRC_DOM0_DOM_REM, d->domain_id); /* Delete from task list and task hashtable. */ spin_lock(&domlist_update_lock); diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e98e9da520..ebe2d2a3ce 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1307,7 +1307,7 @@ map_grant_ref( goto undo_out; } - TRACE_1D(TRC_MEM_PAGE_GRANT_MAP, op->dom); + TRACE_TIME(TRC_MEM_PAGE_GRANT_MAP, op->dom); /* * All maptrack entry users check mt->flags first before using the @@ -1434,7 +1434,7 @@ unmap_common( return; } - TRACE_1D(TRC_MEM_PAGE_GRANT_UNMAP, dom); + TRACE_TIME(TRC_MEM_PAGE_GRANT_UNMAP, dom); rgt = rd->grant_table; @@ -2445,7 +2445,7 @@ gnttab_transfer( put_gfn(d, gop.mfn); #endif - TRACE_1D(TRC_MEM_PAGE_GRANT_TRANSFER, e->domain_id); + TRACE_TIME(TRC_MEM_PAGE_GRANT_TRANSFER, e->domain_id); /* Tell the guest about its new page frame. */ grant_read_lock(e->grant_table); diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index 6d2413b32a..e690a484f1 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -365,7 +365,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, retval = alternative_call(cpufreq_driver.target, policy, target_freq, relation); if ( retval == 0 ) - TRACE_2D(TRC_PM_FREQ_CHANGE, prev_freq/1000, policy->cur/1000); + TRACE_TIME(TRC_PM_FREQ_CHANGE, prev_freq / 1000, policy->cur / 1000); } return retval; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 21:11:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 21:11:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726376.1130661 (Exim 4.92) (envelope-from ) id 1s9AIV-0000yO-MH; Mon, 20 May 2024 21:11:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726376.1130661; Mon, 20 May 2024 21:11: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 1s9AIV-0000yH-Jq; Mon, 20 May 2024 21:11:55 +0000 Received: by outflank-mailman (input) for mailman id 726376; Mon, 20 May 2024 21:11:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AIU-0000y5-34 for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AIU-0002uh-2I for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9AIU-0001Li-1X for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:11:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/xLwqxu6RayLedA8BM7ng5+Wp7w2G2Fn33nA94zAAE4=; b=vT37/A84Ts4yKsj8aPS2Yd4GFC nlmjMnQS0pYbXIscwJXoLBgNOe08KOc4txyLYyOmhzJQVDbA9i4FiyOwuT6iOT0qvA+pSMhtvYFwQ 4Ds/syDt8Qi/wPadT/BppLCs39spGEC7yiyZVWbyDCTBUAu7mI+29T6FAanwBZ55l29o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/trace: Removal final {__,}trace_var() users in favour of the new API Message-Id: Date: Mon, 20 May 2024 21:11:54 +0000 commit aa60520cd37f0f81cec543af37b89c342e915dbd Author: Andrew Cooper AuthorDate: Tue Sep 21 19:55:47 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/trace: Removal final {__,}trace_var() users in favour of the new API The cycles parameter (which gets removed as a consequence) determines whether trace() or trace_time() is used. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: George Dunlap --- xen/arch/x86/hvm/emulate.c | 2 +- xen/arch/x86/hvm/hvm.c | 3 +-- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/irq.c | 2 +- xen/arch/x86/mm/p2m-pod.c | 8 ++++---- xen/arch/x86/mm/p2m-pt.c | 2 +- xen/arch/x86/mm/shadow/common.c | 6 +++--- xen/arch/x86/mm/shadow/multi.c | 10 +++++----- xen/arch/x86/pv/trace.c | 21 +++++++++++---------- xen/common/memory.c | 2 +- xen/common/trace.c | 2 +- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index d8f36206a7..a37525316c 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -67,7 +67,7 @@ static void hvmtrace_io_assist(const ioreq_t *p) size *= 2; } - trace_var(event, 0/*!cycles*/, size, buffer); + trace(event, size, buffer); } static int cf_check null_read( diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2c92e751cb..30fb9d095a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5142,8 +5142,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) return -EINVAL; /* Cycles will be taken at the vmexit and vmenter */ - trace_var(tr.event | TRC_GUEST, 0 /*!cycles*/, - tr.extra_bytes, tr.extra); + trace(tr.event | TRC_GUEST, tr.extra_bytes, tr.extra); break; } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 6103c171d2..94fa3227b9 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1634,7 +1634,7 @@ static void svm_do_nested_pgfault(struct vcpu *v, _d.mfn = mfn_x(mfn); _d.p2mt = p2mt; - __trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d); + trace(TRC_HVM_NPF, sizeof(_d), &_d); } switch ( ret ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 165a85a25b..457c991d09 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3807,7 +3807,7 @@ static void ept_handle_violation(ept_qual_t q, paddr_t gpa) _d.qualification = q.raw; _d.mfn = mfn_x(get_gfn_query_unlocked(d, gfn, &_d.p2mt)); - __trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d); + trace(TRC_HVM_NPF, sizeof(_d), &_d); } if ( q.gla_valid ) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index da54ca0f17..7243891db8 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -135,7 +135,7 @@ static void _trace_irq_mask(uint32_t event, int irq, int vector, memcpy(d.mask, mask, min(sizeof(d.mask), BITS_TO_LONGS(nr_cpu_ids) * sizeof(long))); - trace_var(event, 1, sizeof(d), &d); + trace_time(event, sizeof(d), &d); } static void trace_irq_mask(uint32_t event, int irq, int vector, diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 9750a3a21b..1c727c78c8 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -854,7 +854,7 @@ p2m_pod_zero_check_superpage(struct p2m_domain *p2m, gfn_t gfn) t.d = d->domain_id; t.order = 9; - __trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), &t); + trace(TRC_MEM_POD_ZERO_RECLAIM, sizeof(t), &t); } /* @@ -1022,7 +1022,7 @@ p2m_pod_zero_check(struct p2m_domain *p2m, const gfn_t *gfns, unsigned int count t.d = d->domain_id; t.order = 0; - __trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), &t); + trace(TRC_MEM_POD_ZERO_RECLAIM, sizeof(t), &t); } /* Add to cache, and account for the new p2m PoD entry */ @@ -1262,7 +1262,7 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, t.d = d->domain_id; t.order = order; - __trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), &t); + trace(TRC_MEM_POD_POPULATE, sizeof(t), &t); } pod_unlock_and_flush(p2m); @@ -1307,7 +1307,7 @@ remap_and_retry: t.d = d->domain_id; t.order = order; - __trace_var(TRC_MEM_POD_SUPERPAGE_SPLINTER, 0, sizeof(t), &t); + trace(TRC_MEM_POD_SUPERPAGE_SPLINTER, sizeof(t), &t); } return true; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 348130d0dd..666abd46be 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -608,7 +608,7 @@ p2m_pt_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, t.d = d->domain_id; t.order = page_order; - __trace_var(TRC_MEM_SET_P2M_ENTRY, 0, sizeof(t), &t); + trace(TRC_MEM_SET_P2M_ENTRY, sizeof(t), &t); } /* Carry out any eventually pending earlier changes first. */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index f93f0a4987..0176e33bc9 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -434,7 +434,7 @@ static inline void trace_resync(int event, mfn_t gmfn) /* Convert gmfn to gfn */ gfn_t gfn = mfn_to_gfn(current->domain, gmfn); - __trace_var(event, 0/*!tsc*/, sizeof(gfn), &gfn); + trace(event, sizeof(gfn), &gfn); } } @@ -911,7 +911,7 @@ static inline void trace_shadow_prealloc_unpin(struct domain *d, mfn_t smfn) ASSERT(mfn_valid(smfn)); gfn = mfn_to_gfn(d, backpointer(mfn_to_page(smfn))); - __trace_var(TRC_SHADOW_PREALLOC_UNPIN, 0/*!tsc*/, sizeof(gfn), &gfn); + trace(TRC_SHADOW_PREALLOC_UNPIN, sizeof(gfn), &gfn); } } @@ -1809,7 +1809,7 @@ static inline void trace_shadow_wrmap_bf(mfn_t gmfn) /* Convert gmfn to gfn */ gfn_t gfn = mfn_to_gfn(current->domain, gmfn); - __trace_var(TRC_SHADOW_WRMAP_BF, 0/*!tsc*/, sizeof(gfn), &gfn); + trace(TRC_SHADOW_WRMAP_BF, sizeof(gfn), &gfn); } } diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 90cf0ceaa3..bcd02b2d00 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1979,7 +1979,7 @@ static inline void trace_shadow_gen(u32 event, guest_va_t va) if ( tb_init_done ) { event |= (GUEST_PAGING_LEVELS-2)<<8; - __trace_var(event, 0/*!tsc*/, sizeof(va), &va); + trace(event, sizeof(va), &va); } } @@ -2003,7 +2003,7 @@ static inline void trace_shadow_fixup(guest_l1e_t gl1e, d.va = va; d.flags = this_cpu(trace_shadow_path_flags); - __trace_var(event, 0/*!tsc*/, sizeof(d), &d); + trace(event, sizeof(d), &d); } } @@ -2027,7 +2027,7 @@ static inline void trace_not_shadow_fault(guest_l1e_t gl1e, d.va = va; d.flags = this_cpu(trace_shadow_path_flags); - __trace_var(event, 0/*!tsc*/, sizeof(d), &d); + trace(event, sizeof(d), &d); } } @@ -2053,7 +2053,7 @@ static inline void trace_shadow_emulate_other(u32 event, d.gfn=gfn_x(gfn); d.va = va; - __trace_var(event, 0/*!tsc*/, sizeof(d), &d); + trace(event, sizeof(d), &d); } } @@ -2106,7 +2106,7 @@ static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) #endif d.flags = this_cpu(trace_shadow_path_flags); - __trace_var(event, 0/*!tsc*/, sizeof(d), &d); + trace(event, sizeof(d), &d); } } #endif /* CONFIG_HVM */ diff --git a/xen/arch/x86/pv/trace.c b/xen/arch/x86/pv/trace.c index cf3897061e..70f426f209 100644 --- a/xen/arch/x86/pv/trace.c +++ b/xen/arch/x86/pv/trace.c @@ -19,7 +19,7 @@ void __trace_pv_trap(int trapnr, unsigned long eip, .error_code = error_code, }; - __trace_var(TRC_PV_TRAP, 1, sizeof(d), &d); + trace_time(TRC_PV_TRAP, sizeof(d), &d); } else { @@ -35,7 +35,7 @@ void __trace_pv_trap(int trapnr, unsigned long eip, .error_code = error_code, }; - __trace_var(TRC_PV_TRAP | TRC_64_FLAG, 1, sizeof(d), &d); + trace_time(TRC_PV_TRAP | TRC_64_FLAG, sizeof(d), &d); } } @@ -53,7 +53,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) .error_code = error_code, }; - __trace_var(TRC_PV_PAGE_FAULT, 1, sizeof(d), &d); + trace_time(TRC_PV_PAGE_FAULT, sizeof(d), &d); } else { @@ -66,7 +66,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) .error_code = error_code, }; - __trace_var(TRC_PV_PAGE_FAULT | TRC_64_FLAG, 1, sizeof(d), &d); + trace_time(TRC_PV_PAGE_FAULT | TRC_64_FLAG, sizeof(d), &d); } } @@ -75,10 +75,11 @@ void __trace_trap_one_addr(unsigned event, unsigned long va) if ( is_pv_32bit_vcpu(current) ) { u32 d = va; - __trace_var(event, 1, sizeof(d), &d); + + trace_time(event, sizeof(d), &d); } else - __trace_var(event | TRC_64_FLAG, 1, sizeof(va), &va); + trace_time(event | TRC_64_FLAG, sizeof(va), &va); } void __trace_trap_two_addr(unsigned event, unsigned long va1, @@ -93,7 +94,7 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1, .va2 = va2, }; - __trace_var(event, 1, sizeof(d), &d); + trace_time(event, sizeof(d), &d); } else { @@ -104,7 +105,7 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1, .va2 = va2, }; - __trace_var(event | TRC_64_FLAG, 1, sizeof(d), &d); + trace_time(event | TRC_64_FLAG, sizeof(d), &d); } } @@ -123,7 +124,7 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) .eip = eip, }; - __trace_var(TRC_PV_PTWR_EMULATION_PAE, 1, sizeof(d), &d); + trace_time(TRC_PV_PTWR_EMULATION_PAE, sizeof(d), &d); } else { @@ -136,6 +137,6 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) .rip = eip, }; - __trace_var(TRC_PV_PTWR_EMULATION | TRC_64_FLAG, 1, sizeof(d), &d); + trace_time(TRC_PV_PTWR_EMULATION | TRC_64_FLAG, sizeof(d), &d); } } diff --git a/xen/common/memory.c b/xen/common/memory.c index b4593f5f45..de2cc7ad92 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -483,7 +483,7 @@ static void decrease_reservation(struct memop_args *a) t.d = a->domain->domain_id; t.order = a->extent_order; - __trace_var(TRC_MEM_DECREASE_RESERVATION, 0, sizeof(t), &t); + trace(TRC_MEM_DECREASE_RESERVATION, sizeof(t), &t); } /* See if populate-on-demand wants to handle this */ diff --git a/xen/common/trace.c b/xen/common/trace.c index c94ce1f7dc..27c8a19f05 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -868,7 +868,7 @@ void __trace_hypercall(uint32_t event, unsigned long op, break; } - __trace_var(event, 1, sizeof(uint32_t) * (1 + (a - d.args)), &d); + trace_time(event, sizeof(uint32_t) * (1 + (a - d.args)), &d); } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 20 21:12:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 20 May 2024 21:12:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726378.1130665 (Exim 4.92) (envelope-from ) id 1s9AIf-00012k-O6; Mon, 20 May 2024 21:12:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726378.1130665; Mon, 20 May 2024 21:12: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 1s9AIf-00012d-LI; Mon, 20 May 2024 21:12:05 +0000 Received: by outflank-mailman (input) for mailman id 726378; Mon, 20 May 2024 21:12:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AIe-00012B-6u for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:12:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9AIe-0002v2-62 for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:12:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9AIe-0001Mu-5J for xen-changelog@lists.xenproject.org; Mon, 20 May 2024 21:12:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RSTQEuD4L98dg73KNNeOecd1SbScohP1wma56neDWJg=; b=bCz0k7l+K50zUApQx8/uGMzUNO jGHFXhYVMkbPVW1J8CGttt/N3kO2yDZk1qbziZpou6Vk1GBgUY5N+Crz8LqYNPTMZGchVrZnsKkTF Xd/bh/fohMYEmNjWwlKD2+YsVknLOqWGf3acHY09xal8aaxeY4yGZEH9TXk1r9nRhTuw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/trace: Drop old trace API Message-Id: Date: Mon, 20 May 2024 21:12:04 +0000 commit 9c5444b01ad51369bc09197a442a93d87b4b76f2 Author: Andrew Cooper AuthorDate: Mon Sep 20 13:40:21 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/trace: Drop old trace API With all users updated to the new API, drop the old API. This includes all of asm/hvm/trace.h, which allows us to drop some includes. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: George Dunlap --- xen/arch/x86/hvm/emulate.c | 1 - xen/arch/x86/hvm/hpet.c | 1 - xen/arch/x86/hvm/hvm.c | 1 - xen/arch/x86/hvm/io.c | 1 - xen/arch/x86/hvm/svm/intr.c | 1 - xen/arch/x86/hvm/svm/svm.c | 1 - xen/arch/x86/hvm/vlapic.c | 1 - xen/arch/x86/hvm/vmx/intr.c | 1 - xen/arch/x86/hvm/vmx/vmx.c | 1 - xen/arch/x86/include/asm/hvm/trace.h | 114 --------------------------------- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 1 - xen/common/trace.c | 12 +--- xen/include/xen/trace.h | 47 -------------- 13 files changed, 3 insertions(+), 180 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index a37525316c..02e378365b 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 4c5b171922..12b00b7702 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 30fb9d095a..2c66fe0f7a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 06283b41c4..db726b3817 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c index dc684fdc84..780c7e178a 100644 --- a/xen/arch/x86/hvm/svm/intr.c +++ b/xen/arch/x86/hvm/svm/intr.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "nestedhvm.h" diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 94fa3227b9..db530d55f2 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 4f5e714aa4..6a11f4d94d 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index d36498d831..1a4dfb499b 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -24,7 +24,6 @@ #include #include #include -#include #include /* diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 457c991d09..8ba996546f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/include/asm/hvm/trace.h b/xen/arch/x86/include/asm/hvm/trace.h deleted file mode 100644 index 22eadbdd47..0000000000 --- a/xen/arch/x86/include/asm/hvm/trace.h +++ /dev/null @@ -1,114 +0,0 @@ -#ifndef __ASM_X86_HVM_TRACE_H__ -#define __ASM_X86_HVM_TRACE_H__ - -#include - -#define DEFAULT_HVM_TRACE_ON 1 -#define DEFAULT_HVM_TRACE_OFF 0 - -#define DEFAULT_HVM_VMSWITCH DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_PF DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_INJECT DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_IO DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_REGACCESS DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_MISC DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_INTR DEFAULT_HVM_TRACE_ON - -#define DO_TRC_HVM_VMENTRY DEFAULT_HVM_VMSWITCH -#define DO_TRC_HVM_VMEXIT DEFAULT_HVM_VMSWITCH -#define DO_TRC_HVM_VMEXIT64 DEFAULT_HVM_VMSWITCH -#define DO_TRC_HVM_PF_XEN DEFAULT_HVM_PF -#define DO_TRC_HVM_PF_XEN64 DEFAULT_HVM_PF -#define DO_TRC_HVM_PF_INJECT DEFAULT_HVM_PF -#define DO_TRC_HVM_PF_INJECT64 DEFAULT_HVM_PF -#define DO_TRC_HVM_INJ_EXC DEFAULT_HVM_INJECT -#define DO_TRC_HVM_INJ_VIRQ DEFAULT_HVM_INJECT -#define DO_TRC_HVM_REINJ_VIRQ DEFAULT_HVM_INJECT -#define DO_TRC_HVM_INTR_WINDOW DEFAULT_HVM_INJECT -#define DO_TRC_HVM_IO_READ DEFAULT_HVM_IO -#define DO_TRC_HVM_IO_WRITE DEFAULT_HVM_IO -#define DO_TRC_HVM_CR_READ DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_CR_READ64 DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_CR_WRITE DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_CR_WRITE64 DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_DR_READ DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_DR_WRITE DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_XCR_READ64 DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_XCR_WRITE64 DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_MSR_READ DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_MSR_WRITE DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_RDTSC DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_CPUID DEFAULT_HVM_MISC -#define DO_TRC_HVM_INTR DEFAULT_HVM_INTR -#define DO_TRC_HVM_NMI DEFAULT_HVM_INTR -#define DO_TRC_HVM_MCE DEFAULT_HVM_INTR -#define DO_TRC_HVM_SMI DEFAULT_HVM_INTR -#define DO_TRC_HVM_VMMCALL DEFAULT_HVM_MISC -#define DO_TRC_HVM_HLT DEFAULT_HVM_MISC -#define DO_TRC_HVM_INVLPG DEFAULT_HVM_MISC -#define DO_TRC_HVM_INVLPG64 DEFAULT_HVM_MISC -#define DO_TRC_HVM_IO_ASSIST DEFAULT_HVM_MISC -#define DO_TRC_HVM_MMIO_ASSIST DEFAULT_HVM_MISC -#define DO_TRC_HVM_CLTS DEFAULT_HVM_MISC -#define DO_TRC_HVM_LMSW DEFAULT_HVM_MISC -#define DO_TRC_HVM_LMSW64 DEFAULT_HVM_MISC -#define DO_TRC_HVM_REALMODE_EMULATE DEFAULT_HVM_MISC -#define DO_TRC_HVM_TRAP DEFAULT_HVM_MISC -#define DO_TRC_HVM_TRAP_DEBUG DEFAULT_HVM_MISC -#define DO_TRC_HVM_VLAPIC DEFAULT_HVM_MISC - - -#define TRC_PAR_LONG(par) ((uint32_t)(par)), ((par) >> 32) - -#define TRACE_2_LONG_2D(_e, d1, d2, ...) \ - TRACE_4D(_e, d1, d2) -#define TRACE_2_LONG_3D(_e, d1, d2, d3, ...) \ - TRACE_5D(_e, d1, d2, d3) -#define TRACE_2_LONG_4D(_e, d1, d2, d3, d4, ...) \ - TRACE_6D(_e, d1, d2, d3, d4) - -#define HVMTRACE_ND(evt, modifier, cycles, ...) \ - do { \ - if ( unlikely(tb_init_done) && DO_TRC_HVM_ ## evt ) \ - { \ - uint32_t _d[] = { __VA_ARGS__ }; \ - __trace_var(TRC_HVM_ ## evt | (modifier), cycles, \ - sizeof(_d), sizeof(_d) ? _d : NULL); \ - } \ - } while(0) - -#define HVMTRACE_6D(evt, d1, d2, d3, d4, d5, d6) \ - HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4, d5, d6) -#define HVMTRACE_5D(evt, d1, d2, d3, d4, d5) \ - HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4, d5) -#define HVMTRACE_4D(evt, d1, d2, d3, d4) \ - HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4) -#define HVMTRACE_3D(evt, d1, d2, d3) \ - HVMTRACE_ND(evt, 0, 0, d1, d2, d3) -#define HVMTRACE_2D(evt, d1, d2) \ - HVMTRACE_ND(evt, 0, 0, d1, d2) -#define HVMTRACE_1D(evt, d1) \ - HVMTRACE_ND(evt, 0, 0, d1) -#define HVMTRACE_0D(evt) \ - HVMTRACE_ND(evt, 0, 0) - -#define HVMTRACE_LONG_1D(evt, d1) \ - HVMTRACE_2D(evt ## 64, (uint32_t)(d1), (d1) >> 32) -#define HVMTRACE_LONG_2D(evt, d1, d2, ...) \ - HVMTRACE_3D(evt ## 64, d1, d2) -#define HVMTRACE_LONG_3D(evt, d1, d2, d3, ...) \ - HVMTRACE_4D(evt ## 64, d1, d2, d3) -#define HVMTRACE_LONG_4D(evt, d1, d2, d3, d4, ...) \ - HVMTRACE_5D(evt ## 64, d1, d2, d3, d4) - -#endif /* __ASM_X86_HVM_TRACE_H__ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index 8ffab7d94c..1489dd05c2 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -15,7 +15,6 @@ #include #include #include -#include #include extern int8_t opt_ept_exec_sp; diff --git a/xen/common/trace.c b/xen/common/trace.c index 27c8a19f05..c9c555094b 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -666,22 +666,21 @@ static DECLARE_SOFTIRQ_TASKLET(trace_notify_dom0_tasklet, trace_notify_dom0, NULL); /** - * __trace_var - Enters a trace tuple into the trace buffer for the current CPU. + * trace - Enters a trace tuple into the trace buffer for the current CPU. * @event: the event type being logged - * @cycles: include tsc timestamp into trace record * @extra: size of additional trace data in bytes * @extra_data: pointer to additional trace data * * Logs a trace record into the appropriate buffer. */ -void __trace_var(u32 event, bool cycles, unsigned int extra, - const void *extra_data) +void trace(uint32_t event, unsigned int extra, const void *extra_data) { struct t_buf *buf; unsigned long flags; u32 bytes_to_tail, bytes_to_wrap; unsigned int rec_size, total_size; bool started_below_highwater; + bool cycles = event & TRC_HD_CYCLE_FLAG; if( !tb_init_done ) return; @@ -808,11 +807,6 @@ unlock: tasklet_schedule(&trace_notify_dom0_tasklet); } -void trace(uint32_t event, unsigned int extra, const void *extra_data) -{ - __trace_var(event, event & TRC_HD_CYCLE_FLAG, extra, extra_data); -} - void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) { diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index 9dc7e3d621..914cecbc18 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -40,15 +40,6 @@ int trace_will_trace_event(u32 event); /* Create a trace record, with pre-constructed additional parameters. */ void trace(uint32_t event, unsigned int extra, const void *extra_data); -void __trace_var(uint32_t event, bool cycles, unsigned int extra, const void *); - -static inline void trace_var(uint32_t event, bool cycles, unsigned int extra, - const void *extra_data) -{ - if ( unlikely(tb_init_done) ) - __trace_var(event, cycles, extra, extra_data); -} - void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args); @@ -72,10 +63,6 @@ static inline int trace_will_trace_event(uint32_t event) static inline void trace( uint32_t event, unsigned int extra, const void *extra_data) {} -static inline void trace_var(uint32_t event, bool cycles, unsigned int extra, - const void *extra_data) {} -static inline void __trace_var(uint32_t event, bool cycles, unsigned int extra, - const void *extra_data) {} static inline void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) {} #endif /* CONFIG_TRACEBUFFER */ @@ -104,38 +91,4 @@ static inline void trace_time( /* Create a trace record with time included. */ #define TRACE_TIME(_e, ...) TRACE((_e) | TRC_HD_CYCLE_FLAG, ## __VA_ARGS__) -/* Convenience macros for calling the trace function. */ -#define TRACE_0D(_e) \ - do { \ - trace_var(_e, 1, 0, NULL); \ - } while ( 0 ) - -/* Common helper for TRACE_{1..6}D() below. */ -#define TRACE_varD(_e, ...) \ - do { \ - if ( unlikely(tb_init_done) ) \ - { \ - uint32_t _d[] = { __VA_ARGS__ }; \ - __trace_var(_e, true, sizeof(_d), _d); \ - } \ - } while ( 0 ) - -#define TRACE_1D(_e, d1) \ - TRACE_varD(_e, d1) - -#define TRACE_2D(_e, d1, d2) \ - TRACE_varD(_e, d1, d2) - -#define TRACE_3D(_e, d1, d2, d3) \ - TRACE_varD(_e, d1, d2, d3) - -#define TRACE_4D(_e, d1, d2, d3, d4) \ - TRACE_varD(_e, d1, d2, d3, d4) - -#define TRACE_5D(_e, d1, d2, d3, d4, d5) \ - TRACE_varD(_e, d1, d2, d3, d4, d5) - -#define TRACE_6D(_e, d1, d2, d3, d4, d5, d6) \ - TRACE_varD(_e, d1, d2, d3, d4, d5, d6) - #endif /* __XEN_TRACE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 05:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 05:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726566.1130882 (Exim 4.92) (envelope-from ) id 1s9HmB-00025U-0g; Tue, 21 May 2024 05:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726566.1130882; Tue, 21 May 2024 05:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9HmA-00025M-Tw; Tue, 21 May 2024 05:11:02 +0000 Received: by outflank-mailman (input) for mailman id 726566; Tue, 21 May 2024 05:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Hm9-00025G-Sx for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 05:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Hm9-0003Pp-S6 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 05:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Hm9-0002E0-QI for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 05: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=lb8F7R3hxvVYgVPkFKZY+xCcL8TQW4+VTnSww4s62yc=; b=ihiri5ojJwZGQN1Au1aeEyOEK5 /4W2aFGwLh2uwRQkaL9hw+jluFc2qLMNq1kqHGwhY/O2/fsTFS0Q94/CSc4UQCzljroREObOWTdrq QXEqpwMurBQZKp3R5sWiyeiUhbukGOrQe6ZfQoOfWFynrjiQdxCD4eOu5eSy+vno8tCw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/msi: prevent watchdog triggering when dumping MSI state Message-Id: Date: Tue, 21 May 2024 05:11:01 +0000 commit 594b22ca5be681ec1b42c34f321cc2600d582210 Author: Roger Pau Monné AuthorDate: Fri May 17 15:56:05 2024 +0200 Commit: Andrew Cooper CommitDate: Mon May 20 14:29:44 2024 +0100 x86/msi: prevent watchdog triggering when dumping MSI state Use the same check that's used in dump_irqs(). Signed-off-by: Roger Pau Monné Release-acked-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/x86/msi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 19830528b6..0c97fbb3fc 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -1451,6 +1452,9 @@ static void cf_check dump_msi(unsigned char key) unsigned long flags; const char *type = "???"; + if ( !(irq & 0x1f) ) + process_pending_softirqs(); + if ( !irq_desc_initialized(desc) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 21 05:11:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 05:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726567.1130886 (Exim 4.92) (envelope-from ) id 1s9HmL-0002Aq-3Q; Tue, 21 May 2024 05:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726567.1130886; Tue, 21 May 2024 05: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 1s9HmL-0002AR-0X; Tue, 21 May 2024 05:11:13 +0000 Received: by outflank-mailman (input) for mailman id 726567; Tue, 21 May 2024 05:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9HmK-000292-1o for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 05:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9HmK-0003Pt-0r for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 05:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9HmJ-0002Ek-UT for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 05: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=B+QD9JT4DrbYTOm5uwD6o6Mvzyos3K8wXXq6nY3FRW0=; b=0cX7jXf2m9OwaA3CR/pBd6dAGy IGnpaR04H8Dw4GZltCI8xoZWv1uMtbJ5O+snXO7UrFD0fB55EkyF5Zu6hrySdhELqQr4nfwYP5XMA jmez0lJjvdnoO3mrbnDHpyzo9ykVmJNMi3AA4H2mLXnKLTqliv5nOke+mdNPriSOhoNg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/golang: Add missing golang bindings for vlan Message-Id: Date: Tue, 21 May 2024 05:11:11 +0000 commit 54aa34fc89151c943550541e0af47664fb6e8676 Author: Henry Wang AuthorDate: Mon May 20 16:21:45 2024 +0800 Commit: Andrew Cooper CommitDate: Mon May 20 14:29:44 2024 +0100 tools/golang: Add missing golang bindings for vlan It is noticed that commit: 3bc14e4fa4b9 ("tools/libs/light: Add vlan field to libxl_device_nic") introduces a new "vlan" string field to libxl_device_nic. But the golang bindings are missing. Add it in this patch. Fixes: 3bc14e4fa4b9 ("tools/libs/light: Add vlan field to libxl_device_nic") Signed-off-by: Henry Wang Acked-by: George Dunlap --- tools/golang/xenlight/helpers.gen.go | 3 +++ tools/golang/xenlight/types.gen.go | 1 + 2 files changed, 4 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 78bdb08b15..b9cb5b33c7 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1963,6 +1963,7 @@ func (x *DeviceNic) fromC(xc *C.libxl_device_nic) error { x.BackendDomname = C.GoString(xc.backend_domname) x.Devid = Devid(xc.devid) x.Mtu = int(xc.mtu) +x.Vlan = C.GoString(xc.vlan) x.Model = C.GoString(xc.model) if err := x.Mac.fromC(&xc.mac);err != nil { return fmt.Errorf("converting field Mac: %v", err) @@ -2040,6 +2041,8 @@ if x.BackendDomname != "" { xc.backend_domname = C.CString(x.BackendDomname)} xc.devid = C.libxl_devid(x.Devid) xc.mtu = C.int(x.Mtu) +if x.Vlan != "" { +xc.vlan = C.CString(x.Vlan)} if x.Model != "" { xc.model = C.CString(x.Model)} if err := x.Mac.toC(&xc.mac); err != nil { diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index ccfe18019e..5b293755d7 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -756,6 +756,7 @@ BackendDomid Domid BackendDomname string Devid Devid Mtu int +Vlan string Model string Mac Mac Ip string -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 21 07:22:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 07:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726613.1130939 (Exim 4.92) (envelope-from ) id 1s9Jp0-0005rr-2V; Tue, 21 May 2024 07:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726613.1130939; Tue, 21 May 2024 07:22:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Joz-0005rj-WA; Tue, 21 May 2024 07:22:05 +0000 Received: by outflank-mailman (input) for mailman id 726613; Tue, 21 May 2024 07:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Joy-0005r6-2u for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Jox-0006Bx-VR for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Jox-0002qE-TC for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QRhu/JBzNeiuSxaLM2o00YzzmGXZttEttQIl27E/tIM=; b=OfHyMkaboFuyubTvlJu4S0ip3h EOMbwxEfSGs/2DcZEGE0+h8lj4IsWvdW+JcchZWi81CHtjqQ1pTCpH5kX0qg58zCe/pYKIocQwVtj joP1y2JWgDV9VGEN486QZhKR8y5mkDTuCK0nOSWRIviamDQ92u1e+KxahRaJhEjQqnjw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: pretty print interrupt CPU affinity masks Message-Id: Date: Tue, 21 May 2024 07:22:03 +0000 commit 44b69e9c173995de066c0ddfc5cb23220fb15cf8 Author: Roger Pau Monné AuthorDate: Tue May 21 09:15:03 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 09:15:03 2024 +0200 xen/x86: pretty print interrupt CPU affinity masks Print the CPU affinity masks as numeric ranges instead of plain hexadecimal bitfields. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Release-acked-by: Oleksii Kurochko --- xen/arch/x86/irq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 7243891db8..c16205a9be 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1932,10 +1932,10 @@ void do_IRQ(struct cpu_user_regs *regs) if ( ~irq < nr_irqs && irq_desc_initialized(desc) ) { spin_lock(&desc->lock); - printk("IRQ%d a=%04lx[%04lx,%04lx] v=%02x[%02x] t=%s s=%08x\n", - ~irq, *cpumask_bits(desc->affinity), - *cpumask_bits(desc->arch.cpu_mask), - *cpumask_bits(desc->arch.old_cpu_mask), + printk("IRQ%d a={%*pbl}[{%*pbl},{%*pbl}] v=%02x[%02x] t=%s s=%08x\n", + ~irq, CPUMASK_PR(desc->affinity), + CPUMASK_PR(desc->arch.cpu_mask), + CPUMASK_PR(desc->arch.old_cpu_mask), desc->arch.vector, desc->arch.old_vector, desc->handler->typename, desc->status); spin_unlock(&desc->lock); @@ -2636,7 +2636,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) if ( !set_affinity ) printk("Cannot set affinity for IRQ%u\n", irq); else if ( break_affinity ) - printk("Broke affinity for IRQ%u, new: %*pb\n", + printk("Broke affinity for IRQ%u, new: {%*pbl}\n", irq, CPUMASK_PR(affinity)); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 07:22:16 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 07:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726614.1130943 (Exim 4.92) (envelope-from ) id 1s9JpA-0005tX-3i; Tue, 21 May 2024 07:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726614.1130943; Tue, 21 May 2024 07:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9JpA-0005tQ-1G; Tue, 21 May 2024 07:22:16 +0000 Received: by outflank-mailman (input) for mailman id 726614; Tue, 21 May 2024 07:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Jp8-0005tE-4i for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Jp8-0006C1-29 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Jp8-0002r3-1E for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wS5tlbi2rpf3MU/ei/W5vg0WrV/ZYrCHKH5RCrywlxc=; b=lSAqI7mPc1CiBOMLlcp5WA7fYI aOOMlA7IK7g2X49rBDzLommwhzMFps7GKNASLkpbN+3IRnSgvoSYJOQMNVHcBuBObWHmWtMOPlSeK rC8N2L1RfaxKpaqXznJOF8HDiT4bHlA5W6Ka/ZsNroo8/ZtMotaUTxw11CsyErfd48+w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce monitor.h Message-Id: Date: Tue, 21 May 2024 07:22:14 +0000 commit 7e036f7e0caacd0ce60414ec3b8d9a1a7a83d9e3 Author: Oleksii Kurochko AuthorDate: Tue May 21 09:15:37 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 09:15:37 2024 +0200 xen/riscv: introduce monitor.h Signed-off-by: Oleksii Kurochko Acked-by: Tamas K Lengyel --- xen/arch/riscv/include/asm/monitor.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/xen/arch/riscv/include/asm/monitor.h b/xen/arch/riscv/include/asm/monitor.h new file mode 100644 index 0000000000..f4fe2c0690 --- /dev/null +++ b/xen/arch/riscv/include/asm/monitor.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_RISCV_MONITOR_H__ +#define __ASM_RISCV_MONITOR_H__ + +#include + +#include + +struct domain; + +static inline uint32_t arch_monitor_get_capabilities(struct domain *d) +{ + BUG_ON("unimplemented"); + return 0; +} + +#endif /* __ASM_RISCV_MONITOR_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 07:22:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 07:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726615.1130948 (Exim 4.92) (envelope-from ) id 1s9JpK-0005wK-5Y; Tue, 21 May 2024 07:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726615.1130948; Tue, 21 May 2024 07:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9JpK-0005wC-2h; Tue, 21 May 2024 07:22:26 +0000 Received: by outflank-mailman (input) for mailman id 726615; Tue, 21 May 2024 07:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9JpI-0005vr-7e for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9JpI-0006CD-6t for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9JpI-0002rc-4B for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OacR3HlbYnCPu018qxxtZM7dnvrxEgyLVfxaSCmjKoI=; b=0mmFr8qKrU5PqQDWrtckEeL2hW dgXznuKldJalHwjakI3TbHIRN1uep9ldgqDRFPeTLwmdPxF/dVs1zbmsi7Can8559ZsXJTCD8jZrc CLxNTnbAjHS688VOUBbiA9ZVg+4bK1/KlmEL1327isZx6t1ZvuKLO69Lv+OQOyvkUlZ4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce vm_event_*() functions Message-Id: Date: Tue, 21 May 2024 07:22:24 +0000 commit ed1ac3e968e54bcd42767d0b38b092ecacddc1df Author: Oleksii Kurochko AuthorDate: Tue May 21 09:16:02 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 09:16:02 2024 +0200 xen/riscv: introduce vm_event_*() functions Signed-off-by: Oleksii Kurochko Acked-by: Tamas K Lengyel --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/vm_event.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index 2fefe14e7c..1ed1a8369b 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.o obj-y += traps.o +obj-y += vm_event.o $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@ diff --git a/xen/arch/riscv/vm_event.c b/xen/arch/riscv/vm_event.c new file mode 100644 index 0000000000..bb1fc73bc1 --- /dev/null +++ b/xen/arch/riscv/vm_event.c @@ -0,0 +1,19 @@ +#include + +struct vm_event_st; +struct vcpu; + +void vm_event_fill_regs(struct vm_event_st *req) +{ + BUG_ON("unimplemented"); +} + +void vm_event_set_registers(struct vcpu *v, struct vm_event_st *rsp) +{ + BUG_ON("unimplemented"); +} + +void vm_event_monitor_next_interrupt(struct vcpu *v) +{ + /* Not supported on RISCV. */ +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 07:22:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 07:22:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726616.1130951 (Exim 4.92) (envelope-from ) id 1s9JpU-0005za-6T; Tue, 21 May 2024 07:22:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726616.1130951; Tue, 21 May 2024 07:22:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9JpU-0005zT-46; Tue, 21 May 2024 07:22:36 +0000 Received: by outflank-mailman (input) for mailman id 726616; Tue, 21 May 2024 07:22:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9JpS-0005z7-As for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9JpS-0006CN-9t for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9JpS-0002s3-97 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 07:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=o/+mwhThJAop74zyph9Vi1gTV3vLt+d8cneupjK6JoQ=; b=fb8tBZycFxosE7Ur2Vyaldj3IC lCG+vSSTzuimwrnZu88Kyg+tJbVvC+NWQcdp6faxamSiJYByWYftj1edL7SWfh+8aqin2RzPpJ8zP +vKZ/7vVhzha6fADDooKnt5rhI+gDvdcbegJXDhLTfYxP3j9HaxHrMfu9jSbgK6RxwFk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/p2m: Add braces for better code clarity Message-Id: Date: Tue, 21 May 2024 07:22:34 +0000 commit 24dbf5bd03ff11dbcebb4d15e34fbba8eb34936b Author: Petr Beneš AuthorDate: Tue May 21 09:16:25 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 09:16:25 2024 +0200 x86/p2m: Add braces for better code clarity No functional change. Signed-off-by: Petr Beneš Reviewed-by: Stefano Stabellini Acked-by: Roger Pau Monné --- xen/arch/x86/mm/p2m.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 4a4620e870..db5d9b6c2a 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -106,6 +106,7 @@ void p2m_change_entry_type_global(struct domain *d, unsigned int i; for ( i = 0; i < MAX_ALTP2M; i++ ) + { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { struct p2m_domain *altp2m = d->arch.altp2m_p2m[i]; @@ -114,6 +115,7 @@ void p2m_change_entry_type_global(struct domain *d, change_entry_type_global(altp2m, ot, nt); p2m_unlock(altp2m); } + } } p2m_unlock(hostp2m); @@ -139,6 +141,7 @@ void p2m_memory_type_changed(struct domain *d) unsigned int i; for ( i = 0; i < MAX_ALTP2M; i++ ) + { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { struct p2m_domain *altp2m = d->arch.altp2m_p2m[i]; @@ -147,6 +150,7 @@ void p2m_memory_type_changed(struct domain *d) _memory_type_changed(altp2m); p2m_unlock(altp2m); } + } } p2m_unlock(hostp2m); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:33:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726660.1130991 (Exim 4.92) (envelope-from ) id 1s9Kvg-0000KZ-W8; Tue, 21 May 2024 08:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726660.1130991; Tue, 21 May 2024 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 1s9Kvg-0000KR-TX; Tue, 21 May 2024 08:33:04 +0000 Received: by outflank-mailman (input) for mailman id 726660; Tue, 21 May 2024 08:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kvf-0000KL-Mo for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kvf-0007wg-KX for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Kvf-0007UH-Hn for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7zFN8QYAxczGzKbGKiGPapFKdQZOslbm66zhld3+fak=; b=mFbPxk1VEuIxR6+WElfBDziolC zPSTFyrP2I9q0qgybmoElJRjCJZcA92sPNE1n57nxHLHrsz4OzkvQD2yYin2WFMH8MZqGo0cefDLm hYpgXYFu57weIDHqXeoahiA1vFdjHJd0x7SXbRsIfz1XBjuxfR/hyf1zAK1hFlEpML0s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] xen/xsm: Wire up get_dom0_console Message-Id: Date: Tue, 21 May 2024 08:33:03 +0000 commit 026542c8577ab6af7c1dbc7446547bdc2bc705fd Author: Jason Andryuk AuthorDate: Tue May 21 10:19:43 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:19:43 2024 +0200 xen/xsm: Wire up get_dom0_console An XSM hook for get_dom0_console is currently missing. Using XSM with a PVH dom0 shows: (XEN) FLASK: Denying unknown platform_op: 64. Wire up the hook, and allow it for dom0. Fixes: 4dd160583c ("x86/platform: introduce hypercall to get initial video console settings") Signed-off-by: Jason Andryuk Acked-by: Daniel P. Smith master commit: 647f7e50ebeeb8152974cad6a12affe474c74513 master date: 2024-04-30 08:33:41 +0200 --- tools/flask/policy/modules/dom0.te | 2 +- xen/xsm/flask/hooks.c | 4 ++++ xen/xsm/flask/policy/access_vectors | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index f1dcff48e2..16b8c9646d 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - coverage_op + coverage_op get_dom0_console }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 78225f68c1..5e88c71b8e 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1558,6 +1558,10 @@ static int cf_check flask_platform_op(uint32_t op) return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, SECCLASS_XEN2, XEN2__GET_SYMBOL, NULL); + case XENPF_get_dom0_console: + return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, + SECCLASS_XEN2, XEN2__GET_DOM0_CONSOLE, NULL); + default: return avc_unknown_permission("platform_op", op); } diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 4e6710a63e..a35e3d4c51 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,6 +99,8 @@ class xen2 livepatch_op # XEN_SYSCTL_coverage_op coverage_op +# XENPF_get_dom0_console + get_dom0_console } # Classes domain and domain2 consist of operations that a domain performs on -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:33:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726661.1130998 (Exim 4.92) (envelope-from ) id 1s9Kvr-0000MP-2R; Tue, 21 May 2024 08:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726661.1130998; Tue, 21 May 2024 08:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kvq-0000ME-V2; Tue, 21 May 2024 08:33:14 +0000 Received: by outflank-mailman (input) for mailman id 726661; Tue, 21 May 2024 08:33:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kvp-0000M2-Rx for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kvp-0007wo-R9 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Kvp-0007V7-Mf for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bThQD3B+Ty6ldYpean3NuA738eu4SFSduKkCTp90RrU=; b=xZnN8d0IvvZAT8PLzf9YNwM1O5 7uxgxZqnNF2/gSUN0VaxN81nS1fhkQXWFEI82kB/0zxr90RoFDRR2XjacfKRmIeEPbP9+Dx6CWsVa 0JlrYji52JhKTYYcKqzmX4s/myrvVt2L1wMub8EPat8UO+yhNGB+Jt+VpHaUdQzGQLHU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] xen/x86: Fix Syntax warning in gen-cpuid.py Message-Id: Date: Tue, 21 May 2024 08:33:13 +0000 commit 47cf06c09a2fa1ee92ea3e7718c8f8e0f1450d88 Author: Jason Andryuk AuthorDate: Tue May 21 10:20:06 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:20:06 2024 +0200 xen/x86: Fix Syntax warning in gen-cpuid.py Python 3.12.2 warns: xen/tools/gen-cpuid.py:50: SyntaxWarning: invalid escape sequence '\s' "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" xen/tools/gen-cpuid.py:51: SyntaxWarning: invalid escape sequence '\s' "\s+/\*([\w!]*) .*$") Specify the strings as raw strings so '\s' is read as literal '\' + 's'. This avoids escaping all the '\'s in the strings. Signed-off-by: Jason Andryuk Acked-by: Andrew Cooper master commit: 08e79bba73d74a85d3ce6ff0f91c5205f1e05eda master date: 2024-04-30 08:34:37 +0200 --- xen/tools/gen-cpuid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 02dd45a5ed..415d644db5 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -47,8 +47,8 @@ def parse_definitions(state): """ feat_regex = re.compile( r"^XEN_CPUFEATURE\(([A-Z0-9_]+)," - "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" - "\s+/\*([\w!]*) .*$") + r"\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" + r"\s+/\*([\w!]*) .*$") word_regex = re.compile( r"^/\* .* word (\d*) \*/$") -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:33:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726662.1131000 (Exim 4.92) (envelope-from ) id 1s9Kw1-0000Om-32; Tue, 21 May 2024 08:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726662.1131000; Tue, 21 May 2024 08:33: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 1s9Kw1-0000Oe-0F; Tue, 21 May 2024 08:33:25 +0000 Received: by outflank-mailman (input) for mailman id 726662; Tue, 21 May 2024 08:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kvz-0000OY-Uw for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kvz-0007ww-UB for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Kvz-0007Ve-TK for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ciJEYQ4wRSbyI9azW71GT0fRQDBnHaR1p27tKoVT1do=; b=EhjY8QnNaiJ6AzcmNP29oY5jcx xwj4gb/1yQE97o2DzIzon30A3R7wmnSjX0WkuPCu+JwPimM9XHw63Ifv/zyTF8srgVtsnxeWyEgTX 0esYi54GDzDI4taIb0Fjd6G6eGY5lZwLsEs+lOziU28et+7GKRccp2NDfQPyVTkevYTU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] VT-d: correct ATS checking for root complex integrated devices Message-Id: Date: Tue, 21 May 2024 08:33:23 +0000 commit a4c5bbb9db07b27e66f7c47676b1c888e1bece20 Author: Jan Beulich AuthorDate: Tue May 21 10:20:58 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:20:58 2024 +0200 VT-d: correct ATS checking for root complex integrated devices Spec version 4.1 says "The ATSR structures identifies PCI Express Root-Ports supporting Address Translation Services (ATS) transactions. Software must enable ATS on endpoint devices behind a Root Port only if the Root Port is reported as supporting ATS transactions." Clearly root complex integrated devices aren't "behind root ports", matching my observation on a SapphireRapids system having an ATS- capable root complex integrated device. Hence for such devices we shouldn't try to locate a corresponding ATSR. Since both pci_find_ext_capability() and pci_find_cap_offset() return "unsigned int", change "pos" to that type at the same time. Fixes: 903b93211f56 ("[VTD] laying the ground work for ATS") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 04e31583bab97e5042a44a1d00fce2760272635f master date: 2024-05-06 09:22:45 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index 1f5913bed9..61052ef580 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -44,7 +44,7 @@ struct acpi_drhd_unit *find_ats_dev_drhd(struct vtd_iommu *iommu) int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) { struct acpi_drhd_unit *ats_drhd; - int pos; + unsigned int pos, expfl = 0; if ( !ats_enabled || !iommu_qinval ) return 0; @@ -53,7 +53,12 @@ int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) !ecap_dev_iotlb(drhd->iommu->ecap) ) return 0; - if ( !acpi_find_matched_atsr_unit(pdev) ) + pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP); + if ( pos ) + expfl = pci_conf_read16(pdev->sbdf, pos + PCI_EXP_FLAGS); + + if ( MASK_EXTR(expfl, PCI_EXP_FLAGS_TYPE) != PCI_EXP_TYPE_RC_END && + !acpi_find_matched_atsr_unit(pdev) ) return 0; ats_drhd = find_ats_dev_drhd(drhd->iommu); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:33:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:33:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726663.1131004 (Exim 4.92) (envelope-from ) id 1s9KwB-0000SN-6t; Tue, 21 May 2024 08:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726663.1131004; Tue, 21 May 2024 08:33: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 1s9KwB-0000SF-4K; Tue, 21 May 2024 08:33:35 +0000 Received: by outflank-mailman (input) for mailman id 726663; Tue, 21 May 2024 08:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KwA-0000Rw-1g for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KwA-0007xB-0t for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9KwA-0007W5-05 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sPwCR4WfqmGRI7oOfe7wUl2Crdv60zIrDLeDkLtbYY4=; b=A+5uEHVdTUGowgWFqQOPjkgReu JhrLoNvsHOtCSU5/VKFtPr1bxHqgBS7sn99NlAZ3R4lvW7qHRo6d0M6tJFCBqzp2TULtovT5k48k8 9SVtx0MYdq/ud2HW/QqyXeDkTiQYXL/aO+GDS0u6dA8rccrCFsUgY3i0XCKXsNKGBRps=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC Message-Id: Date: Tue, 21 May 2024 08:33:34 +0000 commit 2bc52041cacb33a301ebf939d69a021597941186 Author: Andrew Cooper AuthorDate: Tue May 21 10:21:47 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:21:47 2024 +0200 tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC The header description for xs_open() goes as far as to suggest that the fd is O_CLOEXEC, but it isn't actually. `xl devd` has been observed leaking /dev/xen/xenbus into children. Link: https://github.com/QubesOS/qubes-issues/issues/8292 Reported-by: Demi Marie Obenour Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross master commit: f4f2f3402b2f4985d69ffc0d46f845d05fd0b60f master date: 2024-05-07 15:18:36 +0100 --- tools/libs/store/xs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 140b9a2839..1498515073 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -54,6 +54,10 @@ struct xs_stored_msg { #include #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + struct xs_handle { /* Communications channel to xenstore daemon. */ int fd; @@ -227,7 +231,7 @@ error: static int get_dev(const char *connect_to) { /* We cannot open read-only because requests are writes */ - return open(connect_to, O_RDWR); + return open(connect_to, O_RDWR | O_CLOEXEC); } static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:33:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:33:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726666.1131008 (Exim 4.92) (envelope-from ) id 1s9KwL-0000V3-8J; Tue, 21 May 2024 08:33:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726666.1131008; Tue, 21 May 2024 08:33:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KwL-0000Uv-5l; Tue, 21 May 2024 08:33:45 +0000 Received: by outflank-mailman (input) for mailman id 726666; Tue, 21 May 2024 08:33:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KwK-0000Uj-5U for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KwK-0007xa-3o for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9KwK-0007WW-32 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Vff5j+pHH9ocf34ezLTAk41vl6KvU3I3TTJequDUtoU=; b=VRpAR2d+WO65gu1Ul/DK13xe3T 87qrvgi0NKTV4qw8hQRAB6t7SrgZbAgDMeOKQotYscXMqbGHxCk04vM6rqCbcCpQDUprn7vGqexH1 GixrtT3F1NMHfoEihMWKO5giJCU96hPL2YYpf62YmOEltRKd8LkbeKcy1+Qd95YtyrOE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Message-Id: Date: Tue, 21 May 2024 08:33:44 +0000 commit 0673eae8e53de5007dba35149527579819428323 Author: Andrew Cooper AuthorDate: Tue May 21 10:22:08 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:22:08 2024 +0200 x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Ever since Xen 4.14, there has been a latent bug with migration. While some toolstacks can level the features properly, they don't shink feat.max_subleaf when all features have been dropped. This is because we *still* have not completed the toolstack side work for full CPU Policy objects. As a consequence, even when properly feature levelled, VMs can't migrate "backwards" across hardware which reduces feat.max_subleaf. One such example is Ice Lake (max_subleaf=2 for INTEL_PSFD) to Cascade Lake (max_subleaf=0). Extend the max policies feat.max_subleaf to the hightest number Xen knows about, but leave the default policies matching the host. This will allow VMs with a higher feat.max_subleaf than strictly necessary to migrate in. Eventually we'll manage to teach the toolstack how to avoid creating such VMs in the first place, but there's still more work to do there. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: a2330b51df267e20e66bbba6c5bf08f0570ed58b master date: 2024-05-07 16:56:46 +0100 --- xen/arch/x86/cpu-policy.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index a822800f52..1aba6ed4ca 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -603,6 +603,13 @@ static void __init calculate_pv_max_policy(void) unsigned int i; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -643,6 +650,10 @@ static void __init calculate_pv_def_policy(void) unsigned int i; *p = pv_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -679,6 +690,13 @@ static void __init calculate_hvm_max_policy(void) const uint32_t *mask; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? @@ -780,6 +798,10 @@ static void __init calculate_hvm_def_policy(void) const uint32_t *mask; *p = hvm_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:33:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:33:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726668.1131011 (Exim 4.92) (envelope-from ) id 1s9KwW-0000YB-A2; Tue, 21 May 2024 08:33:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726668.1131011; Tue, 21 May 2024 08:33:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KwW-0000Y4-7D; Tue, 21 May 2024 08:33:56 +0000 Received: by outflank-mailman (input) for mailman id 726668; Tue, 21 May 2024 08:33:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KwU-0000Xm-7i for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KwU-0007xh-6x for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9KwU-0007Wx-5z for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:33:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WR1mbJbF1+hM/qbCGAGZ2sk54w8bZsNojn2noGz1Nx8=; b=txd2PyhvxW1ZM0ifR3VOR3PDx0 0pBBlrc6QuZlvq1TRbWBhk4vLG3lM7GotI37mZnZC95e4Ooj4uly307807m2iBrH+eU4NagV05sKO xlwzm1xO8Fot1fB94ZMfXE/QCA9Mp5IA6QJDbXJSE3G8fxt5wx1ZYnfOm0KFuOPeCEqI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/ucode: Distinguish "ucode already up to date" Message-Id: Date: Tue, 21 May 2024 08:33:54 +0000 commit a42c83b202cc034c43c723cf363dbbabac61b1af Author: Andrew Cooper AuthorDate: Tue May 21 10:22:52 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:22:52 2024 +0200 x86/ucode: Distinguish "ucode already up to date" Right now, Xen returns -ENOENT for both "the provided blob isn't correct for this CPU", and "the blob isn't newer than what's loaded". This in turn causes xen-ucode to exit with an error, when "nothing to do" is more commonly a success condition. Handle EEXIST specially and exit cleanly. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: 648db37a155aca6f66d4cf3bb118417a728c3579 master date: 2024-05-09 18:19:49 +0100 --- tools/misc/xen-ucode.c | 5 ++++- xen/arch/x86/cpu/microcode/core.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index c6ae6498d6..390969db3d 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -125,8 +125,11 @@ int main(int argc, char *argv[]) exit(1); } + errno = 0; ret = xc_microcode_update(xch, buf, len); - if ( ret ) + if ( ret == -1 && errno == EEXIST ) + printf("Microcode already up to date\n"); + else if ( ret ) { fprintf(stderr, "Failed to update microcode. (err: %s)\n", strerror(errno)); diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 4e011cdc41..d5338ad345 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -640,7 +640,7 @@ static long cf_check microcode_update_helper(void *data) "microcode: couldn't find any newer%s revision in the provided blob!\n", opt_ucode_allow_same ? " (or the same)" : ""); microcode_free_patch(patch); - ret = -ENOENT; + ret = -EEXIST; goto put; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:34:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:34:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726670.1131016 (Exim 4.92) (envelope-from ) id 1s9Kwg-0000bc-Bf; Tue, 21 May 2024 08:34:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726670.1131016; Tue, 21 May 2024 08:34:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kwg-0000bU-8l; Tue, 21 May 2024 08:34:06 +0000 Received: by outflank-mailman (input) for mailman id 726670; Tue, 21 May 2024 08:34:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kwe-0000b7-Eg for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kwe-0007y2-Bl for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Kwe-0007Y0-94 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=571ksfLCtQLLVqeY6LF0dz9yM7/EHa5JVX4lZqzutBg=; b=AVGWxPPsymLlenaYc/WTl8cNb+ TYVLtftCT54HEM6d0VP0Ll2REhggRj5pQN8f7fj26aQjf8JX+OJVu+nTV7v/gcs728Zq7T0Iowbu8 gJoyGLafYkhQZO7z853qaKTVMyVnqi803FMbcsdHfXZGi7zzgYR3e+agOwPUtUlw7/Hg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] libxl: fix population of the online vCPU bitmap for PVH Message-Id: Date: Tue, 21 May 2024 08:34:04 +0000 commit 9966e5413133157a630f7462518005fb898e582a Author: Roger Pau Monné AuthorDate: Tue May 21 10:23:27 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:23:27 2024 +0200 libxl: fix population of the online vCPU bitmap for PVH libxl passes some information to libacpi to create the ACPI table for a PVH guest, and among that information it's a bitmap of which vCPUs are online which can be less than the maximum number of vCPUs assigned to the domain. While the population of the bitmap is done correctly for HVM based on the number of online vCPUs, for PVH the population of the bitmap is done based on the number of maximum vCPUs allowed. This leads to all local APIC entries in the MADT being set as enabled, which contradicts the data in xenstore if vCPUs is different than maximum vCPUs. Fix by copying the internal libxl bitmap that's populated based on the vCPUs parameter. Reported-by: Arthur Borsboom Link: https://gitlab.com/libvirt/libvirt/-/issues/399 Reported-by: Leigh Brown Fixes: 14c0d328da2b ('libxl/acpi: Build ACPI tables for HVMlite guests') Signed-off-by: Roger Pau Monné Tested-by: Leigh Brown Acked-by: Andrew Cooper master commit: 5cc7347b04b2d0a3133754c7a9b936f614ec656a master date: 2024-05-11 00:13:43 +0100 --- tools/libs/light/libxl_x86_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libs/light/libxl_x86_acpi.c b/tools/libs/light/libxl_x86_acpi.c index 620f3c700c..5cf261bd67 100644 --- a/tools/libs/light/libxl_x86_acpi.c +++ b/tools/libs/light/libxl_x86_acpi.c @@ -89,7 +89,7 @@ static int init_acpi_config(libxl__gc *gc, uint32_t domid = dom->guest_domid; xc_domaininfo_t info; struct hvm_info_table *hvminfo; - int i, r, rc; + int r, rc; config->dsdt_anycpu = config->dsdt_15cpu = dsdt_pvh; config->dsdt_anycpu_len = config->dsdt_15cpu_len = dsdt_pvh_len; @@ -138,8 +138,8 @@ static int init_acpi_config(libxl__gc *gc, hvminfo->nr_vcpus = info.max_vcpu_id + 1; } - for (i = 0; i < hvminfo->nr_vcpus; i++) - hvminfo->vcpu_online[i / 8] |= 1 << (i & 7); + memcpy(hvminfo->vcpu_online, b_info->avail_vcpus.map, + b_info->avail_vcpus.size); config->hvminfo = hvminfo; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:34:16 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:34:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726672.1131019 (Exim 4.92) (envelope-from ) id 1s9Kwq-0000dh-Cn; Tue, 21 May 2024 08:34:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726672.1131019; Tue, 21 May 2024 08:34:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kwq-0000da-AA; Tue, 21 May 2024 08:34:16 +0000 Received: by outflank-mailman (input) for mailman id 726672; Tue, 21 May 2024 08:34:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kwo-0000dU-FM for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kwo-0007y9-Eb for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Kwo-0007Yw-Dx for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XzU1/v4HcX2ixQUivujwFwCkzE9o8IYB2+hoil2/dCs=; b=z4mh3OmxbA77Xsdgz4JRxyT2NQ nQqaZj0HX0BIKaqj1t/AlAvvTtXskVTxafrNJZLsQR8R9DUgpJSJgzhLADotwN5PPCihiQFOH0C9M P1pRXmQ/RdLRDVK4itljP0JEI2vgQIgEMFtK2u2HTwNvOgD2tyYBsYhhvb8OY0Of50d4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] libxl: Fix handling XenStore errors in device creation Message-Id: Date: Tue, 21 May 2024 08:34:14 +0000 commit 8271f0e8f23b63199caf0edcfe85ebc1c1412d1b Author: Demi Marie Obenour AuthorDate: Tue May 21 10:23:52 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:23:52 2024 +0200 libxl: Fix handling XenStore errors in device creation If xenstored runs out of memory it is possible for it to fail operations that should succeed. libxl wasn't robust against this, and could fail to ensure that the TTY path of a non-initial console was created and read-only for guests. This doesn't qualify for an XSA because guests should not be able to run xenstored out of memory, but it still needs to be fixed. Add the missing error checks to ensure that all errors are properly handled and that at no point can a guest make the TTY path of its frontend directory writable. Signed-off-by: Demi Marie Obenour Reviewed-by: Juergen Gross master commit: 531d3bea5e9357357eaf6d40f5784a1b4c29b910 master date: 2024-05-11 00:13:43 +0100 --- tools/libs/light/libxl_console.c | 11 +++--- tools/libs/light/libxl_device.c | 72 +++++++++++++++++++++++++--------------- tools/libs/light/libxl_xshelp.c | 13 +++++--- 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/tools/libs/light/libxl_console.c b/tools/libs/light/libxl_console.c index cd7412a327..a563c9d3c7 100644 --- a/tools/libs/light/libxl_console.c +++ b/tools/libs/light/libxl_console.c @@ -351,11 +351,10 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, flexarray_append(front, "protocol"); flexarray_append(front, LIBXL_XENCONSOLE_PROTOCOL); } - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - libxl__xs_kvs_of_flexarray(gc, ro_front)); - rc = 0; + rc = libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back), + libxl__xs_kvs_of_flexarray(gc, front), + libxl__xs_kvs_of_flexarray(gc, ro_front)); out: return rc; } @@ -665,6 +664,8 @@ int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid, */ if (!val) val = "/NO-SUCH-PATH"; channelinfo->u.pty.path = strdup(val); + if (channelinfo->u.pty.path == NULL) + abort(); break; default: break; diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index 13da6e0573..3035501f2c 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -177,8 +177,13 @@ int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, ro_frontend_perms[1].perms = backend_perms[1].perms = XS_PERM_READ; retry_transaction: - if (create_transaction) + if (create_transaction) { t = xs_transaction_start(ctx->xsh); + if (t == XBT_NULL) { + LOGED(ERROR, device->domid, "xs_transaction_start failed"); + return ERROR_FAIL; + } + } /* FIXME: read frontend_path and check state before removing stuff */ @@ -195,42 +200,55 @@ retry_transaction: if (rc) goto out; } - /* xxx much of this function lacks error checks! */ - if (fents || ro_fents) { - xs_rm(ctx->xsh, t, frontend_path); - xs_mkdir(ctx->xsh, t, frontend_path); + if (!xs_rm(ctx->xsh, t, frontend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, frontend_path)) + goto out; /* Console 0 is a special case. It doesn't use the regular PV * state machine but also the frontend directory has * historically contained other information, such as the * vnc-port, which we don't want the guest fiddling with. */ if ((device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) || - (device->kind == LIBXL__DEVICE_KIND_VUART)) - xs_set_permissions(ctx->xsh, t, frontend_path, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); - else - xs_set_permissions(ctx->xsh, t, frontend_path, - frontend_perms, ARRAY_SIZE(frontend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), - backend_path, strlen(backend_path)); - if (fents) - libxl__xs_writev_perms(gc, t, frontend_path, fents, - frontend_perms, ARRAY_SIZE(frontend_perms)); - if (ro_fents) - libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + (device->kind == LIBXL__DEVICE_KIND_VUART)) { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms))) + goto out; + } else { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + frontend_perms, ARRAY_SIZE(frontend_perms))) + goto out; + } + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), + backend_path, strlen(backend_path))) + goto out; + if (fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, fents, + frontend_perms, ARRAY_SIZE(frontend_perms)); + if (rc) goto out; + } + if (ro_fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + if (rc) goto out; + } } if (bents) { if (!libxl_only) { - xs_rm(ctx->xsh, t, backend_path); - xs_mkdir(ctx->xsh, t, backend_path); - xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, - ARRAY_SIZE(backend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), - frontend_path, strlen(frontend_path)); - libxl__xs_writev(gc, t, backend_path, bents); + if (!xs_rm(ctx->xsh, t, backend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, backend_path)) + goto out; + if (!xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, + ARRAY_SIZE(backend_perms))) + goto out; + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), + frontend_path, strlen(frontend_path))) + goto out; + rc = libxl__xs_writev(gc, t, backend_path, bents); + if (rc) goto out; } /* @@ -276,7 +294,7 @@ retry_transaction: out: if (create_transaction && t) libxl__xs_transaction_abort(gc, &t); - return rc; + return rc != 0 ? rc : ERROR_FAIL; } typedef struct { diff --git a/tools/libs/light/libxl_xshelp.c b/tools/libs/light/libxl_xshelp.c index 751cd942d9..a6e34ab10f 100644 --- a/tools/libs/light/libxl_xshelp.c +++ b/tools/libs/light/libxl_xshelp.c @@ -60,10 +60,15 @@ int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, for (i = 0; kvs[i] != NULL; i += 2) { path = GCSPRINTF("%s/%s", dir, kvs[i]); if (path && kvs[i + 1]) { - int length = strlen(kvs[i + 1]); - xs_write(ctx->xsh, t, path, kvs[i + 1], length); - if (perms) - xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + size_t length = strlen(kvs[i + 1]); + if (length > UINT_MAX) + return ERROR_FAIL; + if (!xs_write(ctx->xsh, t, path, kvs[i + 1], length)) + return ERROR_FAIL; + if (perms) { + if (!xs_set_permissions(ctx->xsh, t, path, perms, num_perms)) + return ERROR_FAIL; + } } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:34:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:34:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726673.1131024 (Exim 4.92) (envelope-from ) id 1s9Kx0-0000gD-Eu; Tue, 21 May 2024 08:34:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726673.1131024; Tue, 21 May 2024 08:34:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kx0-0000g5-Bm; Tue, 21 May 2024 08:34:26 +0000 Received: by outflank-mailman (input) for mailman id 726673; Tue, 21 May 2024 08:34:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kwy-0000fp-IR for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kwy-0007yR-Hg for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Kwy-0007aJ-Gv for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mNhlvtDK0E6OcG+eFRu9VdmIPt6jZDqchgPc4JgVGlw=; b=v+6vh/A4Zb+jFAavgClRIfuTKT 7KJFUiZTpsivcvGX+Gttv0R3wkE6DG9rKRzRdww9ojFTzg2ldojVNmC6NwS9zuiTmFa7jzxoKkWc9 RjP8rz8ORrvOUjuAoDM9kUaQGdFPoU6hE7LvFG9q9TW04lpoN3zNdIe8A6TbGmLCEogg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] xen/sched: set all sched_resource data inside locked region for new cpu Message-Id: Date: Tue, 21 May 2024 08:34:24 +0000 commit 3999b675cad5b717274d6493899b0eea8896f4d7 Author: Juergen Gross AuthorDate: Tue May 21 10:24:26 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:24:26 2024 +0200 xen/sched: set all sched_resource data inside locked region for new cpu When adding a cpu to a scheduler, set all data items of struct sched_resource inside the locked region, as otherwise a race might happen (e.g. when trying to access the cpupool of the cpu): (XEN) ----[ Xen-4.19.0-1-d x86_64 debug=y Tainted: H ]---- (XEN) CPU: 45 (XEN) RIP: e008:[] common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) RFLAGS: 0000000000010092 CONTEXT: hypervisor (XEN) rax: ffff82d040981618 rbx: ffff82d040981618 rcx: 0000000000000000 (XEN) rdx: 0000003ff68cd000 rsi: 000000000000002d rdi: ffff83103723d450 (XEN) rbp: ffff83207caa7d48 rsp: ffff83207caa7b98 r8: 0000000000000000 (XEN) r9: ffff831037253cf0 r10: ffff83103767c3f0 r11: 0000000000000009 (XEN) r12: ffff831037237990 r13: ffff831037237990 r14: ffff831037253720 (XEN) r15: 0000000000000000 cr0: 000000008005003b cr4: 0000000000f526e0 (XEN) cr3: 000000005bc2f000 cr2: 0000000000000010 (XEN) fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) Xen code around (common/sched/credit.c#csched_load_balance+0x41/0x877): (XEN) 48 8b 0c 10 48 8b 49 08 <48> 8b 79 10 48 89 bd b8 fe ff ff 49 8b 4e 28 48 (XEN) Xen call trace: (XEN) [] R common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) [] F common/sched/credit.c#csched_schedule+0x36a/0x69f (XEN) [] F common/sched/core.c#do_schedule+0xe8/0x433 (XEN) [] F common/sched/core.c#schedule+0x2e5/0x2f9 (XEN) [] F common/softirq.c#__do_softirq+0x94/0xbe (XEN) [] F do_softirq+0x13/0x15 (XEN) [] F arch/x86/domain.c#idle_loop+0x92/0xe6 (XEN) (XEN) Pagetable walk from 0000000000000010: (XEN) L4[0x000] = 000000103ff61063 ffffffffffffffff (XEN) L3[0x000] = 000000103ff60063 ffffffffffffffff (XEN) L2[0x000] = 0000001033dff063 ffffffffffffffff (XEN) L1[0x000] = 0000000000000000 ffffffffffffffff (XEN) (XEN) **************************************** (XEN) Panic on CPU 45: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000010 (XEN) **************************************** Reported-by: Andrew Cooper Fixes: a8c6c623192e ("sched: clarify use cases of schedule_cpu_switch()") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Tested-by: Andrew Cooper master commit: d104a07524ffc92ae7a70dfe192c291de2a563cc master date: 2024-05-15 19:59:52 +0100 --- xen/common/sched/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 34ad39b9ad..3c2403ebcf 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3179,6 +3179,8 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) sr->scheduler = new_ops; sr->sched_priv = ppriv; + sr->granularity = cpupool_get_granularity(c); + sr->cpupool = c; /* * Reroute the lock to the per pCPU lock as /last/ thing. In fact, @@ -3191,8 +3193,6 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) /* _Not_ pcpu_schedule_unlock(): schedule_lock has changed! */ spin_unlock_irqrestore(old_lock, flags); - sr->granularity = cpupool_get_granularity(c); - sr->cpupool = c; /* The cpu is added to a pool, trigger it to go pick up some work */ cpu_raise_softirq(cpu, SCHEDULE_SOFTIRQ); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:34:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:34:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726675.1131028 (Exim 4.92) (envelope-from ) id 1s9Kx9-0000k8-HH; Tue, 21 May 2024 08:34:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726675.1131028; Tue, 21 May 2024 08: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 1s9Kx9-0000k0-Em; Tue, 21 May 2024 08:34:35 +0000 Received: by outflank-mailman (input) for mailman id 726675; Tue, 21 May 2024 08:34:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kx8-0000ju-Mm for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Kx8-0007yb-M0 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Kx8-0007cH-KG for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ToxKBIQw6vY0JaPMRkfQvDRZSFb9Gv6L3yBWkiF+X+M=; b=d5fYXvKUGbXcnrL2Qwn6znq6r1 IT+9dRvJUCoU+CexDweWD2ceXejaaWCzPx4dzgdPc6252A04MdY+BsDkG3g07WWCiZkQ5mCyB+EDU GjlpLYgClIFQ3dd4jpOltITovM8W6g+lWaZxYc/+3JtOvkYY8i+st9PA1lwD0wtPqAs4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86: respect mapcache_domain_init() failing Message-Id: Date: Tue, 21 May 2024 08:34:34 +0000 commit dfabab2cd9461ef9d21a708461f35d2ae4b55220 Author: Jan Beulich AuthorDate: Tue May 21 10:25:08 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:25:08 2024 +0200 x86: respect mapcache_domain_init() failing The function itself properly handles and hands onwards failure from create_perdomain_mapping(). Therefore its caller should respect possible failure, too. Fixes: 4b28bf6ae90b ("x86: re-introduce map_domain_page() et al") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 7270fdc7a0028d4b7b26fd1b36c6b9e97abcf3da master date: 2024-05-15 19:59:52 +0100 --- xen/arch/x86/domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 307446273a..5feb0d0679 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -850,7 +850,8 @@ int arch_domain_create(struct domain *d, } else if ( is_pv_domain(d) ) { - mapcache_domain_init(d); + if ( (rc = mapcache_domain_init(d)) != 0 ) + goto fail; if ( (rc = pv_domain_initialise(d)) != 0 ) goto fail; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:34:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:34:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726678.1131031 (Exim 4.92) (envelope-from ) id 1s9KxJ-0000n9-In; Tue, 21 May 2024 08:34:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726678.1131031; Tue, 21 May 2024 08: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 1s9KxJ-0000n1-GB; Tue, 21 May 2024 08:34:45 +0000 Received: by outflank-mailman (input) for mailman id 726678; Tue, 21 May 2024 08:34:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KxI-0000mv-Rg for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KxI-0007z1-Qw for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9KxI-0007dN-OH for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jbbe836T21TQ7oQH7Lk0jpVJhV5Pi8A5562atTAPaUg=; b=fK8lQ3w/NKCUmadUVjfn0ptSbl RNrULi391KoA0jhGarG4zdBD48bEECtf5qdSm0MH1OelViltvkVQW2i4rO+YxAGtHIFuA4WQlSJaD li4DzYvz3Tpz6tBeU3zPMRT4AzFTlpo45+dQQWuGOetcKJLVm2iRIEbrkJ+E02EToT2M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] tools/xentop: Fix cpu% sort order Message-Id: Date: Tue, 21 May 2024 08:34:44 +0000 commit f3d20dd31770a70971f4f85521eec1e741d38695 Author: Leigh Brown AuthorDate: Tue May 21 10:25:30 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:25:30 2024 +0200 tools/xentop: Fix cpu% sort order In compare_cpu_pct(), there is a double -> unsigned long long converion when calling compare(). In C, this discards the fractional part, resulting in an out-of order sorting such as: NAME STATE CPU(sec) CPU(%) xendd --b--- 4020 5.7 icecream --b--- 2600 3.8 Domain-0 -----r 1060 1.5 neon --b--- 827 1.1 cheese --b--- 225 0.7 pizza --b--- 359 0.5 cassini --b--- 490 0.4 fusilli --b--- 159 0.2 bob --b--- 502 0.2 blender --b--- 121 0.2 bread --b--- 69 0.1 chickpea --b--- 67 0.1 lentil --b--- 67 0.1 Introduce compare_dbl() function and update compare_cpu_pct() to call it. Fixes: 49839b535b78 ("Add xenstat framework.") Signed-off-by: Leigh Brown Reviewed-by: Andrew Cooper master commit: e27fc7d15eab79e604e8b8728778594accc23cf1 master date: 2024-05-15 19:59:52 +0100 --- tools/xentop/xentop.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index 545bd5e96d..c2a311befe 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -85,6 +85,7 @@ static void set_delay(const char *value); static void set_prompt(const char *new_prompt, void (*func)(const char *)); static int handle_key(int); static int compare(unsigned long long, unsigned long long); +static int compare_dbl(double, double); static int compare_domains(xenstat_domain **, xenstat_domain **); static unsigned long long tot_net_bytes( xenstat_domain *, int); static bool tot_vbd_reqs(xenstat_domain *, int, unsigned long long *); @@ -422,6 +423,16 @@ static int compare(unsigned long long i1, unsigned long long i2) return 0; } +/* Compares two double precision numbers, returning -1,0,1 for <,=,> */ +static int compare_dbl(double d1, double d2) +{ + if (d1 < d2) + return -1; + if (d1 > d2) + return 1; + return 0; +} + /* Comparison function for use with qsort. Compares two domains using the * current sort field. */ static int compare_domains(xenstat_domain **domain1, xenstat_domain **domain2) @@ -523,7 +534,7 @@ static double get_cpu_pct(xenstat_domain *domain) static int compare_cpu_pct(xenstat_domain *domain1, xenstat_domain *domain2) { - return -compare(get_cpu_pct(domain1), get_cpu_pct(domain2)); + return -compare_dbl(get_cpu_pct(domain1), get_cpu_pct(domain2)); } /* Prints cpu percentage statistic */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 08:34:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 08:34:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726679.1131036 (Exim 4.92) (envelope-from ) id 1s9KxT-0000po-KV; Tue, 21 May 2024 08:34:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726679.1131036; Tue, 21 May 2024 08:34:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KxT-0000pg-Hd; Tue, 21 May 2024 08:34:55 +0000 Received: by outflank-mailman (input) for mailman id 726679; Tue, 21 May 2024 08:34:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KxS-0000pX-Uf for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9KxS-0007z8-Tu for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9KxS-0007eC-TB for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 08:34: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=nkbYqGn2zJR4rjw/+/KLrPB6T/34YcwsGky71JquGhA=; b=p2EU1fEQKi16k9VxwZ6ztgVKyG usJAl7GPTMMFl+AsJwENh2B0j7n88GBgvjaQCkzmeki4EllZKxLGKK7BLWD2f9tdKMUeAkL1Hfj3V d/5PNDiAW4T4lYHeHjATQXqwfYJg5ndtl/esMKzU4GlnXyXROmr7L7tm+GOkedYXT4vg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] x86/mtrr: avoid system wide rendezvous when setting AP MTRRs Message-Id: Date: Tue, 21 May 2024 08:34:54 +0000 commit 7cdb1fa2ab0b5e11f66cada0370770404153c824 Author: Roger Pau Monné AuthorDate: Tue May 21 10:25:39 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:25:39 2024 +0200 x86/mtrr: avoid system wide rendezvous when setting AP MTRRs There's no point in forcing a system wide update of the MTRRs on all processors when there are no changes to be propagated. On AP startup it's only the AP that needs to write the system wide MTRR values in order to match the rest of the already online CPUs. We have occasionally seen the watchdog trigger during `xen-hptool cpu-online` in one Intel Cascade Lake box with 448 CPUs due to the re-setting of the MTRRs on all the CPUs in the system. While there adjust the comment to clarify why the system-wide resetting of the MTRR registers is not needed for the purposes of mtrr_ap_init(). Signed-off-by: Roger Pau Monné Release-acked-by: Oleksii Kurochko Acked-by: Andrew Cooper master commit: abd00b037da5ffa4e8c4508a5df0cd6eabb805a4 master date: 2024-05-15 19:59:52 +0100 --- xen/arch/x86/cpu/mtrr/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index 90b235f57e..0a44ebbcb0 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -573,14 +573,15 @@ void mtrr_ap_init(void) if (!mtrr_if || hold_mtrr_updates_on_aps) return; /* - * Ideally we should hold mtrr_mutex here to avoid mtrr entries changed, - * but this routine will be called in cpu boot time, holding the lock - * breaks it. This routine is called in two cases: 1.very earily time - * of software resume, when there absolutely isn't mtrr entry changes; - * 2.cpu hotadd time. We let mtrr_add/del_page hold cpuhotplug lock to - * prevent mtrr entry changes + * hold_mtrr_updates_on_aps takes care of preventing unnecessary MTRR + * updates when batch starting the CPUs (see + * mtrr_aps_sync_{begin,end}()). + * + * Otherwise just apply the current system wide MTRR values to this AP. + * Note this doesn't require synchronization with the other CPUs, as + * there are strictly no modifications of the current MTRR values. */ - set_mtrr(~0U, 0, 0, 0); + mtrr_set_all(); } /** -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726746.1131096 (Exim 4.92) (envelope-from ) id 1s9MSX-0007d7-FR; Tue, 21 May 2024 10:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726746.1131096; Tue, 21 May 2024 10:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSX-0007cy-CY; Tue, 21 May 2024 10:11:05 +0000 Received: by outflank-mailman (input) for mailman id 726746; Tue, 21 May 2024 10:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSW-0007cs-4s for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSW-0001H9-2P for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MSW-0005CY-1K for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XQ4Hhqym4A0fbnzYTigOX6MCwtCu2Dm30tBSVENFedI=; b=Mv90a2Btg3p8fIZapsP5aihZmL 2KU6pjwcZdYfJ8UsjJH7tUGjl51rS8g2egZep+zsqsP3hP2rKdt9tODUuwRbHpDYsfd/w7I7irQSh KQYXc4M5v6ExU+GTVNnAhKhrI8OjidE5kTiNk7OVpJ44YZx0PJhY0Yxor97AM6k8VRLA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.18] update Xen version to 4.18.3-pre Message-Id: Date: Tue, 21 May 2024 10:11:04 +0000 commit 01f7a3c792241d348a4e454a30afdf6c0d6cd71c Author: Jan Beulich AuthorDate: Tue May 21 11:52:11 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:52:11 2024 +0200 update Xen version to 4.18.3-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 657f6fa4e3..786ab61600 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 ?= .2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:11:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726747.1131098 (Exim 4.92) (envelope-from ) id 1s9MSh-0007ev-GY; Tue, 21 May 2024 10:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726747.1131098; Tue, 21 May 2024 10:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSh-0007eo-Dy; Tue, 21 May 2024 10:11:15 +0000 Received: by outflank-mailman (input) for mailman id 726747; Tue, 21 May 2024 10:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSg-0007ei-MV for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSg-0001HH-Jp for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MSg-0005FN-Io for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gaqwV8vrPvNEDGLiU/URfIcAK4vqZYo0/uAzMbl+Bxw=; b=5Hwyb8EuhmP5PKoXFXOO42Y+Zq hEmZ17PJKEiC+7h8hoES1CAkvjj/gpLuw8xE3ij9IiAbcwwctvX/Lfe1yAKHuNgcsJdaN3w9dJHqj ZitS/UxO01v8g9ZE/2Kvt6hjdsTPaZ9WGj4ksAurREOWomoiAYrgJt1tX+Ta8Tm15CAE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] update Xen version to 4.17.5-pre Message-Id: Date: Tue, 21 May 2024 10:11:14 +0000 commit f772bab69e02474f447007e2dd713034b69f0098 Author: Jan Beulich AuthorDate: Tue May 21 11:53:11 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:53:11 2024 +0200 update Xen version to 4.17.5-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 6f9c407332..dfb3686d3b 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 = 17 -export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:11:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726748.1131103 (Exim 4.92) (envelope-from ) id 1s9MSr-0007i4-IM; Tue, 21 May 2024 10:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726748.1131103; Tue, 21 May 2024 10:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSr-0007hw-Fc; Tue, 21 May 2024 10:11:25 +0000 Received: by outflank-mailman (input) for mailman id 726748; Tue, 21 May 2024 10:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSq-0007he-Pl for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MSq-0001HV-Ow for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MSq-0005Fs-M2 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=w+2nnQlqq9SpziPmXWnP81p02yRoAbOyWsGcx6ov8go=; b=5qDTfvq4cOkO50C6CWRF3s+TP3 4cHH+xqNC1qKccPSu7hkDfLVt3NCMy5SNPDkNAGi9tVrfDjT07DN60mNJCQbZd+S7Ez4rM8MeuTAd Khz5wm1mOmlCFZZ1zuFDBGq5kxG7sU1cW22ZHAfSE2PZQh+gM7fTSvEPZin097W6NAyI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] block-common: Fix same_vm for no targets Message-Id: Date: Tue, 21 May 2024 10:11:24 +0000 commit 20443648649a499f1f5fcbe991a4ff35d31630f0 Author: Jason Andryuk AuthorDate: Tue May 21 11:53:54 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:53:54 2024 +0200 block-common: Fix same_vm for no targets same_vm is broken when the two main domains do not have targets. otvm and targetvm are both missing, which means they get set to -1 and then converted to empty strings: ++10697+ local targetvm=-1 ++10697+ local otvm=-1 ++10697+ otvm= ++10697+ othervm=/vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 ++10697+ targetvm= ++10697+ local frontend_uuid=/vm/844dea4e-44f8-4e3e-8145-325132a31ca5 The final comparison returns true since the two empty strings match: ++10697+ '[' /vm/844dea4e-44f8-4e3e-8145-325132a31ca5 = /vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 -o '' = /vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 -o /vm/844dea4e-44f8-4e3e-8145-325132a31ca5 = '' -o '' = '' ']' Replace -1 with distinct strings indicating the lack of a value and remove the collescing to empty stings. The strings themselves will no longer match, and that is correct. ++12364+ '[' /vm/844dea4e-44f8-4e3e-8145-325132a31ca5 = /vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 -o 'No target' = /vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 -o /vm/844dea4e-44f8-4e3e-8145-325132a31ca5 = 'No other target' -o 'No target' = 'No other target' ']' Signed-off-by: Jason Andryuk Reviewed-by: Anthony PERARD master commit: e8f1bb803fdf44db708991593568a9e3e6b3d130 master date: 2024-02-07 13:46:52 +0100 --- tools/hotplug/Linux/block-common.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/block-common.sh b/tools/hotplug/Linux/block-common.sh index f86a88c4eb..5c80237d99 100644 --- a/tools/hotplug/Linux/block-common.sh +++ b/tools/hotplug/Linux/block-common.sh @@ -112,14 +112,12 @@ same_vm() "$FRONTEND_UUID") local target=$(xenstore_read_default "/local/domain/$FRONTEND_ID/target" \ "-1") - local targetvm=$(xenstore_read_default "/local/domain/$target/vm" "-1") + local targetvm=$(xenstore_read_default "/local/domain/$target/vm" "No Target") local otarget=$(xenstore_read_default "/local/domain/$otherdom/target" \ "-1") local otvm=$(xenstore_read_default "/local/domain/$otarget/vm" \ - "-1") - otvm=${otvm%-1} - othervm=${othervm%-1} - targetvm=${targetvm%-1} + "No Other Target") + local frontend_uuid=${FRONTEND_UUID%-1} [ "$frontend_uuid" = "$othervm" -o "$targetvm" = "$othervm" -o \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:11:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:11:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726749.1131107 (Exim 4.92) (envelope-from ) id 1s9MT1-0007l8-K5; Tue, 21 May 2024 10:11:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726749.1131107; Tue, 21 May 2024 10:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MT1-0007kw-H6; Tue, 21 May 2024 10:11:35 +0000 Received: by outflank-mailman (input) for mailman id 726749; Tue, 21 May 2024 10:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MT0-0007ko-St for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MT0-0001JE-S7 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MT0-0005GP-RA for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZjYGiB1CKvAYXKjPF0Gb8Bav4PTos2HNp+/VoYSB2Z4=; b=SAplBZS98ssuiiMSZgBdH1JSAD CQur4sLecuKGfXCrBzz7X3Xbuf61PC8HNZ5uI+34MEutQO2yhpyCxz77Fe8FPvE50vGHtzDxXJtgI ztVbOgl9erpKwSRgMX1sz3oMFb+hyCg1m1+PyGUIcfsP3GgWGJuGBPm+qLrzi4HN84HY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/hvm: Fix Misra Rule 19.1 regression Message-Id: Date: Tue, 21 May 2024 10:11:34 +0000 commit ae19cd743c0f8deda0381a19911b01f8c19cf843 Author: Andrew Cooper AuthorDate: Tue May 21 11:54:20 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:54:20 2024 +0200 x86/hvm: Fix Misra Rule 19.1 regression Despite noticing an impending Rule 19.1 violation, the adjustment made (the uint32_t cast) wasn't sufficient to avoid it. Try again. Subsequently noticed by Coverity too. Fixes: 6a98383b0877 ("x86/HVM: clear upper halves of GPRs upon entry from 32-bit code") Coverity-IDs: 1596289 thru 1596298 Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini master commit: d0a718a45f14b86471d8eb3083acd72760963470 master date: 2024-04-11 13:23:08 +0100 --- xen/arch/x86/include/asm/hvm/hvm.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index d67565dcb9..e16f9f3489 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -589,16 +589,16 @@ static inline void hvm_sanitize_regs_fields(struct cpu_user_regs *regs, if ( compat ) { /* Clear GPR upper halves, to counteract guests playing games. */ - regs->rbp = (uint32_t)regs->ebp; - regs->rbx = (uint32_t)regs->ebx; - regs->rax = (uint32_t)regs->eax; - regs->rcx = (uint32_t)regs->ecx; - regs->rdx = (uint32_t)regs->edx; - regs->rsi = (uint32_t)regs->esi; - regs->rdi = (uint32_t)regs->edi; - regs->rip = (uint32_t)regs->eip; - regs->rflags = (uint32_t)regs->eflags; - regs->rsp = (uint32_t)regs->esp; + regs->rbp = (uint32_t)regs->rbp; + regs->rbx = (uint32_t)regs->rbx; + regs->rax = (uint32_t)regs->rax; + regs->rcx = (uint32_t)regs->rcx; + regs->rdx = (uint32_t)regs->rdx; + regs->rsi = (uint32_t)regs->rsi; + regs->rdi = (uint32_t)regs->rdi; + regs->rip = (uint32_t)regs->rip; + regs->rflags = (uint32_t)regs->rflags; + regs->rsp = (uint32_t)regs->rsp; } #ifndef NDEBUG -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:11:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:11:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726752.1131110 (Exim 4.92) (envelope-from ) id 1s9MTB-0007nx-LD; Tue, 21 May 2024 10:11:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726752.1131110; Tue, 21 May 2024 10:11: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 1s9MTB-0007nq-IX; Tue, 21 May 2024 10:11:45 +0000 Received: by outflank-mailman (input) for mailman id 726752; Tue, 21 May 2024 10:11:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTA-0007ng-Vi for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTA-0001Jh-Uv for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MTA-0005Gq-UC for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=17HOxEs/LUJTCRyZGqxRLHRhahORhU4TlgamfTeq3bk=; b=aT/zamgB0W5YHPmvCHav/g2hTh dWFVFF0RQpPhro/JMR3Sn/kitRKL9WY2L7pr2jjGVYCXKgzw42V2qV00NCMcbBG+PXtAizOKl9lit WnKg/1oreuyR/LePG0u15e6LZrYLelp7C9RtijlPbb4LQ1G+NdNcZevmYHHdYXcL/nVE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] altcall: fix __alt_call_maybe_initdata so it's safe for livepatch Message-Id: Date: Tue, 21 May 2024 10:11:44 +0000 commit 8d1c36d25a777bed97a8b5da0128fa7b9320f911 Author: Roger Pau Monné AuthorDate: Tue May 21 11:55:09 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:55:09 2024 +0200 altcall: fix __alt_call_maybe_initdata so it's safe for livepatch Setting alternative call variables as __init is not safe for use with livepatch, as livepatches can rightfully introduce new alternative calls to structures marked as __alt_call_maybe_initdata (possibly just indirectly due to replacing existing functions that use those). Attempting to resolve those alternative calls then results in page faults as the variable that holds the function pointer address has been freed. When livepatch is supported use the __ro_after_init attribute instead of __initdata for __alt_call_maybe_initdata. Fixes: f26bb285949b ('xen: Implement xen/alternative-call.h for use in common code') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper master commit: af4cd0a6a61cdb03bc1afca9478b05b0c9703599 master date: 2024-04-11 18:51:36 +0100 --- xen/include/xen/alternative-call.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/alternative-call.h b/xen/include/xen/alternative-call.h index 5c6b9a562b..10f7d7637e 100644 --- a/xen/include/xen/alternative-call.h +++ b/xen/include/xen/alternative-call.h @@ -50,7 +50,12 @@ #include -#define __alt_call_maybe_initdata __initdata +#ifdef CONFIG_LIVEPATCH +/* Must keep for livepatches to resolve alternative calls. */ +# define __alt_call_maybe_initdata __ro_after_init +#else +# define __alt_call_maybe_initdata __initdata +#endif #else -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:11:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:11:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726754.1131116 (Exim 4.92) (envelope-from ) id 1s9MTL-0007rH-PG; Tue, 21 May 2024 10:11:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726754.1131116; Tue, 21 May 2024 10:11: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 1s9MTL-0007rA-Ly; Tue, 21 May 2024 10:11:55 +0000 Received: by outflank-mailman (input) for mailman id 726754; Tue, 21 May 2024 10:11:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTL-0007qy-2e for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTL-0001Js-1m for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MTL-0005HJ-0p for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:11:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0OARQYjKX558lw5MfmjPr9XBz09eIiAbNcNSZYtRhxw=; b=Msg7vhtXrc6dTLCaUtkItDunUz MP6Zhi83PAHl2Y0Jtr4a90wlFrkeX36Y74/rSxxcOz6goHEJ/OgjuqAiBaXEK/2KGWrUM9tX+u5NF cseV59KFq7n5oUKBm7kdzcpdEk1ZoAgqehkoy1kacGY5EzGPK/fxZpe4cvXY1sHjcvQ4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/rtc: Avoid UIP flag being set for longer than expected Message-Id: Date: Tue, 21 May 2024 10:11:55 +0000 commit ef9f147af614a259e54720a133232a1c67dac6c8 Author: Ross Lagerwall AuthorDate: Tue May 21 11:55:49 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:55:49 2024 +0200 x86/rtc: Avoid UIP flag being set for longer than expected In a test, OVMF reported an error initializing the RTC without indicating the precise nature of the error. The only plausible explanation I can find is as follows: As part of the initialization, OVMF reads register C and then reads register A repatedly until the UIP flag is not set. If this takes longer than 100 ms, OVMF fails and reports an error. This may happen with the following sequence of events: At guest time=0s, rtc_init() calls check_update_timer() which schedules update_timer for t=(1 - 244us). At t=1s, the update_timer function happens to have been called >= 244us late. In the timer callback, it sets the UIP flag and schedules update_timer2 for t=1s. Before update_timer2 runs, the guest reads register C which calls check_update_timer(). check_update_timer() stops the scheduled update_timer2 and since the guest time is now outside of the update cycle, it schedules update_timer for t=(2 - 244us). The UIP flag will therefore be set for a whole second from t=1 to t=2 while the guest repeatedly reads register A waiting for the UIP flag to clear. Fix it by clearing the UIP flag when scheduling update_timer. I was able to reproduce this issue with a synthetic test and this resolves the issue. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: 43a07069863b419433dee12c9b58c1f7ce70aa97 master date: 2024-04-23 14:09:18 +0200 --- xen/arch/x86/hvm/rtc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d21925db08..f582280637 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -203,6 +203,7 @@ static void check_update_timer(RTCState *s) } else { + s->hw.cmos_data[RTC_REG_A] &= ~RTC_UIP; next_update_time = (USEC_PER_SEC - guest_usec - 244) * NS_PER_USEC; expire_time = NOW() + next_update_time; s->next_update_time = expire_time; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:12:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:12:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726756.1131119 (Exim 4.92) (envelope-from ) id 1s9MTW-0007vN-QA; Tue, 21 May 2024 10:12:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726756.1131119; Tue, 21 May 2024 10:12:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTW-0007vG-NU; Tue, 21 May 2024 10:12:06 +0000 Received: by outflank-mailman (input) for mailman id 726756; Tue, 21 May 2024 10:12:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTV-0007v3-6d for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTV-0001KC-5p for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MTV-0005Ig-46 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zug3FnvtyJuoIs8N1ELBRfYPy10e7ymiIcMX6Wn2S6k=; b=1WGRWDZeUYz2QylEXkBd1nwk0Y QN93lA9nI31FVCs0BjKixKrFEuu13JKg1ngmlX83Sd5fKJkw1RFBhj7SdIXh75klD6rLkuxoHjvj8 wLDvZP8cZm3PBH27fbBVP/DQCYEpxk+lSpwaWYCPeLw51CUtY190zPTm9o2oQRRy5riM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] xen/xsm: Wire up get_dom0_console Message-Id: Date: Tue, 21 May 2024 10:12:05 +0000 commit 9cef77400470604e76c6c3aa9f647c40429ff956 Author: Jason Andryuk AuthorDate: Tue May 21 11:57:20 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:57:20 2024 +0200 xen/xsm: Wire up get_dom0_console An XSM hook for get_dom0_console is currently missing. Using XSM with a PVH dom0 shows: (XEN) FLASK: Denying unknown platform_op: 64. Wire up the hook, and allow it for dom0. Fixes: 4dd160583c ("x86/platform: introduce hypercall to get initial video console settings") Signed-off-by: Jason Andryuk Acked-by: Daniel P. Smith master commit: 647f7e50ebeeb8152974cad6a12affe474c74513 master date: 2024-04-30 08:33:41 +0200 --- tools/flask/policy/modules/dom0.te | 2 +- xen/xsm/flask/hooks.c | 4 ++++ xen/xsm/flask/policy/access_vectors | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index f1dcff48e2..16b8c9646d 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - coverage_op + coverage_op get_dom0_console }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 78225f68c1..5e88c71b8e 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1558,6 +1558,10 @@ static int cf_check flask_platform_op(uint32_t op) return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, SECCLASS_XEN2, XEN2__GET_SYMBOL, NULL); + case XENPF_get_dom0_console: + return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, + SECCLASS_XEN2, XEN2__GET_DOM0_CONSOLE, NULL); + default: return avc_unknown_permission("platform_op", op); } diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 4e6710a63e..a35e3d4c51 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,6 +99,8 @@ class xen2 livepatch_op # XEN_SYSCTL_coverage_op coverage_op +# XENPF_get_dom0_console + get_dom0_console } # Classes domain and domain2 consist of operations that a domain performs on -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:12:17 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:12:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726758.1131122 (Exim 4.92) (envelope-from ) id 1s9MTg-0007yK-RN; Tue, 21 May 2024 10:12:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726758.1131122; Tue, 21 May 2024 10:12:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTg-0007yD-Ow; Tue, 21 May 2024 10:12:16 +0000 Received: by outflank-mailman (input) for mailman id 726758; Tue, 21 May 2024 10:12:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTf-0007y0-A0 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTf-0001KP-9A for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MTf-0005JM-8A for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DS8823Aign1L/QNIjKehDFFqPFZ9KVVFIvjoj0DvPkQ=; b=GCZbU7Nv3DIqEupbnOQXaASc1x sbEVhPzBnMTdqY2XgOumMEiTmPe4byhND56V5bZ4PmJpuN3XbTMmJ4qFwueprWa5up0Ic3Bm9Ccc/ Pf2oG5VPbQ8O6hBT3vwQIKk5XiWQJ8KlcC/d7R2ZF/5Ocs4hEvuUTjGSwHr+Tnk13umg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] xen/x86: Fix Syntax warning in gen-cpuid.py Message-Id: Date: Tue, 21 May 2024 10:12:15 +0000 commit 910e9a73c447cce26ceab90659b6ee0615a5fba6 Author: Jason Andryuk AuthorDate: Tue May 21 11:57:41 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:57:41 2024 +0200 xen/x86: Fix Syntax warning in gen-cpuid.py Python 3.12.2 warns: xen/tools/gen-cpuid.py:50: SyntaxWarning: invalid escape sequence '\s' "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" xen/tools/gen-cpuid.py:51: SyntaxWarning: invalid escape sequence '\s' "\s+/\*([\w!]*) .*$") Specify the strings as raw strings so '\s' is read as literal '\' + 's'. This avoids escaping all the '\'s in the strings. Signed-off-by: Jason Andryuk Acked-by: Andrew Cooper master commit: 08e79bba73d74a85d3ce6ff0f91c5205f1e05eda master date: 2024-04-30 08:34:37 +0200 --- xen/tools/gen-cpuid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index a7c2ba3e5d..415b8b1d68 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -47,8 +47,8 @@ def parse_definitions(state): """ feat_regex = re.compile( r"^XEN_CPUFEATURE\(([A-Z0-9_]+)," - "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" - "\s+/\*([\w!]*) .*$") + r"\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" + r"\s+/\*([\w!]*) .*$") word_regex = re.compile( r"^/\* .* word (\d*) \*/$") -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:12:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:12:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726760.1131127 (Exim 4.92) (envelope-from ) id 1s9MTq-000812-T6; Tue, 21 May 2024 10:12:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726760.1131127; Tue, 21 May 2024 10:12:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTq-00080u-QQ; Tue, 21 May 2024 10:12:26 +0000 Received: by outflank-mailman (input) for mailman id 726760; Tue, 21 May 2024 10:12:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTp-00080g-Cy for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTp-0001KZ-C8 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MTp-0005K0-BI for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1HzQ0DbgAJkhSabJLRpbea/p1NOdror8q52LSMPtUxc=; b=wnhwHiFXC+QdLU/vEQFOAfonZQ p6nsWXIvVKbaFhF3IC066WSCexrS4iCzxRzDqEGW1TzRRp8oSjdVfF7FQ3bajsDepaoRy2jkoTLrC Wt033IBF3s5Ezj/z+NICqEKRHdrNBjYPSmfVykaGKOmTd4ijMTcUW42a74h3P419GZA8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] VT-d: correct ATS checking for root complex integrated devices Message-Id: Date: Tue, 21 May 2024 10:12:25 +0000 commit fdeacd43848e4ad9b2d33913351fb814567a714a Author: Jan Beulich AuthorDate: Tue May 21 11:58:17 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:58:17 2024 +0200 VT-d: correct ATS checking for root complex integrated devices Spec version 4.1 says "The ATSR structures identifies PCI Express Root-Ports supporting Address Translation Services (ATS) transactions. Software must enable ATS on endpoint devices behind a Root Port only if the Root Port is reported as supporting ATS transactions." Clearly root complex integrated devices aren't "behind root ports", matching my observation on a SapphireRapids system having an ATS- capable root complex integrated device. Hence for such devices we shouldn't try to locate a corresponding ATSR. Since both pci_find_ext_capability() and pci_find_cap_offset() return "unsigned int", change "pos" to that type at the same time. Fixes: 903b93211f56 ("[VTD] laying the ground work for ATS") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 04e31583bab97e5042a44a1d00fce2760272635f master date: 2024-05-06 09:22:45 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index 04d702b1d6..9d65b4896a 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -44,7 +44,7 @@ struct acpi_drhd_unit *find_ats_dev_drhd(struct vtd_iommu *iommu) int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) { struct acpi_drhd_unit *ats_drhd; - int pos; + unsigned int pos, expfl = 0; if ( !ats_enabled || !iommu_qinval ) return 0; @@ -53,7 +53,13 @@ int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) !ecap_dev_iotlb(drhd->iommu->ecap) ) return 0; - if ( !acpi_find_matched_atsr_unit(pdev) ) + pos = pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), + PCI_FUNC(pdev->devfn), PCI_CAP_ID_EXP); + if ( pos ) + expfl = pci_conf_read16(pdev->sbdf, pos + PCI_EXP_FLAGS); + + if ( MASK_EXTR(expfl, PCI_EXP_FLAGS_TYPE) != PCI_EXP_TYPE_RC_END && + !acpi_find_matched_atsr_unit(pdev) ) return 0; ats_drhd = find_ats_dev_drhd(drhd->iommu); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:12:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:12:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726763.1131131 (Exim 4.92) (envelope-from ) id 1s9MU0-00084M-UU; Tue, 21 May 2024 10:12:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726763.1131131; Tue, 21 May 2024 10:12:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MU0-00084E-Rr; Tue, 21 May 2024 10:12:36 +0000 Received: by outflank-mailman (input) for mailman id 726763; Tue, 21 May 2024 10:12:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTz-00083z-Fi for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MTz-0001Kk-F2 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MTz-0005KV-EJ for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FlkFHLMEiSnzOOcG3mXeQS29u6yRmUDIxAktfaWCXsQ=; b=RGG9NWlJNEgheYdTs1lI3seTxZ b6rn4tyKQkTrULmNP1HO1K613RGNAKw7oDKQO5UJ4nVUSXtgrlDpk74Db1z0Hn5tmaB+bktz+qF/y AT5stXoV6TOeojex+BpkqjqrNYL17uD23tD+xfqUS6ZCQMCDqpYqQ1Y8pZaQEt/1hyFM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC Message-Id: Date: Tue, 21 May 2024 10:12:35 +0000 commit 5305b3b4f38d0824a656150703c41c6c17698eaa Author: Andrew Cooper AuthorDate: Tue May 21 11:58:47 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:58:47 2024 +0200 tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC The header description for xs_open() goes as far as to suggest that the fd is O_CLOEXEC, but it isn't actually. `xl devd` has been observed leaking /dev/xen/xenbus into children. Link: https://github.com/QubesOS/qubes-issues/issues/8292 Reported-by: Demi Marie Obenour Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross master commit: f4f2f3402b2f4985d69ffc0d46f845d05fd0b60f master date: 2024-05-07 15:18:36 +0100 --- tools/libs/store/xs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 7a9a8b1656..b5933fb108 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -54,6 +54,10 @@ struct xs_stored_msg { #include #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + struct xs_handle { /* Communications channel to xenstore daemon. */ int fd; @@ -227,7 +231,7 @@ error: static int get_dev(const char *connect_to) { /* We cannot open read-only because requests are writes */ - return open(connect_to, O_RDWR); + return open(connect_to, O_RDWR | O_CLOEXEC); } static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:12:47 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:12:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726764.1131135 (Exim 4.92) (envelope-from ) id 1s9MUA-00087B-W8; Tue, 21 May 2024 10:12:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726764.1131135; Tue, 21 May 2024 10:12:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUA-000871-TM; Tue, 21 May 2024 10:12:46 +0000 Received: by outflank-mailman (input) for mailman id 726764; Tue, 21 May 2024 10:12:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MU9-00086j-Ie for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MU9-0001LE-Hw for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MU9-0005L2-H7 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HJrNWms2jvk0aRh4QxH0rmoApb+qf54J5zaX5TlE7Yw=; b=Omqhq7kO6zbytQzytm/6sUeUj2 4iStqZ5kspm4k7KQsKydB7KgQT4B7BRvO9t3byGnHRHGAzFxjKYCLAH7IM5AfDk0vqEUnVRs6T5G1 7/fZr6QNghkmZ+khsNfOktDzY0i4gHJXPYKeZsm6qmnhAzdC8nbrP3rOo17GGdH6KDKI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Message-Id: Date: Tue, 21 May 2024 10:12:45 +0000 commit c5c46464704d4b96a57bcbf4718e092d6233d913 Author: Andrew Cooper AuthorDate: Tue May 21 11:59:09 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:59:09 2024 +0200 x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Ever since Xen 4.14, there has been a latent bug with migration. While some toolstacks can level the features properly, they don't shink feat.max_subleaf when all features have been dropped. This is because we *still* have not completed the toolstack side work for full CPU Policy objects. As a consequence, even when properly feature levelled, VMs can't migrate "backwards" across hardware which reduces feat.max_subleaf. One such example is Ice Lake (max_subleaf=2 for INTEL_PSFD) to Cascade Lake (max_subleaf=0). Extend the max policies feat.max_subleaf to the hightest number Xen knows about, but leave the default policies matching the host. This will allow VMs with a higher feat.max_subleaf than strictly necessary to migrate in. Eventually we'll manage to teach the toolstack how to avoid creating such VMs in the first place, but there's still more work to do there. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: a2330b51df267e20e66bbba6c5bf08f0570ed58b master date: 2024-05-07 16:56:46 +0100 --- xen/arch/x86/cpu-policy.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index e44de3cfcb..c813df35cb 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -596,6 +596,13 @@ static void __init calculate_pv_max_policy(void) unsigned int i; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -636,6 +643,10 @@ static void __init calculate_pv_def_policy(void) unsigned int i; *p = pv_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -672,6 +683,13 @@ static void __init calculate_hvm_max_policy(void) const uint32_t *mask; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? @@ -758,6 +776,10 @@ static void __init calculate_hvm_def_policy(void) const uint32_t *mask; *p = hvm_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:12:57 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:12:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726767.1131139 (Exim 4.92) (envelope-from ) id 1s9MUL-00089w-1I; Tue, 21 May 2024 10:12:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726767.1131139; Tue, 21 May 2024 10:12:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUK-00089p-Un; Tue, 21 May 2024 10:12:56 +0000 Received: by outflank-mailman (input) for mailman id 726767; Tue, 21 May 2024 10:12:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUJ-00089e-LU for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUJ-0001LP-Kq for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MUJ-0005M1-K9 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:12:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DjwXQK+N/sLXZ9yRI9FT5OCXDr/J4my9Ia6nqzwc6Nk=; b=HuQWcDaeNG8ofk3vXpjohyq6lQ H6DcU3hQI9f5vCn32YcS8vsSAM4k8gInVCwu3hvnZXEbAlc4SINImGQOYlDghXi52qcGVEVlmpS3Z FHR44pRpDCcu076NoCqBWrT+9wCn4wG+S3PoMOR2NhyRcUfQ76WPrBdpeqWQkNMDD6hk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/ucode: Distinguish "ucode already up to date" Message-Id: Date: Tue, 21 May 2024 10:12:55 +0000 commit df095962ac6c07d40a3ad855f3f533e127490691 Author: Andrew Cooper AuthorDate: Tue May 21 11:59:36 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:59:36 2024 +0200 x86/ucode: Distinguish "ucode already up to date" Right now, Xen returns -ENOENT for both "the provided blob isn't correct for this CPU", and "the blob isn't newer than what's loaded". This in turn causes xen-ucode to exit with an error, when "nothing to do" is more commonly a success condition. Handle EEXIST specially and exit cleanly. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: 648db37a155aca6f66d4cf3bb118417a728c3579 master date: 2024-05-09 18:19:49 +0100 --- tools/misc/xen-ucode.c | 5 ++++- xen/arch/x86/cpu/microcode/core.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index ad32face2b..de31c393f0 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -60,8 +60,11 @@ int main(int argc, char *argv[]) exit(1); } + errno = 0; ret = xc_microcode_update(xch, buf, len); - if ( ret ) + if ( ret == -1 && errno == EEXIST ) + printf("Microcode already up to date\n"); + else if ( ret ) { fprintf(stderr, "Failed to update microcode. (err: %s)\n", strerror(errno)); diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index b204b95f8f..667b1baf91 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -637,7 +637,7 @@ static long cf_check microcode_update_helper(void *data) "microcode: couldn't find any newer%s revision in the provided blob!\n", opt_ucode_allow_same ? " (or the same)" : ""); microcode_free_patch(patch); - ret = -ENOENT; + ret = -EEXIST; goto put; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:13:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:13:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726770.1131143 (Exim 4.92) (envelope-from ) id 1s9MUV-0008DV-4G; Tue, 21 May 2024 10:13:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726770.1131143; Tue, 21 May 2024 10:13:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUV-0008DN-1S; Tue, 21 May 2024 10:13:07 +0000 Received: by outflank-mailman (input) for mailman id 726770; Tue, 21 May 2024 10:13:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUT-0008D7-OK for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUT-0001Lm-NZ for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MUT-0005Mk-Mu for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cMw253gx5/THAUAXQzD7Go9HHl2Eq7emnUpTFM3LW+g=; b=LnUsBTQQoG4Dc5/8OLLYpESRVK pRx3cITsePjsPWnEm73o17xJzK1oxtOyVJ9Te3msmcAAV/t/H/h2cLH3Jnqhv191sbYc+u4boe9mR 1PC5kfVaw6HzpQOt91rfpGObbXJcH0Iv1obUemuvq5Qpqi8yDHBu+N+/HkPODLK2Z1I8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] libxl: fix population of the online vCPU bitmap for PVH Message-Id: Date: Tue, 21 May 2024 10:13:05 +0000 commit 3020a20cd9de092c71bfac49a6f018a7502df31f Author: Roger Pau Monné AuthorDate: Tue May 21 12:00:09 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:00:09 2024 +0200 libxl: fix population of the online vCPU bitmap for PVH libxl passes some information to libacpi to create the ACPI table for a PVH guest, and among that information it's a bitmap of which vCPUs are online which can be less than the maximum number of vCPUs assigned to the domain. While the population of the bitmap is done correctly for HVM based on the number of online vCPUs, for PVH the population of the bitmap is done based on the number of maximum vCPUs allowed. This leads to all local APIC entries in the MADT being set as enabled, which contradicts the data in xenstore if vCPUs is different than maximum vCPUs. Fix by copying the internal libxl bitmap that's populated based on the vCPUs parameter. Reported-by: Arthur Borsboom Link: https://gitlab.com/libvirt/libvirt/-/issues/399 Reported-by: Leigh Brown Fixes: 14c0d328da2b ('libxl/acpi: Build ACPI tables for HVMlite guests') Signed-off-by: Roger Pau Monné Tested-by: Leigh Brown Acked-by: Andrew Cooper master commit: 5cc7347b04b2d0a3133754c7a9b936f614ec656a master date: 2024-05-11 00:13:43 +0100 --- tools/libs/light/libxl_x86_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libs/light/libxl_x86_acpi.c b/tools/libs/light/libxl_x86_acpi.c index 57a6b63790..3b16c1e70f 100644 --- a/tools/libs/light/libxl_x86_acpi.c +++ b/tools/libs/light/libxl_x86_acpi.c @@ -89,7 +89,7 @@ static int init_acpi_config(libxl__gc *gc, uint32_t domid = dom->guest_domid; xc_dominfo_t info; struct hvm_info_table *hvminfo; - int i, r, rc; + int r, rc; config->dsdt_anycpu = config->dsdt_15cpu = dsdt_pvh; config->dsdt_anycpu_len = config->dsdt_15cpu_len = dsdt_pvh_len; @@ -138,8 +138,8 @@ static int init_acpi_config(libxl__gc *gc, hvminfo->nr_vcpus = info.max_vcpu_id + 1; } - for (i = 0; i < hvminfo->nr_vcpus; i++) - hvminfo->vcpu_online[i / 8] |= 1 << (i & 7); + memcpy(hvminfo->vcpu_online, b_info->avail_vcpus.map, + b_info->avail_vcpus.size); config->hvminfo = hvminfo; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:13:17 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:13:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726773.1131147 (Exim 4.92) (envelope-from ) id 1s9MUf-0008GK-5q; Tue, 21 May 2024 10:13:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726773.1131147; Tue, 21 May 2024 10:13:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUf-0008G8-30; Tue, 21 May 2024 10:13:17 +0000 Received: by outflank-mailman (input) for mailman id 726773; Tue, 21 May 2024 10:13:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUd-0008Fv-RM for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUd-0001Lt-Qi for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MUd-0005ND-Pp for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KHJD3v1t5iIuh5+2XRNAcnUM5atORNLto1wK//ywOck=; b=t6LN6HOTJwE4dTaLXUKLx1zonC bj3p68qm+QDpVgz60TPlQDsRD6V0ogxy0AvuOsodwvhIla+lWLpccnBW5D0I9wCKqNReCNoutO3hG ZnHd2CR9eVj0/0gnqfe2j/wMQN/wNcuuROylmAWb41Qi475a/hrf0GmcC+aPMh5GfbJc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] libxl: Fix handling XenStore errors in device creation Message-Id: Date: Tue, 21 May 2024 10:13:15 +0000 commit 620387c050f05fe2ccefcb8a13e550fe86d678c5 Author: Demi Marie Obenour AuthorDate: Tue May 21 12:00:34 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:00:34 2024 +0200 libxl: Fix handling XenStore errors in device creation If xenstored runs out of memory it is possible for it to fail operations that should succeed. libxl wasn't robust against this, and could fail to ensure that the TTY path of a non-initial console was created and read-only for guests. This doesn't qualify for an XSA because guests should not be able to run xenstored out of memory, but it still needs to be fixed. Add the missing error checks to ensure that all errors are properly handled and that at no point can a guest make the TTY path of its frontend directory writable. Signed-off-by: Demi Marie Obenour Reviewed-by: Juergen Gross master commit: 531d3bea5e9357357eaf6d40f5784a1b4c29b910 master date: 2024-05-11 00:13:43 +0100 --- tools/libs/light/libxl_console.c | 11 +++--- tools/libs/light/libxl_device.c | 72 +++++++++++++++++++++++++--------------- tools/libs/light/libxl_xshelp.c | 13 +++++--- 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/tools/libs/light/libxl_console.c b/tools/libs/light/libxl_console.c index d8b2bc5465..7087a0486d 100644 --- a/tools/libs/light/libxl_console.c +++ b/tools/libs/light/libxl_console.c @@ -337,11 +337,10 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, flexarray_append(front, "protocol"); flexarray_append(front, LIBXL_XENCONSOLE_PROTOCOL); } - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - libxl__xs_kvs_of_flexarray(gc, ro_front)); - rc = 0; + rc = libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back), + libxl__xs_kvs_of_flexarray(gc, front), + libxl__xs_kvs_of_flexarray(gc, ro_front)); out: return rc; } @@ -628,6 +627,8 @@ int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid, */ if (!val) val = "/NO-SUCH-PATH"; channelinfo->u.pty.path = strdup(val); + if (channelinfo->u.pty.path == NULL) + abort(); break; default: break; diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index a75c21d433..99758524ff 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -177,8 +177,13 @@ int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, ro_frontend_perms[1].perms = backend_perms[1].perms = XS_PERM_READ; retry_transaction: - if (create_transaction) + if (create_transaction) { t = xs_transaction_start(ctx->xsh); + if (t == XBT_NULL) { + LOGED(ERROR, device->domid, "xs_transaction_start failed"); + return ERROR_FAIL; + } + } /* FIXME: read frontend_path and check state before removing stuff */ @@ -195,42 +200,55 @@ retry_transaction: if (rc) goto out; } - /* xxx much of this function lacks error checks! */ - if (fents || ro_fents) { - xs_rm(ctx->xsh, t, frontend_path); - xs_mkdir(ctx->xsh, t, frontend_path); + if (!xs_rm(ctx->xsh, t, frontend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, frontend_path)) + goto out; /* Console 0 is a special case. It doesn't use the regular PV * state machine but also the frontend directory has * historically contained other information, such as the * vnc-port, which we don't want the guest fiddling with. */ if ((device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) || - (device->kind == LIBXL__DEVICE_KIND_VUART)) - xs_set_permissions(ctx->xsh, t, frontend_path, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); - else - xs_set_permissions(ctx->xsh, t, frontend_path, - frontend_perms, ARRAY_SIZE(frontend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), - backend_path, strlen(backend_path)); - if (fents) - libxl__xs_writev_perms(gc, t, frontend_path, fents, - frontend_perms, ARRAY_SIZE(frontend_perms)); - if (ro_fents) - libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + (device->kind == LIBXL__DEVICE_KIND_VUART)) { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms))) + goto out; + } else { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + frontend_perms, ARRAY_SIZE(frontend_perms))) + goto out; + } + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), + backend_path, strlen(backend_path))) + goto out; + if (fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, fents, + frontend_perms, ARRAY_SIZE(frontend_perms)); + if (rc) goto out; + } + if (ro_fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + if (rc) goto out; + } } if (bents) { if (!libxl_only) { - xs_rm(ctx->xsh, t, backend_path); - xs_mkdir(ctx->xsh, t, backend_path); - xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, - ARRAY_SIZE(backend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), - frontend_path, strlen(frontend_path)); - libxl__xs_writev(gc, t, backend_path, bents); + if (!xs_rm(ctx->xsh, t, backend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, backend_path)) + goto out; + if (!xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, + ARRAY_SIZE(backend_perms))) + goto out; + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), + frontend_path, strlen(frontend_path))) + goto out; + rc = libxl__xs_writev(gc, t, backend_path, bents); + if (rc) goto out; } /* @@ -276,7 +294,7 @@ retry_transaction: out: if (create_transaction && t) libxl__xs_transaction_abort(gc, &t); - return rc; + return rc != 0 ? rc : ERROR_FAIL; } typedef struct { diff --git a/tools/libs/light/libxl_xshelp.c b/tools/libs/light/libxl_xshelp.c index 751cd942d9..a6e34ab10f 100644 --- a/tools/libs/light/libxl_xshelp.c +++ b/tools/libs/light/libxl_xshelp.c @@ -60,10 +60,15 @@ int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, for (i = 0; kvs[i] != NULL; i += 2) { path = GCSPRINTF("%s/%s", dir, kvs[i]); if (path && kvs[i + 1]) { - int length = strlen(kvs[i + 1]); - xs_write(ctx->xsh, t, path, kvs[i + 1], length); - if (perms) - xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + size_t length = strlen(kvs[i + 1]); + if (length > UINT_MAX) + return ERROR_FAIL; + if (!xs_write(ctx->xsh, t, path, kvs[i + 1], length)) + return ERROR_FAIL; + if (perms) { + if (!xs_set_permissions(ctx->xsh, t, path, perms, num_perms)) + return ERROR_FAIL; + } } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:13:27 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:13:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726776.1131151 (Exim 4.92) (envelope-from ) id 1s9MUp-0008JF-7D; Tue, 21 May 2024 10:13:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726776.1131151; Tue, 21 May 2024 10:13:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUp-0008J7-4P; Tue, 21 May 2024 10:13:27 +0000 Received: by outflank-mailman (input) for mailman id 726776; Tue, 21 May 2024 10:13:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUn-0008Is-Uq for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUn-0001M4-U5 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MUn-0005Ne-TD for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E2H/4doEWRmzNLDo4w5AUKN7MYx/owPyUC1jZtwhKA4=; b=tnjqMTvH7sX9QlA8DMLwHrtUli pMKu/RFdY5Vx9RDj20lh0EDIPWJZCzim2cqDoqNY923mj1QJpt+Nw6mjBQ3ISxLjqIUnIpE1m5INd qg2zE1lHLr6ITMryzDrh74NhTs7hSAIIH9blBqnIYQ/gf8SdJPlVT+UerblJXwnIkXhs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] xen/sched: set all sched_resource data inside locked region for new cpu Message-Id: Date: Tue, 21 May 2024 10:13:25 +0000 commit a14a7b92af452ac61990b9cb514266935bff7a0b Author: Juergen Gross AuthorDate: Tue May 21 12:01:06 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:01:06 2024 +0200 xen/sched: set all sched_resource data inside locked region for new cpu When adding a cpu to a scheduler, set all data items of struct sched_resource inside the locked region, as otherwise a race might happen (e.g. when trying to access the cpupool of the cpu): (XEN) ----[ Xen-4.19.0-1-d x86_64 debug=y Tainted: H ]---- (XEN) CPU: 45 (XEN) RIP: e008:[] common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) RFLAGS: 0000000000010092 CONTEXT: hypervisor (XEN) rax: ffff82d040981618 rbx: ffff82d040981618 rcx: 0000000000000000 (XEN) rdx: 0000003ff68cd000 rsi: 000000000000002d rdi: ffff83103723d450 (XEN) rbp: ffff83207caa7d48 rsp: ffff83207caa7b98 r8: 0000000000000000 (XEN) r9: ffff831037253cf0 r10: ffff83103767c3f0 r11: 0000000000000009 (XEN) r12: ffff831037237990 r13: ffff831037237990 r14: ffff831037253720 (XEN) r15: 0000000000000000 cr0: 000000008005003b cr4: 0000000000f526e0 (XEN) cr3: 000000005bc2f000 cr2: 0000000000000010 (XEN) fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) Xen code around (common/sched/credit.c#csched_load_balance+0x41/0x877): (XEN) 48 8b 0c 10 48 8b 49 08 <48> 8b 79 10 48 89 bd b8 fe ff ff 49 8b 4e 28 48 (XEN) Xen call trace: (XEN) [] R common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) [] F common/sched/credit.c#csched_schedule+0x36a/0x69f (XEN) [] F common/sched/core.c#do_schedule+0xe8/0x433 (XEN) [] F common/sched/core.c#schedule+0x2e5/0x2f9 (XEN) [] F common/softirq.c#__do_softirq+0x94/0xbe (XEN) [] F do_softirq+0x13/0x15 (XEN) [] F arch/x86/domain.c#idle_loop+0x92/0xe6 (XEN) (XEN) Pagetable walk from 0000000000000010: (XEN) L4[0x000] = 000000103ff61063 ffffffffffffffff (XEN) L3[0x000] = 000000103ff60063 ffffffffffffffff (XEN) L2[0x000] = 0000001033dff063 ffffffffffffffff (XEN) L1[0x000] = 0000000000000000 ffffffffffffffff (XEN) (XEN) **************************************** (XEN) Panic on CPU 45: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000010 (XEN) **************************************** Reported-by: Andrew Cooper Fixes: a8c6c623192e ("sched: clarify use cases of schedule_cpu_switch()") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Tested-by: Andrew Cooper master commit: d104a07524ffc92ae7a70dfe192c291de2a563cc master date: 2024-05-15 19:59:52 +0100 --- xen/common/sched/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 29bbab5ac6..a9ff98f67a 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3179,6 +3179,8 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) sr->scheduler = new_ops; sr->sched_priv = ppriv; + sr->granularity = cpupool_get_granularity(c); + sr->cpupool = c; /* * Reroute the lock to the per pCPU lock as /last/ thing. In fact, @@ -3191,8 +3193,6 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) /* _Not_ pcpu_schedule_unlock(): schedule_lock has changed! */ spin_unlock_irqrestore(old_lock, flags); - sr->granularity = cpupool_get_granularity(c); - sr->cpupool = c; /* The cpu is added to a pool, trigger it to go pick up some work */ cpu_raise_softirq(cpu, SCHEDULE_SOFTIRQ); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:13:37 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:13:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726779.1131155 (Exim 4.92) (envelope-from ) id 1s9MUz-0008MJ-8H; Tue, 21 May 2024 10:13:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726779.1131155; Tue, 21 May 2024 10:13:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUz-0008M9-5k; Tue, 21 May 2024 10:13:37 +0000 Received: by outflank-mailman (input) for mailman id 726779; Tue, 21 May 2024 10:13:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUy-0008M1-27 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MUy-0001MG-1L for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MUy-0005OT-0J for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Qq+LkVd+4Nqo7qUAcCG69h4/nzbj6/j8CdY/IXiw4iQ=; b=fyZUIfovncUcOGGJuDwOx7hNWL 2feOif3W/pzkSt/DVRNWUVd5q8VRCscaGLoF+3syzwax+KqZkql7IunVPj/lF5phiYumKP+AZKP08 ocZpZcVuYRV9fwbyNvun/+WgVJbobFliK++VlFAY1zsAlUZllLcp6ZScGxmezHypWvLI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86: respect mapcache_domain_init() failing Message-Id: Date: Tue, 21 May 2024 10:13:36 +0000 commit e31e8ed53ebafb98418c994f727884924bf45f52 Author: Jan Beulich AuthorDate: Tue May 21 12:01:33 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:01:33 2024 +0200 x86: respect mapcache_domain_init() failing The function itself properly handles and hands onwards failure from create_perdomain_mapping(). Therefore its caller should respect possible failure, too. Fixes: 4b28bf6ae90b ("x86: re-introduce map_domain_page() et al") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 7270fdc7a0028d4b7b26fd1b36c6b9e97abcf3da master date: 2024-05-15 19:59:52 +0100 --- xen/arch/x86/domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5dbd1d8a12..a7bf828578 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -833,7 +833,8 @@ int arch_domain_create(struct domain *d, } else if ( is_pv_domain(d) ) { - mapcache_domain_init(d); + if ( (rc = mapcache_domain_init(d)) != 0 ) + goto fail; if ( (rc = pv_domain_initialise(d)) != 0 ) goto fail; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:13:47 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:13:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726783.1131158 (Exim 4.92) (envelope-from ) id 1s9MV9-0008PI-9x; Tue, 21 May 2024 10:13:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726783.1131158; Tue, 21 May 2024 10:13:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MV9-0008PB-7A; Tue, 21 May 2024 10:13:47 +0000 Received: by outflank-mailman (input) for mailman id 726783; Tue, 21 May 2024 10:13:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MV8-0008Oz-5p for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MV8-0001Mh-4T for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MV8-0005P8-3j for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bjIKxfM0DR7++0tflOolhLk2gkVHm0JKXWjlaWrnvOg=; b=aFxMP8Awq3uaUKPXKgus2/gFEc zk1u4hqUxTQAIm0a/qQ3kBQWwhD6BSsHFnIBXpzpUFObRnQzkRAOR5OYjpaQ1+CzebsccHfM7h9rh /VAPIMkPVMstOklBpE+EaMyFalo6qwa8DzU6IceFJvDgGpn9RuceyG9SxI0raD7bnnSM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] tools/xentop: Fix cpu% sort order Message-Id: Date: Tue, 21 May 2024 10:13:46 +0000 commit cd3f405b68ff99f14a8b9424665059c2447a4756 Author: Leigh Brown AuthorDate: Tue May 21 12:02:03 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:02:03 2024 +0200 tools/xentop: Fix cpu% sort order In compare_cpu_pct(), there is a double -> unsigned long long converion when calling compare(). In C, this discards the fractional part, resulting in an out-of order sorting such as: NAME STATE CPU(sec) CPU(%) xendd --b--- 4020 5.7 icecream --b--- 2600 3.8 Domain-0 -----r 1060 1.5 neon --b--- 827 1.1 cheese --b--- 225 0.7 pizza --b--- 359 0.5 cassini --b--- 490 0.4 fusilli --b--- 159 0.2 bob --b--- 502 0.2 blender --b--- 121 0.2 bread --b--- 69 0.1 chickpea --b--- 67 0.1 lentil --b--- 67 0.1 Introduce compare_dbl() function and update compare_cpu_pct() to call it. Fixes: 49839b535b78 ("Add xenstat framework.") Signed-off-by: Leigh Brown Reviewed-by: Andrew Cooper master commit: e27fc7d15eab79e604e8b8728778594accc23cf1 master date: 2024-05-15 19:59:52 +0100 --- tools/xentop/xentop.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index 545bd5e96d..c2a311befe 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -85,6 +85,7 @@ static void set_delay(const char *value); static void set_prompt(const char *new_prompt, void (*func)(const char *)); static int handle_key(int); static int compare(unsigned long long, unsigned long long); +static int compare_dbl(double, double); static int compare_domains(xenstat_domain **, xenstat_domain **); static unsigned long long tot_net_bytes( xenstat_domain *, int); static bool tot_vbd_reqs(xenstat_domain *, int, unsigned long long *); @@ -422,6 +423,16 @@ static int compare(unsigned long long i1, unsigned long long i2) return 0; } +/* Compares two double precision numbers, returning -1,0,1 for <,=,> */ +static int compare_dbl(double d1, double d2) +{ + if (d1 < d2) + return -1; + if (d1 > d2) + return 1; + return 0; +} + /* Comparison function for use with qsort. Compares two domains using the * current sort field. */ static int compare_domains(xenstat_domain **domain1, xenstat_domain **domain2) @@ -523,7 +534,7 @@ static double get_cpu_pct(xenstat_domain *domain) static int compare_cpu_pct(xenstat_domain *domain1, xenstat_domain *domain2) { - return -compare(get_cpu_pct(domain1), get_cpu_pct(domain2)); + return -compare_dbl(get_cpu_pct(domain1), get_cpu_pct(domain2)); } /* Prints cpu percentage statistic */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 10:13:57 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 10:13:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726785.1131163 (Exim 4.92) (envelope-from ) id 1s9MVJ-0008Rw-C0; Tue, 21 May 2024 10:13:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726785.1131163; Tue, 21 May 2024 10:13:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MVJ-0008Rp-8l; Tue, 21 May 2024 10:13:57 +0000 Received: by outflank-mailman (input) for mailman id 726785; Tue, 21 May 2024 10:13:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MVI-0008Rd-8D for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9MVI-0001Mr-7N for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9MVI-0005Pd-6h for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 10:13:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hPsM8T2yJcMu0xKG/6jf0UPyEAbpkLuR2/XUgw243mw=; b=ldfGKi47UswmqdUC7F4iiC6JKG 0UuFxYMLnmpLfLD3ypo749L1vLbwPzNlhLvFwNzz+o3CYxgQnXc+vYL+gUxLF3gIGr+cyvf7NlFJt 86DONweEubsItjlYLyRURX/R7q2u5/ZKTQoPhwR9AtCLhiWqaiP8gtyheqdRLeiaC3jg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] x86/mtrr: avoid system wide rendezvous when setting AP MTRRs Message-Id: Date: Tue, 21 May 2024 10:13:56 +0000 commit afcce3cfc2458efbd3ff9320153c534a82a108c5 Author: Roger Pau Monné AuthorDate: Tue May 21 12:02:13 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:02:13 2024 +0200 x86/mtrr: avoid system wide rendezvous when setting AP MTRRs There's no point in forcing a system wide update of the MTRRs on all processors when there are no changes to be propagated. On AP startup it's only the AP that needs to write the system wide MTRR values in order to match the rest of the already online CPUs. We have occasionally seen the watchdog trigger during `xen-hptool cpu-online` in one Intel Cascade Lake box with 448 CPUs due to the re-setting of the MTRRs on all the CPUs in the system. While there adjust the comment to clarify why the system-wide resetting of the MTRR registers is not needed for the purposes of mtrr_ap_init(). Signed-off-by: Roger Pau Monné Release-acked-by: Oleksii Kurochko Acked-by: Andrew Cooper master commit: abd00b037da5ffa4e8c4508a5df0cd6eabb805a4 master date: 2024-05-15 19:59:52 +0100 --- xen/arch/x86/cpu/mtrr/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index 990f12286a..099e9f2cf7 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -573,14 +573,15 @@ void mtrr_ap_init(void) if (!mtrr_if || hold_mtrr_updates_on_aps) return; /* - * Ideally we should hold mtrr_mutex here to avoid mtrr entries changed, - * but this routine will be called in cpu boot time, holding the lock - * breaks it. This routine is called in two cases: 1.very earily time - * of software resume, when there absolutely isn't mtrr entry changes; - * 2.cpu hotadd time. We let mtrr_add/del_page hold cpuhotplug lock to - * prevent mtrr entry changes + * hold_mtrr_updates_on_aps takes care of preventing unnecessary MTRR + * updates when batch starting the CPUs (see + * mtrr_aps_sync_{begin,end}()). + * + * Otherwise just apply the current system wide MTRR values to this AP. + * Note this doesn't require synchronization with the other CPUs, as + * there are strictly no modifications of the current MTRR values. */ - set_mtrr(~0U, 0, 0, 0); + mtrr_set_all(); } /** -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 11:44:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 11:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726873.1131270 (Exim 4.92) (envelope-from ) id 1s9NuX-0001MT-PD; Tue, 21 May 2024 11:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726873.1131270; Tue, 21 May 2024 11:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9NuX-0001ML-MY; Tue, 21 May 2024 11:44:05 +0000 Received: by outflank-mailman (input) for mailman id 726873; Tue, 21 May 2024 11:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9NuW-0001MF-2F for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 11:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9NuW-0002yf-1E for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 11:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9NuW-0001vi-0B for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 11:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z62IYI4FMFtXbWvw/VBViBFAVHhlU41Y/L4EfgvsYeY=; b=oCVcZaHMh4pBzZEwHYFTEKKOs7 ZlK9iqC855c9xc66OkqI6ewaguKepTrTRK5jJqh7JZEa2hG5VN/8uzqfige2HXOB/w+zIaPnbeGrF mDhuNp5h/57blOfLoGaMhEzIv59BldTJlUtPtKuOZGe6o1/ByFd+5MRSVPMaRZPXVnRI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.17] Revert "xen/xsm: Wire up get_dom0_console" Message-Id: Date: Tue, 21 May 2024 11:44:04 +0000 commit 3c7c9225ffa5605bf0603f9dd1666f3f786e2c44 Author: Jan Beulich AuthorDate: Tue May 21 13:36:27 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 13:36:27 2024 +0200 Revert "xen/xsm: Wire up get_dom0_console" This reverts commit 9cef77400470604e76c6c3aa9f647c40429ff956, for not being applicable to this branch. --- tools/flask/policy/modules/dom0.te | 2 +- xen/xsm/flask/hooks.c | 4 ---- xen/xsm/flask/policy/access_vectors | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index 16b8c9646d..f1dcff48e2 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - coverage_op get_dom0_console + coverage_op }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 5e88c71b8e..78225f68c1 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1558,10 +1558,6 @@ static int cf_check flask_platform_op(uint32_t op) return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, SECCLASS_XEN2, XEN2__GET_SYMBOL, NULL); - case XENPF_get_dom0_console: - return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, - SECCLASS_XEN2, XEN2__GET_DOM0_CONSOLE, NULL); - default: return avc_unknown_permission("platform_op", op); } diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index a35e3d4c51..4e6710a63e 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,8 +99,6 @@ class xen2 livepatch_op # XEN_SYSCTL_coverage_op coverage_op -# XENPF_get_dom0_console - get_dom0_console } # Classes domain and domain2 consist of operations that a domain performs on -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.17 From xen-changelog-bounces@lists.xenproject.org Tue May 21 14:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 14:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726952.1131334 (Exim 4.92) (envelope-from ) id 1s9QCm-00075o-Av; Tue, 21 May 2024 14:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726952.1131334; Tue, 21 May 2024 14:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QCm-00075g-8D; Tue, 21 May 2024 14:11:04 +0000 Received: by outflank-mailman (input) for mailman id 726952; Tue, 21 May 2024 14:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QCl-00075a-Kr for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QCl-0005T4-JP for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9QCl-00021T-Hi for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mg9Ji7rSzckqxnqIY7WhgPOjIuUkHmj/CPzdylRvu0c=; b=jc9Wtphoc9S+VUBZlvPjTcp70I WviE4SmWO5h3bPU5f/hhH8sXiWJMfwi5QWj/3Ob1X8+AbhPzy7E34qbQSEQxHWKwH638Knz9/zzYz 0eyocgY5okQnbp3r8ex7RqRoTjLRIebu3BZoD1pcIHxrcK2Z76zheYC7GLFnnrQfNNeI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/common/dt-overlay: Fix lock issue when add/remove the device Message-Id: Date: Tue, 21 May 2024 14:11:03 +0000 commit bba4eb88fd7237ececa3097a093dadafc2000519 Author: Henry Wang AuthorDate: Tue May 21 15:59:14 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 15:59:14 2024 +0200 xen/common/dt-overlay: Fix lock issue when add/remove the device If CONFIG_DEBUG=y, below assertion will be triggered: (XEN) Assertion 'rw_is_locked(&dt_host_lock)' failed at drivers/passthrough/device_tree.c:146 (XEN) ----[ Xen-4.19-unstable arm64 debug=y Not tainted ]---- [...] (XEN) Xen call trace: (XEN) [<00000a0000257418>] iommu_remove_dt_device+0x8c/0xd4 (PC) (XEN) [<00000a00002573a0>] iommu_remove_dt_device+0x14/0xd4 (LR) (XEN) [<00000a000020797c>] dt-overlay.c#remove_node_resources+0x8c/0x90 (XEN) [<00000a0000207f14>] dt-overlay.c#remove_nodes+0x524/0x648 (XEN) [<00000a0000208460>] dt_overlay_sysctl+0x428/0xc68 (XEN) [<00000a00002707f8>] arch_do_sysctl+0x1c/0x2c (XEN) [<00000a0000230b40>] do_sysctl+0x96c/0x9ec (XEN) [<00000a0000271e08>] traps.c#do_trap_hypercall+0x1e8/0x288 (XEN) [<00000a0000273490>] do_trap_guest_sync+0x448/0x63c (XEN) [<00000a000025c480>] entry.o#guest_sync_slowpath+0xa8/0xd8 (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Assertion 'rw_is_locked(&dt_host_lock)' failed at drivers/passthrough/device_tree.c:146 (XEN) **************************************** This is because iommu_remove_dt_device() is called without taking the dt_host_lock. dt_host_lock is meant to ensure that the DT node will not disappear behind back. So fix the issue by taking the lock as soon as getting hold of overlay_node. Similar issue will be observed in adding the dtbo: (XEN) Assertion 'system_state < SYS_STATE_active || rw_is_locked(&dt_host_lock)' failed at xen-source/xen/drivers/passthrough/device_tree.c:192 (XEN) ----[ Xen-4.19-unstable arm64 debug=y Not tainted ]---- [...] (XEN) Xen call trace: (XEN) [<00000a00002594f4>] iommu_add_dt_device+0x7c/0x17c (PC) (XEN) [<00000a0000259494>] iommu_add_dt_device+0x1c/0x17c (LR) (XEN) [<00000a0000267db4>] handle_device+0x68/0x1e8 (XEN) [<00000a0000208ba8>] dt_overlay_sysctl+0x9d4/0xb84 (XEN) [<00000a000027342c>] arch_do_sysctl+0x24/0x38 (XEN) [<00000a0000231ac8>] do_sysctl+0x9ac/0xa34 (XEN) [<00000a0000274b70>] traps.c#do_trap_hypercall+0x230/0x2dc (XEN) [<00000a0000276330>] do_trap_guest_sync+0x478/0x688 (XEN) [<00000a000025e480>] entry.o#guest_sync_slowpath+0xa8/0xd8 This is because the lock is released too early. So fix the issue by releasing the lock after handle_device(). Fixes: 7e5c4a8b86f1 ("xen/arm: Implement device tree node removal functionalities") Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- xen/common/dt-overlay.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index 1b197381f6..9cece79067 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -429,18 +429,24 @@ static int remove_nodes(const struct overlay_track *tracker) if ( overlay_node == NULL ) return -EINVAL; + write_lock(&dt_host_lock); + rc = remove_descendant_nodes_resources(overlay_node); if ( rc ) + { + write_unlock(&dt_host_lock); return rc; + } rc = remove_node_resources(overlay_node); if ( rc ) + { + write_unlock(&dt_host_lock); 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 ) { @@ -604,8 +610,6 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) return rc; } - write_unlock(&dt_host_lock); - prev_node->allnext = next_node; overlay_node = dt_find_node_by_path(overlay_node->full_name); @@ -619,6 +623,7 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) rc = handle_device(hardware_domain, overlay_node, p2m_mmio_direct_c, tr->iomem_ranges, tr->irq_ranges); + write_unlock(&dt_host_lock); if ( rc ) { printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 14:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 14:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726953.1131338 (Exim 4.92) (envelope-from ) id 1s9QCw-00078m-CQ; Tue, 21 May 2024 14:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726953.1131338; Tue, 21 May 2024 14:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QCw-00078e-9j; Tue, 21 May 2024 14:11:14 +0000 Received: by outflank-mailman (input) for mailman id 726953; Tue, 21 May 2024 14:11:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QCv-00078Y-PX for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QCv-0005TE-MP for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9QCv-00021z-LW for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8rvLa43bCtJ0DhaUzJC0H+/Y+UsYXY3k/QtWS7h0OFg=; b=sWe7EL4x+A0LrWheCxFG9QOFqM OlQj1FTgHGZKuyyVPDYt6gCJyVwEZGuiLvOC5XRrC4UIbwVq76X09EuKo5fUD0OvNHdJ8f3h7jyjk EzWyn6rajV0DhXIChdER+ueUcwfMWGov2CNd3WhpoJOQbdfTHQikBQpH/uzwbp/n+AFg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vpmu: address violations of MISRA C Rule 20.7 Message-Id: Date: Tue, 21 May 2024 14:11:13 +0000 commit 1b9311da4b6364ed75561307bd8c3f50dd9046ce Author: Nicola Vetrini AuthorDate: Tue May 21 15:59:50 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 15:59:50 2024 +0200 x86/vpmu: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/vpmu_amd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index db2fa420e1..97e6315bd9 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -25,8 +25,8 @@ #define is_guest_mode(msr) ((msr) & (1ULL << MSR_F10H_EVNTSEL_GO_SHIFT)) #define is_pmu_enabled(msr) ((msr) & (1ULL << MSR_F10H_EVNTSEL_EN_SHIFT)) -#define set_guest_mode(msr) (msr |= (1ULL << MSR_F10H_EVNTSEL_GO_SHIFT)) -#define is_overflowed(msr) (!((msr) & (1ULL << (MSR_F10H_COUNTER_LENGTH-1)))) +#define set_guest_mode(msr) ((msr) |= (1ULL << MSR_F10H_EVNTSEL_GO_SHIFT)) +#define is_overflowed(msr) (!((msr) & (1ULL << (MSR_F10H_COUNTER_LENGTH - 1)))) static unsigned int __read_mostly num_counters; static const u32 __read_mostly *counters; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 14:11:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 14:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726954.1131342 (Exim 4.92) (envelope-from ) id 1s9QD6-0007Cc-Ds; Tue, 21 May 2024 14:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726954.1131342; Tue, 21 May 2024 14:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QD6-0007CV-B9; Tue, 21 May 2024 14:11:24 +0000 Received: by outflank-mailman (input) for mailman id 726954; Tue, 21 May 2024 14:11:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QD5-0007CP-Qq for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QD5-0005TQ-Q3 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9QD5-00023M-Oj for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HHQWRP7yj1FgL6/JyDpVL4rEA9YzhEF+Eo4SfSxbJRE=; b=xM0Lc8S1si7Isbo/sZMSveAYvS fggyj3Dp6RIo7dYHO1SFnlUwCYsqwmSilPcyTMDWdQRDGWlv8jijXpdOGU41ZJFVuI9ZZzoDIiKc6 1I7A+ZNG/Z4maG9/xfJcbjtXaqIL4F2udCyF8JCVfwY3Uwx4Eq0nV3estgwxlA29eaZ4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm: address violations of MISRA C Rule 20.7 Message-Id: Date: Tue, 21 May 2024 14:11:23 +0000 commit 670b7ec65d1cb135d63e0bcdbbc686df38a1c02c Author: Nicola Vetrini AuthorDate: Tue May 21 16:00:20 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 16:00:20 2024 +0200 x86/hvm: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 2 +- xen/arch/x86/hvm/rtc.c | 2 +- xen/arch/x86/include/asm/hvm/save.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 32f74c1db0..4620ed427c 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -16,7 +16,7 @@ #include /* Get page attribute fields (PAn) from PAT MSR. */ -#define pat_cr_2_paf(pat_cr,n) ((((uint64_t)pat_cr) >> ((n)<<3)) & 0xff) +#define pat_cr_2_paf(pat_cr, n) (((uint64_t)(pat_cr) >> ((n) << 3)) & 0xff) /* Effective mm type lookup table, according to MTRR and PAT. */ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES][X86_NUM_MT] = { diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index cba8532a5a..e33a8ec108 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -45,7 +45,7 @@ #define vrtc_domain(x) (container_of(x, struct pl_time, vrtc)->domain) #define vrtc_vcpu(x) (pt_global_vcpu_target(vrtc_domain(x))) #define epoch_year 1900 -#define get_year(x) (x + epoch_year) +#define get_year(x) ((x) + epoch_year) enum rtc_mode { rtc_mode_no_ack, diff --git a/xen/arch/x86/include/asm/hvm/save.h b/xen/arch/x86/include/asm/hvm/save.h index 8149aa113c..ec8de02931 100644 --- a/xen/arch/x86/include/asm/hvm/save.h +++ b/xen/arch/x86/include/asm/hvm/save.h @@ -50,7 +50,7 @@ int _hvm_check_entry(struct hvm_domain_context *h, HVM_SAVE_LENGTH(x), true) == 0 ) \ { \ ptr = &(h)->data[(h)->cur]; \ - h->cur += HVM_SAVE_LENGTH(x); \ + (h)->cur += HVM_SAVE_LENGTH(x); \ } \ ptr; }) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 14:11:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 14:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726955.1131346 (Exim 4.92) (envelope-from ) id 1s9QDG-0007F7-FO; Tue, 21 May 2024 14:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726955.1131346; Tue, 21 May 2024 14:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QDG-0007Ez-Cc; Tue, 21 May 2024 14:11:34 +0000 Received: by outflank-mailman (input) for mailman id 726955; Tue, 21 May 2024 14:11:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QDF-0007Er-U2 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QDF-0005TZ-TM for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9QDF-00023t-S9 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HJZhuvKWzqfpIg4axU8BdNyc3SIfsi1FDerKPcs0Xms=; b=dZjHY1T5dwT4njVz2kmW9pB4tj 9N6ri1SyNkn9pMdJC7YOeDzws4pwMoNIomCXGUYVouqSN8Tp5sqXyFF0dwB57DFdqnXJG9YLBtivH 5rGhq+YOQas2Xp+w4+Vf42UQ6dBrbZhyor1y54zDsfiqgrwUDS0dZfB2ihNcEcAqaTJ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86_64/uaccess: address violations of MISRA C Rule 20.7 Message-Id: Date: Tue, 21 May 2024 14:11:33 +0000 commit 1b0b050bd6713454aedec7c3c125c39f9c375bee Author: Nicola Vetrini AuthorDate: Tue May 21 16:00:47 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 16:00:47 2024 +0200 x86_64/uaccess: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. xlat_malloc_init is touched for consistency, despite the construct being already deviated. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/include/asm/x86_64/uaccess.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/x86_64/uaccess.h b/xen/arch/x86/include/asm/x86_64/uaccess.h index ba79f950fb..c6fa3fd381 100644 --- a/xen/arch/x86/include/asm/x86_64/uaccess.h +++ b/xen/arch/x86/include/asm/x86_64/uaccess.h @@ -26,15 +26,16 @@ void free_compat_arg_xlat(struct vcpu *v); #define xlat_page_start ((unsigned long)COMPAT_ARG_XLAT_VIRT_BASE) #define xlat_page_size COMPAT_ARG_XLAT_SIZE #define xlat_page_left_size(xlat_page_current) \ - (xlat_page_start + xlat_page_size - xlat_page_current) + (xlat_page_start + xlat_page_size - (xlat_page_current)) #define xlat_malloc_init(xlat_page_current) do { \ - xlat_page_current = xlat_page_start; \ + (xlat_page_current) = xlat_page_start; \ } while (0) extern void *xlat_malloc(unsigned long *xlat_page_current, size_t size); -#define xlat_malloc_array(_p, _t, _c) ((_t *) xlat_malloc(&_p, sizeof(_t) * _c)) +#define xlat_malloc_array(_p, _t, _c) ((_t *) xlat_malloc(&(_p), \ + sizeof(_t) * (_c))) /* * Valid if in +ve half of 48-bit address space, or above Xen-reserved area. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 14:11:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 14:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.726957.1131350 (Exim 4.92) (envelope-from ) id 1s9QDQ-0007Ic-Gt; Tue, 21 May 2024 14:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 726957.1131350; Tue, 21 May 2024 14:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QDQ-0007IT-EA; Tue, 21 May 2024 14:11:44 +0000 Received: by outflank-mailman (input) for mailman id 726957; Tue, 21 May 2024 14:11:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QDQ-0007IL-1i for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9QDQ-0005Tk-0t for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9QDP-00024K-VT for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 14:11: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=Wg/s3m6hXUb7JpF8Cz0fD58gHyxpKg52yhhpNiDNdec=; b=2IPJ27RdEurH5GrVA19aBnK5Cm /2JX/8/SZY7g65kr9pnHXC9VkbXLE7mKZ7iANYelsH5cR9fMO8E0uoLyeQ9RdsS9JJaY5Jt3t8qg9 V7McbWSTToZd479OgLuUlYPD4kHi715XPo3u8Qb1cwT5yma6xO1AUEcu+Z+QV+oa3in8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86_64/cpu_idle: address violations of MISRA C Rule 20.7 Message-Id: Date: Tue, 21 May 2024 14:11:43 +0000 commit ced21fbb2842ac4655048bdee56232974ff9ff9c Author: Nicola Vetrini AuthorDate: Tue May 21 16:01:17 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 16:01:17 2024 +0200 x86_64/cpu_idle: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/x86_64/cpu_idle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/x86_64/cpu_idle.c b/xen/arch/x86/x86_64/cpu_idle.c index fcd6fc0fc2..cc9febc03d 100644 --- a/xen/arch/x86/x86_64/cpu_idle.c +++ b/xen/arch/x86/x86_64/cpu_idle.c @@ -93,7 +93,7 @@ long compat_set_cx_pminfo(uint32_t acpi_id, return -EFAULT; \ guest_from_compat_handle(states, (_s_)->states); \ \ - for ( i = 0; i < _s_->count; i++ ) \ + for ( i = 0; i < (_s_)->count; i++ ) \ { \ if ( unlikely(copy_from_guest_offset(&state, states, i, 1)) ) \ return -EFAULT; \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 21 19:22:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 19:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727047.1131443 (Exim 4.92) (envelope-from ) id 1s9V3j-0005ig-KO; Tue, 21 May 2024 19:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727047.1131443; Tue, 21 May 2024 19:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V3j-0005iX-HL; Tue, 21 May 2024 19:22:03 +0000 Received: by outflank-mailman (input) for mailman id 727047; Tue, 21 May 2024 19:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V3i-0005he-CX for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V3i-0002n2-BM for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9V3i-0006OV-9V for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19: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=2LWN6A+9QMclxOz9peks9kGqkCWn0G+fRCKlQXnnCNM=; b=XJD5Ul+9fzyL9aec/35nDK9B7+ Ydy/uSJQe/BBK1TLg7M9aj/AhpMNaejj0oYZ3rzqevgl1H6YWxdLX0oMAKvslPqcSpdEHfqhMACYx NjV5cByedWSjwH/qVyXEKi4iqLaYMdZXPrioivi8UmrGFS1U+CPSU0zkyDSkUBwi+aio=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/gen-cpuid: Minor cleanup Message-Id: Date: Tue, 21 May 2024 19:22:02 +0000 commit f79189cb2951c491ac8a285320bdc552cc3f6a79 Author: Andrew Cooper AuthorDate: Fri May 10 20:04:51 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 17:01:20 2024 +0100 x86/gen-cpuid: Minor cleanup Rename INIT_FEATURE_NAMES to INIT_FEATURE_NAME_TO_VAL as we're about to gain a inverse mapping of the same thing. Use dict.items() unconditionally. iteritems() is a marginal perf optimsiation for Python2 only, and simply not worth the effort on a script this small. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- tools/libs/light/libxl_cpuid.c | 2 +- xen/arch/x86/cpu-policy.c | 2 +- xen/tools/gen-cpuid.py | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index ce4f3c7095..063fe86eb7 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -296,7 +296,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *policy, const char* str) {NULL, 0, NA, CPUID_REG_INV, 0, 0} }; - static const struct feature_name features[] = INIT_FEATURE_NAMES; + static const struct feature_name features[] = INIT_FEATURE_NAME_TO_VAL; /* * NB: if we switch to using a cpu_policy derived object instead of a * libxl_cpuid_policy_list we could get rid of the featureset -> cpuid leaf diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 99871b8e0e..b96f4ee55c 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -43,7 +43,7 @@ static const uint32_t deep_features[] = INIT_DEEP_FEATURES; static const struct feature_name { const char *name; unsigned int bit; -} feature_names[] __initconstrel = INIT_FEATURE_NAMES; +} feature_names[] __initconstrel = INIT_FEATURE_NAME_TO_VAL; /* * Parse a list of cpuid feature names -> bool, calling the callback for any diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 380b9d973a..79d7f5c8e1 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -459,15 +459,10 @@ def write_results(state): state.output.write( """} -#define INIT_FEATURE_NAMES { \\ +#define INIT_FEATURE_NAME_TO_VAL { \\ """) - try: - _tmp = state.values.iteritems() - except AttributeError: - _tmp = state.values.items() - - for name, bit in sorted(_tmp): + for name, bit in sorted(state.values.items()): state.output.write( ' { "%s", %sU },\\\n' % (name, bit) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 21 19:22:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 19:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727048.1131448 (Exim 4.92) (envelope-from ) id 1s9V3t-0005lM-Lk; Tue, 21 May 2024 19:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727048.1131448; Tue, 21 May 2024 19: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 1s9V3t-0005lE-Is; Tue, 21 May 2024 19:22:13 +0000 Received: by outflank-mailman (input) for mailman id 727048; Tue, 21 May 2024 19:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V3s-0005l5-Fu for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V3s-0002og-FC for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9V3s-0006PL-DR for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19: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=8ZFX6i2Lma3UCFW2qXzqsgzqMiOT526NGonfwfYZEVQ=; b=vcqXZuYqgblGTkTYS382wi/tOk bxDVXQYC+J7gWMw3P4JeRJpUBk+WwEOcNp+3+r0u762fRVRrhxvgtktkdoAWKhH293cHBw1U+bIG0 cm1nVgZZEfJ9/EupQyMzMPpNgB12/aR96g7JOfy6PIvPTiM4+F/L1m9OPXTGN5c7VRQE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xen-cpuid: Rename decodes[] to leaf_info[] Message-Id: Date: Tue, 21 May 2024 19:22:12 +0000 commit e96fefdb06dbd6b401ce10b41a166ec90af82c8f Author: Roger Pau Monné AuthorDate: Thu May 2 12:49:22 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 17:01:20 2024 +0100 tools/xen-cpuid: Rename decodes[] to leaf_info[] Split out of subsequent patch to aid legibility. No functional change. Signed-off-by: Roger Pau Monné Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- tools/misc/xen-cpuid.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 8893547beb..6ee835b229 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -268,8 +268,7 @@ static const struct { const char *name; const char *abbr; const char *const *strs; -} decodes[] = -{ +} leaf_info[] = { { "CPUID 0x00000001.edx", "1d", str_1d }, { "CPUID 0x00000001.ecx", "1c", str_1c }, { "CPUID 0x80000001.edx", "e1d", str_e1d }, @@ -336,11 +335,11 @@ static void decode_featureset(const uint32_t *features, if ( !detail ) return; - for ( i = 0; i < length && i < ARRAY_SIZE(decodes); ++i ) + for ( i = 0; i < length && i < ARRAY_SIZE(leaf_info); ++i ) { - printf(" [%02u] %-"COL_ALIGN"s", i, decodes[i].name ?: ""); - if ( decodes[i].name ) - dump_leaf(features[i], decodes[i].strs); + printf(" [%02u] %-"COL_ALIGN"s", i, leaf_info[i].name ?: ""); + if ( leaf_info[i].name ) + dump_leaf(features[i], leaf_info[i].strs); printf("\n"); } } @@ -355,8 +354,8 @@ static void dump_info(xc_interface *xch, bool detail) if ( !detail ) { printf(" %"COL_ALIGN"s ", "KEY"); - for ( i = 0; i < ARRAY_SIZE(decodes); ++i ) - printf("%-8s ", decodes[i].abbr ?: "???"); + for ( i = 0; i < ARRAY_SIZE(leaf_info); ++i ) + printf("%-8s ", leaf_info[i].abbr ?: "???"); printf("\n"); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 21 19:22:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 19:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727049.1131452 (Exim 4.92) (envelope-from ) id 1s9V43-0005oa-OA; Tue, 21 May 2024 19:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727049.1131452; Tue, 21 May 2024 19: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 1s9V43-0005oS-LV; Tue, 21 May 2024 19:22:23 +0000 Received: by outflank-mailman (input) for mailman id 727049; Tue, 21 May 2024 19:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V42-0005o6-Iz for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V42-0002on-ID for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9V42-0006Pl-HL for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19: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=Bn35gTTK4vqIpaXmuLEh+K6/Qu08oJ0JdKMSTrD1+Jw=; b=t6U7ofncWK064FVdnfD4Srpuic /lICdTnphJ/Ey4/ZX9keJtwY7ET1U3ogKyE2o0bv+Z8ZsdvCd90m42eZT/ZHOoNc8QrHkvuLlNJBD Irwgc7FX/fdPz1wjTFb1DKGcChBxwaEFurHezuMP4mHEdKyzSJj7QjGnF1icmnnMzjh4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xen-cpuid: Use automatically generated feature names Message-Id: Date: Tue, 21 May 2024 19:22:22 +0000 commit bbb5c171d730eb524d21c7348726f06e95f6db19 Author: Roger Pau Monné AuthorDate: Thu May 2 12:49:22 2024 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 17:01:20 2024 +0100 tools/xen-cpuid: Use automatically generated feature names Have gen-cpuid.py write out INIT_FEATURE_VAL_TO_NAME, derived from the same data source as INIT_FEATURE_NAME_TO_VAL, although both aliases of common_1d are needed. In xen-cpuid.c, sanity check at build time that leaf_info[] and feature_names[] are of sensible length. As dump_leaf() rendered missing names as numbers, always dump leaves even if we don't have the leaf name. This conversion was argumably missed in commit 59afdb8a81d6 ("tools/misc: Tweak reserved bit handling for xen-cpuid"). Signed-off-by: Roger Pau Monné Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- tools/misc/xen-cpuid.c | 16 ++++++++-------- xen/tools/gen-cpuid.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 6ee835b229..51009683da 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -11,6 +11,7 @@ #include #include +#include static uint32_t nr_features; @@ -291,6 +292,8 @@ static const struct { #define COL_ALIGN "24" +static const char *const feature_names[] = INIT_FEATURE_VAL_TO_NAME; + static const char *const fs_names[] = { [XEN_SYSCTL_cpu_featureset_raw] = "Raw", [XEN_SYSCTL_cpu_featureset_host] = "Host", @@ -304,12 +307,6 @@ static void dump_leaf(uint32_t leaf, const char *const *strs) { unsigned i; - if ( !strs ) - { - printf(" ???"); - return; - } - for ( i = 0; i < 32; ++i ) if ( leaf & (1u << i) ) { @@ -327,6 +324,10 @@ static void decode_featureset(const uint32_t *features, { unsigned int i; + /* If this trips, you probably need to extend leaf_info[] above. */ + BUILD_BUG_ON(ARRAY_SIZE(leaf_info) != FEATURESET_NR_ENTRIES); + BUILD_BUG_ON(ARRAY_SIZE(feature_names) != FEATURESET_NR_ENTRIES * 32); + printf("%-"COL_ALIGN"s ", name); for ( i = 0; i < length; ++i ) printf("%08x%c", features[i], @@ -338,8 +339,7 @@ static void decode_featureset(const uint32_t *features, for ( i = 0; i < length && i < ARRAY_SIZE(leaf_info); ++i ) { printf(" [%02u] %-"COL_ALIGN"s", i, leaf_info[i].name ?: ""); - if ( leaf_info[i].name ) - dump_leaf(features[i], leaf_info[i].strs); + dump_leaf(features[i], &feature_names[i * 32]); printf("\n"); } } diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 79d7f5c8e1..601eec6089 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -470,6 +470,35 @@ def write_results(state): state.output.write( """} +""") + + state.output.write( +""" +#define INIT_FEATURE_VAL_TO_NAME { \\ +""") + + for name, bit in sorted(state.values.items()): + state.output.write( + ' [%s] = "%s",\\\n' % (bit, name) + ) + + # Add the other alias for 1d/e1d common bits. 64 is the difference + # between 1d and e1d. + if bit in state.common_1d: + state.output.write( + ' [%s] = "%s",\\\n' % (64 + bit, name) + ) + + # Pad to an exact multiple of FEATURESET_SIZE if necessary + pad_feat = state.nr_entries * 32 - 1 + if not state.names.get(pad_feat): + state.output.write( + ' [%s] = NULL,\\\n' % (pad_feat, ) + ) + + state.output.write( +"""} + """) for idx, text in enumerate(state.bitfields): -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 21 19:22:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 19:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727050.1131456 (Exim 4.92) (envelope-from ) id 1s9V4D-0005rI-Pq; Tue, 21 May 2024 19:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727050.1131456; Tue, 21 May 2024 19: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 1s9V4D-0005rA-N3; Tue, 21 May 2024 19:22:33 +0000 Received: by outflank-mailman (input) for mailman id 727050; Tue, 21 May 2024 19:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V4C-0005qy-Mu for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9V4C-0002ov-LK for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9V4C-0006QC-KO for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 19: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=4XTLJs0Yf+fZFJr1IMYyt5o1y/FKgR7PSN4UCeLHG8Y=; b=NbWakJrUYsJ7E+bl59z6xgsVKZ oGJflGvxXQfoJ8RcnoU+05vGUcMfy5++QOxlb8D6mmWvJ/qMgjpYK+6hRfDFF4y010N0Xd7bIuyJU Ww1ytBHDJ7eSkAJab/0PceMcxSEEQYFIjvxtcPY92y+bxVjteJ8qDtE88Kv0R5qAhIj0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xen-cpuid: Drop old names Message-Id: Date: Tue, 21 May 2024 19:22:32 +0000 commit 26b122e3bf8f3921d87312fbf5e7e13872ae92b0 Author: Roger Pau Monné AuthorDate: Thu May 2 13:49:22 2024 +0200 Commit: Andrew Cooper CommitDate: Mon May 20 17:01:20 2024 +0100 tools/xen-cpuid: Drop old names Not used any more. Split out of previous patch to aid legibility. Signed-off-by: Roger Pau Monné Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné --- tools/misc/xen-cpuid.c | 287 ++++--------------------------------------------- 1 file changed, 18 insertions(+), 269 deletions(-) diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 51009683da..4c4593528d 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -15,279 +15,28 @@ static uint32_t nr_features; -static const char *const str_1d[32] = -{ - [ 0] = "fpu", [ 1] = "vme", - [ 2] = "de", [ 3] = "pse", - [ 4] = "tsc", [ 5] = "msr", - [ 6] = "pae", [ 7] = "mce", - [ 8] = "cx8", [ 9] = "apic", - /* [10] */ [11] = "sysenter", - [12] = "mtrr", [13] = "pge", - [14] = "mca", [15] = "cmov", - [16] = "pat", [17] = "pse36", - [18] = "psn", [19] = "clflush", - /* [20] */ [21] = "ds", - [22] = "acpi", [23] = "mmx", - [24] = "fxsr", [25] = "sse", - [26] = "sse2", [27] = "ss", - [28] = "htt", [29] = "tm", - [30] = "ia64", [31] = "pbe", -}; - -static const char *const str_1c[32] = -{ - [ 0] = "sse3", [ 1] = "pclmulqdq", - [ 2] = "dtes64", [ 3] = "monitor", - [ 4] = "ds-cpl", [ 5] = "vmx", - [ 6] = "smx", [ 7] = "est", - [ 8] = "tm2", [ 9] = "ssse3", - [10] = "cntx-id", [11] = "sdgb", - [12] = "fma", [13] = "cx16", - [14] = "xtpr", [15] = "pdcm", - /* [16] */ [17] = "pcid", - [18] = "dca", [19] = "sse41", - [20] = "sse42", [21] = "x2apic", - [22] = "movebe", [23] = "popcnt", - [24] = "tsc-dl", [25] = "aesni", - [26] = "xsave", [27] = "osxsave", - [28] = "avx", [29] = "f16c", - [30] = "rdrnd", [31] = "hyper", -}; - -static const char *const str_e1d[32] = -{ - [ 0] = "fpu", [ 1] = "vme", - [ 2] = "de", [ 3] = "pse", - [ 4] = "tsc", [ 5] = "msr", - [ 6] = "pae", [ 7] = "mce", - [ 8] = "cx8", [ 9] = "apic", - /* [10] */ [11] = "syscall", - [12] = "mtrr", [13] = "pge", - [14] = "mca", [15] = "cmov", - [16] = "fcmov", [17] = "pse36", - /* [18] */ [19] = "mp", - [20] = "nx", /* [21] */ - [22] = "mmx+", [23] = "mmx", - [24] = "fxsr", [25] = "fxsr+", - [26] = "pg1g", [27] = "rdtscp", - /* [28] */ [29] = "lm", - [30] = "3dnow+", [31] = "3dnow", -}; - -static const char *const str_e1c[32] = -{ - [ 0] = "lahf-lm", [ 1] = "cmp", - [ 2] = "svm", [ 3] = "extapic", - [ 4] = "cr8d", [ 5] = "lzcnt", - [ 6] = "sse4a", [ 7] = "msse", - [ 8] = "3dnowpf", [ 9] = "osvw", - [10] = "ibs", [11] = "xop", - [12] = "skinit", [13] = "wdt", - /* [14] */ [15] = "lwp", - [16] = "fma4", [17] = "tce", - /* [18] */ [19] = "nodeid", - /* [20] */ [21] = "tbm", - [22] = "topoext", [23] = "perfctr-core", - [24] = "perfctr-nb", /* [25] */ - [26] = "dbx", [27] = "perftsc", - [28] = "pcx-l2i", [29] = "monitorx", - [30] = "addr-msk-ext", -}; - -static const char *const str_7b0[32] = -{ - [ 0] = "fsgsbase", [ 1] = "tsc-adj", - [ 2] = "sgx", [ 3] = "bmi1", - [ 4] = "hle", [ 5] = "avx2", - [ 6] = "fdp-exn", [ 7] = "smep", - [ 8] = "bmi2", [ 9] = "erms", - [10] = "invpcid", [11] = "rtm", - [12] = "pqm", [13] = "depfpp", - [14] = "mpx", [15] = "pqe", - [16] = "avx512f", [17] = "avx512dq", - [18] = "rdseed", [19] = "adx", - [20] = "smap", [21] = "avx512-ifma", - [22] = "pcommit", [23] = "clflushopt", - [24] = "clwb", [25] = "proc-trace", - [26] = "avx512pf", [27] = "avx512er", - [28] = "avx512cd", [29] = "sha", - [30] = "avx512bw", [31] = "avx512vl", -}; - -static const char *const str_Da1[32] = -{ - [ 0] = "xsaveopt", [ 1] = "xsavec", - [ 2] = "xgetbv1", [ 3] = "xsaves", -}; - -static const char *const str_7c0[32] = -{ - [ 0] = "prefetchwt1", [ 1] = "avx512-vbmi", - [ 2] = "umip", [ 3] = "pku", - [ 4] = "ospke", [ 5] = "waitpkg", - [ 6] = "avx512-vbmi2", [ 7] = "cet-ss", - [ 8] = "gfni", [ 9] = "vaes", - [10] = "vpclmulqdq", [11] = "avx512-vnni", - [12] = "avx512-bitalg", - [14] = "avx512-vpopcntdq", - - [22] = "rdpid", - /* 24 */ [25] = "cldemote", - /* 26 */ [27] = "movdiri", - [28] = "movdir64b", [29] = "enqcmd", - [30] = "sgx-lc", [31] = "pks", -}; - -static const char *const str_e7d[32] = -{ - /* 6 */ [ 7] = "hw-pstate", - [ 8] = "itsc", [ 9] = "cpb", - [10] = "efro", -}; - -static const char *const str_e8b[32] = -{ - [ 0] = "clzero", - [ 2] = "rstr-fp-err-ptrs", - - /* [ 8] */ [ 9] = "wbnoinvd", - - [12] = "ibpb", - [14] = "ibrs", [15] = "amd-stibp", - [16] = "ibrs-always", [17] = "stibp-always", - [18] = "ibrs-fast", [19] = "ibrs-same-mode", - - [20] = "no-lmsl", - /* [22] */ [23] = "ppin", - [24] = "amd-ssbd", [25] = "virt-ssbd", - [26] = "ssb-no", - [28] = "psfd", [29] = "btc-no", - [30] = "ibpb-ret", -}; - -static const char *const str_7d0[32] = -{ - [ 2] = "avx512-4vnniw", [ 3] = "avx512-4fmaps", - [ 4] = "fsrm", - - [ 8] = "avx512-vp2intersect", [ 9] = "srbds-ctrl", - [10] = "md-clear", [11] = "rtm-always-abort", - /* 12 */ [13] = "tsx-force-abort", - [14] = "serialize", [15] = "hybrid", - [16] = "tsxldtrk", - [18] = "pconfig", - [20] = "cet-ibt", - /* 22 */ [23] = "avx512-fp16", - - [26] = "ibrsb", [27] = "stibp", - [28] = "l1d-flush", [29] = "arch-caps", - [30] = "core-caps", [31] = "ssbd", -}; - -static const char *const str_7a1[32] = -{ - [ 0] = "sha512", [ 1] = "sm3", - [ 2] = "sm4", - [ 4] = "avx-vnni", [ 5] = "avx512-bf16", - - [10] = "fzrm", [11] = "fsrs", - [12] = "fsrcs", - - /* 18 */ [19] = "wrmsrns", - - /* 22 */ [23] = "avx-ifma", -}; - -static const char *const str_e21a[32] = -{ - [ 0] = "no-nest-bp", [ 1] = "fs-gs-ns", - [ 2] = "lfence+", - [ 6] = "nscb", - [ 8] = "auto-ibrs", - [10] = "amd-fsrs", [11] = "amd-fsrc", - - /* 16 */ [17] = "cpuid-user-dis", - [18] = "epsf", [19] = "fsrsc", - [20] = "amd-prefetchi", - - /* 26 */ [27] = "sbpb", - [28] = "ibpb-brtype", [29] = "srso-no", -}; - -static const char *const str_7b1[32] = -{ - [ 0] = "ppin", -}; - -static const char *const str_7c1[32] = -{ -}; - -static const char *const str_7d1[32] = -{ - [ 4] = "avx-vnni-int8", [ 5] = "avx-ne-convert", - - [10] = "avx-vnni-int16", - - [14] = "prefetchi", - - [18] = "cet-sss", -}; - -static const char *const str_7d2[32] = -{ - [ 0] = "intel-psfd", [ 1] = "ipred-ctrl", - [ 2] = "rrsba-ctrl", [ 3] = "ddp-ctrl", - [ 4] = "bhi-ctrl", [ 5] = "mcdt-no", -}; - -static const char *const str_m10Al[32] = -{ - [ 0] = "rdcl-no", [ 1] = "eibrs", - [ 2] = "rsba", [ 3] = "skip-l1dfl", - [ 4] = "intel-ssb-no", [ 5] = "mds-no", - [ 6] = "if-pschange-mc-no", [ 7] = "tsx-ctrl", - [ 8] = "taa-no", [ 9] = "mcu-ctrl", - [10] = "misc-pkg-ctrl", [11] = "energy-ctrl", - [12] = "doitm", [13] = "sbdr-ssdp-no", - [14] = "fbsdp-no", [15] = "psdp-no", - /* 16 */ [17] = "fb-clear", - [18] = "fb-clear-ctrl", [19] = "rrsba", - [20] = "bhi-no", [21] = "xapic-status", - /* 22 */ [23] = "ovrclk-status", - [24] = "pbrsb-no", [25] = "gds-ctrl", - [26] = "gds-no", [27] = "rfds-no", - [28] = "rfds-clear", -}; - -static const char *const str_m10Ah[32] = -{ -}; - static const struct { const char *name; const char *abbr; - const char *const *strs; } leaf_info[] = { - { "CPUID 0x00000001.edx", "1d", str_1d }, - { "CPUID 0x00000001.ecx", "1c", str_1c }, - { "CPUID 0x80000001.edx", "e1d", str_e1d }, - { "CPUID 0x80000001.ecx", "e1c", str_e1c }, - { "CPUID 0x0000000d:1.eax", "Da1", str_Da1 }, - { "CPUID 0x00000007:0.ebx", "7b0", str_7b0 }, - { "CPUID 0x00000007:0.ecx", "7c0", str_7c0 }, - { "CPUID 0x80000007.edx", "e7d", str_e7d }, - { "CPUID 0x80000008.ebx", "e8b", str_e8b }, - { "CPUID 0x00000007:0.edx", "7d0", str_7d0 }, - { "CPUID 0x00000007:1.eax", "7a1", str_7a1 }, - { "CPUID 0x80000021.eax", "e21a", str_e21a }, - { "CPUID 0x00000007:1.ebx", "7b1", str_7b1 }, - { "CPUID 0x00000007:2.edx", "7d2", str_7d2 }, - { "CPUID 0x00000007:1.ecx", "7c1", str_7c1 }, - { "CPUID 0x00000007:1.edx", "7d1", str_7d1 }, - { "MSR_ARCH_CAPS.lo", "m10Al", str_m10Al }, - { "MSR_ARCH_CAPS.hi", "m10Ah", str_m10Ah }, + { "CPUID 0x00000001.edx", "1d" }, + { "CPUID 0x00000001.ecx", "1c" }, + { "CPUID 0x80000001.edx", "e1d" }, + { "CPUID 0x80000001.ecx", "e1c" }, + { "CPUID 0x0000000d:1.eax", "Da1" }, + { "CPUID 0x00000007:0.ebx", "7b0" }, + { "CPUID 0x00000007:0.ecx", "7c0" }, + { "CPUID 0x80000007.edx", "e7d" }, + { "CPUID 0x80000008.ebx", "e8b" }, + { "CPUID 0x00000007:0.edx", "7d0" }, + { "CPUID 0x00000007:1.eax", "7a1" }, + { "CPUID 0x80000021.eax", "e21a" }, + { "CPUID 0x00000007:1.ebx", "7b1" }, + { "CPUID 0x00000007:2.edx", "7d2" }, + { "CPUID 0x00000007:1.ecx", "7c1" }, + { "CPUID 0x00000007:1.edx", "7d1" }, + { "MSR_ARCH_CAPS.lo", "m10Al" }, + { "MSR_ARCH_CAPS.hi", "m10Ah" }, }; #define COL_ALIGN "24" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:11:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727104.1131483 (Exim 4.92) (envelope-from ) id 1s9YdL-0005M2-JC; Tue, 21 May 2024 23:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727104.1131483; Tue, 21 May 2024 23:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YdL-0005Lu-GZ; Tue, 21 May 2024 23:11:03 +0000 Received: by outflank-mailman (input) for mailman id 727104; Tue, 21 May 2024 23:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YdK-0005Lo-Ak for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YdK-0006Zh-9q for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9YdK-0001nb-8M for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jU/gN017Zb61dczGAvfE2irXDevu/uLNoNhU9rorxjQ=; b=7EffRY30QwsAeIVciACopFxDtd kmqvv4SYftkZr/wtifnxzhNzX+T0mSyE2oLVKid38dTalU9/8n8cBcjCDYVSTGyNvvOAaAD81SyN/ rkWRHTFXBKq0K9jzZ7QTZcOImqwx1+O+DhYMXQ4LRQUpMr8JVXQ+s0igRIgJK5GeBOew=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] xen/xsm: Wire up get_dom0_console Message-Id: Date: Tue, 21 May 2024 23:11:02 +0000 commit 026542c8577ab6af7c1dbc7446547bdc2bc705fd Author: Jason Andryuk AuthorDate: Tue May 21 10:19:43 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:19:43 2024 +0200 xen/xsm: Wire up get_dom0_console An XSM hook for get_dom0_console is currently missing. Using XSM with a PVH dom0 shows: (XEN) FLASK: Denying unknown platform_op: 64. Wire up the hook, and allow it for dom0. Fixes: 4dd160583c ("x86/platform: introduce hypercall to get initial video console settings") Signed-off-by: Jason Andryuk Acked-by: Daniel P. Smith master commit: 647f7e50ebeeb8152974cad6a12affe474c74513 master date: 2024-04-30 08:33:41 +0200 --- tools/flask/policy/modules/dom0.te | 2 +- xen/xsm/flask/hooks.c | 4 ++++ xen/xsm/flask/policy/access_vectors | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index f1dcff48e2..16b8c9646d 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - coverage_op + coverage_op get_dom0_console }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 78225f68c1..5e88c71b8e 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1558,6 +1558,10 @@ static int cf_check flask_platform_op(uint32_t op) return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, SECCLASS_XEN2, XEN2__GET_SYMBOL, NULL); + case XENPF_get_dom0_console: + return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, + SECCLASS_XEN2, XEN2__GET_DOM0_CONSOLE, NULL); + default: return avc_unknown_permission("platform_op", op); } diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 4e6710a63e..a35e3d4c51 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,6 +99,8 @@ class xen2 livepatch_op # XEN_SYSCTL_coverage_op coverage_op +# XENPF_get_dom0_console + get_dom0_console } # Classes domain and domain2 consist of operations that a domain performs on -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:11:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727105.1131487 (Exim 4.92) (envelope-from ) id 1s9YdV-0005OB-Kc; Tue, 21 May 2024 23:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727105.1131487; Tue, 21 May 2024 23:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YdV-0005O3-I0; Tue, 21 May 2024 23:11:13 +0000 Received: by outflank-mailman (input) for mailman id 727105; Tue, 21 May 2024 23:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YdU-0005Nv-EZ for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YdU-0006Zp-Co for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9YdU-0001oA-Bw for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=J7k+MUYhBqx6EK6GGDIg8/zcafYA+hBJSFA0RFOjxKM=; b=vFZmGLlOKCnFRZFKnOfywafHll l8NuYKymKDes82NItVh90/tMOLjoCtXc9clplY0NRiLoLqRaQD3F0hgmXyhqiOzEaYFa3ku4ISuu/ RROYMV0TmZFrGxHAhYx/lHMpa0JlJV6F5Qsfa6ZHRxUgPB6PdjB8uDU69ZUp9lhZNYjs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] xen/x86: Fix Syntax warning in gen-cpuid.py Message-Id: Date: Tue, 21 May 2024 23:11:12 +0000 commit 47cf06c09a2fa1ee92ea3e7718c8f8e0f1450d88 Author: Jason Andryuk AuthorDate: Tue May 21 10:20:06 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:20:06 2024 +0200 xen/x86: Fix Syntax warning in gen-cpuid.py Python 3.12.2 warns: xen/tools/gen-cpuid.py:50: SyntaxWarning: invalid escape sequence '\s' "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" xen/tools/gen-cpuid.py:51: SyntaxWarning: invalid escape sequence '\s' "\s+/\*([\w!]*) .*$") Specify the strings as raw strings so '\s' is read as literal '\' + 's'. This avoids escaping all the '\'s in the strings. Signed-off-by: Jason Andryuk Acked-by: Andrew Cooper master commit: 08e79bba73d74a85d3ce6ff0f91c5205f1e05eda master date: 2024-04-30 08:34:37 +0200 --- xen/tools/gen-cpuid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 02dd45a5ed..415d644db5 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -47,8 +47,8 @@ def parse_definitions(state): """ feat_regex = re.compile( r"^XEN_CPUFEATURE\(([A-Z0-9_]+)," - "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" - "\s+/\*([\w!]*) .*$") + r"\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" + r"\s+/\*([\w!]*) .*$") word_regex = re.compile( r"^/\* .* word (\d*) \*/$") -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:11:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727106.1131491 (Exim 4.92) (envelope-from ) id 1s9Ydf-0005RO-MM; Tue, 21 May 2024 23:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727106.1131491; Tue, 21 May 2024 23:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ydf-0005RG-JS; Tue, 21 May 2024 23:11:23 +0000 Received: by outflank-mailman (input) for mailman id 727106; Tue, 21 May 2024 23:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yde-0005Qw-II for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yde-0006a2-HS for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Yde-0001ob-Es for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HX8aiYGCArV7BABhOu4fA2nZvsf4xlO+oN3WUjsse34=; b=T8n3BTUb1HeOelLKFCLgwE8W5g h9gSBSWadJT9jhqA2vORe3Jm2kDPZr46DR8O5CFDbcp3WxsPNOJ3I6xy1ebtzAnYo39KR20gBnlmx BgvbNtg25PzZATw9xYjp/EY+24hDof7OXYNPLfWYz4xbtaKII5GIEs0MWf5cUyMabino=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] VT-d: correct ATS checking for root complex integrated devices Message-Id: Date: Tue, 21 May 2024 23:11:22 +0000 commit a4c5bbb9db07b27e66f7c47676b1c888e1bece20 Author: Jan Beulich AuthorDate: Tue May 21 10:20:58 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:20:58 2024 +0200 VT-d: correct ATS checking for root complex integrated devices Spec version 4.1 says "The ATSR structures identifies PCI Express Root-Ports supporting Address Translation Services (ATS) transactions. Software must enable ATS on endpoint devices behind a Root Port only if the Root Port is reported as supporting ATS transactions." Clearly root complex integrated devices aren't "behind root ports", matching my observation on a SapphireRapids system having an ATS- capable root complex integrated device. Hence for such devices we shouldn't try to locate a corresponding ATSR. Since both pci_find_ext_capability() and pci_find_cap_offset() return "unsigned int", change "pos" to that type at the same time. Fixes: 903b93211f56 ("[VTD] laying the ground work for ATS") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 04e31583bab97e5042a44a1d00fce2760272635f master date: 2024-05-06 09:22:45 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index 1f5913bed9..61052ef580 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -44,7 +44,7 @@ struct acpi_drhd_unit *find_ats_dev_drhd(struct vtd_iommu *iommu) int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) { struct acpi_drhd_unit *ats_drhd; - int pos; + unsigned int pos, expfl = 0; if ( !ats_enabled || !iommu_qinval ) return 0; @@ -53,7 +53,12 @@ int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) !ecap_dev_iotlb(drhd->iommu->ecap) ) return 0; - if ( !acpi_find_matched_atsr_unit(pdev) ) + pos = pci_find_cap_offset(pdev->sbdf, PCI_CAP_ID_EXP); + if ( pos ) + expfl = pci_conf_read16(pdev->sbdf, pos + PCI_EXP_FLAGS); + + if ( MASK_EXTR(expfl, PCI_EXP_FLAGS_TYPE) != PCI_EXP_TYPE_RC_END && + !acpi_find_matched_atsr_unit(pdev) ) return 0; ats_drhd = find_ats_dev_drhd(drhd->iommu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:11:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727107.1131494 (Exim 4.92) (envelope-from ) id 1s9Ydq-0005V9-Oq; Tue, 21 May 2024 23:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727107.1131494; Tue, 21 May 2024 23:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ydq-0005Uz-MH; Tue, 21 May 2024 23:11:34 +0000 Received: by outflank-mailman (input) for mailman id 727107; Tue, 21 May 2024 23:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ydo-0005UY-Le for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ydo-0006aB-KU for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Ydo-0001pA-Jb for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PiE+fZiYjEW7czfSQmKsUmIQ/ZR+dnCugXyGP+05wHY=; b=QYX+4cYyH6RMOGBvglWJkav0NF 7xpjxiIlVBx54+t+te/v+6NM7BgCUytpB56ugKa1pOa0a629WW8gUzt4r1StWHzMY6W59yBtK/pgI uCXatmf3o9Rk3xFoclrzpZbY5hQONsr97xqKPKh2IbMM5fLTUfCtc0RAKPg8GcuRtINU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC Message-Id: Date: Tue, 21 May 2024 23:11:32 +0000 commit 2bc52041cacb33a301ebf939d69a021597941186 Author: Andrew Cooper AuthorDate: Tue May 21 10:21:47 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:21:47 2024 +0200 tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC The header description for xs_open() goes as far as to suggest that the fd is O_CLOEXEC, but it isn't actually. `xl devd` has been observed leaking /dev/xen/xenbus into children. Link: https://github.com/QubesOS/qubes-issues/issues/8292 Reported-by: Demi Marie Obenour Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross master commit: f4f2f3402b2f4985d69ffc0d46f845d05fd0b60f master date: 2024-05-07 15:18:36 +0100 --- tools/libs/store/xs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 140b9a2839..1498515073 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -54,6 +54,10 @@ struct xs_stored_msg { #include #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + struct xs_handle { /* Communications channel to xenstore daemon. */ int fd; @@ -227,7 +231,7 @@ error: static int get_dev(const char *connect_to) { /* We cannot open read-only because requests are writes */ - return open(connect_to, O_RDWR); + return open(connect_to, O_RDWR | O_CLOEXEC); } static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:11:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727110.1131499 (Exim 4.92) (envelope-from ) id 1s9Ye0-0005YE-QR; Tue, 21 May 2024 23:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727110.1131499; Tue, 21 May 2024 23:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ye0-0005Y7-Nh; Tue, 21 May 2024 23:11:44 +0000 Received: by outflank-mailman (input) for mailman id 727110; Tue, 21 May 2024 23:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ydy-0005Xo-OE for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ydy-0006aI-NO for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Ydy-0001pa-Md for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23: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=nobBIVrhneu2ewGFuP9G3hzI4BqJtVZlBnhSSqnpWPY=; b=Bh7u/T1it8kkk1s0c87AJHvseQ qvPgWoJZM0/IbMWpLSGEiI77E1O6+rRJTFeHyRmeOorSQIJAi26p0B6IIgymg/B0HqHpXQB8cheeK ufCLhuQ2J7ozOHU8CO50Xm4vFWavDkADSFLzLvR2QW19ezrIqTA31YlyLR2RzKjO3PCw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Message-Id: Date: Tue, 21 May 2024 23:11:42 +0000 commit 0673eae8e53de5007dba35149527579819428323 Author: Andrew Cooper AuthorDate: Tue May 21 10:22:08 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:22:08 2024 +0200 x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Ever since Xen 4.14, there has been a latent bug with migration. While some toolstacks can level the features properly, they don't shink feat.max_subleaf when all features have been dropped. This is because we *still* have not completed the toolstack side work for full CPU Policy objects. As a consequence, even when properly feature levelled, VMs can't migrate "backwards" across hardware which reduces feat.max_subleaf. One such example is Ice Lake (max_subleaf=2 for INTEL_PSFD) to Cascade Lake (max_subleaf=0). Extend the max policies feat.max_subleaf to the hightest number Xen knows about, but leave the default policies matching the host. This will allow VMs with a higher feat.max_subleaf than strictly necessary to migrate in. Eventually we'll manage to teach the toolstack how to avoid creating such VMs in the first place, but there's still more work to do there. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: a2330b51df267e20e66bbba6c5bf08f0570ed58b master date: 2024-05-07 16:56:46 +0100 --- xen/arch/x86/cpu-policy.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index a822800f52..1aba6ed4ca 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -603,6 +603,13 @@ static void __init calculate_pv_max_policy(void) unsigned int i; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -643,6 +650,10 @@ static void __init calculate_pv_def_policy(void) unsigned int i; *p = pv_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -679,6 +690,13 @@ static void __init calculate_hvm_max_policy(void) const uint32_t *mask; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? @@ -780,6 +798,10 @@ static void __init calculate_hvm_def_policy(void) const uint32_t *mask; *p = hvm_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:11:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727113.1131503 (Exim 4.92) (envelope-from ) id 1s9YeA-0005b6-Rg; Tue, 21 May 2024 23:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727113.1131503; Tue, 21 May 2024 23:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YeA-0005az-PH; Tue, 21 May 2024 23:11:54 +0000 Received: by outflank-mailman (input) for mailman id 727113; Tue, 21 May 2024 23:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ye8-0005ad-RU for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Ye8-0006ao-Qm for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Ye8-0001q4-PX for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23: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=2mH/wzLDYYUrx6ZGcZxlSAGjw1MSAQLMRFoXeQNGOaQ=; b=YGhlGuWQ+u9qj0WlQZewzvddU5 eiWUTiX36u0Y1x72w/kjmTFwILZZqRCPfFgC7gs4huHKxJIxzqTursqLVl5f0NGOwlp7hPYkE7gjn akzztDbSLxqg3TCrnb+0mmV8Lm5m2YjLQdMt9jYyv1TW9IGsFqltG38ERDivQt9VcZsw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/ucode: Distinguish "ucode already up to date" Message-Id: Date: Tue, 21 May 2024 23:11:52 +0000 commit a42c83b202cc034c43c723cf363dbbabac61b1af Author: Andrew Cooper AuthorDate: Tue May 21 10:22:52 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:22:52 2024 +0200 x86/ucode: Distinguish "ucode already up to date" Right now, Xen returns -ENOENT for both "the provided blob isn't correct for this CPU", and "the blob isn't newer than what's loaded". This in turn causes xen-ucode to exit with an error, when "nothing to do" is more commonly a success condition. Handle EEXIST specially and exit cleanly. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: 648db37a155aca6f66d4cf3bb118417a728c3579 master date: 2024-05-09 18:19:49 +0100 --- tools/misc/xen-ucode.c | 5 ++++- xen/arch/x86/cpu/microcode/core.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index c6ae6498d6..390969db3d 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -125,8 +125,11 @@ int main(int argc, char *argv[]) exit(1); } + errno = 0; ret = xc_microcode_update(xch, buf, len); - if ( ret ) + if ( ret == -1 && errno == EEXIST ) + printf("Microcode already up to date\n"); + else if ( ret ) { fprintf(stderr, "Failed to update microcode. (err: %s)\n", strerror(errno)); diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 4e011cdc41..d5338ad345 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -640,7 +640,7 @@ static long cf_check microcode_update_helper(void *data) "microcode: couldn't find any newer%s revision in the provided blob!\n", opt_ucode_allow_same ? " (or the same)" : ""); microcode_free_patch(patch); - ret = -ENOENT; + ret = -EEXIST; goto put; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:12:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727114.1131506 (Exim 4.92) (envelope-from ) id 1s9YeK-0005fS-T7; Tue, 21 May 2024 23:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727114.1131506; Tue, 21 May 2024 23:12:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YeK-0005fK-Qb; Tue, 21 May 2024 23:12:04 +0000 Received: by outflank-mailman (input) for mailman id 727114; Tue, 21 May 2024 23:12:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YeJ-0005dH-0g for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YeI-0006b8-VN for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9YeI-0001r9-Sq for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23: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=6311L5+DiEWqgtPRPhvNXFBW1LcXz3XAPzKHB+guW7w=; b=lmh5BwnnchBUiHQTkVs9f5Jdp2 /98BHJpRVYzmZRxEqD2hjl1NDADOiPSfALG16nc1sscmWwMezduaD6fQWMo4fqmbn6QyWctjrNTsq tGEWM8kWKP+7Q7aYCgnGZ2If5Lpzmm+QeF9U8j5mxEu8SXiYcV4AX64MOW2kJ5k5vy7o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] libxl: fix population of the online vCPU bitmap for PVH Message-Id: Date: Tue, 21 May 2024 23:12:02 +0000 commit 9966e5413133157a630f7462518005fb898e582a Author: Roger Pau Monné AuthorDate: Tue May 21 10:23:27 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:23:27 2024 +0200 libxl: fix population of the online vCPU bitmap for PVH libxl passes some information to libacpi to create the ACPI table for a PVH guest, and among that information it's a bitmap of which vCPUs are online which can be less than the maximum number of vCPUs assigned to the domain. While the population of the bitmap is done correctly for HVM based on the number of online vCPUs, for PVH the population of the bitmap is done based on the number of maximum vCPUs allowed. This leads to all local APIC entries in the MADT being set as enabled, which contradicts the data in xenstore if vCPUs is different than maximum vCPUs. Fix by copying the internal libxl bitmap that's populated based on the vCPUs parameter. Reported-by: Arthur Borsboom Link: https://gitlab.com/libvirt/libvirt/-/issues/399 Reported-by: Leigh Brown Fixes: 14c0d328da2b ('libxl/acpi: Build ACPI tables for HVMlite guests') Signed-off-by: Roger Pau Monné Tested-by: Leigh Brown Acked-by: Andrew Cooper master commit: 5cc7347b04b2d0a3133754c7a9b936f614ec656a master date: 2024-05-11 00:13:43 +0100 --- tools/libs/light/libxl_x86_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libs/light/libxl_x86_acpi.c b/tools/libs/light/libxl_x86_acpi.c index 620f3c700c..5cf261bd67 100644 --- a/tools/libs/light/libxl_x86_acpi.c +++ b/tools/libs/light/libxl_x86_acpi.c @@ -89,7 +89,7 @@ static int init_acpi_config(libxl__gc *gc, uint32_t domid = dom->guest_domid; xc_domaininfo_t info; struct hvm_info_table *hvminfo; - int i, r, rc; + int r, rc; config->dsdt_anycpu = config->dsdt_15cpu = dsdt_pvh; config->dsdt_anycpu_len = config->dsdt_15cpu_len = dsdt_pvh_len; @@ -138,8 +138,8 @@ static int init_acpi_config(libxl__gc *gc, hvminfo->nr_vcpus = info.max_vcpu_id + 1; } - for (i = 0; i < hvminfo->nr_vcpus; i++) - hvminfo->vcpu_online[i / 8] |= 1 << (i & 7); + memcpy(hvminfo->vcpu_online, b_info->avail_vcpus.map, + b_info->avail_vcpus.size); config->hvminfo = hvminfo; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:12:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:12:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727118.1131511 (Exim 4.92) (envelope-from ) id 1s9YeU-0005i8-Um; Tue, 21 May 2024 23:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727118.1131511; Tue, 21 May 2024 23:12:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YeU-0005i1-S3; Tue, 21 May 2024 23:12:14 +0000 Received: by outflank-mailman (input) for mailman id 727118; Tue, 21 May 2024 23:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YeT-0005hn-2w for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9YeT-0006bG-2A for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9YeT-0001rl-1H for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MBMhhDmMfzlIDLt9f18JqlKjKBN3bXnEfwPsFXmmAtg=; b=39VuTb9ZrrtesIaJZI8KczD/3h XORWgJ2FBJojuBlLYD1ixKJZEMCvuBepnSbF66g3HRD39W66cWaGV+PGig3iCmb/e2OHcruhHhS9B Sbm7I+7tai+rKuWJPzE9QZa0psVUZfuK1tpJgVZCAzXgs1eQbNHCIy1iEal831LwpdhQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] libxl: Fix handling XenStore errors in device creation Message-Id: Date: Tue, 21 May 2024 23:12:13 +0000 commit 8271f0e8f23b63199caf0edcfe85ebc1c1412d1b Author: Demi Marie Obenour AuthorDate: Tue May 21 10:23:52 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:23:52 2024 +0200 libxl: Fix handling XenStore errors in device creation If xenstored runs out of memory it is possible for it to fail operations that should succeed. libxl wasn't robust against this, and could fail to ensure that the TTY path of a non-initial console was created and read-only for guests. This doesn't qualify for an XSA because guests should not be able to run xenstored out of memory, but it still needs to be fixed. Add the missing error checks to ensure that all errors are properly handled and that at no point can a guest make the TTY path of its frontend directory writable. Signed-off-by: Demi Marie Obenour Reviewed-by: Juergen Gross master commit: 531d3bea5e9357357eaf6d40f5784a1b4c29b910 master date: 2024-05-11 00:13:43 +0100 --- tools/libs/light/libxl_console.c | 11 +++--- tools/libs/light/libxl_device.c | 72 +++++++++++++++++++++++++--------------- tools/libs/light/libxl_xshelp.c | 13 +++++--- 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/tools/libs/light/libxl_console.c b/tools/libs/light/libxl_console.c index cd7412a327..a563c9d3c7 100644 --- a/tools/libs/light/libxl_console.c +++ b/tools/libs/light/libxl_console.c @@ -351,11 +351,10 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, flexarray_append(front, "protocol"); flexarray_append(front, LIBXL_XENCONSOLE_PROTOCOL); } - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - libxl__xs_kvs_of_flexarray(gc, ro_front)); - rc = 0; + rc = libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back), + libxl__xs_kvs_of_flexarray(gc, front), + libxl__xs_kvs_of_flexarray(gc, ro_front)); out: return rc; } @@ -665,6 +664,8 @@ int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid, */ if (!val) val = "/NO-SUCH-PATH"; channelinfo->u.pty.path = strdup(val); + if (channelinfo->u.pty.path == NULL) + abort(); break; default: break; diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index 13da6e0573..3035501f2c 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -177,8 +177,13 @@ int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, ro_frontend_perms[1].perms = backend_perms[1].perms = XS_PERM_READ; retry_transaction: - if (create_transaction) + if (create_transaction) { t = xs_transaction_start(ctx->xsh); + if (t == XBT_NULL) { + LOGED(ERROR, device->domid, "xs_transaction_start failed"); + return ERROR_FAIL; + } + } /* FIXME: read frontend_path and check state before removing stuff */ @@ -195,42 +200,55 @@ retry_transaction: if (rc) goto out; } - /* xxx much of this function lacks error checks! */ - if (fents || ro_fents) { - xs_rm(ctx->xsh, t, frontend_path); - xs_mkdir(ctx->xsh, t, frontend_path); + if (!xs_rm(ctx->xsh, t, frontend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, frontend_path)) + goto out; /* Console 0 is a special case. It doesn't use the regular PV * state machine but also the frontend directory has * historically contained other information, such as the * vnc-port, which we don't want the guest fiddling with. */ if ((device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) || - (device->kind == LIBXL__DEVICE_KIND_VUART)) - xs_set_permissions(ctx->xsh, t, frontend_path, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); - else - xs_set_permissions(ctx->xsh, t, frontend_path, - frontend_perms, ARRAY_SIZE(frontend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), - backend_path, strlen(backend_path)); - if (fents) - libxl__xs_writev_perms(gc, t, frontend_path, fents, - frontend_perms, ARRAY_SIZE(frontend_perms)); - if (ro_fents) - libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + (device->kind == LIBXL__DEVICE_KIND_VUART)) { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms))) + goto out; + } else { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + frontend_perms, ARRAY_SIZE(frontend_perms))) + goto out; + } + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), + backend_path, strlen(backend_path))) + goto out; + if (fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, fents, + frontend_perms, ARRAY_SIZE(frontend_perms)); + if (rc) goto out; + } + if (ro_fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + if (rc) goto out; + } } if (bents) { if (!libxl_only) { - xs_rm(ctx->xsh, t, backend_path); - xs_mkdir(ctx->xsh, t, backend_path); - xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, - ARRAY_SIZE(backend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), - frontend_path, strlen(frontend_path)); - libxl__xs_writev(gc, t, backend_path, bents); + if (!xs_rm(ctx->xsh, t, backend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, backend_path)) + goto out; + if (!xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, + ARRAY_SIZE(backend_perms))) + goto out; + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), + frontend_path, strlen(frontend_path))) + goto out; + rc = libxl__xs_writev(gc, t, backend_path, bents); + if (rc) goto out; } /* @@ -276,7 +294,7 @@ retry_transaction: out: if (create_transaction && t) libxl__xs_transaction_abort(gc, &t); - return rc; + return rc != 0 ? rc : ERROR_FAIL; } typedef struct { diff --git a/tools/libs/light/libxl_xshelp.c b/tools/libs/light/libxl_xshelp.c index 751cd942d9..a6e34ab10f 100644 --- a/tools/libs/light/libxl_xshelp.c +++ b/tools/libs/light/libxl_xshelp.c @@ -60,10 +60,15 @@ int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, for (i = 0; kvs[i] != NULL; i += 2) { path = GCSPRINTF("%s/%s", dir, kvs[i]); if (path && kvs[i + 1]) { - int length = strlen(kvs[i + 1]); - xs_write(ctx->xsh, t, path, kvs[i + 1], length); - if (perms) - xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + size_t length = strlen(kvs[i + 1]); + if (length > UINT_MAX) + return ERROR_FAIL; + if (!xs_write(ctx->xsh, t, path, kvs[i + 1], length)) + return ERROR_FAIL; + if (perms) { + if (!xs_set_permissions(ctx->xsh, t, path, perms, num_perms)) + return ERROR_FAIL; + } } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:12:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727119.1131516 (Exim 4.92) (envelope-from ) id 1s9Yee-0005kq-0z; Tue, 21 May 2024 23:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727119.1131516; Tue, 21 May 2024 23:12:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yed-0005kh-TW; Tue, 21 May 2024 23:12:23 +0000 Received: by outflank-mailman (input) for mailman id 727119; Tue, 21 May 2024 23:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yed-0005kP-60 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yed-0006cu-58 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Yed-0001sC-4G for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=f1zzZjyeQMvc8M2nj5QjV68WfeQDoOnGARMC2Rqvb0k=; b=RedLPU75+i7feFHRSe1/fQZw0s BlCZoUSsQr/lJIOfsJ5it8gwDbRKLovTWyK9ouwojFQeGky0Nn2YNokT209n7Px5O7jGIXJh+KQe/ SsPcI6hDZwbRpnTYZAlqLYf4bGHkPH2/KIiMHK+aB/hEWm7xxkZLNnskwOLto6i6e61o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] xen/sched: set all sched_resource data inside locked region for new cpu Message-Id: Date: Tue, 21 May 2024 23:12:23 +0000 commit 3999b675cad5b717274d6493899b0eea8896f4d7 Author: Juergen Gross AuthorDate: Tue May 21 10:24:26 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:24:26 2024 +0200 xen/sched: set all sched_resource data inside locked region for new cpu When adding a cpu to a scheduler, set all data items of struct sched_resource inside the locked region, as otherwise a race might happen (e.g. when trying to access the cpupool of the cpu): (XEN) ----[ Xen-4.19.0-1-d x86_64 debug=y Tainted: H ]---- (XEN) CPU: 45 (XEN) RIP: e008:[] common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) RFLAGS: 0000000000010092 CONTEXT: hypervisor (XEN) rax: ffff82d040981618 rbx: ffff82d040981618 rcx: 0000000000000000 (XEN) rdx: 0000003ff68cd000 rsi: 000000000000002d rdi: ffff83103723d450 (XEN) rbp: ffff83207caa7d48 rsp: ffff83207caa7b98 r8: 0000000000000000 (XEN) r9: ffff831037253cf0 r10: ffff83103767c3f0 r11: 0000000000000009 (XEN) r12: ffff831037237990 r13: ffff831037237990 r14: ffff831037253720 (XEN) r15: 0000000000000000 cr0: 000000008005003b cr4: 0000000000f526e0 (XEN) cr3: 000000005bc2f000 cr2: 0000000000000010 (XEN) fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) Xen code around (common/sched/credit.c#csched_load_balance+0x41/0x877): (XEN) 48 8b 0c 10 48 8b 49 08 <48> 8b 79 10 48 89 bd b8 fe ff ff 49 8b 4e 28 48 (XEN) Xen call trace: (XEN) [] R common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) [] F common/sched/credit.c#csched_schedule+0x36a/0x69f (XEN) [] F common/sched/core.c#do_schedule+0xe8/0x433 (XEN) [] F common/sched/core.c#schedule+0x2e5/0x2f9 (XEN) [] F common/softirq.c#__do_softirq+0x94/0xbe (XEN) [] F do_softirq+0x13/0x15 (XEN) [] F arch/x86/domain.c#idle_loop+0x92/0xe6 (XEN) (XEN) Pagetable walk from 0000000000000010: (XEN) L4[0x000] = 000000103ff61063 ffffffffffffffff (XEN) L3[0x000] = 000000103ff60063 ffffffffffffffff (XEN) L2[0x000] = 0000001033dff063 ffffffffffffffff (XEN) L1[0x000] = 0000000000000000 ffffffffffffffff (XEN) (XEN) **************************************** (XEN) Panic on CPU 45: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000010 (XEN) **************************************** Reported-by: Andrew Cooper Fixes: a8c6c623192e ("sched: clarify use cases of schedule_cpu_switch()") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Tested-by: Andrew Cooper master commit: d104a07524ffc92ae7a70dfe192c291de2a563cc master date: 2024-05-15 19:59:52 +0100 --- xen/common/sched/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 34ad39b9ad..3c2403ebcf 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3179,6 +3179,8 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) sr->scheduler = new_ops; sr->sched_priv = ppriv; + sr->granularity = cpupool_get_granularity(c); + sr->cpupool = c; /* * Reroute the lock to the per pCPU lock as /last/ thing. In fact, @@ -3191,8 +3193,6 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) /* _Not_ pcpu_schedule_unlock(): schedule_lock has changed! */ spin_unlock_irqrestore(old_lock, flags); - sr->granularity = cpupool_get_granularity(c); - sr->cpupool = c; /* The cpu is added to a pool, trigger it to go pick up some work */ cpu_raise_softirq(cpu, SCHEDULE_SOFTIRQ); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:12:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727121.1131519 (Exim 4.92) (envelope-from ) id 1s9Yeo-0005oC-2V; Tue, 21 May 2024 23:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727121.1131519; Tue, 21 May 2024 23:12: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 1s9Yeo-0005o5-07; Tue, 21 May 2024 23:12:34 +0000 Received: by outflank-mailman (input) for mailman id 727121; Tue, 21 May 2024 23:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yen-0005nv-CR for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yen-0006d1-80 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Yen-0001sj-7F for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yN0fqnl9cYqxw2A1fXYv9SQ1UuTtoiyh6AqBBXaN+vg=; b=TGDvqJFhR+23mpnPnErlFz7Vq0 8lA3BcfygsABm2qMciPdiOoBjayvQOF25yk7aoJ5s8JKqoWaRn7YHTMjjD0Ixfb7zWcJlx/OQvlmb I7Xsz3naGsFnB7S6A0t1VWSuTk9xleL+up54VIevXNiTBqB7nw2CZx/xB8sz/lx8jciU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86: respect mapcache_domain_init() failing Message-Id: Date: Tue, 21 May 2024 23:12:33 +0000 commit dfabab2cd9461ef9d21a708461f35d2ae4b55220 Author: Jan Beulich AuthorDate: Tue May 21 10:25:08 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:25:08 2024 +0200 x86: respect mapcache_domain_init() failing The function itself properly handles and hands onwards failure from create_perdomain_mapping(). Therefore its caller should respect possible failure, too. Fixes: 4b28bf6ae90b ("x86: re-introduce map_domain_page() et al") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 7270fdc7a0028d4b7b26fd1b36c6b9e97abcf3da master date: 2024-05-15 19:59:52 +0100 --- xen/arch/x86/domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 307446273a..5feb0d0679 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -850,7 +850,8 @@ int arch_domain_create(struct domain *d, } else if ( is_pv_domain(d) ) { - mapcache_domain_init(d); + if ( (rc = mapcache_domain_init(d)) != 0 ) + goto fail; if ( (rc = pv_domain_initialise(d)) != 0 ) goto fail; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:12:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727124.1131522 (Exim 4.92) (envelope-from ) id 1s9Yey-0005rL-40; Tue, 21 May 2024 23:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727124.1131522; Tue, 21 May 2024 23: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 1s9Yey-0005rD-1Y; Tue, 21 May 2024 23:12:44 +0000 Received: by outflank-mailman (input) for mailman id 727124; Tue, 21 May 2024 23:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yex-0005r5-Bq for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yex-0006d8-B8 for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Yex-0001tF-AO for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=n4RS0odABaUPoWKQ/uyqyY1kz+4ym9lthSwWVTzRXHE=; b=yjh4ecgWFgd9VRjkhB5Be8tyyf 4jh8C+YwXKAPBiaHk1XQXnR2Cb7QOLeR+IQhbS1ZfQPTFEoWKfzyporpF9llcR460B2u42bc5Ef5G WGGLr5YPkcM24YvbG8zft+MPWFOe7CvSwE+e4E81ezMgIl+lYdy92YEc2QvLfMcnZGg4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] tools/xentop: Fix cpu% sort order Message-Id: Date: Tue, 21 May 2024 23:12:43 +0000 commit f3d20dd31770a70971f4f85521eec1e741d38695 Author: Leigh Brown AuthorDate: Tue May 21 10:25:30 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:25:30 2024 +0200 tools/xentop: Fix cpu% sort order In compare_cpu_pct(), there is a double -> unsigned long long converion when calling compare(). In C, this discards the fractional part, resulting in an out-of order sorting such as: NAME STATE CPU(sec) CPU(%) xendd --b--- 4020 5.7 icecream --b--- 2600 3.8 Domain-0 -----r 1060 1.5 neon --b--- 827 1.1 cheese --b--- 225 0.7 pizza --b--- 359 0.5 cassini --b--- 490 0.4 fusilli --b--- 159 0.2 bob --b--- 502 0.2 blender --b--- 121 0.2 bread --b--- 69 0.1 chickpea --b--- 67 0.1 lentil --b--- 67 0.1 Introduce compare_dbl() function and update compare_cpu_pct() to call it. Fixes: 49839b535b78 ("Add xenstat framework.") Signed-off-by: Leigh Brown Reviewed-by: Andrew Cooper master commit: e27fc7d15eab79e604e8b8728778594accc23cf1 master date: 2024-05-15 19:59:52 +0100 --- tools/xentop/xentop.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index 545bd5e96d..c2a311befe 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -85,6 +85,7 @@ static void set_delay(const char *value); static void set_prompt(const char *new_prompt, void (*func)(const char *)); static int handle_key(int); static int compare(unsigned long long, unsigned long long); +static int compare_dbl(double, double); static int compare_domains(xenstat_domain **, xenstat_domain **); static unsigned long long tot_net_bytes( xenstat_domain *, int); static bool tot_vbd_reqs(xenstat_domain *, int, unsigned long long *); @@ -422,6 +423,16 @@ static int compare(unsigned long long i1, unsigned long long i2) return 0; } +/* Compares two double precision numbers, returning -1,0,1 for <,=,> */ +static int compare_dbl(double d1, double d2) +{ + if (d1 < d2) + return -1; + if (d1 > d2) + return 1; + return 0; +} + /* Comparison function for use with qsort. Compares two domains using the * current sort field. */ static int compare_domains(xenstat_domain **domain1, xenstat_domain **domain2) @@ -523,7 +534,7 @@ static double get_cpu_pct(xenstat_domain *domain) static int compare_cpu_pct(xenstat_domain *domain1, xenstat_domain *domain2) { - return -compare(get_cpu_pct(domain1), get_cpu_pct(domain2)); + return -compare_dbl(get_cpu_pct(domain1), get_cpu_pct(domain2)); } /* Prints cpu percentage statistic */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Tue May 21 23:12:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 May 2024 23:12:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727125.1131527 (Exim 4.92) (envelope-from ) id 1s9Yf8-0005ty-5n; Tue, 21 May 2024 23:12:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727125.1131527; Tue, 21 May 2024 23:12: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 1s9Yf8-0005tq-31; Tue, 21 May 2024 23:12:54 +0000 Received: by outflank-mailman (input) for mailman id 727125; Tue, 21 May 2024 23:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yf7-0005tg-Ey for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9Yf7-0006dY-EB for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9Yf7-0001u9-DE for xen-changelog@lists.xenproject.org; Tue, 21 May 2024 23:12: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=lHNZwlWW8fSXfu6m0shi67OOGDNKE+MT2mAZJyUYTz0=; b=n+cB9GqmwTON+kuxFJkMyHOdYU 0o1nWNTr+fHeOR/m7kPiwuqlcNzqssHOQ3ZZwAVEYYlXZ4MzJP6IefeshprhH2XMbjjw31kQAJxkA igir1qapdGCzD7/yZ69VQryabGZYNNzCMUIf73Dh4P5vHatoT1QqjzjRlWY5Vyr79+Gc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/mtrr: avoid system wide rendezvous when setting AP MTRRs Message-Id: Date: Tue, 21 May 2024 23:12:53 +0000 commit 7cdb1fa2ab0b5e11f66cada0370770404153c824 Author: Roger Pau Monné AuthorDate: Tue May 21 10:25:39 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 10:25:39 2024 +0200 x86/mtrr: avoid system wide rendezvous when setting AP MTRRs There's no point in forcing a system wide update of the MTRRs on all processors when there are no changes to be propagated. On AP startup it's only the AP that needs to write the system wide MTRR values in order to match the rest of the already online CPUs. We have occasionally seen the watchdog trigger during `xen-hptool cpu-online` in one Intel Cascade Lake box with 448 CPUs due to the re-setting of the MTRRs on all the CPUs in the system. While there adjust the comment to clarify why the system-wide resetting of the MTRR registers is not needed for the purposes of mtrr_ap_init(). Signed-off-by: Roger Pau Monné Release-acked-by: Oleksii Kurochko Acked-by: Andrew Cooper master commit: abd00b037da5ffa4e8c4508a5df0cd6eabb805a4 master date: 2024-05-15 19:59:52 +0100 --- xen/arch/x86/cpu/mtrr/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index 90b235f57e..0a44ebbcb0 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -573,14 +573,15 @@ void mtrr_ap_init(void) if (!mtrr_if || hold_mtrr_updates_on_aps) return; /* - * Ideally we should hold mtrr_mutex here to avoid mtrr entries changed, - * but this routine will be called in cpu boot time, holding the lock - * breaks it. This routine is called in two cases: 1.very earily time - * of software resume, when there absolutely isn't mtrr entry changes; - * 2.cpu hotadd time. We let mtrr_add/del_page hold cpuhotplug lock to - * prevent mtrr entry changes + * hold_mtrr_updates_on_aps takes care of preventing unnecessary MTRR + * updates when batch starting the CPUs (see + * mtrr_aps_sync_{begin,end}()). + * + * Otherwise just apply the current system wide MTRR values to this AP. + * Note this doesn't require synchronization with the other CPUs, as + * there are strictly no modifications of the current MTRR values. */ - set_mtrr(~0U, 0, 0, 0); + mtrr_set_all(); } /** -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:55:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727552.1132026 (Exim 4.92) (envelope-from ) id 1s9lUl-0000io-8p; Wed, 22 May 2024 12:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727552.1132026; Wed, 22 May 2024 12:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lUl-0000ig-6B; Wed, 22 May 2024 12:55:03 +0000 Received: by outflank-mailman (input) for mailman id 727552; Wed, 22 May 2024 12:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lUj-0000ia-N7 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lUj-0004m7-Ie for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lUj-0006aq-Gp for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=atYe0Ya93RjuX7NhFPnD/uYEGeIt8FOvSwii66Go3SE=; b=P3FYOIWU8ILnBq3NMjvgw4Jtje a/a0LwUlMk0M50qPZhrII8qkDuq4olpwWm8Vps+7f/nkfnTKAuzXR2rgDsBdY2x/NJy42cH5YzNd7 iRunMRqCN53w4UPSXgr9QCRRsF5bmOfiVQE5m8M3eMatBShknTEqaM0M/KAFcoGiJeRw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/trace: Introduce new API Message-Id: Date: Wed, 22 May 2024 12:55:01 +0000 commit e978b462ec9a74ec90788fca0b9d37707e1f79c4 Author: Andrew Cooper AuthorDate: Mon Sep 20 13:36:12 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/trace: Introduce new API trace() and trace_time(), in function form for struct arguments, and macro form for simple uint32_t list arguments. This will be used to clean up the mess of macros which exists throughout the codebase, as well as eventually dropping __trace_var(). There is intentionally no macro to split a 64-bit parameter in the new API, for MISRA reasons. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap --- xen/common/trace.c | 5 +++++ xen/include/xen/trace.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/xen/common/trace.c b/xen/common/trace.c index 4e7b080e61..c94ce1f7dc 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -808,6 +808,11 @@ unlock: tasklet_schedule(&trace_notify_dom0_tasklet); } +void trace(uint32_t event, unsigned int extra, const void *extra_data) +{ + __trace_var(event, event & TRC_HD_CYCLE_FLAG, extra, extra_data); +} + void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) { diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index 055883287e..9dc7e3d621 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -37,6 +37,9 @@ int tb_control(struct xen_sysctl_tbuf_op *tbc); int trace_will_trace_event(u32 event); +/* Create a trace record, with pre-constructed additional parameters. */ +void trace(uint32_t event, unsigned int extra, const void *extra_data); + void __trace_var(uint32_t event, bool cycles, unsigned int extra, const void *); static inline void trace_var(uint32_t event, bool cycles, unsigned int extra, @@ -66,6 +69,9 @@ static inline int trace_will_trace_event(uint32_t event) return 0; } +static inline void trace( + uint32_t event, unsigned int extra, const void *extra_data) {} + static inline void trace_var(uint32_t event, bool cycles, unsigned int extra, const void *extra_data) {} static inline void __trace_var(uint32_t event, bool cycles, unsigned int extra, @@ -74,6 +80,30 @@ static inline void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) {} #endif /* CONFIG_TRACEBUFFER */ +/* Create a trace record with time included. */ +static inline void trace_time( + uint32_t event, unsigned int extra, const void *extra_data) +{ + trace(event | TRC_HD_CYCLE_FLAG, extra, extra_data); +} + +/* + * Create a trace record, packaging up to 7 additional parameters into a + * uint32_t array. + */ +#define TRACE(_e, ...) \ + do { \ + if ( unlikely(tb_init_done) ) \ + { \ + uint32_t _d[] = { __VA_ARGS__ }; \ + BUILD_BUG_ON(ARRAY_SIZE(_d) > TRACE_EXTRA_MAX); \ + trace(_e, sizeof(_d), sizeof(_d) ? _d : NULL); \ + } \ + } while ( 0 ) + +/* Create a trace record with time included. */ +#define TRACE_TIME(_e, ...) TRACE((_e) | TRC_HD_CYCLE_FLAG, ## __VA_ARGS__) + /* Convenience macros for calling the trace function. */ #define TRACE_0D(_e) \ do { \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727553.1132030 (Exim 4.92) (envelope-from ) id 1s9lUv-0000kg-A0; Wed, 22 May 2024 12:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727553.1132030; Wed, 22 May 2024 12: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 1s9lUv-0000kZ-7a; Wed, 22 May 2024 12:55:13 +0000 Received: by outflank-mailman (input) for mailman id 727553; Wed, 22 May 2024 12:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lUt-0000kJ-N6 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lUt-0004mi-MI for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lUt-0006bi-L2 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jXlITDitXeHaETpgNfP6IycYp7Ddaw1LxKdA1noxajM=; b=mv4uvCbMgl6nWcl/RoRnMUeflx vY6EvZSz5qwoCdkbcQX5i9fFc8PYUe/CDrke7wR5XIdpDdy6PJlOTINo8pi88Si91h3LmcGE8ib+g EPwitHHLy5iA3ZgWbtUAN77q3Uel1eH/Bi1WVg4F8rp7LMzaNlAOw4tOM5W/WEYycusg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/credit2: Clean up trace handling Message-Id: Date: Wed, 22 May 2024 12:55:11 +0000 commit ab8bc198507de47429e0b06dfd4e31c0d9461a34 Author: Andrew Cooper AuthorDate: Wed Sep 15 17:01:43 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/credit2: Clean up trace handling There is no need for bitfields anywhere - use types with an explicit width instead. There is also no need to cast 'd' to (unsigned char *) before passing it to a function taking void *. Switch to new trace_time() API. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Dario Faggioli --- xen/common/sched/credit2.c | 303 ++++++++++++++++++++++----------------------- 1 file changed, 148 insertions(+), 155 deletions(-) diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index 0962b52415..685929c290 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -1085,13 +1085,13 @@ static void update_max_weight(struct csched2_runqueue_data *rqd, int new_weight, if ( unlikely(tb_init_done) ) { struct { - unsigned rqi:16, max_weight:16; - } d; - d.rqi = rqd->id; - d.max_weight = rqd->max_weight; - __trace_var(TRC_CSCHED2_RUNQ_MAX_WEIGHT, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t rqi, max_weight; + } d = { + .rqi = rqd->id, + .max_weight = rqd->max_weight, + }; + + trace_time(TRC_CSCHED2_RUNQ_MAX_WEIGHT, sizeof(d), &d); } } @@ -1119,9 +1119,7 @@ _runq_assign(struct csched2_unit *svc, struct csched2_runqueue_data *rqd) .rqi = rqd->id, }; - __trace_var(TRC_CSCHED2_RUNQ_ASSIGN, 1, - sizeof(d), - (unsigned char *)&d); + trace_time(TRC_CSCHED2_RUNQ_ASSIGN, sizeof(d), &d); } } @@ -1354,9 +1352,7 @@ update_runq_load(const struct scheduler *ops, .shift = P, }; - __trace_var(TRC_CSCHED2_UPDATE_RUNQ_LOAD, 1, - sizeof(d), - (unsigned char *)&d); + trace_time(TRC_CSCHED2_UPDATE_RUNQ_LOAD, sizeof(d), &d); } } @@ -1406,16 +1402,16 @@ update_svc_load(const struct scheduler *ops, { struct { uint64_t v_avgload; - unsigned unit:16, dom:16; - unsigned shift; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.v_avgload = svc->avgload; - d.shift = P; - __trace_var(TRC_CSCHED2_UPDATE_UNIT_LOAD, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t shift; + } d = { + .v_avgload = svc->avgload, + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .shift = P, + }; + + trace_time(TRC_CSCHED2_UPDATE_UNIT_LOAD, sizeof(d), &d); } } @@ -1424,7 +1420,7 @@ update_load(const struct scheduler *ops, struct csched2_runqueue_data *rqd, struct csched2_unit *svc, int change, s_time_t now) { - trace_var(TRC_CSCHED2_UPDATE_LOAD, 1, 0, NULL); + TRACE_TIME(TRC_CSCHED2_UPDATE_LOAD); update_runq_load(ops, rqd, change, now); if ( svc ) @@ -1462,15 +1458,15 @@ static void runq_insert(struct csched2_unit *svc) if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned pos; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.pos = pos; - __trace_var(TRC_CSCHED2_RUNQ_POS, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t pos; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .pos = pos, + }; + + trace_time(TRC_CSCHED2_RUNQ_POS, sizeof(d), &d); } } @@ -1563,16 +1559,16 @@ static s_time_t tickle_score(const struct scheduler *ops, s_time_t now, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - int credit, score; - } d; - d.dom = cur->unit->domain->domain_id; - d.unit = cur->unit->unit_id; - d.credit = cur->credit; - d.score = score; - __trace_var(TRC_CSCHED2_TICKLE_CHECK, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + int32_t credit, score; + } d = { + .unit = cur->unit->unit_id, + .dom = cur->unit->domain->domain_id, + .credit = cur->credit, + .score = score, + }; + + trace_time(TRC_CSCHED2_TICKLE_CHECK, sizeof(d), &d); } return score; @@ -1610,17 +1606,17 @@ runq_tickle(const struct scheduler *ops, struct csched2_unit *new, s_time_t now) if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned processor; - int credit; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.processor = cpu; - d.credit = new->credit; - __trace_var(TRC_CSCHED2_TICKLE_NEW, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t processor; + int32_t credit; + } d = { + .dom = unit->domain->domain_id, + .unit = unit->unit_id, + .processor = cpu, + .credit = new->credit, + }; + + trace_time(TRC_CSCHED2_TICKLE_NEW, sizeof(d), &d); } /* @@ -1759,12 +1755,12 @@ runq_tickle(const struct scheduler *ops, struct csched2_unit *new, s_time_t now) if ( unlikely(tb_init_done) ) { struct { - unsigned cpu:16, pad:16; - } d; - d.cpu = ipid; d.pad = 0; - __trace_var(TRC_CSCHED2_TICKLE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t cpu, _pad; + } d = { + .cpu = ipid, + }; + + trace_time(TRC_CSCHED2_TICKLE, sizeof(d), &d); } tickle_cpu(ipid, rqd); @@ -1840,16 +1836,16 @@ static void reset_credit(int cpu, s_time_t now, struct csched2_unit *snext) if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - int credit_start, credit_end; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.credit_start = start_credit; - d.credit_end = svc->credit; - __trace_var(TRC_CSCHED2_CREDIT_RESET, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + int32_t credit_start, credit_end; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .credit_start = start_credit, + .credit_end = svc->credit, + }; + + trace_time(TRC_CSCHED2_CREDIT_RESET, sizeof(d), &d); } } @@ -1895,18 +1891,17 @@ void burn_credits(struct csched2_runqueue_data *rqd, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - int credit, budget; - int delta; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.credit = svc->credit; - d.budget = has_cap(svc) ? svc->budget : INT_MIN; - d.delta = delta; - __trace_var(TRC_CSCHED2_CREDIT_BURN, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + int32_t credit, budget, delta; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .credit = svc->credit, + .budget = has_cap(svc) ? svc->budget : INT_MIN, + .delta = delta, + }; + + trace_time(TRC_CSCHED2_CREDIT_BURN, sizeof(d), &d); } } @@ -2551,17 +2546,17 @@ csched2_res_pick(const struct scheduler *ops, const struct sched_unit *unit) { struct { uint64_t b_avgload; - unsigned unit:16, dom:16; - unsigned rq_id:16, new_cpu:16; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.rq_id = min_rqd ? min_rqd->id : -1; - d.b_avgload = min_avgload; - d.new_cpu = new_cpu; - __trace_var(TRC_CSCHED2_PICKED_CPU, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint16_t rq_id, new_cpu; + } d = { + .b_avgload = min_avgload, + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .rq_id = min_rqd ? min_rqd->id : -1, + .new_cpu = new_cpu, + }; + + trace_time(TRC_CSCHED2_PICKED_CPU, sizeof(d), &d); } return get_sched_res(new_cpu); @@ -2622,16 +2617,16 @@ static void migrate(const struct scheduler *ops, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned rqi:16, trqi:16; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.rqi = svc->rqd->id; - d.trqi = trqd->id; - __trace_var(TRC_CSCHED2_MIGRATE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint16_t rqi, trqi; + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .rqi = svc->rqd->id, + .trqi = trqd->id, + }; + + trace_time(TRC_CSCHED2_MIGRATE, sizeof(d), &d); } if ( svc->flags & CSFLAG_scheduled ) @@ -2768,15 +2763,15 @@ retry: if ( unlikely(tb_init_done) ) { struct { - unsigned lrq_id:16, orq_id:16; - unsigned load_delta; - } d; - d.lrq_id = st.lrqd->id; - d.orq_id = st.orqd->id; - d.load_delta = st.load_delta; - __trace_var(TRC_CSCHED2_LOAD_CHECK, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t lrq_id, orq_id; + uint32_t load_delta; + } d = { + .lrq_id = st.lrqd->id, + .orq_id = st.orqd->id, + .load_delta = st.load_delta, + }; + + trace_time(TRC_CSCHED2_LOAD_CHECK, sizeof(d), &d); } /* @@ -2820,9 +2815,7 @@ retry: .orq_id = st.orqd->id, }; - __trace_var(TRC_CSCHED2_LOAD_BALANCE, 1, - sizeof(d), - (unsigned char *)&d); + trace_time(TRC_CSCHED2_LOAD_BALANCE, sizeof(d), &d); } SCHED_STAT_CRANK(acct_load_balance); @@ -3407,15 +3400,15 @@ runq_candidate(struct csched2_runqueue_data *rqd, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned runtime; - } d; - d.dom = scurr->unit->domain->domain_id; - d.unit = scurr->unit->unit_id; - d.runtime = now - scurr->unit->state_entry_time; - __trace_var(TRC_CSCHED2_RATELIMIT, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t runtime; + } d = { + .unit = scurr->unit->unit_id, + .dom = scurr->unit->domain->domain_id, + .runtime = now - scurr->unit->state_entry_time, + }; + + trace_time(TRC_CSCHED2_RATELIMIT, sizeof(d), &d); } return scurr; } @@ -3468,13 +3461,13 @@ runq_candidate(struct csched2_runqueue_data *rqd, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - __trace_var(TRC_CSCHED2_RUNQ_CAND_CHECK, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + }; + + trace_time(TRC_CSCHED2_RUNQ_CAND_CHECK, sizeof(d), &d); } /* @@ -3542,17 +3535,17 @@ runq_candidate(struct csched2_runqueue_data *rqd, if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned tickled_cpu; - int credit; - } d; - d.dom = snext->unit->domain->domain_id; - d.unit = snext->unit->unit_id; - d.credit = snext->credit; - d.tickled_cpu = snext->tickled_cpu; - __trace_var(TRC_CSCHED2_RUNQ_CANDIDATE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t tickled_cpu; + int32_t credit; + } d = { + .unit = snext->unit->unit_id, + .dom = snext->unit->domain->domain_id, + .tickled_cpu = snext->tickled_cpu, + .credit = snext->credit, + }; + + trace_time(TRC_CSCHED2_RUNQ_CANDIDATE, sizeof(d), &d); } if ( unlikely(snext->tickled_cpu != -1 && snext->tickled_cpu != cpu) ) @@ -3608,18 +3601,18 @@ static void cf_check csched2_schedule( if ( unlikely(tb_init_done) ) { struct { - unsigned cpu:16, rq_id:16; - unsigned tasklet:8, idle:8, smt_idle:8, tickled:8; - } d; - d.cpu = cur_cpu; - d.rq_id = c2r(sched_cpu); - d.tasklet = tasklet_work_scheduled; - d.idle = is_idle_unit(currunit); - d.smt_idle = cpumask_test_cpu(sched_cpu, &rqd->smt_idle); - d.tickled = tickled; - __trace_var(TRC_CSCHED2_SCHEDULE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t cpu, rq_id; + uint8_t tasklet, idle, smt_idle, tickled; + } d = { + .cpu = cur_cpu, + .rq_id = c2r(sched_cpu), + .tasklet = tasklet_work_scheduled, + .idle = is_idle_unit(currunit), + .smt_idle = cpumask_test_cpu(sched_cpu, &rqd->smt_idle), + .tickled = tickled, + }; + + trace_time(TRC_CSCHED2_SCHEDULE, sizeof(d), &d); } /* Update credits (and budget, if necessary). */ @@ -3654,7 +3647,7 @@ static void cf_check csched2_schedule( if ( tasklet_work_scheduled ) { __clear_bit(__CSFLAG_unit_yield, &scurr->flags); - trace_var(TRC_CSCHED2_SCHED_TASKLET, 1, 0, NULL); + TRACE_TIME(TRC_CSCHED2_SCHED_TASKLET); snext = csched2_unit(sched_idle_unit(sched_cpu)); } else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:55:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727554.1132034 (Exim 4.92) (envelope-from ) id 1s9lV5-0000nL-Bj; Wed, 22 May 2024 12:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727554.1132034; Wed, 22 May 2024 12: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 1s9lV5-0000nD-94; Wed, 22 May 2024 12:55:23 +0000 Received: by outflank-mailman (input) for mailman id 727554; Wed, 22 May 2024 12:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lV3-0000n3-RI for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lV3-0004mp-QV for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lV3-0006cK-Of for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Jr/7SSifTygnJy8KvneVCYaT+wDYuof6ufisOI4i/qU=; b=QihwMTZshDgpEk+Oylon2aYznm SyBYZhbf5KZizDUsRbJ+RoKz3V3dNg2llt88s/g9F7wb53fuR62nKhiy8XX5Bq1kPccfSO1fpnFpD 2H31qcLREBtvp6qlpMMcwkwtBa3NaqPWZ+PqheIm/0hKUvkcYDxeboryaKBDWKN4Z9B0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/rt: Clean up trace handling Message-Id: Date: Wed, 22 May 2024 12:55:21 +0000 commit df50666449a4ef0bc28f3118dc8adf1ecf5ba4a1 Author: Andrew Cooper AuthorDate: Fri Sep 17 16:28:19 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/rt: Clean up trace handling Most uses of bitfields and __packed are unnecessary. There is also no need to cast 'd' to (unsigned char *) before passing it to a function taking void *. Switch to new trace_time() API. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched/rt.c | 99 ++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 52 deletions(-) diff --git a/xen/common/sched/rt.c b/xen/common/sched/rt.c index b279f957f6..f368e0fdd5 100644 --- a/xen/common/sched/rt.c +++ b/xen/common/sched/rt.c @@ -455,21 +455,21 @@ rt_update_deadline(s_time_t now, struct rt_unit *svc) svc->cur_budget = svc->budget; svc->priority_level = 0; - /* TRACE */ + if ( unlikely(tb_init_done) ) { - struct __packed { - unsigned unit:16, dom:16; - unsigned priority_level; + struct { + uint16_t unit, dom; + uint32_t priority_level; uint64_t cur_deadline, cur_budget; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.priority_level = svc->priority_level; - d.cur_deadline = (uint64_t) svc->cur_deadline; - d.cur_budget = (uint64_t) svc->cur_budget; - trace_var(TRC_RTDS_BUDGET_REPLENISH, 1, - sizeof(d), - (unsigned char *) &d); + } d = { + .dom = svc->unit->domain->domain_id, + .unit = svc->unit->unit_id, + .priority_level = svc->priority_level, + .cur_deadline = svc->cur_deadline, + .cur_budget = svc->cur_budget, + }; + + trace_time(TRC_RTDS_BUDGET_REPLENISH, sizeof(d), &d); } return; @@ -986,7 +986,7 @@ burn_budget(const struct scheduler *ops, struct rt_unit *svc, s_time_t now) } } - /* TRACE */ + if ( unlikely(tb_init_done) ) { struct __packed { uint16_t unit, dom; @@ -1003,9 +1003,7 @@ burn_budget(const struct scheduler *ops, struct rt_unit *svc, s_time_t now) .has_extratime = !!(svc->flags & RTDS_extratime), }; - trace_var(TRC_RTDS_BUDGET_BURN, 1, - sizeof(d), - (unsigned char *) &d); + trace_time(TRC_RTDS_BUDGET_BURN, sizeof(d), &d); } } @@ -1040,22 +1038,19 @@ runq_pick(const struct scheduler *ops, const cpumask_t *mask, unsigned int cpu) break; } - /* TRACE */ + if ( unlikely(tb_init_done) && svc ) { - if( svc != NULL ) - { - struct __packed { - unsigned unit:16, dom:16; - uint64_t cur_deadline, cur_budget; - } d; - d.dom = svc->unit->domain->domain_id; - d.unit = svc->unit->unit_id; - d.cur_deadline = (uint64_t) svc->cur_deadline; - d.cur_budget = (uint64_t) svc->cur_budget; - trace_var(TRC_RTDS_RUNQ_PICK, 1, - sizeof(d), - (unsigned char *) &d); - } + struct __packed { + uint16_t unit, dom; + uint64_t cur_deadline, cur_budget; + } d = { + .unit = svc->unit->unit_id, + .dom = svc->unit->domain->domain_id, + .cur_deadline = svc->cur_deadline, + .cur_budget = svc->cur_budget, + }; + + trace_time(TRC_RTDS_RUNQ_PICK, sizeof(d), &d); } return svc; @@ -1076,18 +1071,19 @@ rt_schedule(const struct scheduler *ops, struct sched_unit *currunit, struct rt_unit *snext = NULL; bool migrated = false; - /* TRACE */ + if ( unlikely(tb_init_done) ) { - struct __packed { - unsigned cpu:16, tasklet:8, tickled:4, idle:4; - } d; - d.cpu = cur_cpu; - d.tasklet = tasklet_work_scheduled; - d.tickled = cpumask_test_cpu(sched_cpu, &prv->tickled); - d.idle = is_idle_unit(currunit); - trace_var(TRC_RTDS_SCHEDULE, 1, - sizeof(d), - (unsigned char *)&d); + struct { + uint16_t cpu; + uint8_t tasklet, tickled:4, idle:4; + } d = { + .cpu = cur_cpu, + .tasklet = tasklet_work_scheduled, + .tickled = cpumask_test_cpu(sched_cpu, &prv->tickled), + .idle = is_idle_unit(currunit), + }; + + trace_time(TRC_RTDS_SCHEDULE, sizeof(d), &d); } /* clear ticked bit now that we've been scheduled */ @@ -1098,7 +1094,7 @@ rt_schedule(const struct scheduler *ops, struct sched_unit *currunit, if ( tasklet_work_scheduled ) { - trace_var(TRC_RTDS_SCHED_TASKLET, 1, 0, NULL); + TRACE_TIME(TRC_RTDS_SCHED_TASKLET); snext = rt_unit(sched_idle_unit(sched_cpu)); } else @@ -1250,16 +1246,15 @@ runq_tickle(const struct scheduler *ops, const struct rt_unit *new) SCHED_STAT_CRANK(tickled_no_cpu); return; out: - /* TRACE */ + if ( unlikely(tb_init_done) ) { struct { - unsigned cpu:16, pad:16; - } d; - d.cpu = cpu_to_tickle; - d.pad = 0; - trace_var(TRC_RTDS_TICKLE, 1, - sizeof(d), - (unsigned char *)&d); + uint16_t cpu, _pad; + } d = { + .cpu = cpu_to_tickle, + }; + + trace_time(TRC_RTDS_TICKLE, sizeof(d), &d); } cpumask_set_cpu(cpu_to_tickle, &prv->tickled); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:55:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727555.1132037 (Exim 4.92) (envelope-from ) id 1s9lVF-0000rL-EF; Wed, 22 May 2024 12:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727555.1132037; Wed, 22 May 2024 12: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 1s9lVF-0000rE-Bj; Wed, 22 May 2024 12:55:33 +0000 Received: by outflank-mailman (input) for mailman id 727555; Wed, 22 May 2024 12:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVD-0000qp-VY for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVD-0004mw-Tv for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lVD-0006d9-T3 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YtF2mB3eL/t0i2IGie2jgePfVG0SwaBJ9nbB59w7Czc=; b=QL+HyqORkA8eBtj2gXyhEkjKAF oPby/T+uuo/NHtPkhoWozwJHECKmKyRpWhk7mAEB9Nw3IOzoIJZUSztoUKp2EM4J8fue3PG/Dorv8 Y2QeRpqTVcr3PMkEBeRmCuXYnM2W0QXpFPozsZtmn167E5L5ox1tF3jOPm2N6XzDWB9I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sched: Clean up trace handling Message-Id: Date: Wed, 22 May 2024 12:55:31 +0000 commit d64693df1ab98f5278cf32ab3e0c12295237c42b Author: Andrew Cooper AuthorDate: Mon Sep 20 14:07:43 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/sched: Clean up trace handling There is no need for bitfields anywhere - use more sensible types. There is also no need to cast 'd' to (unsigned char *) before passing it to a function taking void *. Switch to new trace_time() API. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched/core.c | 56 ++++++++++++++++++------------------- xen/common/sched/credit.c | 70 ++++++++++++++++++++++------------------------- xen/common/sched/null.c | 63 ++++++++++++++++++++++++------------------ 3 files changed, 97 insertions(+), 92 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index babac7aad6..d84b65f197 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -205,7 +205,7 @@ static inline struct scheduler *vcpu_scheduler(const struct vcpu *v) static inline void trace_runstate_change(const struct vcpu *v, int new_state) { - struct { uint32_t vcpu:16, domain:16; } d; + struct { uint16_t vcpu, domain; } d; uint32_t event; if ( likely(!tb_init_done) ) @@ -218,12 +218,12 @@ static inline void trace_runstate_change(const struct vcpu *v, int new_state) event |= ( v->runstate.state & 0x3 ) << 8; event |= ( new_state & 0x3 ) << 4; - __trace_var(event, 1/*tsc*/, sizeof(d), &d); + trace_time(event, sizeof(d), &d); } static inline void trace_continue_running(const struct vcpu *v) { - struct { uint32_t vcpu:16, domain:16; } d; + struct { uint16_t vcpu, domain; } d; if ( likely(!tb_init_done) ) return; @@ -231,7 +231,7 @@ static inline void trace_continue_running(const struct vcpu *v) d.vcpu = v->vcpu_id; d.domain = v->domain->domain_id; - __trace_var(TRC_SCHED_CONTINUE_RUNNING, 1/*tsc*/, sizeof(d), &d); + trace_time(TRC_SCHED_CONTINUE_RUNNING, sizeof(d), &d); } static inline void vcpu_urgent_count_update(struct vcpu *v) @@ -872,7 +872,7 @@ int sched_init_domain(struct domain *d, unsigned int poolid) return ret; SCHED_STAT_CRANK(dom_init); - TRACE_1D(TRC_SCHED_DOM_ADD, d->domain_id); + TRACE_TIME(TRC_SCHED_DOM_ADD, d->domain_id); rcu_read_lock(&sched_res_rculock); @@ -895,7 +895,7 @@ void sched_destroy_domain(struct domain *d) if ( d->cpupool ) { SCHED_STAT_CRANK(dom_destroy); - TRACE_1D(TRC_SCHED_DOM_REM, d->domain_id); + TRACE_TIME(TRC_SCHED_DOM_REM, d->domain_id); rcu_read_lock(&sched_res_rculock); @@ -936,7 +936,7 @@ void vcpu_sleep_nosync(struct vcpu *v) unsigned long flags; spinlock_t *lock; - TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); + TRACE_TIME(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); rcu_read_lock(&sched_res_rculock); @@ -965,7 +965,7 @@ void vcpu_wake(struct vcpu *v) spinlock_t *lock; struct sched_unit *unit = v->sched_unit; - TRACE_2D(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id); + TRACE_TIME(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id); rcu_read_lock(&sched_res_rculock); @@ -1425,7 +1425,7 @@ void vcpu_block(void) } else { - TRACE_2D(TRC_SCHED_BLOCK, v->domain->domain_id, v->vcpu_id); + TRACE_TIME(TRC_SCHED_BLOCK, v->domain->domain_id, v->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); } } @@ -1498,7 +1498,7 @@ static long do_poll(const struct sched_poll *sched_poll) if ( sched_poll->timeout != 0 ) set_timer(&v->poll_timer, sched_poll->timeout); - TRACE_2D(TRC_SCHED_BLOCK, d->domain_id, v->vcpu_id); + TRACE_TIME(TRC_SCHED_BLOCK, d->domain_id, v->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); return 0; @@ -1526,7 +1526,7 @@ long vcpu_yield(void) SCHED_STAT_CRANK(vcpu_yield); - TRACE_2D(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id); + TRACE_TIME(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id); raise_softirq(SCHEDULE_SOFTIRQ); return 0; } @@ -1904,9 +1904,8 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&sched_shutdown, arg, 1) ) break; - TRACE_3D(TRC_SCHED_SHUTDOWN, - current->domain->domain_id, current->vcpu_id, - sched_shutdown.reason); + TRACE_TIME(TRC_SCHED_SHUTDOWN, current->domain->domain_id, + current->vcpu_id, sched_shutdown.reason); ret = domain_shutdown(current->domain, (u8)sched_shutdown.reason); break; @@ -1921,8 +1920,8 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( copy_from_guest(&sched_shutdown, arg, 1) ) break; - TRACE_3D(TRC_SCHED_SHUTDOWN_CODE, - d->domain_id, current->vcpu_id, sched_shutdown.reason); + TRACE_TIME(TRC_SCHED_SHUTDOWN_CODE, d->domain_id, current->vcpu_id, + sched_shutdown.reason); spin_lock(&d->shutdown_lock); if ( d->shutdown_code == SHUTDOWN_CODE_INVALID ) @@ -2086,7 +2085,7 @@ long sched_adjust(struct domain *d, struct xen_domctl_scheduler_op *op) rcu_read_lock(&sched_res_rculock); if ( (ret = sched_adjust_dom(dom_scheduler(d), d, op)) == 0 ) - TRACE_1D(TRC_SCHED_ADJDOM, d->domain_id); + TRACE_TIME(TRC_SCHED_ADJDOM, d->domain_id); rcu_read_unlock(&sched_res_rculock); @@ -2181,14 +2180,13 @@ static void sched_switch_units(struct sched_resource *sr, sr->curr = next; sr->prev = prev; - TRACE_3D(TRC_SCHED_SWITCH_INFPREV, prev->domain->domain_id, - prev->unit_id, now - prev->state_entry_time); - TRACE_4D(TRC_SCHED_SWITCH_INFNEXT, next->domain->domain_id, - next->unit_id, - (next->vcpu_list->runstate.state == RUNSTATE_runnable) ? - (now - next->state_entry_time) : 0, prev->next_time); - TRACE_4D(TRC_SCHED_SWITCH, prev->domain->domain_id, prev->unit_id, - next->domain->domain_id, next->unit_id); + TRACE_TIME(TRC_SCHED_SWITCH_INFPREV, prev->domain->domain_id, + prev->unit_id, now - prev->state_entry_time); + TRACE_TIME(TRC_SCHED_SWITCH_INFNEXT, next->domain->domain_id, next->unit_id, + (next->vcpu_list->runstate.state == RUNSTATE_runnable) ? + (now - next->state_entry_time) : 0, prev->next_time); + TRACE_TIME(TRC_SCHED_SWITCH, prev->domain->domain_id, prev->unit_id, + next->domain->domain_id, next->unit_id); ASSERT(!unit_running(next)); @@ -2379,10 +2377,10 @@ static void sched_context_switch(struct vcpu *vprev, struct vcpu *vnext, { if ( unlikely(vprev == vnext) ) { - TRACE_4D(TRC_SCHED_SWITCH_INFCONT, - vnext->domain->domain_id, vnext->sched_unit->unit_id, - now - vprev->runstate.state_entry_time, - vprev->sched_unit->next_time); + TRACE_TIME(TRC_SCHED_SWITCH_INFCONT, + vnext->domain->domain_id, vnext->sched_unit->unit_id, + now - vprev->runstate.state_entry_time, + vprev->sched_unit->next_time); sched_context_switched(vprev, vnext); /* diff --git a/xen/common/sched/credit.c b/xen/common/sched/credit.c index a72d071527..020f44595e 100644 --- a/xen/common/sched/credit.c +++ b/xen/common/sched/credit.c @@ -493,7 +493,7 @@ static inline void __runq_tickle(const struct csched_unit *new) { /* Avoid TRACE_*: saves checking !tb_init_done each step */ for_each_cpu(cpu, &mask) - __trace_var(TRC_CSCHED_TICKLE, 1, sizeof(cpu), &cpu); + trace_time(TRC_CSCHED_TICKLE, sizeof(cpu), &cpu); } /* @@ -862,8 +862,7 @@ _csched_cpu_pick(const struct scheduler *ops, const struct sched_unit *unit, if ( commit && spc ) spc->idle_bias = cpu; - TRACE_3D(TRC_CSCHED_PICKED_CPU, unit->domain->domain_id, unit->unit_id, - cpu); + TRACE_TIME(TRC_CSCHED_PICKED_CPU, unit->domain->domain_id, unit->unit_id, cpu); return cpu; } @@ -907,8 +906,8 @@ __csched_unit_acct_start(struct csched_private *prv, struct csched_unit *svc) } } - TRACE_3D(TRC_CSCHED_ACCOUNT_START, sdom->dom->domain_id, - svc->unit->unit_id, sdom->active_unit_count); + TRACE_TIME(TRC_CSCHED_ACCOUNT_START, sdom->dom->domain_id, + svc->unit->unit_id, sdom->active_unit_count); spin_unlock_irqrestore(&prv->lock, flags); } @@ -933,8 +932,8 @@ __csched_unit_acct_stop_locked(struct csched_private *prv, list_del_init(&sdom->active_sdom_elem); } - TRACE_3D(TRC_CSCHED_ACCOUNT_STOP, sdom->dom->domain_id, - svc->unit->unit_id, sdom->active_unit_count); + TRACE_TIME(TRC_CSCHED_ACCOUNT_STOP, sdom->dom->domain_id, + svc->unit->unit_id, sdom->active_unit_count); } static void @@ -957,8 +956,8 @@ csched_unit_acct(struct csched_private *prv, unsigned int cpu) if ( svc->pri == CSCHED_PRI_TS_BOOST ) { svc->pri = CSCHED_PRI_TS_UNDER; - TRACE_2D(TRC_CSCHED_BOOST_END, svc->sdom->dom->domain_id, - svc->unit->unit_id); + TRACE_TIME(TRC_CSCHED_BOOST_END, svc->sdom->dom->domain_id, + svc->unit->unit_id); } /* @@ -1164,8 +1163,7 @@ csched_unit_wake(const struct scheduler *ops, struct sched_unit *unit) if ( !migrating && svc->pri == CSCHED_PRI_TS_UNDER && !test_bit(CSCHED_FLAG_UNIT_PARKED, &svc->flags) ) { - TRACE_2D(TRC_CSCHED_BOOST_START, unit->domain->domain_id, - unit->unit_id); + TRACE_TIME(TRC_CSCHED_BOOST_START, unit->domain->domain_id, unit->unit_id); SCHED_STAT_CRANK(unit_boost); svc->pri = CSCHED_PRI_TS_BOOST; } @@ -1671,8 +1669,8 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int balance_step) if ( __csched_unit_is_migrateable(prv, unit, cpu, cpumask_scratch) ) { /* We got a candidate. Grab it! */ - TRACE_3D(TRC_CSCHED_STOLEN_UNIT, peer_cpu, - unit->domain->domain_id, unit->unit_id); + TRACE_TIME(TRC_CSCHED_STOLEN_UNIT, peer_cpu, + unit->domain->domain_id, unit->unit_id); SCHED_UNIT_STAT_CRANK(speer, migrate_q); SCHED_STAT_CRANK(migrate_queued); runq_remove(speer); @@ -1783,7 +1781,7 @@ csched_load_balance(struct csched_private *prv, int cpu, */ if ( CSCHED_PCPU(peer_cpu)->nr_runnable <= 1 ) { - TRACE_2D(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* skipp'n */ 0); + TRACE_TIME(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* skipp'n */ 0); goto next_cpu; } @@ -1799,11 +1797,11 @@ csched_load_balance(struct csched_private *prv, int cpu, if ( !lock ) { SCHED_STAT_CRANK(steal_trylock_failed); - TRACE_2D(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* skip */ 0); + TRACE_TIME(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* skip */ 0); goto next_cpu; } - TRACE_2D(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* checked */ 1); + TRACE_TIME(TRC_CSCHED_STEAL_CHECK, peer_cpu, /* checked */ 1); /* Any work over there to steal? */ speer = cpumask_test_cpu(peer_cpu, online) ? @@ -1860,21 +1858,18 @@ static void cf_check csched_schedule( SCHED_STAT_CRANK(schedule); CSCHED_UNIT_CHECK(unit); - /* - * Here in Credit1 code, we usually just call TRACE_nD() helpers, and - * don't care about packing. But scheduling happens very often, so it - * actually is important that the record is as small as possible. - */ if ( unlikely(tb_init_done) ) { struct { - unsigned cpu:16, tasklet:8, idle:8; - } d; - d.cpu = cur_cpu; - d.tasklet = tasklet_work_scheduled; - d.idle = is_idle_unit(unit); - __trace_var(TRC_CSCHED_SCHEDULE, 1, sizeof(d), - (unsigned char *)&d); + uint16_t cpu; + uint8_t tasklet, idle; + } d = { + .cpu = cur_cpu, + .tasklet = tasklet_work_scheduled, + .idle = is_idle_unit(unit), + }; + + trace_time(TRC_CSCHED_SCHEDULE, sizeof(d), &d); } runtime = now - unit->state_entry_time; @@ -1936,14 +1931,15 @@ static void cf_check csched_schedule( if ( unlikely(tb_init_done) ) { struct { - unsigned unit:16, dom:16; - unsigned runtime; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.runtime = runtime; - __trace_var(TRC_CSCHED_RATELIMIT, 1, sizeof(d), - (unsigned char *)&d); + uint16_t unit, dom; + uint32_t runtime; + } d = { + .dom = unit->domain->domain_id, + .unit = unit->unit_id, + .runtime = runtime, + }; + + trace_time(TRC_CSCHED_RATELIMIT, sizeof(d), &d); } goto out; @@ -1968,7 +1964,7 @@ static void cf_check csched_schedule( /* Tasklet work (which runs in idle UNIT context) overrides all else. */ if ( tasklet_work_scheduled ) { - TRACE_0D(TRC_CSCHED_SCHED_TASKLET); + TRACE_TIME(TRC_CSCHED_SCHED_TASKLET); snext = CSCHED_UNIT(sched_idle_unit(sched_cpu)); snext->pri = CSCHED_PRI_TS_BOOST; } diff --git a/xen/common/sched/null.c b/xen/common/sched/null.c index 2091337fcd..7e31440e5b 100644 --- a/xen/common/sched/null.c +++ b/xen/common/sched/null.c @@ -331,11 +331,13 @@ pick_res(const struct null_private *prv, const struct sched_unit *unit) struct { uint16_t unit, dom; uint32_t new_cpu; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.new_cpu = new_cpu; - __trace_var(TRC_SNULL_PICKED_CPU, 1, sizeof(d), &d); + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .new_cpu = new_cpu, + }; + + trace_time(TRC_SNULL_PICKED_CPU, sizeof(d), &d); } return get_sched_res(new_cpu); @@ -359,11 +361,13 @@ static void unit_assign(struct null_private *prv, struct sched_unit *unit, struct { uint16_t unit, dom; uint32_t cpu; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.cpu = cpu; - __trace_var(TRC_SNULL_UNIT_ASSIGN, 1, sizeof(d), &d); + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .cpu = cpu, + }; + + trace_time(TRC_SNULL_UNIT_ASSIGN, sizeof(d), &d); } } @@ -390,11 +394,13 @@ static bool unit_deassign(struct null_private *prv, const struct sched_unit *uni struct { uint16_t unit, dom; uint32_t cpu; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.cpu = cpu; - __trace_var(TRC_SNULL_UNIT_DEASSIGN, 1, sizeof(d), &d); + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .cpu = cpu, + }; + + trace_time(TRC_SNULL_UNIT_DEASSIGN, sizeof(d), &d); } spin_lock(&prv->waitq_lock); @@ -695,12 +701,14 @@ static void cf_check null_unit_migrate( struct { uint16_t unit, dom; uint16_t cpu, new_cpu; - } d; - d.dom = unit->domain->domain_id; - d.unit = unit->unit_id; - d.cpu = sched_unit_master(unit); - d.new_cpu = new_cpu; - __trace_var(TRC_SNULL_MIGRATE, 1, sizeof(d), &d); + } d = { + .unit = unit->unit_id, + .dom = unit->domain->domain_id, + .cpu = sched_unit_master(unit), + .new_cpu = new_cpu, + }; + + trace_time(TRC_SNULL_MIGRATE, sizeof(d), &d); } /* @@ -824,9 +832,11 @@ static void cf_check null_schedule( struct { uint16_t tasklet, cpu; int16_t unit, dom; - } d; - d.cpu = cur_cpu; - d.tasklet = tasklet_work_scheduled; + } d = { + .tasklet = tasklet_work_scheduled, + .cpu = cur_cpu, + }; + if ( npc->unit == NULL ) { d.unit = d.dom = -1; @@ -836,12 +846,13 @@ static void cf_check null_schedule( d.unit = npc->unit->unit_id; d.dom = npc->unit->domain->domain_id; } - __trace_var(TRC_SNULL_SCHEDULE, 1, sizeof(d), &d); + + trace_time(TRC_SNULL_SCHEDULE, sizeof(d), &d); } if ( tasklet_work_scheduled ) { - trace_var(TRC_SNULL_TASKLET, 1, 0, NULL); + TRACE_TIME(TRC_SNULL_TASKLET); prev->next_task = sched_idle_unit(sched_cpu); } else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:55:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727558.1132041 (Exim 4.92) (envelope-from ) id 1s9lVP-0000u0-Gc; Wed, 22 May 2024 12:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727558.1132041; Wed, 22 May 2024 12:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVP-0000tt-DI; Wed, 22 May 2024 12:55:43 +0000 Received: by outflank-mailman (input) for mailman id 727558; Wed, 22 May 2024 12:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVO-0000te-4A for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVO-0004n4-2X for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lVO-0006di-1X for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12: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=IqVG4sLhw0ldKqETRbEcqq+OYmEcwRKwzV9eQqpCaZw=; b=iIWVPDBB7rZ6x5pcsL7PzOiBDV kdxiyAXiAbT1yGderQgy/YuhUr+57E7T912ku9LqgqORSH1nVCtoYIpberWOAIs9uG1JV5M3vv5fO LN9N1VvSCv7x7klRoK8Ru7kUel7Z5WV8+5edc8kt0FlDyUHS0YMhPiHcvyYFbQIHA9wo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Switch to new TRACE() API Message-Id: Date: Wed, 22 May 2024 12:55:42 +0000 commit 26da08059eef35e6ce1a308dbe276e8ef6a6c5b1 Author: Andrew Cooper AuthorDate: Sat Sep 18 00:31:27 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen: Switch to new TRACE() API (Almost) no functional change. * In irq_move_cleanup_interrupt(), use the 'me' local variable rather than calling smp_processor_id() again. This manifests as a minor code improvement. * In vlapic_update_timer() and lapic_rearm(), introduce a new 'timer_period' local variable to simplify the expressions used for both the trace and create_periodic_time() calls. All other differences in the compiled binary are to do with line numbers changing. Some conversion notes: * HVMTRACE_LONG_[234]D() and TRACE_2_LONG_[234]D() were latently buggy. They blindly discard extra parameters, but luckily no users are impacted. They are also obfuscated wrappers, depending on exactly one or two parameters being TRC_PAR_LONG() to compile successfully. * HVMTRACE_LONG_1D() behaves unlike its named companions, and takes exactly one 64bit parameter which it splits manually. It's one user, vmx_cr_access()'s LMSW path, is gets adjusted. * TRACE_?D() and TRACE_2_LONG_*() change to TRACE_TIME() as cycles is always enabled. * HVMTRACE_ND() is opencoded for VMENTRY/VMEXIT records to include cycles. These are converted to TRACE_TIME(), with the old modifier parameter expressed as an OR at the callsite. One callsite, svm_vmenter_helper() had a nested tb_init_done check, which is dropped. (The optimiser also spotted this, which is why it doesn't manifest as a binary difference.) * All uses of *LONG() are either opencoded or swapped to using a struct, to avoid MISRA issues. * All HVMTRACE_?D() change to TRACE() as cycles is explicitly skipped. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap --- xen/arch/x86/acpi/cpu_idle.c | 12 +++++----- xen/arch/x86/compat.c | 4 ++-- xen/arch/x86/cpu/mwait-idle.c | 6 ++--- xen/arch/x86/emul-i8254.c | 14 +++++------ xen/arch/x86/hvm/emulate.c | 8 +++---- xen/arch/x86/hvm/hpet.c | 6 ++--- xen/arch/x86/hvm/hvm.c | 16 ++++++------- xen/arch/x86/hvm/rtc.c | 12 +++++----- xen/arch/x86/hvm/svm/intr.c | 6 ++--- xen/arch/x86/hvm/svm/svm.c | 40 +++++++++++++++----------------- xen/arch/x86/hvm/vlapic.c | 43 +++++++++++++++++++--------------- xen/arch/x86/hvm/vmx/intr.c | 6 ++--- xen/arch/x86/hvm/vmx/vmx.c | 54 +++++++++++++++++++++---------------------- xen/arch/x86/hvm/vpic.c | 13 +++++------ xen/arch/x86/irq.c | 14 +++++------ xen/arch/x86/traps.c | 2 +- xen/common/domain.c | 4 ++-- xen/common/grant_table.c | 6 ++--- xen/drivers/cpufreq/utility.c | 2 +- 19 files changed, 133 insertions(+), 135 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index c8db1aa991..57ac984790 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -767,7 +767,7 @@ static void cf_check acpi_processor_idle(void) /* Get start time (ticks) */ t1 = alternative_call(cpuidle_get_tick); /* Trace cpu idle entry */ - TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); + TRACE_TIME(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); update_last_cx_stat(power, cx, t1); @@ -777,8 +777,8 @@ static void cf_check acpi_processor_idle(void) t2 = alternative_call(cpuidle_get_tick); trace_exit_reason(irq_traced); /* Trace cpu idle exit */ - TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, - irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + TRACE_TIME(TRC_PM_IDLE_EXIT, cx->idx, t2, + irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); /* Update statistics */ update_idle_stats(power, cx, t1, t2); /* Re-enable interrupts */ @@ -798,7 +798,7 @@ static void cf_check acpi_processor_idle(void) /* Get start time (ticks) */ t1 = alternative_call(cpuidle_get_tick); /* Trace cpu idle entry */ - TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); + TRACE_TIME(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); update_last_cx_stat(power, cx, t1); @@ -853,8 +853,8 @@ static void cf_check acpi_processor_idle(void) cstate_restore_tsc(); trace_exit_reason(irq_traced); /* Trace cpu idle exit */ - TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, - irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + TRACE_TIME(TRC_PM_IDLE_EXIT, cx->idx, t2, + irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); /* Update statistics */ update_idle_stats(power, cx, t1, t2); diff --git a/xen/arch/x86/compat.c b/xen/arch/x86/compat.c index a031062830..217b5b1fcc 100644 --- a/xen/arch/x86/compat.c +++ b/xen/arch/x86/compat.c @@ -37,8 +37,8 @@ long do_sched_op_compat(int cmd, unsigned long arg) return do_sched_op(cmd, guest_handle_from_ptr(NULL, void)); case SCHEDOP_shutdown: - TRACE_3D(TRC_SCHED_SHUTDOWN, - current->domain->domain_id, current->vcpu_id, arg); + TRACE_TIME(TRC_SCHED_SHUTDOWN, + current->domain->domain_id, current->vcpu_id, arg); domain_shutdown(current->domain, (u8)arg); break; diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index ff5c808bc9..ae69871171 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -962,7 +962,7 @@ static void cf_check mwait_idle(void) lapic_timer_off(); before = alternative_call(cpuidle_get_tick); - TRACE_4D(TRC_PM_IDLE_ENTRY, cx->type, before, exp, pred); + TRACE_TIME(TRC_PM_IDLE_ENTRY, cx->type, before, exp, pred); update_last_cx_stat(power, cx, before); @@ -986,8 +986,8 @@ static void cf_check mwait_idle(void) local_irq_enable(); - TRACE_6D(TRC_PM_IDLE_EXIT, cx->type, after, - irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + TRACE_TIME(TRC_PM_IDLE_EXIT, cx->type, after, + irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); if (!(lapic_timer_reliable_states & (1 << cx->type))) lapic_timer_on(); diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 0191f80ba2..144aa168a3 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -94,7 +94,7 @@ static void cf_check pit_time_fired(struct vcpu *v, void *priv) { uint64_t *count_load_time = priv; - TRACE_0D(TRC_HVM_EMUL_PIT_TIMER_CB); + TRACE_TIME(TRC_HVM_EMUL_PIT_TIMER_CB); *count_load_time = get_guest_time(v); } @@ -128,19 +128,19 @@ static void pit_load_count(PITState *pit, int channel, int val) case 2: case 3: /* Periodic timer. */ - TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, period); + TRACE_TIME(TRC_HVM_EMUL_PIT_START_TIMER, period, period); create_periodic_time(v, &pit->pt0, period, period, 0, pit_time_fired, &pit->count_load_time[channel], false); break; case 1: case 4: /* One-shot timer. */ - TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, 0); + TRACE_TIME(TRC_HVM_EMUL_PIT_START_TIMER, period, 0); create_periodic_time(v, &pit->pt0, period, 0, 0, pit_time_fired, &pit->count_load_time[channel], false); break; default: - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_PIT_STOP_TIMER); destroy_periodic_time(&pit->pt0); break; } @@ -404,7 +404,7 @@ void pit_stop_channel0_irq(PITState *pit) if ( !has_vpit(current->domain) ) return; - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_PIT_STOP_TIMER); spin_lock(&pit->lock); destroy_periodic_time(&pit->pt0); spin_unlock(&pit->lock); @@ -615,7 +615,7 @@ void pit_reset(struct domain *d) if ( is_hvm_domain(d) ) { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_PIT_STOP_TIMER); destroy_periodic_time(&pit->pt0); pit->pt0.source = PTSRC_isa; } @@ -660,7 +660,7 @@ void pit_deinit(struct domain *d) if ( is_hvm_domain(d) ) { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_PIT_STOP_TIMER); destroy_periodic_time(&pit->pt0); } } diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index ab1bc51683..d8f36206a7 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -2181,7 +2181,7 @@ static int cf_check hvmemul_read_cr( case 3: case 4: *val = current->arch.hvm.guest_cr[reg]; - HVMTRACE_LONG_2D(CR_READ, reg, TRC_PAR_LONG(*val)); + TRACE(TRC_HVM_CR_READ64, reg, *val, *val >> 32); return X86EMUL_OKAY; default: break; @@ -2197,7 +2197,7 @@ static int cf_check hvmemul_write_cr( { int rc; - HVMTRACE_LONG_2D(CR_WRITE, reg, TRC_PAR_LONG(val)); + TRACE(TRC_HVM_CR_WRITE64, reg, val, val >> 32); switch ( reg ) { case 0: @@ -2242,7 +2242,7 @@ static int cf_check hvmemul_read_xcr( int rc = x86emul_read_xcr(reg, val, ctxt); if ( rc == X86EMUL_OKAY ) - HVMTRACE_LONG_2D(XCR_READ, reg, TRC_PAR_LONG(*val)); + TRACE(TRC_HVM_XCR_READ64, reg, *val, *val >> 32); return rc; } @@ -2252,7 +2252,7 @@ static int cf_check hvmemul_write_xcr( uint64_t val, struct x86_emulate_ctxt *ctxt) { - HVMTRACE_LONG_2D(XCR_WRITE, reg, TRC_PAR_LONG(val)); + TRACE(TRC_HVM_XCR_WRITE64, reg, val, val >> 32); return x86emul_write_xcr(reg, val, ctxt); } diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 5f456221cb..4c5b171922 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -201,7 +201,7 @@ static void hpet_stop_timer(HPETState *h, unsigned int tn, { ASSERT(tn < HPET_TIMER_NUM); ASSERT(rw_is_write_locked(&h->lock)); - TRACE_1D(TRC_HVM_EMUL_HPET_STOP_TIMER, tn); + TRACE_TIME(TRC_HVM_EMUL_HPET_STOP_TIMER, tn); destroy_periodic_time(&h->pt[tn]); /* read the comparator to get it updated so a read while stopped will * return the expected value. */ @@ -305,8 +305,8 @@ static void hpet_set_timer(HPETState *h, unsigned int tn, if ( !oneshot ) period_ns = hpet_tick_to_ns(h, h->hpet.period[tn]); - TRACE_2_LONG_4D(TRC_HVM_EMUL_HPET_START_TIMER, tn, irq, - TRC_PAR_LONG(diff_ns), TRC_PAR_LONG(period_ns)); + TRACE_TIME(TRC_HVM_EMUL_HPET_START_TIMER, tn, irq, + diff_ns, diff_ns >> 32, period_ns, period_ns >> 32); create_periodic_time(vhpet_vcpu(h), &h->pt[tn], diff_ns, period_ns, irq, timer_level(h, tn) ? hpet_timer_fired : NULL, diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 9594e0a5c5..2c92e751cb 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1705,7 +1705,7 @@ void hvm_hlt(unsigned int eflags) do_sched_op(SCHEDOP_block, guest_handle_from_ptr(NULL, void)); - HVMTRACE_1D(HLT, /* pending = */ vcpu_runnable(curr)); + TRACE(TRC_HVM_HLT, /* pending = */ vcpu_runnable(curr)); } void hvm_triple_fault(void) @@ -2159,7 +2159,7 @@ int hvm_mov_to_cr(unsigned int cr, unsigned int gpr) unsigned long val = *decode_gpr(guest_cpu_user_regs(), gpr); int rc; - HVMTRACE_LONG_2D(CR_WRITE, cr, TRC_PAR_LONG(val)); + TRACE(TRC_HVM_CR_WRITE64, cr, val, val >> 32); HVM_DBG_LOG(DBG_LEVEL_1, "CR%u, value = %lx", cr, val); switch ( cr ) @@ -2224,7 +2224,7 @@ int hvm_mov_from_cr(unsigned int cr, unsigned int gpr) } *reg = val; - HVMTRACE_LONG_2D(CR_READ, cr, TRC_PAR_LONG(val)); + TRACE(TRC_HVM_CR_READ64, cr, val, val >> 32); HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR%u, value = %lx", cr, val); return X86EMUL_OKAY; @@ -3514,7 +3514,7 @@ int hvm_vmexit_cpuid(struct cpu_user_regs *regs, unsigned int inst_len) } guest_cpuid(curr, leaf, subleaf, &res); - HVMTRACE_6D(CPUID, leaf, subleaf, res.a, res.b, res.c, res.d); + TRACE(TRC_HVM_CPUID, leaf, subleaf, res.a, res.b, res.c, res.d); regs->rax = res.a; regs->rbx = res.b; @@ -3528,7 +3528,7 @@ void hvm_rdtsc_intercept(struct cpu_user_regs *regs) { msr_split(regs, hvm_get_guest_tsc(current)); - HVMTRACE_2D(RDTSC, regs->eax, regs->edx); + TRACE(TRC_HVM_RDTSC, regs->eax, regs->edx); } int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) @@ -3635,8 +3635,7 @@ int hvm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) } out: - HVMTRACE_3D(MSR_READ, msr, - (uint32_t)*msr_content, (uint32_t)(*msr_content >> 32)); + TRACE(TRC_HVM_MSR_READ, msr, *msr_content, *msr_content >> 32); return ret; gp_fault: @@ -3652,8 +3651,7 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content, struct domain *d = v->domain; int ret; - HVMTRACE_3D(MSR_WRITE, msr, - (uint32_t)msr_content, (uint32_t)(msr_content >> 32)); + TRACE(TRC_HVM_MSR_WRITE, msr, msr_content, msr_content >> 32); if ( may_defer && unlikely(monitored_msr(v->domain, msr)) ) { diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 4bb1c75055..cba8532a5a 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -91,7 +91,7 @@ static void cf_check rtc_pf_callback(struct vcpu *v, void *opaque) && ++(s->pt_dead_ticks) >= 10 ) { /* VM is ignoring its RTC; no point in running the timer */ - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); s->period = 0; } @@ -154,7 +154,7 @@ static void rtc_timer_update(RTCState *s) delta = period - ((now - s->start_time) % period); if ( s->hw.cmos_data[RTC_REG_B] & RTC_PIE ) { - TRACE_2D(TRC_HVM_EMUL_RTC_START_TIMER, delta, period); + TRACE_TIME(TRC_HVM_EMUL_RTC_START_TIMER, delta, period); create_periodic_time(v, &s->pt, delta, period, RTC_IRQ, rtc_pf_callback, s, false); } @@ -165,7 +165,7 @@ static void rtc_timer_update(RTCState *s) } /* fall through */ default: - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); s->period = 0; break; @@ -553,7 +553,7 @@ static int rtc_ioport_write(void *opaque, uint32_t addr, uint32_t data) rtc_update_irq(s); if ( (data ^ orig) & RTC_PIE ) { - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); s->period = 0; rtc_timer_update(s); @@ -807,7 +807,7 @@ void rtc_reset(struct domain *d) if ( !has_vrtc(d) ) return; - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); s->period = 0; s->pt.source = PTSRC_isa; @@ -892,7 +892,7 @@ void rtc_deinit(struct domain *d) spin_barrier(&s->lock); - TRACE_0D(TRC_HVM_EMUL_RTC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_RTC_STOP_TIMER); destroy_periodic_time(&s->pt); kill_timer(&s->update_timer); kill_timer(&s->update_timer2); diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c index 4805c55672..dc684fdc84 100644 --- a/xen/arch/x86/hvm/svm/intr.c +++ b/xen/arch/x86/hvm/svm/intr.c @@ -90,8 +90,8 @@ static void svm_enable_intr_window(struct vcpu *v, struct hvm_intack intack) } } - HVMTRACE_3D(INTR_WINDOW, intack.vector, intack.source, - vmcb->event_inj.v ? vmcb->event_inj.vector : -1); + TRACE(TRC_HVM_INTR_WINDOW, intack.vector, intack.source, + vmcb->event_inj.v ? vmcb->event_inj.vector : -1); /* * Create a dummy virtual interrupt to intercept as soon as the @@ -206,7 +206,7 @@ void asmlinkage svm_intr_assist(void) } else { - HVMTRACE_2D(INJ_VIRQ, intack.vector, /*fake=*/ 0); + TRACE(TRC_HVM_INJ_VIRQ, intack.vector, /*fake=*/ 0); svm_inject_extint(v, intack.vector); pt_intr_post(v, intack); } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 4719fffae5..6103c171d2 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1019,10 +1019,8 @@ void asmlinkage svm_vmenter_helper(void) svm_asid_handle_vmrun(); - if ( unlikely(tb_init_done) ) - HVMTRACE_ND(VMENTRY, - nestedhvm_vcpu_in_guestmode(curr) ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/); + TRACE_TIME(TRC_HVM_VMENTRY | + (nestedhvm_vcpu_in_guestmode(curr) ? TRC_HVM_NESTEDFLAG : 0)); svm_sync_vmcb(curr, vmcb_needs_vmsave); @@ -1394,10 +1392,10 @@ static void cf_check svm_inject_event(const struct x86_event *event) if ( _event.vector == X86_EXC_PF && _event.type == X86_EVENTTYPE_HW_EXCEPTION ) - HVMTRACE_LONG_2D(PF_INJECT, _event.error_code, - TRC_PAR_LONG(_event.cr2)); + TRACE(TRC_HVM_PF_INJECT64, _event.error_code, + _event.cr2, _event.cr2 >> 32); else - HVMTRACE_2D(INJ_EXC, _event.vector, _event.error_code); + TRACE(TRC_HVM_INJ_EXC, _event.vector, _event.error_code); } static bool cf_check svm_event_pending(const struct vcpu *v) @@ -1704,7 +1702,7 @@ static void svm_dr_access(struct vcpu *v, struct cpu_user_regs *regs) { struct vmcb_struct *vmcb = vcpu_nestedhvm(v).nv_n1vmcx; - HVMTRACE_0D(DR_WRITE); + TRACE(TRC_HVM_DR_WRITE); __restore_debug_registers(vmcb, v); } @@ -2345,7 +2343,7 @@ static void svm_invlpga_intercept( static void svm_invlpg_intercept(unsigned long linear) { - HVMTRACE_LONG_2D(INVLPG, 0, TRC_PAR_LONG(linear)); + TRACE(TRC_HVM_INVLPG64, 0, linear, linear >> 32); paging_invlpg(current, linear); } @@ -2574,11 +2572,11 @@ void asmlinkage svm_vmexit_handler(void) exit_reason = vmcb->exitcode; if ( hvm_long_mode_active(v) ) - HVMTRACE_ND(VMEXIT64, vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/, exit_reason, TRC_PAR_LONG(regs->rip)); + TRACE_TIME(TRC_HVM_VMEXIT64 | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), + exit_reason, regs->rip, regs->rip >> 32); else - HVMTRACE_ND(VMEXIT, vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/, exit_reason, regs->eip); + TRACE_TIME(TRC_HVM_VMEXIT | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), + exit_reason, regs->eip); if ( vcpu_guestmode ) { @@ -2673,17 +2671,17 @@ void asmlinkage svm_vmexit_handler(void) { case VMEXIT_INTR: /* Asynchronous event, handled when we STGI'd after the VMEXIT. */ - HVMTRACE_0D(INTR); + TRACE(TRC_HVM_INTR); break; case VMEXIT_NMI: /* Asynchronous event, handled when we STGI'd after the VMEXIT. */ - HVMTRACE_0D(NMI); + TRACE(TRC_HVM_NMI); break; case VMEXIT_SMI: /* Asynchronous event, handled when we STGI'd after the VMEXIT. */ - HVMTRACE_0D(SMI); + TRACE(TRC_HVM_SMI); break; case VMEXIT_ICEBP: @@ -2771,9 +2769,9 @@ void asmlinkage svm_vmexit_handler(void) if ( trace_will_trace_event(TRC_SHADOW) ) break; if ( hvm_long_mode_active(v) ) - HVMTRACE_LONG_2D(PF_XEN, regs->error_code, TRC_PAR_LONG(va)); + TRACE(TRC_HVM_PF_XEN64, regs->error_code, va, va >> 32); else - HVMTRACE_2D(PF_XEN, regs->error_code, va); + TRACE(TRC_HVM_PF_XEN, regs->error_code, va); break; } @@ -2782,7 +2780,7 @@ void asmlinkage svm_vmexit_handler(void) } case VMEXIT_EXCEPTION_AC: - HVMTRACE_1D(TRAP, X86_EXC_AC); + TRACE(TRC_HVM_TRAP, X86_EXC_AC); hvm_inject_hw_exception(X86_EXC_AC, vmcb->ei.exc.ec); break; @@ -2792,7 +2790,7 @@ void asmlinkage svm_vmexit_handler(void) /* Asynchronous event, handled when we STGI'd after the VMEXIT. */ case VMEXIT_EXCEPTION_MC: - HVMTRACE_0D(MCE); + TRACE(TRC_HVM_MCE); svm_vmexit_mce_intercept(v, regs); break; @@ -2938,7 +2936,7 @@ void asmlinkage svm_vmexit_handler(void) if ( (insn_len = svm_get_insn_len(v, INSTR_VMCALL)) == 0 ) break; BUG_ON(vcpu_guestmode); - HVMTRACE_1D(VMMCALL, regs->eax); + TRACE(TRC_HVM_VMMCALL, regs->eax); if ( hvm_hypercall(regs) == HVM_HCALL_completed ) __update_guest_eip(regs, insn_len); diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 05072a21bf..4f5e714aa4 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -682,7 +682,7 @@ int guest_rdmsr_x2apic(const struct vcpu *v, uint32_t msr, uint64_t *val) static void cf_check vlapic_pt_cb(struct vcpu *v, void *data) { - TRACE_0D(TRC_HVM_EMUL_LAPIC_TIMER_CB); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_TIMER_CB); *(s_time_t *)data = hvm_get_guest_time(v); } @@ -729,6 +729,8 @@ static void vlapic_update_timer(struct vlapic *vlapic, uint32_t lvtt, if ( delta && (is_oneshot || is_periodic) ) { + uint64_t timer_period = 0; + if ( vlapic->hw.timer_divisor != old_divisor ) { period = (uint64_t)vlapic_get_reg(vlapic, APIC_TMICT) @@ -736,12 +738,14 @@ static void vlapic_update_timer(struct vlapic *vlapic, uint32_t lvtt, delta = delta * vlapic->hw.timer_divisor / old_divisor; } - TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(delta), - TRC_PAR_LONG(is_periodic ? period : 0), - vlapic->pt.irq); + if ( is_periodic ) + timer_period = period; + + TRACE_TIME(TRC_HVM_EMUL_LAPIC_START_TIMER, delta, delta >> 32, + timer_period, timer_period >> 32, vlapic->pt.irq); create_periodic_time(current, &vlapic->pt, delta, - is_periodic ? period : 0, vlapic->pt.irq, + timer_period, vlapic->pt.irq, is_periodic ? vlapic_pt_cb : NULL, &vlapic->timer_last_update, false); @@ -758,7 +762,7 @@ static void vlapic_update_timer(struct vlapic *vlapic, uint32_t lvtt, } else { - TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); /* * From now, TMCCT should return 0 until TMICT is set again. @@ -1208,8 +1212,8 @@ void vlapic_tdt_msr_set(struct vlapic *vlapic, uint64_t value) vlapic->hw.tdt_msr = value; /* .... reprogram tdt timer */ - TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(delta), - TRC_PAR_LONG(0LL), vlapic->pt.irq); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_START_TIMER, delta, delta >> 32, + 0, 0, vlapic->pt.irq); create_periodic_time(v, &vlapic->pt, delta, 0, vlapic->pt.irq, vlapic_tdt_pt_cb, &vlapic->timer_last_update, false); @@ -1222,8 +1226,8 @@ void vlapic_tdt_msr_set(struct vlapic *vlapic, uint64_t value) /* trigger a timer event if needed */ if ( value > 0 ) { - TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(0LL), - TRC_PAR_LONG(0LL), vlapic->pt.irq); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_START_TIMER, 0, 0, + 0, 0, vlapic->pt.irq); create_periodic_time(v, &vlapic->pt, 0, 0, vlapic->pt.irq, vlapic_tdt_pt_cb, &vlapic->timer_last_update, false); @@ -1232,7 +1236,7 @@ void vlapic_tdt_msr_set(struct vlapic *vlapic, uint64_t value) else { /* .... stop tdt timer */ - TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); } @@ -1282,7 +1286,7 @@ int vlapic_accept_pic_intr(struct vcpu *v) if ( target ) accept = __vlapic_accept_pic_intr(v); - TRACE_2D(TRC_HVM_EMUL_LAPIC_PIC_INTR, target, accept); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_PIC_INTR, target, accept); return target && accept; } @@ -1433,7 +1437,7 @@ static void vlapic_do_init(struct vlapic *vlapic) vlapic_set_reg(vlapic, APIC_SPIV, 0xff); vlapic->hw.disabled |= VLAPIC_SW_DISABLED; - TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); } @@ -1457,7 +1461,7 @@ void vlapic_reset(struct vlapic *vlapic) static void lapic_rearm(struct vlapic *s) { unsigned long tmict; - uint64_t period, tdt_msr; + uint64_t period, timer_period = 0, tdt_msr; bool is_periodic; s->pt.irq = vlapic_get_reg(s, APIC_LVTT) & APIC_VECTOR_MASK; @@ -1476,11 +1480,14 @@ static void lapic_rearm(struct vlapic *s) (uint32_t)tmict * s->hw.timer_divisor); is_periodic = vlapic_lvtt_period(s); - TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(period), - TRC_PAR_LONG(is_periodic ? period : 0LL), s->pt.irq); + if ( is_periodic ) + timer_period = period; + + TRACE_TIME(TRC_HVM_EMUL_LAPIC_START_TIMER, period, period >> 32, + timer_period, timer_period >> 32, s->pt.irq); create_periodic_time(vlapic_vcpu(s), &s->pt, period, - is_periodic ? period : 0, + timer_period, s->pt.irq, is_periodic ? vlapic_pt_cb : NULL, &s->timer_last_update, false); @@ -1669,7 +1676,7 @@ void vlapic_destroy(struct vcpu *v) return; tasklet_kill(&vlapic->init_sipi.tasklet); - TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); + TRACE_TIME(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); unmap_domain_page_global(vlapic->regs); free_domheap_page(vlapic->regs_page); diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 8beeaab151..d36498d831 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -67,8 +67,8 @@ static void vmx_enable_intr_window(struct vcpu *v, struct hvm_intack intack) unsigned long intr; __vmread(VM_ENTRY_INTR_INFO, &intr); - HVMTRACE_3D(INTR_WINDOW, intack.vector, intack.source, - (intr & INTR_INFO_VALID_MASK) ? intr & 0xff : -1); + TRACE(TRC_HVM_INTR_WINDOW, intack.vector, intack.source, + (intr & INTR_INFO_VALID_MASK) ? intr & 0xff : -1); } if ( (intack.source == hvm_intsrc_nmi) && cpu_has_vmx_vnmi ) @@ -390,7 +390,7 @@ void asmlinkage vmx_intr_assist(void) } else { - HVMTRACE_2D(INJ_VIRQ, intack.vector, /*fake=*/ 0); + TRACE(TRC_HVM_INJ_VIRQ, intack.vector, /*fake=*/ 0); vmx_inject_extint(intack.vector, intack.source); pt_intr_post(v, intack); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5f67a48592..165a85a25b 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2112,10 +2112,10 @@ static void cf_check vmx_inject_event(const struct x86_event *event) if ( (_event.vector == X86_EXC_PF) && (_event.type == X86_EVENTTYPE_HW_EXCEPTION) ) - HVMTRACE_LONG_2D(PF_INJECT, _event.error_code, - TRC_PAR_LONG(curr->arch.hvm.guest_cr[2])); + TRACE(TRC_HVM_PF_INJECT64, _event.error_code, + curr->arch.hvm.guest_cr[2], curr->arch.hvm.guest_cr[2] >> 32); else - HVMTRACE_2D(INJ_EXC, _event.vector, _event.error_code); + TRACE(TRC_HVM_INJ_EXC, _event.vector, _event.error_code); } static bool cf_check vmx_event_pending(const struct vcpu *v) @@ -3125,7 +3125,7 @@ static void vmx_dr_access(unsigned long exit_qualification, { struct vcpu *v = current; - HVMTRACE_0D(DR_WRITE); + TRACE(TRC_HVM_DR_WRITE); if ( !v->arch.hvm.flag_dr_dirty ) __restore_debug_registers(v); @@ -3137,7 +3137,7 @@ static void vmx_dr_access(unsigned long exit_qualification, static void vmx_invlpg_intercept(unsigned long linear) { - HVMTRACE_LONG_2D(INVLPG, /*invlpga=*/ 0, TRC_PAR_LONG(linear)); + TRACE(TRC_HVM_INVLPG64, /*invlpga=*/ 0, linear, linear >> 32); paging_invlpg(current, linear); } @@ -3185,7 +3185,7 @@ static int vmx_cr_access(cr_access_qual_t qual) hvm_monitor_crX(CR0, value, old); curr->arch.hvm.guest_cr[0] = value; vmx_update_guest_cr(curr, 0, 0); - HVMTRACE_0D(CLTS); + TRACE(TRC_HVM_CLTS); break; } @@ -3198,7 +3198,7 @@ static int vmx_cr_access(cr_access_qual_t qual) value = (value & ~(X86_CR0_MP|X86_CR0_EM|X86_CR0_TS)) | (qual.lmsw_data & (X86_CR0_PE|X86_CR0_MP|X86_CR0_EM|X86_CR0_TS)); - HVMTRACE_LONG_1D(LMSW, value); + TRACE(TRC_HVM_LMSW64, value, value >> 32); if ( (rc = hvm_set_cr0(value, true)) == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(X86_EXC_GP, 0); @@ -3751,7 +3751,7 @@ static void vmx_do_extint(struct cpu_user_regs *regs) BUG_ON(!(vector & INTR_INFO_VALID_MASK)); vector &= INTR_INFO_VECTOR_MASK; - HVMTRACE_1D(INTR, vector); + TRACE(TRC_HVM_INTR, vector); regs->entry_vector = vector; do_IRQ(regs); @@ -3891,7 +3891,7 @@ static void vmx_failed_vmentry(unsigned int exit_reason, case EXIT_REASON_MCE_DURING_VMENTRY: printk("MCE\n"); - HVMTRACE_0D(MCE); + TRACE(TRC_HVM_MCE); /* Already handled. */ break; @@ -3932,7 +3932,7 @@ static int vmx_handle_eoi_write(void) { update_guest_eip(); /* Safe: APIC data write */ vlapic_EOI_set(vcpu_vlapic(current)); - HVMTRACE_0D(VLAPIC); + TRACE(TRC_HVM_VLAPIC); return 1; } @@ -4106,10 +4106,9 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) __vmread(VM_EXIT_REASON, &exit_reason); if ( hvm_long_mode_active(v) ) - HVMTRACE_ND(VMEXIT64, 0, 1/*cycles*/, exit_reason, - TRC_PAR_LONG(regs->rip)); + TRACE_TIME(TRC_HVM_VMEXIT64, exit_reason, regs->rip, regs->rip >> 32); else - HVMTRACE_ND(VMEXIT, 0, 1/*cycles*/, exit_reason, regs->eip); + TRACE_TIME(TRC_HVM_VMEXIT, exit_reason, regs->eip); perfc_incra(vmexits, (uint16_t)exit_reason); @@ -4226,7 +4225,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) default: perfc_incr(realmode_exits); v->arch.hvm.vmx.vmx_emulate = 1; - HVMTRACE_0D(REALMODE_EMULATE); + TRACE(TRC_HVM_REALMODE_EMULATE); return; } case EXIT_REASON_EXTERNAL_INTERRUPT: @@ -4283,7 +4282,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) * Table 23-1, "Exit Qualification for Debug Exceptions"). */ __vmread(EXIT_QUALIFICATION, &exit_qualification); - HVMTRACE_1D(TRAP_DEBUG, exit_qualification); + TRACE(TRC_HVM_TRAP_DEBUG, exit_qualification); __restore_debug_registers(v); write_debugreg(6, exit_qualification | DR_STATUS_RESERVED_ONE); @@ -4345,7 +4344,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) domain_pause_for_debugger(); break; case X86_EXC_BP: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); if ( !v->domain->debugger_attached ) { unsigned long insn_len; @@ -4370,7 +4369,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) } break; case X86_EXC_NM: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); vmx_fpu_dirty_intercept(); break; case X86_EXC_PF: @@ -4388,37 +4387,36 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) if ( trace_will_trace_event(TRC_SHADOW) ) break; if ( hvm_long_mode_active(v) ) - HVMTRACE_LONG_2D(PF_XEN, regs->error_code, - TRC_PAR_LONG(exit_qualification) ); + TRACE(TRC_HVM_PF_XEN64, regs->error_code, + exit_qualification, exit_qualification >> 32); else - HVMTRACE_2D(PF_XEN, - regs->error_code, exit_qualification ); + TRACE(TRC_HVM_PF_XEN, regs->error_code, exit_qualification); break; } hvm_inject_page_fault(regs->error_code, exit_qualification); break; case X86_EXC_AC: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); vmx_propagate_intr(intr_info); break; case X86_EXC_NMI: if ( MASK_EXTR(intr_info, INTR_INFO_INTR_TYPE_MASK) != X86_EVENTTYPE_NMI ) goto exit_and_crash; - HVMTRACE_0D(NMI); + TRACE(TRC_HVM_NMI); /* Already handled above. */ break; case X86_EXC_MC: - HVMTRACE_0D(MCE); + TRACE(TRC_HVM_MCE); /* Already handled above. */ break; case X86_EXC_UD: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); hvm_ud_intercept(regs); break; default: - HVMTRACE_1D(TRAP, vector); + TRACE(TRC_HVM_TRAP, vector); goto exit_and_crash; } break; @@ -4504,7 +4502,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) break; case EXIT_REASON_VMCALL: - HVMTRACE_1D(VMMCALL, regs->eax); + TRACE(TRC_HVM_VMMCALL, regs->eax); if ( hvm_hypercall(regs) == HVM_HCALL_completed ) update_guest_eip(); /* Safe: VMCALL */ @@ -4912,7 +4910,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) if ( unlikely(curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_MASK) ) lbr_fixup(); - HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/); + TRACE_TIME(TRC_HVM_VMENTRY); __vmwrite(GUEST_RIP, regs->rip); __vmwrite(GUEST_RSP, regs->rsp); diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 4e23247a46..7c3b5c7254 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -99,8 +99,7 @@ static void vpic_update_int_output(struct hvm_hw_vpic *vpic) ASSERT(vpic_is_locked(vpic)); irq = vpic_get_highest_priority_irq(vpic); - TRACE_3D(TRC_HVM_EMUL_PIC_INT_OUTPUT, vpic->int_output, vpic->is_master, - irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_INT_OUTPUT, vpic->int_output, vpic->is_master, irq); if ( vpic->int_output == (!vpic->init_state && irq >= 0) ) return; @@ -119,7 +118,7 @@ static void vpic_update_int_output(struct hvm_hw_vpic *vpic) if ( v != NULL ) { - TRACE_1D(TRC_HVM_EMUL_PIC_KICK, irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_KICK, irq); vcpu_kick(v); } } @@ -144,7 +143,7 @@ static void __vpic_intack(struct hvm_hw_vpic *vpic, int irq) ASSERT(vpic_is_locked(vpic)); - TRACE_2D(TRC_HVM_EMUL_PIC_INTACK, vpic->is_master, irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_INTACK, vpic->is_master, irq); /* Edge-triggered: clear the IRR (forget the edge). */ if ( !(vpic->elcr & mask) ) vpic->irr &= ~mask; @@ -526,7 +525,7 @@ void vpic_irq_positive_edge(struct domain *d, int irq) ASSERT(irq <= 15); ASSERT(vpic_is_locked(vpic)); - TRACE_1D(TRC_HVM_EMUL_PIC_POSEDGE, irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_POSEDGE, irq); if ( irq == 2 ) return; @@ -544,7 +543,7 @@ void vpic_irq_negative_edge(struct domain *d, int irq) ASSERT(irq <= 15); ASSERT(vpic_is_locked(vpic)); - TRACE_1D(TRC_HVM_EMUL_PIC_NEGEDGE, irq); + TRACE_TIME(TRC_HVM_EMUL_PIC_NEGEDGE, irq); if ( irq == 2 ) return; @@ -562,7 +561,7 @@ int vpic_ack_pending_irq(struct vcpu *v) accept = vlapic_accept_pic_intr(v); - TRACE_2D(TRC_HVM_EMUL_PIC_PEND_IRQ_CALL, accept, vpic->int_output); + TRACE_TIME(TRC_HVM_EMUL_PIC_PEND_IRQ_CALL, accept, vpic->int_output); if ( !accept || !vpic->int_output ) return -1; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 80ba8d9fe9..da54ca0f17 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -229,7 +229,7 @@ static void _clear_irq_vector(struct irq_desc *desc) for_each_cpu(cpu, tmp_mask) { ASSERT(per_cpu(vector_irq, cpu)[old_vector] == irq); - TRACE_3D(TRC_HW_IRQ_MOVE_FINISH, irq, old_vector, cpu); + TRACE_TIME(TRC_HW_IRQ_MOVE_FINISH, irq, old_vector, cpu); per_cpu(vector_irq, cpu)[old_vector] = ~irq; } @@ -796,13 +796,11 @@ void cf_check irq_move_cleanup_interrupt(void) goto unlock; } send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR); - TRACE_3D(TRC_HW_IRQ_MOVE_CLEANUP_DELAY, - irq, vector, smp_processor_id()); + TRACE_TIME(TRC_HW_IRQ_MOVE_CLEANUP_DELAY, irq, vector, me); goto unlock; } - TRACE_3D(TRC_HW_IRQ_MOVE_CLEANUP, - irq, vector, smp_processor_id()); + TRACE_TIME(TRC_HW_IRQ_MOVE_CLEANUP, irq, vector, me); per_cpu(vector_irq, me)[vector] = ~irq; desc->arch.move_cleanup_count--; @@ -1943,7 +1941,7 @@ void do_IRQ(struct cpu_user_regs *regs) spin_unlock(&desc->lock); } } - TRACE_1D(TRC_HW_IRQ_UNMAPPED_VECTOR, vector); + TRACE_TIME(TRC_HW_IRQ_UNMAPPED_VECTOR, vector); } goto out_no_unlock; } @@ -1984,7 +1982,7 @@ void do_IRQ(struct cpu_user_regs *regs) tsc_in = tb_init_done ? get_cycles() : 0; do_IRQ_guest(desc, vector); - TRACE_3D(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles()); + TRACE_TIME(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles()); goto out_no_end; } @@ -2008,7 +2006,7 @@ void do_IRQ(struct cpu_user_regs *regs) tsc_in = tb_init_done ? get_cycles() : 0; action->handler(irq, action->dev_id); - TRACE_3D(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles()); + TRACE_TIME(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles()); spin_lock_irq(&desc->lock); } diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index d554c9d41e..468a036081 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1899,7 +1899,7 @@ void asmlinkage do_device_not_available(struct cpu_user_regs *regs) curr->arch.pv.ctrlreg[0] &= ~X86_CR0_TS; } else - TRACE_0D(TRC_PV_MATH_STATE_RESTORE); + TRACE_TIME(TRC_PV_MATH_STATE_RESTORE); #else ASSERT_UNREACHABLE(); #endif diff --git a/xen/common/domain.c b/xen/common/domain.c index 6773f7fb90..67cadb7c3f 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -626,7 +626,7 @@ struct domain *domain_create(domid_t domid, hardware_domain = d; } - TRACE_1D(TRC_DOM0_DOM_ADD, d->domain_id); + TRACE_TIME(TRC_DOM0_DOM_ADD, d->domain_id); lock_profile_register_struct(LOCKPROF_TYPE_PERDOM, d, domid); @@ -1223,7 +1223,7 @@ void domain_destroy(struct domain *d) if ( atomic_cmpxchg(&d->refcnt, 0, DOMAIN_DESTROYED) != 0 ) return; - TRACE_1D(TRC_DOM0_DOM_REM, d->domain_id); + TRACE_TIME(TRC_DOM0_DOM_REM, d->domain_id); /* Delete from task list and task hashtable. */ spin_lock(&domlist_update_lock); diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e98e9da520..ebe2d2a3ce 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1307,7 +1307,7 @@ map_grant_ref( goto undo_out; } - TRACE_1D(TRC_MEM_PAGE_GRANT_MAP, op->dom); + TRACE_TIME(TRC_MEM_PAGE_GRANT_MAP, op->dom); /* * All maptrack entry users check mt->flags first before using the @@ -1434,7 +1434,7 @@ unmap_common( return; } - TRACE_1D(TRC_MEM_PAGE_GRANT_UNMAP, dom); + TRACE_TIME(TRC_MEM_PAGE_GRANT_UNMAP, dom); rgt = rd->grant_table; @@ -2445,7 +2445,7 @@ gnttab_transfer( put_gfn(d, gop.mfn); #endif - TRACE_1D(TRC_MEM_PAGE_GRANT_TRANSFER, e->domain_id); + TRACE_TIME(TRC_MEM_PAGE_GRANT_TRANSFER, e->domain_id); /* Tell the guest about its new page frame. */ grant_read_lock(e->grant_table); diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index 6d2413b32a..e690a484f1 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -365,7 +365,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, retval = alternative_call(cpufreq_driver.target, policy, target_freq, relation); if ( retval == 0 ) - TRACE_2D(TRC_PM_FREQ_CHANGE, prev_freq/1000, policy->cur/1000); + TRACE_TIME(TRC_PM_FREQ_CHANGE, prev_freq / 1000, policy->cur / 1000); } return retval; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:55:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727560.1132046 (Exim 4.92) (envelope-from ) id 1s9lVZ-0000xV-K9; Wed, 22 May 2024 12:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727560.1132046; Wed, 22 May 2024 12:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVZ-0000xN-HU; Wed, 22 May 2024 12:55:53 +0000 Received: by outflank-mailman (input) for mailman id 727560; Wed, 22 May 2024 12:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVY-0000xF-8q for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVY-0004nG-7w for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lVY-0006e9-65 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12: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=f/tmLQFUGt6LAQRIzrtBl2Gm4s/PdEUVcJPErn5FeYs=; b=eIbz+5bsLzrVIERYB7Wz4jZQhT U77r8giOMo6LAoCc5ZsS+s5nCKq8sg1mgEgWzJWQRbVLljtb4oTwWuX1/pKepufW2HKyqrPGL5uBz JbSkHWjUWgA2C6CGkd0UPBF++TirMxEvjOImn6nQBf7zZ4BCe1SZkJ9OT4ZLUA7Vr908=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/trace: Removal final {__,}trace_var() users in favour of the new API Message-Id: Date: Wed, 22 May 2024 12:55:52 +0000 commit aa60520cd37f0f81cec543af37b89c342e915dbd Author: Andrew Cooper AuthorDate: Tue Sep 21 19:55:47 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/trace: Removal final {__,}trace_var() users in favour of the new API The cycles parameter (which gets removed as a consequence) determines whether trace() or trace_time() is used. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: George Dunlap --- xen/arch/x86/hvm/emulate.c | 2 +- xen/arch/x86/hvm/hvm.c | 3 +-- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/irq.c | 2 +- xen/arch/x86/mm/p2m-pod.c | 8 ++++---- xen/arch/x86/mm/p2m-pt.c | 2 +- xen/arch/x86/mm/shadow/common.c | 6 +++--- xen/arch/x86/mm/shadow/multi.c | 10 +++++----- xen/arch/x86/pv/trace.c | 21 +++++++++++---------- xen/common/memory.c | 2 +- xen/common/trace.c | 2 +- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index d8f36206a7..a37525316c 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -67,7 +67,7 @@ static void hvmtrace_io_assist(const ioreq_t *p) size *= 2; } - trace_var(event, 0/*!cycles*/, size, buffer); + trace(event, size, buffer); } static int cf_check null_read( diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2c92e751cb..30fb9d095a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5142,8 +5142,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) return -EINVAL; /* Cycles will be taken at the vmexit and vmenter */ - trace_var(tr.event | TRC_GUEST, 0 /*!cycles*/, - tr.extra_bytes, tr.extra); + trace(tr.event | TRC_GUEST, tr.extra_bytes, tr.extra); break; } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 6103c171d2..94fa3227b9 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1634,7 +1634,7 @@ static void svm_do_nested_pgfault(struct vcpu *v, _d.mfn = mfn_x(mfn); _d.p2mt = p2mt; - __trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d); + trace(TRC_HVM_NPF, sizeof(_d), &_d); } switch ( ret ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 165a85a25b..457c991d09 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3807,7 +3807,7 @@ static void ept_handle_violation(ept_qual_t q, paddr_t gpa) _d.qualification = q.raw; _d.mfn = mfn_x(get_gfn_query_unlocked(d, gfn, &_d.p2mt)); - __trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d); + trace(TRC_HVM_NPF, sizeof(_d), &_d); } if ( q.gla_valid ) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index da54ca0f17..7243891db8 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -135,7 +135,7 @@ static void _trace_irq_mask(uint32_t event, int irq, int vector, memcpy(d.mask, mask, min(sizeof(d.mask), BITS_TO_LONGS(nr_cpu_ids) * sizeof(long))); - trace_var(event, 1, sizeof(d), &d); + trace_time(event, sizeof(d), &d); } static void trace_irq_mask(uint32_t event, int irq, int vector, diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 9750a3a21b..1c727c78c8 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -854,7 +854,7 @@ p2m_pod_zero_check_superpage(struct p2m_domain *p2m, gfn_t gfn) t.d = d->domain_id; t.order = 9; - __trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), &t); + trace(TRC_MEM_POD_ZERO_RECLAIM, sizeof(t), &t); } /* @@ -1022,7 +1022,7 @@ p2m_pod_zero_check(struct p2m_domain *p2m, const gfn_t *gfns, unsigned int count t.d = d->domain_id; t.order = 0; - __trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), &t); + trace(TRC_MEM_POD_ZERO_RECLAIM, sizeof(t), &t); } /* Add to cache, and account for the new p2m PoD entry */ @@ -1262,7 +1262,7 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, t.d = d->domain_id; t.order = order; - __trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), &t); + trace(TRC_MEM_POD_POPULATE, sizeof(t), &t); } pod_unlock_and_flush(p2m); @@ -1307,7 +1307,7 @@ remap_and_retry: t.d = d->domain_id; t.order = order; - __trace_var(TRC_MEM_POD_SUPERPAGE_SPLINTER, 0, sizeof(t), &t); + trace(TRC_MEM_POD_SUPERPAGE_SPLINTER, sizeof(t), &t); } return true; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 348130d0dd..666abd46be 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -608,7 +608,7 @@ p2m_pt_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, t.d = d->domain_id; t.order = page_order; - __trace_var(TRC_MEM_SET_P2M_ENTRY, 0, sizeof(t), &t); + trace(TRC_MEM_SET_P2M_ENTRY, sizeof(t), &t); } /* Carry out any eventually pending earlier changes first. */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index f93f0a4987..0176e33bc9 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -434,7 +434,7 @@ static inline void trace_resync(int event, mfn_t gmfn) /* Convert gmfn to gfn */ gfn_t gfn = mfn_to_gfn(current->domain, gmfn); - __trace_var(event, 0/*!tsc*/, sizeof(gfn), &gfn); + trace(event, sizeof(gfn), &gfn); } } @@ -911,7 +911,7 @@ static inline void trace_shadow_prealloc_unpin(struct domain *d, mfn_t smfn) ASSERT(mfn_valid(smfn)); gfn = mfn_to_gfn(d, backpointer(mfn_to_page(smfn))); - __trace_var(TRC_SHADOW_PREALLOC_UNPIN, 0/*!tsc*/, sizeof(gfn), &gfn); + trace(TRC_SHADOW_PREALLOC_UNPIN, sizeof(gfn), &gfn); } } @@ -1809,7 +1809,7 @@ static inline void trace_shadow_wrmap_bf(mfn_t gmfn) /* Convert gmfn to gfn */ gfn_t gfn = mfn_to_gfn(current->domain, gmfn); - __trace_var(TRC_SHADOW_WRMAP_BF, 0/*!tsc*/, sizeof(gfn), &gfn); + trace(TRC_SHADOW_WRMAP_BF, sizeof(gfn), &gfn); } } diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 90cf0ceaa3..bcd02b2d00 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1979,7 +1979,7 @@ static inline void trace_shadow_gen(u32 event, guest_va_t va) if ( tb_init_done ) { event |= (GUEST_PAGING_LEVELS-2)<<8; - __trace_var(event, 0/*!tsc*/, sizeof(va), &va); + trace(event, sizeof(va), &va); } } @@ -2003,7 +2003,7 @@ static inline void trace_shadow_fixup(guest_l1e_t gl1e, d.va = va; d.flags = this_cpu(trace_shadow_path_flags); - __trace_var(event, 0/*!tsc*/, sizeof(d), &d); + trace(event, sizeof(d), &d); } } @@ -2027,7 +2027,7 @@ static inline void trace_not_shadow_fault(guest_l1e_t gl1e, d.va = va; d.flags = this_cpu(trace_shadow_path_flags); - __trace_var(event, 0/*!tsc*/, sizeof(d), &d); + trace(event, sizeof(d), &d); } } @@ -2053,7 +2053,7 @@ static inline void trace_shadow_emulate_other(u32 event, d.gfn=gfn_x(gfn); d.va = va; - __trace_var(event, 0/*!tsc*/, sizeof(d), &d); + trace(event, sizeof(d), &d); } } @@ -2106,7 +2106,7 @@ static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) #endif d.flags = this_cpu(trace_shadow_path_flags); - __trace_var(event, 0/*!tsc*/, sizeof(d), &d); + trace(event, sizeof(d), &d); } } #endif /* CONFIG_HVM */ diff --git a/xen/arch/x86/pv/trace.c b/xen/arch/x86/pv/trace.c index cf3897061e..70f426f209 100644 --- a/xen/arch/x86/pv/trace.c +++ b/xen/arch/x86/pv/trace.c @@ -19,7 +19,7 @@ void __trace_pv_trap(int trapnr, unsigned long eip, .error_code = error_code, }; - __trace_var(TRC_PV_TRAP, 1, sizeof(d), &d); + trace_time(TRC_PV_TRAP, sizeof(d), &d); } else { @@ -35,7 +35,7 @@ void __trace_pv_trap(int trapnr, unsigned long eip, .error_code = error_code, }; - __trace_var(TRC_PV_TRAP | TRC_64_FLAG, 1, sizeof(d), &d); + trace_time(TRC_PV_TRAP | TRC_64_FLAG, sizeof(d), &d); } } @@ -53,7 +53,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) .error_code = error_code, }; - __trace_var(TRC_PV_PAGE_FAULT, 1, sizeof(d), &d); + trace_time(TRC_PV_PAGE_FAULT, sizeof(d), &d); } else { @@ -66,7 +66,7 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) .error_code = error_code, }; - __trace_var(TRC_PV_PAGE_FAULT | TRC_64_FLAG, 1, sizeof(d), &d); + trace_time(TRC_PV_PAGE_FAULT | TRC_64_FLAG, sizeof(d), &d); } } @@ -75,10 +75,11 @@ void __trace_trap_one_addr(unsigned event, unsigned long va) if ( is_pv_32bit_vcpu(current) ) { u32 d = va; - __trace_var(event, 1, sizeof(d), &d); + + trace_time(event, sizeof(d), &d); } else - __trace_var(event | TRC_64_FLAG, 1, sizeof(va), &va); + trace_time(event | TRC_64_FLAG, sizeof(va), &va); } void __trace_trap_two_addr(unsigned event, unsigned long va1, @@ -93,7 +94,7 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1, .va2 = va2, }; - __trace_var(event, 1, sizeof(d), &d); + trace_time(event, sizeof(d), &d); } else { @@ -104,7 +105,7 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1, .va2 = va2, }; - __trace_var(event | TRC_64_FLAG, 1, sizeof(d), &d); + trace_time(event | TRC_64_FLAG, sizeof(d), &d); } } @@ -123,7 +124,7 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) .eip = eip, }; - __trace_var(TRC_PV_PTWR_EMULATION_PAE, 1, sizeof(d), &d); + trace_time(TRC_PV_PTWR_EMULATION_PAE, sizeof(d), &d); } else { @@ -136,6 +137,6 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) .rip = eip, }; - __trace_var(TRC_PV_PTWR_EMULATION | TRC_64_FLAG, 1, sizeof(d), &d); + trace_time(TRC_PV_PTWR_EMULATION | TRC_64_FLAG, sizeof(d), &d); } } diff --git a/xen/common/memory.c b/xen/common/memory.c index b4593f5f45..de2cc7ad92 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -483,7 +483,7 @@ static void decrease_reservation(struct memop_args *a) t.d = a->domain->domain_id; t.order = a->extent_order; - __trace_var(TRC_MEM_DECREASE_RESERVATION, 0, sizeof(t), &t); + trace(TRC_MEM_DECREASE_RESERVATION, sizeof(t), &t); } /* See if populate-on-demand wants to handle this */ diff --git a/xen/common/trace.c b/xen/common/trace.c index c94ce1f7dc..27c8a19f05 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -868,7 +868,7 @@ void __trace_hypercall(uint32_t event, unsigned long op, break; } - __trace_var(event, 1, sizeof(uint32_t) * (1 + (a - d.args)), &d); + trace_time(event, sizeof(uint32_t) * (1 + (a - d.args)), &d); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:56:02 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:56:02 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727562.1132052 (Exim 4.92) (envelope-from ) id 1s9lVi-00010B-Mc; Wed, 22 May 2024 12:56:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727562.1132052; Wed, 22 May 2024 12:56: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 1s9lVi-000102-Ix; Wed, 22 May 2024 12:56:02 +0000 Received: by outflank-mailman (input) for mailman id 727562; Wed, 22 May 2024 12:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVi-0000zs-Cz for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVi-0004nr-C1 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lVi-0006fH-BC for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12: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=1edKB9otoGDyi6BO/lZ8c9hx7SO0t979eU+JrJ5iLhc=; b=m2TgNUU1CvEvhrdTah/5h2qQC7 mTyhpHX5QEVUz5BshPCrKb/TceE57G21CTJVeeYm+/CZwfJ4KhGR7UX4poz1badLehowrxO11rEgj 4s1kU9BN8R5/VuMHAS9xzXuZgCMUKUpSer/A9A+eQ47I5101kTrQqYv6VJxfrVmaNGNE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/trace: Drop old trace API Message-Id: Date: Wed, 22 May 2024 12:56:02 +0000 commit 9c5444b01ad51369bc09197a442a93d87b4b76f2 Author: Andrew Cooper AuthorDate: Mon Sep 20 13:40:21 2021 +0100 Commit: Andrew Cooper CommitDate: Mon May 20 18:29:44 2024 +0100 xen/trace: Drop old trace API With all users updated to the new API, drop the old API. This includes all of asm/hvm/trace.h, which allows us to drop some includes. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: George Dunlap --- xen/arch/x86/hvm/emulate.c | 1 - xen/arch/x86/hvm/hpet.c | 1 - xen/arch/x86/hvm/hvm.c | 1 - xen/arch/x86/hvm/io.c | 1 - xen/arch/x86/hvm/svm/intr.c | 1 - xen/arch/x86/hvm/svm/svm.c | 1 - xen/arch/x86/hvm/vlapic.c | 1 - xen/arch/x86/hvm/vmx/intr.c | 1 - xen/arch/x86/hvm/vmx/vmx.c | 1 - xen/arch/x86/include/asm/hvm/trace.h | 114 --------------------------------- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 1 - xen/common/trace.c | 12 +--- xen/include/xen/trace.h | 47 -------------- 13 files changed, 3 insertions(+), 180 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index a37525316c..02e378365b 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 4c5b171922..12b00b7702 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 30fb9d095a..2c66fe0f7a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 06283b41c4..db726b3817 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c index dc684fdc84..780c7e178a 100644 --- a/xen/arch/x86/hvm/svm/intr.c +++ b/xen/arch/x86/hvm/svm/intr.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "nestedhvm.h" diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 94fa3227b9..db530d55f2 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 4f5e714aa4..6a11f4d94d 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index d36498d831..1a4dfb499b 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -24,7 +24,6 @@ #include #include #include -#include #include /* diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 457c991d09..8ba996546f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/include/asm/hvm/trace.h b/xen/arch/x86/include/asm/hvm/trace.h deleted file mode 100644 index 22eadbdd47..0000000000 --- a/xen/arch/x86/include/asm/hvm/trace.h +++ /dev/null @@ -1,114 +0,0 @@ -#ifndef __ASM_X86_HVM_TRACE_H__ -#define __ASM_X86_HVM_TRACE_H__ - -#include - -#define DEFAULT_HVM_TRACE_ON 1 -#define DEFAULT_HVM_TRACE_OFF 0 - -#define DEFAULT_HVM_VMSWITCH DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_PF DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_INJECT DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_IO DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_REGACCESS DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_MISC DEFAULT_HVM_TRACE_ON -#define DEFAULT_HVM_INTR DEFAULT_HVM_TRACE_ON - -#define DO_TRC_HVM_VMENTRY DEFAULT_HVM_VMSWITCH -#define DO_TRC_HVM_VMEXIT DEFAULT_HVM_VMSWITCH -#define DO_TRC_HVM_VMEXIT64 DEFAULT_HVM_VMSWITCH -#define DO_TRC_HVM_PF_XEN DEFAULT_HVM_PF -#define DO_TRC_HVM_PF_XEN64 DEFAULT_HVM_PF -#define DO_TRC_HVM_PF_INJECT DEFAULT_HVM_PF -#define DO_TRC_HVM_PF_INJECT64 DEFAULT_HVM_PF -#define DO_TRC_HVM_INJ_EXC DEFAULT_HVM_INJECT -#define DO_TRC_HVM_INJ_VIRQ DEFAULT_HVM_INJECT -#define DO_TRC_HVM_REINJ_VIRQ DEFAULT_HVM_INJECT -#define DO_TRC_HVM_INTR_WINDOW DEFAULT_HVM_INJECT -#define DO_TRC_HVM_IO_READ DEFAULT_HVM_IO -#define DO_TRC_HVM_IO_WRITE DEFAULT_HVM_IO -#define DO_TRC_HVM_CR_READ DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_CR_READ64 DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_CR_WRITE DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_CR_WRITE64 DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_DR_READ DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_DR_WRITE DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_XCR_READ64 DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_XCR_WRITE64 DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_MSR_READ DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_MSR_WRITE DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_RDTSC DEFAULT_HVM_REGACCESS -#define DO_TRC_HVM_CPUID DEFAULT_HVM_MISC -#define DO_TRC_HVM_INTR DEFAULT_HVM_INTR -#define DO_TRC_HVM_NMI DEFAULT_HVM_INTR -#define DO_TRC_HVM_MCE DEFAULT_HVM_INTR -#define DO_TRC_HVM_SMI DEFAULT_HVM_INTR -#define DO_TRC_HVM_VMMCALL DEFAULT_HVM_MISC -#define DO_TRC_HVM_HLT DEFAULT_HVM_MISC -#define DO_TRC_HVM_INVLPG DEFAULT_HVM_MISC -#define DO_TRC_HVM_INVLPG64 DEFAULT_HVM_MISC -#define DO_TRC_HVM_IO_ASSIST DEFAULT_HVM_MISC -#define DO_TRC_HVM_MMIO_ASSIST DEFAULT_HVM_MISC -#define DO_TRC_HVM_CLTS DEFAULT_HVM_MISC -#define DO_TRC_HVM_LMSW DEFAULT_HVM_MISC -#define DO_TRC_HVM_LMSW64 DEFAULT_HVM_MISC -#define DO_TRC_HVM_REALMODE_EMULATE DEFAULT_HVM_MISC -#define DO_TRC_HVM_TRAP DEFAULT_HVM_MISC -#define DO_TRC_HVM_TRAP_DEBUG DEFAULT_HVM_MISC -#define DO_TRC_HVM_VLAPIC DEFAULT_HVM_MISC - - -#define TRC_PAR_LONG(par) ((uint32_t)(par)), ((par) >> 32) - -#define TRACE_2_LONG_2D(_e, d1, d2, ...) \ - TRACE_4D(_e, d1, d2) -#define TRACE_2_LONG_3D(_e, d1, d2, d3, ...) \ - TRACE_5D(_e, d1, d2, d3) -#define TRACE_2_LONG_4D(_e, d1, d2, d3, d4, ...) \ - TRACE_6D(_e, d1, d2, d3, d4) - -#define HVMTRACE_ND(evt, modifier, cycles, ...) \ - do { \ - if ( unlikely(tb_init_done) && DO_TRC_HVM_ ## evt ) \ - { \ - uint32_t _d[] = { __VA_ARGS__ }; \ - __trace_var(TRC_HVM_ ## evt | (modifier), cycles, \ - sizeof(_d), sizeof(_d) ? _d : NULL); \ - } \ - } while(0) - -#define HVMTRACE_6D(evt, d1, d2, d3, d4, d5, d6) \ - HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4, d5, d6) -#define HVMTRACE_5D(evt, d1, d2, d3, d4, d5) \ - HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4, d5) -#define HVMTRACE_4D(evt, d1, d2, d3, d4) \ - HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4) -#define HVMTRACE_3D(evt, d1, d2, d3) \ - HVMTRACE_ND(evt, 0, 0, d1, d2, d3) -#define HVMTRACE_2D(evt, d1, d2) \ - HVMTRACE_ND(evt, 0, 0, d1, d2) -#define HVMTRACE_1D(evt, d1) \ - HVMTRACE_ND(evt, 0, 0, d1) -#define HVMTRACE_0D(evt) \ - HVMTRACE_ND(evt, 0, 0) - -#define HVMTRACE_LONG_1D(evt, d1) \ - HVMTRACE_2D(evt ## 64, (uint32_t)(d1), (d1) >> 32) -#define HVMTRACE_LONG_2D(evt, d1, d2, ...) \ - HVMTRACE_3D(evt ## 64, d1, d2) -#define HVMTRACE_LONG_3D(evt, d1, d2, d3, ...) \ - HVMTRACE_4D(evt ## 64, d1, d2, d3) -#define HVMTRACE_LONG_4D(evt, d1, d2, d3, d4, ...) \ - HVMTRACE_5D(evt ## 64, d1, d2, d3, d4) - -#endif /* __ASM_X86_HVM_TRACE_H__ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index 8ffab7d94c..1489dd05c2 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -15,7 +15,6 @@ #include #include #include -#include #include extern int8_t opt_ept_exec_sp; diff --git a/xen/common/trace.c b/xen/common/trace.c index 27c8a19f05..c9c555094b 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -666,22 +666,21 @@ static DECLARE_SOFTIRQ_TASKLET(trace_notify_dom0_tasklet, trace_notify_dom0, NULL); /** - * __trace_var - Enters a trace tuple into the trace buffer for the current CPU. + * trace - Enters a trace tuple into the trace buffer for the current CPU. * @event: the event type being logged - * @cycles: include tsc timestamp into trace record * @extra: size of additional trace data in bytes * @extra_data: pointer to additional trace data * * Logs a trace record into the appropriate buffer. */ -void __trace_var(u32 event, bool cycles, unsigned int extra, - const void *extra_data) +void trace(uint32_t event, unsigned int extra, const void *extra_data) { struct t_buf *buf; unsigned long flags; u32 bytes_to_tail, bytes_to_wrap; unsigned int rec_size, total_size; bool started_below_highwater; + bool cycles = event & TRC_HD_CYCLE_FLAG; if( !tb_init_done ) return; @@ -808,11 +807,6 @@ unlock: tasklet_schedule(&trace_notify_dom0_tasklet); } -void trace(uint32_t event, unsigned int extra, const void *extra_data) -{ - __trace_var(event, event & TRC_HD_CYCLE_FLAG, extra, extra_data); -} - void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) { diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index 9dc7e3d621..914cecbc18 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -40,15 +40,6 @@ int trace_will_trace_event(u32 event); /* Create a trace record, with pre-constructed additional parameters. */ void trace(uint32_t event, unsigned int extra, const void *extra_data); -void __trace_var(uint32_t event, bool cycles, unsigned int extra, const void *); - -static inline void trace_var(uint32_t event, bool cycles, unsigned int extra, - const void *extra_data) -{ - if ( unlikely(tb_init_done) ) - __trace_var(event, cycles, extra, extra_data); -} - void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args); @@ -72,10 +63,6 @@ static inline int trace_will_trace_event(uint32_t event) static inline void trace( uint32_t event, unsigned int extra, const void *extra_data) {} -static inline void trace_var(uint32_t event, bool cycles, unsigned int extra, - const void *extra_data) {} -static inline void __trace_var(uint32_t event, bool cycles, unsigned int extra, - const void *extra_data) {} static inline void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) {} #endif /* CONFIG_TRACEBUFFER */ @@ -104,38 +91,4 @@ static inline void trace_time( /* Create a trace record with time included. */ #define TRACE_TIME(_e, ...) TRACE((_e) | TRC_HD_CYCLE_FLAG, ## __VA_ARGS__) -/* Convenience macros for calling the trace function. */ -#define TRACE_0D(_e) \ - do { \ - trace_var(_e, 1, 0, NULL); \ - } while ( 0 ) - -/* Common helper for TRACE_{1..6}D() below. */ -#define TRACE_varD(_e, ...) \ - do { \ - if ( unlikely(tb_init_done) ) \ - { \ - uint32_t _d[] = { __VA_ARGS__ }; \ - __trace_var(_e, true, sizeof(_d), _d); \ - } \ - } while ( 0 ) - -#define TRACE_1D(_e, d1) \ - TRACE_varD(_e, d1) - -#define TRACE_2D(_e, d1, d2) \ - TRACE_varD(_e, d1, d2) - -#define TRACE_3D(_e, d1, d2, d3) \ - TRACE_varD(_e, d1, d2, d3) - -#define TRACE_4D(_e, d1, d2, d3, d4) \ - TRACE_varD(_e, d1, d2, d3, d4) - -#define TRACE_5D(_e, d1, d2, d3, d4, d5) \ - TRACE_varD(_e, d1, d2, d3, d4, d5) - -#define TRACE_6D(_e, d1, d2, d3, d4, d5, d6) \ - TRACE_varD(_e, d1, d2, d3, d4, d5, d6) - #endif /* __XEN_TRACE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:56:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:56:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727564.1132054 (Exim 4.92) (envelope-from ) id 1s9lVt-00013F-N2; Wed, 22 May 2024 12:56:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727564.1132054; Wed, 22 May 2024 12:56: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 1s9lVt-000138-KV; Wed, 22 May 2024 12:56:13 +0000 Received: by outflank-mailman (input) for mailman id 727564; Wed, 22 May 2024 12:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVs-00012r-Fr for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lVs-0004ny-FC for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lVs-0006fo-EK for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56: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=mCI3XErNL62gt+bdQpl8t7vjKmIBcXjuadr/OokrRGQ=; b=z8jOYEafKc4/xbKg7eOCAVon4Z KefgIoAFTuSItSe0dHoeXMLhG1D4Cd+O6XGIB1MZg55pYENKTKIjbWY/Il1/nc3n2qdJcKtwKr0Sh rT91HorEab/dNFCjWnSo7z+7e0xD21eGh0s8gojPvL3WciTJYHIYqeaGc5/zTM/xrSrE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: pretty print interrupt CPU affinity masks Message-Id: Date: Wed, 22 May 2024 12:56:12 +0000 commit 44b69e9c173995de066c0ddfc5cb23220fb15cf8 Author: Roger Pau Monné AuthorDate: Tue May 21 09:15:03 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 09:15:03 2024 +0200 xen/x86: pretty print interrupt CPU affinity masks Print the CPU affinity masks as numeric ranges instead of plain hexadecimal bitfields. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Release-acked-by: Oleksii Kurochko --- xen/arch/x86/irq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 7243891db8..c16205a9be 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1932,10 +1932,10 @@ void do_IRQ(struct cpu_user_regs *regs) if ( ~irq < nr_irqs && irq_desc_initialized(desc) ) { spin_lock(&desc->lock); - printk("IRQ%d a=%04lx[%04lx,%04lx] v=%02x[%02x] t=%s s=%08x\n", - ~irq, *cpumask_bits(desc->affinity), - *cpumask_bits(desc->arch.cpu_mask), - *cpumask_bits(desc->arch.old_cpu_mask), + printk("IRQ%d a={%*pbl}[{%*pbl},{%*pbl}] v=%02x[%02x] t=%s s=%08x\n", + ~irq, CPUMASK_PR(desc->affinity), + CPUMASK_PR(desc->arch.cpu_mask), + CPUMASK_PR(desc->arch.old_cpu_mask), desc->arch.vector, desc->arch.old_vector, desc->handler->typename, desc->status); spin_unlock(&desc->lock); @@ -2636,7 +2636,7 @@ void fixup_irqs(const cpumask_t *mask, bool verbose) if ( !set_affinity ) printk("Cannot set affinity for IRQ%u\n", irq); else if ( break_affinity ) - printk("Broke affinity for IRQ%u, new: %*pb\n", + printk("Broke affinity for IRQ%u, new: {%*pbl}\n", irq, CPUMASK_PR(affinity)); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:56:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:56:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727566.1132057 (Exim 4.92) (envelope-from ) id 1s9lW3-00016e-Pr; Wed, 22 May 2024 12:56:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727566.1132057; Wed, 22 May 2024 12:56: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 1s9lW3-00016W-NK; Wed, 22 May 2024 12:56:23 +0000 Received: by outflank-mailman (input) for mailman id 727566; Wed, 22 May 2024 12:56:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lW2-00016O-It for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lW2-0004o7-I6 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lW2-0006gJ-HK for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56: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=y0uErJKpq1/zO77DTUjrbxvrvpXEHNf7WuC+dMvANwA=; b=tAYid6yaMFlbvHVVvtRBKHZTly RfWDs3JFVj9Z7jZwdOwOr41U0hfx72MUOc22FEDuhNxtcSgJrBedi7oA24vO9H133CJQde+fQwBtv /Ubn2eS6CPKFn3GxvfT9cIAO7DWWf2r9z5vSnCDF6Iua4gScBjmGWN+TqtNGucfsK3Ok=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce monitor.h Message-Id: Date: Wed, 22 May 2024 12:56:22 +0000 commit 7e036f7e0caacd0ce60414ec3b8d9a1a7a83d9e3 Author: Oleksii Kurochko AuthorDate: Tue May 21 09:15:37 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 09:15:37 2024 +0200 xen/riscv: introduce monitor.h Signed-off-by: Oleksii Kurochko Acked-by: Tamas K Lengyel --- xen/arch/riscv/include/asm/monitor.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/xen/arch/riscv/include/asm/monitor.h b/xen/arch/riscv/include/asm/monitor.h new file mode 100644 index 0000000000..f4fe2c0690 --- /dev/null +++ b/xen/arch/riscv/include/asm/monitor.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_RISCV_MONITOR_H__ +#define __ASM_RISCV_MONITOR_H__ + +#include + +#include + +struct domain; + +static inline uint32_t arch_monitor_get_capabilities(struct domain *d) +{ + BUG_ON("unimplemented"); + return 0; +} + +#endif /* __ASM_RISCV_MONITOR_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 Wed May 22 12:56:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:56:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727569.1132062 (Exim 4.92) (envelope-from ) id 1s9lWD-00019a-RP; Wed, 22 May 2024 12:56:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727569.1132062; Wed, 22 May 2024 12:56: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 1s9lWD-00019S-On; Wed, 22 May 2024 12:56:33 +0000 Received: by outflank-mailman (input) for mailman id 727569; Wed, 22 May 2024 12:56:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWC-00019E-Lm for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWC-0004oG-L5 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lWC-0006gs-KG for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56: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=cZqYUPteslGHX9Rs4KlW49kNudfLr9ISFayJYk2lwO8=; b=3waNz44sM5M9sU1/3XT1tqxJ2F CzJzno6uBTjTDteh2vqcko0v5oh4mH8ScWoNtkbU5F2Llr2iLsLSlTZAec29LCps5ChFEEmzsNdgl /ECyf37OXBOEcJrg8HsttfIGdJ4tXQAI0hKx0XwCRBpqVEj9CFzdTM6RRUpja0zOEGh8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce vm_event_*() functions Message-Id: Date: Wed, 22 May 2024 12:56:32 +0000 commit ed1ac3e968e54bcd42767d0b38b092ecacddc1df Author: Oleksii Kurochko AuthorDate: Tue May 21 09:16:02 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 09:16:02 2024 +0200 xen/riscv: introduce vm_event_*() functions Signed-off-by: Oleksii Kurochko Acked-by: Tamas K Lengyel --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/vm_event.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index 2fefe14e7c..1ed1a8369b 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.o obj-y += traps.o +obj-y += vm_event.o $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@ diff --git a/xen/arch/riscv/vm_event.c b/xen/arch/riscv/vm_event.c new file mode 100644 index 0000000000..bb1fc73bc1 --- /dev/null +++ b/xen/arch/riscv/vm_event.c @@ -0,0 +1,19 @@ +#include + +struct vm_event_st; +struct vcpu; + +void vm_event_fill_regs(struct vm_event_st *req) +{ + BUG_ON("unimplemented"); +} + +void vm_event_set_registers(struct vcpu *v, struct vm_event_st *rsp) +{ + BUG_ON("unimplemented"); +} + +void vm_event_monitor_next_interrupt(struct vcpu *v) +{ + /* Not supported on RISCV. */ +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:56:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:56:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727570.1132066 (Exim 4.92) (envelope-from ) id 1s9lWN-0001C1-Sp; Wed, 22 May 2024 12:56:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727570.1132066; Wed, 22 May 2024 12:56: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 1s9lWN-0001Bt-QB; Wed, 22 May 2024 12:56:43 +0000 Received: by outflank-mailman (input) for mailman id 727570; Wed, 22 May 2024 12:56:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWM-0001Bj-PL for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWM-0004oO-OS for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lWM-0006hJ-NF for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56: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=5VssT0u5bzfpAEQUmKvhK7DGSCM7kXktz/1VoZjLLWA=; b=1OOU06v2uz1s8rjlAZOE/JfHRD wreVW6BwrKwi06Tzx0WC+cYiuLI7gWos6RP8sYCjZpRvH1D1krqKesgsgD1tj5WrE75DsNbrAx29v 4haTI2FrKQh0tOxDuTAdzOC1QvzEsZreqsl7oUqDyOBfihhUfuvtSM9SsZZIc9O6HVu0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: Add braces for better code clarity Message-Id: Date: Wed, 22 May 2024 12:56:42 +0000 commit 24dbf5bd03ff11dbcebb4d15e34fbba8eb34936b Author: Petr Beneš AuthorDate: Tue May 21 09:16:25 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 09:16:25 2024 +0200 x86/p2m: Add braces for better code clarity No functional change. Signed-off-by: Petr Beneš Reviewed-by: Stefano Stabellini Acked-by: Roger Pau Monné --- xen/arch/x86/mm/p2m.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 4a4620e870..db5d9b6c2a 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -106,6 +106,7 @@ void p2m_change_entry_type_global(struct domain *d, unsigned int i; for ( i = 0; i < MAX_ALTP2M; i++ ) + { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { struct p2m_domain *altp2m = d->arch.altp2m_p2m[i]; @@ -114,6 +115,7 @@ void p2m_change_entry_type_global(struct domain *d, change_entry_type_global(altp2m, ot, nt); p2m_unlock(altp2m); } + } } p2m_unlock(hostp2m); @@ -139,6 +141,7 @@ void p2m_memory_type_changed(struct domain *d) unsigned int i; for ( i = 0; i < MAX_ALTP2M; i++ ) + { if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) { struct p2m_domain *altp2m = d->arch.altp2m_p2m[i]; @@ -147,6 +150,7 @@ void p2m_memory_type_changed(struct domain *d) _memory_type_changed(altp2m); p2m_unlock(altp2m); } + } } p2m_unlock(hostp2m); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:56:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:56:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727572.1132070 (Exim 4.92) (envelope-from ) id 1s9lWX-0001FV-UL; Wed, 22 May 2024 12:56:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727572.1132070; Wed, 22 May 2024 12:56: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 1s9lWX-0001FN-Re; Wed, 22 May 2024 12:56:53 +0000 Received: by outflank-mailman (input) for mailman id 727572; Wed, 22 May 2024 12:56:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWW-0001F7-S3 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWW-0004ob-RO for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lWW-0006ht-Qj for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:56: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=FCueOoIL9Uy17+CaOIWQni52VcEckmiLeSMQu7MKb2c=; b=gnGPk/UrPn0+GdcyVBeETBEMLg aD1eekyf2KjvGa654hZpqbuU8dDjsFHtnsNYe8oX7n1kMZZ8A51uYq1slv36+1F3jmvPy9cHUhzqL I5NVL0jgqubfJVOoOkAgHVYnYfSMwQ6yMWuAzz6ZetLtJuyG2Njj09ORkhvRLqDP+w3o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common/dt-overlay: Fix lock issue when add/remove the device Message-Id: Date: Wed, 22 May 2024 12:56:52 +0000 commit bba4eb88fd7237ececa3097a093dadafc2000519 Author: Henry Wang AuthorDate: Tue May 21 15:59:14 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 15:59:14 2024 +0200 xen/common/dt-overlay: Fix lock issue when add/remove the device If CONFIG_DEBUG=y, below assertion will be triggered: (XEN) Assertion 'rw_is_locked(&dt_host_lock)' failed at drivers/passthrough/device_tree.c:146 (XEN) ----[ Xen-4.19-unstable arm64 debug=y Not tainted ]---- [...] (XEN) Xen call trace: (XEN) [<00000a0000257418>] iommu_remove_dt_device+0x8c/0xd4 (PC) (XEN) [<00000a00002573a0>] iommu_remove_dt_device+0x14/0xd4 (LR) (XEN) [<00000a000020797c>] dt-overlay.c#remove_node_resources+0x8c/0x90 (XEN) [<00000a0000207f14>] dt-overlay.c#remove_nodes+0x524/0x648 (XEN) [<00000a0000208460>] dt_overlay_sysctl+0x428/0xc68 (XEN) [<00000a00002707f8>] arch_do_sysctl+0x1c/0x2c (XEN) [<00000a0000230b40>] do_sysctl+0x96c/0x9ec (XEN) [<00000a0000271e08>] traps.c#do_trap_hypercall+0x1e8/0x288 (XEN) [<00000a0000273490>] do_trap_guest_sync+0x448/0x63c (XEN) [<00000a000025c480>] entry.o#guest_sync_slowpath+0xa8/0xd8 (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Assertion 'rw_is_locked(&dt_host_lock)' failed at drivers/passthrough/device_tree.c:146 (XEN) **************************************** This is because iommu_remove_dt_device() is called without taking the dt_host_lock. dt_host_lock is meant to ensure that the DT node will not disappear behind back. So fix the issue by taking the lock as soon as getting hold of overlay_node. Similar issue will be observed in adding the dtbo: (XEN) Assertion 'system_state < SYS_STATE_active || rw_is_locked(&dt_host_lock)' failed at xen-source/xen/drivers/passthrough/device_tree.c:192 (XEN) ----[ Xen-4.19-unstable arm64 debug=y Not tainted ]---- [...] (XEN) Xen call trace: (XEN) [<00000a00002594f4>] iommu_add_dt_device+0x7c/0x17c (PC) (XEN) [<00000a0000259494>] iommu_add_dt_device+0x1c/0x17c (LR) (XEN) [<00000a0000267db4>] handle_device+0x68/0x1e8 (XEN) [<00000a0000208ba8>] dt_overlay_sysctl+0x9d4/0xb84 (XEN) [<00000a000027342c>] arch_do_sysctl+0x24/0x38 (XEN) [<00000a0000231ac8>] do_sysctl+0x9ac/0xa34 (XEN) [<00000a0000274b70>] traps.c#do_trap_hypercall+0x230/0x2dc (XEN) [<00000a0000276330>] do_trap_guest_sync+0x478/0x688 (XEN) [<00000a000025e480>] entry.o#guest_sync_slowpath+0xa8/0xd8 This is because the lock is released too early. So fix the issue by releasing the lock after handle_device(). Fixes: 7e5c4a8b86f1 ("xen/arm: Implement device tree node removal functionalities") Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- xen/common/dt-overlay.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index 1b197381f6..9cece79067 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -429,18 +429,24 @@ static int remove_nodes(const struct overlay_track *tracker) if ( overlay_node == NULL ) return -EINVAL; + write_lock(&dt_host_lock); + rc = remove_descendant_nodes_resources(overlay_node); if ( rc ) + { + write_unlock(&dt_host_lock); return rc; + } rc = remove_node_resources(overlay_node); if ( rc ) + { + write_unlock(&dt_host_lock); 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 ) { @@ -604,8 +610,6 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) return rc; } - write_unlock(&dt_host_lock); - prev_node->allnext = next_node; overlay_node = dt_find_node_by_path(overlay_node->full_name); @@ -619,6 +623,7 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) rc = handle_device(hardware_domain, overlay_node, p2m_mmio_direct_c, tr->iomem_ranges, tr->irq_ranges); + write_unlock(&dt_host_lock); if ( rc ) { printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:57:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:57:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727575.1132074 (Exim 4.92) (envelope-from ) id 1s9lWh-0001Iv-Vp; Wed, 22 May 2024 12:57:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727575.1132074; Wed, 22 May 2024 12:57: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 1s9lWh-0001In-T3; Wed, 22 May 2024 12:57:03 +0000 Received: by outflank-mailman (input) for mailman id 727575; Wed, 22 May 2024 12:57:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWg-0001Hs-V7 for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWg-0004pE-UJ for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lWg-0006iV-Ta for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57: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=9bzhqWELsp6Mg6OcdV6n9Ur8hcnyEJ6ymsLDzmwLEaM=; b=ihlQxBSI5d7GxzwMqlphxHKpZ9 XxGh0KoBWhpfYv2y2idF02yrTxO4uA38XVOScTLKlgepGbYiIvQlVSgzZbzyEjZ8WL+96HYH/VwIP Ce7S47Qe7Gx/xrxkJsVbk5XE6vxBZqOUSfhKryp2qT0Q0iWzNAdo1aeLjqMMl8Uz7v88=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vpmu: address violations of MISRA C Rule 20.7 Message-Id: Date: Wed, 22 May 2024 12:57:02 +0000 commit 1b9311da4b6364ed75561307bd8c3f50dd9046ce Author: Nicola Vetrini AuthorDate: Tue May 21 15:59:50 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 15:59:50 2024 +0200 x86/vpmu: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/vpmu_amd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index db2fa420e1..97e6315bd9 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -25,8 +25,8 @@ #define is_guest_mode(msr) ((msr) & (1ULL << MSR_F10H_EVNTSEL_GO_SHIFT)) #define is_pmu_enabled(msr) ((msr) & (1ULL << MSR_F10H_EVNTSEL_EN_SHIFT)) -#define set_guest_mode(msr) (msr |= (1ULL << MSR_F10H_EVNTSEL_GO_SHIFT)) -#define is_overflowed(msr) (!((msr) & (1ULL << (MSR_F10H_COUNTER_LENGTH-1)))) +#define set_guest_mode(msr) ((msr) |= (1ULL << MSR_F10H_EVNTSEL_GO_SHIFT)) +#define is_overflowed(msr) (!((msr) & (1ULL << (MSR_F10H_COUNTER_LENGTH - 1)))) static unsigned int __read_mostly num_counters; static const u32 __read_mostly *counters; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:57:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:57:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727576.1132078 (Exim 4.92) (envelope-from ) id 1s9lWs-0001M0-0z; Wed, 22 May 2024 12:57:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727576.1132078; Wed, 22 May 2024 12: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 1s9lWr-0001Ls-UW; Wed, 22 May 2024 12:57:13 +0000 Received: by outflank-mailman (input) for mailman id 727576; Wed, 22 May 2024 12:57:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWr-0001Li-1b for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lWr-0004pL-0m for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lWr-0006iw-0C for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12: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=pwgUWgnq0uLeKN3AAFQtBu8MDa6Hu8LXPSm3kP5LmHE=; b=KFla1LSNZnbD0mGjSZqBQxGKlv 301J+FxKmNmxvifDh+QJy6ThCK3rfMRfgUN/D2jD1iKNTyI+ThkzSbNDUW/zFkDsdC56qjxD2Ce0w ISaVdUvbtJrCrOs7INJZVHplm0WuUlzMAY/j2zy8OrJaZMqFRWyTjdPhRkR46eSdxlxk=; 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 Rule 20.7 Message-Id: Date: Wed, 22 May 2024 12:57:13 +0000 commit 670b7ec65d1cb135d63e0bcdbbc686df38a1c02c Author: Nicola Vetrini AuthorDate: Tue May 21 16:00:20 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 16:00:20 2024 +0200 x86/hvm: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 2 +- xen/arch/x86/hvm/rtc.c | 2 +- xen/arch/x86/include/asm/hvm/save.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 32f74c1db0..4620ed427c 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -16,7 +16,7 @@ #include /* Get page attribute fields (PAn) from PAT MSR. */ -#define pat_cr_2_paf(pat_cr,n) ((((uint64_t)pat_cr) >> ((n)<<3)) & 0xff) +#define pat_cr_2_paf(pat_cr, n) (((uint64_t)(pat_cr) >> ((n) << 3)) & 0xff) /* Effective mm type lookup table, according to MTRR and PAT. */ static const uint8_t mm_type_tbl[MTRR_NUM_TYPES][X86_NUM_MT] = { diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index cba8532a5a..e33a8ec108 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -45,7 +45,7 @@ #define vrtc_domain(x) (container_of(x, struct pl_time, vrtc)->domain) #define vrtc_vcpu(x) (pt_global_vcpu_target(vrtc_domain(x))) #define epoch_year 1900 -#define get_year(x) (x + epoch_year) +#define get_year(x) ((x) + epoch_year) enum rtc_mode { rtc_mode_no_ack, diff --git a/xen/arch/x86/include/asm/hvm/save.h b/xen/arch/x86/include/asm/hvm/save.h index 8149aa113c..ec8de02931 100644 --- a/xen/arch/x86/include/asm/hvm/save.h +++ b/xen/arch/x86/include/asm/hvm/save.h @@ -50,7 +50,7 @@ int _hvm_check_entry(struct hvm_domain_context *h, HVM_SAVE_LENGTH(x), true) == 0 ) \ { \ ptr = &(h)->data[(h)->cur]; \ - h->cur += HVM_SAVE_LENGTH(x); \ + (h)->cur += HVM_SAVE_LENGTH(x); \ } \ ptr; }) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:57:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:57:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727577.1132082 (Exim 4.92) (envelope-from ) id 1s9lX2-0001OP-2w; Wed, 22 May 2024 12:57:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727577.1132082; Wed, 22 May 2024 12:57:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lX1-0001OI-W3; Wed, 22 May 2024 12:57:23 +0000 Received: by outflank-mailman (input) for mailman id 727577; Wed, 22 May 2024 12:57:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lX1-0001O7-4T for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lX1-0004pS-3o for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lX1-0006jN-2s for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57: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=c10P9J6yIHjKQHw7CoROFUqpf1SwQ/gZL5vdYQNU4lc=; b=fzhKnXhN6gZLe2T8e4Q40FYtTJ jMaQ5jZ2nt7c/Y8j8F+239WrPK5jbLVzsXRJVfMYBkZHrOhYGgBKf1MJtS6SQpa/5iUYtFIB/0Jg2 JPLxG1YxAolCvqRK1QCUZDkS5VdPjcc+R73vNruxkC2bJEswbbtzzdcCTw0vwgQ7y6BY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86_64/uaccess: address violations of MISRA C Rule 20.7 Message-Id: Date: Wed, 22 May 2024 12:57:23 +0000 commit 1b0b050bd6713454aedec7c3c125c39f9c375bee Author: Nicola Vetrini AuthorDate: Tue May 21 16:00:47 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 16:00:47 2024 +0200 x86_64/uaccess: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. xlat_malloc_init is touched for consistency, despite the construct being already deviated. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/include/asm/x86_64/uaccess.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/x86_64/uaccess.h b/xen/arch/x86/include/asm/x86_64/uaccess.h index ba79f950fb..c6fa3fd381 100644 --- a/xen/arch/x86/include/asm/x86_64/uaccess.h +++ b/xen/arch/x86/include/asm/x86_64/uaccess.h @@ -26,15 +26,16 @@ void free_compat_arg_xlat(struct vcpu *v); #define xlat_page_start ((unsigned long)COMPAT_ARG_XLAT_VIRT_BASE) #define xlat_page_size COMPAT_ARG_XLAT_SIZE #define xlat_page_left_size(xlat_page_current) \ - (xlat_page_start + xlat_page_size - xlat_page_current) + (xlat_page_start + xlat_page_size - (xlat_page_current)) #define xlat_malloc_init(xlat_page_current) do { \ - xlat_page_current = xlat_page_start; \ + (xlat_page_current) = xlat_page_start; \ } while (0) extern void *xlat_malloc(unsigned long *xlat_page_current, size_t size); -#define xlat_malloc_array(_p, _t, _c) ((_t *) xlat_malloc(&_p, sizeof(_t) * _c)) +#define xlat_malloc_array(_p, _t, _c) ((_t *) xlat_malloc(&(_p), \ + sizeof(_t) * (_c))) /* * Valid if in +ve half of 48-bit address space, or above Xen-reserved area. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 12:57:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 12:57:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727578.1132086 (Exim 4.92) (envelope-from ) id 1s9lXC-0001S9-5W; Wed, 22 May 2024 12:57:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727578.1132086; Wed, 22 May 2024 12:57: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 1s9lXC-0001S1-2t; Wed, 22 May 2024 12:57:34 +0000 Received: by outflank-mailman (input) for mailman id 727578; Wed, 22 May 2024 12:57:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lXB-0001Rj-7X for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9lXB-0004pa-6l for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9lXB-0006jo-5z for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 12:57: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=l8vOpCh5zc48ghSUsLyVsa6I2UhLvoYqqkv3RW2AIrM=; b=ZquAVaiTg72ZJ+lzqPOS7rRgaG 6+KLXeKG73sHNdrPBMfFOIGbi2G76N5b08EJaqi+ugEHEDEL03isGB3bA2jO3ZcWoMX+hkjKuY1Kj BzDbuJGFHM+7S4afNQ0ZUcRsBq7iUYqm1Zs2lyEG0mJxm8Qo4mg0EkgIH3f6OKJ5PJOc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86_64/cpu_idle: address violations of MISRA C Rule 20.7 Message-Id: Date: Wed, 22 May 2024 12:57:33 +0000 commit ced21fbb2842ac4655048bdee56232974ff9ff9c Author: Nicola Vetrini AuthorDate: Tue May 21 16:01:17 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 16:01:17 2024 +0200 x86_64/cpu_idle: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/x86_64/cpu_idle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/x86_64/cpu_idle.c b/xen/arch/x86/x86_64/cpu_idle.c index fcd6fc0fc2..cc9febc03d 100644 --- a/xen/arch/x86/x86_64/cpu_idle.c +++ b/xen/arch/x86/x86_64/cpu_idle.c @@ -93,7 +93,7 @@ long compat_set_cx_pminfo(uint32_t acpi_id, return -EFAULT; \ guest_from_compat_handle(states, (_s_)->states); \ \ - for ( i = 0; i < _s_->count; i++ ) \ + for ( i = 0; i < (_s_)->count; i++ ) \ { \ if ( unlikely(copy_from_guest_offset(&state, states, i, 1)) ) \ return -EFAULT; \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 22 20:33:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 22 May 2024 20:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.727874.1132550 (Exim 4.92) (envelope-from ) id 1s9sdz-0007Lh-Kw; Wed, 22 May 2024 20:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 727874.1132550; Wed, 22 May 2024 20:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9sdz-0007La-IN; Wed, 22 May 2024 20:33:03 +0000 Received: by outflank-mailman (input) for mailman id 727874; Wed, 22 May 2024 20:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9sdy-0007LU-Dw for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 20:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9sdy-00052t-7g for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 20:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1s9sdy-0003sZ-6h for xen-changelog@lists.xenproject.org; Wed, 22 May 2024 20: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=JZrKeClWjBXeqrvMNCX42SnQnx2WfoOP3KQ4Jm+2d48=; b=oNyKeBtsfbQai5rH0PbsiBKpUo JW+sFb0YS0Y0nNuHMFbUXN15+XRCIR8W+hdlFAejCFlg5DLI59vj2yQqjIABJ2Y8xpkzXEB9ZPdgl VRFS/AJ9X3C3k1jaCrMRdV4CYCt2ENk1E9cySjCT42zoHo45Chq+nIQPQGs4zOcXnbQw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] update Xen version to 4.18.3-pre Message-Id: Date: Wed, 22 May 2024 20:33:02 +0000 commit 01f7a3c792241d348a4e454a30afdf6c0d6cd71c Author: Jan Beulich AuthorDate: Tue May 21 11:52:11 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:52:11 2024 +0200 update Xen version to 4.18.3-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 657f6fa4e3..786ab61600 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 ?= .2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:22:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728194.1133030 (Exim 4.92) (envelope-from ) id 1sA3i9-0001zK-J6; Thu, 23 May 2024 08:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728194.1133030; Thu, 23 May 2024 08:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3i9-0001zA-GQ; Thu, 23 May 2024 08:22:05 +0000 Received: by outflank-mailman (input) for mailman id 728194; Thu, 23 May 2024 08:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3i8-0001wc-07 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3i7-0001Gw-SI for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3i7-0005Ph-Ow for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gW2Nx8tJMukPtnGY+3fmDdkcRHp76cFbQIzHSUKZzaU=; b=Q1/rn8FZj29f0C6YIKCx3Q5cQ2 mbP/+MdPrJfywxjfNpPeyfQ0jCBiztYSBQQyon9P6bun+KymOcl+Xm8MEKZ1KDutb8UyjM3cQH78W MVB5HS2rr1/XafIqSqHbKT5P20cMVVDKkbvvafB63W93LVBZXb3BV/7UMLCHtymb0KuQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/livepatch: make .livepatch.funcs read-only for in-tree tests Message-Id: Date: Thu, 23 May 2024 08:22:03 +0000 commit 3a3111d01844a38c523909744d0ebc6d7b096fe7 Author: Roger Pau Monné AuthorDate: Thu May 23 10:03:14 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:03:14 2024 +0200 xen/livepatch: make .livepatch.funcs read-only for in-tree tests This matches the flags of the .livepatch.funcs section when generated using livepatch-build-tools, which only sets the SHT_ALLOC flag. Also constify the definitions of the livepatch_func variables in the tests themselves, in order to better match the resulting output. Note that just making those variables constant is not enough to force the generated sections to be read-only. Signed-off-by: Roger Pau Monné Reviewed-by: Ross Lagerwall --- xen/test/livepatch/Makefile | 5 ++++- xen/test/livepatch/xen_action_hooks.c | 3 ++- xen/test/livepatch/xen_action_hooks_marker.c | 3 ++- xen/test/livepatch/xen_action_hooks_noapply.c | 3 ++- xen/test/livepatch/xen_action_hooks_norevert.c | 3 ++- xen/test/livepatch/xen_bye_world.c | 3 ++- xen/test/livepatch/xen_expectations.c | 3 ++- xen/test/livepatch/xen_expectations_fail.c | 3 ++- xen/test/livepatch/xen_hello_world.c | 3 ++- xen/test/livepatch/xen_nop.c | 2 +- xen/test/livepatch/xen_prepost_hooks.c | 3 ++- xen/test/livepatch/xen_prepost_hooks_fail.c | 3 ++- xen/test/livepatch/xen_replace_world.c | 3 ++- 13 files changed, 27 insertions(+), 13 deletions(-) diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile index d987a8367f..4caa9e2432 100644 --- a/xen/test/livepatch/Makefile +++ b/xen/test/livepatch/Makefile @@ -142,7 +142,10 @@ xen_expectations_fail-objs := xen_expectations_fail.o xen_hello_world_func.o not quiet_cmd_livepatch = LD $@ -cmd_livepatch = $(LD) $(XEN_LDFLAGS) $(build_id_linker) -r -o $@ $(real-prereqs) +define cmd_livepatch + $(LD) $(XEN_LDFLAGS) $(build_id_linker) -r -o $@ $(real-prereqs); \ + $(OBJCOPY) --set-section-flags ".livepatch.funcs=alloc,readonly" $@ +endef $(obj)/%.livepatch: FORCE $(call if_changed,livepatch) diff --git a/xen/test/livepatch/xen_action_hooks.c b/xen/test/livepatch/xen_action_hooks.c index fa0b3ab35f..30c2c5de3c 100644 --- a/xen/test/livepatch/xen_action_hooks.c +++ b/xen/test/livepatch/xen_action_hooks.c @@ -84,7 +84,8 @@ LIVEPATCH_REVERT_HOOK(revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_action_hooks_marker.c b/xen/test/livepatch/xen_action_hooks_marker.c index d2e22f70d1..eb31a4abc4 100644 --- a/xen/test/livepatch/xen_action_hooks_marker.c +++ b/xen/test/livepatch/xen_action_hooks_marker.c @@ -96,7 +96,8 @@ LIVEPATCH_POSTAPPLY_HOOK(post_apply_hook); LIVEPATCH_PREREVERT_HOOK(pre_revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_action_hooks_noapply.c b/xen/test/livepatch/xen_action_hooks_noapply.c index 646a5fd2f0..92d10d53ff 100644 --- a/xen/test/livepatch/xen_action_hooks_noapply.c +++ b/xen/test/livepatch/xen_action_hooks_noapply.c @@ -120,7 +120,8 @@ LIVEPATCH_POSTAPPLY_HOOK(post_apply_hook); LIVEPATCH_PREREVERT_HOOK(pre_revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_action_hooks_norevert.c b/xen/test/livepatch/xen_action_hooks_norevert.c index c5fbab1746..fc2d33b531 100644 --- a/xen/test/livepatch/xen_action_hooks_norevert.c +++ b/xen/test/livepatch/xen_action_hooks_norevert.c @@ -115,7 +115,8 @@ LIVEPATCH_POSTAPPLY_HOOK(post_apply_hook); LIVEPATCH_PREREVERT_HOOK(pre_revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_bye_world.c b/xen/test/livepatch/xen_bye_world.c index 2700f0eedd..86589205d8 100644 --- a/xen/test/livepatch/xen_bye_world.c +++ b/xen/test/livepatch/xen_bye_world.c @@ -14,7 +14,8 @@ static const char bye_world_patch_this_fnc[] = "xen_extra_version"; extern const char *xen_bye_world(void); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_bye_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_bye_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = bye_world_patch_this_fnc, .new_addr = xen_bye_world, diff --git a/xen/test/livepatch/xen_expectations.c b/xen/test/livepatch/xen_expectations.c index c8175a458b..06c752c818 100644 --- a/xen/test/livepatch/xen_expectations.c +++ b/xen/test/livepatch/xen_expectations.c @@ -15,7 +15,8 @@ static const char livepatch_exceptions_str[] = "xen_extra_version"; extern const char *xen_hello_world(void); -struct livepatch_func __section(".livepatch.funcs") livepatch_exceptions = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_exceptions = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = livepatch_exceptions_str, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_expectations_fail.c b/xen/test/livepatch/xen_expectations_fail.c index 36a110286f..f42c19a953 100644 --- a/xen/test/livepatch/xen_expectations_fail.c +++ b/xen/test/livepatch/xen_expectations_fail.c @@ -16,7 +16,8 @@ extern const char *xen_hello_world(void); #define EXPECT_BYTES_COUNT 6 -struct livepatch_func __section(".livepatch.funcs") livepatch_exceptions = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_exceptions = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = livepatch_exceptions_str, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_hello_world.c b/xen/test/livepatch/xen_hello_world.c index 02f3f85dc0..08ab2f197e 100644 --- a/xen/test/livepatch/xen_hello_world.c +++ b/xen/test/livepatch/xen_hello_world.c @@ -47,7 +47,8 @@ LIVEPATCH_UNLOAD_HOOK(hi_func); LIVEPATCH_UNLOAD_HOOK(check_fnc); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_nop.c b/xen/test/livepatch/xen_nop.c index a224b7c670..6dea657365 100644 --- a/xen/test/livepatch/xen_nop.c +++ b/xen/test/livepatch/xen_nop.c @@ -14,7 +14,7 @@ * running this test-case you MUST verify that the assumptions are * correct (Hint: make debug and look in xen.s). */ -struct livepatch_func __section(".livepatch.funcs") livepatch_nop = { +const struct livepatch_func __section(".livepatch.funcs") livepatch_nop = { .version = LIVEPATCH_PAYLOAD_VERSION, .old_size = MINOR_VERSION_SZ, diff --git a/xen/test/livepatch/xen_prepost_hooks.c b/xen/test/livepatch/xen_prepost_hooks.c index 17f5af6a19..00b0b3abb0 100644 --- a/xen/test/livepatch/xen_prepost_hooks.c +++ b/xen/test/livepatch/xen_prepost_hooks.c @@ -102,7 +102,8 @@ LIVEPATCH_POSTAPPLY_HOOK(post_apply_hook); LIVEPATCH_PREREVERT_HOOK(pre_revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_prepost_hooks_fail.c b/xen/test/livepatch/xen_prepost_hooks_fail.c index 52fd7f642e..8497715646 100644 --- a/xen/test/livepatch/xen_prepost_hooks_fail.c +++ b/xen/test/livepatch/xen_prepost_hooks_fail.c @@ -55,7 +55,8 @@ LIVEPATCH_POSTAPPLY_HOOK(unreachable_post_hook); LIVEPATCH_PREREVERT_HOOK(unreachable_pre_hook); LIVEPATCH_POSTREVERT_HOOK(unreachable_post_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_replace_world.c b/xen/test/livepatch/xen_replace_world.c index 78a8f528b3..272cc55e82 100644 --- a/xen/test/livepatch/xen_replace_world.c +++ b/xen/test/livepatch/xen_replace_world.c @@ -13,7 +13,8 @@ static const char xen_replace_world_name[] = "xen_extra_version"; extern const char *xen_replace_world(void); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_replace_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_replace_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = xen_replace_world_name, .old_addr = 0, /* Forces the hypervisor to lookup .name */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:22:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:22:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728197.1133034 (Exim 4.92) (envelope-from ) id 1sA3iJ-00029y-Ku; Thu, 23 May 2024 08:22:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728197.1133034; Thu, 23 May 2024 08:22:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3iJ-00029q-I5; Thu, 23 May 2024 08:22:15 +0000 Received: by outflank-mailman (input) for mailman id 728197; Thu, 23 May 2024 08:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3iI-00028J-3N for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3iH-0001H3-WB for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3iH-0005QD-UQ for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qyP8AfCGM5ULAY+W1xfH5y5w6hMYNAC49OD22ndPjkM=; b=vTJPdsamYLk/YWUDxWdp/Zyfl7 sjJrNuATjJqiwUKfW7ytvZ9fTbd9NOPPeMTo0JD55/QmZgTmGYWPK8G1tg5pK7Gohpj3XszFDzX8Q ik3jWYyvWy0hNz4ZPbh6nGanT/kUoIkCWsUOL6JGl2Y6eLCjEy4GtsQIpFCNky5b1xWI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] iommu/x86: print RMRR/IVMD ranges using full addresses Message-Id: Date: Thu, 23 May 2024 08:22:13 +0000 commit 212cb5effa6bccf6f8c4f17964c036abb6ad5809 Author: Roger Pau Monné AuthorDate: Thu May 23 10:03:33 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:03:33 2024 +0200 iommu/x86: print RMRR/IVMD ranges using full addresses It's easier to correlate with the physical memory map if the addresses are fully printed, instead of using frame numbers. Requested-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/passthrough/x86/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index a3fa0aef7c..304a2f5480 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -801,8 +801,8 @@ bool __init iommu_unity_region_ok(const char *prefix, mfn_t start, mfn_t end) return true; printk(XENLOG_WARNING - "%s: [%#" PRI_mfn " ,%#" PRI_mfn "] is not (entirely) in reserved memory\n", - prefix, mfn_x(start), mfn_x(end)); + "%s: [%#lx, %#lx] is not (entirely) in reserved memory\n", + prefix, mfn_to_maddr(start), mfn_to_maddr(end)); for ( addr = start; mfn_x(addr) <= mfn_x(end); addr = mfn_add(addr, 1) ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:22:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:22:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728198.1133038 (Exim 4.92) (envelope-from ) id 1sA3iT-0002Ha-M7; Thu, 23 May 2024 08:22:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728198.1133038; Thu, 23 May 2024 08:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3iT-0002HS-Jb; Thu, 23 May 2024 08:22:25 +0000 Received: by outflank-mailman (input) for mailman id 728198; Thu, 23 May 2024 08:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3iS-0002GE-3w for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3iS-0001HQ-36 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3iS-0005Qg-26 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=S/q6U77bRU9Qct8I1sNHGupwmz046I1DOQ6PLnF1AM4=; b=029sQ2P48VXA6XZ6X9cMo2KRUA ll8MtYb00yTp+GhGalzNH/+rgyGHTw262ZfjI3qKrd0AfQ1CqBq3riM0ruU9WpFwBwbi0h11iGTbd DsmHosrmg/QkD/XEJ6KBq2reEKpnnHRBwujjNBbE/nQZKfyU8BBRIxrYtHZ/sM0+lJSc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: Simplify header dependencies in x86/hvm Message-Id: Date: Thu, 23 May 2024 08:22:24 +0000 commit 9f482c6a7ef6908aacc3df440f292c164b77058f Author: Alejandro Vallejo AuthorDate: Thu May 23 10:07:31 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:07:31 2024 +0200 xen/x86: Simplify header dependencies in x86/hvm Otherwise it's not possible to call functions described in hvm/vlapic.h from the inline functions of hvm/hvm.h. This is because a static inline in vlapic.h depends on hvm.h, and pulls it transitively through vpt.h. The ultimate cause is having hvm.h included in any of the "v*.h" headers, so break the cycle moving the guilty inline into hvm.h. No functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/irq.c | 6 +++--- xen/arch/x86/hvm/vlapic.c | 4 ++-- xen/arch/x86/include/asm/hvm/hvm.h | 6 ++++++ xen/arch/x86/include/asm/hvm/vlapic.h | 6 ------ xen/arch/x86/include/asm/hvm/vpt.h | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 4a9fe82cbd..210cebb0e6 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -512,13 +512,13 @@ struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v) int vector; /* - * Always call vlapic_sync_pir_to_irr so that PIR is synced into IRR when - * using posted interrupts. Note this is also done by + * Always call hvm_sync_pir_to_irr() so that PIR is synced into IRR + * when using posted interrupts. Note this is also done by * vlapic_has_pending_irq but depending on which interrupts are pending * hvm_vcpu_has_pending_irq will return early without calling * vlapic_has_pending_irq. */ - vlapic_sync_pir_to_irr(v); + hvm_sync_pir_to_irr(v); if ( unlikely(v->arch.nmi_pending) ) return hvm_intack_nmi; diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 6a11f4d94d..9cfc82666a 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -97,7 +97,7 @@ static void vlapic_clear_irr(int vector, struct vlapic *vlapic) static int vlapic_find_highest_irr(struct vlapic *vlapic) { - vlapic_sync_pir_to_irr(vlapic_vcpu(vlapic)); + hvm_sync_pir_to_irr(vlapic_vcpu(vlapic)); return vlapic_find_highest_vector(&vlapic->regs->data[APIC_IRR]); } @@ -1506,7 +1506,7 @@ static int cf_check lapic_save_regs(struct vcpu *v, hvm_domain_context_t *h) if ( !has_vlapic(v->domain) ) return 0; - vlapic_sync_pir_to_irr(v); + hvm_sync_pir_to_irr(v); return hvm_save_entry(LAPIC_REGS, v->vcpu_id, h, vcpu_vlapic(v)->regs); } diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 0c9e6f1564..1c01e22c8e 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -797,6 +797,12 @@ static inline void hvm_update_vlapic_mode(struct vcpu *v) alternative_vcall(hvm_funcs.update_vlapic_mode, v); } +static inline void hvm_sync_pir_to_irr(struct vcpu *v) +{ + if ( hvm_funcs.sync_pir_to_irr ) + alternative_vcall(hvm_funcs.sync_pir_to_irr, v); +} + #else /* CONFIG_HVM */ #define hvm_enabled false diff --git a/xen/arch/x86/include/asm/hvm/vlapic.h b/xen/arch/x86/include/asm/hvm/vlapic.h index 88ef945243..2c4ff94ae7 100644 --- a/xen/arch/x86/include/asm/hvm/vlapic.h +++ b/xen/arch/x86/include/asm/hvm/vlapic.h @@ -137,10 +137,4 @@ bool vlapic_match_dest( const struct vlapic *target, const struct vlapic *source, int short_hand, uint32_t dest, bool dest_mode); -static inline void vlapic_sync_pir_to_irr(struct vcpu *v) -{ - if ( hvm_funcs.sync_pir_to_irr ) - alternative_vcall(hvm_funcs.sync_pir_to_irr, v); -} - #endif /* __ASM_X86_HVM_VLAPIC_H__ */ diff --git a/xen/arch/x86/include/asm/hvm/vpt.h b/xen/arch/x86/include/asm/hvm/vpt.h index feb0bf43f1..0b92b28625 100644 --- a/xen/arch/x86/include/asm/hvm/vpt.h +++ b/xen/arch/x86/include/asm/hvm/vpt.h @@ -11,7 +11,6 @@ #include #include #include -#include /* * Abstract layer of periodic time, one short time. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:22:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:22:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728200.1133042 (Exim 4.92) (envelope-from ) id 1sA3id-0002NS-Nr; Thu, 23 May 2024 08:22:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728200.1133042; Thu, 23 May 2024 08:22:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3id-0002NK-LA; Thu, 23 May 2024 08:22:35 +0000 Received: by outflank-mailman (input) for mailman id 728200; Thu, 23 May 2024 08:22:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3ic-0002N4-6p for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3ic-0001HX-62 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3ic-0005RO-5H for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=X23gdpvLODSrLYoQjLkC7apmJlD0VB9iZqwqcUh/aQc=; b=wQs/FB9HQ7l5LwU3qf13HFz+10 ifRRcFJQJOTTrSmEskmovv6iSG63qQZ3ULyUbIXQaZ4VyWvuZbqno5ETg9UrzvhahR538MfA+M0ad 9qF+OfGMOytA9VwQACfUTuBGzztYivt+Ia6nUkim6zy5CZJ5OkUq/pdTgKigtoE0ms94=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce cmpxchg.h Message-Id: Date: Thu, 23 May 2024 08:22:34 +0000 commit 51dabd6312ce42e557bcba10710577306808a13e Author: Oleksii Kurochko AuthorDate: Fri May 17 15:54:54 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:10:19 2024 +0200 xen/riscv: introduce cmpxchg.h The header was taken from Linux kernl 6.4.0-rc1. Addionally, were updated: * add emulation of {cmp}xchg for 1/2 byte types using 32-bit atomic access. * replace tabs with spaces * replace __* variale with *__ * introduce generic version of xchg_* and cmpxchg_*. * drop {cmp}xchg{release,relaxed,acquire} as Xen doesn't use them * drop barries and use instruction suffixices instead ( .aq, .rl, .aqrl ) Implementation of 4- and 8-byte cases were updated according to the spec: ``` .... Linux Construct RVWMO AMO Mapping ... atomic amo.{w|d}.aqrl Linux Construct RVWMO LR/SC Mapping ... atomic loop: lr.{w|d}.aq; ; sc.{w|d}.aqrl; bnez loop Table A.5: Mappings from Linux memory primitives to RISC-V primitives ``` The current implementation is the same with 8e86f0b409a4 ("arm64: atomics: fix use of acquire + release for full barrier semantics") [1]. RISC-V could combine acquire and release into the SC instructions and it could reduce a fence instruction to gain better performance. Here is related description from RISC-V ISA 10.2 Load-Reserved/Store-Conditional Instructions: - .aq: The LR/SC sequence can be given acquire semantics by setting the aq bit on the LR instruction. - .rl: The LR/SC sequence can be given release semantics by setting the rl bit on the SC instruction. - .aqrl: Setting the aq bit on the LR instruction, and setting both the aq and the rl bit on the SC instruction makes the LR/SC sequence sequentially consistent, meaning that it cannot be reordered with earlier or later memory operations from the same hart. Software should not set the rl bit on an LR instruction unless the aq bit is also set, nor should software set the aq bit on an SC instruction unless the rl bit is also set. LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those with both bits clear, but may result in lower performance. Also, I way of transforming ".rl + full barrier" to ".aqrl" was approved by (the author of the RVWMO spec) [2] [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/1391516953-14541-1-git-send-email-will.deacon@arm.com/ [2] https://lore.kernel.org/linux-riscv/41e01514-74ca-84f2-f5cc-2645c444fd8e@nvidia.com/ Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/cmpxchg.h | 241 +++++++++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/config.h | 2 + 2 files changed, 243 insertions(+) diff --git a/xen/arch/riscv/include/asm/cmpxchg.h b/xen/arch/riscv/include/asm/cmpxchg.h new file mode 100644 index 0000000000..d5e678c036 --- /dev/null +++ b/xen/arch/riscv/include/asm/cmpxchg.h @@ -0,0 +1,241 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2014 Regents of the University of California */ + +#ifndef _ASM_RISCV_CMPXCHG_H +#define _ASM_RISCV_CMPXCHG_H + +#include +#include + +#include +#include +#include + +#define _amoswap_generic(ptr, new, ret, sfx) \ + asm volatile ( \ + " amoswap" sfx " %0, %2, %1" \ + : "=r" (ret), "+A" (*(ptr)) \ + : "r" (new) \ + : "memory" ); + +/* + * For LR and SC, the A extension requires that the address held in rs1 be + * naturally aligned to the size of the operand (i.e., eight-byte aligned + * for 64-bit words and four-byte aligned for 32-bit words). + * If the address is not naturally aligned, an address-misaligned exception + * or an access-fault exception will be generated. + * + * Thereby: + * - for 1-byte xchg access the containing word by clearing low two bits. + * - for 2-byte xchg access the containing word by clearing bit 1. + * + * If resulting 4-byte access is still misalgined, it will fault just as + * non-emulated 4-byte access would. + */ +#define emulate_xchg_1_2(ptr, new, lr_sfx, sc_sfx) \ +({ \ + uint32_t *aligned_ptr; \ + unsigned long alignment_mask = sizeof(*aligned_ptr) - sizeof(*(ptr)); \ + unsigned int new_val_bit = \ + ((unsigned long)(ptr) & alignment_mask) * BITS_PER_BYTE; \ + unsigned long mask = \ + GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0) << new_val_bit; \ + unsigned int new_ = (new) << new_val_bit; \ + unsigned int old; \ + unsigned int scratch; \ + \ + aligned_ptr = (uint32_t *)((unsigned long)(ptr) & ~alignment_mask); \ + \ + asm volatile ( \ + "0: lr.w" lr_sfx " %[old], %[ptr_]\n" \ + " andn %[scratch], %[old], %[mask]\n" \ + " or %[scratch], %[scratch], %z[new_]\n" \ + " sc.w" sc_sfx " %[scratch], %[scratch], %[ptr_]\n" \ + " bnez %[scratch], 0b\n" \ + : [old] "=&r" (old), [scratch] "=&r" (scratch), \ + [ptr_] "+A" (*aligned_ptr) \ + : [new_] "rJ" (new_), [mask] "r" (mask) \ + : "memory" ); \ + \ + (__typeof__(*(ptr)))((old & mask) >> new_val_bit); \ +}) + +/* + * This function doesn't exist, so you'll get a linker error + * if something tries to do an invalid xchg(). + */ +extern unsigned long __bad_xchg(volatile void *ptr, unsigned int size); + +static always_inline unsigned long __xchg(volatile void *ptr, + unsigned long new, + unsigned int size) +{ + unsigned long ret; + + switch ( size ) + { + case 1: + ret = emulate_xchg_1_2((volatile uint8_t *)ptr, new, ".aq", ".aqrl"); + break; + case 2: + ret = emulate_xchg_1_2((volatile uint16_t *)ptr, new, ".aq", ".aqrl"); + break; + case 4: + _amoswap_generic((volatile uint32_t *)ptr, new, ret, ".w.aqrl"); + break; +#ifndef CONFIG_RISCV_32 + case 8: + _amoswap_generic((volatile uint64_t *)ptr, new, ret, ".d.aqrl"); + break; +#endif + default: + return __bad_xchg(ptr, size); + } + + return ret; +} + +#define xchg(ptr, x) \ +({ \ + __typeof__(*(ptr)) n_ = (x); \ + (__typeof__(*(ptr))) \ + __xchg(ptr, (unsigned long)n_, sizeof(*(ptr))); \ +}) + +#define _generic_cmpxchg(ptr, old, new, lr_sfx, sc_sfx) \ + ({ \ + unsigned int rc; \ + unsigned long ret; \ + unsigned long mask = GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0); \ + asm volatile ( \ + "0: lr" lr_sfx " %[ret], %[ptr_]\n" \ + " and %[ret], %[ret], %[mask]\n" \ + " bne %[ret], %z[old_], 1f\n" \ + " sc" sc_sfx " %[rc], %z[new_], %[ptr_]\n" \ + " bnez %[rc], 0b\n" \ + "1:\n" \ + : [ret] "=&r" (ret), [rc] "=&r" (rc), [ptr_] "+A" (*ptr) \ + : [old_] "rJ" (old), [new_] "rJ" (new), [mask] "r" (mask) \ + : "memory" ); \ + ret; \ + }) + +/* + * For LR and SC, the A extension requires that the address held in rs1 be + * naturally aligned to the size of the operand (i.e., eight-byte aligned + * for 64-bit words and four-byte aligned for 32-bit words). + * If the address is not naturally aligned, an address-misaligned exception + * or an access-fault exception will be generated. + * + * Thereby: + * - for 1-byte xchg access the containing word by clearing low two bits + * - for 2-byte xchg ccess the containing word by clearing first bit. + * + * If resulting 4-byte access is still misalgined, it will fault just as + * non-emulated 4-byte access would. + * + * old_val was casted to unsigned long for cmpxchgptr() + */ +#define emulate_cmpxchg_1_2(ptr, old, new, lr_sfx, sc_sfx) \ +({ \ + uint32_t *aligned_ptr; \ + unsigned long alignment_mask = sizeof(*aligned_ptr) - sizeof(*(ptr)); \ + uint8_t new_val_bit = \ + ((unsigned long)(ptr) & alignment_mask) * BITS_PER_BYTE; \ + unsigned long mask = \ + GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0) << new_val_bit; \ + unsigned int old_ = (old) << new_val_bit; \ + unsigned int new_ = (new) << new_val_bit; \ + unsigned int old_val; \ + unsigned int scratch; \ + \ + aligned_ptr = (uint32_t *)((unsigned long)ptr & ~alignment_mask); \ + \ + asm volatile ( \ + "0: lr.w" lr_sfx " %[scratch], %[ptr_]\n" \ + " and %[old_val], %[scratch], %[mask]\n" \ + " bne %[old_val], %z[old_], 1f\n" \ + /* the following line is an equivalent to: \ + * scratch = old_val & ~mask; \ + * And to elimanate one ( likely register ) input it was decided \ + * to use: \ + * scratch = old_val ^ scratch \ + */ \ + " xor %[scratch], %[old_val], %[scratch]\n" \ + " or %[scratch], %[scratch], %z[new_]\n" \ + " sc.w" sc_sfx " %[scratch], %[scratch], %[ptr_]\n" \ + " bnez %[scratch], 0b\n" \ + "1:\n" \ + : [old_val] "=&r" (old_val), [scratch] "=&r" (scratch), \ + [ptr_] "+A" (*aligned_ptr) \ + : [old_] "rJ" (old_), [new_] "rJ" (new_), \ + [mask] "r" (mask) \ + : "memory" ); \ + \ + (__typeof__(*(ptr)))((unsigned long)old_val >> new_val_bit); \ +}) + +/* + * This function doesn't exist, so you'll get a linker error + * if something tries to do an invalid cmpxchg(). + */ +extern unsigned long __bad_cmpxchg(volatile void *ptr, unsigned int size); + +/* + * Atomic compare and exchange. Compare OLD with MEM, if identical, + * store NEW in MEM. Return the initial value in MEM. Success is + * indicated by comparing RETURN with OLD. + */ +static always_inline unsigned long __cmpxchg(volatile void *ptr, + unsigned long old, + unsigned long new, + unsigned int size) +{ + unsigned long ret; + + switch ( size ) + { + case 1: + ret = emulate_cmpxchg_1_2((volatile uint8_t *)ptr, old, new, + ".aq", ".aqrl"); + break; + case 2: + ret = emulate_cmpxchg_1_2((volatile uint16_t *)ptr, old, new, + ".aq", ".aqrl"); + break; + case 4: + ret = _generic_cmpxchg((volatile uint32_t *)ptr, old, new, + ".w.aq", ".w.aqrl"); + break; +#ifndef CONFIG_32BIT + case 8: + ret = _generic_cmpxchg((volatile uint64_t *)ptr, old, new, + ".d.aq", ".d.aqrl"); + break; +#endif + default: + return __bad_cmpxchg(ptr, size); + } + + return ret; +} + +#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))); \ +}) + +#endif /* _ASM_RISCV_CMPXCHG_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/riscv/include/asm/config.h b/xen/arch/riscv/include/asm/config.h index c5f93e6a01..50583aafdc 100644 --- a/xen/arch/riscv/include/asm/config.h +++ b/xen/arch/riscv/include/asm/config.h @@ -119,6 +119,8 @@ #define BITS_PER_LLONG 64 +#define BITS_PER_BYTE 8 + /* xen_ulong_t is always 64 bits */ #define BITS_PER_XEN_ULONG 64 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:22:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728204.1133056 (Exim 4.92) (envelope-from ) id 1sA3io-0002hb-16; Thu, 23 May 2024 08:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728204.1133056; Thu, 23 May 2024 08:22:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3in-0002hT-Ua; Thu, 23 May 2024 08:22:45 +0000 Received: by outflank-mailman (input) for mailman id 728204; Thu, 23 May 2024 08:22:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3im-0002SS-9v for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3im-0001Hf-97 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3im-0005S9-8A for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ty335eZOA6nmQ/B3ckAV3LpquaB6S9rWT0ZeaM/Wbbo=; b=T9682o4FZA5b9YS+RzqNQ22cyg bRlGUpHWe4I+QArF/Nx8nR1P1sqpgq+bKnpxm4NFJHjaosb4j7bBoV1Fc7vljQDEc8QnzP4uWJorK QVG6nkE2N8zgOUs1HIc3NqqoIo+5nOmXd2pfr/nPlBS+nPuuGXh5B1lGPpzHOiwxjvHM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: introduce atomic.h Message-Id: Date: Thu, 23 May 2024 08:22:44 +0000 commit 3cd46d4ec8b9fa6b05c823e1f48cb6dc6a837e78 Author: Oleksii Kurochko AuthorDate: Fri May 17 15:54:55 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:12:12 2024 +0200 xen/riscv: introduce atomic.h Initially the patch was introduced by Bobby, who takes the header from Linux kernel. The following changes were done on top of Bobby's changes: - atomic##prefix##_*xchg_*(atomic##prefix##_t *v, c_t n) were updated to use__*xchg_generic() - drop casts in write_atomic() as they are unnecessary - drop introduction of WRITE_ONCE() and READ_ONCE(). Xen provides ACCESS_ONCE() - remove zero-length array access in read_atomic() - drop defines similar to pattern: #define atomic_add_return_relaxed atomic_add_return_relaxed - move not RISC-V specific functions to asm-generic/atomics-ops.h - drop atomic##prefix##_{cmp}xchg_{release, aquire, release}() as they are not used in Xen. - update the defintion of atomic##prefix##_{cmp}xchg according to {cmp}xchg() implementation in Xen. - some ATOMIC_OP() macros were updated: - drop size argument for ATOMIC_OP which defines atomic##prefix##_xchg() and atomic##prefix##_cmpxchg(). - drop c_op argument for ATOMIC_OPS which defines ATOMIC_OPS(and, and), ATOMIC_OPS( or, or), ATOMIC_OPS(xor, xor), ATOMIC_OPS(add, add, +), ATOMIC_OPS(sub, add, -) as c_op is always "+" for them. - drop "" from definition of __atomic_{acquire/release"}_fence. The current implementation is the same with 8e86f0b409a4 ("arm64: atomics: fix use of acquire + release for full barrier semantics") [1]. RISC-V could combine acquire and release into the SC instructions and it could reduce a fence instruction to gain better performance. Here is related description from RISC-V ISA 10.2 Load-Reserved/Store-Conditional Instructions: - .aq: The LR/SC sequence can be given acquire semantics by setting the aq bit on the LR instruction. - .rl: The LR/SC sequence can be given release semantics by setting the rl bit on the SC instruction. - .aqrl: Setting the aq bit on the LR instruction, and setting both the aq and the rl bit on the SC instruction makes the LR/SC sequence sequentially consistent, meaning that it cannot be reordered with earlier or later memory operations from the same hart. Software should not set the rl bit on an LR instruction unless the aq bit is also set, nor should software set the aq bit on an SC instruction unless the rl bit is also set. LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those with both bits clear, but may result in lower performance. Also, I way of transforming ".rl + full barrier" to ".aqrl" was approved by (the author of the RVWMO spec) [2] [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/1391516953-14541-1-git-send-email-will.deacon@arm.com/ [2] https://lore.kernel.org/linux-riscv/41e01514-74ca-84f2-f5cc-2645c444fd8e@nvidia.com/ Signed-off-by: Bobby Eshleman Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/atomic.h | 280 +++++++++++++++++++++++++++++++++++ xen/include/asm-generic/atomic-ops.h | 97 ++++++++++++ 2 files changed, 377 insertions(+) diff --git a/xen/arch/riscv/include/asm/atomic.h b/xen/arch/riscv/include/asm/atomic.h new file mode 100644 index 0000000000..31b91a79c8 --- /dev/null +++ b/xen/arch/riscv/include/asm/atomic.h @@ -0,0 +1,280 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Taken and modified from Linux. + * + * The following changes were done: + * - * atomic##prefix##_*xchg_*(atomic##prefix##_t *v, c_t n) were updated + * to use__*xchg_generic() + * - drop casts in write_atomic() as they are unnecessary + * - drop introduction of WRITE_ONCE() and READ_ONCE(). + * Xen provides ACCESS_ONCE() + * - remove zero-length array access in read_atomic() + * - drop defines similar to pattern + * #define atomic_add_return_relaxed atomic_add_return_relaxed + * - move not RISC-V specific functions to asm-generic/atomics-ops.h + * + * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. + * Copyright (C) 2012 Regents of the University of California + * Copyright (C) 2017 SiFive + * Copyright (C) 2024 Vates SAS + */ + +#ifndef _ASM_RISCV_ATOMIC_H +#define _ASM_RISCV_ATOMIC_H + +#include + +#include +#include +#include +#include + +void __bad_atomic_size(void); + +/* + * Legacy from Linux kernel. For some reason they wanted to have ordered + * read/write access. Thereby read* is used instead of read*_cpu() + */ +static always_inline void read_atomic_size(const volatile void *p, + void *res, + unsigned int size) +{ + switch ( size ) + { + case 1: *(uint8_t *)res = readb(p); break; + case 2: *(uint16_t *)res = readw(p); break; + case 4: *(uint32_t *)res = readl(p); break; +#ifndef CONFIG_RISCV_32 + case 8: *(uint32_t *)res = readq(p); break; +#endif + 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; \ +}) + +static always_inline void _write_atomic(volatile void *p, + unsigned long x, unsigned int size) +{ + switch ( size ) + { + case 1: writeb(x, p); break; + case 2: writew(x, p); break; + case 4: writel(x, p); break; +#ifndef CONFIG_RISCV_32 + case 8: writeq(x, p); break; +#endif + default: __bad_atomic_size(); break; + } +} + +#define write_atomic(p, x) \ +({ \ + typeof(*(p)) x_ = (x); \ + _write_atomic(p, x_, sizeof(*(p))); \ +}) + +static always_inline void _add_sized(volatile void *p, + unsigned long x, unsigned int size) +{ + switch ( size ) + { + case 1: + { + volatile uint8_t *ptr = p; + write_atomic(ptr, read_atomic(ptr) + x); + break; + } + case 2: + { + volatile uint16_t *ptr = p; + write_atomic(ptr, read_atomic(ptr) + x); + break; + } + case 4: + { + volatile uint32_t *ptr = p; + write_atomic(ptr, read_atomic(ptr) + x); + break; + } +#ifndef CONFIG_RISCV_32 + case 8: + { + volatile uint64_t *ptr = p; + write_atomic(ptr, read_atomic(ptr) + x); + break; + } +#endif + default: __bad_atomic_size(); break; + } +} + +#define add_sized(p, x) \ +({ \ + typeof(*(p)) x_ = (x); \ + _add_sized(p, x_, sizeof(*(p))); \ +}) + +#define __atomic_acquire_fence() \ + asm volatile ( RISCV_ACQUIRE_BARRIER ::: "memory" ) + +#define __atomic_release_fence() \ + asm volatile ( RISCV_RELEASE_BARRIER ::: "memory" ) + +/* + * First, the atomic ops that have no ordering constraints and therefor don't + * have the AQ or RL bits set. These don't return anything, so there's only + * one version to worry about. + */ +#define ATOMIC_OP(op, asm_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +void atomic##prefix##_##op(c_type i, atomic##prefix##_t *v) \ +{ \ + asm volatile ( \ + " amo" #asm_op "." #asm_type " zero, %1, %0" \ + : "+A" (v->counter) \ + : "r" (unary_op i) \ + : "memory" ); \ +} \ + +/* + * Only CONFIG_GENERIC_ATOMIC64=y was ported to Xen that is the reason why + * last argument for ATOMIC_OP isn't used. + */ +#define ATOMIC_OPS(op, asm_op, unary_op) \ + ATOMIC_OP (op, asm_op, unary_op, w, int, ) + +ATOMIC_OPS(add, add, +) +ATOMIC_OPS(sub, add, -) +ATOMIC_OPS(and, and, +) +ATOMIC_OPS( or, or, +) +ATOMIC_OPS(xor, xor, +) + +#undef ATOMIC_OP +#undef ATOMIC_OPS + +#include + +/* + * Atomic ops that have ordered variant. + * There's two flavors of these: the arithmatic ops have both fetch and return + * versions, while the logical ops only have fetch versions. + */ +#define ATOMIC_FETCH_OP(op, asm_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +c_type atomic##prefix##_fetch_##op(c_type i, atomic##prefix##_t *v) \ +{ \ + register c_type ret; \ + asm volatile ( \ + " amo" #asm_op "." #asm_type ".aqrl %1, %2, %0" \ + : "+A" (v->counter), "=r" (ret) \ + : "r" (unary_op i) \ + : "memory" ); \ + return ret; \ +} + +#define ATOMIC_OP_RETURN(op, asm_op, c_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +c_type atomic##prefix##_##op##_return(c_type i, atomic##prefix##_t *v) \ +{ \ + return atomic##prefix##_fetch_##op(i, v) c_op (unary_op i); \ +} + +/* + * Only CONFIG_GENERIC_ATOMIC64=y was ported to Xen that is the reason why + * last argument of ATOMIC_FETCH_OP, ATOMIC_OP_RETURN isn't used. + */ +#define ATOMIC_OPS(op, asm_op, unary_op) \ + ATOMIC_FETCH_OP( op, asm_op, unary_op, w, int, ) \ + ATOMIC_OP_RETURN(op, asm_op, +, unary_op, w, int, ) + +ATOMIC_OPS(add, add, +) +ATOMIC_OPS(sub, add, -) + +#undef ATOMIC_OPS + +#define ATOMIC_OPS(op, asm_op) \ + ATOMIC_FETCH_OP(op, asm_op, +, w, int, ) + +ATOMIC_OPS(and, and) +ATOMIC_OPS( or, or) +ATOMIC_OPS(xor, xor) + +#undef ATOMIC_OPS + +#undef ATOMIC_FETCH_OP +#undef ATOMIC_OP_RETURN + +/* This is required to provide a full barrier on success. */ +static inline int atomic_add_unless(atomic_t *v, int a, int u) +{ + int prev, rc; + + asm volatile ( + "0: lr.w %[p], %[c]\n" + " beq %[p], %[u], 1f\n" + " add %[rc], %[p], %[a]\n" + " sc.w.aqrl %[rc], %[rc], %[c]\n" + " bnez %[rc], 0b\n" + "1:\n" + : [p] "=&r" (prev), [rc] "=&r" (rc), [c] "+A" (v->counter) + : [a] "r" (a), [u] "r" (u) + : "memory"); + return prev; +} + +static inline int atomic_sub_if_positive(atomic_t *v, int offset) +{ + int prev, rc; + + asm volatile ( + "0: lr.w %[p], %[c]\n" + " sub %[rc], %[p], %[o]\n" + " bltz %[rc], 1f\n" + " sc.w.aqrl %[rc], %[rc], %[c]\n" + " bnez %[rc], 0b\n" + "1:\n" + : [p] "=&r" (prev), [rc] "=&r" (rc), [c] "+A" (v->counter) + : [o] "r" (offset) + : "memory" ); + return prev - offset; +} + +/* + * atomic_{cmp,}xchg is required to have exactly the same ordering semantics as + * {cmp,}xchg and the operations that return. + */ +#define ATOMIC_OP(c_t, prefix) \ +static inline \ +c_t atomic##prefix##_xchg(atomic##prefix##_t *v, c_t n) \ +{ \ + return __xchg(&v->counter, n, sizeof(c_t)); \ +} \ +static inline \ +c_t atomic##prefix##_cmpxchg(atomic##prefix##_t *v, c_t o, c_t n) \ +{ \ + return __cmpxchg(&v->counter, o, n, sizeof(c_t)); \ +} + +#define ATOMIC_OPS() \ + ATOMIC_OP(int, ) + +ATOMIC_OPS() + +#undef ATOMIC_OPS +#undef ATOMIC_OP + +#endif /* _ASM_RISCV_ATOMIC_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-generic/atomic-ops.h b/xen/include/asm-generic/atomic-ops.h new file mode 100644 index 0000000000..98dd907942 --- /dev/null +++ b/xen/include/asm-generic/atomic-ops.h @@ -0,0 +1,97 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * The header provides default implementations for every xen/atomic.h-provided + * forward inline declaration that can be synthesized from other atomic + * functions or being created from scratch. + */ +#ifndef _ASM_GENERIC_ATOMIC_OPS_H_ +#define _ASM_GENERIC_ATOMIC_OPS_H_ + +#include +#include + +#ifndef ATOMIC_READ +static inline int atomic_read(const atomic_t *v) +{ + return ACCESS_ONCE(v->counter); +} +#endif + +#ifndef _ATOMIC_READ +static inline int _atomic_read(atomic_t v) +{ + return v.counter; +} +#endif + +#ifndef ATOMIC_SET +static inline void atomic_set(atomic_t *v, int i) +{ + ACCESS_ONCE(v->counter) = i; +} +#endif + +#ifndef _ATOMIC_SET +static inline void _atomic_set(atomic_t *v, int i) +{ + v->counter = i; +} +#endif + +#ifndef ATOMIC_SUB_AND_TEST +static inline int atomic_sub_and_test(int i, atomic_t *v) +{ + return atomic_sub_return(i, v) == 0; +} +#endif + +#ifndef ATOMIC_INC_AND_TEST +static inline int atomic_inc_and_test(atomic_t *v) +{ + return atomic_add_return(1, v) == 0; +} +#endif + +#ifndef ATOMIC_INC +static inline void atomic_inc(atomic_t *v) +{ + atomic_add(1, v); +} +#endif + +#ifndef ATOMIC_INC_RETURN +static inline int atomic_inc_return(atomic_t *v) +{ + return atomic_add_return(1, v); +} +#endif + +#ifndef ATOMIC_DEC +static inline void atomic_dec(atomic_t *v) +{ + atomic_sub(1, v); +} +#endif + +#ifndef ATOMIC_DEC_RETURN +static inline int atomic_dec_return(atomic_t *v) +{ + return atomic_sub_return(1, v); +} +#endif + +#ifndef ATOMIC_DEC_AND_TEST +static inline int atomic_dec_and_test(atomic_t *v) +{ + return atomic_sub_return(1, v) == 0; +} +#endif + +#ifndef ATOMIC_ADD_NEGATIVE +static inline int atomic_add_negative(int i, atomic_t *v) +{ + return atomic_add_return(i, v) < 0; +} +#endif + +#endif /* _ASM_GENERIC_ATOMIC_OPS_H_ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:22:55 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:22:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728207.1133070 (Exim 4.92) (envelope-from ) id 1sA3ix-00038i-BC; Thu, 23 May 2024 08:22:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728207.1133070; Thu, 23 May 2024 08:22:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3ix-00038Z-89; Thu, 23 May 2024 08:22:55 +0000 Received: by outflank-mailman (input) for mailman id 728207; Thu, 23 May 2024 08:22:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3iw-00037a-EX for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3iw-0001Hw-Dq for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3iw-0005Sn-BB for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:22: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=cq83w0qXp14f+65ZuROb3gP/3LA+jRMzBLEuayboEHw=; b=4ol6khQwHSKcMV3C35Tz0HDMlc 7BhBFhx87Xy0UC/yelzz0luN8EAM5R8KTyzdw7BTahY9pMYhNPjahNRjRIq+/Y3/sy3FhGQc/z2lw TohWhVXzgm6Wt9WTwxAHhsnAdsyloAcY9XevA1hn6POfEuS7mluIcd5IOlrxgZ87lWTM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: add required things to current.h Message-Id: Date: Thu, 23 May 2024 08:22:54 +0000 commit e6ed98863bc79728e5aa759d51f21c90187e2519 Author: Oleksii Kurochko AuthorDate: Fri May 17 15:54:58 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:12:52 2024 +0200 xen/riscv: add required things to current.h Add minimal requied things to be able to build full Xen. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/current.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/xen/arch/riscv/include/asm/current.h b/xen/arch/riscv/include/asm/current.h index d84f15dc50..aedb6dc732 100644 --- a/xen/arch/riscv/include/asm/current.h +++ b/xen/arch/riscv/include/asm/current.h @@ -3,6 +3,21 @@ #ifndef __ASM_CURRENT_H #define __ASM_CURRENT_H +#include +#include +#include + +#ifndef __ASSEMBLY__ + +/* 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) + +#define guest_cpu_user_regs() ({ BUG_ON("unimplemented"); NULL; }) + #define switch_stack_and_jump(stack, fn) do { \ asm volatile ( \ "mv sp, %0\n" \ @@ -10,4 +25,8 @@ unreachable(); \ } while ( false ) +#define get_per_cpu_offset() __per_cpu_offset[smp_processor_id()] + +#endif /* __ASSEMBLY__ */ + #endif /* __ASM_CURRENT_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:23:05 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:23:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728214.1133074 (Exim 4.92) (envelope-from ) id 1sA3j7-0003Rs-DF; Thu, 23 May 2024 08:23:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728214.1133074; Thu, 23 May 2024 08:23:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3j7-0003Rk-9o; Thu, 23 May 2024 08:23:05 +0000 Received: by outflank-mailman (input) for mailman id 728214; Thu, 23 May 2024 08:23:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3j6-0003Oz-Hs for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3j6-0001IU-H6 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3j6-0005TW-GB for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9LshGjknqrf/S+kX9Ddo+KO75UbjVWAcIE7f1ELes+g=; b=vLOuVcoKETnRpGP3I9Gd4us1rV 1OHj0WyWFNwSjwOzSrWD8tfG17jmUb0SEIK/ug1L2J/6+OuHREZAOQX3bgQr7a2Q9eAk2O97aezoR /pTpe3ukoX0puY5Kfk08ar92QyBcvays7CHE9Xs7Tt6DopmiLb1gIg5AsdgpLirrAI+E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PIT: supply and use #define-s Message-Id: Date: Thu, 23 May 2024 08:23:04 +0000 commit 249affc129f441f6ca0b1f2c382fd4f816c094f7 Author: Jan Beulich AuthorDate: Thu May 23 10:16:07 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:16:07 2024 +0200 x86/PIT: supply and use #define-s Help reading of code programming the PIT by introducing constants for control word, read back and latch commands, as well as status. Requested-by: Jason Andryuk Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/apic.c | 2 +- xen/arch/x86/include/asm/time.h | 34 ++++++++++++++++++++++++++++++++++ xen/arch/x86/time.c | 31 ++++++++++++++++++------------- 3 files changed, 53 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 592b78e11e..6567af685a 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -983,7 +983,7 @@ static unsigned int __init get_8254_timer_count(void) /*spin_lock_irqsave(&i8253_lock, flags);*/ - outb_p(0x00, PIT_MODE); + outb_p(PIT_LTCH_CH(0), PIT_MODE); count = inb_p(PIT_CH0); count |= inb_p(PIT_CH0) << 8; diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index 0d7989a1fe..3dfbb5297a 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -58,4 +58,38 @@ struct time_scale; void set_time_scale(struct time_scale *ts, u64 ticks_per_sec); u64 scale_delta(u64 delta, const struct time_scale *scale); +/* Programmable Interval Timer (8254) */ + +/* Timer Control Word */ +#define PIT_TCW_CH(n) ((n) << 6) +/* Lower bits also Timer Status. */ +#define PIT_RW_MSB (1 << 5) +#define PIT_RW_LSB (1 << 4) +#define PIT_RW_LSB_MSB (PIT_RW_LSB | PIT_RW_MSB) +#define PIT_MODE_EOC (0 << 1) +#define PIT_MODE_ONESHOT (1 << 1) +#define PIT_MODE_RATE_GEN (2 << 1) +#define PIT_MODE_SQUARE_WAVE (3 << 1) +#define PIT_MODE_SW_STROBE (4 << 1) +#define PIT_MODE_HW_STROBE (5 << 1) +#define PIT_BINARY (0 << 0) +#define PIT_BCD (1 << 0) + +/* Read Back Command */ +#define PIT_RDB PIT_TCW_CH(3) +#define PIT_RDB_NO_COUNT (1 << 5) +#define PIT_RDB_NO_STATUS (1 << 4) +#define PIT_RDB_CH2 (1 << 3) +#define PIT_RDB_CH1 (1 << 2) +#define PIT_RDB_CH0 (1 << 1) +#define PIT_RDB_RSVD (1 << 0) + +/* Counter Latch Command */ +#define PIT_LTCH_CH(n) PIT_TCW_CH(n) + +/* Timer Status */ +#define PIT_STATUS_OUT_PIN (1 << 7) +#define PIT_STATUS_NULL_COUNT (1 << 6) +/* Lower bits match Timer Control Word. */ + #endif /* __X86_TIME_H__ */ diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 9655971269..85ec73bd9a 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -222,7 +222,7 @@ static void cf_check timer_interrupt(int irq, void *dev_id) spin_lock_irq(&pit_lock); - outb(0x80, PIT_MODE); + outb(PIT_LTCH_CH(2), PIT_MODE); count = inb(PIT_CH2); count |= inb(PIT_CH2) << 8; @@ -245,7 +245,8 @@ static void preinit_pit(void) { /* Set PIT channel 0 to HZ Hz. */ #define LATCH (((CLOCK_TICK_RATE)+(HZ/2))/HZ) - outb_p(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ + outb_p(PIT_TCW_CH(0) | PIT_RW_LSB_MSB | PIT_MODE_RATE_GEN | PIT_BINARY, + PIT_MODE); outb_p(LATCH & 0xff, PIT_CH0); /* LSB */ outb(LATCH >> 8, PIT_CH0); /* MSB */ #undef LATCH @@ -356,7 +357,7 @@ static u64 cf_check read_pit_count(void) spin_lock_irqsave(&pit_lock, flags); - outb(0x80, PIT_MODE); + outb(PIT_LTCH_CH(2), PIT_MODE); count16 = inb(PIT_CH2); count16 |= inb(PIT_CH2) << 8; @@ -383,7 +384,8 @@ static s64 __init cf_check init_pit(struct platform_timesource *pts) */ #define CALIBRATE_LATCH CALIBRATE_VALUE(CLOCK_TICK_RATE) BUILD_BUG_ON(CALIBRATE_LATCH >> 16); - outb(0xb0, PIT_MODE); /* binary, mode 0, LSB/MSB, Ch 2 */ + outb(PIT_TCW_CH(2) | PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY, + PIT_MODE); outb(CALIBRATE_LATCH & 0xff, PIT_CH2); /* LSB of count */ outb(CALIBRATE_LATCH >> 8, PIT_CH2); /* MSB of count */ #undef CALIBRATE_LATCH @@ -408,7 +410,8 @@ static s64 __init cf_check init_pit(struct platform_timesource *pts) static void cf_check resume_pit(struct platform_timesource *pts) { /* Set CTC channel 2 to mode 0 again; initial value does not matter. */ - outb(0xb0, PIT_MODE); /* binary, mode 0, LSB/MSB, Ch 2 */ + outb(PIT_TCW_CH(2) | PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY, + PIT_MODE); outb(0, PIT_CH2); /* LSB of count */ outb(0, PIT_CH2); /* MSB of count */ } @@ -2456,7 +2459,8 @@ static int _disable_pit_irq(bool init) } /* Disable PIT CH0 timer interrupt. */ - outb_p(0x30, PIT_MODE); + outb_p(PIT_TCW_CH(0) | PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY, + PIT_MODE); outb_p(0, PIT_CH0); outb_p(0, PIT_CH0); @@ -2562,17 +2566,18 @@ int hwdom_pit_access(struct ioreq *ioreq) case PIT_MODE: if ( ioreq->dir == IOREQ_READ ) return 0; /* urk! */ - switch ( ioreq->data & 0xc0 ) + switch ( ioreq->data & PIT_TCW_CH(3) ) { - case 0xc0: /* Read Back */ - if ( ioreq->data & 0x08 ) /* Select Channel 2? */ - outb(ioreq->data & 0xf8, PIT_MODE); - if ( !(ioreq->data & 0x06) ) /* Select Channel 0/1? */ + case PIT_RDB: /* Read Back */ + if ( ioreq->data & PIT_RDB_CH2 ) + outb(ioreq->data & ~(PIT_RDB_CH1 | PIT_RDB_CH0 | PIT_RDB_RSVD), + PIT_MODE); + if ( !(ioreq->data & (PIT_RDB_CH0 | PIT_RDB_CH1)) ) return 1; /* no - we're done */ /* Filter Channel 2 and reserved bit 0. */ - ioreq->data &= ~0x09; + ioreq->data &= ~(PIT_RDB_CH2 | PIT_RDB_RSVD); return 0; /* emulate ch0/1 readback */ - case 0x80: /* Select Counter 2 */ + case PIT_TCW_CH(2): outb(ioreq->data, PIT_MODE); return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:23:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:23:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728218.1133078 (Exim 4.92) (envelope-from ) id 1sA3jH-0003df-EN; Thu, 23 May 2024 08:23:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728218.1133078; Thu, 23 May 2024 08:23:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jH-0003dW-BK; Thu, 23 May 2024 08:23:15 +0000 Received: by outflank-mailman (input) for mailman id 728218; Thu, 23 May 2024 08:23:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jG-0003bz-LM for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jG-0001Id-Kf for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3jG-0005Ty-JM for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xnb+vFbqyR/fUMXRK9HP7PRSiy5qJ5D4OKkmqw1fh8s=; b=XtGtJ0YZRccImg90aIfP9ar17g PqR9bPXtrk1YAaB3qDfS2iwIHUADspWrZwa1O5u5SPyGNwaUl+01HSQtOfnS+9QlAVXZjXkil9nqY H28/0sVFQX8I1xSRY7Rb0lfF5bFn0rFKrvskM13pg8yMmCMyRbf1HAxIDHlk3VtN4MU0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: detect PIT aliasing on ports other than 0x4[0-3] Message-Id: Date: Thu, 23 May 2024 08:23:14 +0000 commit 2c15fa332efaeb79e602f6ef22672f790b8bebf2 Author: Jan Beulich AuthorDate: Thu May 23 10:16:52 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:16:52 2024 +0200 x86: detect PIT aliasing on ports other than 0x4[0-3] ... in order to also deny Dom0 access through the alias ports (commonly observed on Intel chipsets). Without this it is only giving the impression of denying access to PIT. Unlike for CMOS/RTC, do detection pretty early, to avoid disturbing normal operation later on (even if typically we won't use much of the PIT). Like for CMOS/RTC a fundamental assumption of the probing is that reads from the probed alias port won't have side effects (beyond such that PIT reads have anyway) in case it does not alias the PIT's. As to the port 0x61 accesses: Unlike other accesses we do, this masks off the top four bits (in addition to the bottom two ones), following Intel chipset documentation saying that these (read-only) bits should only be written with zero. Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/dom0_build.c | 7 +++- xen/arch/x86/include/asm/setup.h | 1 + xen/arch/x86/time.c | 70 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 4288957b2b..8d56705a08 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -20,6 +20,7 @@ #include #include #include +#include struct memsize { long nr_pages; @@ -495,7 +496,11 @@ int __init dom0_setup_permissions(struct domain *d) rc |= ioports_deny_access(d, 0x4D0, 0x4D1); /* Interval Timer (PIT). */ - rc |= ioports_deny_access(d, 0x40, 0x43); + for ( offs = 0, i = ISOLATE_LSB(pit_alias_mask) ?: 4; + offs <= pit_alias_mask; offs += i ) + if ( !(offs & ~pit_alias_mask) ) + rc |= ioports_deny_access(d, PIT_CH0 + offs, PIT_MODE + offs); + /* PIT Channel 2 / PC Speaker Control. */ rc |= ioports_deny_access(d, 0x61, 0x61); diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index 471aed92c2..d75589178b 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -49,6 +49,7 @@ extern unsigned long highmem_start; #endif extern unsigned int i8259A_alias_mask; +extern unsigned int pit_alias_mask; extern int8_t opt_smt; extern int8_t opt_probe_port_aliases; diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 85ec73bd9a..a97d784841 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -427,6 +427,74 @@ static struct platform_timesource __initdata_cf_clobber plt_pit = .resume = resume_pit, }; +unsigned int __initdata pit_alias_mask; + +static void __init probe_pit_alias(void) +{ + unsigned int mask = 0x1c; + uint8_t val = 0; + + if ( !opt_probe_port_aliases ) + return; + + /* + * Use channel 2 in mode 0 for probing. In this mode even a non-initial + * count is loaded independent of counting being / becoming enabled. Thus + * we have a 16-bit value fully under our control, to write and then check + * whether we can also read it back unaltered. + */ + + /* Turn off speaker output and disable channel 2 counting. */ + outb(inb(0x61) & 0x0c, 0x61); + + outb(PIT_TCW_CH(2) | PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY, + PIT_MODE); + + do { + uint8_t val2; + unsigned int offs; + + outb(val, PIT_CH2); + outb(val ^ 0xff, PIT_CH2); + + /* Wait for the Null Count bit to clear. */ + do { + /* Latch status. */ + outb(PIT_RDB | PIT_RDB_NO_COUNT | PIT_RDB_CH2, PIT_MODE); + + /* Try to make sure we're actually having a PIT here. */ + val2 = inb(PIT_CH2); + if ( (val2 & ~(PIT_STATUS_OUT_PIN | PIT_STATUS_NULL_COUNT)) != + (PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY) ) + return; + } while ( val2 & PIT_STATUS_NULL_COUNT ); + + /* + * Try to further make sure we're actually having a PIT here. + * + * NB: Deliberately |, not ||, as we always want both reads. + */ + val2 = inb(PIT_CH2); + if ( (val2 ^ val) | (inb(PIT_CH2) ^ val ^ 0xff) ) + return; + + for ( offs = ISOLATE_LSB(mask); offs <= mask; offs <<= 1 ) + { + if ( !(mask & offs) ) + continue; + val2 = inb(PIT_CH2 + offs); + if ( (val2 ^ val) | (inb(PIT_CH2 + offs) ^ val ^ 0xff) ) + mask &= ~offs; + } + } while ( mask && (val += 0x0b) ); /* Arbitrary uneven number. */ + + if ( mask ) + { + dprintk(XENLOG_INFO, "PIT aliasing mask: %02x\n", mask); + pit_alias_mask = mask; + } +} + /************************************************************ * PLATFORM TIMER 2: HIGH PRECISION EVENT TIMER (HPET) */ @@ -2416,6 +2484,8 @@ void __init early_time_init(void) } preinit_pit(); + probe_pit_alias(); + tmp = init_platform_timer(); plt_tsc.frequency = tmp; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:23:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:23:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728219.1133081 (Exim 4.92) (envelope-from ) id 1sA3jR-0003nM-Ge; Thu, 23 May 2024 08:23:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728219.1133081; Thu, 23 May 2024 08:23:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jR-0003nF-E9; Thu, 23 May 2024 08:23:25 +0000 Received: by outflank-mailman (input) for mailman id 728219; Thu, 23 May 2024 08:23:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jQ-0003mz-O7 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jQ-0001J5-NN for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3jQ-0005Ub-Mn for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5xACGttV8I7+O0NNOrzCQ61VtR/BtBhOFHD2p7muxSw=; b=1dDfifHxFdM4LZOsWLRokcTjAY pMGtwsKebuTZUrQT97wyTQHTS2dgYv3QPr9aWCqPFA7fhQhss9WkpEDPgc3TKbeU9N+JtKAOBAjLW cOHX2p+EtE3sNWOeX9kHmyuWcjZAn4JNNo9mbiZzuMDnt2PfqLa89oqBGx/ynS/RRX9U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/vpci: honor access size when returning an error Message-Id: Date: Thu, 23 May 2024 08:23:24 +0000 commit 7db7bd0f319fe7f19a6904e75c53adf891fa2dac Author: Volodymyr Babchuk AuthorDate: Thu May 23 10:17:30 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:17:30 2024 +0200 arm/vpci: honor access size when returning an error Guest can try to read config space using different access sizes: 8, 16, 32, 64 bits. We need to take this into account when we are returning an error back to MMIO handler, otherwise it is possible to provide more data than requested: i.e. guest issues LDRB instruction to read one byte, but we are writing 0xFFFFFFFFFFFFFFFF in the target register. Signed-off-by: Volodymyr Babchuk Signed-off-by: Stewart Hildebrand Acked-by: Julien Grall --- xen/arch/arm/vpci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index 3bc4bb5508..b63a356bb4 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -29,6 +29,8 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, { struct pci_host_bridge *bridge = p; pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); + const unsigned int access_size = (1U << info->dabt.size) * 8; + const register_t invalid = GENMASK_ULL(access_size - 1, 0); /* data is needed to prevent a pointer cast on 32bit */ unsigned long data; @@ -39,7 +41,7 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, return 1; } - *r = ~0ul; + *r = invalid; return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:23:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:23:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728221.1133086 (Exim 4.92) (envelope-from ) id 1sA3jb-0003rz-IN; Thu, 23 May 2024 08:23:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728221.1133086; Thu, 23 May 2024 08:23: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 1sA3jb-0003rr-Fe; Thu, 23 May 2024 08:23:35 +0000 Received: by outflank-mailman (input) for mailman id 728221; Thu, 23 May 2024 08:23:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3ja-0003rC-RF for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3ja-0001JG-QX for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3ja-0005V2-Pf for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nEx4q4Vl9U8QeLEZCgJWHxoXEGa4uODnk31a83KrhqQ=; b=KKyOuNSq2yTUpHx0zluVVThiTW wJUU9xMPw8s+IDHpRH/Ex4MeYNKFEi+q5xbXldJrMqFKWX/BhGQ4nj+HFqajGFfWxMp64g71Owhjf +xWvozb8X9wDJYtjkpRuqmh50QM2zgv/egFTbK3OxNRR1YPI2bio6AXZIjinm82Zq9OM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vpci/header: emulate PCI_COMMAND register for guests Message-Id: Date: Thu, 23 May 2024 08:23:34 +0000 commit 9c831e429c723749b64456ab725da974f74da9ca Author: Oleksandr Andrushchenko AuthorDate: Thu May 23 10:18:04 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:18:04 2024 +0200 vpci/header: emulate PCI_COMMAND register for guests Xen and/or Dom0 may have put values in PCI_COMMAND which they expect to remain unaltered. PCI_COMMAND_SERR bit is a good example: while the guest's (domU) view of this will want to be zero (for now), the host having set it to 1 should be preserved, or else we'd effectively be giving the domU control of the bit. Thus, PCI_COMMAND register needs proper emulation in order to honor host's settings. According to "PCI LOCAL BUS SPECIFICATION, REV. 3.0", section "6.2.2 Device Control" the reset state of the command register is typically 0, so when assigning a PCI device use 0 as the initial state for the guest's (domU) view of the command register. Here is the full list of command register bits with notes about PCI/PCIe specification, and how Xen handles the bit. QEMU's behavior is also documented here since that is our current reference implementation for PCI passthrough. PCI_COMMAND_IO (bit 0) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. QEMU sets this bit to 1 in hardware if an I/O BAR is exposed to the guest. Xen domU: (rsvdp_mask) We treat this bit as RsvdP for now since we don't yet support I/O BARs for domUs. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_MEMORY (bit 1) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. QEMU sets this bit to 1 in hardware if a Memory BAR is exposed to the guest. Xen domU/dom0: We handle writes to this bit by mapping/unmapping BAR regions. Xen domU: For devices assigned to DomUs, memory decoding will be disabled at the time of initialization. PCI_COMMAND_MASTER (bit 2) PCIe 6.1: RW PCI LB 3.0: RW QEMU: Pass through writes to hardware. Xen domU/dom0: Pass through writes to hardware. PCI_COMMAND_SPECIAL (bit 3) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: RW QEMU: Pass through writes to hardware. Xen domU/dom0: Pass through writes to hardware. PCI_COMMAND_INVALIDATE (bit 4) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: RW QEMU: Pass through writes to hardware. Xen domU/dom0: Pass through writes to hardware. PCI_COMMAND_VGA_PALETTE (bit 5) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: RW QEMU: Pass through writes to hardware. Xen domU/dom0: Pass through writes to hardware. PCI_COMMAND_PARITY (bit 6) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. Xen domU: (rsvdp_mask) We treat this bit as RsvdP. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_WAIT (bit 7) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: hardwire to 0 QEMU: res_mask Xen domU: (rsvdp_mask) We treat this bit as RsvdP. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_SERR (bit 8) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. Xen domU: (rsvdp_mask) We treat this bit as RsvdP. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_FAST_BACK (bit 9) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. Xen domU: (rsvdp_mask) We treat this bit as RsvdP. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_INTX_DISABLE (bit 10) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. QEMU checks if INTx was mapped for a device. If it is not, then guest can't control PCI_COMMAND_INTX_DISABLE bit. Xen domU: We prohibit a guest from enabling INTx if MSI(X) is enabled. Xen dom0: We allow dom0 to control this bit freely. Bits 11-15 PCIe 6.1: RsvdP PCI LB 3.0: Reserved QEMU: res_mask Xen domU: rsvdp_mask Xen dom0: We allow dom0 to control these bits freely. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Volodymyr Babchuk Signed-off-by: Stewart Hildebrand Reviewed-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 60 +++++++++++++++++++++++++++++++++++++++++----- xen/drivers/vpci/msi.c | 9 +++++++ xen/drivers/vpci/msix.c | 7 ++++++ xen/include/xen/pci_regs.h | 1 + xen/include/xen/vpci.h | 3 +++ 5 files changed, 74 insertions(+), 6 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 47648c3951..ef6c965c08 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -524,9 +524,21 @@ static void cf_check cmd_write( { struct vpci_header *header = data; + if ( !is_hardware_domain(pdev->domain) ) + { + const struct vpci *vpci = pdev->vpci; + + if ( (vpci->msi && vpci->msi->enabled) || + (vpci->msix && vpci->msix->enabled) ) + cmd |= PCI_COMMAND_INTX_DISABLE; + + header->guest_cmd = cmd; + } + /* * Let Dom0 play with all the bits directly except for the memory - * decoding one. + * decoding one. Bits that are not allowed for DomU are already + * handled above and by the rsvdp_mask. */ if ( header->bars_mapped != !!(cmd & PCI_COMMAND_MEMORY) ) /* @@ -540,6 +552,14 @@ static void cf_check cmd_write( pci_conf_write16(pdev->sbdf, reg, cmd); } +static uint32_t cf_check guest_cmd_read( + const struct pci_dev *pdev, unsigned int reg, void *data) +{ + const struct vpci_header *header = data; + + return header->guest_cmd; +} + static void cf_check bar_write( const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data) { @@ -754,9 +774,23 @@ static int cf_check init_header(struct pci_dev *pdev) return -EOPNOTSUPP; } - /* Setup a handler for the command register. */ - rc = vpci_add_register(pdev->vpci, vpci_hw_read16, cmd_write, PCI_COMMAND, - 2, header); + /* + * Setup a handler for the command register. + * + * TODO: If support for emulated bits is added, re-visit how to handle + * PCI_COMMAND_PARITY, PCI_COMMAND_SERR, and PCI_COMMAND_FAST_BACK. + */ + rc = vpci_add_register_mask(pdev->vpci, + is_hwdom ? vpci_hw_read16 : guest_cmd_read, + cmd_write, PCI_COMMAND, 2, header, 0, 0, + is_hwdom ? 0 + : PCI_COMMAND_RSVDP_MASK | + PCI_COMMAND_IO | + PCI_COMMAND_PARITY | + PCI_COMMAND_WAIT | + PCI_COMMAND_SERR | + PCI_COMMAND_FAST_BACK, + 0); if ( rc ) return rc; @@ -836,9 +870,23 @@ static int cf_check init_header(struct pci_dev *pdev) if ( pdev->ignore_bars ) return 0; - /* Disable memory decoding before sizing. */ cmd = pci_conf_read16(pdev->sbdf, PCI_COMMAND); - if ( cmd & PCI_COMMAND_MEMORY ) + + /* + * For DomUs, clear PCI_COMMAND_{MASTER,MEMORY,IO} and other + * DomU-controllable bits in PCI_COMMAND. Devices assigned to DomUs will + * start with memory decoding disabled, and modify_bars() will not be called + * at the end of this function. + */ + if ( !is_hwdom ) + cmd &= ~(PCI_COMMAND_VGA_PALETTE | PCI_COMMAND_INVALIDATE | + PCI_COMMAND_SPECIAL | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | + PCI_COMMAND_IO); + + header->guest_cmd = cmd; + + /* Disable memory decoding before sizing. */ + if ( !is_hwdom || (cmd & PCI_COMMAND_MEMORY) ) pci_conf_write16(pdev->sbdf, PCI_COMMAND, cmd & ~PCI_COMMAND_MEMORY); for ( i = 0; i < num_bars; i++ ) diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c index 30adcf7df0..dd6620ec56 100644 --- a/xen/drivers/vpci/msi.c +++ b/xen/drivers/vpci/msi.c @@ -57,6 +57,8 @@ static void cf_check control_write( if ( new_enabled ) { + bool old_enabled = msi->enabled; + /* * If the device is already enabled it means the number of * enabled messages has changed. Disable and re-enable the @@ -70,6 +72,13 @@ static void cf_check control_write( if ( vpci_msi_arch_enable(msi, pdev, vectors) ) return; + + /* Make sure domU doesn't enable INTx while enabling MSI. */ + if ( !old_enabled && !is_hardware_domain(pdev->domain) ) + { + pci_intx(pdev, false); + pdev->vpci->header.guest_cmd |= PCI_COMMAND_INTX_DISABLE; + } } else vpci_msi_arch_disable(msi, pdev); diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 58c16ebdf2..fbe710ab92 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -135,6 +135,13 @@ static void cf_check control_write( } } + /* Make sure domU doesn't enable INTx while enabling MSI-X. */ + if ( new_enabled && !msix->enabled && !is_hardware_domain(pdev->domain) ) + { + pci_intx(pdev, false); + pdev->vpci->header.guest_cmd |= PCI_COMMAND_INTX_DISABLE; + } + msix->masked = new_masked; msix->enabled = new_enabled; diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index 0bc18efabb..250ba106db 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -48,6 +48,7 @@ #define PCI_COMMAND_SERR 0x100 /* Enable SERR */ #define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */ #define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */ +#define PCI_COMMAND_RSVDP_MASK 0xf800 #define PCI_STATUS 0x06 /* 16 bits */ #define PCI_STATUS_IMM_READY 0x01 /* Immediate Readiness */ diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 6e4c972f35..2064d9354f 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -107,6 +107,9 @@ struct vpci { } bars[PCI_HEADER_NORMAL_NR_BARS + 1]; /* At most 6 BARS + 1 expansion ROM BAR. */ + /* Guest (domU only) view of the PCI_COMMAND register. */ + uint16_t guest_cmd; + /* * Store whether the ROM enable bit is set (doesn't imply ROM BAR * is mapped into guest p2m) if there's a ROM BAR on the device. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 08:23:45 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 08:23:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728224.1133089 (Exim 4.92) (envelope-from ) id 1sA3jl-0003vE-Jg; Thu, 23 May 2024 08:23:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728224.1133089; Thu, 23 May 2024 08:23:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jl-0003v7-HE; Thu, 23 May 2024 08:23:45 +0000 Received: by outflank-mailman (input) for mailman id 728224; Thu, 23 May 2024 08:23:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jk-0003v1-UE for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA3jk-0001JT-TW for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA3jk-0005Vn-So for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 08:23:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/iJLcrTK4ksRICn4nbjCXq8YhvShyS7ZqCjBlwtQEa4=; b=hQ8pbRRw568RG0NxtcZA5fwac8 Wvvzk2liSmc/5TW7J56AcTq1XQ9DmC+LvrbgneF0TdVYPRB+ky6g/ETY3nKaAa/NfQ2hoWI5OIpzS QUriCKC3RYIEfIz5l1S0xdXxX6oMx047rSTUeWNbHYXsRkBnNNGYf7dIRtmQO9LLNuRo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vpci: add initial support for virtual PCI bus topology Message-Id: Date: Thu, 23 May 2024 08:23:44 +0000 commit d6a7fd83039af36c28bd0ae2174f12c3888ce993 Author: Oleksandr Andrushchenko AuthorDate: Thu May 23 10:18:47 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:18:47 2024 +0200 vpci: add initial support for virtual PCI bus topology Assign SBDF to the PCI devices being passed through with bus 0. The resulting topology is where PCIe devices reside on the bus 0 of the root complex itself (embedded endpoints). This implementation is limited to 32 devices which are allowed on a single PCI bus. Please note, that at the moment only function 0 of a multifunction device can be passed through. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Volodymyr Babchuk Signed-off-by: Stewart Hildebrand Acked-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/drivers/Kconfig | 4 ++++ xen/drivers/vpci/vpci.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/sched.h | 10 ++++++++- xen/include/xen/vpci.h | 13 +++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index db94393f47..20050e9bb8 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -15,4 +15,8 @@ source "drivers/video/Kconfig" config HAS_VPCI bool +config HAS_VPCI_GUEST_SUPPORT + bool + select HAS_VPCI + endmenu diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 97e115dc57..1e6aa5d799 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -40,6 +40,49 @@ extern vpci_register_init_t *const __start_vpci_array[]; extern vpci_register_init_t *const __end_vpci_array[]; #define NUM_VPCI_INIT (__end_vpci_array - __start_vpci_array) +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT +static int assign_virtual_sbdf(struct pci_dev *pdev) +{ + struct domain *d = pdev->domain; + unsigned int new_dev_number; + + ASSERT(rw_is_write_locked(&pdev->domain->pci_lock)); + + if ( is_hardware_domain(d) ) + return 0; + + /* + * Each PCI bus supports 32 devices/slots at max or up to 256 when + * there are multi-function ones which are not yet supported. + */ + if ( pdev->sbdf.fn ) + { + gdprintk(XENLOG_ERR, "%pp: only function 0 passthrough supported\n", + &pdev->sbdf); + return -EOPNOTSUPP; + } + new_dev_number = find_first_zero_bit(d->vpci_dev_assigned_map, + VPCI_MAX_VIRT_DEV); + if ( new_dev_number == VPCI_MAX_VIRT_DEV ) + return -ENOSPC; + + __set_bit(new_dev_number, &d->vpci_dev_assigned_map); + + /* + * Both segment and bus number are 0: + * - we emulate a single host bridge for the guest, e.g. segment 0 + * - with bus 0 the virtual devices are seen as embedded + * endpoints behind the root complex + * + * TODO: add support for multi-function devices. + */ + pdev->vpci->guest_sbdf = PCI_SBDF(0, 0, new_dev_number, 0); + + return 0; +} + +#endif /* CONFIG_HAS_VPCI_GUEST_SUPPORT */ + void vpci_deassign_device(struct pci_dev *pdev) { unsigned int i; @@ -49,6 +92,12 @@ void vpci_deassign_device(struct pci_dev *pdev) if ( !has_vpci(pdev->domain) || !pdev->vpci ) return; +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + if ( pdev->vpci->guest_sbdf.sbdf != ~0 ) + __clear_bit(pdev->vpci->guest_sbdf.dev, + &pdev->domain->vpci_dev_assigned_map); +#endif + spin_lock(&pdev->vpci->lock); while ( !list_empty(&pdev->vpci->handlers) ) { @@ -103,6 +152,13 @@ int vpci_assign_device(struct pci_dev *pdev) INIT_LIST_HEAD(&pdev->vpci->handlers); spin_lock_init(&pdev->vpci->lock); +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + pdev->vpci->guest_sbdf = INVALID_GUEST_SBDF; + rc = assign_virtual_sbdf(pdev); + if ( rc ) + goto out; +#endif + for ( i = 0; i < NUM_VPCI_INIT; i++ ) { rc = __start_vpci_array[i](pdev); @@ -110,6 +166,7 @@ int vpci_assign_device(struct pci_dev *pdev) break; } + out: __maybe_unused; if ( rc ) vpci_deassign_device(pdev); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 132b841995..2dcd1d1a4f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -486,7 +486,15 @@ struct domain * 2. pdev->vpci->lock */ rwlock_t pci_lock; -#endif +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + /* + * The bitmap which shows which device numbers are already used by the + * virtual PCI bus topology and is used to assign a unique SBDF to the + * next passed through virtual PCI device. + */ + DECLARE_BITMAP(vpci_dev_assigned_map, VPCI_MAX_VIRT_DEV); +#endif /* CONFIG_HAS_VPCI_GUEST_SUPPORT */ +#endif /* CONFIG_HAS_PCI */ #ifdef CONFIG_HAS_PASSTHROUGH struct domain_iommu iommu; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 2064d9354f..da8d0f41e6 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -21,6 +21,14 @@ typedef int vpci_register_init_t(struct pci_dev *dev); #define VPCI_ECAM_BDF(addr) (((addr) & 0x0ffff000) >> 12) +/* + * Maximum number of devices supported by the virtual bus topology: + * each PCI bus supports 32 devices/slots at max or up to 256 when + * there are multi-function ones which are not yet supported. + * This limit implies only segment 0, bus 0 is supported. + */ +#define VPCI_MAX_VIRT_DEV (PCI_SLOT(~0) + 1) + #define REGISTER_VPCI_INIT(x, p) \ static vpci_register_init_t *const x##_entry \ __used_section(".data.vpci." p) = (x) @@ -175,6 +183,11 @@ struct vpci { struct vpci_arch_msix_entry arch; } entries[]; } *msix; +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + /* Guest SBDF of the device. */ +#define INVALID_GUEST_SBDF ((pci_sbdf_t){ .sbdf = ~0U }) + pci_sbdf_t guest_sbdf; +#endif #endif }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 12:44:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 12:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728458.1133390 (Exim 4.92) (envelope-from ) id 1sA7ng-0003V3-Ms; Thu, 23 May 2024 12:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728458.1133390; Thu, 23 May 2024 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 1sA7ng-0003Uv-Jy; Thu, 23 May 2024 12:44:04 +0000 Received: by outflank-mailman (input) for mailman id 728458; Thu, 23 May 2024 12:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA7ng-0003Up-1k for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 12:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA7nf-0005fZ-VF for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 12:44:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA7nf-0004ho-UE for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 12:44:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IphTGef+RsphBCi1qSLT1U8SSOBzdXinBEAKXN5K4BM=; b=MPs7IaEA9XK9ej3NiFEvXsdtgx NbajRqJ0oHq9KbZ6W/R6Hh5xepKCRWdNXljci2bFxck+QQ64wYdwgcwD5u/XrGteOtRYPp368RF9h TRA3YHf46CLfOKHDvmuwbEoDJAypM5J5Jg/b1JKFs4RK4AM9qI3oVVKihBKqm/jUFGKc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: mem_access: Conditionally compile mem_access.c Message-Id: Date: Thu, 23 May 2024 12:44:03 +0000 commit 9e58da32cc844b3fb7612fc35ece3a96f8cbf744 Author: Alessandro Zucchelli AuthorDate: Fri May 10 14:32:11 2024 +0200 Commit: Julien Grall CommitDate: Thu May 23 13:36:41 2024 +0100 xen/arm: mem_access: Conditionally compile mem_access.c Commit 634cfc8beb ("Make MEM_ACCESS configurable") intended to make MEM_ACCESS configurable on Arm to reduce the code size when the user doesn't need it. However, this didn't cover the arch specific code. None of the code in arm/mem_access.c is necessary when MEM_ACCESS=n, so it can be compiled out. This will require to provide some stub for functions called by the common code. Signed-off-by: Alessandro Zucchelli Acked-by: Tamas K Lengyel Release-acked-by: Oleksii Kurochko --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/include/asm/mem_access.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7b1350e2ef..45dc29ea53 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -37,7 +37,7 @@ obj-$(CONFIG_IOREQ_SERVER) += ioreq.o obj-y += irq.o obj-y += kernel.init.o obj-$(CONFIG_LIVEPATCH) += livepatch.o -obj-y += mem_access.o +obj-$(CONFIG_MEM_ACCESS) += mem_access.o obj-y += mm.o obj-y += monitor.o obj-y += p2m.o diff --git a/xen/arch/arm/include/asm/mem_access.h b/xen/arch/arm/include/asm/mem_access.h index 35ed0ad154..abac8032fc 100644 --- a/xen/arch/arm/include/asm/mem_access.h +++ b/xen/arch/arm/include/asm/mem_access.h @@ -17,6 +17,8 @@ #ifndef _ASM_ARM_MEM_ACCESS_H #define _ASM_ARM_MEM_ACCESS_H +#include + static inline bool p2m_mem_access_emulate_check(struct vcpu *v, const struct vm_event_st *rsp) @@ -35,12 +37,28 @@ static inline bool p2m_mem_access_sanity_check(struct domain *d) * Send mem event based on the access. Boolean return value indicates if trap * needs to be injected into guest. */ +#ifdef CONFIG_MEM_ACCESS bool p2m_mem_access_check(paddr_t gpa, vaddr_t gla, const struct npfec npfec); struct page_info* p2m_mem_access_check_and_get_page(vaddr_t gva, unsigned long flag, const struct vcpu *v); +#else + +static inline bool +p2m_mem_access_check(paddr_t gpa, vaddr_t gla, const struct npfec npfec) +{ + return false; +} + +static inline struct page_info* +p2m_mem_access_check_and_get_page(vaddr_t gva, unsigned long flag, + const struct vcpu *v) +{ + return NULL; +} +#endif /*CONFIG_MEM_ACCESS*/ #endif /* _ASM_ARM_MEM_ACCESS_H */ /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 14:11:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 14:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728527.1133453 (Exim 4.92) (envelope-from ) id 1sA99s-00025K-Pi; Thu, 23 May 2024 14:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728527.1133453; Thu, 23 May 2024 14:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA99s-00025C-N7; Thu, 23 May 2024 14:11:04 +0000 Received: by outflank-mailman (input) for mailman id 728527; Thu, 23 May 2024 14:11:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA99r-000256-Lq for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA99r-0007BY-Jg for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA99r-0001Mw-Ie for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xAEv2MFYpYxw2BMfEfRuIDyax0BzL7m6UPqKoO0FDaI=; b=5g0Ig5qgn9m5GpdoBXKkDfMkjn fdWhGuYttXbnyuC2Icl745D3RkuvTMmEfZeYgG/Td6zvxdzNI/brJt4rPFZgZh0nLb5v25HqSHDJ+ pIF6yPRUp4Homs07w/rIYZBO856rIlLdnLoVlIAQ/ju0OrFUpoS0qtYR5aK0BnSKbNAI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] LICENSES: Add MIT-0 (MIT No Attribution) Message-Id: Date: Thu, 23 May 2024 14:11:03 +0000 commit 219cdff3fb7b4a03ab14869584f111e0f623b330 Author: Andrew Cooper AuthorDate: Thu May 16 18:50:26 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 23 15:04:40 2024 +0100 LICENSES: Add MIT-0 (MIT No Attribution) We are about to import code licensed under MIT-0. It's compatible for us to use, so identify it as a permitted license. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Acked-by: Christian Lindig --- LICENSES/MIT-0 | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/LICENSES/MIT-0 b/LICENSES/MIT-0 new file mode 100644 index 0000000000..70fb90ee34 --- /dev/null +++ b/LICENSES/MIT-0 @@ -0,0 +1,31 @@ +Valid-License-Identifier: MIT-0 + +SPDX-URL: https://spdx.org/licenses/MIT-0.html + +Usage-Guide: + + To use the MIT-0 License put the following SPDX tag/value pair into a + comment according to the placement guidelines in the licensing rules + documentation: + SPDX-License-Identifier: MIT-0 + +License-Text: + +MIT No Attribution + +Copyright + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 14:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 14:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728528.1133458 (Exim 4.92) (envelope-from ) id 1sA9A2-00027Y-R1; Thu, 23 May 2024 14:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728528.1133458; Thu, 23 May 2024 14:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9A2-00027Q-OW; Thu, 23 May 2024 14:11:14 +0000 Received: by outflank-mailman (input) for mailman id 728528; Thu, 23 May 2024 14:11:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9A1-00027I-PP for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9A1-0007Bg-Nk for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA9A1-0001Nb-Ly for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R0DY9W32UCUDUpcXgLF/ttBVRiOevNQ+YfVvIaYMJYA=; b=iyyb9bVvuf0zwP4rsN1NddVeOE hasu00nGd3Oob1q8iqCiKA2rAdwEA0M9OY+p+5c69soybRfY95PkR/o3I1LlwH61KrTFJN2kFAy6Y qxSqJT98EJnPQkLpu32t6dmHjMBKZM6TPktIdsRo7k7NIes82OETtj4xpaKgMxAdcloA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: Import stand-alone sd_notify() implementation from systemd Message-Id: Date: Thu, 23 May 2024 14:11:13 +0000 commit 78510f3a1522f2856330ffa429e0e35f8aab4277 Author: Andrew Cooper AuthorDate: Thu May 16 18:59:00 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 23 15:04:40 2024 +0100 tools: Import stand-alone sd_notify() implementation from systemd ... in order to avoid linking against the whole of libsystemd. Only minimal changes to the upstream copy, to function as a drop-in replacement for sd_notify() and as a header-only library. Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross Acked-by: Christian Lindig --- tools/include/xen-sd-notify.h | 98 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/tools/include/xen-sd-notify.h b/tools/include/xen-sd-notify.h new file mode 100644 index 0000000000..28c9b20f15 --- /dev/null +++ b/tools/include/xen-sd-notify.h @@ -0,0 +1,98 @@ +/* SPDX-License-Identifier: MIT-0 */ + +/* + * Implement the systemd notify protocol without external dependencies. + * Supports both readiness notification on startup and on reloading, + * according to the protocol defined at: + * https://www.freedesktop.org/software/systemd/man/latest/sd_notify.html + * This protocol is guaranteed to be stable as per: + * https://systemd.io/PORTABILITY_AND_STABILITY/ + * + * Differences from the upstream copy: + * - Rename/rework as a drop-in replacement for systemd/sd-daemon.h + * - Only take the subset Xen cares about + * - Respect -Wdeclaration-after-statement + */ + +#ifndef XEN_SD_NOTIFY +#define XEN_SD_NOTIFY + +#include +#include +#include +#include +#include +#include + +static inline void xen_sd_closep(int *fd) { + if (!fd || *fd < 0) + return; + + close(*fd); + *fd = -1; +} + +static inline int xen_sd_notify(const char *message) { + union sockaddr_union { + struct sockaddr sa; + struct sockaddr_un sun; + } socket_addr = { + .sun.sun_family = AF_UNIX, + }; + size_t path_length, message_length; + ssize_t written; + const char *socket_path; + int __attribute__((cleanup(xen_sd_closep))) fd = -1; + + /* Verify the argument first */ + if (!message) + return -EINVAL; + + message_length = strlen(message); + if (message_length == 0) + return -EINVAL; + + /* If the variable is not set, the protocol is a noop */ + socket_path = getenv("NOTIFY_SOCKET"); + if (!socket_path) + return 0; /* Not set? Nothing to do */ + + /* Only AF_UNIX is supported, with path or abstract sockets */ + if (socket_path[0] != '/' && socket_path[0] != '@') + return -EAFNOSUPPORT; + + path_length = strlen(socket_path); + /* Ensure there is room for NUL byte */ + if (path_length >= sizeof(socket_addr.sun.sun_path)) + return -E2BIG; + + memcpy(socket_addr.sun.sun_path, socket_path, path_length); + + /* Support for abstract socket */ + if (socket_addr.sun.sun_path[0] == '@') + socket_addr.sun.sun_path[0] = 0; + + fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0); + if (fd < 0) + return -errno; + + if (connect(fd, &socket_addr.sa, offsetof(struct sockaddr_un, sun_path) + path_length) != 0) + return -errno; + + written = write(fd, message, message_length); + if (written != (ssize_t) message_length) + return written < 0 ? -errno : -EPROTO; + + return 1; /* Notified! */ +} + +static inline int sd_notify(int unset_environment, const char *message) { + int r = xen_sd_notify(message); + + if (unset_environment) + unsetenv("NOTIFY_SOCKET"); + + return r; +} + +#endif /* XEN_SD_NOTIFY */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 14:11:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 14:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728529.1133462 (Exim 4.92) (envelope-from ) id 1sA9AC-0002BC-Sb; Thu, 23 May 2024 14:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728529.1133462; Thu, 23 May 2024 14:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9AC-0002B4-Pw; Thu, 23 May 2024 14:11:24 +0000 Received: by outflank-mailman (input) for mailman id 728529; Thu, 23 May 2024 14:11:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9AB-0002Au-Rz for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9AB-0007CB-R7 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA9AB-0001OG-Pr for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mdojmlAgv6sr8IYwjOIa6vzYXfkaap+MQt8RcTHzkvk=; b=IfntdtA4rhoK0JJLA2kX38VDRK Qrna/ypDfPimv0bzuUrLQP1LLFPYcfZrgRKjZJT8JAW9XGaqUiDsSPi8fyWUdSpoUZmeOxtI2QRu9 a8SSvWvC2UoJ3uNZI2YaASDpqTP63OGkg2zjMG9nbhfPXnDxdmD5frzRzvcOwvocJXB0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/{c,o}xenstored: Don't link against libsystemd Message-Id: Date: Thu, 23 May 2024 14:11:23 +0000 commit caf864482689a5dd6a945759b6372bb260d49665 Author: Andrew Cooper AuthorDate: Thu Apr 25 10:26:58 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 23 15:04:40 2024 +0100 tools/{c,o}xenstored: Don't link against libsystemd Use the local freestanding wrapper instead. Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross Acked-by: Christian Lindig --- tools/ocaml/xenstored/Makefile | 3 +-- tools/ocaml/xenstored/systemd_stubs.c | 2 +- tools/xenstored/Makefile | 5 ----- tools/xenstored/posix.c | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index e8aaecf2e6..fa45305d8c 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -4,8 +4,7 @@ include $(OCAML_TOPLEVEL)/common.make # Include configure output (config.h) CFLAGS += -include $(XEN_ROOT)/tools/config.h -CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS) -LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS) +CFLAGS-$(CONFIG_SYSTEMD) += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS-y) CFLAGS += $(APPEND_CFLAGS) diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index f4c875075a..7dbbdd35bf 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -25,7 +25,7 @@ #if defined(HAVE_SYSTEMD) -#include +#include CAMLprim value ocaml_sd_notify_ready(value ignore) { diff --git a/tools/xenstored/Makefile b/tools/xenstored/Makefile index e0897ed1ba..09adfe1d50 100644 --- a/tools/xenstored/Makefile +++ b/tools/xenstored/Makefile @@ -9,11 +9,6 @@ xenstored: LDLIBS += $(LDLIBS_libxenctrl) xenstored: LDLIBS += -lrt xenstored: LDLIBS += $(SOCKET_LIBS) -ifeq ($(CONFIG_SYSTEMD),y) -$(XENSTORED_OBJS-y): CFLAGS += $(SYSTEMD_CFLAGS) -xenstored: LDLIBS += $(SYSTEMD_LIBS) -endif - TARGETS := xenstored .PHONY: all diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index d88c82d972..6037d739d0 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -27,7 +27,7 @@ #include #include #if defined(HAVE_SYSTEMD) -#include +#include #endif #include @@ -393,7 +393,7 @@ void late_init(bool live_update) #if defined(HAVE_SYSTEMD) if (!live_update) { sd_notify(1, "READY=1"); - fprintf(stderr, SD_NOTICE "xenstored is ready\n"); + fprintf(stderr, "xenstored is ready\n"); } #endif } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 14:11:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 14:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728530.1133466 (Exim 4.92) (envelope-from ) id 1sA9AM-0002EJ-UK; Thu, 23 May 2024 14:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728530.1133466; Thu, 23 May 2024 14:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9AM-0002E9-Rg; Thu, 23 May 2024 14:11:34 +0000 Received: by outflank-mailman (input) for mailman id 728530; Thu, 23 May 2024 14:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9AL-0002Dz-Vh for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9AL-0007CI-Ur for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA9AL-0001On-Tr for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:11:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YYdqUM5/8oFEyHj8g6vdfUcyWq+cYQc5NTI8GP6D6gQ=; b=Udto0dhFcZYA1qIvoHXipcy08Q FkIkUgtAGq/K8vWL/T7HqPkat7aJIS3GsB+OeXQGugIFvHaEnnqOpGQs8VqtSbukODDfjv2VUkuzJ E4wZu7aTeAgJ3OcKg12FE/sEH/zdij3DwcEF+nulj9oYaNjRFDOKk0KIGA99gk4Tk30c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: Drop libsystemd as a dependency Message-Id: Date: Thu, 23 May 2024 14:11:33 +0000 commit ae26101f6bfc8185adcdb9165d469bdc467780db Author: Andrew Cooper AuthorDate: Thu Apr 25 10:46:40 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 23 15:04:40 2024 +0100 tools: Drop libsystemd as a dependency There are no more users, and we want to disuade people from introducing new users just for sd_notify() and friends. Drop the dependency. We still want the overall --with{,out}-systemd to gate the generation of the service/unit/mount/etc files. Rerun autogen.sh, and mark the dependency as removed in the build containers. Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross Acked-by: Christian Lindig --- CHANGELOG.md | 3 + automation/build/archlinux/current.dockerfile | 1 + automation/build/suse/opensuse-leap.dockerfile | 1 + .../build/suse/opensuse-tumbleweed.dockerfile | 1 + automation/build/ubuntu/focal.dockerfile | 1 + config/Tools.mk.in | 2 - m4/systemd.m4 | 9 - tools/configure | 256 --------------------- 8 files changed, 7 insertions(+), 267 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c43c45d8d4..efdaff11de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - xl/libxl configures vkb=[] for HVM domains with priority over vkb_device. - Increase the maximum number of CPUs Xen can be built for from 4095 to 16383. + - When building with Systemd support (./configure --enable-systemd), remove + libsystemd as a build dependency. Systemd Notify support is retained, now + using a standalone library implementation. ### Added - On x86: diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 3e37ab5c40..d29f1358c2 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -37,6 +37,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ sdl2 \ spice \ spice-protocol \ + # systemd for Xen < 4.19 systemd \ transfig \ usbredir \ diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile index 48d0d50d00..3ef33458a0 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -59,6 +59,7 @@ RUN zypper install -y --no-recommends \ 'pkgconfig(sdl2)' \ python3-devel \ python3-setuptools \ + # systemd-devel for Xen < 4.19 systemd-devel \ tar \ transfig \ diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile index 53542ba1f4..a793601c87 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -60,6 +60,7 @@ RUN zypper install -y --no-recommends \ 'pkgconfig(sdl2)' \ python3-devel \ python3-setuptools \ + # systemd-devel for Xen < 4.19 systemd-devel \ tar \ transfig \ diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile index 7c6a4d0756..078abd56d5 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -34,6 +34,7 @@ RUN apt-get update && \ libnl-3-dev \ ocaml-nox \ libfindlib-ocaml-dev \ + # libsystemd-dev for Xen < 4.19 libsystemd-dev \ transfig \ pandoc \ diff --git a/config/Tools.mk.in b/config/Tools.mk.in index b54ab21f96..50fbef841f 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -52,8 +52,6 @@ CONFIG_PYGRUB := @pygrub@ CONFIG_LIBFSIMAGE := @libfsimage@ CONFIG_SYSTEMD := @systemd@ -SYSTEMD_CFLAGS := @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS := @SYSTEMD_LIBS@ XEN_SYSTEMD_DIR := @SYSTEMD_DIR@ XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@ CONFIG_9PFS := @ninepfs@ diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 112dc11b5e..e4fe51a8ba 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -41,15 +41,6 @@ AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],, - [PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209])] - ) - dnl pkg-config older than 0.24 does not set these for - dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 - dnl of systemd pkg-config --cflags currently yields no extra flags yet. - AC_SUBST([SYSTEMD_CFLAGS]) - AC_SUBST([SYSTEMD_LIBS]) - AS_IF([test "x$SYSTEMD_DIR" = x], [ dnl In order to use the line below we need to fix upstream systemd dnl to properly ${prefix} for child variables in diff --git a/tools/configure b/tools/configure index 3d557234b3..b8faa1d520 100755 --- a/tools/configure +++ b/tools/configure @@ -9766,262 +9766,6 @@ $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h systemd=y - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libsystemd >= 209) were not met: - -$SYSTEMD_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libsystemd >= 209) were not met: - -$SYSTEMD_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - if test "x$SYSTEMD_DIR" = x; then : SYSTEMD_DIR="\$(prefix)/lib/systemd/system/" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 23 14:22:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 23 May 2024 14:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.728540.1133480 (Exim 4.92) (envelope-from ) id 1sA9KW-00047g-T2; Thu, 23 May 2024 14:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 728540.1133480; Thu, 23 May 2024 14:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9KW-00047Z-QL; Thu, 23 May 2024 14:22:04 +0000 Received: by outflank-mailman (input) for mailman id 728540; Thu, 23 May 2024 14:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9KV-00045w-4v for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sA9KV-0007ML-2R for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sA9KV-0001vS-02 for xen-changelog@lists.xenproject.org; Thu, 23 May 2024 14:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FEMQfsBHiGox1VRbbW/ruRhXgp488SCwEK5semi6J9Q=; b=Gr0P+Z9HUtVZ6ygwJST15eL6JY +PZKesGmQrHmackA7KolnmHgT4roUBjGycExEJCvCW/l6UQccx2+6De6XNeO6H/WqhYwn1b+qMqQE iUtuU1ivjd6fVeR/Znz5cPgmuN73zPLylBM/jCz377h8AajmI77iVshlTFkxxKKELdq8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xentrace: Remove xentrace_format Message-Id: Date: Thu, 23 May 2024 14:22:03 +0000 commit 2a40b106e92aaa7ce808c8608dd6473edc67f608 Author: George Dunlap AuthorDate: Fri Apr 26 15:18:25 2024 +0100 Commit: George Dunlap CommitDate: Thu May 23 15:05:13 2024 +0100 tools/xentrace: Remove xentrace_format xentrace_format was always of limited utility, since trace records across pcpus were processed out of order; it was superseded by xenalyze over a decade ago. But for several releases, the `formats` file it has depended on for proper operation has not even been included in `make install` (which generally means it doesn't get picked up by distros either); yet nobody has seemed to complain. Simple remove xentrace_format, and point people to xenalyze instead. NB that there is no man page for xenalyze, so the "see also" on the xentrace man page is simply removed for now. Signed-off-by: George Dunlap Acked-by: Andrew Cooper Acked-by: Olaf Hering --- docs/man/xentrace.8.pod | 5 +- docs/man/xentrace_format.1.pod | 46 ------- tools/xentrace/Makefile | 3 - tools/xentrace/formats | 229 ----------------------------------- tools/xentrace/xentrace.c | 2 +- tools/xentrace/xentrace_format | 264 ----------------------------------------- 6 files changed, 2 insertions(+), 547 deletions(-) diff --git a/docs/man/xentrace.8.pod b/docs/man/xentrace.8.pod index 4c174a84c0..7c9f69c67f 100644 --- a/docs/man/xentrace.8.pod +++ b/docs/man/xentrace.8.pod @@ -20,7 +20,7 @@ D1...D5 are the trace data. Data is dumped onto the standard output (which must not be a TTY) or a I specified on the command line. -The output should be parsed using the tool xentrace_format, which can +The output should be parsed using the tool xenalyze, which can produce human-readable output in ASCII format. @@ -157,6 +157,3 @@ B collects the following events from the trace buffer: Mark A. Williamson -=head1 SEE ALSO - -xentrace_format(1) diff --git a/docs/man/xentrace_format.1.pod b/docs/man/xentrace_format.1.pod deleted file mode 100644 index e05479a83b..0000000000 --- a/docs/man/xentrace_format.1.pod +++ /dev/null @@ -1,46 +0,0 @@ -=head1 NAME - -xentrace_format - pretty-print Xen trace data - -=head1 SYNOPSIS - -B [ I ] - -=head1 DESCRIPTION - -B parses trace data in B binary format from -standard input and reformats it according to the rules in a file of -definitions (I), printing to standard output. - -The rules in I should have the format shown below: - -I I I - -Each rule should start on a new line. - -The format string may include format specifiers, such as: -%(cpu)d, %(tsc)d, %(event)d, %(1)d, %(2)d, %(3)d, %(4)d, %(5)d - -[ the `d' format specifier output in decimal, alternatively `x' - will output in hexadecimal and `o' will output in octal ] - -These correspond to the CPU number, event ID, timestamp counter and -the 5 data fields from the trace record. There should be one such -rule for each type of event to be pretty-printed (events which do not -have formatting rules are ignored). - -A sample format file for Xen's predefined trace events is available -in the file tools/xentrace/formats in the Xen source tree. - -Depending on your system and the rate at which trace data is produced, -this script may not be able to keep up with the output of -B if it is piped directly. In these circumstances you -should have B output to a file for processing off-line. - -=head1 AUTHOR - -Mark A. Williamson - -=head1 SEE ALSO - -xentrace(8) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index d50d400472..bf960c0867 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -10,7 +10,6 @@ LDLIBS += $(ARGP_LDFLAGS) BIN := xenalyze SBIN := xentrace xentrace_setsize LIBBIN := xenctx -SCRIPTS := xentrace_format TARGETS := $(BIN) $(SBIN) $(LIBBIN) @@ -24,13 +23,11 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(LIBBIN)) - rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS)) rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(SBIN)) rm -f $(addprefix $(DESTDIR)$(bindir)/, $(BIN)) diff --git a/tools/xentrace/formats b/tools/xentrace/formats deleted file mode 100644 index afb5ee0112..0000000000 --- a/tools/xentrace/formats +++ /dev/null @@ -1,229 +0,0 @@ -0x00000000 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) unknown (0x%(event)016x) [ 0x%(1)08x 0x%(2)08x 0x%(3)08x 0x%(4)08x 0x%(5)08x 0x%(6)08x 0x%(7)08x ] - -0x0001f001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) lost_records 0x%(1)08x -0x0001f002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) wrap_buffer 0x%(1)08x -0x0001f003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cpu_change 0x%(1)08x -0x0001f004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) trace_irq [ vector = %(1)d, count = %(2)d, tot_cycles = 0x%(3)08x, max_cycles = 0x%(4)08x ] - -0x00021002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) continue_running [ dom:vcpu = 0x%(1)08x ] -0x00021011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) running_to_runnable [ dom:vcpu = 0x%(1)08x ] -0x00021021 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) running_to_blocked [ dom:vcpu = 0x%(1)08x ] -0x00021031 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) running_to_offline [ dom:vcpu = 0x%(1)08x ] -0x00021101 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) runnable_to_running [ dom:vcpu = 0x%(1)08x ] -0x00021121 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) runnable_to_blocked [ dom:vcpu = 0x%(1)08x ] -0x00021131 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) runnable_to_offline [ dom:vcpu = 0x%(1)08x ] -0x00021201 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) blocked_to_running [ dom:vcpu = 0x%(1)08x ] -0x00021211 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) blocked_to_runnable [ dom:vcpu = 0x%(1)08x ] -0x00021231 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) blocked_to_offline [ dom:vcpu = 0x%(1)08x ] -0x00021301 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) offline_to_running [ dom:vcpu = 0x%(1)08x ] -0x00021311 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) offline_to_runnable [ dom:vcpu = 0x%(1)08x ] -0x00021321 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) offline_to_blocked [ dom:vcpu = 0x%(1)08x ] - -0x00028001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) sched_add_domain [ domid = 0x%(1)08x ] -0x00028002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) sched_rem_domain [ domid = 0x%(1)08x ] -0x00028003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_sleep [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00028004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_wake [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00028005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) do_yield [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00028006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) do_block [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00028007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_shutdown [ dom:vcpu = 0x%(1)04x%(2)04x, reason = 0x%(3)08x ] -0x00028008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) sched_ctl -0x00028009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) sched_adjdom [ domid = 0x%(1)08x ] -0x0002800a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) __enter_scheduler [ prev = 0x%(1)04x%(2)04x, next = 0x%(3)04x%(4)04x ] -0x0002800b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) s_timer_fn -0x0002800c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) t_timer_fn -0x0002800d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) dom_timer_fn -0x0002800e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) switch_infprev [ dom:vcpu = 0x%(1)04x%(2)04x, runtime = %(3)d ] -0x0002800f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) switch_infnext [ new_dom:vcpu = 0x%(1)04x%(2)04x, time = %(3)d, r_time = %(4)d ] -0x00028010 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_shutdown_code [ dom:vcpu = 0x%(1)04x%(2)04x, reason = 0x%(3)08x ] -0x00028011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) switch_infcont [ dom:vcpu = 0x%(1)04x%(2)04x, runtime = %(3)d, r_time = %(4)d ] - -0x00022001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:sched_tasklet -0x00022002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:account_start [ dom:vcpu = 0x%(1)04x%(2)04x, active = %(3)d ] -0x00022003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:account_stop [ dom:vcpu = 0x%(1)04x%(2)04x, active = %(3)d ] -0x00022004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:stolen_vcpu [ dom:vcpu = 0x%(2)04x%(3)04x, from = %(1)d ] -0x00022005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:picked_cpu [ dom:vcpu = 0x%(1)04x%(2)04x, cpu = %(3)d ] -0x00022006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:tickle [ cpu = %(1)d ] -0x00022007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:boost [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00022008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:unboost [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00022009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:schedule [ cpu[16]:tasklet[8]:idle[8] = %(1)08x ] -0x0002200A CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:ratelimit [ dom:vcpu = 0x%(1)08x, runtime = %(2)d ] -0x0002200B CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:steal_check [ peer_cpu = %(1)d, checked = %(2)d ] - -0x00022201 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:tick -0x00022202 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_pos [ dom:vcpu = 0x%(1)08x, pos = %(2)d] -0x00022203 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:credit burn [ dom:vcpu = 0x%(1)08x, credit = %(2)d, budget = %(3)d, delta = %(4)d ] -0x00022204 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:credit_add -0x00022205 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:tickle_check [ dom:vcpu = 0x%(1)08x, credit = %(2)d, score = %(3)d ] -0x00022206 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:tickle [ cpu = %(1)d ] -0x00022207 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:credit_reset [ dom:vcpu = 0x%(1)08x, cr_start = %(2)d, cr_end = %(3)d ] -0x00022208 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:sched_tasklet -0x00022209 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:update_load -0x0002220a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_assign [ dom:vcpu = 0x%(1)08x, rq_id = %(2)d ] -0x0002220b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:updt_vcpu_load [ dom:vcpu = 0x%(3)08x, vcpuload = 0x%(2)08x%(1)08x, wshift = %(4)d ] -0x0002220c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:updt_runq_load [ rq_load[16]:rq_id[8]:wshift[8] = 0x%(5)08x, rq_avgload = 0x%(2)08x%(1)08x, b_avgload = 0x%(4)08x%(3)08x ] -0x0002220d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:tickle_new [ dom:vcpu = 0x%(1)08x, processor = %(2)d credit = %(3)d ] -0x0002220e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_max_weight [ rq_id[16]:max_weight[16] = 0x%(1)08x ] -0x0002220f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:migrrate [ dom:vcpu = 0x%(1)08x, rq_id[16]:trq_id[16] = 0x%(2)08x ] -0x00022210 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:load_check [ lrq_id[16]:orq_id[16] = 0x%(1)08x, delta = %(2)d ] -0x00022211 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:load_balance [ l_bavgload = 0x%(2)08x%(1)08x, o_bavgload = 0x%(4)08x%(3)08x, lrq_id[16]:orq_id[16] = 0x%(5)08x ] -0x00022212 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:pick_cpu [ b_avgload = 0x%(2)08x%(1)08x, dom:vcpu = 0x%(3)08x, rq_id[16]:new_cpu[16] = %(4)d ] -0x00022213 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_candidate [ dom:vcpu = 0x%(1)08x, credit = %(3)d, tickled_cpu = %(2)d ] -0x00022214 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:schedule [ rq:cpu = 0x%(1)08x, tasklet[8]:idle[8]:smt_idle[8]:tickled[8] = %(2)08x ] -0x00022215 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:ratelimit [ dom:vcpu = 0x%(1)08x, runtime = %(2)d ] -0x00022216 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_cand_chk [ dom:vcpu = 0x%(1)08x ] - -0x00022801 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:tickle [ cpu = %(1)d ] -0x00022802 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:runq_pick [ dom:vcpu = 0x%(1)08x, cur_deadline = 0x%(3)08x%(2)08x, cur_budget = 0x%(5)08x%(4)08x ] -0x00022803 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:burn_budget [ dom:vcpu = 0x%(1)08x, cur_budget = 0x%(3)08x%(2)08x, delta = %(4)d ] -0x00022804 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:repl_budget [ dom:vcpu = 0x%(1)08x, cur_deadline = 0x%(3)08x%(2)08x, cur_budget = 0x%(5)08x%(4)08x ] -0x00022805 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:sched_tasklet -0x00022806 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:schedule [ cpu[16]:tasklet[8]:idle[4]:tickled[4] = %(1)08x ] - -0x00022A01 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:pick_cpu [ dom:vcpu = 0x%(1)08x, new_cpu = %(2)d ] -0x00022A02 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:assign [ dom:vcpu = 0x%(1)08x, cpu = %(2)d ] -0x00022A03 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:deassign [ dom:vcpu = 0x%(1)08x, cpu = %(2)d ] -0x00022A04 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:migrate [ dom:vcpu = 0x%(1)08x, new_cpu:cpu = 0x%(2)08x ] -0x00022A05 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:schedule [ cpu[16]:tasklet[16] = %(1)08x, dom:vcpu = 0x%(2)08x ] -0x00022A06 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:sched_tasklet - -0x00041001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_create [ dom = 0x%(1)08x ] -0x00041002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_destroy [ dom = 0x%(1)08x ] - -0x00081001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMENTRY -0x00081002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMEXIT [ exitcode = 0x%(1)08x, rIP = 0x%(2)08x ] -0x00081102 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMEXIT [ exitcode = 0x%(1)08x, rIP = 0x%(3)08x%(2)08x ] -0x00081401 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) nVMENTRY -0x00081402 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) nVMEXIT [ exitcode = 0x%(1)08x, rIP = 0x%(2)08x ] -0x00081502 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) nVMEXIT [ exitcode = 0x%(1)08x, rIP = 0x%(3)08x%(2)08x ] -0x00082001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_XEN [ errorcode = 0x%(2)02x, virt = 0x%(1)08x ] -0x00082101 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_XEN [ errorcode = 0x%(3)02x, virt = 0x%(2)08x%(1)08x ] -0x00082002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_INJECT [ errorcode = 0x%(1)02x, virt = 0x%(2)08x ] -0x00082102 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_INJECT [ errorcode = 0x%(1)02x, virt = 0x%(3)08x%(2)08x ] -0x00082003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INJ_EXC [ vector = 0x%(1)02x, errorcode = 0x%(2)04x ] -0x00082004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INJ_VIRQ [ vector = 0x%(1)02x, fake = %(2)d ] -0x00082005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) REINJ_VIRQ [ vector = 0x%(1)02x ] -0x00082006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) IO_READ [ port = 0x%(1)04x, size = %(2)d ] -0x00082007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) IO_WRITE [ port = 0x%(1)04x, size = %(2)d ] -0x00082008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CR_READ [ CR# = %(1)d, value = 0x%(2)08x ] -0x00082108 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CR_READ [ CR# = %(1)d, value = 0x%(3)08x%(2)08x ] -0x00082009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CR_WRITE [ CR# = %(1)d, value = 0x%(2)08x ] -0x00082109 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CR_WRITE [ CR# = %(1)d, value = 0x%(3)08x%(2)08x ] -0x0008200A CPU%(cpu)d %(tsc)d (+%(reltsc)8d) DR_READ -0x0008200B CPU%(cpu)d %(tsc)d (+%(reltsc)8d) DR_WRITE -0x0008200C CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MSR_READ [ MSR# = 0x%(1)08x, value = 0x%(3)08x%(2)08x ] -0x0008200D CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MSR_WRITE [ MSR# = 0x%(1)08x, value = 0x%(3)08x%(2)08x ] -0x0008200E CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CPUID [ func = 0x%(1)08x, eax = 0x%(2)08x, ebx = 0x%(3)08x, ecx=0x%(4)08x, edx = 0x%(5)08x ] -0x0008200F CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INTR [ vector = 0x%(1)02x ] -0x00082010 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) NMI -0x00082011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) SMI -0x00082012 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMMCALL [ func = 0x%(1)08x ] -0x00082013 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) HLT [ intpending = %(1)d ] -0x00082014 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INVLPG [ is invlpga? = %(1)d, virt = 0x%(2)08x ] -0x00082114 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INVLPG [ is invlpga? = %(1)d, virt = 0x%(3)08x%(2)08x ] -0x00082015 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MCE -0x00082016 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) IOPORT_READ [ port = 0x%(1)04x, data = 0x%(2)08x ] -0x00082216 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) IOPORT_WRITE [ port = 0x%(1)04x, data = 0x%(2)08x ] -0x00082017 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MMIO_READ [ port = 0x%(1)08x, data = 0x%(2)08x ] -0x00082217 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MMIO_WRITE [ port = 0x%(1)08x, data = 0x%(2)08x ] -0x00082018 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CLTS -0x00082019 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) LMSW [ value = 0x%(1)08x ] -0x00082119 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) LMSW [ value = 0x%(2)08x%(1)08x ] -0x0008201a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) RDTSC [ value = 0x%(2)08x%(1)08x ] -0x00082020 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INTR_WINDOW [ value = 0x%(1)08x ] -0x00082021 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) NPF [ gpa = 0x%(2)08x%(1)08x mfn = 0x%(4)08x%(3)08x qual = 0x%(5)04x p2mt = 0x%(6)04x ] -0x00082023 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) TRAP [ vector = 0x%(1)02x ] - -0x0010f001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_grant_map [ domid = %(1)d ] -0x0010f002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_grant_unmap [ domid = %(1)d ] -0x0010f003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_grant_transfer [ domid = %(1)d ] -0x0010f005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) decrease_reservation [ d%(3)d gfn 0x%(2)08x%(1)08x, order %(4)u ] -0x0010f010 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pod_populate [ d%(5)d gfn 0x%(2)08x%(1)08x => mfn 0x%(4)08x%(3)08x, order %(6)u ] -0x0010f011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pod_zero_reclaim [ d%(5)d gfn 0x%(2)08x%(1)08x => mfn 0x%(4)08x%(3)08x, order %(6)u ] -0x0010f012 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pod_superpage_splinter [ d%(3)d gfn 0x%(2)08x%(1)08x, order %(4)u ] - -0x00201001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hypercall [ eip = 0x%(1)08x, eax = 0x%(2)08x ] -0x00201101 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hypercall [ rip = 0x%(2)08x%(1)08x, eax = 0x%(3)08x ] -0x00201003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) trap [ eip = 0x%(1)08x, trapnr:error = 0x%(2)08x ] -0x00201103 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) trap [ rip = 0x%(2)08x%(1)08x, trapnr:error = 0x%(3)08x ] -0x00201004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_fault [ eip = 0x%(1)08x, addr = 0x%(2)08x, error = 0x%(3)08x ] -0x00201104 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_fault [ rip = 0x%(2)08x%(1)08x, addr = 0x%(4)08x%(3)08x, error = 0x%(5)08x ] -0x00201005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) forced_invalid_op [ eip = 0x%(1)08x ] -0x00201105 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) forced_invalid_op [ rip = 0x%(2)08x%(1)08x ] -0x00201006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) emulate_privop [ eip = 0x%(1)08x ] -0x00201106 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) emulate_privop [ rip = 0x%(2)08x%(1)08x ] -0x00201007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) emulate_4G [ eip = 0x%(1)08x ] -0x00201107 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) emulate_4G [ rip = 0x%(2)08x%(1)08x ] -0x00201008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) math_state_restore -0x00201108 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) math_state_restore -0x00201009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) paging_fixup [ eip = 0x%(1)08x, addr = 0x%(2)08x ] -0x00201109 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) paging_fixup [ rip = 0x%(2)08x%(1)08x, addr = 0x%(4)08x%(3)08x ] -0x0020100a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) gdt_ldt_mapping_fault [ eip = 0x%(1)08x, offset = 0x%(2)08x ] -0x0020110a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) gdt_ldt_mapping_fault [ rip = 0x%(2)08x%(1)08x, offset = 0x%(4)08x%(3)08x ] -0x0020100b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) ptwr_emulation [ addr = 0x%(3)08x, eip = 0x%(4)08x, npte = 0x%(2)08x%(1)08x ] -0x0020110b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) ptwr_emulation [ addr = 0x%(4)08x%(3)08x, rip = 0x%(6)08x%(5)08x, npte = 0x%(2)08x%(1)08x ] -0x0020100c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) ptwr_emulation_pae [ addr = 0x%(3)08x, eip = 0x%(4)08x, npte = 0x%(2)08x%(1)08x ] -0x0020110c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) ptwr_emulation_pae [ addr = 0x%(4)08x%(3)08x, rip = 0x%(6)08x%(5)08x, npte = 0x%(2)08x%(1)08x ] -0x0020100d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hypercall [ op = 0x%(1)08x ] -0x0020200e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hypercall [ op = 0x%(1)08x ] - -0x0040f001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_not_shadow [ gl1e = 0x%(2)08x%(1)08x, va = 0x%(3)08x, flags = 0x%(4)08x ] -0x0040f101 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_not_shadow [ gl1e = 0x%(2)08x%(1)08x, va = 0x%(4)08x%(3)08x, flags = 0x%(5)08x ] -0x0040f002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fast_propagate [ va = 0x%(1)08x ] -0x0040f102 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fast_propagate [ va = 0x%(2)08x%(1)08x ] -0x0040f003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fast_mmio [ va = 0x%(1)08x ] -0x0040f103 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fast_mmio [ va = 0x%(2)08x%(1)08x ] -0x0040f004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_false_fast_path [ va = 0x%(1)08x ] -0x0040f104 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_false_fast_path [ va = 0x%(2)08x%(1)08x ] -0x0040f005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_mmio [ va = 0x%(1)08x ] -0x0040f105 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_mmio [ va = 0x%(2)08x%(1)08x ] -0x0040f006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fixup [ gl1e = 0x%(1)08x, va = 0x%(2)08x, flags = 0x%(3)08x ] -0x0040f106 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fixup [ gl1e = 0x%(2)08x%(1)08x, va = 0x%(4)08x%(3)08x, flags = 0x%(3)08x ] -0x0040f007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_domf_dying [ va = 0x%(1)08x ] -0x0040f107 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_domf_dying [ va = 0x%(2)08x%(1)08x ] -0x0040f008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate [ gl1e = 0x%(1)08x, write_val = 0x%(2)08x, va = 0x%(3)08x, flags = 0x%(4)08x ] -0x0040f108 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate [ gl1e = 0x%(2)08x%(1)08x, write_val = 0x%(4)08x%(3)08x, va = 0x%(6)08x%(5)08x, flags = 0x%(7)08x ] -0x0040f009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_user [ va = 0x%(1)08x, gfn = 0x%(2)08x ] -0x0040f109 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_user [ va = 0x%(2)08x%(1)08x, gfn = 0x%(4)08x%(3)08x ] -0x0040f00a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_evtinj [ va = 0x%(1)08x, gfn = 0x%(2)08x ] -0x0040f10a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_evtinj [ va = 0x%(2)08x%(1)08x, gfn = 0x%(4)08x%(3)08x ] -0x0040f00b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_unhandled [ va = 0x%(1)08x, gfn = 0x%(2)08x ] -0x0040f10b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_unhandled [ va = 0x%(2)08x%(1)08x, gfn = 0x%(4)08x%(3)08x ] -0x0040f00c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_wrmap_bf [ gfn = 0x%(1)08x ] -0x0040f10c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_wrmap_bf [ gfn = 0x%(2)08x%(1)08x ] -0x0040f00d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_prealloc_unpin [ gfn = 0x%(1)08x ] -0x0040f10d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_prealloc_unpin [ gfn = 0x%(2)08x%(1)08x ] -0x0040f00e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_resync_full [ gfn = 0x%(1)08x ] -0x0040f10e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_resync_full [ gfn = 0x%(2)08x%(1)08x ] -0x0040f00f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_resync_only [ gfn = 0x%(1)08x ] -0x0040f10f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_resync_only [ gfn = 0x%(2)08x%(1)08x ] - -0x00801001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cpu_freq_change [ %(1)dMHz -> %(2)dMHz ] -0x00801002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cpu_idle_entry [ C0 -> C%(1)d, acpi_pm_tick = %(2)d, expected = %(3)dus, predicted = %(4)dus ] -0x00801003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cpu_idle_exit [ C%(1)d -> C0, acpi_pm_tick = %(2)d, irq = %(3)d %(4)d %(5)d %(6)d ] - -0x00802001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cleanup_move_delayed [ irq = %(1)d, vector 0x%(2)x on CPU%(3)d ] -0x00802002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cleanup_move [ irq = %(1)d, vector 0x%(2)x on CPU%(3)d ] -0x00802003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) bind_vector [ irq = %(1)d = vector 0x%(2)x, CPU mask: 0x%(3)08x ] -0x00802004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) clear_vector [ irq = %(1)d = vector 0x%(2)x, CPU mask: 0x%(3)08x ] -0x00802005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) move_vector [ irq = %(1)d had vector 0x%(2)x on CPU%(3)d ] -0x00802006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) assign_vector [ irq = %(1)d = vector 0x%(2)x, CPU mask: 0x%(3)08x ] -0x00802007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) bogus_vector [ 0x%(1)x ] -0x00802008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) do_irq [ irq = %(1)d, began = %(2)dus, ended = %(3)dus ] - -0x00084001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hpet create [ tn = %(1)d, irq = %(2)d, delta = 0x%(4)08x%(3)08x, period = 0x%(6)08x%(5)08x ] -0x00084002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pit create [ delta = 0x%(1)08x, period = 0x%(2)08x ] -0x00084003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtc create [ delta = 0x%(1)08x, period = 0x%(2)08x ] -0x00084004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vlapic create [ delta = 0x%(2)08x%(1)08x , period = 0x%(4)08x%(3)08x, irq = %(5)d ] -0x00084005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hpet destroy [ tn = %(1)d ] -0x00084006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pit destroy [ ] -0x00084007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtc destroy [ ] -0x00084008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vlapic destroy [ ] -0x00084009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pit callback [ ] -0x0008400a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vlapic callback [ ] -0x0008400b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic_update_int_output [ int_output = %(1)d, is_master = %(2)d, irq = %(3)d ] -0x0008400c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic vcpu_kick [ irq = %(1)d ] -0x0008400d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) __vpic_intack [ is_master = %(1)d, irq = %(2)d ] -0x0008400e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic_irq_positive_edge [ irq = %(1)d ] -0x0008400f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic_irq_negative_edge [ irq = %(1)d ] -0x00084010 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic_ack_pending_irq [ accept_pic_intr = %(1)d, int_output = %(2)d ] -0x00084011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vlapic_accept_pic_intr [ i8259_target = %(1)d, accept_pic_int = %(2)d ] diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index be6226f088..63b29f8442 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -848,7 +848,7 @@ static void usage(int status) "\n" \ " CPU(uint) TSC(uint64_t) EVENT(uint32_t) D1 D2 D3 D4 D5 (all uint32_t)\n" \ "\n" \ -"The output should be parsed using the tool xentrace_format,\n" \ +"The output should be parsed using the tool xenalyze,\n" \ "which can produce human-readable output in ASCII format.\n" printf(USAGE_STR); diff --git a/tools/xentrace/xentrace_format b/tools/xentrace/xentrace_format deleted file mode 100644 index 21be16b7e4..0000000000 --- a/tools/xentrace/xentrace_format +++ /dev/null @@ -1,264 +0,0 @@ -#!/usr/bin/env python - -# by Mark Williamson, (C) 2004 Intel Research Cambridge - -# 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("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 - and are not part of the syntax): - - {event_id}{whitespace}{text format string} - - The textual format string may include format specifiers, such as: - %(cpu)d, %(tsc)d, %(event)d, %(1)d, %(2)d, %(3)d, %(4)d, ... - [ the 'd' format specifier outputs in decimal, alternatively 'x' - will output in hexadecimal and 'o' will output in octal ] - - Which correspond to the CPU number, event ID, timestamp counter and - the 7 data fields from the trace record. There should be one such - rule for each type of event. - - Depending on your system and the volume of trace buffer data, - 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): - defs = {} - - fd = open(defs_file) - - reg = re.compile('(\S+)\s+(\S.*)') - - while True: - line = fd.readline() - if not line: - break - - if line[0] == '#' or line[0] == '\n': - continue - - m = reg.match(line) - - if not m: print("Bad format file", file=sys.stderr) ; sys.exit(1) - - defs[str(eval(m.group(1)))] = m.group(2) - - return defs - -def sighand(x,y): - global interrupted - interrupted = 1 - -##### Main code - -mhz = 0 - -if len(sys.argv) < 2: - usage() - -try: - opts, arg = getopt.getopt(sys.argv[1:], "c:" ) - - for opt in opts: - if opt[0] == '-c' : mhz = int(opt[1]) - -except getopt.GetoptError: - usage() - -signal.signal(signal.SIGTERM, sighand) -signal.signal(signal.SIGHUP, sighand) -signal.signal(signal.SIGINT, sighand) - -interrupted = 0 - -try: - defs = read_defs(arg[0]) -except IOError as exn: - print(exn) - sys.exit(1) - -# structure of trace record (as output by xentrace): -# HDR(I) {TSC(Q)} D1(I) D2(I) D3(I) D4(I) D5(I) D6(I) D7(I) -# -# HDR consists of EVENT:28:, n_data:3:, tsc_in:1: -# EVENT means Event ID -# n_data means number of data (like D1, D2, ...) -# tsc_in means TSC data exists(1) or not(0). -# if tsc_in == 0, TSC(Q) does not exists. -# -# CPU ID exists on trace data of EVENT=0x0001f003 -# -HDRREC = "I" -TSCREC = "Q" -D1REC = "I" -D2REC = "II" -D3REC = "III" -D4REC = "IIII" -D5REC = "IIIII" -D6REC = "IIIIII" -D7REC = "IIIIIII" - -last_tsc = [0] - -TRC_TRACE_IRQ = 0x1f004 -TRC_PV_HYPERCALL_V2 = 0x20100d -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 = stdin_bytes.read(struct.calcsize(HDRREC)) - if not line: - break - event = struct.unpack(HDRREC, line)[0] - n_data = event >> 28 & 0x7 - tsc_in = event >> 31 - - d1 = 0 - d2 = 0 - d3 = 0 - d4 = 0 - d5 = 0 - d6 = 0 - d7 = 0 - - tsc = 0 - - if tsc_in == 1: - line = stdin_bytes.read(struct.calcsize(TSCREC)) - if not line: - break - tsc = struct.unpack(TSCREC, line)[0] - - if n_data == 1: - line = stdin_bytes.read(struct.calcsize(D1REC)) - if not line: - break - d1 = struct.unpack(D1REC, line)[0] - if n_data == 2: - line = stdin_bytes.read(struct.calcsize(D2REC)) - if not line: - break - (d1, d2) = struct.unpack(D2REC, line) - if n_data == 3: - line = stdin_bytes.read(struct.calcsize(D3REC)) - if not line: - break - (d1, d2, d3) = struct.unpack(D3REC, line) - if n_data == 4: - line = stdin_bytes.read(struct.calcsize(D4REC)) - if not line: - break - (d1, d2, d3, d4) = struct.unpack(D4REC, line) - if n_data == 5: - 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 = 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 = stdin_bytes.read(struct.calcsize(D7REC)) - if not line: - break - (d1, d2, d3, d4, d5, d6, d7) = struct.unpack(D7REC, line) - - # Event field is 28bit of 'uint32_t' in header, not 'long'. - event &= 0x0fffffff - if event == 0x1f003: - cpu = d1 - - if event == TRC_TRACE_IRQ: - # IN - d1:vector, d2:tsc_in, d3:tsc_out - # OUT - d1:vector, d2:count, d3:tot_cycles, d4:max_cycles - tsc_diff = d3 - d2 - if tsc_diff < 0: - break - irq_measure[d1]['count'] += 1 - irq_measure[d1]['tot_cycles'] += tsc_diff - if irq_measure[d1]['max_cycles'] < tsc_diff: - irq_measure[d1]['max_cycles'] = tsc_diff - d2 = irq_measure[d1]['count'] - d3 = irq_measure[d1]['tot_cycles'] - d4 = irq_measure[d1]['max_cycles'] - - if event == TRC_PV_HYPERCALL_V2 or event == TRC_PV_HYPERCALL_SUBCALL: - # Mask off the argument present bits. - d1 &= 0x000fffff - - #tsc = (tscH<<32) | tscL - - #print i, tsc - - 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])) - - # provide relative TSC - if last_tsc[cpu] > 0 and tsc_in == 1: - reltsc = tsc - last_tsc[cpu] - else: - reltsc = 0 - - if tsc_in == 1: - last_tsc[cpu] = tsc - - if mhz: - tsc = tsc / (mhz*1000000.0) - - args = {'cpu' : cpu, - 'tsc' : tsc, - 'event' : event, - 'reltsc': reltsc, - '1' : d1, - '2' : d2, - '3' : d3, - '4' : d4, - '5' : d5, - '6' : d6, - '7' : d7 } - - try: - - if str(event) in defs: - print(defs[str(event)] % args) - else: - if str(0) in defs: print(defs[str(0)] % args) - except TypeError: - if str(event) in defs: - print(defs[str(event)]) - print(args) - else: - if str(0) in defs: - print(defs[str(0)]) - print(args) - - - except (IOError, struct.error): sys.exit() -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 13:33:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 13:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729575.1134776 (Exim 4.92) (envelope-from ) id 1sAV2e-0007Va-VX; Fri, 24 May 2024 13:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729575.1134776; Fri, 24 May 2024 13: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 1sAV2e-0007VS-Sv; Fri, 24 May 2024 13:33:04 +0000 Received: by outflank-mailman (input) for mailman id 729575; Fri, 24 May 2024 13:33:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAV2d-0007VM-96 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 13:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAV2d-0002IE-3b for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 13:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAV2d-0004Di-0x for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 13:33:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+p+PgVJYrYxPXg9Iw0t0tF4+fmO6zs+arJMFFYkXZ7g=; b=qxPAS+r37EB3/kFGOsXfTaK7T7 cj+cxaqHzKXrz7jItKkjmOjBttldyR2uc1+RPqUT7kglCWi/MRhXQurXzditKM68fSyvYg546QZ33 BAuo/7TNO/d/SikWOWWXUdMacPNcLnXc3WKO2GkdlgmCDjLgbDLmIf08k+Igato1+nLQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Set correct per-cpu cpu_core_mask Message-Id: Date: Fri, 24 May 2024 13:33:03 +0000 commit 701190abb3d5873cf77349b3d90bd11ded74871a Author: Henry Wang AuthorDate: Thu Mar 21 11:57:06 2024 +0800 Commit: Julien Grall CommitDate: Fri May 24 14:26:01 2024 +0100 xen/arm: Set correct per-cpu cpu_core_mask In the common sysctl command XEN_SYSCTL_physinfo, the value of cores_per_socket is calculated based on the cpu_core_mask of CPU0. Currently on Arm this is a fixed value 1 (can be checked via xl info), which is not correct. This is because during the Arm CPU online process at boot time, setup_cpu_sibling_map() only sets the per-cpu cpu_core_mask for itself. cores_per_socket refers to the number of cores that belong to the same socket (NUMA node). Currently Xen on Arm does not support physical CPU hotplug and NUMA, also we assume there is no multithread. Therefore cores_per_socket means all possible CPUs detected from the device tree. Setting the per-cpu cpu_core_mask in setup_cpu_sibling_map() accordingly. Modify the in-code comment which seems to be outdated. Add a warning to users if Xen is running on processors with multithread support. Signed-off-by: Henry Wang Signed-off-by: Henry Wang Reviewed-by: Michal Orzel --- xen/arch/arm/smpboot.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 6efed87678..93a10d7721 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -67,7 +67,11 @@ static bool cpu_is_dead; /* ID of the PCPU we're running on */ DEFINE_PER_CPU(unsigned int, cpu_id); -/* XXX these seem awfully x86ish... */ +/* + * Although multithread is part of the Arm spec, there are not many + * processors supporting multithread and current Xen on Arm assumes there + * is no multithread. + */ /* 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 */ @@ -86,9 +90,13 @@ static int setup_cpu_sibling_map(int cpu) !zalloc_cpumask_var(&per_cpu(cpu_core_mask, cpu)) ) return -ENOMEM; - /* A CPU is a sibling with itself and is always on its own core. */ + /* + * Currently we assume there is no multithread and NUMA, so + * a CPU is a sibling with itself, and the all possible CPUs + * are supposed to belong to the same socket (NUMA node). + */ cpumask_set_cpu(cpu, per_cpu(cpu_sibling_mask, cpu)); - cpumask_set_cpu(cpu, per_cpu(cpu_core_mask, cpu)); + cpumask_copy(per_cpu(cpu_core_mask, cpu), &cpu_possible_map); return 0; } @@ -278,6 +286,10 @@ void __init smp_init_cpus(void) warning_add("WARNING: HMP COMPUTING HAS BEEN ENABLED.\n" "It has implications on the security and stability of the system,\n" "unless the cpu affinity of all domains is specified.\n"); + + if ( system_cpuinfo.mpidr.mt == 1 ) + warning_add("WARNING: MULTITHREADING HAS BEEN DETECTED ON THE PROCESSOR.\n" + "It might impact the security of the system.\n"); } unsigned int __init smp_get_max_cpus(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 14:55:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 14:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729615.1134821 (Exim 4.92) (envelope-from ) id 1sAWK2-0004Cf-Dj; Fri, 24 May 2024 14:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729615.1134821; Fri, 24 May 2024 14:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAWK2-0004CX-B3; Fri, 24 May 2024 14:55:06 +0000 Received: by outflank-mailman (input) for mailman id 729615; Fri, 24 May 2024 14:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAWK0-0004CP-75 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 14:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAWK0-0003qu-4l for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 14:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAWK0-0000hN-2g for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 14:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=usaB1UCAbX9w7vsu20LBPbSCloKhaQXQlLFScBymtyA=; b=oxxdnm6bePfhs2LKmx07OgDfLf QQ1sercOiZgrbW6PSvjlZNw4pOrpZgjINQUac1GDMyDQmpSByf88g+9TpXpfUYEpgAVm+UbdE0jAQ 4wTMTv4JKn4KkjdMIAwzl2aO9f22I68jqyXw6qAJKvkHjQg4uAc95CL5q7zc8uRWuDho=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm/trace: Use a different trace type for AMD processors Message-Id: Date: Fri, 24 May 2024 14:55:04 +0000 commit 320e644616c04655c353d7da4880cff555bc2055 Author: George Dunlap AuthorDate: Thu Apr 25 13:03:58 2024 +0100 Commit: George Dunlap CommitDate: Fri May 24 15:29:06 2024 +0100 x86/hvm/trace: Use a different trace type for AMD processors A long-standing usability sub-optimality with xenalyze is the necessity to specify `--svm-mode` when analyzing AMD processors. This fundamentally comes about because the same trace event ID is used for both VMX and SVM, but the contents of the trace must be interpreted differently. Instead, allocate separate trace events for VMX and SVM vmexits in Xen; this will allow all readers to properly interpret the meaning of the vmexit reason. In xenalyze, first remove the redundant call to init_hvm_data(); there's no way to get to hvm_vmexit_process() without it being already initialized by the set_vcpu_type call in hvm_process(). Replace this with set_hvm_exit_reson_data(), and move setting of hvm->exit_reason_* into that function. Modify hvm_process and hvm_vmexit_process to handle all four potential values appropriately. If SVM entries are encountered, set opt.svm_mode so that other SVM-specific functionality is triggered. Remove the `--svm-mode` command-line option, since it's now redundant. Signed-off-by: George Dunlap Acked-by: Andrew Cooper --- tools/xentrace/xenalyze.c | 37 +++++++++++++++++++------------------ xen/arch/x86/hvm/svm/svm.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 4 ++-- xen/include/public/trace.h | 6 ++++-- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index ce6a85d50b..9c4463b0e8 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -1437,14 +1437,6 @@ void init_hvm_data(struct hvm_data *h, struct vcpu_data *v) { h->init = 1; - if(opt.svm_mode) { - h->exit_reason_max = HVM_SVM_EXIT_REASON_MAX; - h->exit_reason_name = hvm_svm_exit_reason_name; - } else { - h->exit_reason_max = HVM_VMX_EXIT_REASON_MAX; - h->exit_reason_name = hvm_vmx_exit_reason_name; - } - if(opt.histogram_interrupt_eip) { int count = ((1ULL<summary.guest_interrupt[i].count=0; } +void set_hvm_exit_reason_data(struct hvm_data *h, unsigned event) { + if (((event & ~TRC_64_FLAG) == TRC_HVM_SVM_EXIT) || + opt.svm_mode) { + opt.svm_mode = 1; + h->exit_reason_max = HVM_SVM_EXIT_REASON_MAX; + h->exit_reason_name = hvm_svm_exit_reason_name; + } else { + h->exit_reason_max = HVM_VMX_EXIT_REASON_MAX; + h->exit_reason_name = hvm_vmx_exit_reason_name; + } +} + /* PV data */ enum { PV_HYPERCALL=1, @@ -5088,13 +5092,13 @@ void hvm_vmexit_process(struct record_info *ri, struct hvm_data *h, r = (typeof(r))ri->d; - if(!h->init) - init_hvm_data(h, v); + if(!h->exit_reason_name) + set_hvm_exit_reason_data(h, ri->event); h->vmexit_valid=1; bzero(&h->inflight, sizeof(h->inflight)); - if(ri->event == TRC_HVM_VMEXIT64) { + if(ri->event & TRC_64_FLAG) { if(v->guest_paging_levels != 4) { if ( verbosity >= 6 ) @@ -5316,8 +5320,10 @@ void hvm_process(struct pcpu_info *p) break; default: switch(ri->event) { - case TRC_HVM_VMEXIT: - case TRC_HVM_VMEXIT64: + case TRC_HVM_VMX_EXIT: + case TRC_HVM_VMX_EXIT64: + case TRC_HVM_SVM_EXIT: + case TRC_HVM_SVM_EXIT64: UPDATE_VOLUME(p, hvm[HVM_VOL_VMEXIT], ri->size); hvm_vmexit_process(ri, h, v); break; @@ -10884,11 +10890,6 @@ const struct argp_option cmd_opts[] = { .arg = "HZ", .doc = "Cpu speed of the tracing host, used to convert tsc into seconds.", }, - { .name = "svm-mode", - .key = OPT_SVM_MODE, - .group = OPT_GROUP_HARDWARE, - .doc = "Assume AMD SVM-style vmexit error codes. (Default is Intel VMX.)", }, - { .name = "progress", .key = OPT_PROGRESS, .doc = "Progress dialog. Requires the zenity (GTK+) executable.", }, diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index db530d55f2..988250dbc1 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2571,10 +2571,10 @@ void asmlinkage svm_vmexit_handler(void) exit_reason = vmcb->exitcode; if ( hvm_long_mode_active(v) ) - TRACE_TIME(TRC_HVM_VMEXIT64 | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), + TRACE_TIME(TRC_HVM_SVM_EXIT64 | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), exit_reason, regs->rip, regs->rip >> 32); else - TRACE_TIME(TRC_HVM_VMEXIT | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), + TRACE_TIME(TRC_HVM_SVM_EXIT | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), exit_reason, regs->eip); if ( vcpu_guestmode ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8ba996546f..f16faa6a61 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4105,9 +4105,9 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) __vmread(VM_EXIT_REASON, &exit_reason); if ( hvm_long_mode_active(v) ) - TRACE_TIME(TRC_HVM_VMEXIT64, exit_reason, regs->rip, regs->rip >> 32); + TRACE_TIME(TRC_HVM_VMX_EXIT64, exit_reason, regs->rip, regs->rip >> 32); else - TRACE_TIME(TRC_HVM_VMEXIT, exit_reason, regs->eip); + TRACE_TIME(TRC_HVM_VMX_EXIT, exit_reason, regs->eip); perfc_incra(vmexits, (uint16_t)exit_reason); diff --git a/xen/include/public/trace.h b/xen/include/public/trace.h index 3c9f9c3c18..141efa0ea7 100644 --- a/xen/include/public/trace.h +++ b/xen/include/public/trace.h @@ -178,8 +178,10 @@ /* trace events per subclass */ #define TRC_HVM_NESTEDFLAG (0x400) #define TRC_HVM_VMENTRY (TRC_HVM_ENTRYEXIT + 0x01) -#define TRC_HVM_VMEXIT (TRC_HVM_ENTRYEXIT + 0x02) -#define TRC_HVM_VMEXIT64 (TRC_HVM_ENTRYEXIT + TRC_64_FLAG + 0x02) +#define TRC_HVM_VMX_EXIT (TRC_HVM_ENTRYEXIT + 0x02) +#define TRC_HVM_VMX_EXIT64 (TRC_HVM_ENTRYEXIT + TRC_64_FLAG + 0x02) +#define TRC_HVM_SVM_EXIT (TRC_HVM_ENTRYEXIT + 0x03) +#define TRC_HVM_SVM_EXIT64 (TRC_HVM_ENTRYEXIT + TRC_64_FLAG + 0x03) #define TRC_HVM_PF_XEN (TRC_HVM_HANDLER + 0x01) #define TRC_HVM_PF_XEN64 (TRC_HVM_HANDLER + TRC_64_FLAG + 0x01) #define TRC_HVM_PF_INJECT (TRC_HVM_HANDLER + 0x02) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 14:55:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 14:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729616.1134825 (Exim 4.92) (envelope-from ) id 1sAWKB-0004EQ-FB; Fri, 24 May 2024 14:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729616.1134825; Fri, 24 May 2024 14:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAWKB-0004EI-CX; Fri, 24 May 2024 14:55:15 +0000 Received: by outflank-mailman (input) for mailman id 729616; Fri, 24 May 2024 14:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAWKA-0004E6-90 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 14:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAWKA-0003r3-8D for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 14:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAWKA-0000ht-7N for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 14:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aI1rBLcVtyL3g5dk3AWhDcGXNTQqu4YQC7Rw82waK/M=; b=PJJ5R16isUNkRO+pjQWxr5Zyn7 EE/qSHFu06E9gMWXj1Om6tzf8urlzYYib1NkTvwSrGZlXFWpivzNMJekKwHvu5Et+m5HQZ5sKr2cS ulESAqfnj87l0LT6+AdSAjTHBFAhdPplmB0bc/CPLSApzSHqpuNZFk7qJtipCL5rwHwI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenalyze: Ignore HVM_EMUL events harder Message-Id: Date: Fri, 24 May 2024 14:55:14 +0000 commit 2172a01c4cecbaa1d79bad200bfe3b996a3e4ba5 Author: George Dunlap AuthorDate: Fri Apr 26 14:17:33 2024 +0100 Commit: George Dunlap CommitDate: Fri May 24 15:29:18 2024 +0100 tools/xenalyze: Ignore HVM_EMUL events harder To unify certain common sanity checks, checks are done very early in processing based only on the top-level type. Unfortunately, when TRC_HVM_EMUL was introduced, it broke some of the assumptions about how the top-level types worked. Namely, traces of this type will show up outside of HVM contexts: in idle domains and in PV domains. Make an explicit exception for TRC_HVM_EMUL types in a number of places: - Pass the record info pointer to toplevel_assert_check, so that it can exclude TRC_HVM_EMUL records from idle and vcpu data_mode checks - Don't attempt to set the vcpu data_type in hvm_process for TRC_HVM_EMUL records. Signed-off-by: George Dunlap Acked-by: Andrew Cooper --- tools/xentrace/xenalyze.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 9c4463b0e8..d95e52695f 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -21,6 +21,7 @@ #define _XOPEN_SOURCE 600 #include #include +#include #include #include #include @@ -5305,8 +5306,11 @@ void hvm_process(struct pcpu_info *p) assert(p->current); - if(vcpu_set_data_type(p->current, VCPU_DATA_HVM)) - return; + /* HVM_EMUL types show up in all contexts */ + if(ri->evt.sub != 0x4) { + if(vcpu_set_data_type(p->current, VCPU_DATA_HVM)) + return; + } switch ( ri->evt.sub ) { case 2: /* HVM_HANDLER */ @@ -9447,9 +9451,10 @@ static struct tl_assert_mask tl_assert_checks[TOPLEVEL_MAX] = { /* There are a lot of common assumptions for the various processing * routines. Check them all in one place, doing something else if * they don't pass. */ -int toplevel_assert_check(int toplevel, struct pcpu_info *p) +int toplevel_assert_check(int toplevel, struct record_info *ri, struct pcpu_info *p) { struct tl_assert_mask mask; + bool is_hvm_emul = (toplevel == TOPLEVEL_HVM) && (ri->evt.sub == 0x4); mask = tl_assert_checks[toplevel]; @@ -9459,7 +9464,7 @@ int toplevel_assert_check(int toplevel, struct pcpu_info *p) goto fail; } - if( mask.not_idle_domain ) + if( mask.not_idle_domain && !is_hvm_emul) { /* Can't do this check w/o first doing above check */ assert(mask.p_current); @@ -9478,7 +9483,8 @@ int toplevel_assert_check(int toplevel, struct pcpu_info *p) v = p->current; if ( ! (v->data_type == VCPU_DATA_NONE - || v->data_type == mask.vcpu_data_mode) ) + || v->data_type == mask.vcpu_data_mode + || is_hvm_emul) ) { /* This may happen for track_dirty_vram, which causes a SHADOW_WRMAP_BF trace f/ dom0 */ fprintf(warn, "WARNING: Unexpected vcpu data type for d%dv%d on proc %d! Expected %d got %d. Not processing\n", @@ -9525,7 +9531,7 @@ void process_record(struct pcpu_info *p) { return; /* Unify toplevel assertions */ - if ( toplevel_assert_check(toplevel, p) ) + if ( toplevel_assert_check(toplevel, ri, p) ) { switch(toplevel) { case TRC_GEN_MAIN: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:55:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729718.1134911 (Exim 4.92) (envelope-from ) id 1sAb0J-0004W8-Ep; Fri, 24 May 2024 19:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729718.1134911; Fri, 24 May 2024 19:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0J-0004W1-Bf; Fri, 24 May 2024 19:55:03 +0000 Received: by outflank-mailman (input) for mailman id 729718; Fri, 24 May 2024 19:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0H-0004Vr-NL for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0H-0000qa-MK for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb0H-0001lN-LN for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mfnG67MjmfFmKNVI24leJoUewhQhv/dKLlVoRaaD6ao=; b=H/Fy2pPGG1oPVYIR8ncU7ykqpS bPBa24MoNC4ts8PeOCfZovbUlhIf6gguepf+suDBEc6v2ZTTgd+NaQdGHFp+unSCuM6mwyyaUbarG KxTEdXXNKDcBOpfi8ZD+K44ZLp6fWg+tNmlqCS6Li/eOTP8a5K4bNTQuX8NlB1BbEelM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/livepatch: make .livepatch.funcs read-only for in-tree tests Message-Id: Date: Fri, 24 May 2024 19:55:01 +0000 commit 3a3111d01844a38c523909744d0ebc6d7b096fe7 Author: Roger Pau Monné AuthorDate: Thu May 23 10:03:14 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:03:14 2024 +0200 xen/livepatch: make .livepatch.funcs read-only for in-tree tests This matches the flags of the .livepatch.funcs section when generated using livepatch-build-tools, which only sets the SHT_ALLOC flag. Also constify the definitions of the livepatch_func variables in the tests themselves, in order to better match the resulting output. Note that just making those variables constant is not enough to force the generated sections to be read-only. Signed-off-by: Roger Pau Monné Reviewed-by: Ross Lagerwall --- xen/test/livepatch/Makefile | 5 ++++- xen/test/livepatch/xen_action_hooks.c | 3 ++- xen/test/livepatch/xen_action_hooks_marker.c | 3 ++- xen/test/livepatch/xen_action_hooks_noapply.c | 3 ++- xen/test/livepatch/xen_action_hooks_norevert.c | 3 ++- xen/test/livepatch/xen_bye_world.c | 3 ++- xen/test/livepatch/xen_expectations.c | 3 ++- xen/test/livepatch/xen_expectations_fail.c | 3 ++- xen/test/livepatch/xen_hello_world.c | 3 ++- xen/test/livepatch/xen_nop.c | 2 +- xen/test/livepatch/xen_prepost_hooks.c | 3 ++- xen/test/livepatch/xen_prepost_hooks_fail.c | 3 ++- xen/test/livepatch/xen_replace_world.c | 3 ++- 13 files changed, 27 insertions(+), 13 deletions(-) diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile index d987a8367f..4caa9e2432 100644 --- a/xen/test/livepatch/Makefile +++ b/xen/test/livepatch/Makefile @@ -142,7 +142,10 @@ xen_expectations_fail-objs := xen_expectations_fail.o xen_hello_world_func.o not quiet_cmd_livepatch = LD $@ -cmd_livepatch = $(LD) $(XEN_LDFLAGS) $(build_id_linker) -r -o $@ $(real-prereqs) +define cmd_livepatch + $(LD) $(XEN_LDFLAGS) $(build_id_linker) -r -o $@ $(real-prereqs); \ + $(OBJCOPY) --set-section-flags ".livepatch.funcs=alloc,readonly" $@ +endef $(obj)/%.livepatch: FORCE $(call if_changed,livepatch) diff --git a/xen/test/livepatch/xen_action_hooks.c b/xen/test/livepatch/xen_action_hooks.c index fa0b3ab35f..30c2c5de3c 100644 --- a/xen/test/livepatch/xen_action_hooks.c +++ b/xen/test/livepatch/xen_action_hooks.c @@ -84,7 +84,8 @@ LIVEPATCH_REVERT_HOOK(revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_action_hooks_marker.c b/xen/test/livepatch/xen_action_hooks_marker.c index d2e22f70d1..eb31a4abc4 100644 --- a/xen/test/livepatch/xen_action_hooks_marker.c +++ b/xen/test/livepatch/xen_action_hooks_marker.c @@ -96,7 +96,8 @@ LIVEPATCH_POSTAPPLY_HOOK(post_apply_hook); LIVEPATCH_PREREVERT_HOOK(pre_revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_action_hooks_noapply.c b/xen/test/livepatch/xen_action_hooks_noapply.c index 646a5fd2f0..92d10d53ff 100644 --- a/xen/test/livepatch/xen_action_hooks_noapply.c +++ b/xen/test/livepatch/xen_action_hooks_noapply.c @@ -120,7 +120,8 @@ LIVEPATCH_POSTAPPLY_HOOK(post_apply_hook); LIVEPATCH_PREREVERT_HOOK(pre_revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_action_hooks_norevert.c b/xen/test/livepatch/xen_action_hooks_norevert.c index c5fbab1746..fc2d33b531 100644 --- a/xen/test/livepatch/xen_action_hooks_norevert.c +++ b/xen/test/livepatch/xen_action_hooks_norevert.c @@ -115,7 +115,8 @@ LIVEPATCH_POSTAPPLY_HOOK(post_apply_hook); LIVEPATCH_PREREVERT_HOOK(pre_revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_bye_world.c b/xen/test/livepatch/xen_bye_world.c index 2700f0eedd..86589205d8 100644 --- a/xen/test/livepatch/xen_bye_world.c +++ b/xen/test/livepatch/xen_bye_world.c @@ -14,7 +14,8 @@ static const char bye_world_patch_this_fnc[] = "xen_extra_version"; extern const char *xen_bye_world(void); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_bye_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_bye_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = bye_world_patch_this_fnc, .new_addr = xen_bye_world, diff --git a/xen/test/livepatch/xen_expectations.c b/xen/test/livepatch/xen_expectations.c index c8175a458b..06c752c818 100644 --- a/xen/test/livepatch/xen_expectations.c +++ b/xen/test/livepatch/xen_expectations.c @@ -15,7 +15,8 @@ static const char livepatch_exceptions_str[] = "xen_extra_version"; extern const char *xen_hello_world(void); -struct livepatch_func __section(".livepatch.funcs") livepatch_exceptions = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_exceptions = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = livepatch_exceptions_str, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_expectations_fail.c b/xen/test/livepatch/xen_expectations_fail.c index 36a110286f..f42c19a953 100644 --- a/xen/test/livepatch/xen_expectations_fail.c +++ b/xen/test/livepatch/xen_expectations_fail.c @@ -16,7 +16,8 @@ extern const char *xen_hello_world(void); #define EXPECT_BYTES_COUNT 6 -struct livepatch_func __section(".livepatch.funcs") livepatch_exceptions = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_exceptions = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = livepatch_exceptions_str, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_hello_world.c b/xen/test/livepatch/xen_hello_world.c index 02f3f85dc0..08ab2f197e 100644 --- a/xen/test/livepatch/xen_hello_world.c +++ b/xen/test/livepatch/xen_hello_world.c @@ -47,7 +47,8 @@ LIVEPATCH_UNLOAD_HOOK(hi_func); LIVEPATCH_UNLOAD_HOOK(check_fnc); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_nop.c b/xen/test/livepatch/xen_nop.c index a224b7c670..6dea657365 100644 --- a/xen/test/livepatch/xen_nop.c +++ b/xen/test/livepatch/xen_nop.c @@ -14,7 +14,7 @@ * running this test-case you MUST verify that the assumptions are * correct (Hint: make debug and look in xen.s). */ -struct livepatch_func __section(".livepatch.funcs") livepatch_nop = { +const struct livepatch_func __section(".livepatch.funcs") livepatch_nop = { .version = LIVEPATCH_PAYLOAD_VERSION, .old_size = MINOR_VERSION_SZ, diff --git a/xen/test/livepatch/xen_prepost_hooks.c b/xen/test/livepatch/xen_prepost_hooks.c index 17f5af6a19..00b0b3abb0 100644 --- a/xen/test/livepatch/xen_prepost_hooks.c +++ b/xen/test/livepatch/xen_prepost_hooks.c @@ -102,7 +102,8 @@ LIVEPATCH_POSTAPPLY_HOOK(post_apply_hook); LIVEPATCH_PREREVERT_HOOK(pre_revert_hook); LIVEPATCH_POSTREVERT_HOOK(post_revert_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_prepost_hooks_fail.c b/xen/test/livepatch/xen_prepost_hooks_fail.c index 52fd7f642e..8497715646 100644 --- a/xen/test/livepatch/xen_prepost_hooks_fail.c +++ b/xen/test/livepatch/xen_prepost_hooks_fail.c @@ -55,7 +55,8 @@ LIVEPATCH_POSTAPPLY_HOOK(unreachable_post_hook); LIVEPATCH_PREREVERT_HOOK(unreachable_pre_hook); LIVEPATCH_POSTREVERT_HOOK(unreachable_post_hook); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_hello_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = hello_world_patch_this_fnc, .new_addr = xen_hello_world, diff --git a/xen/test/livepatch/xen_replace_world.c b/xen/test/livepatch/xen_replace_world.c index 78a8f528b3..272cc55e82 100644 --- a/xen/test/livepatch/xen_replace_world.c +++ b/xen/test/livepatch/xen_replace_world.c @@ -13,7 +13,8 @@ static const char xen_replace_world_name[] = "xen_extra_version"; extern const char *xen_replace_world(void); -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_replace_world = { +const struct livepatch_func __section(".livepatch.funcs") +livepatch_xen_replace_world = { .version = LIVEPATCH_PAYLOAD_VERSION, .name = xen_replace_world_name, .old_addr = 0, /* Forces the hypervisor to lookup .name */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729719.1134916 (Exim 4.92) (envelope-from ) id 1sAb0T-0004Z2-HE; Fri, 24 May 2024 19:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729719.1134916; Fri, 24 May 2024 19: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 1sAb0T-0004Yu-EV; Fri, 24 May 2024 19:55:13 +0000 Received: by outflank-mailman (input) for mailman id 729719; Fri, 24 May 2024 19:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0R-0004Ya-Rn for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0R-0000rN-Qx for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb0R-0001lq-Ok for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=h/Y4DD4cPnuRjsI1FqKU7vH/dMQY7x7kQx3KCz8oml0=; b=FQSgqRgAz5N/AKrtgm0Rk8r/Sa 4D3AcbUZQgOywY6najOXj15mmTi8XVp2ZandoweP+5lRiNDC08DX6MWJxiMnE6Y+GWGPfWLNX6XdD R4e9gfDGmAJhXrpeBvctnKeLmbPfFTAajXKmNa7xsyJyiB7O+7wKroHmfgkDzbMnGEHA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/x86: print RMRR/IVMD ranges using full addresses Message-Id: Date: Fri, 24 May 2024 19:55:11 +0000 commit 212cb5effa6bccf6f8c4f17964c036abb6ad5809 Author: Roger Pau Monné AuthorDate: Thu May 23 10:03:33 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:03:33 2024 +0200 iommu/x86: print RMRR/IVMD ranges using full addresses It's easier to correlate with the physical memory map if the addresses are fully printed, instead of using frame numbers. Requested-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/passthrough/x86/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index a3fa0aef7c..304a2f5480 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -801,8 +801,8 @@ bool __init iommu_unity_region_ok(const char *prefix, mfn_t start, mfn_t end) return true; printk(XENLOG_WARNING - "%s: [%#" PRI_mfn " ,%#" PRI_mfn "] is not (entirely) in reserved memory\n", - prefix, mfn_x(start), mfn_x(end)); + "%s: [%#lx, %#lx] is not (entirely) in reserved memory\n", + prefix, mfn_to_maddr(start), mfn_to_maddr(end)); for ( addr = start; mfn_x(addr) <= mfn_x(end); addr = mfn_add(addr, 1) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:55:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729720.1134920 (Exim 4.92) (envelope-from ) id 1sAb0d-0004c8-Ii; Fri, 24 May 2024 19:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729720.1134920; Fri, 24 May 2024 19: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 1sAb0d-0004c0-Fx; Fri, 24 May 2024 19:55:23 +0000 Received: by outflank-mailman (input) for mailman id 729720; Fri, 24 May 2024 19:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0b-0004bj-W3 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0b-0000rz-VB for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb0b-0001mJ-TP for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VBqdl279z5vvqB/77dlICdqZnkinHvGtKHtpsa3nBfU=; b=o674H3dwLpKDOIofa2UY1XpdUx xZnTOh9zQA18H0R+DncRvOgA1NXx6sv3WqvWpN0Kzi0dfH71b7HU2HIblRgbSqupJSX8K6SwzxLQF h23jay/ninitYDyZsEsLy6GreI0RBNI2mW5HwHpsCzo9zLhLIYo1uNmRA/SW4ZIYcCuc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Simplify header dependencies in x86/hvm Message-Id: Date: Fri, 24 May 2024 19:55:21 +0000 commit 9f482c6a7ef6908aacc3df440f292c164b77058f Author: Alejandro Vallejo AuthorDate: Thu May 23 10:07:31 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:07:31 2024 +0200 xen/x86: Simplify header dependencies in x86/hvm Otherwise it's not possible to call functions described in hvm/vlapic.h from the inline functions of hvm/hvm.h. This is because a static inline in vlapic.h depends on hvm.h, and pulls it transitively through vpt.h. The ultimate cause is having hvm.h included in any of the "v*.h" headers, so break the cycle moving the guilty inline into hvm.h. No functional change. Signed-off-by: Alejandro Vallejo Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/irq.c | 6 +++--- xen/arch/x86/hvm/vlapic.c | 4 ++-- xen/arch/x86/include/asm/hvm/hvm.h | 6 ++++++ xen/arch/x86/include/asm/hvm/vlapic.h | 6 ------ xen/arch/x86/include/asm/hvm/vpt.h | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 4a9fe82cbd..210cebb0e6 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -512,13 +512,13 @@ struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v) int vector; /* - * Always call vlapic_sync_pir_to_irr so that PIR is synced into IRR when - * using posted interrupts. Note this is also done by + * Always call hvm_sync_pir_to_irr() so that PIR is synced into IRR + * when using posted interrupts. Note this is also done by * vlapic_has_pending_irq but depending on which interrupts are pending * hvm_vcpu_has_pending_irq will return early without calling * vlapic_has_pending_irq. */ - vlapic_sync_pir_to_irr(v); + hvm_sync_pir_to_irr(v); if ( unlikely(v->arch.nmi_pending) ) return hvm_intack_nmi; diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 6a11f4d94d..9cfc82666a 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -97,7 +97,7 @@ static void vlapic_clear_irr(int vector, struct vlapic *vlapic) static int vlapic_find_highest_irr(struct vlapic *vlapic) { - vlapic_sync_pir_to_irr(vlapic_vcpu(vlapic)); + hvm_sync_pir_to_irr(vlapic_vcpu(vlapic)); return vlapic_find_highest_vector(&vlapic->regs->data[APIC_IRR]); } @@ -1506,7 +1506,7 @@ static int cf_check lapic_save_regs(struct vcpu *v, hvm_domain_context_t *h) if ( !has_vlapic(v->domain) ) return 0; - vlapic_sync_pir_to_irr(v); + hvm_sync_pir_to_irr(v); return hvm_save_entry(LAPIC_REGS, v->vcpu_id, h, vcpu_vlapic(v)->regs); } diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index 0c9e6f1564..1c01e22c8e 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -797,6 +797,12 @@ static inline void hvm_update_vlapic_mode(struct vcpu *v) alternative_vcall(hvm_funcs.update_vlapic_mode, v); } +static inline void hvm_sync_pir_to_irr(struct vcpu *v) +{ + if ( hvm_funcs.sync_pir_to_irr ) + alternative_vcall(hvm_funcs.sync_pir_to_irr, v); +} + #else /* CONFIG_HVM */ #define hvm_enabled false diff --git a/xen/arch/x86/include/asm/hvm/vlapic.h b/xen/arch/x86/include/asm/hvm/vlapic.h index 88ef945243..2c4ff94ae7 100644 --- a/xen/arch/x86/include/asm/hvm/vlapic.h +++ b/xen/arch/x86/include/asm/hvm/vlapic.h @@ -137,10 +137,4 @@ bool vlapic_match_dest( const struct vlapic *target, const struct vlapic *source, int short_hand, uint32_t dest, bool dest_mode); -static inline void vlapic_sync_pir_to_irr(struct vcpu *v) -{ - if ( hvm_funcs.sync_pir_to_irr ) - alternative_vcall(hvm_funcs.sync_pir_to_irr, v); -} - #endif /* __ASM_X86_HVM_VLAPIC_H__ */ diff --git a/xen/arch/x86/include/asm/hvm/vpt.h b/xen/arch/x86/include/asm/hvm/vpt.h index feb0bf43f1..0b92b28625 100644 --- a/xen/arch/x86/include/asm/hvm/vpt.h +++ b/xen/arch/x86/include/asm/hvm/vpt.h @@ -11,7 +11,6 @@ #include #include #include -#include /* * Abstract layer of periodic time, one short time. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:55:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729721.1134924 (Exim 4.92) (envelope-from ) id 1sAb0n-0004fY-K5; Fri, 24 May 2024 19:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729721.1134924; Fri, 24 May 2024 19: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 1sAb0n-0004fQ-HW; Fri, 24 May 2024 19:55:33 +0000 Received: by outflank-mailman (input) for mailman id 729721; Fri, 24 May 2024 19:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0m-0004fB-2s for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0m-0000sY-20 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb0m-0001mm-18 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19: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=lkarrAt1Tu+UbiXwQDu3sTeTHisR1Xmt3bAo5b933YQ=; b=DsU1Z96sSJfuWPs4SjsaopSFno UA1kL1jUNXh95px0DrLmpFTpb51xDEvADRSFS4VZFT+Atl16fO8ZhUKyb929gPmOxjlND6q+bds4p 4clzycWptvxVFTIBEVTG3I1vg583C4xEtEdnvlaXUmJ1ZIT1uCUBT9gIkjkfFWxMe8qE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce cmpxchg.h Message-Id: Date: Fri, 24 May 2024 19:55:32 +0000 commit 51dabd6312ce42e557bcba10710577306808a13e Author: Oleksii Kurochko AuthorDate: Fri May 17 15:54:54 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:10:19 2024 +0200 xen/riscv: introduce cmpxchg.h The header was taken from Linux kernl 6.4.0-rc1. Addionally, were updated: * add emulation of {cmp}xchg for 1/2 byte types using 32-bit atomic access. * replace tabs with spaces * replace __* variale with *__ * introduce generic version of xchg_* and cmpxchg_*. * drop {cmp}xchg{release,relaxed,acquire} as Xen doesn't use them * drop barries and use instruction suffixices instead ( .aq, .rl, .aqrl ) Implementation of 4- and 8-byte cases were updated according to the spec: ``` .... Linux Construct RVWMO AMO Mapping ... atomic amo.{w|d}.aqrl Linux Construct RVWMO LR/SC Mapping ... atomic loop: lr.{w|d}.aq; ; sc.{w|d}.aqrl; bnez loop Table A.5: Mappings from Linux memory primitives to RISC-V primitives ``` The current implementation is the same with 8e86f0b409a4 ("arm64: atomics: fix use of acquire + release for full barrier semantics") [1]. RISC-V could combine acquire and release into the SC instructions and it could reduce a fence instruction to gain better performance. Here is related description from RISC-V ISA 10.2 Load-Reserved/Store-Conditional Instructions: - .aq: The LR/SC sequence can be given acquire semantics by setting the aq bit on the LR instruction. - .rl: The LR/SC sequence can be given release semantics by setting the rl bit on the SC instruction. - .aqrl: Setting the aq bit on the LR instruction, and setting both the aq and the rl bit on the SC instruction makes the LR/SC sequence sequentially consistent, meaning that it cannot be reordered with earlier or later memory operations from the same hart. Software should not set the rl bit on an LR instruction unless the aq bit is also set, nor should software set the aq bit on an SC instruction unless the rl bit is also set. LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those with both bits clear, but may result in lower performance. Also, I way of transforming ".rl + full barrier" to ".aqrl" was approved by (the author of the RVWMO spec) [2] [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/1391516953-14541-1-git-send-email-will.deacon@arm.com/ [2] https://lore.kernel.org/linux-riscv/41e01514-74ca-84f2-f5cc-2645c444fd8e@nvidia.com/ Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/cmpxchg.h | 241 +++++++++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/config.h | 2 + 2 files changed, 243 insertions(+) diff --git a/xen/arch/riscv/include/asm/cmpxchg.h b/xen/arch/riscv/include/asm/cmpxchg.h new file mode 100644 index 0000000000..d5e678c036 --- /dev/null +++ b/xen/arch/riscv/include/asm/cmpxchg.h @@ -0,0 +1,241 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2014 Regents of the University of California */ + +#ifndef _ASM_RISCV_CMPXCHG_H +#define _ASM_RISCV_CMPXCHG_H + +#include +#include + +#include +#include +#include + +#define _amoswap_generic(ptr, new, ret, sfx) \ + asm volatile ( \ + " amoswap" sfx " %0, %2, %1" \ + : "=r" (ret), "+A" (*(ptr)) \ + : "r" (new) \ + : "memory" ); + +/* + * For LR and SC, the A extension requires that the address held in rs1 be + * naturally aligned to the size of the operand (i.e., eight-byte aligned + * for 64-bit words and four-byte aligned for 32-bit words). + * If the address is not naturally aligned, an address-misaligned exception + * or an access-fault exception will be generated. + * + * Thereby: + * - for 1-byte xchg access the containing word by clearing low two bits. + * - for 2-byte xchg access the containing word by clearing bit 1. + * + * If resulting 4-byte access is still misalgined, it will fault just as + * non-emulated 4-byte access would. + */ +#define emulate_xchg_1_2(ptr, new, lr_sfx, sc_sfx) \ +({ \ + uint32_t *aligned_ptr; \ + unsigned long alignment_mask = sizeof(*aligned_ptr) - sizeof(*(ptr)); \ + unsigned int new_val_bit = \ + ((unsigned long)(ptr) & alignment_mask) * BITS_PER_BYTE; \ + unsigned long mask = \ + GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0) << new_val_bit; \ + unsigned int new_ = (new) << new_val_bit; \ + unsigned int old; \ + unsigned int scratch; \ + \ + aligned_ptr = (uint32_t *)((unsigned long)(ptr) & ~alignment_mask); \ + \ + asm volatile ( \ + "0: lr.w" lr_sfx " %[old], %[ptr_]\n" \ + " andn %[scratch], %[old], %[mask]\n" \ + " or %[scratch], %[scratch], %z[new_]\n" \ + " sc.w" sc_sfx " %[scratch], %[scratch], %[ptr_]\n" \ + " bnez %[scratch], 0b\n" \ + : [old] "=&r" (old), [scratch] "=&r" (scratch), \ + [ptr_] "+A" (*aligned_ptr) \ + : [new_] "rJ" (new_), [mask] "r" (mask) \ + : "memory" ); \ + \ + (__typeof__(*(ptr)))((old & mask) >> new_val_bit); \ +}) + +/* + * This function doesn't exist, so you'll get a linker error + * if something tries to do an invalid xchg(). + */ +extern unsigned long __bad_xchg(volatile void *ptr, unsigned int size); + +static always_inline unsigned long __xchg(volatile void *ptr, + unsigned long new, + unsigned int size) +{ + unsigned long ret; + + switch ( size ) + { + case 1: + ret = emulate_xchg_1_2((volatile uint8_t *)ptr, new, ".aq", ".aqrl"); + break; + case 2: + ret = emulate_xchg_1_2((volatile uint16_t *)ptr, new, ".aq", ".aqrl"); + break; + case 4: + _amoswap_generic((volatile uint32_t *)ptr, new, ret, ".w.aqrl"); + break; +#ifndef CONFIG_RISCV_32 + case 8: + _amoswap_generic((volatile uint64_t *)ptr, new, ret, ".d.aqrl"); + break; +#endif + default: + return __bad_xchg(ptr, size); + } + + return ret; +} + +#define xchg(ptr, x) \ +({ \ + __typeof__(*(ptr)) n_ = (x); \ + (__typeof__(*(ptr))) \ + __xchg(ptr, (unsigned long)n_, sizeof(*(ptr))); \ +}) + +#define _generic_cmpxchg(ptr, old, new, lr_sfx, sc_sfx) \ + ({ \ + unsigned int rc; \ + unsigned long ret; \ + unsigned long mask = GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0); \ + asm volatile ( \ + "0: lr" lr_sfx " %[ret], %[ptr_]\n" \ + " and %[ret], %[ret], %[mask]\n" \ + " bne %[ret], %z[old_], 1f\n" \ + " sc" sc_sfx " %[rc], %z[new_], %[ptr_]\n" \ + " bnez %[rc], 0b\n" \ + "1:\n" \ + : [ret] "=&r" (ret), [rc] "=&r" (rc), [ptr_] "+A" (*ptr) \ + : [old_] "rJ" (old), [new_] "rJ" (new), [mask] "r" (mask) \ + : "memory" ); \ + ret; \ + }) + +/* + * For LR and SC, the A extension requires that the address held in rs1 be + * naturally aligned to the size of the operand (i.e., eight-byte aligned + * for 64-bit words and four-byte aligned for 32-bit words). + * If the address is not naturally aligned, an address-misaligned exception + * or an access-fault exception will be generated. + * + * Thereby: + * - for 1-byte xchg access the containing word by clearing low two bits + * - for 2-byte xchg ccess the containing word by clearing first bit. + * + * If resulting 4-byte access is still misalgined, it will fault just as + * non-emulated 4-byte access would. + * + * old_val was casted to unsigned long for cmpxchgptr() + */ +#define emulate_cmpxchg_1_2(ptr, old, new, lr_sfx, sc_sfx) \ +({ \ + uint32_t *aligned_ptr; \ + unsigned long alignment_mask = sizeof(*aligned_ptr) - sizeof(*(ptr)); \ + uint8_t new_val_bit = \ + ((unsigned long)(ptr) & alignment_mask) * BITS_PER_BYTE; \ + unsigned long mask = \ + GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0) << new_val_bit; \ + unsigned int old_ = (old) << new_val_bit; \ + unsigned int new_ = (new) << new_val_bit; \ + unsigned int old_val; \ + unsigned int scratch; \ + \ + aligned_ptr = (uint32_t *)((unsigned long)ptr & ~alignment_mask); \ + \ + asm volatile ( \ + "0: lr.w" lr_sfx " %[scratch], %[ptr_]\n" \ + " and %[old_val], %[scratch], %[mask]\n" \ + " bne %[old_val], %z[old_], 1f\n" \ + /* the following line is an equivalent to: \ + * scratch = old_val & ~mask; \ + * And to elimanate one ( likely register ) input it was decided \ + * to use: \ + * scratch = old_val ^ scratch \ + */ \ + " xor %[scratch], %[old_val], %[scratch]\n" \ + " or %[scratch], %[scratch], %z[new_]\n" \ + " sc.w" sc_sfx " %[scratch], %[scratch], %[ptr_]\n" \ + " bnez %[scratch], 0b\n" \ + "1:\n" \ + : [old_val] "=&r" (old_val), [scratch] "=&r" (scratch), \ + [ptr_] "+A" (*aligned_ptr) \ + : [old_] "rJ" (old_), [new_] "rJ" (new_), \ + [mask] "r" (mask) \ + : "memory" ); \ + \ + (__typeof__(*(ptr)))((unsigned long)old_val >> new_val_bit); \ +}) + +/* + * This function doesn't exist, so you'll get a linker error + * if something tries to do an invalid cmpxchg(). + */ +extern unsigned long __bad_cmpxchg(volatile void *ptr, unsigned int size); + +/* + * Atomic compare and exchange. Compare OLD with MEM, if identical, + * store NEW in MEM. Return the initial value in MEM. Success is + * indicated by comparing RETURN with OLD. + */ +static always_inline unsigned long __cmpxchg(volatile void *ptr, + unsigned long old, + unsigned long new, + unsigned int size) +{ + unsigned long ret; + + switch ( size ) + { + case 1: + ret = emulate_cmpxchg_1_2((volatile uint8_t *)ptr, old, new, + ".aq", ".aqrl"); + break; + case 2: + ret = emulate_cmpxchg_1_2((volatile uint16_t *)ptr, old, new, + ".aq", ".aqrl"); + break; + case 4: + ret = _generic_cmpxchg((volatile uint32_t *)ptr, old, new, + ".w.aq", ".w.aqrl"); + break; +#ifndef CONFIG_32BIT + case 8: + ret = _generic_cmpxchg((volatile uint64_t *)ptr, old, new, + ".d.aq", ".d.aqrl"); + break; +#endif + default: + return __bad_cmpxchg(ptr, size); + } + + return ret; +} + +#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))); \ +}) + +#endif /* _ASM_RISCV_CMPXCHG_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/riscv/include/asm/config.h b/xen/arch/riscv/include/asm/config.h index c5f93e6a01..50583aafdc 100644 --- a/xen/arch/riscv/include/asm/config.h +++ b/xen/arch/riscv/include/asm/config.h @@ -119,6 +119,8 @@ #define BITS_PER_LLONG 64 +#define BITS_PER_BYTE 8 + /* xen_ulong_t is always 64 bits */ #define BITS_PER_XEN_ULONG 64 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:55:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729722.1134927 (Exim 4.92) (envelope-from ) id 1sAb0x-0004iK-Li; Fri, 24 May 2024 19:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729722.1134927; Fri, 24 May 2024 19:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0x-0004iD-J5; Fri, 24 May 2024 19:55:43 +0000 Received: by outflank-mailman (input) for mailman id 729722; Fri, 24 May 2024 19:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0w-0004hw-5t for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb0w-0000tP-54 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb0w-0001nD-4J for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19: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=I4pz0/vU21FBO2d2cVBaM7BDri+kkhi5B6UuD1Hd9+I=; b=g7gqy0R6lx6+3cC1QQM76Q8l3L e8UOUjtGRe+ZP/cLFBDJiKP9U8oKCeZZr95Gou07+uSoBupDbB/k7csalSyvPlgdTGijapmaCBSkq kK2kfHuu5UUiL99c+YQFY8ervnFceM99bf48bqUpz/bjlLu/xnJkPb13fO83lifHsbJg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce atomic.h Message-Id: Date: Fri, 24 May 2024 19:55:42 +0000 commit 3cd46d4ec8b9fa6b05c823e1f48cb6dc6a837e78 Author: Oleksii Kurochko AuthorDate: Fri May 17 15:54:55 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:12:12 2024 +0200 xen/riscv: introduce atomic.h Initially the patch was introduced by Bobby, who takes the header from Linux kernel. The following changes were done on top of Bobby's changes: - atomic##prefix##_*xchg_*(atomic##prefix##_t *v, c_t n) were updated to use__*xchg_generic() - drop casts in write_atomic() as they are unnecessary - drop introduction of WRITE_ONCE() and READ_ONCE(). Xen provides ACCESS_ONCE() - remove zero-length array access in read_atomic() - drop defines similar to pattern: #define atomic_add_return_relaxed atomic_add_return_relaxed - move not RISC-V specific functions to asm-generic/atomics-ops.h - drop atomic##prefix##_{cmp}xchg_{release, aquire, release}() as they are not used in Xen. - update the defintion of atomic##prefix##_{cmp}xchg according to {cmp}xchg() implementation in Xen. - some ATOMIC_OP() macros were updated: - drop size argument for ATOMIC_OP which defines atomic##prefix##_xchg() and atomic##prefix##_cmpxchg(). - drop c_op argument for ATOMIC_OPS which defines ATOMIC_OPS(and, and), ATOMIC_OPS( or, or), ATOMIC_OPS(xor, xor), ATOMIC_OPS(add, add, +), ATOMIC_OPS(sub, add, -) as c_op is always "+" for them. - drop "" from definition of __atomic_{acquire/release"}_fence. The current implementation is the same with 8e86f0b409a4 ("arm64: atomics: fix use of acquire + release for full barrier semantics") [1]. RISC-V could combine acquire and release into the SC instructions and it could reduce a fence instruction to gain better performance. Here is related description from RISC-V ISA 10.2 Load-Reserved/Store-Conditional Instructions: - .aq: The LR/SC sequence can be given acquire semantics by setting the aq bit on the LR instruction. - .rl: The LR/SC sequence can be given release semantics by setting the rl bit on the SC instruction. - .aqrl: Setting the aq bit on the LR instruction, and setting both the aq and the rl bit on the SC instruction makes the LR/SC sequence sequentially consistent, meaning that it cannot be reordered with earlier or later memory operations from the same hart. Software should not set the rl bit on an LR instruction unless the aq bit is also set, nor should software set the aq bit on an SC instruction unless the rl bit is also set. LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those with both bits clear, but may result in lower performance. Also, I way of transforming ".rl + full barrier" to ".aqrl" was approved by (the author of the RVWMO spec) [2] [1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/1391516953-14541-1-git-send-email-will.deacon@arm.com/ [2] https://lore.kernel.org/linux-riscv/41e01514-74ca-84f2-f5cc-2645c444fd8e@nvidia.com/ Signed-off-by: Bobby Eshleman Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/atomic.h | 280 +++++++++++++++++++++++++++++++++++ xen/include/asm-generic/atomic-ops.h | 97 ++++++++++++ 2 files changed, 377 insertions(+) diff --git a/xen/arch/riscv/include/asm/atomic.h b/xen/arch/riscv/include/asm/atomic.h new file mode 100644 index 0000000000..31b91a79c8 --- /dev/null +++ b/xen/arch/riscv/include/asm/atomic.h @@ -0,0 +1,280 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Taken and modified from Linux. + * + * The following changes were done: + * - * atomic##prefix##_*xchg_*(atomic##prefix##_t *v, c_t n) were updated + * to use__*xchg_generic() + * - drop casts in write_atomic() as they are unnecessary + * - drop introduction of WRITE_ONCE() and READ_ONCE(). + * Xen provides ACCESS_ONCE() + * - remove zero-length array access in read_atomic() + * - drop defines similar to pattern + * #define atomic_add_return_relaxed atomic_add_return_relaxed + * - move not RISC-V specific functions to asm-generic/atomics-ops.h + * + * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. + * Copyright (C) 2012 Regents of the University of California + * Copyright (C) 2017 SiFive + * Copyright (C) 2024 Vates SAS + */ + +#ifndef _ASM_RISCV_ATOMIC_H +#define _ASM_RISCV_ATOMIC_H + +#include + +#include +#include +#include +#include + +void __bad_atomic_size(void); + +/* + * Legacy from Linux kernel. For some reason they wanted to have ordered + * read/write access. Thereby read* is used instead of read*_cpu() + */ +static always_inline void read_atomic_size(const volatile void *p, + void *res, + unsigned int size) +{ + switch ( size ) + { + case 1: *(uint8_t *)res = readb(p); break; + case 2: *(uint16_t *)res = readw(p); break; + case 4: *(uint32_t *)res = readl(p); break; +#ifndef CONFIG_RISCV_32 + case 8: *(uint32_t *)res = readq(p); break; +#endif + 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; \ +}) + +static always_inline void _write_atomic(volatile void *p, + unsigned long x, unsigned int size) +{ + switch ( size ) + { + case 1: writeb(x, p); break; + case 2: writew(x, p); break; + case 4: writel(x, p); break; +#ifndef CONFIG_RISCV_32 + case 8: writeq(x, p); break; +#endif + default: __bad_atomic_size(); break; + } +} + +#define write_atomic(p, x) \ +({ \ + typeof(*(p)) x_ = (x); \ + _write_atomic(p, x_, sizeof(*(p))); \ +}) + +static always_inline void _add_sized(volatile void *p, + unsigned long x, unsigned int size) +{ + switch ( size ) + { + case 1: + { + volatile uint8_t *ptr = p; + write_atomic(ptr, read_atomic(ptr) + x); + break; + } + case 2: + { + volatile uint16_t *ptr = p; + write_atomic(ptr, read_atomic(ptr) + x); + break; + } + case 4: + { + volatile uint32_t *ptr = p; + write_atomic(ptr, read_atomic(ptr) + x); + break; + } +#ifndef CONFIG_RISCV_32 + case 8: + { + volatile uint64_t *ptr = p; + write_atomic(ptr, read_atomic(ptr) + x); + break; + } +#endif + default: __bad_atomic_size(); break; + } +} + +#define add_sized(p, x) \ +({ \ + typeof(*(p)) x_ = (x); \ + _add_sized(p, x_, sizeof(*(p))); \ +}) + +#define __atomic_acquire_fence() \ + asm volatile ( RISCV_ACQUIRE_BARRIER ::: "memory" ) + +#define __atomic_release_fence() \ + asm volatile ( RISCV_RELEASE_BARRIER ::: "memory" ) + +/* + * First, the atomic ops that have no ordering constraints and therefor don't + * have the AQ or RL bits set. These don't return anything, so there's only + * one version to worry about. + */ +#define ATOMIC_OP(op, asm_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +void atomic##prefix##_##op(c_type i, atomic##prefix##_t *v) \ +{ \ + asm volatile ( \ + " amo" #asm_op "." #asm_type " zero, %1, %0" \ + : "+A" (v->counter) \ + : "r" (unary_op i) \ + : "memory" ); \ +} \ + +/* + * Only CONFIG_GENERIC_ATOMIC64=y was ported to Xen that is the reason why + * last argument for ATOMIC_OP isn't used. + */ +#define ATOMIC_OPS(op, asm_op, unary_op) \ + ATOMIC_OP (op, asm_op, unary_op, w, int, ) + +ATOMIC_OPS(add, add, +) +ATOMIC_OPS(sub, add, -) +ATOMIC_OPS(and, and, +) +ATOMIC_OPS( or, or, +) +ATOMIC_OPS(xor, xor, +) + +#undef ATOMIC_OP +#undef ATOMIC_OPS + +#include + +/* + * Atomic ops that have ordered variant. + * There's two flavors of these: the arithmatic ops have both fetch and return + * versions, while the logical ops only have fetch versions. + */ +#define ATOMIC_FETCH_OP(op, asm_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +c_type atomic##prefix##_fetch_##op(c_type i, atomic##prefix##_t *v) \ +{ \ + register c_type ret; \ + asm volatile ( \ + " amo" #asm_op "." #asm_type ".aqrl %1, %2, %0" \ + : "+A" (v->counter), "=r" (ret) \ + : "r" (unary_op i) \ + : "memory" ); \ + return ret; \ +} + +#define ATOMIC_OP_RETURN(op, asm_op, c_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +c_type atomic##prefix##_##op##_return(c_type i, atomic##prefix##_t *v) \ +{ \ + return atomic##prefix##_fetch_##op(i, v) c_op (unary_op i); \ +} + +/* + * Only CONFIG_GENERIC_ATOMIC64=y was ported to Xen that is the reason why + * last argument of ATOMIC_FETCH_OP, ATOMIC_OP_RETURN isn't used. + */ +#define ATOMIC_OPS(op, asm_op, unary_op) \ + ATOMIC_FETCH_OP( op, asm_op, unary_op, w, int, ) \ + ATOMIC_OP_RETURN(op, asm_op, +, unary_op, w, int, ) + +ATOMIC_OPS(add, add, +) +ATOMIC_OPS(sub, add, -) + +#undef ATOMIC_OPS + +#define ATOMIC_OPS(op, asm_op) \ + ATOMIC_FETCH_OP(op, asm_op, +, w, int, ) + +ATOMIC_OPS(and, and) +ATOMIC_OPS( or, or) +ATOMIC_OPS(xor, xor) + +#undef ATOMIC_OPS + +#undef ATOMIC_FETCH_OP +#undef ATOMIC_OP_RETURN + +/* This is required to provide a full barrier on success. */ +static inline int atomic_add_unless(atomic_t *v, int a, int u) +{ + int prev, rc; + + asm volatile ( + "0: lr.w %[p], %[c]\n" + " beq %[p], %[u], 1f\n" + " add %[rc], %[p], %[a]\n" + " sc.w.aqrl %[rc], %[rc], %[c]\n" + " bnez %[rc], 0b\n" + "1:\n" + : [p] "=&r" (prev), [rc] "=&r" (rc), [c] "+A" (v->counter) + : [a] "r" (a), [u] "r" (u) + : "memory"); + return prev; +} + +static inline int atomic_sub_if_positive(atomic_t *v, int offset) +{ + int prev, rc; + + asm volatile ( + "0: lr.w %[p], %[c]\n" + " sub %[rc], %[p], %[o]\n" + " bltz %[rc], 1f\n" + " sc.w.aqrl %[rc], %[rc], %[c]\n" + " bnez %[rc], 0b\n" + "1:\n" + : [p] "=&r" (prev), [rc] "=&r" (rc), [c] "+A" (v->counter) + : [o] "r" (offset) + : "memory" ); + return prev - offset; +} + +/* + * atomic_{cmp,}xchg is required to have exactly the same ordering semantics as + * {cmp,}xchg and the operations that return. + */ +#define ATOMIC_OP(c_t, prefix) \ +static inline \ +c_t atomic##prefix##_xchg(atomic##prefix##_t *v, c_t n) \ +{ \ + return __xchg(&v->counter, n, sizeof(c_t)); \ +} \ +static inline \ +c_t atomic##prefix##_cmpxchg(atomic##prefix##_t *v, c_t o, c_t n) \ +{ \ + return __cmpxchg(&v->counter, o, n, sizeof(c_t)); \ +} + +#define ATOMIC_OPS() \ + ATOMIC_OP(int, ) + +ATOMIC_OPS() + +#undef ATOMIC_OPS +#undef ATOMIC_OP + +#endif /* _ASM_RISCV_ATOMIC_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-generic/atomic-ops.h b/xen/include/asm-generic/atomic-ops.h new file mode 100644 index 0000000000..98dd907942 --- /dev/null +++ b/xen/include/asm-generic/atomic-ops.h @@ -0,0 +1,97 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * The header provides default implementations for every xen/atomic.h-provided + * forward inline declaration that can be synthesized from other atomic + * functions or being created from scratch. + */ +#ifndef _ASM_GENERIC_ATOMIC_OPS_H_ +#define _ASM_GENERIC_ATOMIC_OPS_H_ + +#include +#include + +#ifndef ATOMIC_READ +static inline int atomic_read(const atomic_t *v) +{ + return ACCESS_ONCE(v->counter); +} +#endif + +#ifndef _ATOMIC_READ +static inline int _atomic_read(atomic_t v) +{ + return v.counter; +} +#endif + +#ifndef ATOMIC_SET +static inline void atomic_set(atomic_t *v, int i) +{ + ACCESS_ONCE(v->counter) = i; +} +#endif + +#ifndef _ATOMIC_SET +static inline void _atomic_set(atomic_t *v, int i) +{ + v->counter = i; +} +#endif + +#ifndef ATOMIC_SUB_AND_TEST +static inline int atomic_sub_and_test(int i, atomic_t *v) +{ + return atomic_sub_return(i, v) == 0; +} +#endif + +#ifndef ATOMIC_INC_AND_TEST +static inline int atomic_inc_and_test(atomic_t *v) +{ + return atomic_add_return(1, v) == 0; +} +#endif + +#ifndef ATOMIC_INC +static inline void atomic_inc(atomic_t *v) +{ + atomic_add(1, v); +} +#endif + +#ifndef ATOMIC_INC_RETURN +static inline int atomic_inc_return(atomic_t *v) +{ + return atomic_add_return(1, v); +} +#endif + +#ifndef ATOMIC_DEC +static inline void atomic_dec(atomic_t *v) +{ + atomic_sub(1, v); +} +#endif + +#ifndef ATOMIC_DEC_RETURN +static inline int atomic_dec_return(atomic_t *v) +{ + return atomic_sub_return(1, v); +} +#endif + +#ifndef ATOMIC_DEC_AND_TEST +static inline int atomic_dec_and_test(atomic_t *v) +{ + return atomic_sub_return(1, v) == 0; +} +#endif + +#ifndef ATOMIC_ADD_NEGATIVE +static inline int atomic_add_negative(int i, atomic_t *v) +{ + return atomic_add_return(i, v) < 0; +} +#endif + +#endif /* _ASM_GENERIC_ATOMIC_OPS_H_ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:55:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729723.1134932 (Exim 4.92) (envelope-from ) id 1sAb17-0004m1-P0; Fri, 24 May 2024 19:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729723.1134932; Fri, 24 May 2024 19:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb17-0004lt-MH; Fri, 24 May 2024 19:55:53 +0000 Received: by outflank-mailman (input) for mailman id 729723; Fri, 24 May 2024 19:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb16-0004lc-Ap for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb16-0000u9-A6 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb16-0001nr-7Q for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19: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=WLZPyWQlMn+S8ZpuK6rpvagM3N35Fnf/1UkSdQ1UN8I=; b=52RBK4G+lAZBtgOagucVThfoSm NAUAG6OAk6/BF+G9E/Az0nGC1eI+mvMkTaQVKrqhSKKnEFhkc2jCeKrCRaWPEymhIFkoWUK6mSo7y MKhlTZq0ZUs5aHWyHf4m+7FO2oXL7RC8IQKz/Egkw+arP1CkWQCEkr9E0ZvwSDCd/JiQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add required things to current.h Message-Id: Date: Fri, 24 May 2024 19:55:52 +0000 commit e6ed98863bc79728e5aa759d51f21c90187e2519 Author: Oleksii Kurochko AuthorDate: Fri May 17 15:54:58 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:12:52 2024 +0200 xen/riscv: add required things to current.h Add minimal requied things to be able to build full Xen. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- xen/arch/riscv/include/asm/current.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/xen/arch/riscv/include/asm/current.h b/xen/arch/riscv/include/asm/current.h index d84f15dc50..aedb6dc732 100644 --- a/xen/arch/riscv/include/asm/current.h +++ b/xen/arch/riscv/include/asm/current.h @@ -3,6 +3,21 @@ #ifndef __ASM_CURRENT_H #define __ASM_CURRENT_H +#include +#include +#include + +#ifndef __ASSEMBLY__ + +/* 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) + +#define guest_cpu_user_regs() ({ BUG_ON("unimplemented"); NULL; }) + #define switch_stack_and_jump(stack, fn) do { \ asm volatile ( \ "mv sp, %0\n" \ @@ -10,4 +25,8 @@ unreachable(); \ } while ( false ) +#define get_per_cpu_offset() __per_cpu_offset[smp_processor_id()] + +#endif /* __ASSEMBLY__ */ + #endif /* __ASM_CURRENT_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:56:03 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729724.1134936 (Exim 4.92) (envelope-from ) id 1sAb1H-0004pO-QO; Fri, 24 May 2024 19:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729724.1134936; Fri, 24 May 2024 19:56:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1H-0004pG-Ni; Fri, 24 May 2024 19:56:03 +0000 Received: by outflank-mailman (input) for mailman id 729724; Fri, 24 May 2024 19:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1G-0004ox-EF for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1G-0000uw-DW for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb1G-0001oy-Ca for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19: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=MBrXq307HOhUSC7i6i6gMQfQ4qcTCree/TfhQ1wlZZg=; b=hDl3tURii2tTJZWXqs8r3sGsFH Y76gh9ltE5/Q5QUZkDupqwopRSwa0SWQ1e6tGEINVXyYIi5kIIQHuqq/KyBdbr5AOZEVpO6nb/MlI QRgtTwCISXcRe+xE/VIsqwFJOYd418NqR30t5kpdV6iLVvQGLbPRoKRI58tNxBUw3yq0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PIT: supply and use #define-s Message-Id: Date: Fri, 24 May 2024 19:56:02 +0000 commit 249affc129f441f6ca0b1f2c382fd4f816c094f7 Author: Jan Beulich AuthorDate: Thu May 23 10:16:07 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:16:07 2024 +0200 x86/PIT: supply and use #define-s Help reading of code programming the PIT by introducing constants for control word, read back and latch commands, as well as status. Requested-by: Jason Andryuk Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/apic.c | 2 +- xen/arch/x86/include/asm/time.h | 34 ++++++++++++++++++++++++++++++++++ xen/arch/x86/time.c | 31 ++++++++++++++++++------------- 3 files changed, 53 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 592b78e11e..6567af685a 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -983,7 +983,7 @@ static unsigned int __init get_8254_timer_count(void) /*spin_lock_irqsave(&i8253_lock, flags);*/ - outb_p(0x00, PIT_MODE); + outb_p(PIT_LTCH_CH(0), PIT_MODE); count = inb_p(PIT_CH0); count |= inb_p(PIT_CH0) << 8; diff --git a/xen/arch/x86/include/asm/time.h b/xen/arch/x86/include/asm/time.h index 0d7989a1fe..3dfbb5297a 100644 --- a/xen/arch/x86/include/asm/time.h +++ b/xen/arch/x86/include/asm/time.h @@ -58,4 +58,38 @@ struct time_scale; void set_time_scale(struct time_scale *ts, u64 ticks_per_sec); u64 scale_delta(u64 delta, const struct time_scale *scale); +/* Programmable Interval Timer (8254) */ + +/* Timer Control Word */ +#define PIT_TCW_CH(n) ((n) << 6) +/* Lower bits also Timer Status. */ +#define PIT_RW_MSB (1 << 5) +#define PIT_RW_LSB (1 << 4) +#define PIT_RW_LSB_MSB (PIT_RW_LSB | PIT_RW_MSB) +#define PIT_MODE_EOC (0 << 1) +#define PIT_MODE_ONESHOT (1 << 1) +#define PIT_MODE_RATE_GEN (2 << 1) +#define PIT_MODE_SQUARE_WAVE (3 << 1) +#define PIT_MODE_SW_STROBE (4 << 1) +#define PIT_MODE_HW_STROBE (5 << 1) +#define PIT_BINARY (0 << 0) +#define PIT_BCD (1 << 0) + +/* Read Back Command */ +#define PIT_RDB PIT_TCW_CH(3) +#define PIT_RDB_NO_COUNT (1 << 5) +#define PIT_RDB_NO_STATUS (1 << 4) +#define PIT_RDB_CH2 (1 << 3) +#define PIT_RDB_CH1 (1 << 2) +#define PIT_RDB_CH0 (1 << 1) +#define PIT_RDB_RSVD (1 << 0) + +/* Counter Latch Command */ +#define PIT_LTCH_CH(n) PIT_TCW_CH(n) + +/* Timer Status */ +#define PIT_STATUS_OUT_PIN (1 << 7) +#define PIT_STATUS_NULL_COUNT (1 << 6) +/* Lower bits match Timer Control Word. */ + #endif /* __X86_TIME_H__ */ diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 9655971269..85ec73bd9a 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -222,7 +222,7 @@ static void cf_check timer_interrupt(int irq, void *dev_id) spin_lock_irq(&pit_lock); - outb(0x80, PIT_MODE); + outb(PIT_LTCH_CH(2), PIT_MODE); count = inb(PIT_CH2); count |= inb(PIT_CH2) << 8; @@ -245,7 +245,8 @@ static void preinit_pit(void) { /* Set PIT channel 0 to HZ Hz. */ #define LATCH (((CLOCK_TICK_RATE)+(HZ/2))/HZ) - outb_p(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ + outb_p(PIT_TCW_CH(0) | PIT_RW_LSB_MSB | PIT_MODE_RATE_GEN | PIT_BINARY, + PIT_MODE); outb_p(LATCH & 0xff, PIT_CH0); /* LSB */ outb(LATCH >> 8, PIT_CH0); /* MSB */ #undef LATCH @@ -356,7 +357,7 @@ static u64 cf_check read_pit_count(void) spin_lock_irqsave(&pit_lock, flags); - outb(0x80, PIT_MODE); + outb(PIT_LTCH_CH(2), PIT_MODE); count16 = inb(PIT_CH2); count16 |= inb(PIT_CH2) << 8; @@ -383,7 +384,8 @@ static s64 __init cf_check init_pit(struct platform_timesource *pts) */ #define CALIBRATE_LATCH CALIBRATE_VALUE(CLOCK_TICK_RATE) BUILD_BUG_ON(CALIBRATE_LATCH >> 16); - outb(0xb0, PIT_MODE); /* binary, mode 0, LSB/MSB, Ch 2 */ + outb(PIT_TCW_CH(2) | PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY, + PIT_MODE); outb(CALIBRATE_LATCH & 0xff, PIT_CH2); /* LSB of count */ outb(CALIBRATE_LATCH >> 8, PIT_CH2); /* MSB of count */ #undef CALIBRATE_LATCH @@ -408,7 +410,8 @@ static s64 __init cf_check init_pit(struct platform_timesource *pts) static void cf_check resume_pit(struct platform_timesource *pts) { /* Set CTC channel 2 to mode 0 again; initial value does not matter. */ - outb(0xb0, PIT_MODE); /* binary, mode 0, LSB/MSB, Ch 2 */ + outb(PIT_TCW_CH(2) | PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY, + PIT_MODE); outb(0, PIT_CH2); /* LSB of count */ outb(0, PIT_CH2); /* MSB of count */ } @@ -2456,7 +2459,8 @@ static int _disable_pit_irq(bool init) } /* Disable PIT CH0 timer interrupt. */ - outb_p(0x30, PIT_MODE); + outb_p(PIT_TCW_CH(0) | PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY, + PIT_MODE); outb_p(0, PIT_CH0); outb_p(0, PIT_CH0); @@ -2562,17 +2566,18 @@ int hwdom_pit_access(struct ioreq *ioreq) case PIT_MODE: if ( ioreq->dir == IOREQ_READ ) return 0; /* urk! */ - switch ( ioreq->data & 0xc0 ) + switch ( ioreq->data & PIT_TCW_CH(3) ) { - case 0xc0: /* Read Back */ - if ( ioreq->data & 0x08 ) /* Select Channel 2? */ - outb(ioreq->data & 0xf8, PIT_MODE); - if ( !(ioreq->data & 0x06) ) /* Select Channel 0/1? */ + case PIT_RDB: /* Read Back */ + if ( ioreq->data & PIT_RDB_CH2 ) + outb(ioreq->data & ~(PIT_RDB_CH1 | PIT_RDB_CH0 | PIT_RDB_RSVD), + PIT_MODE); + if ( !(ioreq->data & (PIT_RDB_CH0 | PIT_RDB_CH1)) ) return 1; /* no - we're done */ /* Filter Channel 2 and reserved bit 0. */ - ioreq->data &= ~0x09; + ioreq->data &= ~(PIT_RDB_CH2 | PIT_RDB_RSVD); return 0; /* emulate ch0/1 readback */ - case 0x80: /* Select Counter 2 */ + case PIT_TCW_CH(2): outb(ioreq->data, PIT_MODE); return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:56:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:56:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729725.1134940 (Exim 4.92) (envelope-from ) id 1sAb1Q-0004s2-Ri; Fri, 24 May 2024 19:56:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729725.1134940; Fri, 24 May 2024 19:56: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 1sAb1Q-0004rv-PH; Fri, 24 May 2024 19:56:12 +0000 Received: by outflank-mailman (input) for mailman id 729725; Fri, 24 May 2024 19:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1Q-0004ro-HY for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1Q-0000vW-Gi for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb1Q-0001pS-Fp for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56: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=mHkX+p6XAOx+pz2skpN75aCSTYnfd9wHjtmGZQlsL7Y=; b=ZuFcY5l4qqCvBCAfiICRaDLRs0 hH9SCOGaGzFC/JgNe3SqeZKNsQFbYahE5iUVwrumzH8XIP5ILGub65KL4+TFZngxtGm4cTUZU9X/v AG6YhGs1QxxU3vplXwE4xGTc9Ha8xDScfxBW1xCavh+BXI46H//5UTwx3yn54K8HK4KA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: detect PIT aliasing on ports other than 0x4[0-3] Message-Id: Date: Fri, 24 May 2024 19:56:12 +0000 commit 2c15fa332efaeb79e602f6ef22672f790b8bebf2 Author: Jan Beulich AuthorDate: Thu May 23 10:16:52 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:16:52 2024 +0200 x86: detect PIT aliasing on ports other than 0x4[0-3] ... in order to also deny Dom0 access through the alias ports (commonly observed on Intel chipsets). Without this it is only giving the impression of denying access to PIT. Unlike for CMOS/RTC, do detection pretty early, to avoid disturbing normal operation later on (even if typically we won't use much of the PIT). Like for CMOS/RTC a fundamental assumption of the probing is that reads from the probed alias port won't have side effects (beyond such that PIT reads have anyway) in case it does not alias the PIT's. As to the port 0x61 accesses: Unlike other accesses we do, this masks off the top four bits (in addition to the bottom two ones), following Intel chipset documentation saying that these (read-only) bits should only be written with zero. Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/dom0_build.c | 7 +++- xen/arch/x86/include/asm/setup.h | 1 + xen/arch/x86/time.c | 70 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 4288957b2b..8d56705a08 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -20,6 +20,7 @@ #include #include #include +#include struct memsize { long nr_pages; @@ -495,7 +496,11 @@ int __init dom0_setup_permissions(struct domain *d) rc |= ioports_deny_access(d, 0x4D0, 0x4D1); /* Interval Timer (PIT). */ - rc |= ioports_deny_access(d, 0x40, 0x43); + for ( offs = 0, i = ISOLATE_LSB(pit_alias_mask) ?: 4; + offs <= pit_alias_mask; offs += i ) + if ( !(offs & ~pit_alias_mask) ) + rc |= ioports_deny_access(d, PIT_CH0 + offs, PIT_MODE + offs); + /* PIT Channel 2 / PC Speaker Control. */ rc |= ioports_deny_access(d, 0x61, 0x61); diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index 471aed92c2..d75589178b 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -49,6 +49,7 @@ extern unsigned long highmem_start; #endif extern unsigned int i8259A_alias_mask; +extern unsigned int pit_alias_mask; extern int8_t opt_smt; extern int8_t opt_probe_port_aliases; diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 85ec73bd9a..a97d784841 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -427,6 +427,74 @@ static struct platform_timesource __initdata_cf_clobber plt_pit = .resume = resume_pit, }; +unsigned int __initdata pit_alias_mask; + +static void __init probe_pit_alias(void) +{ + unsigned int mask = 0x1c; + uint8_t val = 0; + + if ( !opt_probe_port_aliases ) + return; + + /* + * Use channel 2 in mode 0 for probing. In this mode even a non-initial + * count is loaded independent of counting being / becoming enabled. Thus + * we have a 16-bit value fully under our control, to write and then check + * whether we can also read it back unaltered. + */ + + /* Turn off speaker output and disable channel 2 counting. */ + outb(inb(0x61) & 0x0c, 0x61); + + outb(PIT_TCW_CH(2) | PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY, + PIT_MODE); + + do { + uint8_t val2; + unsigned int offs; + + outb(val, PIT_CH2); + outb(val ^ 0xff, PIT_CH2); + + /* Wait for the Null Count bit to clear. */ + do { + /* Latch status. */ + outb(PIT_RDB | PIT_RDB_NO_COUNT | PIT_RDB_CH2, PIT_MODE); + + /* Try to make sure we're actually having a PIT here. */ + val2 = inb(PIT_CH2); + if ( (val2 & ~(PIT_STATUS_OUT_PIN | PIT_STATUS_NULL_COUNT)) != + (PIT_RW_LSB_MSB | PIT_MODE_EOC | PIT_BINARY) ) + return; + } while ( val2 & PIT_STATUS_NULL_COUNT ); + + /* + * Try to further make sure we're actually having a PIT here. + * + * NB: Deliberately |, not ||, as we always want both reads. + */ + val2 = inb(PIT_CH2); + if ( (val2 ^ val) | (inb(PIT_CH2) ^ val ^ 0xff) ) + return; + + for ( offs = ISOLATE_LSB(mask); offs <= mask; offs <<= 1 ) + { + if ( !(mask & offs) ) + continue; + val2 = inb(PIT_CH2 + offs); + if ( (val2 ^ val) | (inb(PIT_CH2 + offs) ^ val ^ 0xff) ) + mask &= ~offs; + } + } while ( mask && (val += 0x0b) ); /* Arbitrary uneven number. */ + + if ( mask ) + { + dprintk(XENLOG_INFO, "PIT aliasing mask: %02x\n", mask); + pit_alias_mask = mask; + } +} + /************************************************************ * PLATFORM TIMER 2: HIGH PRECISION EVENT TIMER (HPET) */ @@ -2416,6 +2484,8 @@ void __init early_time_init(void) } preinit_pit(); + probe_pit_alias(); + tmp = init_platform_timer(); plt_tsc.frequency = tmp; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:56:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729726.1134944 (Exim 4.92) (envelope-from ) id 1sAb1b-0004vP-TK; Fri, 24 May 2024 19:56:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729726.1134944; Fri, 24 May 2024 19:56: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 1sAb1b-0004vH-Qn; Fri, 24 May 2024 19:56:23 +0000 Received: by outflank-mailman (input) for mailman id 729726; Fri, 24 May 2024 19:56:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1a-0004ux-Kp for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1a-0000xl-Jf for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb1a-0001ps-Ir for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56: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=ETcRzxRv26dLddLYHywhfiG9nJa27THvH82UCT9P+jI=; b=X2u136kHT1jZBMLvB/ca3zObvn hVjuRYw5P392Wtn+aaaVEFGU+0xrdiGBrTntlDBHy3bn3HO49yVmro25+xATmelwsgq130ojDWr87 72fVrYgJi4W6Oi+XzcrlpuD7+fZ79SR2c2aTx+s8S+inFW59Kxm8FAzgdUnqdVXa2cng=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/vpci: honor access size when returning an error Message-Id: Date: Fri, 24 May 2024 19:56:22 +0000 commit 7db7bd0f319fe7f19a6904e75c53adf891fa2dac Author: Volodymyr Babchuk AuthorDate: Thu May 23 10:17:30 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:17:30 2024 +0200 arm/vpci: honor access size when returning an error Guest can try to read config space using different access sizes: 8, 16, 32, 64 bits. We need to take this into account when we are returning an error back to MMIO handler, otherwise it is possible to provide more data than requested: i.e. guest issues LDRB instruction to read one byte, but we are writing 0xFFFFFFFFFFFFFFFF in the target register. Signed-off-by: Volodymyr Babchuk Signed-off-by: Stewart Hildebrand Acked-by: Julien Grall --- xen/arch/arm/vpci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index 3bc4bb5508..b63a356bb4 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -29,6 +29,8 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, { struct pci_host_bridge *bridge = p; pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); + const unsigned int access_size = (1U << info->dabt.size) * 8; + const register_t invalid = GENMASK_ULL(access_size - 1, 0); /* data is needed to prevent a pointer cast on 32bit */ unsigned long data; @@ -39,7 +41,7 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, return 1; } - *r = ~0ul; + *r = invalid; return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:56:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729728.1134948 (Exim 4.92) (envelope-from ) id 1sAb1l-0004zN-VE; Fri, 24 May 2024 19:56:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729728.1134948; Fri, 24 May 2024 19:56: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 1sAb1l-0004zG-SK; Fri, 24 May 2024 19:56:33 +0000 Received: by outflank-mailman (input) for mailman id 729728; Fri, 24 May 2024 19:56:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1k-0004yx-Om for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1k-0000yL-Me for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb1k-0001qR-Lz for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56: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=0MvozMqmMNp1t2GBAah5hYeXegMhNmAhGZdVqT3mDys=; b=Qac9sT/n0kvnNmFlS7hQ3SpcDW +xNJIqSeqljvPoRo5SOI0UFk2eLMqk/cvV9yLez0GOeblNDb8lEQ9e8jUo8YisgcUW8DJjNlyQd8c tcEKN+XILTIi7NdV3KBUAmaMH+kTx/DbiYVMHh2sVzAbtJKFXEwn3Ezp675ip9Ye9Uts=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vpci/header: emulate PCI_COMMAND register for guests Message-Id: Date: Fri, 24 May 2024 19:56:32 +0000 commit 9c831e429c723749b64456ab725da974f74da9ca Author: Oleksandr Andrushchenko AuthorDate: Thu May 23 10:18:04 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:18:04 2024 +0200 vpci/header: emulate PCI_COMMAND register for guests Xen and/or Dom0 may have put values in PCI_COMMAND which they expect to remain unaltered. PCI_COMMAND_SERR bit is a good example: while the guest's (domU) view of this will want to be zero (for now), the host having set it to 1 should be preserved, or else we'd effectively be giving the domU control of the bit. Thus, PCI_COMMAND register needs proper emulation in order to honor host's settings. According to "PCI LOCAL BUS SPECIFICATION, REV. 3.0", section "6.2.2 Device Control" the reset state of the command register is typically 0, so when assigning a PCI device use 0 as the initial state for the guest's (domU) view of the command register. Here is the full list of command register bits with notes about PCI/PCIe specification, and how Xen handles the bit. QEMU's behavior is also documented here since that is our current reference implementation for PCI passthrough. PCI_COMMAND_IO (bit 0) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. QEMU sets this bit to 1 in hardware if an I/O BAR is exposed to the guest. Xen domU: (rsvdp_mask) We treat this bit as RsvdP for now since we don't yet support I/O BARs for domUs. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_MEMORY (bit 1) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. QEMU sets this bit to 1 in hardware if a Memory BAR is exposed to the guest. Xen domU/dom0: We handle writes to this bit by mapping/unmapping BAR regions. Xen domU: For devices assigned to DomUs, memory decoding will be disabled at the time of initialization. PCI_COMMAND_MASTER (bit 2) PCIe 6.1: RW PCI LB 3.0: RW QEMU: Pass through writes to hardware. Xen domU/dom0: Pass through writes to hardware. PCI_COMMAND_SPECIAL (bit 3) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: RW QEMU: Pass through writes to hardware. Xen domU/dom0: Pass through writes to hardware. PCI_COMMAND_INVALIDATE (bit 4) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: RW QEMU: Pass through writes to hardware. Xen domU/dom0: Pass through writes to hardware. PCI_COMMAND_VGA_PALETTE (bit 5) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: RW QEMU: Pass through writes to hardware. Xen domU/dom0: Pass through writes to hardware. PCI_COMMAND_PARITY (bit 6) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. Xen domU: (rsvdp_mask) We treat this bit as RsvdP. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_WAIT (bit 7) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: hardwire to 0 QEMU: res_mask Xen domU: (rsvdp_mask) We treat this bit as RsvdP. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_SERR (bit 8) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. Xen domU: (rsvdp_mask) We treat this bit as RsvdP. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_FAST_BACK (bit 9) PCIe 6.1: RO, hardwire to 0 PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. Xen domU: (rsvdp_mask) We treat this bit as RsvdP. Xen dom0: We allow dom0 to control this bit freely. PCI_COMMAND_INTX_DISABLE (bit 10) PCIe 6.1: RW PCI LB 3.0: RW QEMU: (emu_mask) QEMU provides an emulated view of this bit. Guest writes do not propagate to hardware. QEMU checks if INTx was mapped for a device. If it is not, then guest can't control PCI_COMMAND_INTX_DISABLE bit. Xen domU: We prohibit a guest from enabling INTx if MSI(X) is enabled. Xen dom0: We allow dom0 to control this bit freely. Bits 11-15 PCIe 6.1: RsvdP PCI LB 3.0: Reserved QEMU: res_mask Xen domU: rsvdp_mask Xen dom0: We allow dom0 to control these bits freely. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Volodymyr Babchuk Signed-off-by: Stewart Hildebrand Reviewed-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 60 +++++++++++++++++++++++++++++++++++++++++----- xen/drivers/vpci/msi.c | 9 +++++++ xen/drivers/vpci/msix.c | 7 ++++++ xen/include/xen/pci_regs.h | 1 + xen/include/xen/vpci.h | 3 +++ 5 files changed, 74 insertions(+), 6 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 47648c3951..ef6c965c08 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -524,9 +524,21 @@ static void cf_check cmd_write( { struct vpci_header *header = data; + if ( !is_hardware_domain(pdev->domain) ) + { + const struct vpci *vpci = pdev->vpci; + + if ( (vpci->msi && vpci->msi->enabled) || + (vpci->msix && vpci->msix->enabled) ) + cmd |= PCI_COMMAND_INTX_DISABLE; + + header->guest_cmd = cmd; + } + /* * Let Dom0 play with all the bits directly except for the memory - * decoding one. + * decoding one. Bits that are not allowed for DomU are already + * handled above and by the rsvdp_mask. */ if ( header->bars_mapped != !!(cmd & PCI_COMMAND_MEMORY) ) /* @@ -540,6 +552,14 @@ static void cf_check cmd_write( pci_conf_write16(pdev->sbdf, reg, cmd); } +static uint32_t cf_check guest_cmd_read( + const struct pci_dev *pdev, unsigned int reg, void *data) +{ + const struct vpci_header *header = data; + + return header->guest_cmd; +} + static void cf_check bar_write( const struct pci_dev *pdev, unsigned int reg, uint32_t val, void *data) { @@ -754,9 +774,23 @@ static int cf_check init_header(struct pci_dev *pdev) return -EOPNOTSUPP; } - /* Setup a handler for the command register. */ - rc = vpci_add_register(pdev->vpci, vpci_hw_read16, cmd_write, PCI_COMMAND, - 2, header); + /* + * Setup a handler for the command register. + * + * TODO: If support for emulated bits is added, re-visit how to handle + * PCI_COMMAND_PARITY, PCI_COMMAND_SERR, and PCI_COMMAND_FAST_BACK. + */ + rc = vpci_add_register_mask(pdev->vpci, + is_hwdom ? vpci_hw_read16 : guest_cmd_read, + cmd_write, PCI_COMMAND, 2, header, 0, 0, + is_hwdom ? 0 + : PCI_COMMAND_RSVDP_MASK | + PCI_COMMAND_IO | + PCI_COMMAND_PARITY | + PCI_COMMAND_WAIT | + PCI_COMMAND_SERR | + PCI_COMMAND_FAST_BACK, + 0); if ( rc ) return rc; @@ -836,9 +870,23 @@ static int cf_check init_header(struct pci_dev *pdev) if ( pdev->ignore_bars ) return 0; - /* Disable memory decoding before sizing. */ cmd = pci_conf_read16(pdev->sbdf, PCI_COMMAND); - if ( cmd & PCI_COMMAND_MEMORY ) + + /* + * For DomUs, clear PCI_COMMAND_{MASTER,MEMORY,IO} and other + * DomU-controllable bits in PCI_COMMAND. Devices assigned to DomUs will + * start with memory decoding disabled, and modify_bars() will not be called + * at the end of this function. + */ + if ( !is_hwdom ) + cmd &= ~(PCI_COMMAND_VGA_PALETTE | PCI_COMMAND_INVALIDATE | + PCI_COMMAND_SPECIAL | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | + PCI_COMMAND_IO); + + header->guest_cmd = cmd; + + /* Disable memory decoding before sizing. */ + if ( !is_hwdom || (cmd & PCI_COMMAND_MEMORY) ) pci_conf_write16(pdev->sbdf, PCI_COMMAND, cmd & ~PCI_COMMAND_MEMORY); for ( i = 0; i < num_bars; i++ ) diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c index 30adcf7df0..dd6620ec56 100644 --- a/xen/drivers/vpci/msi.c +++ b/xen/drivers/vpci/msi.c @@ -57,6 +57,8 @@ static void cf_check control_write( if ( new_enabled ) { + bool old_enabled = msi->enabled; + /* * If the device is already enabled it means the number of * enabled messages has changed. Disable and re-enable the @@ -70,6 +72,13 @@ static void cf_check control_write( if ( vpci_msi_arch_enable(msi, pdev, vectors) ) return; + + /* Make sure domU doesn't enable INTx while enabling MSI. */ + if ( !old_enabled && !is_hardware_domain(pdev->domain) ) + { + pci_intx(pdev, false); + pdev->vpci->header.guest_cmd |= PCI_COMMAND_INTX_DISABLE; + } } else vpci_msi_arch_disable(msi, pdev); diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c index 58c16ebdf2..fbe710ab92 100644 --- a/xen/drivers/vpci/msix.c +++ b/xen/drivers/vpci/msix.c @@ -135,6 +135,13 @@ static void cf_check control_write( } } + /* Make sure domU doesn't enable INTx while enabling MSI-X. */ + if ( new_enabled && !msix->enabled && !is_hardware_domain(pdev->domain) ) + { + pci_intx(pdev, false); + pdev->vpci->header.guest_cmd |= PCI_COMMAND_INTX_DISABLE; + } + msix->masked = new_masked; msix->enabled = new_enabled; diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h index 0bc18efabb..250ba106db 100644 --- a/xen/include/xen/pci_regs.h +++ b/xen/include/xen/pci_regs.h @@ -48,6 +48,7 @@ #define PCI_COMMAND_SERR 0x100 /* Enable SERR */ #define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */ #define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */ +#define PCI_COMMAND_RSVDP_MASK 0xf800 #define PCI_STATUS 0x06 /* 16 bits */ #define PCI_STATUS_IMM_READY 0x01 /* Immediate Readiness */ diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 6e4c972f35..2064d9354f 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -107,6 +107,9 @@ struct vpci { } bars[PCI_HEADER_NORMAL_NR_BARS + 1]; /* At most 6 BARS + 1 expansion ROM BAR. */ + /* Guest (domU only) view of the PCI_COMMAND register. */ + uint16_t guest_cmd; + /* * Store whether the ROM enable bit is set (doesn't imply ROM BAR * is mapped into guest p2m) if there's a ROM BAR on the device. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:56:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729729.1134951 (Exim 4.92) (envelope-from ) id 1sAb1w-00052Z-1d; Fri, 24 May 2024 19:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729729.1134951; Fri, 24 May 2024 19:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1v-00052S-VK; Fri, 24 May 2024 19:56:43 +0000 Received: by outflank-mailman (input) for mailman id 729729; Fri, 24 May 2024 19:56:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1u-00052F-QQ for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb1u-0000zC-Pe for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb1u-0001qs-Ow for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56: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=Hoja4zUQ4iifx/xBiUSD1jThfPKt0A5GyZA4jmFte98=; b=IWcS5e2M8s2o1VjOKyWQzndcB6 0QStlbbjc8X9MaYKwPR0M39spaZXtPjDxCV4TgCyIsVh+Ti5bVADXh47Lx0A5iA9N3Ln7SeLGo5Fg CbmNz0C6bhPndZJux4JRU1DfMdKBAl3V7ffIci5/DzGS3mohXUFTG9Bz1kJVggi7HuEw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vpci: add initial support for virtual PCI bus topology Message-Id: Date: Fri, 24 May 2024 19:56:42 +0000 commit d6a7fd83039af36c28bd0ae2174f12c3888ce993 Author: Oleksandr Andrushchenko AuthorDate: Thu May 23 10:18:47 2024 +0200 Commit: Jan Beulich CommitDate: Thu May 23 10:18:47 2024 +0200 vpci: add initial support for virtual PCI bus topology Assign SBDF to the PCI devices being passed through with bus 0. The resulting topology is where PCIe devices reside on the bus 0 of the root complex itself (embedded endpoints). This implementation is limited to 32 devices which are allowed on a single PCI bus. Please note, that at the moment only function 0 of a multifunction device can be passed through. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Volodymyr Babchuk Signed-off-by: Stewart Hildebrand Acked-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/drivers/Kconfig | 4 ++++ xen/drivers/vpci/vpci.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/sched.h | 10 ++++++++- xen/include/xen/vpci.h | 13 +++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index db94393f47..20050e9bb8 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -15,4 +15,8 @@ source "drivers/video/Kconfig" config HAS_VPCI bool +config HAS_VPCI_GUEST_SUPPORT + bool + select HAS_VPCI + endmenu diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 97e115dc57..1e6aa5d799 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -40,6 +40,49 @@ extern vpci_register_init_t *const __start_vpci_array[]; extern vpci_register_init_t *const __end_vpci_array[]; #define NUM_VPCI_INIT (__end_vpci_array - __start_vpci_array) +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT +static int assign_virtual_sbdf(struct pci_dev *pdev) +{ + struct domain *d = pdev->domain; + unsigned int new_dev_number; + + ASSERT(rw_is_write_locked(&pdev->domain->pci_lock)); + + if ( is_hardware_domain(d) ) + return 0; + + /* + * Each PCI bus supports 32 devices/slots at max or up to 256 when + * there are multi-function ones which are not yet supported. + */ + if ( pdev->sbdf.fn ) + { + gdprintk(XENLOG_ERR, "%pp: only function 0 passthrough supported\n", + &pdev->sbdf); + return -EOPNOTSUPP; + } + new_dev_number = find_first_zero_bit(d->vpci_dev_assigned_map, + VPCI_MAX_VIRT_DEV); + if ( new_dev_number == VPCI_MAX_VIRT_DEV ) + return -ENOSPC; + + __set_bit(new_dev_number, &d->vpci_dev_assigned_map); + + /* + * Both segment and bus number are 0: + * - we emulate a single host bridge for the guest, e.g. segment 0 + * - with bus 0 the virtual devices are seen as embedded + * endpoints behind the root complex + * + * TODO: add support for multi-function devices. + */ + pdev->vpci->guest_sbdf = PCI_SBDF(0, 0, new_dev_number, 0); + + return 0; +} + +#endif /* CONFIG_HAS_VPCI_GUEST_SUPPORT */ + void vpci_deassign_device(struct pci_dev *pdev) { unsigned int i; @@ -49,6 +92,12 @@ void vpci_deassign_device(struct pci_dev *pdev) if ( !has_vpci(pdev->domain) || !pdev->vpci ) return; +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + if ( pdev->vpci->guest_sbdf.sbdf != ~0 ) + __clear_bit(pdev->vpci->guest_sbdf.dev, + &pdev->domain->vpci_dev_assigned_map); +#endif + spin_lock(&pdev->vpci->lock); while ( !list_empty(&pdev->vpci->handlers) ) { @@ -103,6 +152,13 @@ int vpci_assign_device(struct pci_dev *pdev) INIT_LIST_HEAD(&pdev->vpci->handlers); spin_lock_init(&pdev->vpci->lock); +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + pdev->vpci->guest_sbdf = INVALID_GUEST_SBDF; + rc = assign_virtual_sbdf(pdev); + if ( rc ) + goto out; +#endif + for ( i = 0; i < NUM_VPCI_INIT; i++ ) { rc = __start_vpci_array[i](pdev); @@ -110,6 +166,7 @@ int vpci_assign_device(struct pci_dev *pdev) break; } + out: __maybe_unused; if ( rc ) vpci_deassign_device(pdev); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 132b841995..2dcd1d1a4f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -486,7 +486,15 @@ struct domain * 2. pdev->vpci->lock */ rwlock_t pci_lock; -#endif +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + /* + * The bitmap which shows which device numbers are already used by the + * virtual PCI bus topology and is used to assign a unique SBDF to the + * next passed through virtual PCI device. + */ + DECLARE_BITMAP(vpci_dev_assigned_map, VPCI_MAX_VIRT_DEV); +#endif /* CONFIG_HAS_VPCI_GUEST_SUPPORT */ +#endif /* CONFIG_HAS_PCI */ #ifdef CONFIG_HAS_PASSTHROUGH struct domain_iommu iommu; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 2064d9354f..da8d0f41e6 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -21,6 +21,14 @@ typedef int vpci_register_init_t(struct pci_dev *dev); #define VPCI_ECAM_BDF(addr) (((addr) & 0x0ffff000) >> 12) +/* + * Maximum number of devices supported by the virtual bus topology: + * each PCI bus supports 32 devices/slots at max or up to 256 when + * there are multi-function ones which are not yet supported. + * This limit implies only segment 0, bus 0 is supported. + */ +#define VPCI_MAX_VIRT_DEV (PCI_SLOT(~0) + 1) + #define REGISTER_VPCI_INIT(x, p) \ static vpci_register_init_t *const x##_entry \ __used_section(".data.vpci." p) = (x) @@ -175,6 +183,11 @@ struct vpci { struct vpci_arch_msix_entry arch; } entries[]; } *msix; +#ifdef CONFIG_HAS_VPCI_GUEST_SUPPORT + /* Guest SBDF of the device. */ +#define INVALID_GUEST_SBDF ((pci_sbdf_t){ .sbdf = ~0U }) + pci_sbdf_t guest_sbdf; +#endif #endif }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:56:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:56:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729730.1134956 (Exim 4.92) (envelope-from ) id 1sAb26-00055p-31; Fri, 24 May 2024 19:56:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729730.1134956; Fri, 24 May 2024 19: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 1sAb26-00055h-0W; Fri, 24 May 2024 19:56:54 +0000 Received: by outflank-mailman (input) for mailman id 729730; Fri, 24 May 2024 19:56:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb24-00055W-TO for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb24-0000zq-Si for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb24-0001rN-Rn for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:56: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=3nYD0q9pLuO4G8azE4zsh8awFohdFgKWEhpl/j9RTcM=; b=TErCivTk5CrXc6r14OwUWtUF0l AAQ2Hj2OM6mJ8Ox0LLJKsfQ6DT+SitoE5Jg8wD0cRxyNC5X+Kg+a1eVkJarYiNNw1AGrlHHe+L4mr HLUdWOF8kmpHcXjviSciFdnJXwlr+DxWlFvyMuy7up0sQ+4HO1z0+iZtZ3Gnn15N7Sio=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: mem_access: Conditionally compile mem_access.c Message-Id: Date: Fri, 24 May 2024 19:56:52 +0000 commit 9e58da32cc844b3fb7612fc35ece3a96f8cbf744 Author: Alessandro Zucchelli AuthorDate: Fri May 10 14:32:11 2024 +0200 Commit: Julien Grall CommitDate: Thu May 23 13:36:41 2024 +0100 xen/arm: mem_access: Conditionally compile mem_access.c Commit 634cfc8beb ("Make MEM_ACCESS configurable") intended to make MEM_ACCESS configurable on Arm to reduce the code size when the user doesn't need it. However, this didn't cover the arch specific code. None of the code in arm/mem_access.c is necessary when MEM_ACCESS=n, so it can be compiled out. This will require to provide some stub for functions called by the common code. Signed-off-by: Alessandro Zucchelli Acked-by: Tamas K Lengyel Release-acked-by: Oleksii Kurochko --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/include/asm/mem_access.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7b1350e2ef..45dc29ea53 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -37,7 +37,7 @@ obj-$(CONFIG_IOREQ_SERVER) += ioreq.o obj-y += irq.o obj-y += kernel.init.o obj-$(CONFIG_LIVEPATCH) += livepatch.o -obj-y += mem_access.o +obj-$(CONFIG_MEM_ACCESS) += mem_access.o obj-y += mm.o obj-y += monitor.o obj-y += p2m.o diff --git a/xen/arch/arm/include/asm/mem_access.h b/xen/arch/arm/include/asm/mem_access.h index 35ed0ad154..abac8032fc 100644 --- a/xen/arch/arm/include/asm/mem_access.h +++ b/xen/arch/arm/include/asm/mem_access.h @@ -17,6 +17,8 @@ #ifndef _ASM_ARM_MEM_ACCESS_H #define _ASM_ARM_MEM_ACCESS_H +#include + static inline bool p2m_mem_access_emulate_check(struct vcpu *v, const struct vm_event_st *rsp) @@ -35,12 +37,28 @@ static inline bool p2m_mem_access_sanity_check(struct domain *d) * Send mem event based on the access. Boolean return value indicates if trap * needs to be injected into guest. */ +#ifdef CONFIG_MEM_ACCESS bool p2m_mem_access_check(paddr_t gpa, vaddr_t gla, const struct npfec npfec); struct page_info* p2m_mem_access_check_and_get_page(vaddr_t gva, unsigned long flag, const struct vcpu *v); +#else + +static inline bool +p2m_mem_access_check(paddr_t gpa, vaddr_t gla, const struct npfec npfec) +{ + return false; +} + +static inline struct page_info* +p2m_mem_access_check_and_get_page(vaddr_t gva, unsigned long flag, + const struct vcpu *v) +{ + return NULL; +} +#endif /*CONFIG_MEM_ACCESS*/ #endif /* _ASM_ARM_MEM_ACCESS_H */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:57:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:57:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729731.1134961 (Exim 4.92) (envelope-from ) id 1sAb2G-0005A6-5i; Fri, 24 May 2024 19:57:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729731.1134961; Fri, 24 May 2024 19: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 1sAb2G-00059x-1t; Fri, 24 May 2024 19:57:04 +0000 Received: by outflank-mailman (input) for mailman id 729731; Fri, 24 May 2024 19:57:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2F-00058N-09 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2E-00010e-VW for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb2E-0001rx-Up for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57: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=soNkbdnDM93HUdlRYO3QkchOJjPPUIRP9X/unS35tGA=; b=JNAsPxvv3NjcKvaDyqIjSZxUiq e5IB8Q0DMh48tyRmu9VtP1VKPIlYDQRMlIA/FJ9RJDv+MDsIZKw+04YdIfJLYG2ZQNJtwHaR1wZAg 4ZkT8qCWuq8F/49mROi4dvS9CdCYXevNwWXp7RqR74XGvrZfEADjJmjW0SMRugbjXL/M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] LICENSES: Add MIT-0 (MIT No Attribution) Message-Id: Date: Fri, 24 May 2024 19:57:02 +0000 commit 219cdff3fb7b4a03ab14869584f111e0f623b330 Author: Andrew Cooper AuthorDate: Thu May 16 18:50:26 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 23 15:04:40 2024 +0100 LICENSES: Add MIT-0 (MIT No Attribution) We are about to import code licensed under MIT-0. It's compatible for us to use, so identify it as a permitted license. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Acked-by: Christian Lindig --- LICENSES/MIT-0 | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/LICENSES/MIT-0 b/LICENSES/MIT-0 new file mode 100644 index 0000000000..70fb90ee34 --- /dev/null +++ b/LICENSES/MIT-0 @@ -0,0 +1,31 @@ +Valid-License-Identifier: MIT-0 + +SPDX-URL: https://spdx.org/licenses/MIT-0.html + +Usage-Guide: + + To use the MIT-0 License put the following SPDX tag/value pair into a + comment according to the placement guidelines in the licensing rules + documentation: + SPDX-License-Identifier: MIT-0 + +License-Text: + +MIT No Attribution + +Copyright + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:57:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:57:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729732.1134963 (Exim 4.92) (envelope-from ) id 1sAb2Q-0005D2-5z; Fri, 24 May 2024 19:57:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729732.1134963; Fri, 24 May 2024 19: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 1sAb2Q-0005Cu-3N; Fri, 24 May 2024 19:57:14 +0000 Received: by outflank-mailman (input) for mailman id 729732; Fri, 24 May 2024 19:57:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2P-0005Cm-2o for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2P-00011C-20 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb2P-0001sO-1R for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19: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=QzJGPKgnuIIiAyhUfeN93+y1WymPYs3Kt7N4h0clghI=; b=1c9ldpwSjrM4Sa8VZK2JnVqz45 3IhqSKSDLHivjUAu/t3iFKH+hIGrWrG/+Hsa4x6WZdY0qfcvGPeQPF6kwRlzdVIfse4P+wtuOjeV8 ogsjazwPA5vq2GLvhtYUIxpOonfOTRh5DbgsdIPsadKLnVoeYeF3yjHeIIUffTJHQi/k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Import stand-alone sd_notify() implementation from systemd Message-Id: Date: Fri, 24 May 2024 19:57:13 +0000 commit 78510f3a1522f2856330ffa429e0e35f8aab4277 Author: Andrew Cooper AuthorDate: Thu May 16 18:59:00 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 23 15:04:40 2024 +0100 tools: Import stand-alone sd_notify() implementation from systemd ... in order to avoid linking against the whole of libsystemd. Only minimal changes to the upstream copy, to function as a drop-in replacement for sd_notify() and as a header-only library. Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross Acked-by: Christian Lindig --- tools/include/xen-sd-notify.h | 98 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/tools/include/xen-sd-notify.h b/tools/include/xen-sd-notify.h new file mode 100644 index 0000000000..28c9b20f15 --- /dev/null +++ b/tools/include/xen-sd-notify.h @@ -0,0 +1,98 @@ +/* SPDX-License-Identifier: MIT-0 */ + +/* + * Implement the systemd notify protocol without external dependencies. + * Supports both readiness notification on startup and on reloading, + * according to the protocol defined at: + * https://www.freedesktop.org/software/systemd/man/latest/sd_notify.html + * This protocol is guaranteed to be stable as per: + * https://systemd.io/PORTABILITY_AND_STABILITY/ + * + * Differences from the upstream copy: + * - Rename/rework as a drop-in replacement for systemd/sd-daemon.h + * - Only take the subset Xen cares about + * - Respect -Wdeclaration-after-statement + */ + +#ifndef XEN_SD_NOTIFY +#define XEN_SD_NOTIFY + +#include +#include +#include +#include +#include +#include + +static inline void xen_sd_closep(int *fd) { + if (!fd || *fd < 0) + return; + + close(*fd); + *fd = -1; +} + +static inline int xen_sd_notify(const char *message) { + union sockaddr_union { + struct sockaddr sa; + struct sockaddr_un sun; + } socket_addr = { + .sun.sun_family = AF_UNIX, + }; + size_t path_length, message_length; + ssize_t written; + const char *socket_path; + int __attribute__((cleanup(xen_sd_closep))) fd = -1; + + /* Verify the argument first */ + if (!message) + return -EINVAL; + + message_length = strlen(message); + if (message_length == 0) + return -EINVAL; + + /* If the variable is not set, the protocol is a noop */ + socket_path = getenv("NOTIFY_SOCKET"); + if (!socket_path) + return 0; /* Not set? Nothing to do */ + + /* Only AF_UNIX is supported, with path or abstract sockets */ + if (socket_path[0] != '/' && socket_path[0] != '@') + return -EAFNOSUPPORT; + + path_length = strlen(socket_path); + /* Ensure there is room for NUL byte */ + if (path_length >= sizeof(socket_addr.sun.sun_path)) + return -E2BIG; + + memcpy(socket_addr.sun.sun_path, socket_path, path_length); + + /* Support for abstract socket */ + if (socket_addr.sun.sun_path[0] == '@') + socket_addr.sun.sun_path[0] = 0; + + fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0); + if (fd < 0) + return -errno; + + if (connect(fd, &socket_addr.sa, offsetof(struct sockaddr_un, sun_path) + path_length) != 0) + return -errno; + + written = write(fd, message, message_length); + if (written != (ssize_t) message_length) + return written < 0 ? -errno : -EPROTO; + + return 1; /* Notified! */ +} + +static inline int sd_notify(int unset_environment, const char *message) { + int r = xen_sd_notify(message); + + if (unset_environment) + unsetenv("NOTIFY_SOCKET"); + + return r; +} + +#endif /* XEN_SD_NOTIFY */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:57:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:57:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729733.1134968 (Exim 4.92) (envelope-from ) id 1sAb2a-0005Fk-7t; Fri, 24 May 2024 19:57:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729733.1134968; Fri, 24 May 2024 19:57:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2a-0005FY-4r; Fri, 24 May 2024 19:57:24 +0000 Received: by outflank-mailman (input) for mailman id 729733; Fri, 24 May 2024 19:57:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2Z-0005FJ-5a for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2Z-00011l-4o for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb2Z-0001sr-47 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57: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=2TpDu5SmYTlrtxyieHttgFsFvAdsqhQIt6qi6g2Oep0=; b=xAwIsLXM6fkhkG0SjJLYTqPbSE 3GIk13ELENqYB3tJBUEBk3hyP8sqZ6SUAg0UnlqxOFkPbjBYidd7evrBDLNXrAL1sckTQBsVxr4hK SFumoeDXFEp3l80AONB6rE+8e2Rzkv5elfjxghqB0Fa9TNGJYBplW+gJhKtTaxNHHUTg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/{c,o}xenstored: Don't link against libsystemd Message-Id: Date: Fri, 24 May 2024 19:57:23 +0000 commit caf864482689a5dd6a945759b6372bb260d49665 Author: Andrew Cooper AuthorDate: Thu Apr 25 10:26:58 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 23 15:04:40 2024 +0100 tools/{c,o}xenstored: Don't link against libsystemd Use the local freestanding wrapper instead. Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross Acked-by: Christian Lindig --- tools/ocaml/xenstored/Makefile | 3 +-- tools/ocaml/xenstored/systemd_stubs.c | 2 +- tools/xenstored/Makefile | 5 ----- tools/xenstored/posix.c | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index e8aaecf2e6..fa45305d8c 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -4,8 +4,7 @@ include $(OCAML_TOPLEVEL)/common.make # Include configure output (config.h) CFLAGS += -include $(XEN_ROOT)/tools/config.h -CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS) -LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS) +CFLAGS-$(CONFIG_SYSTEMD) += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS-y) CFLAGS += $(APPEND_CFLAGS) diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index f4c875075a..7dbbdd35bf 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -25,7 +25,7 @@ #if defined(HAVE_SYSTEMD) -#include +#include CAMLprim value ocaml_sd_notify_ready(value ignore) { diff --git a/tools/xenstored/Makefile b/tools/xenstored/Makefile index e0897ed1ba..09adfe1d50 100644 --- a/tools/xenstored/Makefile +++ b/tools/xenstored/Makefile @@ -9,11 +9,6 @@ xenstored: LDLIBS += $(LDLIBS_libxenctrl) xenstored: LDLIBS += -lrt xenstored: LDLIBS += $(SOCKET_LIBS) -ifeq ($(CONFIG_SYSTEMD),y) -$(XENSTORED_OBJS-y): CFLAGS += $(SYSTEMD_CFLAGS) -xenstored: LDLIBS += $(SYSTEMD_LIBS) -endif - TARGETS := xenstored .PHONY: all diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index d88c82d972..6037d739d0 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -27,7 +27,7 @@ #include #include #if defined(HAVE_SYSTEMD) -#include +#include #endif #include @@ -393,7 +393,7 @@ void late_init(bool live_update) #if defined(HAVE_SYSTEMD) if (!live_update) { sd_notify(1, "READY=1"); - fprintf(stderr, SD_NOTICE "xenstored is ready\n"); + fprintf(stderr, "xenstored is ready\n"); } #endif } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:57:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:57:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729734.1134972 (Exim 4.92) (envelope-from ) id 1sAb2k-0005Ip-9G; Fri, 24 May 2024 19:57:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729734.1134972; Fri, 24 May 2024 19:57: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 1sAb2k-0005Ig-6P; Fri, 24 May 2024 19:57:34 +0000 Received: by outflank-mailman (input) for mailman id 729734; Fri, 24 May 2024 19:57:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2j-0005IV-9u for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2j-00012L-95 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb2j-0001tb-7S for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57: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=0swbaFOyXLBHLC69JhgbYLKC7Q46ZQ59OZJ4COuxa+w=; b=B9MEY4z3ImDMBH+CdQPl8MpePZ pmlRWNArZyTZw0r8n4tmjkGWVmQNzyjx8vLamdnSOqLWhN621MaRgLoClQ3McrHWzPd+156kvouWn rL4eU1OxXP7CnTGjRNQyklkg6PgRao/rSE+CVu1sFK69K1X3OJuVHm2CiO+QJj84uQZk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Drop libsystemd as a dependency Message-Id: Date: Fri, 24 May 2024 19:57:33 +0000 commit ae26101f6bfc8185adcdb9165d469bdc467780db Author: Andrew Cooper AuthorDate: Thu Apr 25 10:46:40 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 23 15:04:40 2024 +0100 tools: Drop libsystemd as a dependency There are no more users, and we want to disuade people from introducing new users just for sd_notify() and friends. Drop the dependency. We still want the overall --with{,out}-systemd to gate the generation of the service/unit/mount/etc files. Rerun autogen.sh, and mark the dependency as removed in the build containers. Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross Acked-by: Christian Lindig --- CHANGELOG.md | 3 + automation/build/archlinux/current.dockerfile | 1 + automation/build/suse/opensuse-leap.dockerfile | 1 + .../build/suse/opensuse-tumbleweed.dockerfile | 1 + automation/build/ubuntu/focal.dockerfile | 1 + config/Tools.mk.in | 2 - m4/systemd.m4 | 9 - tools/configure | 256 --------------------- 8 files changed, 7 insertions(+), 267 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c43c45d8d4..efdaff11de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - xl/libxl configures vkb=[] for HVM domains with priority over vkb_device. - Increase the maximum number of CPUs Xen can be built for from 4095 to 16383. + - When building with Systemd support (./configure --enable-systemd), remove + libsystemd as a build dependency. Systemd Notify support is retained, now + using a standalone library implementation. ### Added - On x86: diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 3e37ab5c40..d29f1358c2 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -37,6 +37,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ sdl2 \ spice \ spice-protocol \ + # systemd for Xen < 4.19 systemd \ transfig \ usbredir \ diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile index 48d0d50d00..3ef33458a0 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -59,6 +59,7 @@ RUN zypper install -y --no-recommends \ 'pkgconfig(sdl2)' \ python3-devel \ python3-setuptools \ + # systemd-devel for Xen < 4.19 systemd-devel \ tar \ transfig \ diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile index 53542ba1f4..a793601c87 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -60,6 +60,7 @@ RUN zypper install -y --no-recommends \ 'pkgconfig(sdl2)' \ python3-devel \ python3-setuptools \ + # systemd-devel for Xen < 4.19 systemd-devel \ tar \ transfig \ diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile index 7c6a4d0756..078abd56d5 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -34,6 +34,7 @@ RUN apt-get update && \ libnl-3-dev \ ocaml-nox \ libfindlib-ocaml-dev \ + # libsystemd-dev for Xen < 4.19 libsystemd-dev \ transfig \ pandoc \ diff --git a/config/Tools.mk.in b/config/Tools.mk.in index b54ab21f96..50fbef841f 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -52,8 +52,6 @@ CONFIG_PYGRUB := @pygrub@ CONFIG_LIBFSIMAGE := @libfsimage@ CONFIG_SYSTEMD := @systemd@ -SYSTEMD_CFLAGS := @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS := @SYSTEMD_LIBS@ XEN_SYSTEMD_DIR := @SYSTEMD_DIR@ XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@ CONFIG_9PFS := @ninepfs@ diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 112dc11b5e..e4fe51a8ba 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -41,15 +41,6 @@ AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],, - [PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209])] - ) - dnl pkg-config older than 0.24 does not set these for - dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 - dnl of systemd pkg-config --cflags currently yields no extra flags yet. - AC_SUBST([SYSTEMD_CFLAGS]) - AC_SUBST([SYSTEMD_LIBS]) - AS_IF([test "x$SYSTEMD_DIR" = x], [ dnl In order to use the line below we need to fix upstream systemd dnl to properly ${prefix} for child variables in diff --git a/tools/configure b/tools/configure index 3d557234b3..b8faa1d520 100755 --- a/tools/configure +++ b/tools/configure @@ -9766,262 +9766,6 @@ $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h systemd=y - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libsystemd >= 209) were not met: - -$SYSTEMD_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libsystemd >= 209) were not met: - -$SYSTEMD_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - if test "x$SYSTEMD_DIR" = x; then : SYSTEMD_DIR="\$(prefix)/lib/systemd/system/" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 19:57:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 19:57:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.729735.1134976 (Exim 4.92) (envelope-from ) id 1sAb2u-0005MO-CN; Fri, 24 May 2024 19:57:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 729735.1134976; Fri, 24 May 2024 19:57: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 1sAb2u-0005MH-9G; Fri, 24 May 2024 19:57:44 +0000 Received: by outflank-mailman (input) for mailman id 729735; Fri, 24 May 2024 19:57:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2t-0005M8-Cw for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAb2t-000139-CC for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAb2t-0001u8-BN for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 19:57: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=8z+IOPXkrjNvvwpVIT84/vJGAR3ajReGYdkBmWNT3OY=; b=EAp+YycoZMtLQg7URYhNcoMKut pttEq7j6KAmx8x9fN676AbbwvRR83FUGGdtWLrARQnRvCt0eh/vwoba+IW8RhiMXbjuynaWn+5/24 hzcPa2+0r9qZ+27SvveG8FyhwXDANqtlYF6lGEixIgHxnXj3zF0TtmxBXjEBeLszGFzg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xentrace: Remove xentrace_format Message-Id: Date: Fri, 24 May 2024 19:57:43 +0000 commit 2a40b106e92aaa7ce808c8608dd6473edc67f608 Author: George Dunlap AuthorDate: Fri Apr 26 15:18:25 2024 +0100 Commit: George Dunlap CommitDate: Thu May 23 15:05:13 2024 +0100 tools/xentrace: Remove xentrace_format xentrace_format was always of limited utility, since trace records across pcpus were processed out of order; it was superseded by xenalyze over a decade ago. But for several releases, the `formats` file it has depended on for proper operation has not even been included in `make install` (which generally means it doesn't get picked up by distros either); yet nobody has seemed to complain. Simple remove xentrace_format, and point people to xenalyze instead. NB that there is no man page for xenalyze, so the "see also" on the xentrace man page is simply removed for now. Signed-off-by: George Dunlap Acked-by: Andrew Cooper Acked-by: Olaf Hering --- docs/man/xentrace.8.pod | 5 +- docs/man/xentrace_format.1.pod | 46 ------- tools/xentrace/Makefile | 3 - tools/xentrace/formats | 229 ----------------------------------- tools/xentrace/xentrace.c | 2 +- tools/xentrace/xentrace_format | 264 ----------------------------------------- 6 files changed, 2 insertions(+), 547 deletions(-) diff --git a/docs/man/xentrace.8.pod b/docs/man/xentrace.8.pod index 4c174a84c0..7c9f69c67f 100644 --- a/docs/man/xentrace.8.pod +++ b/docs/man/xentrace.8.pod @@ -20,7 +20,7 @@ D1...D5 are the trace data. Data is dumped onto the standard output (which must not be a TTY) or a I specified on the command line. -The output should be parsed using the tool xentrace_format, which can +The output should be parsed using the tool xenalyze, which can produce human-readable output in ASCII format. @@ -157,6 +157,3 @@ B collects the following events from the trace buffer: Mark A. Williamson -=head1 SEE ALSO - -xentrace_format(1) diff --git a/docs/man/xentrace_format.1.pod b/docs/man/xentrace_format.1.pod deleted file mode 100644 index e05479a83b..0000000000 --- a/docs/man/xentrace_format.1.pod +++ /dev/null @@ -1,46 +0,0 @@ -=head1 NAME - -xentrace_format - pretty-print Xen trace data - -=head1 SYNOPSIS - -B [ I ] - -=head1 DESCRIPTION - -B parses trace data in B binary format from -standard input and reformats it according to the rules in a file of -definitions (I), printing to standard output. - -The rules in I should have the format shown below: - -I I I - -Each rule should start on a new line. - -The format string may include format specifiers, such as: -%(cpu)d, %(tsc)d, %(event)d, %(1)d, %(2)d, %(3)d, %(4)d, %(5)d - -[ the `d' format specifier output in decimal, alternatively `x' - will output in hexadecimal and `o' will output in octal ] - -These correspond to the CPU number, event ID, timestamp counter and -the 5 data fields from the trace record. There should be one such -rule for each type of event to be pretty-printed (events which do not -have formatting rules are ignored). - -A sample format file for Xen's predefined trace events is available -in the file tools/xentrace/formats in the Xen source tree. - -Depending on your system and the rate at which trace data is produced, -this script may not be able to keep up with the output of -B if it is piped directly. In these circumstances you -should have B output to a file for processing off-line. - -=head1 AUTHOR - -Mark A. Williamson - -=head1 SEE ALSO - -xentrace(8) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index d50d400472..bf960c0867 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -10,7 +10,6 @@ LDLIBS += $(ARGP_LDFLAGS) BIN := xenalyze SBIN := xentrace xentrace_setsize LIBBIN := xenctx -SCRIPTS := xentrace_format TARGETS := $(BIN) $(SBIN) $(LIBBIN) @@ -24,13 +23,11 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(LIBBIN)) - rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS)) rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(SBIN)) rm -f $(addprefix $(DESTDIR)$(bindir)/, $(BIN)) diff --git a/tools/xentrace/formats b/tools/xentrace/formats deleted file mode 100644 index afb5ee0112..0000000000 --- a/tools/xentrace/formats +++ /dev/null @@ -1,229 +0,0 @@ -0x00000000 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) unknown (0x%(event)016x) [ 0x%(1)08x 0x%(2)08x 0x%(3)08x 0x%(4)08x 0x%(5)08x 0x%(6)08x 0x%(7)08x ] - -0x0001f001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) lost_records 0x%(1)08x -0x0001f002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) wrap_buffer 0x%(1)08x -0x0001f003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cpu_change 0x%(1)08x -0x0001f004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) trace_irq [ vector = %(1)d, count = %(2)d, tot_cycles = 0x%(3)08x, max_cycles = 0x%(4)08x ] - -0x00021002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) continue_running [ dom:vcpu = 0x%(1)08x ] -0x00021011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) running_to_runnable [ dom:vcpu = 0x%(1)08x ] -0x00021021 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) running_to_blocked [ dom:vcpu = 0x%(1)08x ] -0x00021031 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) running_to_offline [ dom:vcpu = 0x%(1)08x ] -0x00021101 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) runnable_to_running [ dom:vcpu = 0x%(1)08x ] -0x00021121 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) runnable_to_blocked [ dom:vcpu = 0x%(1)08x ] -0x00021131 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) runnable_to_offline [ dom:vcpu = 0x%(1)08x ] -0x00021201 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) blocked_to_running [ dom:vcpu = 0x%(1)08x ] -0x00021211 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) blocked_to_runnable [ dom:vcpu = 0x%(1)08x ] -0x00021231 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) blocked_to_offline [ dom:vcpu = 0x%(1)08x ] -0x00021301 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) offline_to_running [ dom:vcpu = 0x%(1)08x ] -0x00021311 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) offline_to_runnable [ dom:vcpu = 0x%(1)08x ] -0x00021321 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) offline_to_blocked [ dom:vcpu = 0x%(1)08x ] - -0x00028001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) sched_add_domain [ domid = 0x%(1)08x ] -0x00028002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) sched_rem_domain [ domid = 0x%(1)08x ] -0x00028003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_sleep [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00028004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_wake [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00028005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) do_yield [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00028006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) do_block [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00028007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_shutdown [ dom:vcpu = 0x%(1)04x%(2)04x, reason = 0x%(3)08x ] -0x00028008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) sched_ctl -0x00028009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) sched_adjdom [ domid = 0x%(1)08x ] -0x0002800a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) __enter_scheduler [ prev = 0x%(1)04x%(2)04x, next = 0x%(3)04x%(4)04x ] -0x0002800b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) s_timer_fn -0x0002800c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) t_timer_fn -0x0002800d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) dom_timer_fn -0x0002800e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) switch_infprev [ dom:vcpu = 0x%(1)04x%(2)04x, runtime = %(3)d ] -0x0002800f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) switch_infnext [ new_dom:vcpu = 0x%(1)04x%(2)04x, time = %(3)d, r_time = %(4)d ] -0x00028010 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_shutdown_code [ dom:vcpu = 0x%(1)04x%(2)04x, reason = 0x%(3)08x ] -0x00028011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) switch_infcont [ dom:vcpu = 0x%(1)04x%(2)04x, runtime = %(3)d, r_time = %(4)d ] - -0x00022001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:sched_tasklet -0x00022002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:account_start [ dom:vcpu = 0x%(1)04x%(2)04x, active = %(3)d ] -0x00022003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:account_stop [ dom:vcpu = 0x%(1)04x%(2)04x, active = %(3)d ] -0x00022004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:stolen_vcpu [ dom:vcpu = 0x%(2)04x%(3)04x, from = %(1)d ] -0x00022005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:picked_cpu [ dom:vcpu = 0x%(1)04x%(2)04x, cpu = %(3)d ] -0x00022006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:tickle [ cpu = %(1)d ] -0x00022007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:boost [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00022008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:unboost [ dom:vcpu = 0x%(1)04x%(2)04x ] -0x00022009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:schedule [ cpu[16]:tasklet[8]:idle[8] = %(1)08x ] -0x0002200A CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:ratelimit [ dom:vcpu = 0x%(1)08x, runtime = %(2)d ] -0x0002200B CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched:steal_check [ peer_cpu = %(1)d, checked = %(2)d ] - -0x00022201 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:tick -0x00022202 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_pos [ dom:vcpu = 0x%(1)08x, pos = %(2)d] -0x00022203 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:credit burn [ dom:vcpu = 0x%(1)08x, credit = %(2)d, budget = %(3)d, delta = %(4)d ] -0x00022204 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:credit_add -0x00022205 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:tickle_check [ dom:vcpu = 0x%(1)08x, credit = %(2)d, score = %(3)d ] -0x00022206 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:tickle [ cpu = %(1)d ] -0x00022207 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:credit_reset [ dom:vcpu = 0x%(1)08x, cr_start = %(2)d, cr_end = %(3)d ] -0x00022208 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:sched_tasklet -0x00022209 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:update_load -0x0002220a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_assign [ dom:vcpu = 0x%(1)08x, rq_id = %(2)d ] -0x0002220b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:updt_vcpu_load [ dom:vcpu = 0x%(3)08x, vcpuload = 0x%(2)08x%(1)08x, wshift = %(4)d ] -0x0002220c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:updt_runq_load [ rq_load[16]:rq_id[8]:wshift[8] = 0x%(5)08x, rq_avgload = 0x%(2)08x%(1)08x, b_avgload = 0x%(4)08x%(3)08x ] -0x0002220d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:tickle_new [ dom:vcpu = 0x%(1)08x, processor = %(2)d credit = %(3)d ] -0x0002220e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_max_weight [ rq_id[16]:max_weight[16] = 0x%(1)08x ] -0x0002220f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:migrrate [ dom:vcpu = 0x%(1)08x, rq_id[16]:trq_id[16] = 0x%(2)08x ] -0x00022210 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:load_check [ lrq_id[16]:orq_id[16] = 0x%(1)08x, delta = %(2)d ] -0x00022211 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:load_balance [ l_bavgload = 0x%(2)08x%(1)08x, o_bavgload = 0x%(4)08x%(3)08x, lrq_id[16]:orq_id[16] = 0x%(5)08x ] -0x00022212 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:pick_cpu [ b_avgload = 0x%(2)08x%(1)08x, dom:vcpu = 0x%(3)08x, rq_id[16]:new_cpu[16] = %(4)d ] -0x00022213 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_candidate [ dom:vcpu = 0x%(1)08x, credit = %(3)d, tickled_cpu = %(2)d ] -0x00022214 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:schedule [ rq:cpu = 0x%(1)08x, tasklet[8]:idle[8]:smt_idle[8]:tickled[8] = %(2)08x ] -0x00022215 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:ratelimit [ dom:vcpu = 0x%(1)08x, runtime = %(2)d ] -0x00022216 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) csched2:runq_cand_chk [ dom:vcpu = 0x%(1)08x ] - -0x00022801 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:tickle [ cpu = %(1)d ] -0x00022802 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:runq_pick [ dom:vcpu = 0x%(1)08x, cur_deadline = 0x%(3)08x%(2)08x, cur_budget = 0x%(5)08x%(4)08x ] -0x00022803 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:burn_budget [ dom:vcpu = 0x%(1)08x, cur_budget = 0x%(3)08x%(2)08x, delta = %(4)d ] -0x00022804 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:repl_budget [ dom:vcpu = 0x%(1)08x, cur_deadline = 0x%(3)08x%(2)08x, cur_budget = 0x%(5)08x%(4)08x ] -0x00022805 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:sched_tasklet -0x00022806 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtds:schedule [ cpu[16]:tasklet[8]:idle[4]:tickled[4] = %(1)08x ] - -0x00022A01 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:pick_cpu [ dom:vcpu = 0x%(1)08x, new_cpu = %(2)d ] -0x00022A02 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:assign [ dom:vcpu = 0x%(1)08x, cpu = %(2)d ] -0x00022A03 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:deassign [ dom:vcpu = 0x%(1)08x, cpu = %(2)d ] -0x00022A04 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:migrate [ dom:vcpu = 0x%(1)08x, new_cpu:cpu = 0x%(2)08x ] -0x00022A05 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:schedule [ cpu[16]:tasklet[16] = %(1)08x, dom:vcpu = 0x%(2)08x ] -0x00022A06 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) null:sched_tasklet - -0x00041001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_create [ dom = 0x%(1)08x ] -0x00041002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) domain_destroy [ dom = 0x%(1)08x ] - -0x00081001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMENTRY -0x00081002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMEXIT [ exitcode = 0x%(1)08x, rIP = 0x%(2)08x ] -0x00081102 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMEXIT [ exitcode = 0x%(1)08x, rIP = 0x%(3)08x%(2)08x ] -0x00081401 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) nVMENTRY -0x00081402 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) nVMEXIT [ exitcode = 0x%(1)08x, rIP = 0x%(2)08x ] -0x00081502 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) nVMEXIT [ exitcode = 0x%(1)08x, rIP = 0x%(3)08x%(2)08x ] -0x00082001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_XEN [ errorcode = 0x%(2)02x, virt = 0x%(1)08x ] -0x00082101 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_XEN [ errorcode = 0x%(3)02x, virt = 0x%(2)08x%(1)08x ] -0x00082002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_INJECT [ errorcode = 0x%(1)02x, virt = 0x%(2)08x ] -0x00082102 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) PF_INJECT [ errorcode = 0x%(1)02x, virt = 0x%(3)08x%(2)08x ] -0x00082003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INJ_EXC [ vector = 0x%(1)02x, errorcode = 0x%(2)04x ] -0x00082004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INJ_VIRQ [ vector = 0x%(1)02x, fake = %(2)d ] -0x00082005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) REINJ_VIRQ [ vector = 0x%(1)02x ] -0x00082006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) IO_READ [ port = 0x%(1)04x, size = %(2)d ] -0x00082007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) IO_WRITE [ port = 0x%(1)04x, size = %(2)d ] -0x00082008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CR_READ [ CR# = %(1)d, value = 0x%(2)08x ] -0x00082108 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CR_READ [ CR# = %(1)d, value = 0x%(3)08x%(2)08x ] -0x00082009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CR_WRITE [ CR# = %(1)d, value = 0x%(2)08x ] -0x00082109 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CR_WRITE [ CR# = %(1)d, value = 0x%(3)08x%(2)08x ] -0x0008200A CPU%(cpu)d %(tsc)d (+%(reltsc)8d) DR_READ -0x0008200B CPU%(cpu)d %(tsc)d (+%(reltsc)8d) DR_WRITE -0x0008200C CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MSR_READ [ MSR# = 0x%(1)08x, value = 0x%(3)08x%(2)08x ] -0x0008200D CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MSR_WRITE [ MSR# = 0x%(1)08x, value = 0x%(3)08x%(2)08x ] -0x0008200E CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CPUID [ func = 0x%(1)08x, eax = 0x%(2)08x, ebx = 0x%(3)08x, ecx=0x%(4)08x, edx = 0x%(5)08x ] -0x0008200F CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INTR [ vector = 0x%(1)02x ] -0x00082010 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) NMI -0x00082011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) SMI -0x00082012 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) VMMCALL [ func = 0x%(1)08x ] -0x00082013 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) HLT [ intpending = %(1)d ] -0x00082014 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INVLPG [ is invlpga? = %(1)d, virt = 0x%(2)08x ] -0x00082114 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INVLPG [ is invlpga? = %(1)d, virt = 0x%(3)08x%(2)08x ] -0x00082015 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MCE -0x00082016 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) IOPORT_READ [ port = 0x%(1)04x, data = 0x%(2)08x ] -0x00082216 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) IOPORT_WRITE [ port = 0x%(1)04x, data = 0x%(2)08x ] -0x00082017 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MMIO_READ [ port = 0x%(1)08x, data = 0x%(2)08x ] -0x00082217 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) MMIO_WRITE [ port = 0x%(1)08x, data = 0x%(2)08x ] -0x00082018 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) CLTS -0x00082019 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) LMSW [ value = 0x%(1)08x ] -0x00082119 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) LMSW [ value = 0x%(2)08x%(1)08x ] -0x0008201a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) RDTSC [ value = 0x%(2)08x%(1)08x ] -0x00082020 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) INTR_WINDOW [ value = 0x%(1)08x ] -0x00082021 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) NPF [ gpa = 0x%(2)08x%(1)08x mfn = 0x%(4)08x%(3)08x qual = 0x%(5)04x p2mt = 0x%(6)04x ] -0x00082023 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) TRAP [ vector = 0x%(1)02x ] - -0x0010f001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_grant_map [ domid = %(1)d ] -0x0010f002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_grant_unmap [ domid = %(1)d ] -0x0010f003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_grant_transfer [ domid = %(1)d ] -0x0010f005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) decrease_reservation [ d%(3)d gfn 0x%(2)08x%(1)08x, order %(4)u ] -0x0010f010 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pod_populate [ d%(5)d gfn 0x%(2)08x%(1)08x => mfn 0x%(4)08x%(3)08x, order %(6)u ] -0x0010f011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pod_zero_reclaim [ d%(5)d gfn 0x%(2)08x%(1)08x => mfn 0x%(4)08x%(3)08x, order %(6)u ] -0x0010f012 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pod_superpage_splinter [ d%(3)d gfn 0x%(2)08x%(1)08x, order %(4)u ] - -0x00201001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hypercall [ eip = 0x%(1)08x, eax = 0x%(2)08x ] -0x00201101 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hypercall [ rip = 0x%(2)08x%(1)08x, eax = 0x%(3)08x ] -0x00201003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) trap [ eip = 0x%(1)08x, trapnr:error = 0x%(2)08x ] -0x00201103 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) trap [ rip = 0x%(2)08x%(1)08x, trapnr:error = 0x%(3)08x ] -0x00201004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_fault [ eip = 0x%(1)08x, addr = 0x%(2)08x, error = 0x%(3)08x ] -0x00201104 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) page_fault [ rip = 0x%(2)08x%(1)08x, addr = 0x%(4)08x%(3)08x, error = 0x%(5)08x ] -0x00201005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) forced_invalid_op [ eip = 0x%(1)08x ] -0x00201105 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) forced_invalid_op [ rip = 0x%(2)08x%(1)08x ] -0x00201006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) emulate_privop [ eip = 0x%(1)08x ] -0x00201106 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) emulate_privop [ rip = 0x%(2)08x%(1)08x ] -0x00201007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) emulate_4G [ eip = 0x%(1)08x ] -0x00201107 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) emulate_4G [ rip = 0x%(2)08x%(1)08x ] -0x00201008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) math_state_restore -0x00201108 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) math_state_restore -0x00201009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) paging_fixup [ eip = 0x%(1)08x, addr = 0x%(2)08x ] -0x00201109 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) paging_fixup [ rip = 0x%(2)08x%(1)08x, addr = 0x%(4)08x%(3)08x ] -0x0020100a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) gdt_ldt_mapping_fault [ eip = 0x%(1)08x, offset = 0x%(2)08x ] -0x0020110a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) gdt_ldt_mapping_fault [ rip = 0x%(2)08x%(1)08x, offset = 0x%(4)08x%(3)08x ] -0x0020100b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) ptwr_emulation [ addr = 0x%(3)08x, eip = 0x%(4)08x, npte = 0x%(2)08x%(1)08x ] -0x0020110b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) ptwr_emulation [ addr = 0x%(4)08x%(3)08x, rip = 0x%(6)08x%(5)08x, npte = 0x%(2)08x%(1)08x ] -0x0020100c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) ptwr_emulation_pae [ addr = 0x%(3)08x, eip = 0x%(4)08x, npte = 0x%(2)08x%(1)08x ] -0x0020110c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) ptwr_emulation_pae [ addr = 0x%(4)08x%(3)08x, rip = 0x%(6)08x%(5)08x, npte = 0x%(2)08x%(1)08x ] -0x0020100d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hypercall [ op = 0x%(1)08x ] -0x0020200e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hypercall [ op = 0x%(1)08x ] - -0x0040f001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_not_shadow [ gl1e = 0x%(2)08x%(1)08x, va = 0x%(3)08x, flags = 0x%(4)08x ] -0x0040f101 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_not_shadow [ gl1e = 0x%(2)08x%(1)08x, va = 0x%(4)08x%(3)08x, flags = 0x%(5)08x ] -0x0040f002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fast_propagate [ va = 0x%(1)08x ] -0x0040f102 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fast_propagate [ va = 0x%(2)08x%(1)08x ] -0x0040f003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fast_mmio [ va = 0x%(1)08x ] -0x0040f103 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fast_mmio [ va = 0x%(2)08x%(1)08x ] -0x0040f004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_false_fast_path [ va = 0x%(1)08x ] -0x0040f104 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_false_fast_path [ va = 0x%(2)08x%(1)08x ] -0x0040f005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_mmio [ va = 0x%(1)08x ] -0x0040f105 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_mmio [ va = 0x%(2)08x%(1)08x ] -0x0040f006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fixup [ gl1e = 0x%(1)08x, va = 0x%(2)08x, flags = 0x%(3)08x ] -0x0040f106 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_fixup [ gl1e = 0x%(2)08x%(1)08x, va = 0x%(4)08x%(3)08x, flags = 0x%(3)08x ] -0x0040f007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_domf_dying [ va = 0x%(1)08x ] -0x0040f107 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_domf_dying [ va = 0x%(2)08x%(1)08x ] -0x0040f008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate [ gl1e = 0x%(1)08x, write_val = 0x%(2)08x, va = 0x%(3)08x, flags = 0x%(4)08x ] -0x0040f108 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate [ gl1e = 0x%(2)08x%(1)08x, write_val = 0x%(4)08x%(3)08x, va = 0x%(6)08x%(5)08x, flags = 0x%(7)08x ] -0x0040f009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_user [ va = 0x%(1)08x, gfn = 0x%(2)08x ] -0x0040f109 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_user [ va = 0x%(2)08x%(1)08x, gfn = 0x%(4)08x%(3)08x ] -0x0040f00a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_evtinj [ va = 0x%(1)08x, gfn = 0x%(2)08x ] -0x0040f10a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_evtinj [ va = 0x%(2)08x%(1)08x, gfn = 0x%(4)08x%(3)08x ] -0x0040f00b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_unhandled [ va = 0x%(1)08x, gfn = 0x%(2)08x ] -0x0040f10b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_unshadow_unhandled [ va = 0x%(2)08x%(1)08x, gfn = 0x%(4)08x%(3)08x ] -0x0040f00c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_wrmap_bf [ gfn = 0x%(1)08x ] -0x0040f10c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_wrmap_bf [ gfn = 0x%(2)08x%(1)08x ] -0x0040f00d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_prealloc_unpin [ gfn = 0x%(1)08x ] -0x0040f10d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_prealloc_unpin [ gfn = 0x%(2)08x%(1)08x ] -0x0040f00e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_resync_full [ gfn = 0x%(1)08x ] -0x0040f10e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_resync_full [ gfn = 0x%(2)08x%(1)08x ] -0x0040f00f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_resync_only [ gfn = 0x%(1)08x ] -0x0040f10f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) shadow_emulate_resync_only [ gfn = 0x%(2)08x%(1)08x ] - -0x00801001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cpu_freq_change [ %(1)dMHz -> %(2)dMHz ] -0x00801002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cpu_idle_entry [ C0 -> C%(1)d, acpi_pm_tick = %(2)d, expected = %(3)dus, predicted = %(4)dus ] -0x00801003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cpu_idle_exit [ C%(1)d -> C0, acpi_pm_tick = %(2)d, irq = %(3)d %(4)d %(5)d %(6)d ] - -0x00802001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cleanup_move_delayed [ irq = %(1)d, vector 0x%(2)x on CPU%(3)d ] -0x00802002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) cleanup_move [ irq = %(1)d, vector 0x%(2)x on CPU%(3)d ] -0x00802003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) bind_vector [ irq = %(1)d = vector 0x%(2)x, CPU mask: 0x%(3)08x ] -0x00802004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) clear_vector [ irq = %(1)d = vector 0x%(2)x, CPU mask: 0x%(3)08x ] -0x00802005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) move_vector [ irq = %(1)d had vector 0x%(2)x on CPU%(3)d ] -0x00802006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) assign_vector [ irq = %(1)d = vector 0x%(2)x, CPU mask: 0x%(3)08x ] -0x00802007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) bogus_vector [ 0x%(1)x ] -0x00802008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) do_irq [ irq = %(1)d, began = %(2)dus, ended = %(3)dus ] - -0x00084001 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hpet create [ tn = %(1)d, irq = %(2)d, delta = 0x%(4)08x%(3)08x, period = 0x%(6)08x%(5)08x ] -0x00084002 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pit create [ delta = 0x%(1)08x, period = 0x%(2)08x ] -0x00084003 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtc create [ delta = 0x%(1)08x, period = 0x%(2)08x ] -0x00084004 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vlapic create [ delta = 0x%(2)08x%(1)08x , period = 0x%(4)08x%(3)08x, irq = %(5)d ] -0x00084005 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) hpet destroy [ tn = %(1)d ] -0x00084006 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pit destroy [ ] -0x00084007 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) rtc destroy [ ] -0x00084008 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vlapic destroy [ ] -0x00084009 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) pit callback [ ] -0x0008400a CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vlapic callback [ ] -0x0008400b CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic_update_int_output [ int_output = %(1)d, is_master = %(2)d, irq = %(3)d ] -0x0008400c CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic vcpu_kick [ irq = %(1)d ] -0x0008400d CPU%(cpu)d %(tsc)d (+%(reltsc)8d) __vpic_intack [ is_master = %(1)d, irq = %(2)d ] -0x0008400e CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic_irq_positive_edge [ irq = %(1)d ] -0x0008400f CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic_irq_negative_edge [ irq = %(1)d ] -0x00084010 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vpic_ack_pending_irq [ accept_pic_intr = %(1)d, int_output = %(2)d ] -0x00084011 CPU%(cpu)d %(tsc)d (+%(reltsc)8d) vlapic_accept_pic_intr [ i8259_target = %(1)d, accept_pic_int = %(2)d ] diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index be6226f088..63b29f8442 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -848,7 +848,7 @@ static void usage(int status) "\n" \ " CPU(uint) TSC(uint64_t) EVENT(uint32_t) D1 D2 D3 D4 D5 (all uint32_t)\n" \ "\n" \ -"The output should be parsed using the tool xentrace_format,\n" \ +"The output should be parsed using the tool xenalyze,\n" \ "which can produce human-readable output in ASCII format.\n" printf(USAGE_STR); diff --git a/tools/xentrace/xentrace_format b/tools/xentrace/xentrace_format deleted file mode 100644 index 21be16b7e4..0000000000 --- a/tools/xentrace/xentrace_format +++ /dev/null @@ -1,264 +0,0 @@ -#!/usr/bin/env python - -# by Mark Williamson, (C) 2004 Intel Research Cambridge - -# 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("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 - and are not part of the syntax): - - {event_id}{whitespace}{text format string} - - The textual format string may include format specifiers, such as: - %(cpu)d, %(tsc)d, %(event)d, %(1)d, %(2)d, %(3)d, %(4)d, ... - [ the 'd' format specifier outputs in decimal, alternatively 'x' - will output in hexadecimal and 'o' will output in octal ] - - Which correspond to the CPU number, event ID, timestamp counter and - the 7 data fields from the trace record. There should be one such - rule for each type of event. - - Depending on your system and the volume of trace buffer data, - 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): - defs = {} - - fd = open(defs_file) - - reg = re.compile('(\S+)\s+(\S.*)') - - while True: - line = fd.readline() - if not line: - break - - if line[0] == '#' or line[0] == '\n': - continue - - m = reg.match(line) - - if not m: print("Bad format file", file=sys.stderr) ; sys.exit(1) - - defs[str(eval(m.group(1)))] = m.group(2) - - return defs - -def sighand(x,y): - global interrupted - interrupted = 1 - -##### Main code - -mhz = 0 - -if len(sys.argv) < 2: - usage() - -try: - opts, arg = getopt.getopt(sys.argv[1:], "c:" ) - - for opt in opts: - if opt[0] == '-c' : mhz = int(opt[1]) - -except getopt.GetoptError: - usage() - -signal.signal(signal.SIGTERM, sighand) -signal.signal(signal.SIGHUP, sighand) -signal.signal(signal.SIGINT, sighand) - -interrupted = 0 - -try: - defs = read_defs(arg[0]) -except IOError as exn: - print(exn) - sys.exit(1) - -# structure of trace record (as output by xentrace): -# HDR(I) {TSC(Q)} D1(I) D2(I) D3(I) D4(I) D5(I) D6(I) D7(I) -# -# HDR consists of EVENT:28:, n_data:3:, tsc_in:1: -# EVENT means Event ID -# n_data means number of data (like D1, D2, ...) -# tsc_in means TSC data exists(1) or not(0). -# if tsc_in == 0, TSC(Q) does not exists. -# -# CPU ID exists on trace data of EVENT=0x0001f003 -# -HDRREC = "I" -TSCREC = "Q" -D1REC = "I" -D2REC = "II" -D3REC = "III" -D4REC = "IIII" -D5REC = "IIIII" -D6REC = "IIIIII" -D7REC = "IIIIIII" - -last_tsc = [0] - -TRC_TRACE_IRQ = 0x1f004 -TRC_PV_HYPERCALL_V2 = 0x20100d -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 = stdin_bytes.read(struct.calcsize(HDRREC)) - if not line: - break - event = struct.unpack(HDRREC, line)[0] - n_data = event >> 28 & 0x7 - tsc_in = event >> 31 - - d1 = 0 - d2 = 0 - d3 = 0 - d4 = 0 - d5 = 0 - d6 = 0 - d7 = 0 - - tsc = 0 - - if tsc_in == 1: - line = stdin_bytes.read(struct.calcsize(TSCREC)) - if not line: - break - tsc = struct.unpack(TSCREC, line)[0] - - if n_data == 1: - line = stdin_bytes.read(struct.calcsize(D1REC)) - if not line: - break - d1 = struct.unpack(D1REC, line)[0] - if n_data == 2: - line = stdin_bytes.read(struct.calcsize(D2REC)) - if not line: - break - (d1, d2) = struct.unpack(D2REC, line) - if n_data == 3: - line = stdin_bytes.read(struct.calcsize(D3REC)) - if not line: - break - (d1, d2, d3) = struct.unpack(D3REC, line) - if n_data == 4: - line = stdin_bytes.read(struct.calcsize(D4REC)) - if not line: - break - (d1, d2, d3, d4) = struct.unpack(D4REC, line) - if n_data == 5: - 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 = 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 = stdin_bytes.read(struct.calcsize(D7REC)) - if not line: - break - (d1, d2, d3, d4, d5, d6, d7) = struct.unpack(D7REC, line) - - # Event field is 28bit of 'uint32_t' in header, not 'long'. - event &= 0x0fffffff - if event == 0x1f003: - cpu = d1 - - if event == TRC_TRACE_IRQ: - # IN - d1:vector, d2:tsc_in, d3:tsc_out - # OUT - d1:vector, d2:count, d3:tot_cycles, d4:max_cycles - tsc_diff = d3 - d2 - if tsc_diff < 0: - break - irq_measure[d1]['count'] += 1 - irq_measure[d1]['tot_cycles'] += tsc_diff - if irq_measure[d1]['max_cycles'] < tsc_diff: - irq_measure[d1]['max_cycles'] = tsc_diff - d2 = irq_measure[d1]['count'] - d3 = irq_measure[d1]['tot_cycles'] - d4 = irq_measure[d1]['max_cycles'] - - if event == TRC_PV_HYPERCALL_V2 or event == TRC_PV_HYPERCALL_SUBCALL: - # Mask off the argument present bits. - d1 &= 0x000fffff - - #tsc = (tscH<<32) | tscL - - #print i, tsc - - 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])) - - # provide relative TSC - if last_tsc[cpu] > 0 and tsc_in == 1: - reltsc = tsc - last_tsc[cpu] - else: - reltsc = 0 - - if tsc_in == 1: - last_tsc[cpu] = tsc - - if mhz: - tsc = tsc / (mhz*1000000.0) - - args = {'cpu' : cpu, - 'tsc' : tsc, - 'event' : event, - 'reltsc': reltsc, - '1' : d1, - '2' : d2, - '3' : d3, - '4' : d4, - '5' : d5, - '6' : d6, - '7' : d7 } - - try: - - if str(event) in defs: - print(defs[str(event)] % args) - else: - if str(0) in defs: print(defs[str(0)] % args) - except TypeError: - if str(event) in defs: - print(defs[str(event)]) - print(args) - else: - if str(0) in defs: - print(defs[str(0)]) - print(args) - - - except (IOError, struct.error): sys.exit() -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 24 23:33:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 23:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730050.1135419 (Exim 4.92) (envelope-from ) id 1sAePJ-0002Q5-Pu; Fri, 24 May 2024 23:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730050.1135419; Fri, 24 May 2024 23:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePJ-0002Px-N2; Fri, 24 May 2024 23:33:05 +0000 Received: by outflank-mailman (input) for mailman id 730050; Fri, 24 May 2024 23:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePI-0002Od-3K for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePI-0005Sy-15 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAePI-0005fM-00 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33: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=eXAXjOuMhvh/IMwtlnBSt157dp9LFNLs7BDI3nB3+9o=; b=EVIQ+G9hNxvNbSqcXjJRcbiyPi px7b8v+GsjwIS0Pz1eDH+p219ti5J4PMjjYkHQd+STr+KLCmGaKXQu88HcHrHZzT6eJ7puoIArzD2 KND0MmB5B6k6gn6IcH3GV2/dP4fpMmFoFxIM4R2xA1OGJ/+UzAtQy+9xuK4AmiQKmuwg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xl: Correct the help information and exit code of the dt-overlay command Message-Id: Date: Fri, 24 May 2024 23:33:04 +0000 commit c8cbc5eb1c2e40448e1c1565ce2de08ecaeb21a5 Author: Henry Wang AuthorDate: Thu May 23 15:40:32 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 tools/xl: Correct the help information and exit code of the dt-overlay command Fix the name mismatch in the xl dt-overlay command, the command name should be "dt-overlay" instead of "dt_overlay". Add the missing "," in the cmdtable. Fix the exit code of the dt-overlay command, use EXIT_FAILURE instead of ERROR_FAIL. Fixes: 61765a07e3d8 ("tools/xl: Add new xl command overlay for device tree overlay support") Suggested-by: Anthony PERARD Signed-off-by: Henry Wang Reviewed-by: Jason Andryuk Reviewed-by: Stefano Stabellini --- tools/xl/xl_cmdtable.c | 2 +- tools/xl/xl_vmcontrol.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 62bdb2aeaa..1f3c6b5897 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -635,7 +635,7 @@ const struct cmd_spec cmd_table[] = { { "dt-overlay", &main_dt_overlay, 0, 1, "Add/Remove a device tree overlay", - "add/remove <.dtbo>" + "add/remove <.dtbo>", "-h print this help\n" }, #endif diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index 98f6bd2e76..02575d5d36 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -1278,7 +1278,7 @@ int main_dt_overlay(int argc, char **argv) const int overlay_remove_op = 2; if (argc < 2) { - help("dt_overlay"); + help("dt-overlay"); return EXIT_FAILURE; } @@ -1302,11 +1302,11 @@ int main_dt_overlay(int argc, char **argv) fprintf(stderr, "failed to read the overlay device tree file %s\n", overlay_config_file); free(overlay_dtb); - return ERROR_FAIL; + return EXIT_FAILURE; } } else { fprintf(stderr, "overlay dtbo file not provided\n"); - return ERROR_FAIL; + return EXIT_FAILURE; } rc = libxl_dt_overlay(ctx, overlay_dtb, overlay_dtb_size, op); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 23:33:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 23:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730051.1135424 (Exim 4.92) (envelope-from ) id 1sAePT-0002UT-RO; Fri, 24 May 2024 23:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730051.1135424; Fri, 24 May 2024 23:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePT-0002UL-OZ; Fri, 24 May 2024 23:33:15 +0000 Received: by outflank-mailman (input) for mailman id 730051; Fri, 24 May 2024 23:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePS-0002UB-6d for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePS-0005Te-53 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAePS-0005g8-3E for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33: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=nALSyvLQ+wvgaGnovOrt+mXa1cXkh2vsYOk0UJOSEG0=; b=LfEu1KFDCS2KG5+xmdQUeQQhqz zXoAvHXPO4Iw472U2TC1Ujc92rlOkJixyX+xDn1JAC0XIYZmdxw+yirWTNMB3zJ4TWSG7om0C+sTH jzpBaDTmBkM4WLQpJlHjmNaWfOTP4k2HK6SZYH9KDT2zWT1tTOM2GntdnVZ5FpRpgZQU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm, doc: Add a DT property to specify IOMMU for Dom0less domUs Message-Id: Date: Fri, 24 May 2024 23:33:14 +0000 commit 1d2b4f3049fdb916992c4c19c8496671546ac521 Author: Henry Wang AuthorDate: Thu May 23 15:40:33 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 xen/arm, doc: Add a DT property to specify IOMMU for Dom0less domUs There are some use cases in which the dom0less domUs need to have the XEN_DOMCTL_CDF_iommu set at the domain construction time. For example, the dynamic dtbo feature allows the domain to be assigned a device that is behind the IOMMU at runtime. For these use cases, we need to have a way to specify the domain will need the IOMMU mapping at domain construction time. Introduce a "passthrough" DT property for Dom0less DomUs following the same entry as the xl.cfg. Currently only provide two options, i.e. "enable" and "disable". Set the XEN_DOMCTL_CDF_iommu at domain construction time based on the property. Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 16 ++++++++++++++++ xen/arch/arm/dom0less-build.c | 11 +++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index bbd955e9c2..f1fd069c87 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -260,6 +260,22 @@ with the following properties: value specified by Xen command line parameter gnttab_max_maptrack_frames (or its default value if unspecified, i.e. 1024) is used. +- passthrough + + A string property specifying whether IOMMU mappings are enabled for the + domain and hence whether it will be enabled for passthrough hardware. + Possible property values are: + + - "enabled" + IOMMU mappings are enabled for the domain. Note that this option is the + default if the user provides the device partial passthrough device tree + for the domain. + + - "disabled" + IOMMU mappings are disabled for the domain and so hardware may not be + passed through. This option is the default if this property is missing + and the user does not provide the device partial device tree for the domain. + Under the "xen,domain" compatible node, one or more sub-nodes are present for the DomU kernel and ramdisk. diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 74f053c242..5830a7051d 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -848,6 +848,8 @@ static int __init construct_domU(struct domain *d, void __init create_domUs(void) { struct dt_device_node *node; + const char *dom0less_iommu; + bool iommu = false; const struct dt_device_node *cpupool_node, *chosen = dt_find_node_by_path("/chosen"); @@ -895,8 +897,13 @@ void __init create_domUs(void) panic("Missing property 'cpus' for domain %s\n", dt_node_name(node)); - if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") && - iommu_enabled ) + if ( !dt_property_read_string(node, "passthrough", &dom0less_iommu) && + !strcmp(dom0less_iommu, "enabled") ) + iommu = true; + + if ( iommu_enabled && + (iommu || dt_find_compatible_node(node, NULL, + "multiboot,device-tree")) ) d_cfg.flags |= XEN_DOMCTL_CDF_iommu; if ( !dt_property_read_u32(node, "nr_spis", &d_cfg.arch.nr_spis) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 23:33:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 23:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730052.1135429 (Exim 4.92) (envelope-from ) id 1sAePd-0002ag-Sr; Fri, 24 May 2024 23:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730052.1135429; Fri, 24 May 2024 23:33: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 1sAePd-0002aY-Pz; Fri, 24 May 2024 23:33:25 +0000 Received: by outflank-mailman (input) for mailman id 730052; Fri, 24 May 2024 23:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePc-0002Z3-9f for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePc-0005UK-8s for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAePc-0005h7-7r for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R1jWG7Dkn1eGmgTau+qa4rPgev9NtDabCNuiNmvM134=; b=gomG2UNOn3KLKzJF9ZtlSLHWrl 43TviZCBAuBJAns+QlE10BsdEz+7D5C+quI+M8h+Ub+hocNBJZsS14uHJzldEToDbKTtTyv2O+aiy iZvBQhJx/2hmb+jeMTGUZvjGZpPV3mtiGSNokt4+RJ2edZFSl/gVc7NrYo873DBq6eWE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/arm: Introduce the "nr_spis" xl config entry Message-Id: Date: Fri, 24 May 2024 23:33:24 +0000 commit 6f588194d9c89580cd06518b48116d453e33cc8f Author: Henry Wang AuthorDate: Thu May 23 15:40:34 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 tools/arm: Introduce the "nr_spis" xl config entry Currently, the number of SPIs allocated to the domain is only configurable for Dom0less DomUs. Xen domains are supposed to be platform agnostics and therefore the numbers of SPIs for libxl guests should not be based on the hardware. Introduce a new xl config entry for Arm to provide a method for user to decide the number of SPIs. This would help to avoid bumping the `config->arch.nr_spis` in libxl everytime there is a new platform with increased SPI numbers. Update the doc and the golang bindings accordingly. Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Reviewed-by: Jason Andryuk --- docs/man/xl.cfg.5.pod.in | 16 ++++++++++++++++ tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 5 +++++ tools/libs/light/libxl_arm.c | 4 ++-- tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 3 +++ 7 files changed, 30 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 8f2b375ce9..ac3f88fd57 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -3072,6 +3072,22 @@ raised. =back +=over 4 + +=item B + +An optional integer parameter specifying the number of SPIs (Shared +Peripheral Interrupts) to allocate for the domain. Max is 991 SPIs. If +the value specified by the `nr_spis` parameter is smaller than the +number of SPIs calculated by the toolstack based on the devices +allocated for the domain, or the `nr_spis` parameter is not specified, +the value calculated by the toolstack will be used for the domain. +Otherwise, the value specified by the `nr_spis` parameter will be used. +The number of SPIs should match the highest interrupt ID that will be +assigned to the domain. + +=back + =head3 x86 =over 4 diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index b9cb5b33c7..fe5110474d 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1154,6 +1154,7 @@ return fmt.Errorf("invalid union key '%v'", x.Type)} x.ArchArm.GicVersion = GicVersion(xc.arch_arm.gic_version) x.ArchArm.Vuart = VuartType(xc.arch_arm.vuart) x.ArchArm.SveVl = SveType(xc.arch_arm.sve_vl) +x.ArchArm.NrSpis = uint32(xc.arch_arm.nr_spis) if err := x.ArchX86.MsrRelaxed.fromC(&xc.arch_x86.msr_relaxed);err != nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } @@ -1670,6 +1671,7 @@ return fmt.Errorf("invalid union key '%v'", x.Type)} xc.arch_arm.gic_version = C.libxl_gic_version(x.ArchArm.GicVersion) xc.arch_arm.vuart = C.libxl_vuart_type(x.ArchArm.Vuart) xc.arch_arm.sve_vl = C.libxl_sve_type(x.ArchArm.SveVl) +xc.arch_arm.nr_spis = C.uint32_t(x.ArchArm.NrSpis) if err := x.ArchX86.MsrRelaxed.toC(&xc.arch_x86.msr_relaxed); err != nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 5b293755d7..c9e45b306f 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -597,6 +597,7 @@ ArchArm struct { GicVersion GicVersion Vuart VuartType SveVl SveType +NrSpis uint32 } ArchX86 struct { MsrRelaxed Defbool diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 62cb07dea6..a3d05c840b 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -308,6 +308,11 @@ */ #define LIBXL_HAVE_BUILDINFO_ARCH_ARM_SVE_VL 1 +/* + * libxl_domain_build_info has the arch_arm.nr_spis field + */ +#define LIBXL_HAVE_BUILDINFO_ARCH_NR_SPIS 1 + /* * LIBXL_HAVE_SOFT_RESET indicates that libxl supports performing * 'soft reset' for domains and there is 'soft_reset' shutdown reason diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 1cb89fa584..a4029e3ac8 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -181,8 +181,8 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, LOG(DEBUG, "Configure the domain"); - config->arch.nr_spis = nr_spis; - LOG(DEBUG, " - Allocate %u SPIs", nr_spis); + config->arch.nr_spis = max(nr_spis, d_config->b_info.arch_arm.nr_spis); + LOG(DEBUG, " - Allocate %u SPIs", config->arch.nr_spis); switch (d_config->b_info.arch_arm.gic_version) { case LIBXL_GIC_VERSION_DEFAULT: diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 79e9c656cc..4e65e6fda5 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -722,6 +722,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("arch_arm", Struct(None, [("gic_version", libxl_gic_version), ("vuart", libxl_vuart_type), ("sve_vl", libxl_sve_type), + ("nr_spis", uint32), ])), ("arch_x86", Struct(None, [("msr_relaxed", libxl_defbool), ])), diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index c504ab3711..e3a4800f6e 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2935,6 +2935,9 @@ skip_usbdev: } } + if (!xlu_cfg_get_long (config, "nr_spis", &l, 0)) + b_info->arch_arm.nr_spis = l; + parse_vkb_list(config, d_config); d_config->virtios = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 23:33:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 23:33:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730053.1135432 (Exim 4.92) (envelope-from ) id 1sAePn-0002eZ-U9; Fri, 24 May 2024 23:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730053.1135432; Fri, 24 May 2024 23:33: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 1sAePn-0002eS-RS; Fri, 24 May 2024 23:33:35 +0000 Received: by outflank-mailman (input) for mailman id 730053; Fri, 24 May 2024 23:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePm-0002eE-CX for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePm-0005Uu-Br for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAePm-0005he-B4 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=b5/aZqVC5fxnVnkczk/mNMdDrPg8qk7yOO4nx+0LayQ=; b=e6X69fdUzR744AeLmFSYnMIAcm ESJhnRcGcRJ1qKZyl/h7F39XBh3u4wWAlDtOuWJOVPMp74IAu2+5KTV+5kSmifdzinp7KY2efAmqu sWfrSrxL83k2u1DxttiLBEXxrizDdGQw1es7Sg7qydFzQ3FKT3fSgzblkGzzYLqvAWfs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm/gic: Allow adding interrupt to running VMs Message-Id: Date: Fri, 24 May 2024 23:33:34 +0000 commit 1c77496bc84391a946f5a00b21ffa9c5d71335c9 Author: Henry Wang AuthorDate: Thu May 23 15:40:35 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 xen/arm/gic: Allow adding interrupt to running VMs Currently, adding physical interrupts are only allowed at the domain creation time. For use cases such as dynamic device tree overlay addition, the adding of physical IRQ to running domains should be allowed. Drop the above-mentioned domain creation check. Since this will introduce interrupt state unsync issues for cases when the interrupt is active or pending in the guest, therefore for these cases we simply reject the operation. Do it for both new and old vGIC implementations. Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Reviewed-by: Julien Grall --- xen/arch/arm/gic-vgic.c | 9 +++++++-- xen/arch/arm/gic.c | 8 -------- xen/arch/arm/vgic/vgic.c | 7 +++++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/gic-vgic.c b/xen/arch/arm/gic-vgic.c index 56490dbc43..b99e287224 100644 --- a/xen/arch/arm/gic-vgic.c +++ b/xen/arch/arm/gic-vgic.c @@ -442,9 +442,14 @@ int vgic_connect_hw_irq(struct domain *d, struct vcpu *v, unsigned int virq, if ( connect ) { - /* The VIRQ should not be already enabled by the guest */ + /* + * The VIRQ should not be already enabled by the guest nor + * active/pending in the guest. + */ if ( !p->desc && - !test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) ) + !test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) && + !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) && + !test_bit(GIC_IRQ_GUEST_ACTIVE, &p->status) ) p->desc = desc; else ret = -EBUSY; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 44c40e86de..b3467a76ae 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -135,14 +135,6 @@ int gic_route_irq_to_guest(struct domain *d, unsigned int virq, ASSERT(virq < vgic_num_irqs(d)); ASSERT(!is_lpi(virq)); - /* - * When routing an IRQ to guest, the virtual state is not synced - * back to the physical IRQ. To prevent get unsync, restrict the - * routing to when the Domain is been created. - */ - if ( d->creation_finished ) - return -EBUSY; - ret = vgic_connect_hw_irq(d, NULL, virq, desc, true); if ( ret ) return ret; diff --git a/xen/arch/arm/vgic/vgic.c b/xen/arch/arm/vgic/vgic.c index b9463a5f27..6cabd0496d 100644 --- a/xen/arch/arm/vgic/vgic.c +++ b/xen/arch/arm/vgic/vgic.c @@ -876,8 +876,11 @@ int vgic_connect_hw_irq(struct domain *d, struct vcpu *vcpu, if ( connect ) /* assign a mapped IRQ */ { - /* The VIRQ should not be already enabled by the guest */ - if ( !irq->hw && !irq->enabled ) + /* + * The VIRQ should not be already enabled by the guest nor + * active/pending in the guest. + */ + if ( !irq->hw && !irq->enabled && !irq->active && !irq->pending_latch ) { irq->hw = true; irq->hwintid = desc->irq; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 23:33:46 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 23:33:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730054.1135436 (Exim 4.92) (envelope-from ) id 1sAePy-0002hy-0R; Fri, 24 May 2024 23:33:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730054.1135436; Fri, 24 May 2024 23:33:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePx-0002hq-T2; Fri, 24 May 2024 23:33:45 +0000 Received: by outflank-mailman (input) for mailman id 730054; Fri, 24 May 2024 23:33:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePw-0002hU-GC for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAePw-0005Vq-FL for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAePw-0005iQ-EN for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=M/hLKQtEVpH7gZ6vioIDaZmw2uqN367VhK8ZZ2NipA0=; b=Ti/rIXrkpUWZMrpnXl2i7Q+CIM itaD961QTeVkvBVyZF88kIC4btDqBPPv+TF5Ee7N6MRGa5jubIBMcWqTr9le/AtjuDSRthY/TqN8r drPn+r9TgYmINKzwrBh8SJ5KlchSer5LgNpkOvHhQwGIHzG/Dv+pWrUtqaRPKBeOs4n8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add XEN_DOMCTL_dt_overlay and device attachment to domains Message-Id: Date: Fri, 24 May 2024 23:33:44 +0000 commit 4c733873b5c2dbe7620365eacb399ab885011279 Author: Henry Wang AuthorDate: Thu May 23 15:40:36 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 xen/arm: Add XEN_DOMCTL_dt_overlay and device attachment to domains In order to support the dynamic dtbo device assignment to a running VM, the add/remove of the DT overlay and the attach/detach of the device from the DT overlay should happen separately. Therefore, repurpose the existing XEN_SYSCTL_dt_overlay to only add the DT overlay to Xen device tree, instead of assigning the device to the hardware domain at the same time. It is OK to change the sysctl behavior as this feature is experimental so changing sysctl behavior and breaking compatibility is OK. Add the XEN_DOMCTL_dt_overlay with operations XEN_DOMCTL_DT_OVERLAY_ATTACH to do the device assignment to the domain. The hypervisor firstly checks the DT overlay passed from the toolstack is valid. Then the device nodes are retrieved from the overlay tracker based on the DT overlay. The attach of the device is implemented by mapping the IRQ and IOMMU resources. All devices in the overlay are assigned to a single domain. Also take the opportunity to make one coding style fix in sysctl.h. Introduce DT_OVERLAY_MAX_SIZE and use it to avoid repetitions of KB(500). xen,reg is to be used to handle non-1:1 mappings but it is currently unsupported. For now return errors for not-1:1 mapped domains. Signed-off-by: Henry Wang Signed-off-by: Vikram Garhwal Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domctl.c | 3 + xen/common/dt-overlay.c | 211 ++++++++++++++++++++++++++++++++----------- xen/include/public/domctl.h | 16 +++- xen/include/public/sysctl.h | 11 +-- xen/include/xen/dt-overlay.h | 8 ++ 5 files changed, 189 insertions(+), 60 deletions(-) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index ad56efb0f5..12a12ee781 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -5,6 +5,7 @@ * Copyright (c) 2012, Citrix Systems */ +#include #include #include #include @@ -176,6 +177,8 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, return rc; } + case XEN_DOMCTL_dt_overlay: + return dt_overlay_domctl(d, &domctl->u.dt_overlay); default: return subarch_do_domctl(domctl, d, u_domctl); } diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index 9cece79067..d53b4706cd 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -15,6 +15,8 @@ #include #include +#define DT_OVERLAY_MAX_SIZE KB(500) + static LIST_HEAD(overlay_tracker); static DEFINE_SPINLOCK(overlay_lock); @@ -356,6 +358,42 @@ static int overlay_get_nodes_info(const void *fdto, char **nodes_full_path) return 0; } +/* This function should be called with the overlay_lock taken */ +static struct overlay_track * +find_track_entry_from_tracker(const void *overlay_fdt, + uint32_t overlay_fdt_size) +{ + struct overlay_track *entry, *temp; + bool found_entry = false; + + ASSERT(spin_is_locked(&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 ) + { + found_entry = true; + break; + } + } + + if ( !found_entry ) + { + printk(XENLOG_ERR "Cannot find any matching tracker with input dtbo." + " Operation is supported only for prior added dtbo.\n"); + return NULL; + } + + return entry; +} + /* Check if node itself can be removed and remove node from IOMMU. */ static int remove_node_resources(struct dt_device_node *device_node) { @@ -485,8 +523,7 @@ 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; + struct overlay_track *entry; rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size); if ( rc ) @@ -494,29 +531,10 @@ static long handle_remove_overlay_nodes(const void *overlay_fdt, 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 ) + entry = find_track_entry_from_tracker(overlay_fdt, overlay_fdt_size); + if ( entry == NULL ) { 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; } @@ -620,15 +638,7 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) return -EFAULT; } - rc = handle_device(hardware_domain, overlay_node, p2m_mmio_direct_c, - tr->iomem_ranges, - tr->irq_ranges); write_unlock(&dt_host_lock); - 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; @@ -638,9 +648,7 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) } /* * 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(). + * We use tr->dt_host_new to unflatten the updated device_tree_flattened. */ static long handle_add_overlay_nodes(void *overlay_fdt, uint32_t overlay_fdt_size) @@ -774,20 +782,6 @@ static long handle_add_overlay_nodes(void *overlay_fdt, 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 ) { @@ -843,14 +837,83 @@ static long handle_add_overlay_nodes(void *overlay_fdt, xfree(tr->nodes_address); xfree(tr->fdt); - rangeset_destroy(tr->irq_ranges); - rangeset_destroy(tr->iomem_ranges); - xfree(tr); return rc; } +static long handle_attach_overlay_nodes(struct domain *d, + const void *overlay_fdt, + uint32_t overlay_fdt_size) +{ + int rc; + unsigned int j; + struct overlay_track *entry; + + rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size); + if ( rc ) + return rc; + + spin_lock(&overlay_lock); + + entry = find_track_entry_from_tracker(overlay_fdt, overlay_fdt_size); + if ( entry == NULL ) + { + rc = -EINVAL; + goto out; + } + + entry->irq_ranges = rangeset_new(d, "Overlays: Interrupts", 0); + if (entry->irq_ranges == NULL) + { + rc = -ENOMEM; + printk(XENLOG_ERR "Creating IRQ rangeset failed"); + goto out; + } + + entry->iomem_ranges = rangeset_new(d, "Overlay: I/O Memory", 0); + if (entry->iomem_ranges == NULL) + { + rc = -ENOMEM; + printk(XENLOG_ERR "Creating IOMMU rangeset failed"); + goto out; + } + + for ( j = 0; j < entry->num_nodes; j++ ) + { + struct dt_device_node *overlay_node; + + overlay_node = (struct dt_device_node *)entry->nodes_address[j]; + if ( overlay_node == NULL ) + { + rc = -EINVAL; + goto out; + } + + write_lock(&dt_host_lock); + rc = handle_device(d, overlay_node, p2m_mmio_direct_c, + entry->iomem_ranges, entry->irq_ranges); + write_unlock(&dt_host_lock); + if ( rc ) + { + printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n"); + goto out; + } + } + + spin_unlock(&overlay_lock); + + return 0; + + out: + spin_unlock(&overlay_lock); + + rangeset_destroy(entry->irq_ranges); + rangeset_destroy(entry->iomem_ranges); + + return rc; +} + long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) { long ret; @@ -860,7 +923,8 @@ long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) op->overlay_op != XEN_SYSCTL_DT_OVERLAY_REMOVE ) return -EOPNOTSUPP; - if ( op->overlay_fdt_size == 0 || op->overlay_fdt_size > KB(500) ) + if ( op->overlay_fdt_size == 0 || + op->overlay_fdt_size > DT_OVERLAY_MAX_SIZE ) return -EINVAL; if ( op->pad[0] || op->pad[1] || op->pad[2] ) @@ -890,6 +954,49 @@ long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) return ret; } +long dt_overlay_domctl(struct domain *d, struct xen_domctl_dt_overlay *op) +{ + long ret; + void *overlay_fdt; + + if ( op->overlay_op != XEN_DOMCTL_DT_OVERLAY_ATTACH ) + return -EOPNOTSUPP; + + if ( op->overlay_fdt_size == 0 || + op->overlay_fdt_size > DT_OVERLAY_MAX_SIZE ) + return -EINVAL; + + if ( op->pad[0] || op->pad[1] || op->pad[2] ) + return -EINVAL; + + /* TODO: add support for non-1:1 domains using xen,reg */ + if ( !is_domain_direct_mapped(d) ) + return -EOPNOTSUPP; + + 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_DOMCTL_DT_OVERLAY_ATTACH ) + ret = handle_attach_overlay_nodes(d, overlay_fdt, op->overlay_fdt_size); + else + ret = -EOPNOTSUPP; + + xfree(overlay_fdt); + + return ret; +} + /* * Local variables: * mode: C diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index a33f9ec32b..6cd39ea46d 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -21,7 +21,7 @@ #include "hvm/save.h" #include "memory.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000016 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000017 /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -1190,6 +1190,16 @@ struct xen_domctl_vmtrace_op { typedef struct xen_domctl_vmtrace_op xen_domctl_vmtrace_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vmtrace_op_t); +#if defined(__arm__) || defined(__aarch64__) +struct xen_domctl_dt_overlay { + XEN_GUEST_HANDLE_64(const_void) overlay_fdt; /* IN: overlay fdt. */ + uint32_t overlay_fdt_size; /* IN: Overlay dtb size. */ +#define XEN_DOMCTL_DT_OVERLAY_ATTACH 1 + uint8_t overlay_op; /* IN: Attach. */ + uint8_t pad[3]; /* IN: Must be zero. */ +}; +#endif + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -1277,6 +1287,7 @@ struct xen_domctl { #define XEN_DOMCTL_vmtrace_op 84 #define XEN_DOMCTL_get_paging_mempool_size 85 #define XEN_DOMCTL_set_paging_mempool_size 86 +#define XEN_DOMCTL_dt_overlay 87 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1339,6 +1350,9 @@ struct xen_domctl { struct xen_domctl_vuart_op vuart_op; struct xen_domctl_vmtrace_op vmtrace_op; struct xen_domctl_paging_mempool paging_mempool; +#if defined(__arm__) || defined(__aarch64__) + struct xen_domctl_dt_overlay dt_overlay; +#endif uint8_t pad[128]; } u; }; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index febaa4b16a..3a6e7d48f0 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -1184,14 +1184,11 @@ 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__) +#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. + * Performs addition/removal of device tree nodes under parent node using dtbo + * from dt_host. */ struct xen_sysctl_dt_overlay { XEN_GUEST_HANDLE_64(const_void) overlay_fdt; /* IN: overlay fdt. */ @@ -1265,7 +1262,7 @@ struct xen_sysctl { struct xen_sysctl_cpu_policy cpu_policy; #endif -#if defined(__arm__) || defined (__aarch64__) +#if defined(__arm__) || defined(__aarch64__) struct xen_sysctl_dt_overlay dt_overlay; #endif uint8_t pad[128]; diff --git a/xen/include/xen/dt-overlay.h b/xen/include/xen/dt-overlay.h index c0567741ee..b2cedf3f2a 100644 --- a/xen/include/xen/dt-overlay.h +++ b/xen/include/xen/dt-overlay.h @@ -39,15 +39,23 @@ struct overlay_track { }; struct xen_sysctl_dt_overlay; +struct xen_domctl_dt_overlay; #ifdef CONFIG_OVERLAY_DTB long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op); +long dt_overlay_domctl(struct domain *d, struct xen_domctl_dt_overlay *op); #else #include static inline long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) { return -EOPNOTSUPP; } + +static inline long dt_overlay_domctl(struct domain *d, + struct xen_domctl_dt_overlay *op) +{ + return -EOPNOTSUPP; +} #endif #endif /* __XEN_DT_OVERLAY_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 23:33:56 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 23:33:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730055.1135441 (Exim 4.92) (envelope-from ) id 1sAeQ8-0002l2-3i; Fri, 24 May 2024 23:33:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730055.1135441; Fri, 24 May 2024 23:33:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAeQ7-0002ku-W6; Fri, 24 May 2024 23:33:55 +0000 Received: by outflank-mailman (input) for mailman id 730055; Fri, 24 May 2024 23:33:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAeQ6-0002km-Jj for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAeQ6-0005WP-Iy for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAeQ6-0005j3-I8 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:33:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HU9Ysuzl03XW3z0exzkWLAIrn1d9TVqBdd06TP3HV8k=; b=gMyJZhsGLizjWlC6SryCnp39hi uEqErRJS3KLJpwX0EoKBMXXzFKmd10FMftdk6kAP8QW/toCMceQV6tHQ+ZlE4CACIyKEfq9XLDMG8 IDR+g830wrOR1k1owtWqmHkwyBLfLgDd3KmpFEBAvXlIo6KHyekHyXxBd0IVGwwss58g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: Introduce the "xl dt-overlay attach" command Message-Id: Date: Fri, 24 May 2024 23:33:54 +0000 commit 2c4fbadf7372bf5344d0a637367fb392d4c9322b Author: Henry Wang AuthorDate: Thu May 23 15:40:39 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 tools: Introduce the "xl dt-overlay attach" command With the XEN_DOMCTL_dt_overlay DOMCTL added, users should be able to attach (in the future also detach) devices from the provided DT overlay to domains. Support this by introducing a new "xl dt-overlay" command and related documentation, i.e. "xl dt-overlay attach. Slightly rework the command option parsing logic. Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Reviewed-by: Jason Andryuk Reviewed-by: Stefano Stabellini --- tools/include/libxl.h | 15 ++++++++++++++ tools/include/xenctrl.h | 3 +++ tools/libs/ctrl/xc_dt_overlay.c | 31 +++++++++++++++++++++++++++++ tools/libs/light/libxl_dt_overlay.c | 28 ++++++++++++++++++++++++++ tools/xl/xl_cmdtable.c | 4 ++-- tools/xl/xl_vmcontrol.c | 39 +++++++++++++++++++++++++------------ 6 files changed, 106 insertions(+), 14 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index a3d05c840b..f5c7167742 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -641,6 +641,12 @@ */ #define LIBXL_HAVE_XEN_9PFS 1 +/* + * LIBXL_HAVE_DT_OVERLAY_DOMAIN indicates the presence of + * libxl_dt_overlay_domain. + */ +#define LIBXL_HAVE_DT_OVERLAY_DOMAIN 1 + /* * libxl memory management * @@ -2554,8 +2560,17 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, void libxl_device_pci_list_free(libxl_device_pci* list, int num); #if defined(__arm__) || defined(__aarch64__) +/* Values should keep consistent with the op from XEN_SYSCTL_dt_overlay */ +#define LIBXL_DT_OVERLAY_ADD 1 +#define LIBXL_DT_OVERLAY_REMOVE 2 int libxl_dt_overlay(libxl_ctx *ctx, void *overlay, uint32_t overlay_size, uint8_t overlay_op); + +/* Values should keep consistent with the op from XEN_DOMCTL_dt_overlay */ +#define LIBXL_DT_OVERLAY_DOMAIN_ATTACH 1 +int libxl_dt_overlay_domain(libxl_ctx *ctx, uint32_t domain_id, + void *overlay_dt, uint32_t overlay_dt_size, + uint8_t overlay_op); #endif /* diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 4996855944..9ceca0cffc 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -2657,6 +2657,9 @@ int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, #if defined(__arm__) || defined(__aarch64__) int xc_dt_overlay(xc_interface *xch, void *overlay_fdt, uint32_t overlay_fdt_size, uint8_t overlay_op); +int xc_dt_overlay_domain(xc_interface *xch, void *overlay_fdt, + uint32_t overlay_fdt_size, uint8_t overlay_op, + uint32_t domain_id); #endif /* Compat shims */ diff --git a/tools/libs/ctrl/xc_dt_overlay.c b/tools/libs/ctrl/xc_dt_overlay.c index c2224c4d15..ea1da522d1 100644 --- a/tools/libs/ctrl/xc_dt_overlay.c +++ b/tools/libs/ctrl/xc_dt_overlay.c @@ -48,3 +48,34 @@ err: return err; } + +int xc_dt_overlay_domain(xc_interface *xch, void *overlay_fdt, + uint32_t overlay_fdt_size, uint8_t overlay_op, + uint32_t domain_id) +{ + int err; + struct xen_domctl domctl = { + .cmd = XEN_DOMCTL_dt_overlay, + .domain = domain_id, + .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(domctl.u.dt_overlay.overlay_fdt, overlay_fdt); + + if ( (err = do_domctl(xch, &domctl)) != 0 ) + PERROR("%s failed", __func__); + +err: + xc_hypercall_bounce_post(xch, overlay_fdt); + + return err; +} diff --git a/tools/libs/light/libxl_dt_overlay.c b/tools/libs/light/libxl_dt_overlay.c index a6c709a6dc..00503b76bd 100644 --- a/tools/libs/light/libxl_dt_overlay.c +++ b/tools/libs/light/libxl_dt_overlay.c @@ -69,3 +69,31 @@ out: return rc; } +int libxl_dt_overlay_domain(libxl_ctx *ctx, uint32_t domain_id, + 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_domain(ctx->xch, overlay_dt, overlay_dt_size, overlay_op, + domain_id); + if (r) { + LOG(ERROR, "%s: Attaching/Detaching overlay dtb failed.", __func__); + rc = ERROR_FAIL; + } + +out: + GC_FREE; + return rc; +} diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 1f3c6b5897..42751228c1 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -634,8 +634,8 @@ const struct cmd_spec cmd_table[] = { #ifdef LIBXL_HAVE_DT_OVERLAY { "dt-overlay", &main_dt_overlay, 0, 1, - "Add/Remove a device tree overlay", - "add/remove <.dtbo>", + "Add/Remove a device tree overlay to Xen device tree, attach/detach the device to a domain", + " <.dtbo> OR <.dtbo> ", "-h print this help\n" }, #endif diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index 02575d5d36..fa1a4420e3 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -1268,32 +1268,43 @@ int main_create(int argc, char **argv) #ifdef LIBXL_HAVE_DT_OVERLAY 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; + uint32_t domain_id = 0; + bool domain_op = false; 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 { + if (strcmp(argv[optind], "add") == 0) + op = LIBXL_DT_OVERLAY_ADD; + else if (strcmp(argv[optind], "remove") == 0) + op = LIBXL_DT_OVERLAY_REMOVE; + else if (strcmp(argv[optind], "attach") == 0) { + op = LIBXL_DT_OVERLAY_DOMAIN_ATTACH; + domain_op = true; + } else { fprintf(stderr, "Invalid dt overlay operation\n"); return EXIT_FAILURE; } + overlay_config_file = argv[optind+1]; + + if (domain_op) { + if (argc <= optind + 2) { + fprintf(stderr, "Missing domain ID\n"); + help("dt-overlay"); + return EXIT_FAILURE; + } else { + domain_id = find_domain(argv[optind+2]); + } + } + if (overlay_config_file) { rc = libxl_read_file_contents(ctx, overlay_config_file, &overlay_dtb, &overlay_dtb_size); @@ -1309,7 +1320,11 @@ int main_dt_overlay(int argc, char **argv) return EXIT_FAILURE; } - rc = libxl_dt_overlay(ctx, overlay_dtb, overlay_dtb_size, op); + if (!domain_op) + rc = libxl_dt_overlay(ctx, overlay_dtb, overlay_dtb_size, op); + else + rc = libxl_dt_overlay_domain(ctx, domain_id, overlay_dtb, + overlay_dtb_size, op); free(overlay_dtb); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 24 23:34:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 24 May 2024 23:34:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730056.1135445 (Exim 4.92) (envelope-from ) id 1sAeQI-0002nV-4O; Fri, 24 May 2024 23:34:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730056.1135445; Fri, 24 May 2024 23:34:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAeQI-0002nN-1M; Fri, 24 May 2024 23:34:06 +0000 Received: by outflank-mailman (input) for mailman id 730056; Fri, 24 May 2024 23:34:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAeQG-0002nA-NT for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:34:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAeQG-0005XB-Lu for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:34:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAeQG-0005kG-L4 for xen-changelog@lists.xenproject.org; Fri, 24 May 2024 23:34:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hljbocVR1yfg1q1YRolvNq5Vw++9PMWyIp8iUGdvj0U=; b=EB24+XH2TyYbK9CpYuL/jwOmkp lloE6+hoKivbaHEX4aoz3TWz/tZMJGjtBfRR+HMM9XeV0vKN6lDqn2/FWLvhi6+ov4lj9ta/rVk2A qeCQOmMXg4MhXZc8mvpxTAqaiiLP4F7o+hiF6Za9gFR2hyjMngUjP1AEOOGR/cgXh00M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: Add device tree overlay documentation Message-Id: Date: Fri, 24 May 2024 23:34:04 +0000 commit ac572152e578a8853de0534384c1539ec21f11e0 Author: Vikram Garhwal AuthorDate: Thu May 23 15:40:40 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 docs: Add device tree overlay documentation Signed-off-by: Vikram Garhwal Signed-off-by: Stefano Stabellini Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- docs/misc/arm/overlay.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/docs/misc/arm/overlay.txt b/docs/misc/arm/overlay.txt new file mode 100644 index 0000000000..ca85b1beea --- /dev/null +++ b/docs/misc/arm/overlay.txt @@ -0,0 +1,82 @@ +# Device Tree Overlays support in Xen + +Xen experimentally supports dynamic device assignment to running +domains, i.e. adding/removing nodes (using .dtbo) to/from Xen device +tree, and attaching them to a running domain with given $domid. + +Dynamic node assignment works in two steps: + +## Add/Remove device tree overlay to/from Xen device tree + +1. Xen tools check the dtbo given and parse all other user provided arguments +2. Xen tools pass the dtbo to Xen hypervisor via hypercall. +3. Xen hypervisor applies/removes the dtbo to/from Xen device tree. + +## Attach device from the DT overlay to domain + +1. Xen tools check the dtbo given and parse all other user provided arguments +2. Xen tools pass the dtbo to Xen hypervisor via hypercall. +3. Xen hypervisor attach the device to the user-provided $domid by + mapping node resources in the DT overlay. + +# Examples + +Here are a few examples on how to use it. + +## Dom0 device add + +For assigning a device tree overlay to Dom0, user should firstly properly +prepare the DT overlay. More information about device tree overlays can be +found in [1]. Then, in Dom0, enter the following: + + (dom0) xl dt-overlay add overlay.dtbo + +This will allocate the devices mentioned in overlay.dtbo to Xen device tree. + +To assign the newly added device from the dtbo to Dom0: + + (dom0) xl dt-overlay attach overlay.dtbo 0 + +Next, if the user wants to add the same device tree overlay to dom0 +Linux, execute the following: + + (dom0) mkdir -p /sys/kernel/config/device-tree/overlays/new_overlay + (dom0) cat overlay.dtbo > /sys/kernel/config/device-tree/overlays/new_overlay/dtbo + +Finally if needed, the relevant Linux kernel drive can be loaded using: + + (dom0) modprobe module_name.ko + +## DomU device add/remove + +All the nodes in dtbo will be assigned to one domain. The user will need +to prepare a different dtbo for the domU. For example, the +`interrupt-parent` property of the DomU overlay should be changed to the +Xen hardcoded value `0xfde8` and the xen,reg property should be added to +specify the address mappings. If the domain is not 1:1 mapped, xen,reg +must be present. See the xen,reg format description in +docs/misc/arm/passthrough.txt. Below assumes the properly written DomU +dtbo is `overlay_domu.dtbo`. + +The user needs to set the `passthrough` property in the xl config file +if you plan to use DT overlay and devices requiring an IOMMU. + +User will also need to modprobe the relevant drivers. For already +running domains, the user can use the xl dt-overlay attach command, +example: + + (dom0) xl dt-overlay add overlay.dtbo # If not executed before + (dom0) xl dt-overlay attach overlay_domu.dtbo $domid + (dom0) xl console $domid # To access $domid console + +Next, if the user needs to modify/prepare the overlay.dtbo suitable for +the domU: + + (domU) mkdir -p /sys/kernel/config/device-tree/overlays/new_overlay + (domU) cat overlay_domu.dtbo > /sys/kernel/config/device-tree/overlays/new_overlay/dtbo + +Finally, if needed, the relevant Linux kernel drive can be probed: + + (domU) modprobe module_name.ko + +[1] https://www.kernel.org/doc/Documentation/devicetree/overlay-notes.txt -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:44:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730102.1135468 (Exim 4.92) (envelope-from ) id 1sAiKB-0007td-AJ; Sat, 25 May 2024 03:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730102.1135468; Sat, 25 May 2024 03:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKB-0007tT-7O; Sat, 25 May 2024 03:44:03 +0000 Received: by outflank-mailman (input) for mailman id 730102; Sat, 25 May 2024 03:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiK9-0007tF-SB for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiK9-0002hy-Ny for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiK9-0005yV-MS for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EQd+2TSArqiByJxa1F5cyRST7R25dRniOO018IKSNwU=; b=SsMsYYeKrkMxJkIVtbnqlxcACi w1re1QoEbyWdTjfD/XTkUpDGXQYex+pjvdVNAkExisDMluCmDWcj7/ZbPfDoRtBAkaetJbtjZxxgM FvMwci/9FxlGwOp2MKKNsIZiDc1KIJ1UoLl3sgpwClSDzFMd2JqXbUlrL39fAi8bGhcA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] update Xen version to 4.17.5-pre Message-Id: Date: Sat, 25 May 2024 03:44:01 +0000 commit f772bab69e02474f447007e2dd713034b69f0098 Author: Jan Beulich AuthorDate: Tue May 21 11:53:11 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:53:11 2024 +0200 update Xen version to 4.17.5-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 6f9c407332..dfb3686d3b 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 = 17 -export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730103.1135471 (Exim 4.92) (envelope-from ) id 1sAiKL-0007vT-Bm; Sat, 25 May 2024 03:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730103.1135471; Sat, 25 May 2024 03: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 1sAiKL-0007vM-8l; Sat, 25 May 2024 03:44:13 +0000 Received: by outflank-mailman (input) for mailman id 730103; Sat, 25 May 2024 03:44:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKJ-0007vA-Tv for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKJ-0002iR-Sw for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiKJ-00060A-QA for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=tHULJ1cYwKRHWbidj6RhAWkFUcmc8scIMFB56xYvnZI=; b=XDKIo+qejR/URVXNgcBbAn2nHn p8U2BknequGAnbZQHjB4rtAQj6sw17nLeF6LWAAZb+UGcKChpRxLfXxa2rIOwb0diI939mw3Ox+JL JvvLHLk4jIKY5mXSjneE53kQI9lP/FYTFAXitI7v1gjc0V1Fi8wMRO48H5ne6yiHVSzY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] block-common: Fix same_vm for no targets Message-Id: Date: Sat, 25 May 2024 03:44:11 +0000 commit 20443648649a499f1f5fcbe991a4ff35d31630f0 Author: Jason Andryuk AuthorDate: Tue May 21 11:53:54 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:53:54 2024 +0200 block-common: Fix same_vm for no targets same_vm is broken when the two main domains do not have targets. otvm and targetvm are both missing, which means they get set to -1 and then converted to empty strings: ++10697+ local targetvm=-1 ++10697+ local otvm=-1 ++10697+ otvm= ++10697+ othervm=/vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 ++10697+ targetvm= ++10697+ local frontend_uuid=/vm/844dea4e-44f8-4e3e-8145-325132a31ca5 The final comparison returns true since the two empty strings match: ++10697+ '[' /vm/844dea4e-44f8-4e3e-8145-325132a31ca5 = /vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 -o '' = /vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 -o /vm/844dea4e-44f8-4e3e-8145-325132a31ca5 = '' -o '' = '' ']' Replace -1 with distinct strings indicating the lack of a value and remove the collescing to empty stings. The strings themselves will no longer match, and that is correct. ++12364+ '[' /vm/844dea4e-44f8-4e3e-8145-325132a31ca5 = /vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 -o 'No target' = /vm/cc97bc2f-3a91-43f7-8fbc-4cb92f90b4e4 -o /vm/844dea4e-44f8-4e3e-8145-325132a31ca5 = 'No other target' -o 'No target' = 'No other target' ']' Signed-off-by: Jason Andryuk Reviewed-by: Anthony PERARD master commit: e8f1bb803fdf44db708991593568a9e3e6b3d130 master date: 2024-02-07 13:46:52 +0100 --- tools/hotplug/Linux/block-common.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/block-common.sh b/tools/hotplug/Linux/block-common.sh index f86a88c4eb..5c80237d99 100644 --- a/tools/hotplug/Linux/block-common.sh +++ b/tools/hotplug/Linux/block-common.sh @@ -112,14 +112,12 @@ same_vm() "$FRONTEND_UUID") local target=$(xenstore_read_default "/local/domain/$FRONTEND_ID/target" \ "-1") - local targetvm=$(xenstore_read_default "/local/domain/$target/vm" "-1") + local targetvm=$(xenstore_read_default "/local/domain/$target/vm" "No Target") local otarget=$(xenstore_read_default "/local/domain/$otherdom/target" \ "-1") local otvm=$(xenstore_read_default "/local/domain/$otarget/vm" \ - "-1") - otvm=${otvm%-1} - othervm=${othervm%-1} - targetvm=${targetvm%-1} + "No Other Target") + local frontend_uuid=${FRONTEND_UUID%-1} [ "$frontend_uuid" = "$othervm" -o "$targetvm" = "$othervm" -o \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:44:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730104.1135476 (Exim 4.92) (envelope-from ) id 1sAiKV-0007y3-DJ; Sat, 25 May 2024 03:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730104.1135476; Sat, 25 May 2024 03: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 1sAiKV-0007xv-AX; Sat, 25 May 2024 03:44:23 +0000 Received: by outflank-mailman (input) for mailman id 730104; Sat, 25 May 2024 03:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKU-0007xk-1a for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKT-0002j1-WE for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiKT-00061o-VH for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=JzbraFpSdSS7fKYC+B5E2f0HhNZxvztmmlSTG87knJg=; b=FsR+A4B/glE5MP++6jRob/tuSl A/CjybiFOEaATkwNl69CocibqS5ni1IjLHXufj7qkRlO1jpq7/uRD5kiOr92qqjlnwZm6sosHj3pD axnK+X5gf1MV8IXTsNW67C9MlbNxukvqhUSyXV8pc/DWcziOr8tU2YeaxnoFlHG0j5EY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/hvm: Fix Misra Rule 19.1 regression Message-Id: Date: Sat, 25 May 2024 03:44:21 +0000 commit ae19cd743c0f8deda0381a19911b01f8c19cf843 Author: Andrew Cooper AuthorDate: Tue May 21 11:54:20 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:54:20 2024 +0200 x86/hvm: Fix Misra Rule 19.1 regression Despite noticing an impending Rule 19.1 violation, the adjustment made (the uint32_t cast) wasn't sufficient to avoid it. Try again. Subsequently noticed by Coverity too. Fixes: 6a98383b0877 ("x86/HVM: clear upper halves of GPRs upon entry from 32-bit code") Coverity-IDs: 1596289 thru 1596298 Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini master commit: d0a718a45f14b86471d8eb3083acd72760963470 master date: 2024-04-11 13:23:08 +0100 --- xen/arch/x86/include/asm/hvm/hvm.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/hvm/hvm.h index d67565dcb9..e16f9f3489 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -589,16 +589,16 @@ static inline void hvm_sanitize_regs_fields(struct cpu_user_regs *regs, if ( compat ) { /* Clear GPR upper halves, to counteract guests playing games. */ - regs->rbp = (uint32_t)regs->ebp; - regs->rbx = (uint32_t)regs->ebx; - regs->rax = (uint32_t)regs->eax; - regs->rcx = (uint32_t)regs->ecx; - regs->rdx = (uint32_t)regs->edx; - regs->rsi = (uint32_t)regs->esi; - regs->rdi = (uint32_t)regs->edi; - regs->rip = (uint32_t)regs->eip; - regs->rflags = (uint32_t)regs->eflags; - regs->rsp = (uint32_t)regs->esp; + regs->rbp = (uint32_t)regs->rbp; + regs->rbx = (uint32_t)regs->rbx; + regs->rax = (uint32_t)regs->rax; + regs->rcx = (uint32_t)regs->rcx; + regs->rdx = (uint32_t)regs->rdx; + regs->rsi = (uint32_t)regs->rsi; + regs->rdi = (uint32_t)regs->rdi; + regs->rip = (uint32_t)regs->rip; + regs->rflags = (uint32_t)regs->rflags; + regs->rsp = (uint32_t)regs->rsp; } #ifndef NDEBUG -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:44:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730105.1135479 (Exim 4.92) (envelope-from ) id 1sAiKf-00081S-F0; Sat, 25 May 2024 03:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730105.1135479; Sat, 25 May 2024 03: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 1sAiKf-00081K-C9; Sat, 25 May 2024 03:44:33 +0000 Received: by outflank-mailman (input) for mailman id 730105; Sat, 25 May 2024 03:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKe-000816-4e for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKe-0002jV-3i for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiKe-00065D-1z for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=TPq/xwrpT7SJr5FyXPGkehNq+HRdhHeSW3knikUZCdU=; b=PFsCT6hCMlfD+AY7o7uo+sML4U 0Ik07XiROngfFvhnXCXH0rQ9L1gEQBC1wIAnUTu+RPFKVR9o0L05BE1tsDWbOboghTDMGjCsZv8om uEAnxMjYGKtEoq2fRaUII0HYFT/1fNtH57fUSHCBJeD1Lg/9smu+LnWkRd/RP3AIH4ZM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] altcall: fix __alt_call_maybe_initdata so it's safe for livepatch Message-Id: Date: Sat, 25 May 2024 03:44:32 +0000 commit 8d1c36d25a777bed97a8b5da0128fa7b9320f911 Author: Roger Pau Monné AuthorDate: Tue May 21 11:55:09 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:55:09 2024 +0200 altcall: fix __alt_call_maybe_initdata so it's safe for livepatch Setting alternative call variables as __init is not safe for use with livepatch, as livepatches can rightfully introduce new alternative calls to structures marked as __alt_call_maybe_initdata (possibly just indirectly due to replacing existing functions that use those). Attempting to resolve those alternative calls then results in page faults as the variable that holds the function pointer address has been freed. When livepatch is supported use the __ro_after_init attribute instead of __initdata for __alt_call_maybe_initdata. Fixes: f26bb285949b ('xen: Implement xen/alternative-call.h for use in common code') Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper master commit: af4cd0a6a61cdb03bc1afca9478b05b0c9703599 master date: 2024-04-11 18:51:36 +0100 --- xen/include/xen/alternative-call.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/alternative-call.h b/xen/include/xen/alternative-call.h index 5c6b9a562b..10f7d7637e 100644 --- a/xen/include/xen/alternative-call.h +++ b/xen/include/xen/alternative-call.h @@ -50,7 +50,12 @@ #include -#define __alt_call_maybe_initdata __initdata +#ifdef CONFIG_LIVEPATCH +/* Must keep for livepatches to resolve alternative calls. */ +# define __alt_call_maybe_initdata __ro_after_init +#else +# define __alt_call_maybe_initdata __initdata +#endif #else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:44:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730106.1135483 (Exim 4.92) (envelope-from ) id 1sAiKp-00084l-J1; Sat, 25 May 2024 03:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730106.1135483; Sat, 25 May 2024 03: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 1sAiKp-00084d-GX; Sat, 25 May 2024 03:44:43 +0000 Received: by outflank-mailman (input) for mailman id 730106; Sat, 25 May 2024 03:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKo-00084R-83 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKo-0002k0-7D for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiKo-00066s-5p for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=/THmJX5a/1G3ZYM2x0Yl8UTfVNDLp5XbH2U1LkxAkNE=; b=1nYK42Zto0LzQF4qD8LrCsE5aS n/u9LciPZEt9nNEL/OH7kK4BEEzROD6eoM1A+rOb+zOO/YTa10sJPTRv64SSfKmUs/Qe1LJdduVQ9 1NJrASr5gl5OdH8HfXB1+Xd/xck5vkSd+HaDnWE5cbzb5scupHSjnkCIkPNZYDWga8W0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/rtc: Avoid UIP flag being set for longer than expected Message-Id: Date: Sat, 25 May 2024 03:44:42 +0000 commit ef9f147af614a259e54720a133232a1c67dac6c8 Author: Ross Lagerwall AuthorDate: Tue May 21 11:55:49 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:55:49 2024 +0200 x86/rtc: Avoid UIP flag being set for longer than expected In a test, OVMF reported an error initializing the RTC without indicating the precise nature of the error. The only plausible explanation I can find is as follows: As part of the initialization, OVMF reads register C and then reads register A repatedly until the UIP flag is not set. If this takes longer than 100 ms, OVMF fails and reports an error. This may happen with the following sequence of events: At guest time=0s, rtc_init() calls check_update_timer() which schedules update_timer for t=(1 - 244us). At t=1s, the update_timer function happens to have been called >= 244us late. In the timer callback, it sets the UIP flag and schedules update_timer2 for t=1s. Before update_timer2 runs, the guest reads register C which calls check_update_timer(). check_update_timer() stops the scheduled update_timer2 and since the guest time is now outside of the update cycle, it schedules update_timer for t=(2 - 244us). The UIP flag will therefore be set for a whole second from t=1 to t=2 while the guest repeatedly reads register A waiting for the UIP flag to clear. Fix it by clearing the UIP flag when scheduling update_timer. I was able to reproduce this issue with a synthetic test and this resolves the issue. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: 43a07069863b419433dee12c9b58c1f7ce70aa97 master date: 2024-04-23 14:09:18 +0200 --- xen/arch/x86/hvm/rtc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d21925db08..f582280637 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -203,6 +203,7 @@ static void check_update_timer(RTCState *s) } else { + s->hw.cmos_data[RTC_REG_A] &= ~RTC_UIP; next_update_time = (USEC_PER_SEC - guest_usec - 244) * NS_PER_USEC; expire_time = NOW() + next_update_time; s->next_update_time = expire_time; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:44:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730107.1135488 (Exim 4.92) (envelope-from ) id 1sAiKz-00087L-Kn; Sat, 25 May 2024 03:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730107.1135488; Sat, 25 May 2024 03: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 1sAiKz-00087A-Hz; Sat, 25 May 2024 03:44:53 +0000 Received: by outflank-mailman (input) for mailman id 730107; Sat, 25 May 2024 03:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKy-000872-BB for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiKy-0002ko-AP for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiKy-00068W-9S for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=K1dZida5rVXI7R5DAh1sB4lz4HyDA7Oh6uPhtPell2g=; b=YVhHwCPSaNd/Ayv1uD4bekavMk bpCn35HTNJXAm1w6iGs2UDPSXGyUvZ9d9kN3PsAxD5IAg8NJS2L6EU+CZgoQrSh6qNTLTG0kONxsS PYtilvoxjXsJK2BnIA9PM5EJDDep+OFqH3vyHOpqakECrmuX/MP9NHFFWC9iFgVbEOtk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] xen/xsm: Wire up get_dom0_console Message-Id: Date: Sat, 25 May 2024 03:44:52 +0000 commit 9cef77400470604e76c6c3aa9f647c40429ff956 Author: Jason Andryuk AuthorDate: Tue May 21 11:57:20 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:57:20 2024 +0200 xen/xsm: Wire up get_dom0_console An XSM hook for get_dom0_console is currently missing. Using XSM with a PVH dom0 shows: (XEN) FLASK: Denying unknown platform_op: 64. Wire up the hook, and allow it for dom0. Fixes: 4dd160583c ("x86/platform: introduce hypercall to get initial video console settings") Signed-off-by: Jason Andryuk Acked-by: Daniel P. Smith master commit: 647f7e50ebeeb8152974cad6a12affe474c74513 master date: 2024-04-30 08:33:41 +0200 --- tools/flask/policy/modules/dom0.te | 2 +- xen/xsm/flask/hooks.c | 4 ++++ xen/xsm/flask/policy/access_vectors | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index f1dcff48e2..16b8c9646d 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - coverage_op + coverage_op get_dom0_console }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 78225f68c1..5e88c71b8e 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1558,6 +1558,10 @@ static int cf_check flask_platform_op(uint32_t op) return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, SECCLASS_XEN2, XEN2__GET_SYMBOL, NULL); + case XENPF_get_dom0_console: + return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, + SECCLASS_XEN2, XEN2__GET_DOM0_CONSOLE, NULL); + default: return avc_unknown_permission("platform_op", op); } diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 4e6710a63e..a35e3d4c51 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,6 +99,8 @@ class xen2 livepatch_op # XEN_SYSCTL_coverage_op coverage_op +# XENPF_get_dom0_console + get_dom0_console } # Classes domain and domain2 consist of operations that a domain performs on -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:45:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730108.1135492 (Exim 4.92) (envelope-from ) id 1sAiLA-0008AD-MT; Sat, 25 May 2024 03:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730108.1135492; Sat, 25 May 2024 03:45:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLA-0008A5-Ja; Sat, 25 May 2024 03:45:04 +0000 Received: by outflank-mailman (input) for mailman id 730108; Sat, 25 May 2024 03:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiL8-00089p-Et for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiL8-0002li-E9 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiL8-0006AQ-Cy for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=TYFW8++AsDxShlliIxDFFLxkud1mRayrH+f71nDULQE=; b=X7NeuM473ad/NSHXaXwCzXh6DT HeoIFX0X6STC102fH/R3XkHX0kjK4JJ5gwS4t/mbI1RtNzHGt1/v0ejQB1TSJDLx2IwO+uocbpkm/ blnN5v3pfCIijJ9Qsu1cELYglhFJ5+XqFrneUbPHLy7dcg41FS6pA3Fq2GoFjkclNThk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] xen/x86: Fix Syntax warning in gen-cpuid.py Message-Id: Date: Sat, 25 May 2024 03:45:02 +0000 commit 910e9a73c447cce26ceab90659b6ee0615a5fba6 Author: Jason Andryuk AuthorDate: Tue May 21 11:57:41 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:57:41 2024 +0200 xen/x86: Fix Syntax warning in gen-cpuid.py Python 3.12.2 warns: xen/tools/gen-cpuid.py:50: SyntaxWarning: invalid escape sequence '\s' "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" xen/tools/gen-cpuid.py:51: SyntaxWarning: invalid escape sequence '\s' "\s+/\*([\w!]*) .*$") Specify the strings as raw strings so '\s' is read as literal '\' + 's'. This avoids escaping all the '\'s in the strings. Signed-off-by: Jason Andryuk Acked-by: Andrew Cooper master commit: 08e79bba73d74a85d3ce6ff0f91c5205f1e05eda master date: 2024-04-30 08:34:37 +0200 --- xen/tools/gen-cpuid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index a7c2ba3e5d..415b8b1d68 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -47,8 +47,8 @@ def parse_definitions(state): """ feat_regex = re.compile( r"^XEN_CPUFEATURE\(([A-Z0-9_]+)," - "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" - "\s+/\*([\w!]*) .*$") + r"\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" + r"\s+/\*([\w!]*) .*$") word_regex = re.compile( r"^/\* .* word (\d*) \*/$") -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:45:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730109.1135496 (Exim 4.92) (envelope-from ) id 1sAiLJ-0008CR-OC; Sat, 25 May 2024 03:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730109.1135496; Sat, 25 May 2024 03: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 1sAiLJ-0008CH-LA; Sat, 25 May 2024 03:45:13 +0000 Received: by outflank-mailman (input) for mailman id 730109; Sat, 25 May 2024 03:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLI-0008CB-Hv for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLI-0002mB-H8 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiLI-0006C2-GO for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=YISuzqLk2Q3G/Kl76hXaidlIHvsmtdHWEUxQkkI0sXo=; b=qacCLLua41xKDSB2+8y0TY0LNx KMnZMjfWZZfaHHdj4hCFmTK5am6CrvS7HQWjxWKcRYS269CQwEQv2Z1y4uR8lGFt0/lTZa5VJgywV ffJqcq1CYRpk7/+TaWkqV9x5Qq5jIIWjuti4RqaBA6dVkupWzMkPGC22u+oMzCAKr+cI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] VT-d: correct ATS checking for root complex integrated devices Message-Id: Date: Sat, 25 May 2024 03:45:12 +0000 commit fdeacd43848e4ad9b2d33913351fb814567a714a Author: Jan Beulich AuthorDate: Tue May 21 11:58:17 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:58:17 2024 +0200 VT-d: correct ATS checking for root complex integrated devices Spec version 4.1 says "The ATSR structures identifies PCI Express Root-Ports supporting Address Translation Services (ATS) transactions. Software must enable ATS on endpoint devices behind a Root Port only if the Root Port is reported as supporting ATS transactions." Clearly root complex integrated devices aren't "behind root ports", matching my observation on a SapphireRapids system having an ATS- capable root complex integrated device. Hence for such devices we shouldn't try to locate a corresponding ATSR. Since both pci_find_ext_capability() and pci_find_cap_offset() return "unsigned int", change "pos" to that type at the same time. Fixes: 903b93211f56 ("[VTD] laying the ground work for ATS") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 04e31583bab97e5042a44a1d00fce2760272635f master date: 2024-05-06 09:22:45 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index 04d702b1d6..9d65b4896a 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -44,7 +44,7 @@ struct acpi_drhd_unit *find_ats_dev_drhd(struct vtd_iommu *iommu) int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) { struct acpi_drhd_unit *ats_drhd; - int pos; + unsigned int pos, expfl = 0; if ( !ats_enabled || !iommu_qinval ) return 0; @@ -53,7 +53,13 @@ int ats_device(const struct pci_dev *pdev, const struct acpi_drhd_unit *drhd) !ecap_dev_iotlb(drhd->iommu->ecap) ) return 0; - if ( !acpi_find_matched_atsr_unit(pdev) ) + pos = pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), + PCI_FUNC(pdev->devfn), PCI_CAP_ID_EXP); + if ( pos ) + expfl = pci_conf_read16(pdev->sbdf, pos + PCI_EXP_FLAGS); + + if ( MASK_EXTR(expfl, PCI_EXP_FLAGS_TYPE) != PCI_EXP_TYPE_RC_END && + !acpi_find_matched_atsr_unit(pdev) ) return 0; ats_drhd = find_ats_dev_drhd(drhd->iommu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:45:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730110.1135499 (Exim 4.92) (envelope-from ) id 1sAiLT-0008Ex-PN; Sat, 25 May 2024 03:45:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730110.1135499; Sat, 25 May 2024 03: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 1sAiLT-0008Ep-Mh; Sat, 25 May 2024 03:45:23 +0000 Received: by outflank-mailman (input) for mailman id 730110; Sat, 25 May 2024 03:45:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLS-0008Ee-Kt for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLS-0002md-KG for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiLS-0006Dd-JK for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=vMfnJ2iGs7x3hkBIEio1woMi8rDBSXsNPFs/h40y4UI=; b=UV5yDEcQhvHzvmpjzXMOSL/Byt GBe974DiRwSk2r98/jL0q95ODEYyKTBj0az1t72WWZCusNLJvjG5sAXOvICFiF1yBYeiu0EBc1uOV ejHaSQb5t5GylFrKkH8jMjNrwHnoJKJlT4vzZpJBU4hz7VLQPL6MnvrWE6zxP3Mq6ciA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC Message-Id: Date: Sat, 25 May 2024 03:45:22 +0000 commit 5305b3b4f38d0824a656150703c41c6c17698eaa Author: Andrew Cooper AuthorDate: Tue May 21 11:58:47 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:58:47 2024 +0200 tools/libxs: Open /dev/xen/xenbus fds as O_CLOEXEC The header description for xs_open() goes as far as to suggest that the fd is O_CLOEXEC, but it isn't actually. `xl devd` has been observed leaking /dev/xen/xenbus into children. Link: https://github.com/QubesOS/qubes-issues/issues/8292 Reported-by: Demi Marie Obenour Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross master commit: f4f2f3402b2f4985d69ffc0d46f845d05fd0b60f master date: 2024-05-07 15:18:36 +0100 --- tools/libs/store/xs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 7a9a8b1656..b5933fb108 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -54,6 +54,10 @@ struct xs_stored_msg { #include #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + struct xs_handle { /* Communications channel to xenstore daemon. */ int fd; @@ -227,7 +231,7 @@ error: static int get_dev(const char *connect_to) { /* We cannot open read-only because requests are writes */ - return open(connect_to, O_RDWR); + return open(connect_to, O_RDWR | O_CLOEXEC); } static int all_restrict_cb(Xentoolcore__Active_Handle *ah, domid_t domid) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:45:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:45:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730111.1135503 (Exim 4.92) (envelope-from ) id 1sAiLd-0008IG-Qm; Sat, 25 May 2024 03:45:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730111.1135503; Sat, 25 May 2024 03: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 1sAiLd-0008I9-OC; Sat, 25 May 2024 03:45:33 +0000 Received: by outflank-mailman (input) for mailman id 730111; Sat, 25 May 2024 03:45:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLc-0008Hz-Nt for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLc-0002n5-NC for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiLc-0006FJ-MR for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=gUTomPmINqv+v1K1VrFvo2S8tc2o9qkGJyvWBL097j4=; b=HC9lrkYhG5ZnNKvR0CtN/IDV27 U0dn8FgSeshxK7WFf5jYLSM9z8jnzcUHT9laxZ4FIiTf9Jrz1OcrtPgnu6757G3ekKHDHO9IWvMt3 OdXSgI5ewfMtePI/ic9qOVVWs7t6cBLCHm857xwwR93h9FZtxfiFUY8jD4uHZcG5pG6M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Message-Id: Date: Sat, 25 May 2024 03:45:32 +0000 commit c5c46464704d4b96a57bcbf4718e092d6233d913 Author: Andrew Cooper AuthorDate: Tue May 21 11:59:09 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:59:09 2024 +0200 x86/cpu-policy: Fix migration from Ice Lake to Cascade Lake Ever since Xen 4.14, there has been a latent bug with migration. While some toolstacks can level the features properly, they don't shink feat.max_subleaf when all features have been dropped. This is because we *still* have not completed the toolstack side work for full CPU Policy objects. As a consequence, even when properly feature levelled, VMs can't migrate "backwards" across hardware which reduces feat.max_subleaf. One such example is Ice Lake (max_subleaf=2 for INTEL_PSFD) to Cascade Lake (max_subleaf=0). Extend the max policies feat.max_subleaf to the hightest number Xen knows about, but leave the default policies matching the host. This will allow VMs with a higher feat.max_subleaf than strictly necessary to migrate in. Eventually we'll manage to teach the toolstack how to avoid creating such VMs in the first place, but there's still more work to do there. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: a2330b51df267e20e66bbba6c5bf08f0570ed58b master date: 2024-05-07 16:56:46 +0100 --- xen/arch/x86/cpu-policy.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index e44de3cfcb..c813df35cb 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -596,6 +596,13 @@ static void __init calculate_pv_max_policy(void) unsigned int i; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -636,6 +643,10 @@ static void __init calculate_pv_def_policy(void) unsigned int i; *p = pv_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); for ( i = 0; i < ARRAY_SIZE(fs); ++i ) @@ -672,6 +683,13 @@ static void __init calculate_hvm_max_policy(void) const uint32_t *mask; *p = host_cpu_policy; + + /* + * Some VMs may have a larger-than-necessary feat max_subleaf. Allow them + * to migrate in. + */ + p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? @@ -758,6 +776,10 @@ static void __init calculate_hvm_def_policy(void) const uint32_t *mask; *p = hvm_max_cpu_policy; + + /* Default to the same max_subleaf as the host. */ + p->feat.max_subleaf = host_cpu_policy.feat.max_subleaf; + x86_cpu_policy_to_featureset(p, fs); mask = hvm_hap_supported() ? -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:45:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:45:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730112.1135509 (Exim 4.92) (envelope-from ) id 1sAiLn-0008LB-TE; Sat, 25 May 2024 03:45:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730112.1135509; Sat, 25 May 2024 03: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 1sAiLn-0008L3-Q9; Sat, 25 May 2024 03:45:43 +0000 Received: by outflank-mailman (input) for mailman id 730112; Sat, 25 May 2024 03:45:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLm-0008Ks-Qu for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLm-0002nb-QA for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiLm-0006Gs-PS for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=TYlVPMqJlqmHC/z9qpRyI/llic7Ky3nhEytvnB71S4M=; b=BdcnKMfoop/IH0bZMT8BwCtkdF RM93n/Zvv2hRLfYiNFS13o92FIm6s826fO2xoWfJEJvWzaKs89xP4VVzl1dCDJ/OPlbbQHWFI3Yxz 37LLLO1mWScVmkmK3VsPuDrbQBOrRkXmAklco76/D0n4Rwgqov3Eyf1BTa/FjKqHU7Bs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/ucode: Distinguish "ucode already up to date" Message-Id: Date: Sat, 25 May 2024 03:45:42 +0000 commit df095962ac6c07d40a3ad855f3f533e127490691 Author: Andrew Cooper AuthorDate: Tue May 21 11:59:36 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 11:59:36 2024 +0200 x86/ucode: Distinguish "ucode already up to date" Right now, Xen returns -ENOENT for both "the provided blob isn't correct for this CPU", and "the blob isn't newer than what's loaded". This in turn causes xen-ucode to exit with an error, when "nothing to do" is more commonly a success condition. Handle EEXIST specially and exit cleanly. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné master commit: 648db37a155aca6f66d4cf3bb118417a728c3579 master date: 2024-05-09 18:19:49 +0100 --- tools/misc/xen-ucode.c | 5 ++++- xen/arch/x86/cpu/microcode/core.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index ad32face2b..de31c393f0 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -60,8 +60,11 @@ int main(int argc, char *argv[]) exit(1); } + errno = 0; ret = xc_microcode_update(xch, buf, len); - if ( ret ) + if ( ret == -1 && errno == EEXIST ) + printf("Microcode already up to date\n"); + else if ( ret ) { fprintf(stderr, "Failed to update microcode. (err: %s)\n", strerror(errno)); diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index b204b95f8f..667b1baf91 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -637,7 +637,7 @@ static long cf_check microcode_update_helper(void *data) "microcode: couldn't find any newer%s revision in the provided blob!\n", opt_ucode_allow_same ? " (or the same)" : ""); microcode_free_patch(patch); - ret = -ENOENT; + ret = -EEXIST; goto put; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:45:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730113.1135511 (Exim 4.92) (envelope-from ) id 1sAiLx-0008OS-Vz; Sat, 25 May 2024 03:45:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730113.1135511; Sat, 25 May 2024 03: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 1sAiLx-0008OL-TS; Sat, 25 May 2024 03:45:53 +0000 Received: by outflank-mailman (input) for mailman id 730113; Sat, 25 May 2024 03:45:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLw-0008O8-Tg for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiLw-0002oV-T0 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:45:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiLw-0006IO-SO for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=f7S91EsTCiyp9B6IQ+EkAebTHct/kiga9s4HTNx2ZyY=; b=YVO7V7ZGhncNfTS2tnqOwGFaGm ABflcbfRdF8DJjbZ61WkLA4uG3qtrv4Pl3HN9KgERdKlN+yHd8YiDqNn4V/CSAqVgbd4h/m2vvN/e 94ZeYm0BnPcV8sbPoCjGUM7Atew29eLSpeUhYS7iH/PzRN4m8wZhWCvF7F2VkPVeaQn8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] libxl: fix population of the online vCPU bitmap for PVH Message-Id: Date: Sat, 25 May 2024 03:45:52 +0000 commit 3020a20cd9de092c71bfac49a6f018a7502df31f Author: Roger Pau Monné AuthorDate: Tue May 21 12:00:09 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:00:09 2024 +0200 libxl: fix population of the online vCPU bitmap for PVH libxl passes some information to libacpi to create the ACPI table for a PVH guest, and among that information it's a bitmap of which vCPUs are online which can be less than the maximum number of vCPUs assigned to the domain. While the population of the bitmap is done correctly for HVM based on the number of online vCPUs, for PVH the population of the bitmap is done based on the number of maximum vCPUs allowed. This leads to all local APIC entries in the MADT being set as enabled, which contradicts the data in xenstore if vCPUs is different than maximum vCPUs. Fix by copying the internal libxl bitmap that's populated based on the vCPUs parameter. Reported-by: Arthur Borsboom Link: https://gitlab.com/libvirt/libvirt/-/issues/399 Reported-by: Leigh Brown Fixes: 14c0d328da2b ('libxl/acpi: Build ACPI tables for HVMlite guests') Signed-off-by: Roger Pau Monné Tested-by: Leigh Brown Acked-by: Andrew Cooper master commit: 5cc7347b04b2d0a3133754c7a9b936f614ec656a master date: 2024-05-11 00:13:43 +0100 --- tools/libs/light/libxl_x86_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libs/light/libxl_x86_acpi.c b/tools/libs/light/libxl_x86_acpi.c index 57a6b63790..3b16c1e70f 100644 --- a/tools/libs/light/libxl_x86_acpi.c +++ b/tools/libs/light/libxl_x86_acpi.c @@ -89,7 +89,7 @@ static int init_acpi_config(libxl__gc *gc, uint32_t domid = dom->guest_domid; xc_dominfo_t info; struct hvm_info_table *hvminfo; - int i, r, rc; + int r, rc; config->dsdt_anycpu = config->dsdt_15cpu = dsdt_pvh; config->dsdt_anycpu_len = config->dsdt_15cpu_len = dsdt_pvh_len; @@ -138,8 +138,8 @@ static int init_acpi_config(libxl__gc *gc, hvminfo->nr_vcpus = info.max_vcpu_id + 1; } - for (i = 0; i < hvminfo->nr_vcpus; i++) - hvminfo->vcpu_online[i / 8] |= 1 << (i & 7); + memcpy(hvminfo->vcpu_online, b_info->avail_vcpus.map, + b_info->avail_vcpus.size); config->hvminfo = hvminfo; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:46:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:46:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730114.1135516 (Exim 4.92) (envelope-from ) id 1sAiM8-0008RB-1r; Sat, 25 May 2024 03:46:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730114.1135516; Sat, 25 May 2024 03: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 1sAiM7-0008R1-V7; Sat, 25 May 2024 03:46:03 +0000 Received: by outflank-mailman (input) for mailman id 730114; Sat, 25 May 2024 03:46:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiM7-0008Qp-0X for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiM6-0002pG-W6 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiM6-0006KU-VE for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=MNFTzZttRdphDXapejU1hNlxLHlN978zCXIXEk4T1AI=; b=GaIQfNNwPzjs/Z08YZINjaICq+ lV/cRJYNw/DIXidIN7isDR1KzdUPkgnTpLxTaJkAItGcWVZnURSBYLbh7PRAATNSpF7xzjwT0uiqw 4GsHf/GiifhCa0Wrow3AbkvtGPAJyWj6Ya7UMboa8GhPEle/YFm/NVy9D87G+J4GK0Qc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] libxl: Fix handling XenStore errors in device creation Message-Id: Date: Sat, 25 May 2024 03:46:02 +0000 commit 620387c050f05fe2ccefcb8a13e550fe86d678c5 Author: Demi Marie Obenour AuthorDate: Tue May 21 12:00:34 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:00:34 2024 +0200 libxl: Fix handling XenStore errors in device creation If xenstored runs out of memory it is possible for it to fail operations that should succeed. libxl wasn't robust against this, and could fail to ensure that the TTY path of a non-initial console was created and read-only for guests. This doesn't qualify for an XSA because guests should not be able to run xenstored out of memory, but it still needs to be fixed. Add the missing error checks to ensure that all errors are properly handled and that at no point can a guest make the TTY path of its frontend directory writable. Signed-off-by: Demi Marie Obenour Reviewed-by: Juergen Gross master commit: 531d3bea5e9357357eaf6d40f5784a1b4c29b910 master date: 2024-05-11 00:13:43 +0100 --- tools/libs/light/libxl_console.c | 11 +++--- tools/libs/light/libxl_device.c | 72 +++++++++++++++++++++++++--------------- tools/libs/light/libxl_xshelp.c | 13 +++++--- 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/tools/libs/light/libxl_console.c b/tools/libs/light/libxl_console.c index d8b2bc5465..7087a0486d 100644 --- a/tools/libs/light/libxl_console.c +++ b/tools/libs/light/libxl_console.c @@ -337,11 +337,10 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, flexarray_append(front, "protocol"); flexarray_append(front, LIBXL_XENCONSOLE_PROTOCOL); } - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back), - libxl__xs_kvs_of_flexarray(gc, front), - libxl__xs_kvs_of_flexarray(gc, ro_front)); - rc = 0; + rc = libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back), + libxl__xs_kvs_of_flexarray(gc, front), + libxl__xs_kvs_of_flexarray(gc, ro_front)); out: return rc; } @@ -628,6 +627,8 @@ int libxl_device_channel_getinfo(libxl_ctx *ctx, uint32_t domid, */ if (!val) val = "/NO-SUCH-PATH"; channelinfo->u.pty.path = strdup(val); + if (channelinfo->u.pty.path == NULL) + abort(); break; default: break; diff --git a/tools/libs/light/libxl_device.c b/tools/libs/light/libxl_device.c index a75c21d433..99758524ff 100644 --- a/tools/libs/light/libxl_device.c +++ b/tools/libs/light/libxl_device.c @@ -177,8 +177,13 @@ int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, ro_frontend_perms[1].perms = backend_perms[1].perms = XS_PERM_READ; retry_transaction: - if (create_transaction) + if (create_transaction) { t = xs_transaction_start(ctx->xsh); + if (t == XBT_NULL) { + LOGED(ERROR, device->domid, "xs_transaction_start failed"); + return ERROR_FAIL; + } + } /* FIXME: read frontend_path and check state before removing stuff */ @@ -195,42 +200,55 @@ retry_transaction: if (rc) goto out; } - /* xxx much of this function lacks error checks! */ - if (fents || ro_fents) { - xs_rm(ctx->xsh, t, frontend_path); - xs_mkdir(ctx->xsh, t, frontend_path); + if (!xs_rm(ctx->xsh, t, frontend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, frontend_path)) + goto out; /* Console 0 is a special case. It doesn't use the regular PV * state machine but also the frontend directory has * historically contained other information, such as the * vnc-port, which we don't want the guest fiddling with. */ if ((device->kind == LIBXL__DEVICE_KIND_CONSOLE && device->devid == 0) || - (device->kind == LIBXL__DEVICE_KIND_VUART)) - xs_set_permissions(ctx->xsh, t, frontend_path, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); - else - xs_set_permissions(ctx->xsh, t, frontend_path, - frontend_perms, ARRAY_SIZE(frontend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), - backend_path, strlen(backend_path)); - if (fents) - libxl__xs_writev_perms(gc, t, frontend_path, fents, - frontend_perms, ARRAY_SIZE(frontend_perms)); - if (ro_fents) - libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, - ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + (device->kind == LIBXL__DEVICE_KIND_VUART)) { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms))) + goto out; + } else { + if (!xs_set_permissions(ctx->xsh, t, frontend_path, + frontend_perms, ARRAY_SIZE(frontend_perms))) + goto out; + } + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/backend", frontend_path), + backend_path, strlen(backend_path))) + goto out; + if (fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, fents, + frontend_perms, ARRAY_SIZE(frontend_perms)); + if (rc) goto out; + } + if (ro_fents) { + rc = libxl__xs_writev_perms(gc, t, frontend_path, ro_fents, + ro_frontend_perms, ARRAY_SIZE(ro_frontend_perms)); + if (rc) goto out; + } } if (bents) { if (!libxl_only) { - xs_rm(ctx->xsh, t, backend_path); - xs_mkdir(ctx->xsh, t, backend_path); - xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, - ARRAY_SIZE(backend_perms)); - xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), - frontend_path, strlen(frontend_path)); - libxl__xs_writev(gc, t, backend_path, bents); + if (!xs_rm(ctx->xsh, t, backend_path) && errno != ENOENT) + goto out; + if (!xs_mkdir(ctx->xsh, t, backend_path)) + goto out; + if (!xs_set_permissions(ctx->xsh, t, backend_path, backend_perms, + ARRAY_SIZE(backend_perms))) + goto out; + if (!xs_write(ctx->xsh, t, GCSPRINTF("%s/frontend", backend_path), + frontend_path, strlen(frontend_path))) + goto out; + rc = libxl__xs_writev(gc, t, backend_path, bents); + if (rc) goto out; } /* @@ -276,7 +294,7 @@ retry_transaction: out: if (create_transaction && t) libxl__xs_transaction_abort(gc, &t); - return rc; + return rc != 0 ? rc : ERROR_FAIL; } typedef struct { diff --git a/tools/libs/light/libxl_xshelp.c b/tools/libs/light/libxl_xshelp.c index 751cd942d9..a6e34ab10f 100644 --- a/tools/libs/light/libxl_xshelp.c +++ b/tools/libs/light/libxl_xshelp.c @@ -60,10 +60,15 @@ int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, for (i = 0; kvs[i] != NULL; i += 2) { path = GCSPRINTF("%s/%s", dir, kvs[i]); if (path && kvs[i + 1]) { - int length = strlen(kvs[i + 1]); - xs_write(ctx->xsh, t, path, kvs[i + 1], length); - if (perms) - xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + size_t length = strlen(kvs[i + 1]); + if (length > UINT_MAX) + return ERROR_FAIL; + if (!xs_write(ctx->xsh, t, path, kvs[i + 1], length)) + return ERROR_FAIL; + if (perms) { + if (!xs_set_permissions(ctx->xsh, t, path, perms, num_perms)) + return ERROR_FAIL; + } } } return 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:46:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:46:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730115.1135520 (Exim 4.92) (envelope-from ) id 1sAiMI-0008Tk-3V; Sat, 25 May 2024 03:46:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730115.1135520; Sat, 25 May 2024 03: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 1sAiMI-0008Tc-0Z; Sat, 25 May 2024 03:46:14 +0000 Received: by outflank-mailman (input) for mailman id 730115; Sat, 25 May 2024 03:46:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMH-0008TU-3d for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMH-0002pl-2w for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiMH-0006M9-28 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VHuLqESIV+0/DgNCLR6EYmxyW6L/YIAZTMR5Ro8fhb4=; b=EAAm40Ax3VT6BDN8xQwqS0X8lL G5XlhAut5wG0jsCLhjvXLebWQFssQutlFwgjn+2M8oxfdC90MNOdlrfh2llkPS1FaZAOyF5a3V/DV vR4jq1ApdakzygxCLtmkT3R/a0aY/BynKzH5w4GLmPFiUCFHdiCyoB9SaVtYjLhjSarw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] xen/sched: set all sched_resource data inside locked region for new cpu Message-Id: Date: Sat, 25 May 2024 03:46:13 +0000 commit a14a7b92af452ac61990b9cb514266935bff7a0b Author: Juergen Gross AuthorDate: Tue May 21 12:01:06 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:01:06 2024 +0200 xen/sched: set all sched_resource data inside locked region for new cpu When adding a cpu to a scheduler, set all data items of struct sched_resource inside the locked region, as otherwise a race might happen (e.g. when trying to access the cpupool of the cpu): (XEN) ----[ Xen-4.19.0-1-d x86_64 debug=y Tainted: H ]---- (XEN) CPU: 45 (XEN) RIP: e008:[] common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) RFLAGS: 0000000000010092 CONTEXT: hypervisor (XEN) rax: ffff82d040981618 rbx: ffff82d040981618 rcx: 0000000000000000 (XEN) rdx: 0000003ff68cd000 rsi: 000000000000002d rdi: ffff83103723d450 (XEN) rbp: ffff83207caa7d48 rsp: ffff83207caa7b98 r8: 0000000000000000 (XEN) r9: ffff831037253cf0 r10: ffff83103767c3f0 r11: 0000000000000009 (XEN) r12: ffff831037237990 r13: ffff831037237990 r14: ffff831037253720 (XEN) r15: 0000000000000000 cr0: 000000008005003b cr4: 0000000000f526e0 (XEN) cr3: 000000005bc2f000 cr2: 0000000000000010 (XEN) fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000 (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) Xen code around (common/sched/credit.c#csched_load_balance+0x41/0x877): (XEN) 48 8b 0c 10 48 8b 49 08 <48> 8b 79 10 48 89 bd b8 fe ff ff 49 8b 4e 28 48 (XEN) Xen call trace: (XEN) [] R common/sched/credit.c#csched_load_balance+0x41/0x877 (XEN) [] F common/sched/credit.c#csched_schedule+0x36a/0x69f (XEN) [] F common/sched/core.c#do_schedule+0xe8/0x433 (XEN) [] F common/sched/core.c#schedule+0x2e5/0x2f9 (XEN) [] F common/softirq.c#__do_softirq+0x94/0xbe (XEN) [] F do_softirq+0x13/0x15 (XEN) [] F arch/x86/domain.c#idle_loop+0x92/0xe6 (XEN) (XEN) Pagetable walk from 0000000000000010: (XEN) L4[0x000] = 000000103ff61063 ffffffffffffffff (XEN) L3[0x000] = 000000103ff60063 ffffffffffffffff (XEN) L2[0x000] = 0000001033dff063 ffffffffffffffff (XEN) L1[0x000] = 0000000000000000 ffffffffffffffff (XEN) (XEN) **************************************** (XEN) Panic on CPU 45: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000010 (XEN) **************************************** Reported-by: Andrew Cooper Fixes: a8c6c623192e ("sched: clarify use cases of schedule_cpu_switch()") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Tested-by: Andrew Cooper master commit: d104a07524ffc92ae7a70dfe192c291de2a563cc master date: 2024-05-15 19:59:52 +0100 --- xen/common/sched/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 29bbab5ac6..a9ff98f67a 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -3179,6 +3179,8 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) sr->scheduler = new_ops; sr->sched_priv = ppriv; + sr->granularity = cpupool_get_granularity(c); + sr->cpupool = c; /* * Reroute the lock to the per pCPU lock as /last/ thing. In fact, @@ -3191,8 +3193,6 @@ int schedule_cpu_add(unsigned int cpu, struct cpupool *c) /* _Not_ pcpu_schedule_unlock(): schedule_lock has changed! */ spin_unlock_irqrestore(old_lock, flags); - sr->granularity = cpupool_get_granularity(c); - sr->cpupool = c; /* The cpu is added to a pool, trigger it to go pick up some work */ cpu_raise_softirq(cpu, SCHEDULE_SOFTIRQ); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:46:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:46:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730117.1135524 (Exim 4.92) (envelope-from ) id 1sAiMS-00005x-5L; Sat, 25 May 2024 03:46:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730117.1135524; Sat, 25 May 2024 03: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 1sAiMS-00005p-21; Sat, 25 May 2024 03:46:24 +0000 Received: by outflank-mailman (input) for mailman id 730117; Sat, 25 May 2024 03:46:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMR-00005X-6n for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMR-0002qL-5z for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiMR-0006Nr-5H for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03: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=1offq3XTxrbH5exvrfVd5HplYCcmvEqJ6+um2h0Fqw8=; b=3tYrOfo3WrLoz2oqbxf0clC85l 64/b82FzHieiMBX/nWeNuKDNP2su3iqzlmDnxSyJoj21b9BfAHQAc9kOgfwc8hocVbUlaCyExhToP FSIUlFZAEI3JM0Khn7Uv3ZDeOMAwWydQ99hzgbGMtb3nZFn3BeLTL5uhUgOtlE8PZeu8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86: respect mapcache_domain_init() failing Message-Id: Date: Sat, 25 May 2024 03:46:23 +0000 commit e31e8ed53ebafb98418c994f727884924bf45f52 Author: Jan Beulich AuthorDate: Tue May 21 12:01:33 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:01:33 2024 +0200 x86: respect mapcache_domain_init() failing The function itself properly handles and hands onwards failure from create_perdomain_mapping(). Therefore its caller should respect possible failure, too. Fixes: 4b28bf6ae90b ("x86: re-introduce map_domain_page() et al") Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné master commit: 7270fdc7a0028d4b7b26fd1b36c6b9e97abcf3da master date: 2024-05-15 19:59:52 +0100 --- xen/arch/x86/domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5dbd1d8a12..a7bf828578 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -833,7 +833,8 @@ int arch_domain_create(struct domain *d, } else if ( is_pv_domain(d) ) { - mapcache_domain_init(d); + if ( (rc = mapcache_domain_init(d)) != 0 ) + goto fail; if ( (rc = pv_domain_initialise(d)) != 0 ) goto fail; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:46:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:46:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730118.1135528 (Exim 4.92) (envelope-from ) id 1sAiMc-00008v-6b; Sat, 25 May 2024 03:46:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730118.1135528; Sat, 25 May 2024 03:46: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 1sAiMc-00008k-3m; Sat, 25 May 2024 03:46:34 +0000 Received: by outflank-mailman (input) for mailman id 730118; Sat, 25 May 2024 03:46:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMb-00008X-9o for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMb-0002qr-96 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiMb-0006QA-86 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46: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=V/VK170knXssET6ilHWgINZpjLYJhf9J8xWxslBfXhY=; b=szJH3rltH2vltoNT4XEgT0uCh7 g+yEVbpDANB01bwjOaaXgfb26ko7Wxh1XbnDuH7fxnyleeDV8OYqeaJmlCEGE8oLy6l6nVyO18quW nvCBm2/hzH8VPiCGFcMj8wb/9n1Y8cmjYVXgK/p8NhcG7Zi/0IiXNRXOCzDXmlqzdK8I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] tools/xentop: Fix cpu% sort order Message-Id: Date: Sat, 25 May 2024 03:46:33 +0000 commit cd3f405b68ff99f14a8b9424665059c2447a4756 Author: Leigh Brown AuthorDate: Tue May 21 12:02:03 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:02:03 2024 +0200 tools/xentop: Fix cpu% sort order In compare_cpu_pct(), there is a double -> unsigned long long converion when calling compare(). In C, this discards the fractional part, resulting in an out-of order sorting such as: NAME STATE CPU(sec) CPU(%) xendd --b--- 4020 5.7 icecream --b--- 2600 3.8 Domain-0 -----r 1060 1.5 neon --b--- 827 1.1 cheese --b--- 225 0.7 pizza --b--- 359 0.5 cassini --b--- 490 0.4 fusilli --b--- 159 0.2 bob --b--- 502 0.2 blender --b--- 121 0.2 bread --b--- 69 0.1 chickpea --b--- 67 0.1 lentil --b--- 67 0.1 Introduce compare_dbl() function and update compare_cpu_pct() to call it. Fixes: 49839b535b78 ("Add xenstat framework.") Signed-off-by: Leigh Brown Reviewed-by: Andrew Cooper master commit: e27fc7d15eab79e604e8b8728778594accc23cf1 master date: 2024-05-15 19:59:52 +0100 --- tools/xentop/xentop.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index 545bd5e96d..c2a311befe 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -85,6 +85,7 @@ static void set_delay(const char *value); static void set_prompt(const char *new_prompt, void (*func)(const char *)); static int handle_key(int); static int compare(unsigned long long, unsigned long long); +static int compare_dbl(double, double); static int compare_domains(xenstat_domain **, xenstat_domain **); static unsigned long long tot_net_bytes( xenstat_domain *, int); static bool tot_vbd_reqs(xenstat_domain *, int, unsigned long long *); @@ -422,6 +423,16 @@ static int compare(unsigned long long i1, unsigned long long i2) return 0; } +/* Compares two double precision numbers, returning -1,0,1 for <,=,> */ +static int compare_dbl(double d1, double d2) +{ + if (d1 < d2) + return -1; + if (d1 > d2) + return 1; + return 0; +} + /* Comparison function for use with qsort. Compares two domains using the * current sort field. */ static int compare_domains(xenstat_domain **domain1, xenstat_domain **domain2) @@ -523,7 +534,7 @@ static double get_cpu_pct(xenstat_domain *domain) static int compare_cpu_pct(xenstat_domain *domain1, xenstat_domain *domain2) { - return -compare(get_cpu_pct(domain1), get_cpu_pct(domain2)); + return -compare_dbl(get_cpu_pct(domain1), get_cpu_pct(domain2)); } /* Prints cpu percentage statistic */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:46:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:46:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730119.1135532 (Exim 4.92) (envelope-from ) id 1sAiMm-0000CC-8b; Sat, 25 May 2024 03:46:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730119.1135532; Sat, 25 May 2024 03:46: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 1sAiMm-0000C4-5I; Sat, 25 May 2024 03:46:44 +0000 Received: by outflank-mailman (input) for mailman id 730119; Sat, 25 May 2024 03:46:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMl-0000Bw-Cx for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMl-0002rL-C8 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiMl-0006SH-BD for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46: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=a1IpO8Z+1VSGLGfg69+5eXTyi8lqkCEJjthY9VmBSfs=; b=I/zBRtJzBlaxckFltdhVP9VOnq dnS67mylMw3yHM6u01vP0zUlpZV3PJtpMsQLUcRA9ExzBAEzusVEwEBC5JzxzCmTHfIxCmjMm3vzF rFqm81OJbcwywv20FkL4ifFq7qIGmh5c/pKIfyd0Zd5xOBghHGgzjazx0flomTu2z4EM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/mtrr: avoid system wide rendezvous when setting AP MTRRs Message-Id: Date: Sat, 25 May 2024 03:46:43 +0000 commit afcce3cfc2458efbd3ff9320153c534a82a108c5 Author: Roger Pau Monné AuthorDate: Tue May 21 12:02:13 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 12:02:13 2024 +0200 x86/mtrr: avoid system wide rendezvous when setting AP MTRRs There's no point in forcing a system wide update of the MTRRs on all processors when there are no changes to be propagated. On AP startup it's only the AP that needs to write the system wide MTRR values in order to match the rest of the already online CPUs. We have occasionally seen the watchdog trigger during `xen-hptool cpu-online` in one Intel Cascade Lake box with 448 CPUs due to the re-setting of the MTRRs on all the CPUs in the system. While there adjust the comment to clarify why the system-wide resetting of the MTRR registers is not needed for the purposes of mtrr_ap_init(). Signed-off-by: Roger Pau Monné Release-acked-by: Oleksii Kurochko Acked-by: Andrew Cooper master commit: abd00b037da5ffa4e8c4508a5df0cd6eabb805a4 master date: 2024-05-15 19:59:52 +0100 --- xen/arch/x86/cpu/mtrr/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index 990f12286a..099e9f2cf7 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -573,14 +573,15 @@ void mtrr_ap_init(void) if (!mtrr_if || hold_mtrr_updates_on_aps) return; /* - * Ideally we should hold mtrr_mutex here to avoid mtrr entries changed, - * but this routine will be called in cpu boot time, holding the lock - * breaks it. This routine is called in two cases: 1.very earily time - * of software resume, when there absolutely isn't mtrr entry changes; - * 2.cpu hotadd time. We let mtrr_add/del_page hold cpuhotplug lock to - * prevent mtrr entry changes + * hold_mtrr_updates_on_aps takes care of preventing unnecessary MTRR + * updates when batch starting the CPUs (see + * mtrr_aps_sync_{begin,end}()). + * + * Otherwise just apply the current system wide MTRR values to this AP. + * Note this doesn't require synchronization with the other CPUs, as + * there are strictly no modifications of the current MTRR values. */ - set_mtrr(~0U, 0, 0, 0); + mtrr_set_all(); } /** -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 03:46:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 03:46:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730120.1135537 (Exim 4.92) (envelope-from ) id 1sAiMw-0000FN-C5; Sat, 25 May 2024 03:46:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730120.1135537; Sat, 25 May 2024 03:46: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 1sAiMw-0000FF-8o; Sat, 25 May 2024 03:46:54 +0000 Received: by outflank-mailman (input) for mailman id 730120; Sat, 25 May 2024 03:46:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMv-0000F5-Fg for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAiMv-0002tj-F2 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAiMv-0006U4-EL for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 03:46: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=7Ip6IIh/tPAg53eOi2POIVgwEJCjrLbtqXh6qQCH75E=; b=4P5YJ2ri1HL9l2kV3BMhkXfskV YicxBm4tGUD1YB7uiTz5bjGOxHW7YbVHm+D+t0er90ObF3hqNvsbPLD3x+WzwxpzeGfhU5/Ry1gq8 X7GsG7JBqIEjcw03q4j4kemL7hjTZYijUiVvZR3UjX3hlnpiXJ4lH2Qqaxtsr2MZ4PJE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] Revert "xen/xsm: Wire up get_dom0_console" Message-Id: Date: Sat, 25 May 2024 03:46:53 +0000 commit 3c7c9225ffa5605bf0603f9dd1666f3f786e2c44 Author: Jan Beulich AuthorDate: Tue May 21 13:36:27 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 21 13:36:27 2024 +0200 Revert "xen/xsm: Wire up get_dom0_console" This reverts commit 9cef77400470604e76c6c3aa9f647c40429ff956, for not being applicable to this branch. --- tools/flask/policy/modules/dom0.te | 2 +- xen/xsm/flask/hooks.c | 4 ---- xen/xsm/flask/policy/access_vectors | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index 16b8c9646d..f1dcff48e2 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - coverage_op get_dom0_console + coverage_op }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 5e88c71b8e..78225f68c1 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1558,10 +1558,6 @@ static int cf_check flask_platform_op(uint32_t op) return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, SECCLASS_XEN2, XEN2__GET_SYMBOL, NULL); - case XENPF_get_dom0_console: - return avc_has_perm(domain_sid(current->domain), SECINITSID_XEN, - SECCLASS_XEN2, XEN2__GET_DOM0_CONSOLE, NULL); - default: return avc_unknown_permission("platform_op", op); } diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index a35e3d4c51..4e6710a63e 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,8 +99,6 @@ class xen2 livepatch_op # XEN_SYSCTL_coverage_op coverage_op -# XENPF_get_dom0_console - get_dom0_console } # Classes domain and domain2 consist of operations that a domain performs on -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat May 25 11:33:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 11:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730212.1135550 (Exim 4.92) (envelope-from ) id 1sApe3-0007rU-P2; Sat, 25 May 2024 11:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730212.1135550; Sat, 25 May 2024 11: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 1sApe3-0007rM-ME; Sat, 25 May 2024 11:33:03 +0000 Received: by outflank-mailman (input) for mailman id 730212; Sat, 25 May 2024 11:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sApe2-0007rG-0a for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sApe1-0007iF-Sb for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sApe1-0003RC-QB for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11: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=/QOx+6C5Ssipo5ndUko6+2jR3KFLv5dzIrL3XeeqOcM=; b=G0GfuO5MkIzUjSNnUJErNxDfy5 y+0TrIFbQVYptfep+9MOUosJfMfGtETI22UaRIDHoiWah35aCj5l68I7RuJ1wzM9U+X2KRwnhAZ36 RWSqFfqUG8I2d2BRC5xo3dNcxktgtRDPpt9pNit1tdHcna2HGi2ler5OnEDJmtV04+qU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Set correct per-cpu cpu_core_mask Message-Id: Date: Sat, 25 May 2024 11:33:01 +0000 commit 701190abb3d5873cf77349b3d90bd11ded74871a Author: Henry Wang AuthorDate: Thu Mar 21 11:57:06 2024 +0800 Commit: Julien Grall CommitDate: Fri May 24 14:26:01 2024 +0100 xen/arm: Set correct per-cpu cpu_core_mask In the common sysctl command XEN_SYSCTL_physinfo, the value of cores_per_socket is calculated based on the cpu_core_mask of CPU0. Currently on Arm this is a fixed value 1 (can be checked via xl info), which is not correct. This is because during the Arm CPU online process at boot time, setup_cpu_sibling_map() only sets the per-cpu cpu_core_mask for itself. cores_per_socket refers to the number of cores that belong to the same socket (NUMA node). Currently Xen on Arm does not support physical CPU hotplug and NUMA, also we assume there is no multithread. Therefore cores_per_socket means all possible CPUs detected from the device tree. Setting the per-cpu cpu_core_mask in setup_cpu_sibling_map() accordingly. Modify the in-code comment which seems to be outdated. Add a warning to users if Xen is running on processors with multithread support. Signed-off-by: Henry Wang Signed-off-by: Henry Wang Reviewed-by: Michal Orzel --- xen/arch/arm/smpboot.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 6efed87678..93a10d7721 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -67,7 +67,11 @@ static bool cpu_is_dead; /* ID of the PCPU we're running on */ DEFINE_PER_CPU(unsigned int, cpu_id); -/* XXX these seem awfully x86ish... */ +/* + * Although multithread is part of the Arm spec, there are not many + * processors supporting multithread and current Xen on Arm assumes there + * is no multithread. + */ /* 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 */ @@ -86,9 +90,13 @@ static int setup_cpu_sibling_map(int cpu) !zalloc_cpumask_var(&per_cpu(cpu_core_mask, cpu)) ) return -ENOMEM; - /* A CPU is a sibling with itself and is always on its own core. */ + /* + * Currently we assume there is no multithread and NUMA, so + * a CPU is a sibling with itself, and the all possible CPUs + * are supposed to belong to the same socket (NUMA node). + */ cpumask_set_cpu(cpu, per_cpu(cpu_sibling_mask, cpu)); - cpumask_set_cpu(cpu, per_cpu(cpu_core_mask, cpu)); + cpumask_copy(per_cpu(cpu_core_mask, cpu), &cpu_possible_map); return 0; } @@ -278,6 +286,10 @@ void __init smp_init_cpus(void) warning_add("WARNING: HMP COMPUTING HAS BEEN ENABLED.\n" "It has implications on the security and stability of the system,\n" "unless the cpu affinity of all domains is specified.\n"); + + if ( system_cpuinfo.mpidr.mt == 1 ) + warning_add("WARNING: MULTITHREADING HAS BEEN DETECTED ON THE PROCESSOR.\n" + "It might impact the security of the system.\n"); } unsigned int __init smp_get_max_cpus(void) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 11:33:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 11:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730213.1135554 (Exim 4.92) (envelope-from ) id 1sApeD-0007t4-QY; Sat, 25 May 2024 11:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730213.1135554; Sat, 25 May 2024 11: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 1sApeD-0007su-Nu; Sat, 25 May 2024 11:33:13 +0000 Received: by outflank-mailman (input) for mailman id 730213; Sat, 25 May 2024 11:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sApeC-0007sm-1f for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sApeC-0007iK-0q for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sApeB-0003Ri-Vf for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11: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=W7oeBnqHgE+XGoqUwf11Nd7UM6jUaP6Nx8x4kW8lFNo=; b=y+isv0RIL8heudpWD2exXT2ndI putEZy3zDVpNIvw0CyKBNe+5xmA1HuPUhU2G8bmlqqHItqFIGheyDk27KLWBvMRqrf4jdPjYFNr03 dswyJBWxZl8Ig386TxbhCePgizQ7oHjKHx4gr1mtgmvC5Rt5AsoB5QvC6UvqTq5JpjJ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm/trace: Use a different trace type for AMD processors Message-Id: Date: Sat, 25 May 2024 11:33:11 +0000 commit 320e644616c04655c353d7da4880cff555bc2055 Author: George Dunlap AuthorDate: Thu Apr 25 13:03:58 2024 +0100 Commit: George Dunlap CommitDate: Fri May 24 15:29:06 2024 +0100 x86/hvm/trace: Use a different trace type for AMD processors A long-standing usability sub-optimality with xenalyze is the necessity to specify `--svm-mode` when analyzing AMD processors. This fundamentally comes about because the same trace event ID is used for both VMX and SVM, but the contents of the trace must be interpreted differently. Instead, allocate separate trace events for VMX and SVM vmexits in Xen; this will allow all readers to properly interpret the meaning of the vmexit reason. In xenalyze, first remove the redundant call to init_hvm_data(); there's no way to get to hvm_vmexit_process() without it being already initialized by the set_vcpu_type call in hvm_process(). Replace this with set_hvm_exit_reson_data(), and move setting of hvm->exit_reason_* into that function. Modify hvm_process and hvm_vmexit_process to handle all four potential values appropriately. If SVM entries are encountered, set opt.svm_mode so that other SVM-specific functionality is triggered. Remove the `--svm-mode` command-line option, since it's now redundant. Signed-off-by: George Dunlap Acked-by: Andrew Cooper --- tools/xentrace/xenalyze.c | 37 +++++++++++++++++++------------------ xen/arch/x86/hvm/svm/svm.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 4 ++-- xen/include/public/trace.h | 6 ++++-- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index ce6a85d50b..9c4463b0e8 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -1437,14 +1437,6 @@ void init_hvm_data(struct hvm_data *h, struct vcpu_data *v) { h->init = 1; - if(opt.svm_mode) { - h->exit_reason_max = HVM_SVM_EXIT_REASON_MAX; - h->exit_reason_name = hvm_svm_exit_reason_name; - } else { - h->exit_reason_max = HVM_VMX_EXIT_REASON_MAX; - h->exit_reason_name = hvm_vmx_exit_reason_name; - } - if(opt.histogram_interrupt_eip) { int count = ((1ULL<summary.guest_interrupt[i].count=0; } +void set_hvm_exit_reason_data(struct hvm_data *h, unsigned event) { + if (((event & ~TRC_64_FLAG) == TRC_HVM_SVM_EXIT) || + opt.svm_mode) { + opt.svm_mode = 1; + h->exit_reason_max = HVM_SVM_EXIT_REASON_MAX; + h->exit_reason_name = hvm_svm_exit_reason_name; + } else { + h->exit_reason_max = HVM_VMX_EXIT_REASON_MAX; + h->exit_reason_name = hvm_vmx_exit_reason_name; + } +} + /* PV data */ enum { PV_HYPERCALL=1, @@ -5088,13 +5092,13 @@ void hvm_vmexit_process(struct record_info *ri, struct hvm_data *h, r = (typeof(r))ri->d; - if(!h->init) - init_hvm_data(h, v); + if(!h->exit_reason_name) + set_hvm_exit_reason_data(h, ri->event); h->vmexit_valid=1; bzero(&h->inflight, sizeof(h->inflight)); - if(ri->event == TRC_HVM_VMEXIT64) { + if(ri->event & TRC_64_FLAG) { if(v->guest_paging_levels != 4) { if ( verbosity >= 6 ) @@ -5316,8 +5320,10 @@ void hvm_process(struct pcpu_info *p) break; default: switch(ri->event) { - case TRC_HVM_VMEXIT: - case TRC_HVM_VMEXIT64: + case TRC_HVM_VMX_EXIT: + case TRC_HVM_VMX_EXIT64: + case TRC_HVM_SVM_EXIT: + case TRC_HVM_SVM_EXIT64: UPDATE_VOLUME(p, hvm[HVM_VOL_VMEXIT], ri->size); hvm_vmexit_process(ri, h, v); break; @@ -10884,11 +10890,6 @@ const struct argp_option cmd_opts[] = { .arg = "HZ", .doc = "Cpu speed of the tracing host, used to convert tsc into seconds.", }, - { .name = "svm-mode", - .key = OPT_SVM_MODE, - .group = OPT_GROUP_HARDWARE, - .doc = "Assume AMD SVM-style vmexit error codes. (Default is Intel VMX.)", }, - { .name = "progress", .key = OPT_PROGRESS, .doc = "Progress dialog. Requires the zenity (GTK+) executable.", }, diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index db530d55f2..988250dbc1 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2571,10 +2571,10 @@ void asmlinkage svm_vmexit_handler(void) exit_reason = vmcb->exitcode; if ( hvm_long_mode_active(v) ) - TRACE_TIME(TRC_HVM_VMEXIT64 | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), + TRACE_TIME(TRC_HVM_SVM_EXIT64 | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), exit_reason, regs->rip, regs->rip >> 32); else - TRACE_TIME(TRC_HVM_VMEXIT | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), + TRACE_TIME(TRC_HVM_SVM_EXIT | (vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0), exit_reason, regs->eip); if ( vcpu_guestmode ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8ba996546f..f16faa6a61 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4105,9 +4105,9 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_regs *regs) __vmread(VM_EXIT_REASON, &exit_reason); if ( hvm_long_mode_active(v) ) - TRACE_TIME(TRC_HVM_VMEXIT64, exit_reason, regs->rip, regs->rip >> 32); + TRACE_TIME(TRC_HVM_VMX_EXIT64, exit_reason, regs->rip, regs->rip >> 32); else - TRACE_TIME(TRC_HVM_VMEXIT, exit_reason, regs->eip); + TRACE_TIME(TRC_HVM_VMX_EXIT, exit_reason, regs->eip); perfc_incra(vmexits, (uint16_t)exit_reason); diff --git a/xen/include/public/trace.h b/xen/include/public/trace.h index 3c9f9c3c18..141efa0ea7 100644 --- a/xen/include/public/trace.h +++ b/xen/include/public/trace.h @@ -178,8 +178,10 @@ /* trace events per subclass */ #define TRC_HVM_NESTEDFLAG (0x400) #define TRC_HVM_VMENTRY (TRC_HVM_ENTRYEXIT + 0x01) -#define TRC_HVM_VMEXIT (TRC_HVM_ENTRYEXIT + 0x02) -#define TRC_HVM_VMEXIT64 (TRC_HVM_ENTRYEXIT + TRC_64_FLAG + 0x02) +#define TRC_HVM_VMX_EXIT (TRC_HVM_ENTRYEXIT + 0x02) +#define TRC_HVM_VMX_EXIT64 (TRC_HVM_ENTRYEXIT + TRC_64_FLAG + 0x02) +#define TRC_HVM_SVM_EXIT (TRC_HVM_ENTRYEXIT + 0x03) +#define TRC_HVM_SVM_EXIT64 (TRC_HVM_ENTRYEXIT + TRC_64_FLAG + 0x03) #define TRC_HVM_PF_XEN (TRC_HVM_HANDLER + 0x01) #define TRC_HVM_PF_XEN64 (TRC_HVM_HANDLER + TRC_64_FLAG + 0x01) #define TRC_HVM_PF_INJECT (TRC_HVM_HANDLER + 0x02) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 11:33:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 11:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730214.1135557 (Exim 4.92) (envelope-from ) id 1sApeN-0007vT-SR; Sat, 25 May 2024 11:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730214.1135557; Sat, 25 May 2024 11: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 1sApeN-0007vM-PT; Sat, 25 May 2024 11:33:23 +0000 Received: by outflank-mailman (input) for mailman id 730214; Sat, 25 May 2024 11:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sApeM-0007vA-8e for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sApeM-0007iZ-6f for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sApeM-0003S9-3T for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 11: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=t0l+HqYYSwZ1XPdZJ9sz0rIooPJWJ9T+o2axK7zfZkk=; b=ZKvHc0jiH+6E+Bw0+T/ipYU8kc ofrF96dWlWGqylZZBo+EqKnh8GuG3GUBjtsTR7B8KvuiWeFKrD5EsifK2zk7YhzwuYvM3E0cJWAzO PiFvJSYRtUQexWa2G4zkdAPxMnd/MGDpfycpKJwN4C99kZlBl4PPsSuJ5OFv6izHtmoo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenalyze: Ignore HVM_EMUL events harder Message-Id: Date: Sat, 25 May 2024 11:33:22 +0000 commit 2172a01c4cecbaa1d79bad200bfe3b996a3e4ba5 Author: George Dunlap AuthorDate: Fri Apr 26 14:17:33 2024 +0100 Commit: George Dunlap CommitDate: Fri May 24 15:29:18 2024 +0100 tools/xenalyze: Ignore HVM_EMUL events harder To unify certain common sanity checks, checks are done very early in processing based only on the top-level type. Unfortunately, when TRC_HVM_EMUL was introduced, it broke some of the assumptions about how the top-level types worked. Namely, traces of this type will show up outside of HVM contexts: in idle domains and in PV domains. Make an explicit exception for TRC_HVM_EMUL types in a number of places: - Pass the record info pointer to toplevel_assert_check, so that it can exclude TRC_HVM_EMUL records from idle and vcpu data_mode checks - Don't attempt to set the vcpu data_type in hvm_process for TRC_HVM_EMUL records. Signed-off-by: George Dunlap Acked-by: Andrew Cooper --- tools/xentrace/xenalyze.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 9c4463b0e8..d95e52695f 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -21,6 +21,7 @@ #define _XOPEN_SOURCE 600 #include #include +#include #include #include #include @@ -5305,8 +5306,11 @@ void hvm_process(struct pcpu_info *p) assert(p->current); - if(vcpu_set_data_type(p->current, VCPU_DATA_HVM)) - return; + /* HVM_EMUL types show up in all contexts */ + if(ri->evt.sub != 0x4) { + if(vcpu_set_data_type(p->current, VCPU_DATA_HVM)) + return; + } switch ( ri->evt.sub ) { case 2: /* HVM_HANDLER */ @@ -9447,9 +9451,10 @@ static struct tl_assert_mask tl_assert_checks[TOPLEVEL_MAX] = { /* There are a lot of common assumptions for the various processing * routines. Check them all in one place, doing something else if * they don't pass. */ -int toplevel_assert_check(int toplevel, struct pcpu_info *p) +int toplevel_assert_check(int toplevel, struct record_info *ri, struct pcpu_info *p) { struct tl_assert_mask mask; + bool is_hvm_emul = (toplevel == TOPLEVEL_HVM) && (ri->evt.sub == 0x4); mask = tl_assert_checks[toplevel]; @@ -9459,7 +9464,7 @@ int toplevel_assert_check(int toplevel, struct pcpu_info *p) goto fail; } - if( mask.not_idle_domain ) + if( mask.not_idle_domain && !is_hvm_emul) { /* Can't do this check w/o first doing above check */ assert(mask.p_current); @@ -9478,7 +9483,8 @@ int toplevel_assert_check(int toplevel, struct pcpu_info *p) v = p->current; if ( ! (v->data_type == VCPU_DATA_NONE - || v->data_type == mask.vcpu_data_mode) ) + || v->data_type == mask.vcpu_data_mode + || is_hvm_emul) ) { /* This may happen for track_dirty_vram, which causes a SHADOW_WRMAP_BF trace f/ dom0 */ fprintf(warn, "WARNING: Unexpected vcpu data type for d%dv%d on proc %d! Expected %d got %d. Not processing\n", @@ -9525,7 +9531,7 @@ void process_record(struct pcpu_info *p) { return; /* Unify toplevel assertions */ - if ( toplevel_assert_check(toplevel, p) ) + if ( toplevel_assert_check(toplevel, ri, p) ) { switch(toplevel) { case TRC_GEN_MAIN: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 21:33:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 21:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730340.1135591 (Exim 4.92) (envelope-from ) id 1sAz0h-00032g-G9; Sat, 25 May 2024 21:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730340.1135591; Sat, 25 May 2024 21: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 1sAz0h-00032Y-DK; Sat, 25 May 2024 21:33:03 +0000 Received: by outflank-mailman (input) for mailman id 730340; Sat, 25 May 2024 21:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz0g-000320-1g for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz0g-0001b0-0P for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAz0f-0002VA-Vb for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21: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=9jqYvNZR7vQPMr7cuAaOVZpvoeKJdK0Xfn1xvTCpt0Q=; b=CzXUWqHFgB6cCxSpkE4ObdNOxD DkYWNs65P78KnkFpgHrCKy0A+UCMIrAqM0bR+tEHZKw3LYGAtkxFClK8MohKyf7M1+zG0+67hrd65 Epj+ogD0+ZoL5GlClZJdSp2wSaOxLOIbNOZYDBo7uAaDgr0oNw1dY4RcxboOTKpvMs58=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: Correct the help information and exit code of the dt-overlay command Message-Id: Date: Sat, 25 May 2024 21:33:01 +0000 commit c8cbc5eb1c2e40448e1c1565ce2de08ecaeb21a5 Author: Henry Wang AuthorDate: Thu May 23 15:40:32 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 tools/xl: Correct the help information and exit code of the dt-overlay command Fix the name mismatch in the xl dt-overlay command, the command name should be "dt-overlay" instead of "dt_overlay". Add the missing "," in the cmdtable. Fix the exit code of the dt-overlay command, use EXIT_FAILURE instead of ERROR_FAIL. Fixes: 61765a07e3d8 ("tools/xl: Add new xl command overlay for device tree overlay support") Suggested-by: Anthony PERARD Signed-off-by: Henry Wang Reviewed-by: Jason Andryuk Reviewed-by: Stefano Stabellini --- tools/xl/xl_cmdtable.c | 2 +- tools/xl/xl_vmcontrol.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 62bdb2aeaa..1f3c6b5897 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -635,7 +635,7 @@ const struct cmd_spec cmd_table[] = { { "dt-overlay", &main_dt_overlay, 0, 1, "Add/Remove a device tree overlay", - "add/remove <.dtbo>" + "add/remove <.dtbo>", "-h print this help\n" }, #endif diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index 98f6bd2e76..02575d5d36 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -1278,7 +1278,7 @@ int main_dt_overlay(int argc, char **argv) const int overlay_remove_op = 2; if (argc < 2) { - help("dt_overlay"); + help("dt-overlay"); return EXIT_FAILURE; } @@ -1302,11 +1302,11 @@ int main_dt_overlay(int argc, char **argv) fprintf(stderr, "failed to read the overlay device tree file %s\n", overlay_config_file); free(overlay_dtb); - return ERROR_FAIL; + return EXIT_FAILURE; } } else { fprintf(stderr, "overlay dtbo file not provided\n"); - return ERROR_FAIL; + return EXIT_FAILURE; } rc = libxl_dt_overlay(ctx, overlay_dtb, overlay_dtb_size, op); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 21:33:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 21:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730343.1135596 (Exim 4.92) (envelope-from ) id 1sAz0r-0003BY-Ij; Sat, 25 May 2024 21:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730343.1135596; Sat, 25 May 2024 21: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 1sAz0r-0003Ap-FF; Sat, 25 May 2024 21:33:13 +0000 Received: by outflank-mailman (input) for mailman id 730343; Sat, 25 May 2024 21:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz0q-00038z-4o for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz0q-0001b6-3w for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAz0q-0002Vf-2d for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21: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=uOAadrMcOslvi1Z91/TlbQQTAQJDzbjLjTtAGKn+lzs=; b=lHZWbMCjtS83oEAxwNirLbtGZB 3OJW5Ey0smrXOjc81rAskz6/8mPnv8sVLGFDYH3xtmbiMTN84YZHjvRu6pHlaXnl910Dgm/iPr4LL glWmbwc8yISijfgb3zUO90/Bv8QOhXIkDfnsR7kK0kd9twvndHE7cyuRuRpvnlLKYIMQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm, doc: Add a DT property to specify IOMMU for Dom0less domUs Message-Id: Date: Sat, 25 May 2024 21:33:12 +0000 commit 1d2b4f3049fdb916992c4c19c8496671546ac521 Author: Henry Wang AuthorDate: Thu May 23 15:40:33 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 xen/arm, doc: Add a DT property to specify IOMMU for Dom0less domUs There are some use cases in which the dom0less domUs need to have the XEN_DOMCTL_CDF_iommu set at the domain construction time. For example, the dynamic dtbo feature allows the domain to be assigned a device that is behind the IOMMU at runtime. For these use cases, we need to have a way to specify the domain will need the IOMMU mapping at domain construction time. Introduce a "passthrough" DT property for Dom0less DomUs following the same entry as the xl.cfg. Currently only provide two options, i.e. "enable" and "disable". Set the XEN_DOMCTL_CDF_iommu at domain construction time based on the property. Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 16 ++++++++++++++++ xen/arch/arm/dom0less-build.c | 11 +++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index bbd955e9c2..f1fd069c87 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -260,6 +260,22 @@ with the following properties: value specified by Xen command line parameter gnttab_max_maptrack_frames (or its default value if unspecified, i.e. 1024) is used. +- passthrough + + A string property specifying whether IOMMU mappings are enabled for the + domain and hence whether it will be enabled for passthrough hardware. + Possible property values are: + + - "enabled" + IOMMU mappings are enabled for the domain. Note that this option is the + default if the user provides the device partial passthrough device tree + for the domain. + + - "disabled" + IOMMU mappings are disabled for the domain and so hardware may not be + passed through. This option is the default if this property is missing + and the user does not provide the device partial device tree for the domain. + Under the "xen,domain" compatible node, one or more sub-nodes are present for the DomU kernel and ramdisk. diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 74f053c242..5830a7051d 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -848,6 +848,8 @@ static int __init construct_domU(struct domain *d, void __init create_domUs(void) { struct dt_device_node *node; + const char *dom0less_iommu; + bool iommu = false; const struct dt_device_node *cpupool_node, *chosen = dt_find_node_by_path("/chosen"); @@ -895,8 +897,13 @@ void __init create_domUs(void) panic("Missing property 'cpus' for domain %s\n", dt_node_name(node)); - if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") && - iommu_enabled ) + if ( !dt_property_read_string(node, "passthrough", &dom0less_iommu) && + !strcmp(dom0less_iommu, "enabled") ) + iommu = true; + + if ( iommu_enabled && + (iommu || dt_find_compatible_node(node, NULL, + "multiboot,device-tree")) ) d_cfg.flags |= XEN_DOMCTL_CDF_iommu; if ( !dt_property_read_u32(node, "nr_spis", &d_cfg.arch.nr_spis) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 21:33:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 21:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730345.1135600 (Exim 4.92) (envelope-from ) id 1sAz11-0003HV-Jr; Sat, 25 May 2024 21:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730345.1135600; Sat, 25 May 2024 21: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 1sAz11-0003HL-Gu; Sat, 25 May 2024 21:33:23 +0000 Received: by outflank-mailman (input) for mailman id 730345; Sat, 25 May 2024 21:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz10-0003Fq-9Z for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz10-0001bE-8b for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAz10-0002WJ-6s for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21: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=LnUHy91NwAsKQHd+PwuGppk2lBVS8RKDcZaV+KbBF/E=; b=G7wlizQCyPzBnMOuMrvcHzSEoW wTmod3/e7TwrJbUmg+PbYse89y6+86bKKzEZ5WcFizjvxIN5wAdjddaMLVnJBJgV8C9Zq9BSRIkE5 Smj4OkLfG/qGNqDnkPeB0rtwg4eDkLT2gBKh0p6WvMBOzRjJB/MFBZEZKvAfkdFb1+mA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/arm: Introduce the "nr_spis" xl config entry Message-Id: Date: Sat, 25 May 2024 21:33:22 +0000 commit 6f588194d9c89580cd06518b48116d453e33cc8f Author: Henry Wang AuthorDate: Thu May 23 15:40:34 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 tools/arm: Introduce the "nr_spis" xl config entry Currently, the number of SPIs allocated to the domain is only configurable for Dom0less DomUs. Xen domains are supposed to be platform agnostics and therefore the numbers of SPIs for libxl guests should not be based on the hardware. Introduce a new xl config entry for Arm to provide a method for user to decide the number of SPIs. This would help to avoid bumping the `config->arch.nr_spis` in libxl everytime there is a new platform with increased SPI numbers. Update the doc and the golang bindings accordingly. Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Reviewed-by: Jason Andryuk --- docs/man/xl.cfg.5.pod.in | 16 ++++++++++++++++ tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 5 +++++ tools/libs/light/libxl_arm.c | 4 ++-- tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 3 +++ 7 files changed, 30 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 8f2b375ce9..ac3f88fd57 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -3072,6 +3072,22 @@ raised. =back +=over 4 + +=item B + +An optional integer parameter specifying the number of SPIs (Shared +Peripheral Interrupts) to allocate for the domain. Max is 991 SPIs. If +the value specified by the `nr_spis` parameter is smaller than the +number of SPIs calculated by the toolstack based on the devices +allocated for the domain, or the `nr_spis` parameter is not specified, +the value calculated by the toolstack will be used for the domain. +Otherwise, the value specified by the `nr_spis` parameter will be used. +The number of SPIs should match the highest interrupt ID that will be +assigned to the domain. + +=back + =head3 x86 =over 4 diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index b9cb5b33c7..fe5110474d 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1154,6 +1154,7 @@ return fmt.Errorf("invalid union key '%v'", x.Type)} x.ArchArm.GicVersion = GicVersion(xc.arch_arm.gic_version) x.ArchArm.Vuart = VuartType(xc.arch_arm.vuart) x.ArchArm.SveVl = SveType(xc.arch_arm.sve_vl) +x.ArchArm.NrSpis = uint32(xc.arch_arm.nr_spis) if err := x.ArchX86.MsrRelaxed.fromC(&xc.arch_x86.msr_relaxed);err != nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } @@ -1670,6 +1671,7 @@ return fmt.Errorf("invalid union key '%v'", x.Type)} xc.arch_arm.gic_version = C.libxl_gic_version(x.ArchArm.GicVersion) xc.arch_arm.vuart = C.libxl_vuart_type(x.ArchArm.Vuart) xc.arch_arm.sve_vl = C.libxl_sve_type(x.ArchArm.SveVl) +xc.arch_arm.nr_spis = C.uint32_t(x.ArchArm.NrSpis) if err := x.ArchX86.MsrRelaxed.toC(&xc.arch_x86.msr_relaxed); err != nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 5b293755d7..c9e45b306f 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -597,6 +597,7 @@ ArchArm struct { GicVersion GicVersion Vuart VuartType SveVl SveType +NrSpis uint32 } ArchX86 struct { MsrRelaxed Defbool diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 62cb07dea6..a3d05c840b 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -308,6 +308,11 @@ */ #define LIBXL_HAVE_BUILDINFO_ARCH_ARM_SVE_VL 1 +/* + * libxl_domain_build_info has the arch_arm.nr_spis field + */ +#define LIBXL_HAVE_BUILDINFO_ARCH_NR_SPIS 1 + /* * LIBXL_HAVE_SOFT_RESET indicates that libxl supports performing * 'soft reset' for domains and there is 'soft_reset' shutdown reason diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 1cb89fa584..a4029e3ac8 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -181,8 +181,8 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, LOG(DEBUG, "Configure the domain"); - config->arch.nr_spis = nr_spis; - LOG(DEBUG, " - Allocate %u SPIs", nr_spis); + config->arch.nr_spis = max(nr_spis, d_config->b_info.arch_arm.nr_spis); + LOG(DEBUG, " - Allocate %u SPIs", config->arch.nr_spis); switch (d_config->b_info.arch_arm.gic_version) { case LIBXL_GIC_VERSION_DEFAULT: diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 79e9c656cc..4e65e6fda5 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -722,6 +722,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("arch_arm", Struct(None, [("gic_version", libxl_gic_version), ("vuart", libxl_vuart_type), ("sve_vl", libxl_sve_type), + ("nr_spis", uint32), ])), ("arch_x86", Struct(None, [("msr_relaxed", libxl_defbool), ])), diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index c504ab3711..e3a4800f6e 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2935,6 +2935,9 @@ skip_usbdev: } } + if (!xlu_cfg_get_long (config, "nr_spis", &l, 0)) + b_info->arch_arm.nr_spis = l; + parse_vkb_list(config, d_config); d_config->virtios = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 21:33:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 21:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730347.1135604 (Exim 4.92) (envelope-from ) id 1sAz1B-0003LP-Ky; Sat, 25 May 2024 21:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730347.1135604; Sat, 25 May 2024 21: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 1sAz1B-0003LH-IO; Sat, 25 May 2024 21:33:33 +0000 Received: by outflank-mailman (input) for mailman id 730347; Sat, 25 May 2024 21:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1A-0003LA-CS for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1A-0001bQ-Be for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAz1A-0002Ww-Am for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21: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=1aVj4+OLaMgEqHhw3MHLG1y0PhE+yBNX3oFOq7JLi/c=; b=G9/LCB6JMuggcc2KDVGLnAKlyf /g3nWBhnuQhdQaw/70qDNwCBCq4R71venNTOu7dBdVI2RFMVgt16dbcJrgdKH3C3JYyMjEb0Kdo+x Odc9t30XXq2Zbgo9NinpLAiPsXWmhTW2c5Z/5MPXx1b+BejstKifE72dJQsQrNo2q+ZY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm/gic: Allow adding interrupt to running VMs Message-Id: Date: Sat, 25 May 2024 21:33:32 +0000 commit 1c77496bc84391a946f5a00b21ffa9c5d71335c9 Author: Henry Wang AuthorDate: Thu May 23 15:40:35 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 xen/arm/gic: Allow adding interrupt to running VMs Currently, adding physical interrupts are only allowed at the domain creation time. For use cases such as dynamic device tree overlay addition, the adding of physical IRQ to running domains should be allowed. Drop the above-mentioned domain creation check. Since this will introduce interrupt state unsync issues for cases when the interrupt is active or pending in the guest, therefore for these cases we simply reject the operation. Do it for both new and old vGIC implementations. Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Reviewed-by: Julien Grall --- xen/arch/arm/gic-vgic.c | 9 +++++++-- xen/arch/arm/gic.c | 8 -------- xen/arch/arm/vgic/vgic.c | 7 +++++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/gic-vgic.c b/xen/arch/arm/gic-vgic.c index 56490dbc43..b99e287224 100644 --- a/xen/arch/arm/gic-vgic.c +++ b/xen/arch/arm/gic-vgic.c @@ -442,9 +442,14 @@ int vgic_connect_hw_irq(struct domain *d, struct vcpu *v, unsigned int virq, if ( connect ) { - /* The VIRQ should not be already enabled by the guest */ + /* + * The VIRQ should not be already enabled by the guest nor + * active/pending in the guest. + */ if ( !p->desc && - !test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) ) + !test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) && + !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) && + !test_bit(GIC_IRQ_GUEST_ACTIVE, &p->status) ) p->desc = desc; else ret = -EBUSY; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 44c40e86de..b3467a76ae 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -135,14 +135,6 @@ int gic_route_irq_to_guest(struct domain *d, unsigned int virq, ASSERT(virq < vgic_num_irqs(d)); ASSERT(!is_lpi(virq)); - /* - * When routing an IRQ to guest, the virtual state is not synced - * back to the physical IRQ. To prevent get unsync, restrict the - * routing to when the Domain is been created. - */ - if ( d->creation_finished ) - return -EBUSY; - ret = vgic_connect_hw_irq(d, NULL, virq, desc, true); if ( ret ) return ret; diff --git a/xen/arch/arm/vgic/vgic.c b/xen/arch/arm/vgic/vgic.c index b9463a5f27..6cabd0496d 100644 --- a/xen/arch/arm/vgic/vgic.c +++ b/xen/arch/arm/vgic/vgic.c @@ -876,8 +876,11 @@ int vgic_connect_hw_irq(struct domain *d, struct vcpu *vcpu, if ( connect ) /* assign a mapped IRQ */ { - /* The VIRQ should not be already enabled by the guest */ - if ( !irq->hw && !irq->enabled ) + /* + * The VIRQ should not be already enabled by the guest nor + * active/pending in the guest. + */ + if ( !irq->hw && !irq->enabled && !irq->active && !irq->pending_latch ) { irq->hw = true; irq->hwintid = desc->irq; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 21:33:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 21:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730348.1135609 (Exim 4.92) (envelope-from ) id 1sAz1L-0003Ow-NE; Sat, 25 May 2024 21:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730348.1135609; Sat, 25 May 2024 21: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 1sAz1L-0003Om-Jr; Sat, 25 May 2024 21:33:43 +0000 Received: by outflank-mailman (input) for mailman id 730348; Sat, 25 May 2024 21:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1K-0003OW-Fh for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1K-0001bX-Er for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAz1K-0002XR-Dx for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21: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=fIkjFYmHEM3Gz/jxf1k4nulukL96XQ2FnkSkrYFaJ/w=; b=cjRN1ttwcHCOjZoXxVRev65Un/ yF8JHBMuzOBfWy4dJ/7IMynH70hqOFIsaFhLMqUCmxAFRIy8cEF/xqOeMKmnn+wWegpASiHCbr0J2 aWg2Xhnr9gRGCvGsPW+ZJod5laZUSMJ/6HHF8pta3+RJcq8elZINAEgzKQlC1a8M5nj4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add XEN_DOMCTL_dt_overlay and device attachment to domains Message-Id: Date: Sat, 25 May 2024 21:33:42 +0000 commit 4c733873b5c2dbe7620365eacb399ab885011279 Author: Henry Wang AuthorDate: Thu May 23 15:40:36 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 xen/arm: Add XEN_DOMCTL_dt_overlay and device attachment to domains In order to support the dynamic dtbo device assignment to a running VM, the add/remove of the DT overlay and the attach/detach of the device from the DT overlay should happen separately. Therefore, repurpose the existing XEN_SYSCTL_dt_overlay to only add the DT overlay to Xen device tree, instead of assigning the device to the hardware domain at the same time. It is OK to change the sysctl behavior as this feature is experimental so changing sysctl behavior and breaking compatibility is OK. Add the XEN_DOMCTL_dt_overlay with operations XEN_DOMCTL_DT_OVERLAY_ATTACH to do the device assignment to the domain. The hypervisor firstly checks the DT overlay passed from the toolstack is valid. Then the device nodes are retrieved from the overlay tracker based on the DT overlay. The attach of the device is implemented by mapping the IRQ and IOMMU resources. All devices in the overlay are assigned to a single domain. Also take the opportunity to make one coding style fix in sysctl.h. Introduce DT_OVERLAY_MAX_SIZE and use it to avoid repetitions of KB(500). xen,reg is to be used to handle non-1:1 mappings but it is currently unsupported. For now return errors for not-1:1 mapped domains. Signed-off-by: Henry Wang Signed-off-by: Vikram Garhwal Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domctl.c | 3 + xen/common/dt-overlay.c | 211 ++++++++++++++++++++++++++++++++----------- xen/include/public/domctl.h | 16 +++- xen/include/public/sysctl.h | 11 +-- xen/include/xen/dt-overlay.h | 8 ++ 5 files changed, 189 insertions(+), 60 deletions(-) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index ad56efb0f5..12a12ee781 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -5,6 +5,7 @@ * Copyright (c) 2012, Citrix Systems */ +#include #include #include #include @@ -176,6 +177,8 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, return rc; } + case XEN_DOMCTL_dt_overlay: + return dt_overlay_domctl(d, &domctl->u.dt_overlay); default: return subarch_do_domctl(domctl, d, u_domctl); } diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index 9cece79067..d53b4706cd 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -15,6 +15,8 @@ #include #include +#define DT_OVERLAY_MAX_SIZE KB(500) + static LIST_HEAD(overlay_tracker); static DEFINE_SPINLOCK(overlay_lock); @@ -356,6 +358,42 @@ static int overlay_get_nodes_info(const void *fdto, char **nodes_full_path) return 0; } +/* This function should be called with the overlay_lock taken */ +static struct overlay_track * +find_track_entry_from_tracker(const void *overlay_fdt, + uint32_t overlay_fdt_size) +{ + struct overlay_track *entry, *temp; + bool found_entry = false; + + ASSERT(spin_is_locked(&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 ) + { + found_entry = true; + break; + } + } + + if ( !found_entry ) + { + printk(XENLOG_ERR "Cannot find any matching tracker with input dtbo." + " Operation is supported only for prior added dtbo.\n"); + return NULL; + } + + return entry; +} + /* Check if node itself can be removed and remove node from IOMMU. */ static int remove_node_resources(struct dt_device_node *device_node) { @@ -485,8 +523,7 @@ 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; + struct overlay_track *entry; rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size); if ( rc ) @@ -494,29 +531,10 @@ static long handle_remove_overlay_nodes(const void *overlay_fdt, 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 ) + entry = find_track_entry_from_tracker(overlay_fdt, overlay_fdt_size); + if ( entry == NULL ) { 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; } @@ -620,15 +638,7 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) return -EFAULT; } - rc = handle_device(hardware_domain, overlay_node, p2m_mmio_direct_c, - tr->iomem_ranges, - tr->irq_ranges); write_unlock(&dt_host_lock); - 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; @@ -638,9 +648,7 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) } /* * 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(). + * We use tr->dt_host_new to unflatten the updated device_tree_flattened. */ static long handle_add_overlay_nodes(void *overlay_fdt, uint32_t overlay_fdt_size) @@ -774,20 +782,6 @@ static long handle_add_overlay_nodes(void *overlay_fdt, 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 ) { @@ -843,14 +837,83 @@ static long handle_add_overlay_nodes(void *overlay_fdt, xfree(tr->nodes_address); xfree(tr->fdt); - rangeset_destroy(tr->irq_ranges); - rangeset_destroy(tr->iomem_ranges); - xfree(tr); return rc; } +static long handle_attach_overlay_nodes(struct domain *d, + const void *overlay_fdt, + uint32_t overlay_fdt_size) +{ + int rc; + unsigned int j; + struct overlay_track *entry; + + rc = check_overlay_fdt(overlay_fdt, overlay_fdt_size); + if ( rc ) + return rc; + + spin_lock(&overlay_lock); + + entry = find_track_entry_from_tracker(overlay_fdt, overlay_fdt_size); + if ( entry == NULL ) + { + rc = -EINVAL; + goto out; + } + + entry->irq_ranges = rangeset_new(d, "Overlays: Interrupts", 0); + if (entry->irq_ranges == NULL) + { + rc = -ENOMEM; + printk(XENLOG_ERR "Creating IRQ rangeset failed"); + goto out; + } + + entry->iomem_ranges = rangeset_new(d, "Overlay: I/O Memory", 0); + if (entry->iomem_ranges == NULL) + { + rc = -ENOMEM; + printk(XENLOG_ERR "Creating IOMMU rangeset failed"); + goto out; + } + + for ( j = 0; j < entry->num_nodes; j++ ) + { + struct dt_device_node *overlay_node; + + overlay_node = (struct dt_device_node *)entry->nodes_address[j]; + if ( overlay_node == NULL ) + { + rc = -EINVAL; + goto out; + } + + write_lock(&dt_host_lock); + rc = handle_device(d, overlay_node, p2m_mmio_direct_c, + entry->iomem_ranges, entry->irq_ranges); + write_unlock(&dt_host_lock); + if ( rc ) + { + printk(XENLOG_ERR "Adding IRQ and IOMMU failed\n"); + goto out; + } + } + + spin_unlock(&overlay_lock); + + return 0; + + out: + spin_unlock(&overlay_lock); + + rangeset_destroy(entry->irq_ranges); + rangeset_destroy(entry->iomem_ranges); + + return rc; +} + long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) { long ret; @@ -860,7 +923,8 @@ long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) op->overlay_op != XEN_SYSCTL_DT_OVERLAY_REMOVE ) return -EOPNOTSUPP; - if ( op->overlay_fdt_size == 0 || op->overlay_fdt_size > KB(500) ) + if ( op->overlay_fdt_size == 0 || + op->overlay_fdt_size > DT_OVERLAY_MAX_SIZE ) return -EINVAL; if ( op->pad[0] || op->pad[1] || op->pad[2] ) @@ -890,6 +954,49 @@ long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) return ret; } +long dt_overlay_domctl(struct domain *d, struct xen_domctl_dt_overlay *op) +{ + long ret; + void *overlay_fdt; + + if ( op->overlay_op != XEN_DOMCTL_DT_OVERLAY_ATTACH ) + return -EOPNOTSUPP; + + if ( op->overlay_fdt_size == 0 || + op->overlay_fdt_size > DT_OVERLAY_MAX_SIZE ) + return -EINVAL; + + if ( op->pad[0] || op->pad[1] || op->pad[2] ) + return -EINVAL; + + /* TODO: add support for non-1:1 domains using xen,reg */ + if ( !is_domain_direct_mapped(d) ) + return -EOPNOTSUPP; + + 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_DOMCTL_DT_OVERLAY_ATTACH ) + ret = handle_attach_overlay_nodes(d, overlay_fdt, op->overlay_fdt_size); + else + ret = -EOPNOTSUPP; + + xfree(overlay_fdt); + + return ret; +} + /* * Local variables: * mode: C diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index a33f9ec32b..6cd39ea46d 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -21,7 +21,7 @@ #include "hvm/save.h" #include "memory.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000016 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000017 /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -1190,6 +1190,16 @@ struct xen_domctl_vmtrace_op { typedef struct xen_domctl_vmtrace_op xen_domctl_vmtrace_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vmtrace_op_t); +#if defined(__arm__) || defined(__aarch64__) +struct xen_domctl_dt_overlay { + XEN_GUEST_HANDLE_64(const_void) overlay_fdt; /* IN: overlay fdt. */ + uint32_t overlay_fdt_size; /* IN: Overlay dtb size. */ +#define XEN_DOMCTL_DT_OVERLAY_ATTACH 1 + uint8_t overlay_op; /* IN: Attach. */ + uint8_t pad[3]; /* IN: Must be zero. */ +}; +#endif + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -1277,6 +1287,7 @@ struct xen_domctl { #define XEN_DOMCTL_vmtrace_op 84 #define XEN_DOMCTL_get_paging_mempool_size 85 #define XEN_DOMCTL_set_paging_mempool_size 86 +#define XEN_DOMCTL_dt_overlay 87 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1339,6 +1350,9 @@ struct xen_domctl { struct xen_domctl_vuart_op vuart_op; struct xen_domctl_vmtrace_op vmtrace_op; struct xen_domctl_paging_mempool paging_mempool; +#if defined(__arm__) || defined(__aarch64__) + struct xen_domctl_dt_overlay dt_overlay; +#endif uint8_t pad[128]; } u; }; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index febaa4b16a..3a6e7d48f0 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -1184,14 +1184,11 @@ 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__) +#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. + * Performs addition/removal of device tree nodes under parent node using dtbo + * from dt_host. */ struct xen_sysctl_dt_overlay { XEN_GUEST_HANDLE_64(const_void) overlay_fdt; /* IN: overlay fdt. */ @@ -1265,7 +1262,7 @@ struct xen_sysctl { struct xen_sysctl_cpu_policy cpu_policy; #endif -#if defined(__arm__) || defined (__aarch64__) +#if defined(__arm__) || defined(__aarch64__) struct xen_sysctl_dt_overlay dt_overlay; #endif uint8_t pad[128]; diff --git a/xen/include/xen/dt-overlay.h b/xen/include/xen/dt-overlay.h index c0567741ee..b2cedf3f2a 100644 --- a/xen/include/xen/dt-overlay.h +++ b/xen/include/xen/dt-overlay.h @@ -39,15 +39,23 @@ struct overlay_track { }; struct xen_sysctl_dt_overlay; +struct xen_domctl_dt_overlay; #ifdef CONFIG_OVERLAY_DTB long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op); +long dt_overlay_domctl(struct domain *d, struct xen_domctl_dt_overlay *op); #else #include static inline long dt_overlay_sysctl(struct xen_sysctl_dt_overlay *op) { return -EOPNOTSUPP; } + +static inline long dt_overlay_domctl(struct domain *d, + struct xen_domctl_dt_overlay *op) +{ + return -EOPNOTSUPP; +} #endif #endif /* __XEN_DT_OVERLAY_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 21:33:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 21:33:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730349.1135611 (Exim 4.92) (envelope-from ) id 1sAz1W-0003Sl-Pb; Sat, 25 May 2024 21:33:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730349.1135611; Sat, 25 May 2024 21:33:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1W-0003Sb-NB; Sat, 25 May 2024 21:33:54 +0000 Received: by outflank-mailman (input) for mailman id 730349; Sat, 25 May 2024 21:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1U-0003SD-KF for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1U-0001bf-IF for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAz1U-0002gI-HO for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21: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=DcBQ3OurHjgwbchOe5S8F7/ggYY8CmoYeHoV7ordOQM=; b=USNBbT8YJDeRhIYklvs8ArS/xi VEccT4KDlyB/3nMSS/yU+2DXZFtAdJYr/x7Tj6a6UL93c173pYHJ64IRo0on3y3kByHHZaEjKncLY pZfbY3LDeNmbw/YfHtAc9aU2K946spYaoOoSseRO03u0S1r2wCqjnVGYVDI8Vm73cuh8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Introduce the "xl dt-overlay attach" command Message-Id: Date: Sat, 25 May 2024 21:33:52 +0000 commit 2c4fbadf7372bf5344d0a637367fb392d4c9322b Author: Henry Wang AuthorDate: Thu May 23 15:40:39 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 tools: Introduce the "xl dt-overlay attach" command With the XEN_DOMCTL_dt_overlay DOMCTL added, users should be able to attach (in the future also detach) devices from the provided DT overlay to domains. Support this by introducing a new "xl dt-overlay" command and related documentation, i.e. "xl dt-overlay attach. Slightly rework the command option parsing logic. Signed-off-by: Henry Wang Signed-off-by: Stefano Stabellini Reviewed-by: Jason Andryuk Reviewed-by: Stefano Stabellini --- tools/include/libxl.h | 15 ++++++++++++++ tools/include/xenctrl.h | 3 +++ tools/libs/ctrl/xc_dt_overlay.c | 31 +++++++++++++++++++++++++++++ tools/libs/light/libxl_dt_overlay.c | 28 ++++++++++++++++++++++++++ tools/xl/xl_cmdtable.c | 4 ++-- tools/xl/xl_vmcontrol.c | 39 +++++++++++++++++++++++++------------ 6 files changed, 106 insertions(+), 14 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index a3d05c840b..f5c7167742 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -641,6 +641,12 @@ */ #define LIBXL_HAVE_XEN_9PFS 1 +/* + * LIBXL_HAVE_DT_OVERLAY_DOMAIN indicates the presence of + * libxl_dt_overlay_domain. + */ +#define LIBXL_HAVE_DT_OVERLAY_DOMAIN 1 + /* * libxl memory management * @@ -2554,8 +2560,17 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, void libxl_device_pci_list_free(libxl_device_pci* list, int num); #if defined(__arm__) || defined(__aarch64__) +/* Values should keep consistent with the op from XEN_SYSCTL_dt_overlay */ +#define LIBXL_DT_OVERLAY_ADD 1 +#define LIBXL_DT_OVERLAY_REMOVE 2 int libxl_dt_overlay(libxl_ctx *ctx, void *overlay, uint32_t overlay_size, uint8_t overlay_op); + +/* Values should keep consistent with the op from XEN_DOMCTL_dt_overlay */ +#define LIBXL_DT_OVERLAY_DOMAIN_ATTACH 1 +int libxl_dt_overlay_domain(libxl_ctx *ctx, uint32_t domain_id, + void *overlay_dt, uint32_t overlay_dt_size, + uint8_t overlay_op); #endif /* diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 4996855944..9ceca0cffc 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -2657,6 +2657,9 @@ int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, #if defined(__arm__) || defined(__aarch64__) int xc_dt_overlay(xc_interface *xch, void *overlay_fdt, uint32_t overlay_fdt_size, uint8_t overlay_op); +int xc_dt_overlay_domain(xc_interface *xch, void *overlay_fdt, + uint32_t overlay_fdt_size, uint8_t overlay_op, + uint32_t domain_id); #endif /* Compat shims */ diff --git a/tools/libs/ctrl/xc_dt_overlay.c b/tools/libs/ctrl/xc_dt_overlay.c index c2224c4d15..ea1da522d1 100644 --- a/tools/libs/ctrl/xc_dt_overlay.c +++ b/tools/libs/ctrl/xc_dt_overlay.c @@ -48,3 +48,34 @@ err: return err; } + +int xc_dt_overlay_domain(xc_interface *xch, void *overlay_fdt, + uint32_t overlay_fdt_size, uint8_t overlay_op, + uint32_t domain_id) +{ + int err; + struct xen_domctl domctl = { + .cmd = XEN_DOMCTL_dt_overlay, + .domain = domain_id, + .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(domctl.u.dt_overlay.overlay_fdt, overlay_fdt); + + if ( (err = do_domctl(xch, &domctl)) != 0 ) + PERROR("%s failed", __func__); + +err: + xc_hypercall_bounce_post(xch, overlay_fdt); + + return err; +} diff --git a/tools/libs/light/libxl_dt_overlay.c b/tools/libs/light/libxl_dt_overlay.c index a6c709a6dc..00503b76bd 100644 --- a/tools/libs/light/libxl_dt_overlay.c +++ b/tools/libs/light/libxl_dt_overlay.c @@ -69,3 +69,31 @@ out: return rc; } +int libxl_dt_overlay_domain(libxl_ctx *ctx, uint32_t domain_id, + 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_domain(ctx->xch, overlay_dt, overlay_dt_size, overlay_op, + domain_id); + if (r) { + LOG(ERROR, "%s: Attaching/Detaching overlay dtb failed.", __func__); + rc = ERROR_FAIL; + } + +out: + GC_FREE; + return rc; +} diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 1f3c6b5897..42751228c1 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -634,8 +634,8 @@ const struct cmd_spec cmd_table[] = { #ifdef LIBXL_HAVE_DT_OVERLAY { "dt-overlay", &main_dt_overlay, 0, 1, - "Add/Remove a device tree overlay", - "add/remove <.dtbo>", + "Add/Remove a device tree overlay to Xen device tree, attach/detach the device to a domain", + " <.dtbo> OR <.dtbo> ", "-h print this help\n" }, #endif diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index 02575d5d36..fa1a4420e3 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -1268,32 +1268,43 @@ int main_create(int argc, char **argv) #ifdef LIBXL_HAVE_DT_OVERLAY 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; + uint32_t domain_id = 0; + bool domain_op = false; 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 { + if (strcmp(argv[optind], "add") == 0) + op = LIBXL_DT_OVERLAY_ADD; + else if (strcmp(argv[optind], "remove") == 0) + op = LIBXL_DT_OVERLAY_REMOVE; + else if (strcmp(argv[optind], "attach") == 0) { + op = LIBXL_DT_OVERLAY_DOMAIN_ATTACH; + domain_op = true; + } else { fprintf(stderr, "Invalid dt overlay operation\n"); return EXIT_FAILURE; } + overlay_config_file = argv[optind+1]; + + if (domain_op) { + if (argc <= optind + 2) { + fprintf(stderr, "Missing domain ID\n"); + help("dt-overlay"); + return EXIT_FAILURE; + } else { + domain_id = find_domain(argv[optind+2]); + } + } + if (overlay_config_file) { rc = libxl_read_file_contents(ctx, overlay_config_file, &overlay_dtb, &overlay_dtb_size); @@ -1309,7 +1320,11 @@ int main_dt_overlay(int argc, char **argv) return EXIT_FAILURE; } - rc = libxl_dt_overlay(ctx, overlay_dtb, overlay_dtb_size, op); + if (!domain_op) + rc = libxl_dt_overlay(ctx, overlay_dtb, overlay_dtb_size, op); + else + rc = libxl_dt_overlay_domain(ctx, domain_id, overlay_dtb, + overlay_dtb_size, op); free(overlay_dtb); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 25 21:34:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 25 May 2024 21:34:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730350.1135616 (Exim 4.92) (envelope-from ) id 1sAz1g-0003W5-RH; Sat, 25 May 2024 21:34:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730350.1135616; Sat, 25 May 2024 21: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 1sAz1g-0003Vx-OX; Sat, 25 May 2024 21:34:04 +0000 Received: by outflank-mailman (input) for mailman id 730350; Sat, 25 May 2024 21:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1e-0003VV-Ml for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sAz1e-0001cI-M2 for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sAz1e-0002hS-KS for xen-changelog@lists.xenproject.org; Sat, 25 May 2024 21: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=iDLGG9Y6j9V09JaxucKLYM9bSVyfHnHywbKf9Bkvbm8=; b=O3zGZ0sAeaT2FieVQ8VZ/oP7x0 9lm8NKExFHgzAXkSjr+VJ1KIugAVaFWKJHxQJeJmDouyxPqOXsRXlXbXVh/ylD12L7XpljrTFyz6W /EYzMcQ6k0XtTrp7w+YJbnlguqSjLc/swXf7I6KXkn8N2q+oB9bWnICRqsW0L5zPLadw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: Add device tree overlay documentation Message-Id: Date: Sat, 25 May 2024 21:34:02 +0000 commit ac572152e578a8853de0534384c1539ec21f11e0 Author: Vikram Garhwal AuthorDate: Thu May 23 15:40:40 2024 +0800 Commit: Stefano Stabellini CommitDate: Fri May 24 16:26:22 2024 -0700 docs: Add device tree overlay documentation Signed-off-by: Vikram Garhwal Signed-off-by: Stefano Stabellini Signed-off-by: Henry Wang Reviewed-by: Julien Grall --- docs/misc/arm/overlay.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/docs/misc/arm/overlay.txt b/docs/misc/arm/overlay.txt new file mode 100644 index 0000000000..ca85b1beea --- /dev/null +++ b/docs/misc/arm/overlay.txt @@ -0,0 +1,82 @@ +# Device Tree Overlays support in Xen + +Xen experimentally supports dynamic device assignment to running +domains, i.e. adding/removing nodes (using .dtbo) to/from Xen device +tree, and attaching them to a running domain with given $domid. + +Dynamic node assignment works in two steps: + +## Add/Remove device tree overlay to/from Xen device tree + +1. Xen tools check the dtbo given and parse all other user provided arguments +2. Xen tools pass the dtbo to Xen hypervisor via hypercall. +3. Xen hypervisor applies/removes the dtbo to/from Xen device tree. + +## Attach device from the DT overlay to domain + +1. Xen tools check the dtbo given and parse all other user provided arguments +2. Xen tools pass the dtbo to Xen hypervisor via hypercall. +3. Xen hypervisor attach the device to the user-provided $domid by + mapping node resources in the DT overlay. + +# Examples + +Here are a few examples on how to use it. + +## Dom0 device add + +For assigning a device tree overlay to Dom0, user should firstly properly +prepare the DT overlay. More information about device tree overlays can be +found in [1]. Then, in Dom0, enter the following: + + (dom0) xl dt-overlay add overlay.dtbo + +This will allocate the devices mentioned in overlay.dtbo to Xen device tree. + +To assign the newly added device from the dtbo to Dom0: + + (dom0) xl dt-overlay attach overlay.dtbo 0 + +Next, if the user wants to add the same device tree overlay to dom0 +Linux, execute the following: + + (dom0) mkdir -p /sys/kernel/config/device-tree/overlays/new_overlay + (dom0) cat overlay.dtbo > /sys/kernel/config/device-tree/overlays/new_overlay/dtbo + +Finally if needed, the relevant Linux kernel drive can be loaded using: + + (dom0) modprobe module_name.ko + +## DomU device add/remove + +All the nodes in dtbo will be assigned to one domain. The user will need +to prepare a different dtbo for the domU. For example, the +`interrupt-parent` property of the DomU overlay should be changed to the +Xen hardcoded value `0xfde8` and the xen,reg property should be added to +specify the address mappings. If the domain is not 1:1 mapped, xen,reg +must be present. See the xen,reg format description in +docs/misc/arm/passthrough.txt. Below assumes the properly written DomU +dtbo is `overlay_domu.dtbo`. + +The user needs to set the `passthrough` property in the xl config file +if you plan to use DT overlay and devices requiring an IOMMU. + +User will also need to modprobe the relevant drivers. For already +running domains, the user can use the xl dt-overlay attach command, +example: + + (dom0) xl dt-overlay add overlay.dtbo # If not executed before + (dom0) xl dt-overlay attach overlay_domu.dtbo $domid + (dom0) xl console $domid # To access $domid console + +Next, if the user needs to modify/prepare the overlay.dtbo suitable for +the domU: + + (domU) mkdir -p /sys/kernel/config/device-tree/overlays/new_overlay + (domU) cat overlay_domu.dtbo > /sys/kernel/config/device-tree/overlays/new_overlay/dtbo + +Finally, if needed, the relevant Linux kernel drive can be probed: + + (domU) modprobe module_name.ko + +[1] https://www.kernel.org/doc/Documentation/devicetree/overlay-notes.txt -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 28 02:00:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 02:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730971.1136250 (Exim 4.92) (envelope-from ) id 1sBm8D-0002hr-7T; Tue, 28 May 2024 02:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730971.1136250; Tue, 28 May 2024 02:00:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8D-0002hk-4U; Tue, 28 May 2024 02:00:05 +0000 Received: by outflank-mailman (input) for mailman id 730971; Tue, 28 May 2024 02:00:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8B-0002Tl-RG for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8B-00012F-NE for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBm8B-0002Cu-LQ for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sKT148j9C9o7XtwN0Rh8j4TmFy+XDvooyn8iEVUPFtk=; b=1YfQ0ktNCJ0Ny6si8XU9XEE4hR SWsaZYWFIeNbU/qEwBQ8YL5F38GeV2Hty52FrOwWE/gr40pccTo/haWdW3FDaIvedJh4mEWyVcHzR +faXpcv7UFno43GC9j2HUwZY728lWwKdWrgQgSjchpsHQPh5KYDICO38AF4CPfU4Wnes=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: set MISRA C Rule 10.2 as clean Message-Id: Date: Tue, 28 May 2024 02:00:03 +0000 commit 4bc8dc01a3f506235b9473a899e077bf2479c98a Author: Nicola Vetrini AuthorDate: Fri May 17 12:27:10 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon May 27 18:49:43 2024 -0700 automation/eclair_analysis: set MISRA C Rule 10.2 as clean This rule has no more violations in the codebase, so it can be set as clean. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index acea15f486..b7a9f75b27 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.10||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R21.9||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R10.2||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.10||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R21.9||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 02:00:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 02:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730972.1136255 (Exim 4.92) (envelope-from ) id 1sBm8N-0003CK-8i; Tue, 28 May 2024 02:00:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730972.1136255; Tue, 28 May 2024 02:00:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8N-0003CD-67; Tue, 28 May 2024 02:00:15 +0000 Received: by outflank-mailman (input) for mailman id 730972; Tue, 28 May 2024 02:00:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8L-0003C1-RQ for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8L-00012O-QZ for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBm8L-0002Ej-Pc for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00: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=p0sgHoFmu30RhMrn2eAczpa9sOlZs9p4jwcY+XmzPoM=; b=Fl0EUoHx+7L38wKyHk9bfZaOjo 6RtN+QNKNdV5wwjHfsIC16mkigzsWQW1Ak+32xiN+GhpzKcxYIPtJjlJB4oT2MFOotALVDcK9IpXR Z1uojxKvkBtKu3/9cgMASHP1gQ1OSkl1F5xX6DGSUl//9kZgZgnEXxUsuKuTYqIwNd9Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: add already clean rules to the analysis Message-Id: Date: Tue, 28 May 2024 02:00:13 +0000 commit 1eba1fe18d1474629a9c12f5442cce69c79f1b8b Author: Nicola Vetrini AuthorDate: Tue May 21 21:34:21 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon May 27 18:51:09 2024 -0700 automation/eclair_analysis: add already clean rules to the analysis Some MISRA C rules already have no violations in Xen, so they can be set as clean. Reorder the rules in tagging.ecl according to version ordering (i.e. sort -V) and split the configuration on multiple lines for readability. Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/monitored.ecl | 17 ++++++ automation/eclair_analysis/ECLAIR/tagging.ecl | 78 ++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl index 9da709dc88..4daecb0c83 100644 --- a/automation/eclair_analysis/ECLAIR/monitored.ecl +++ b/automation/eclair_analysis/ECLAIR/monitored.ecl @@ -79,4 +79,21 @@ -enable=MC3R1.R9.3 -enable=MC3R1.R9.4 -enable=MC3R1.R9.5 +-enable=MC3R1.R18.8 +-enable=MC3R1.R20.2 +-enable=MC3R1.R20.3 +-enable=MC3R1.R20.6 +-enable=MC3R1.R20.11 +-enable=MC3R1.R21.3 +-enable=MC3R1.R21.4 +-enable=MC3R1.R21.5 +-enable=MC3R1.R21.7 +-enable=MC3R1.R21.8 +-enable=MC3R1.R21.12 +-enable=MC3R1.R22.1 +-enable=MC3R1.R22.3 +-enable=MC3R1.R22.7 +-enable=MC3R1.R22.8 +-enable=MC3R1.R22.9 +-enable=MC3R1.R22.10 -doc_end diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index b7a9f75b27..a354ff322e 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,83 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R10.2||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.10||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R21.9||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common, +"MC3R1.D1.1|| +MC3R1.D2.1|| +MC3R1.D4.1|| +MC3R1.D4.11|| +MC3R1.D4.14|| +MC3R1.R1.1|| +MC3R1.R1.3|| +MC3R1.R1.4|| +MC3R1.R2.2|| +MC3R1.R2.6|| +MC3R1.R3.1|| +MC3R1.R3.2|| +MC3R1.R4.1|| +MC3R1.R4.2|| +MC3R1.R5.1|| +MC3R1.R5.2|| +MC3R1.R5.4|| +MC3R1.R5.6|| +MC3R1.R6.1|| +MC3R1.R6.2|| +MC3R1.R7.1|| +MC3R1.R7.2|| +MC3R1.R7.4|| +MC3R1.R8.1|| +MC3R1.R8.2|| +MC3R1.R8.5|| +MC3R1.R8.6|| +MC3R1.R8.8|| +MC3R1.R8.10|| +MC3R1.R8.12|| +MC3R1.R8.14|| +MC3R1.R9.2|| +MC3R1.R9.3|| +MC3R1.R9.4|| +MC3R1.R9.5|| +MC3R1.R10.2|| +MC3R1.R11.7|| +MC3R1.R11.9|| +MC3R1.R12.5|| +MC3R1.R14.1|| +MC3R1.R16.7|| +MC3R1.R17.1|| +MC3R1.R17.3|| +MC3R1.R17.4|| +MC3R1.R17.5|| +MC3R1.R17.6|| +MC3R1.R18.8|| +MC3R1.R20.2|| +MC3R1.R20.3|| +MC3R1.R20.4|| +MC3R1.R20.6|| +MC3R1.R20.9|| +MC3R1.R20.11|| +MC3R1.R20.13|| +MC3R1.R20.14|| +MC3R1.R21.3|| +MC3R1.R21.4|| +MC3R1.R21.5|| +MC3R1.R21.7|| +MC3R1.R21.8|| +MC3R1.R21.9|| +MC3R1.R21.10|| +MC3R1.R21.12|| +MC3R1.R21.13|| +MC3R1.R21.19|| +MC3R1.R21.21|| +MC3R1.R22.1|| +MC3R1.R22.2|| +MC3R1.R22.3|| +MC3R1.R22.4|| +MC3R1.R22.5|| +MC3R1.R22.6|| +MC3R1.R22.7|| +MC3R1.R22.8|| +MC3R1.R22.9|| +MC3R1.R22.10" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 02:00:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 02:00:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730973.1136260 (Exim 4.92) (envelope-from ) id 1sBm8X-0003F9-Ab; Tue, 28 May 2024 02:00:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730973.1136260; Tue, 28 May 2024 02:00:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8X-0003F1-7b; Tue, 28 May 2024 02:00:25 +0000 Received: by outflank-mailman (input) for mailman id 730973; Tue, 28 May 2024 02:00:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8V-0003Ee-VP for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8V-00012W-Ue for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBm8V-0002Ft-Sl for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00: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=Q1MQQlIPiXgOTb9CDxLXubkPGD0gn/BrJHh34AgJaXY=; b=XzEBbYPz+GZz0lNdJiJBMllV1y Q6+Hzu4HpEDH0ura5jf5+/7X/7Wwgo2g/pmAyGaeGrRhzJdmKGatiC4RzCicVkUpXr0coTsIHyLVt /MZfTFIYFP+wcXuQg4EBVFB1DNwG/dw8H+tXnIYfD5mNCIb7j9nugEghExFmtuZrh5AE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/misra: exclude gdbsx from MISRA compliance Message-Id: Date: Tue, 28 May 2024 02:00:23 +0000 commit 841f437a8bc8d220165a5c1c239c69edb54c29ff Author: Nicola Vetrini AuthorDate: Mon May 27 16:53:16 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon May 27 18:54:25 2024 -0700 docs/misra: exclude gdbsx from MISRA compliance These files are used when debugging Xen, and are not meant to comply with MISRA rules at the moment. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- docs/misra/exclude-list.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/misra/exclude-list.json b/docs/misra/exclude-list.json index cd69765427..2567e8467c 100644 --- a/docs/misra/exclude-list.json +++ b/docs/misra/exclude-list.json @@ -77,6 +77,14 @@ "rel_path": "arch/x86/dmi_scan.c", "comment": "Imported from Linux, ignore for now" }, + { + "rel_path": "arch/x86/gdbsx.c", + "comment": "Used for debugging Xen, ignore for now" + }, + { + "rel_path": "arch/x86/include/asm/gdbsx.h", + "comment": "Used for debugging Xen, ignore for now" + }, { "rel_path": "arch/x86/mpparse.c", "comment": "Imported from Linux, ignore for now" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 02:00:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 02:00:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.730974.1136263 (Exim 4.92) (envelope-from ) id 1sBm8h-0003Hw-Bh; Tue, 28 May 2024 02:00:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 730974.1136263; Tue, 28 May 2024 02:00: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 1sBm8h-0003Ho-91; Tue, 28 May 2024 02:00:35 +0000 Received: by outflank-mailman (input) for mailman id 730974; Tue, 28 May 2024 02:00:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8g-0003HQ-2C for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBm8g-00012d-1N for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBm8g-0002H8-0X for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 02:00:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2jkBtoJCdm9jAmMhLOs9ESyjZHMKWbhf8iahGdkZPtY=; b=7F/wjuMD0Iu8WiLjPJCXCyOQxn 7LOR2EiSVQVvuOGgPUwSL38ps+g69EdO9iVWMkK8hVBInmXYmDoCcH4m3f6FOzqc/imDf/5om02n5 +0xK7nSdzsdYCoqdQQoCihTGb5DFe+Fd0kkTIcIVeVUSmh70kWxO9OoDF546ZQWTKRQQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation/eclair_analysis: avoid an ECLAIR warning about escaping Message-Id: Date: Tue, 28 May 2024 02:00:34 +0000 commit 96af090e33130b0bf0953f3ccab8e7a163392318 Author: Nicola Vetrini AuthorDate: Mon May 27 16:53:17 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon May 27 18:56:00 2024 -0700 automation/eclair_analysis: avoid an ECLAIR warning about escaping The parentheses in this regular expression should be doubly escaped because they undergo expansion twice. Signed-off-by: Nicola Vetrini [stefano: fix commit message] Signed-off-by: Stefano Stabellini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index b9b377c56b..cf62a874d9 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -405,8 +405,8 @@ explicit comment indicating the fallthrough intention is present." # -doc_begin="printf()-like functions are allowed to use the variadic features provided by stdarg.h." --config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(^.*printk\(.*\)$)))"} --config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(^.*printf\(.*\)$)))"} +-config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(^.*printk\\(.*\\)$)))"} +-config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(^.*printf\\(.*\\)$)))"} -config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(name(panic)&&kind(function))))"} -config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(name(elf_call_log_callback)&&kind(function))))"} -config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(name(vprintk_common)&&kind(function))))"} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 07:00:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 07:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731016.1136317 (Exim 4.92) (envelope-from ) id 1sBqoX-00049X-8b; Tue, 28 May 2024 07:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731016.1136317; Tue, 28 May 2024 07:00:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBqoX-00049Q-5P; Tue, 28 May 2024 07:00:05 +0000 Received: by outflank-mailman (input) for mailman id 731016; Tue, 28 May 2024 07:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBqoW-0003zM-Hk for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 07:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBqoW-0006hm-Dc for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 07:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBqoW-0002rp-Cc for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 07:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=c+SFxqOLfs1DaATKPBh62Hva36C5LjPMKiH0WinZaKw=; b=Od9pJNhPfCqvJJmEbirOUQuZND cg8mtQLL8lUXELee+SSf/WpAyI7zFEy1cHscsLpAFEUIivQr30hW2YKEoCEtvdz75sdPiXzVZlrlw Mk+A0Be+vgQJtAEow++FBNUJfqjvSEzlTo0UC+ZQ2jf0g7pvC4CKfGqJqYWktVzC2l/c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG: Mention libxl blktap/tapback support Message-Id: Date: Tue, 28 May 2024 07:00:04 +0000 commit 8b977fe57254ff8d343e4bf50cf98fa6c2b36b8b Author: Jason Andryuk AuthorDate: Tue May 28 08:52:15 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 28 08:52:15 2024 +0200 CHANGELOG: Mention libxl blktap/tapback support Add entry for backendtype=tap support in libxl. blktap needs some changes to work with libxl, which haven't been merged. They are available from this PR: https://github.com/xapi-project/blktap/pull/394 Signed-off-by: Jason Andryuk Acked-by: Oleksii Kurochko --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index efdaff11de..579329ff71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) for IPIs and Physical addressing mode for external interrupts. - Add a new 9pfs backend running as a daemon in dom0. First user is Xenstore-stubdom now being able to support full Xenstore trace capability. + - libxl support for backendtype=tap with tapback. ### Removed - caml-stubdom. It hasn't built since 2014, was pinned to Ocaml 4.02, and has -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 07:00:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 07:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731017.1136320 (Exim 4.92) (envelope-from ) id 1sBqoh-0004MJ-9S; Tue, 28 May 2024 07:00:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731017.1136320; Tue, 28 May 2024 07:00:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBqoh-0004MC-6x; Tue, 28 May 2024 07:00:15 +0000 Received: by outflank-mailman (input) for mailman id 731017; Tue, 28 May 2024 07:00:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBqog-0004M6-LG for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 07:00:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBqog-0006hq-KP for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 07:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBqog-0003yv-Fs for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 07:00:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bOqODMRLPFiNI+mW903+5sy7Zy0xxf7Jrlu6j07hPkE=; b=KPA++AyUfCIPghertKdhaa9IW9 IQzBWcn5Uaj98NFmAaKqmm92dJaqI6RNy7S4x1GuYQ7VZpsLX9CtDardEA+NGeiJ9Qu0QGz5R1zFm 6hqjbmbFz6WDCte4xgvF9nVDZs0Xgqp+d+yugzh+z5eb2j/zUyKN+xlNn92Rbd0OmN58=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: address violation of MISRA C Rule 8.4 Message-Id: Date: Tue, 28 May 2024 07:00:14 +0000 commit 2d93f78bfe25f695d8ffb61d110da9df293ed71b Author: Nicola Vetrini AuthorDate: Tue May 28 08:52:27 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 28 08:52:27 2024 +0200 x86/traps: address violation of MISRA C Rule 8.4 Rule 8.4 states: "A compatible declaration shall be visible when an object or function with external linkage is defined". The function do_general_protection is either used is asm code or only within this unit, so there is no risk of this getting out of sync with its definition, but the function must remain extern. Therefore, this function is deviated using a comment-based deviation. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 468a036081..9906e874d5 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1257,6 +1257,7 @@ void asmlinkage do_int3(struct cpu_user_regs *regs) pv_inject_hw_exception(X86_EXC_BP, X86_EVENT_NO_EC); } +/* SAF-1-safe */ void do_general_protection(struct cpu_user_regs *regs) { #ifdef CONFIG_PV -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 16:33:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 16:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731243.1136648 (Exim 4.92) (envelope-from ) id 1sBzl3-0006kW-5V; Tue, 28 May 2024 16:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731243.1136648; Tue, 28 May 2024 16:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzl3-0006kK-2j; Tue, 28 May 2024 16:33:05 +0000 Received: by outflank-mailman (input) for mailman id 731243; Tue, 28 May 2024 16:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzl1-0006kC-VE for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzl1-00019A-TQ for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBzl1-0003Rt-RB for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=n4ZpKB6UuaER4yiVspQ2octVMftylCLk+N7k4anW2TM=; b=OMPFh05I+9JDx8rMX25M0/kyQm cPecJScgcsTtUvLrCqdCfDMVquzYv9W+G1RFsZ+it5aMGzCG18QkCMljx2qx8JtpOapZfkQOhS9XS cFtfrFGNdpycxrijui2EVu202JnIEUvcV0/e7p7hhJBI3GjbHTY23wLKCzK25QcJIvDM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/lzo: Implement COPY{4,8} using memcpy() Message-Id: Date: Tue, 28 May 2024 16:33:03 +0000 commit 56d3b24979b318e661f7542a10d073c720aa6b77 Author: Andrew Cooper AuthorDate: Tue May 21 17:08:32 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 28 17:26:39 2024 +0100 xen/lzo: Implement COPY{4,8} using memcpy() This is simpler and easier for both humans and compilers to read. It also addresses 6 instances of MISRA R5.3 violation (shadowing of the ptr_ local variable inside both {put,get}_unaligned()). No change, not even in the compiled binary. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/common/lzo.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index cc03f0f554..3454ce4a7e 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -25,15 +25,8 @@ */ -#define COPY4(dst, src) \ - put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) -#if defined(__x86_64__) -#define COPY8(dst, src) \ - put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst)) -#else -#define COPY8(dst, src) \ - COPY4(dst, src); COPY4((dst) + 4, (src) + 4) -#endif +#define COPY4(dst, src) memcpy(dst, src, 4) +#define COPY8(dst, src) memcpy(dst, src, 8) #ifdef __MINIOS__ # include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 16:33:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 16:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731244.1136651 (Exim 4.92) (envelope-from ) id 1sBzlD-0006nV-6d; Tue, 28 May 2024 16:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731244.1136651; Tue, 28 May 2024 16:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzlD-0006nN-48; Tue, 28 May 2024 16:33:15 +0000 Received: by outflank-mailman (input) for mailman id 731244; Tue, 28 May 2024 16:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzlC-0006nF-2F for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzlC-00019E-12 for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBzlB-0003SZ-Vc for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lC4OftMCrVT3BS6+6lenfTgNyE/dp0K17BcSe345rzE=; b=i8AxN/VmAlzUTQa18WwmosN7Bo r4NyPUBGI3z1LS4FTmkLakYB2eCyPibONklNr0927kdimcbdberK+H4iidFx8epw17Z3v9NAIu1dG cRRDbKyQWsJIISb8aMvvrVc0JPytHaflp4bSo3T/r28U3e2g+qjjiaUxM/FDB91x+pNI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: Drop useless non-Kconfig CONFIG_* variables Message-Id: Date: Tue, 28 May 2024 16:33:13 +0000 commit 2d082710f7820f4556bd96320db529d556ba9481 Author: Andrew Cooper AuthorDate: Tue May 21 18:07:09 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 28 17:26:39 2024 +0100 xen/x86: Drop useless non-Kconfig CONFIG_* variables These are all either completely unused, or do nothing useful. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/config.h | 2 -- xen/include/xen/acpi.h | 9 --------- 2 files changed, 11 deletions(-) diff --git a/xen/arch/x86/include/asm/config.h b/xen/arch/x86/include/asm/config.h index ab7288cb36..2a260a2581 100644 --- a/xen/arch/x86/include/asm/config.h +++ b/xen/arch/x86/include/asm/config.h @@ -20,7 +20,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG #define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1 -#define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 #define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) @@ -30,7 +29,6 @@ /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 -#define CONFIG_ACPI_SRAT 1 #define CONFIG_ACPI_CSTATE 1 #define CONFIG_WATCHDOG 1 diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index e78e7e7852..bc4818c943 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -140,15 +140,6 @@ int get_cpu_id(u32 acpi_id); unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); -/* - * This function undoes the effect of one call to acpi_register_gsi(). - * If this matches the last registration, any IRQ resources for gsi - * are freed. - */ -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ -void acpi_unregister_gsi (u32 gsi); -#endif - #ifdef CONFIG_ACPI_CSTATE /* * max_cstate sets the highest legal C-state. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 16:33:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 16:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731245.1136655 (Exim 4.92) (envelope-from ) id 1sBzlN-0006qx-8U; Tue, 28 May 2024 16:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731245.1136655; Tue, 28 May 2024 16:33: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 1sBzlN-0006qn-5W; Tue, 28 May 2024 16:33:25 +0000 Received: by outflank-mailman (input) for mailman id 731245; Tue, 28 May 2024 16:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzlM-0006qc-5M for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzlM-00019R-4e for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBzlM-0003T0-3e for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jsr3ah0nRHksdVMU+bz1sYEs6HevhBT75YBFlxKYEAA=; b=h+w3PMyVfPk/SXOBFoz8niQGZ9 R+zNgg7wODW7qrfYslGSC6qIuFqHTaryYJmy693GXCW44p57O68WuUpV2yYKPSCNCBSUtaB6wv4mS JKnwPqp9tAY8I53mpqxtqjn578rEV8p7SHUx/1tjZaIqHu4oic2KXhVeA/jM7korBjFU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: Address two misc MISRA 17.7 violations Message-Id: Date: Tue, 28 May 2024 16:33:24 +0000 commit 58b3437bae50b835a3a9a04fe5e8d31cd115d6a3 Author: Andrew Cooper AuthorDate: Tue May 21 16:22:08 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 28 17:26:39 2024 +0100 xen/x86: Address two misc MISRA 17.7 violations Neither text_poke() nor watchdog_setup() have their return value consulted. Switch them to being void. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/x86/alternative.c | 4 ++-- xen/arch/x86/nmi.c | 5 ++--- xen/include/xen/watchdog.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 2e7ba6e0b8..7824053c9d 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -155,10 +155,10 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) * "noinline" to cause control flow change and thus invalidate I$ and * cause refetch after modification. */ -static void *init_or_livepatch noinline +static void init_or_livepatch noinline text_poke(void *addr, const void *opcode, size_t len) { - return memcpy(addr, opcode, len); + memcpy(addr, opcode, len); } extern void *const __initdata_cf_clobber_start[]; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index f6329cb027..9793fa2316 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -464,12 +464,12 @@ bool watchdog_enabled(void) return !atomic_read(&watchdog_disable_count); } -int __init watchdog_setup(void) +void __init watchdog_setup(void) { unsigned int cpu; /* - * Activate periodic heartbeats. We cannot do this earlier during + * Activate periodic heartbeats. We cannot do this earlier during * setup because the timer infrastructure is not available. */ for_each_online_cpu ( cpu ) @@ -477,7 +477,6 @@ int __init watchdog_setup(void) register_cpu_notifier(&cpu_nmi_nfb); watchdog_enable(); - return 0; } /* Returns false if this was not a watchdog NMI, true otherwise */ diff --git a/xen/include/xen/watchdog.h b/xen/include/xen/watchdog.h index 86fde0884a..4c2840bd91 100644 --- a/xen/include/xen/watchdog.h +++ b/xen/include/xen/watchdog.h @@ -12,7 +12,7 @@ #ifdef CONFIG_WATCHDOG /* Try to set up a watchdog. */ -int watchdog_setup(void); +void watchdog_setup(void); /* Enable the watchdog. */ void watchdog_enable(void); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 16:33:36 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 16:33:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731246.1136659 (Exim 4.92) (envelope-from ) id 1sBzlY-0006vM-9Z; Tue, 28 May 2024 16:33:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731246.1136659; Tue, 28 May 2024 16:33:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzlY-0006vC-6y; Tue, 28 May 2024 16:33:36 +0000 Received: by outflank-mailman (input) for mailman id 731246; Tue, 28 May 2024 16:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzlW-0006uy-8b for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sBzlW-00019c-7n for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sBzlW-0003TR-6o for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 16:33:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PhtMFimetpRMtov5la0PdZDKdV0n1sHKG/1I2xCUC0o=; b=LyuYx8OwTeeVa7hZz825yJHhkd Af4TrcMquLLtGHTFuOfAYQym6AiPSsQKlQzBBK9qLL8d9IVg0Uosl01VBlCz72bR5d3vrWE5Lj3gH DytdkST30P34OcHTCUFNRBmD+Mn7oojyF7+al9RvVODntnsXVtXPQng8x34lIH323okQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/svm: Rework VMCB_ACCESSORS() to use a plain type name Message-Id: Date: Tue, 28 May 2024 16:33:34 +0000 commit d27c2835e0005200d464b57156c76455d46f74bb Author: Andrew Cooper AuthorDate: Tue May 28 16:29:11 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 28 17:26:39 2024 +0100 x86/svm: Rework VMCB_ACCESSORS() to use a plain type name This avoids having a function call in a typeof() expression. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/hvm/svm/vmcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/hvm/svm/vmcb.h b/xen/arch/x86/include/asm/hvm/svm/vmcb.h index 0396d10b90..28f715e376 100644 --- a/xen/arch/x86/include/asm/hvm/svm/vmcb.h +++ b/xen/arch/x86/include/asm/hvm/svm/vmcb.h @@ -630,7 +630,7 @@ vmcb_get_ ## name(const struct vmcb_struct *vmcb) \ } #define VMCB_ACCESSORS(name, cleanbit) \ - VMCB_ACCESSORS_(name, typeof(alloc_vmcb()->_ ## name), cleanbit) + VMCB_ACCESSORS_(name, typeof(((struct vmcb_struct){})._ ## name), cleanbit) VMCB_ACCESSORS(cr_intercepts, intercepts) VMCB_ACCESSORS(dr_intercepts, intercepts) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 28 18:55:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 18:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731280.1136703 (Exim 4.92) (envelope-from ) id 1sC1yQ-0001DD-RF; Tue, 28 May 2024 18:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731280.1136703; Tue, 28 May 2024 18:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yQ-0001D5-Oh; Tue, 28 May 2024 18:55:02 +0000 Received: by outflank-mailman (input) for mailman id 731280; Tue, 28 May 2024 18:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yP-0001Cz-Ji for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yP-0003Uv-IL for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sC1yP-0006r5-HG for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8hOTRzc3YJrUefuiIMzrINBJwaAfCBYkeIULYqGoRUQ=; b=FZ+9MxFp6T8lE3jypPc2lTOytx gJz5/X1sYo7oL0OTKoZEusQaTp9jxopUnnq1BYqU44gDOVqSIp+H52fv1WQRcKxDW7nXcr6bNSQS0 Z4+hpZ7HsEdeSa+mcFZOI/8lG1Ute08EDYwHePETuudgfCquxYcmBs/8M/xKZ+n5E1tE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: set MISRA C Rule 10.2 as clean Message-Id: Date: Tue, 28 May 2024 18:55:01 +0000 commit 4bc8dc01a3f506235b9473a899e077bf2479c98a Author: Nicola Vetrini AuthorDate: Fri May 17 12:27:10 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon May 27 18:49:43 2024 -0700 automation/eclair_analysis: set MISRA C Rule 10.2 as clean This rule has no more violations in the codebase, so it can be set as clean. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/tagging.ecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index acea15f486..b7a9f75b27 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,7 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.10||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R21.9||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R10.2||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.10||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R21.9||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 28 18:55:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 18:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731281.1136706 (Exim 4.92) (envelope-from ) id 1sC1ya-0001Ej-Sg; Tue, 28 May 2024 18:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731281.1136706; Tue, 28 May 2024 18:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1ya-0001Eb-QA; Tue, 28 May 2024 18:55:12 +0000 Received: by outflank-mailman (input) for mailman id 731281; Tue, 28 May 2024 18:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yZ-0001ER-MG for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yZ-0003VC-LU for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sC1yZ-0006rb-KU for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7HwDKTwkK7SrSGPpTFba53LE2DTmZFRzLrkcrKrqEg4=; b=QgtLN3TSOZxjiIyV7cJR7FmBgf M9DY6OSAtuaYoDKdqPO4I6/9trbpHToDQGuk7tyGi3L5Rsps2ApxeDVMDaEMp5Vk4agXSgkVW2BnX Lf1DnrMRgN+Lzji+pZqAZZjXOMiHxFpdD/B6Zk5rZdRahaeJfcQpqUzVHUnXAxkMyhTw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: add already clean rules to the analysis Message-Id: Date: Tue, 28 May 2024 18:55:11 +0000 commit 1eba1fe18d1474629a9c12f5442cce69c79f1b8b Author: Nicola Vetrini AuthorDate: Tue May 21 21:34:21 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon May 27 18:51:09 2024 -0700 automation/eclair_analysis: add already clean rules to the analysis Some MISRA C rules already have no violations in Xen, so they can be set as clean. Reorder the rules in tagging.ecl according to version ordering (i.e. sort -V) and split the configuration on multiple lines for readability. Signed-off-by: Nicola Vetrini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/monitored.ecl | 17 ++++++ automation/eclair_analysis/ECLAIR/tagging.ecl | 78 ++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl index 9da709dc88..4daecb0c83 100644 --- a/automation/eclair_analysis/ECLAIR/monitored.ecl +++ b/automation/eclair_analysis/ECLAIR/monitored.ecl @@ -79,4 +79,21 @@ -enable=MC3R1.R9.3 -enable=MC3R1.R9.4 -enable=MC3R1.R9.5 +-enable=MC3R1.R18.8 +-enable=MC3R1.R20.2 +-enable=MC3R1.R20.3 +-enable=MC3R1.R20.6 +-enable=MC3R1.R20.11 +-enable=MC3R1.R21.3 +-enable=MC3R1.R21.4 +-enable=MC3R1.R21.5 +-enable=MC3R1.R21.7 +-enable=MC3R1.R21.8 +-enable=MC3R1.R21.12 +-enable=MC3R1.R22.1 +-enable=MC3R1.R22.3 +-enable=MC3R1.R22.7 +-enable=MC3R1.R22.8 +-enable=MC3R1.R22.9 +-enable=MC3R1.R22.10 -doc_end diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl index b7a9f75b27..a354ff322e 100644 --- a/automation/eclair_analysis/ECLAIR/tagging.ecl +++ b/automation/eclair_analysis/ECLAIR/tagging.ecl @@ -19,7 +19,83 @@ -doc_begin="Clean guidelines: new violations for these guidelines are not accepted." --service_selector={clean_guidelines_common, "MC3R1.D1.1||MC3R1.D2.1||MC3R1.D4.1||MC3R1.D4.11||MC3R1.D4.14||MC3R1.R10.2||MC3R1.R11.7||MC3R1.R11.9||MC3R1.R12.5||MC3R1.R1.1||MC3R1.R1.3||MC3R1.R1.4||MC3R1.R14.1||MC3R1.R16.7||MC3R1.R17.1||MC3R1.R17.3||MC3R1.R17.4||MC3R1.R17.5||MC3R1.R17.6||MC3R1.R20.13||MC3R1.R20.14||MC3R1.R20.4||MC3R1.R20.9||MC3R1.R21.10||MC3R1.R21.13||MC3R1.R21.19||MC3R1.R21.21||MC3R1.R21.9||MC3R1.R2.2||MC3R1.R22.2||MC3R1.R22.4||MC3R1.R22.5||MC3R1.R22.6||MC3R1.R2.6||MC3R1.R3.1||MC3R1.R3.2||MC3R1.R4.1||MC3R1.R4.2||MC3R1.R5.1||MC3R1.R5.2||MC3R1.R5.4||MC3R1.R5.6||MC3R1.R6.1||MC3R1.R6.2||MC3R1.R7.1||MC3R1.R7.2||MC3R1.R7.4||MC3R1.R8.1||MC3R1.R8.10||MC3R1.R8.12||MC3R1.R8.14||MC3R1.R8.2||MC3R1.R8.5||MC3R1.R8.6||MC3R1.R8.8||MC3R1.R9.2||MC3R1.R9.3||MC3R1.R9.4||MC3R1.R9.5" +-service_selector={clean_guidelines_common, +"MC3R1.D1.1|| +MC3R1.D2.1|| +MC3R1.D4.1|| +MC3R1.D4.11|| +MC3R1.D4.14|| +MC3R1.R1.1|| +MC3R1.R1.3|| +MC3R1.R1.4|| +MC3R1.R2.2|| +MC3R1.R2.6|| +MC3R1.R3.1|| +MC3R1.R3.2|| +MC3R1.R4.1|| +MC3R1.R4.2|| +MC3R1.R5.1|| +MC3R1.R5.2|| +MC3R1.R5.4|| +MC3R1.R5.6|| +MC3R1.R6.1|| +MC3R1.R6.2|| +MC3R1.R7.1|| +MC3R1.R7.2|| +MC3R1.R7.4|| +MC3R1.R8.1|| +MC3R1.R8.2|| +MC3R1.R8.5|| +MC3R1.R8.6|| +MC3R1.R8.8|| +MC3R1.R8.10|| +MC3R1.R8.12|| +MC3R1.R8.14|| +MC3R1.R9.2|| +MC3R1.R9.3|| +MC3R1.R9.4|| +MC3R1.R9.5|| +MC3R1.R10.2|| +MC3R1.R11.7|| +MC3R1.R11.9|| +MC3R1.R12.5|| +MC3R1.R14.1|| +MC3R1.R16.7|| +MC3R1.R17.1|| +MC3R1.R17.3|| +MC3R1.R17.4|| +MC3R1.R17.5|| +MC3R1.R17.6|| +MC3R1.R18.8|| +MC3R1.R20.2|| +MC3R1.R20.3|| +MC3R1.R20.4|| +MC3R1.R20.6|| +MC3R1.R20.9|| +MC3R1.R20.11|| +MC3R1.R20.13|| +MC3R1.R20.14|| +MC3R1.R21.3|| +MC3R1.R21.4|| +MC3R1.R21.5|| +MC3R1.R21.7|| +MC3R1.R21.8|| +MC3R1.R21.9|| +MC3R1.R21.10|| +MC3R1.R21.12|| +MC3R1.R21.13|| +MC3R1.R21.19|| +MC3R1.R21.21|| +MC3R1.R22.1|| +MC3R1.R22.2|| +MC3R1.R22.3|| +MC3R1.R22.4|| +MC3R1.R22.5|| +MC3R1.R22.6|| +MC3R1.R22.7|| +MC3R1.R22.8|| +MC3R1.R22.9|| +MC3R1.R22.10" } -setq=target,getenv("XEN_TARGET_ARCH") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 28 18:55:22 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 18:55:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731282.1136712 (Exim 4.92) (envelope-from ) id 1sC1yk-0001Gv-Ur; Tue, 28 May 2024 18:55:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731282.1136712; Tue, 28 May 2024 18:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yk-0001Gn-RZ; Tue, 28 May 2024 18:55:22 +0000 Received: by outflank-mailman (input) for mailman id 731282; Tue, 28 May 2024 18:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yj-0001GZ-Pv for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yj-0003VS-Oe for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sC1yj-0006s2-Nd for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UKtxGiN4G5oEo0EDZgONon82tULQDKsZvWcJVxFmX2o=; b=F4l2emMZ+tnM6mXriy6m8tXz3j NyBgDAoJ5lyfiYAy4E3GSJe51k8XOElCgnrOuE2tKlmj89/qy3s6pp1filScQuYPA+X1DVEMyAuzm +LzQfE7+OcVefPNt6If1KHTVZ7BbBnjvIveMzK0h63YK7eF83Tn71y9Cm+ytGrVgnysg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: exclude gdbsx from MISRA compliance Message-Id: Date: Tue, 28 May 2024 18:55:21 +0000 commit 841f437a8bc8d220165a5c1c239c69edb54c29ff Author: Nicola Vetrini AuthorDate: Mon May 27 16:53:16 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon May 27 18:54:25 2024 -0700 docs/misra: exclude gdbsx from MISRA compliance These files are used when debugging Xen, and are not meant to comply with MISRA rules at the moment. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- docs/misra/exclude-list.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/misra/exclude-list.json b/docs/misra/exclude-list.json index cd69765427..2567e8467c 100644 --- a/docs/misra/exclude-list.json +++ b/docs/misra/exclude-list.json @@ -77,6 +77,14 @@ "rel_path": "arch/x86/dmi_scan.c", "comment": "Imported from Linux, ignore for now" }, + { + "rel_path": "arch/x86/gdbsx.c", + "comment": "Used for debugging Xen, ignore for now" + }, + { + "rel_path": "arch/x86/include/asm/gdbsx.h", + "comment": "Used for debugging Xen, ignore for now" + }, { "rel_path": "arch/x86/mpparse.c", "comment": "Imported from Linux, ignore for now" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 28 18:55:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 28 May 2024 18:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731283.1136715 (Exim 4.92) (envelope-from ) id 1sC1yu-0001Jt-Vv; Tue, 28 May 2024 18:55:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731283.1136715; Tue, 28 May 2024 18:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yu-0001Jm-T8; Tue, 28 May 2024 18:55:32 +0000 Received: by outflank-mailman (input) for mailman id 731283; Tue, 28 May 2024 18:55:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yt-0001Jg-T7 for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sC1yt-0003VZ-Rw for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sC1yt-0006sa-Qx for xen-changelog@lists.xenproject.org; Tue, 28 May 2024 18:55:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0T7KnnxfdT8QIfNERarH7pSaq9xo4dH2+9nlBpq7l0U=; b=kmDSGDV66nSMjX19x09NqW/zEM qgN2sBKCgmxalWgYCKFrtq3ZqiepdNFEXMGeFktnVLnK54N6KmDoUCnrVaogm5XiByrGQRauIxkLK DpFeunzERhASTwks08QgUkctHWFSPYGNAGd+kcFqjZPzAAHp5qesq7fI+dRoyHgU+Uyc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation/eclair_analysis: avoid an ECLAIR warning about escaping Message-Id: Date: Tue, 28 May 2024 18:55:31 +0000 commit 96af090e33130b0bf0953f3ccab8e7a163392318 Author: Nicola Vetrini AuthorDate: Mon May 27 16:53:17 2024 +0200 Commit: Stefano Stabellini CommitDate: Mon May 27 18:56:00 2024 -0700 automation/eclair_analysis: avoid an ECLAIR warning about escaping The parentheses in this regular expression should be doubly escaped because they undergo expansion twice. Signed-off-by: Nicola Vetrini [stefano: fix commit message] Signed-off-by: Stefano Stabellini Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/deviations.ecl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl b/automation/eclair_analysis/ECLAIR/deviations.ecl index b9b377c56b..cf62a874d9 100644 --- a/automation/eclair_analysis/ECLAIR/deviations.ecl +++ b/automation/eclair_analysis/ECLAIR/deviations.ecl @@ -405,8 +405,8 @@ explicit comment indicating the fallthrough intention is present." # -doc_begin="printf()-like functions are allowed to use the variadic features provided by stdarg.h." --config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(^.*printk\(.*\)$)))"} --config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(^.*printf\(.*\)$)))"} +-config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(^.*printk\\(.*\\)$)))"} +-config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(^.*printf\\(.*\\)$)))"} -config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(name(panic)&&kind(function))))"} -config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(name(elf_call_log_callback)&&kind(function))))"} -config=MC3R1.R17.1,reports+={deliberate,"any_area(^.*va_list.*$&&context(ancestor_or_self(name(vprintk_common)&&kind(function))))"} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 05:55:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 05:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731459.1136949 (Exim 4.92) (envelope-from ) id 1sCCH9-0006lb-JV; Wed, 29 May 2024 05:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731459.1136949; Wed, 29 May 2024 05:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCCH9-0006lT-Gk; Wed, 29 May 2024 05:55:03 +0000 Received: by outflank-mailman (input) for mailman id 731459; Wed, 29 May 2024 05:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCCH7-0006lJ-TQ for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 05:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCCH7-0007O7-Sb for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 05:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCCH7-0000oT-Ra for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 05:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=c7JKbIR//8LAuB7r0B9f9ghJy+PDS2Bw1fxbg5bnb6s=; b=EEdgMWoEkXXbmIAETaNmTBoydX udSS0+pxEMHmUUJ5X/RhLMEB12zehP42WLAf2/G1yO1KcFW7AR4Nbz6ZkJMvhfShAxtB6cryOcVti kSb663CHpi26TtA5AR6hJ1+qjUrnbSZbJuPDTO3LIMtzxGPEkoWeYdSy0A8aumSnhToI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG: Mention libxl blktap/tapback support Message-Id: Date: Wed, 29 May 2024 05:55:01 +0000 commit 8b977fe57254ff8d343e4bf50cf98fa6c2b36b8b Author: Jason Andryuk AuthorDate: Tue May 28 08:52:15 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 28 08:52:15 2024 +0200 CHANGELOG: Mention libxl blktap/tapback support Add entry for backendtype=tap support in libxl. blktap needs some changes to work with libxl, which haven't been merged. They are available from this PR: https://github.com/xapi-project/blktap/pull/394 Signed-off-by: Jason Andryuk Acked-by: Oleksii Kurochko --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index efdaff11de..579329ff71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) for IPIs and Physical addressing mode for external interrupts. - Add a new 9pfs backend running as a daemon in dom0. First user is Xenstore-stubdom now being able to support full Xenstore trace capability. + - libxl support for backendtype=tap with tapback. ### Removed - caml-stubdom. It hasn't built since 2014, was pinned to Ocaml 4.02, and has -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 05:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 05:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731460.1136952 (Exim 4.92) (envelope-from ) id 1sCCHJ-0006nh-Kx; Wed, 29 May 2024 05:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731460.1136952; Wed, 29 May 2024 05: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 1sCCHJ-0006na-I9; Wed, 29 May 2024 05:55:13 +0000 Received: by outflank-mailman (input) for mailman id 731460; Wed, 29 May 2024 05:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCCHI-0006nQ-0H for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 05:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCCHH-0007OF-Vh for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 05:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCCHH-0000ou-Uo for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 05:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zWjz5QaHiXknwYDE7/Y2gBlQ+zTxdHCbmQaLrd6muVk=; b=UVRAibTfp3pIbgHxAdCtENOr3w MgIHnumoLMIRD/9QRBVD1BL9HcDLSMYwHYBlX3knlkGrTeYC42/rrIaAI13nEKgDIWZtCLhldE7Vn qDpnwcb8ityH+8VLsf2xqAwZGm7YbS4OzWi8zrdQAzfDJfH8Qgx1bFQm7XdU96XKDSL4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: address violation of MISRA C Rule 8.4 Message-Id: Date: Wed, 29 May 2024 05:55:11 +0000 commit 2d93f78bfe25f695d8ffb61d110da9df293ed71b Author: Nicola Vetrini AuthorDate: Tue May 28 08:52:27 2024 +0200 Commit: Jan Beulich CommitDate: Tue May 28 08:52:27 2024 +0200 x86/traps: address violation of MISRA C Rule 8.4 Rule 8.4 states: "A compatible declaration shall be visible when an object or function with external linkage is defined". The function do_general_protection is either used is asm code or only within this unit, so there is no risk of this getting out of sync with its definition, but the function must remain extern. Therefore, this function is deviated using a comment-based deviation. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 468a036081..9906e874d5 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1257,6 +1257,7 @@ void asmlinkage do_int3(struct cpu_user_regs *regs) pv_inject_hw_exception(X86_EXC_BP, X86_EVENT_NO_EC); } +/* SAF-1-safe */ void do_general_protection(struct cpu_user_regs *regs) { #ifdef CONFIG_PV -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 08:00:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 08:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731582.1137147 (Exim 4.92) (envelope-from ) id 1sCEE9-0000By-Ea; Wed, 29 May 2024 08:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731582.1137147; Wed, 29 May 2024 08:00:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEE9-0000Bm-BW; Wed, 29 May 2024 08:00:05 +0000 Received: by outflank-mailman (input) for mailman id 731582; Wed, 29 May 2024 08:00:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEE8-0008Ri-BE for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEE8-0001ak-8f for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCEE8-0001Ia-7H for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+1QBRJdaeeeNLbJVHc2bE9DQssuxrUX8C+jUPxIjKSk=; b=Hse0iuxFRrINWB/JFsr3J0Tio5 zKn3+slGCKcUALOLPnUOB8rvXYuID2anYRHi5U6lUyC4Bqj2zb0n6J88IoDVjNrGAq2zOzk42fEif 39EnLL/7tvVG5oMPzNyJd00MCTTFffCQ1BBgJj5Dzhd6+84Go0moPlKP4gTCihBoxxyY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/intel: move vmce_has_lmce() routine to header Message-Id: Date: Wed, 29 May 2024 08:00:04 +0000 commit 498a4ded74b3f062c52e42568223dc5858d27731 Author: Sergiy Kibrik AuthorDate: Wed May 29 09:54:22 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 09:54:22 2024 +0200 x86/intel: move vmce_has_lmce() routine to header Moving this function out of mce_intel.c will make it possible to disable build of Intel MCE code later on, because the function gets called from common x86 code. Also replace boilerplate code that checks for MCG_LMCE_P flag with vmce_has_lmce(), which might contribute to readability a bit. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce.h | 5 +++++ xen/arch/x86/cpu/mcheck/mce_intel.c | 4 ---- xen/arch/x86/cpu/mcheck/vmce.c | 5 ++--- xen/arch/x86/include/asm/mce.h | 1 - xen/arch/x86/msr.c | 2 ++ 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 4806405f96..eba4b536c7 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -170,6 +170,11 @@ static inline int mce_bank_msr(const struct vcpu *v, uint32_t msr) return 0; } +static inline bool vmce_has_lmce(const struct vcpu *v) +{ + return v->arch.vmce.mcg_cap & MCG_LMCE_P; +} + struct mce_callbacks { void (*handler)(const struct cpu_user_regs *regs); bool (*check_addr)(uint64_t status, uint64_t misc, int addr_type); diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 3f5199b531..af43281cc6 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -1050,7 +1050,3 @@ int vmce_intel_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) return 1; } -bool vmce_has_lmce(const struct vcpu *v) -{ - return v->arch.vmce.mcg_cap & MCG_LMCE_P; -} diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index 4da6f4a3e4..5abdf4cb5f 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -203,7 +203,7 @@ int vmce_rdmsr(uint32_t msr, uint64_t *val) * bits are always set in guest MSR_IA32_FEATURE_CONTROL by Xen, so it * does not need to check them here. */ - if ( cur->arch.vmce.mcg_cap & MCG_LMCE_P ) + if ( vmce_has_lmce(cur) ) { *val = cur->arch.vmce.mcg_ext_ctl; mce_printk(MCE_VERBOSE, "MCE: %pv: rd MCG_EXT_CTL %#"PRIx64"\n", @@ -332,8 +332,7 @@ int vmce_wrmsr(uint32_t msr, uint64_t val) break; case MSR_IA32_MCG_EXT_CTL: - if ( (cur->arch.vmce.mcg_cap & MCG_LMCE_P) && - !(val & ~MCG_EXT_CTL_LMCE_EN) ) + if ( vmce_has_lmce(cur) && !(val & ~MCG_EXT_CTL_LMCE_EN) ) cur->arch.vmce.mcg_ext_ctl = val; else ret = -1; diff --git a/xen/arch/x86/include/asm/mce.h b/xen/arch/x86/include/asm/mce.h index 6ce56b5b85..2ec47a71ae 100644 --- a/xen/arch/x86/include/asm/mce.h +++ b/xen/arch/x86/include/asm/mce.h @@ -41,7 +41,6 @@ extern void vmce_init_vcpu(struct vcpu *v); extern int vmce_restore_vcpu(struct vcpu *v, const struct hvm_vmce_vcpu *ctxt); extern int vmce_wrmsr(uint32_t msr, uint64_t val); extern int vmce_rdmsr(uint32_t msr, uint64_t *val); -extern bool vmce_has_lmce(const struct vcpu *v); extern int vmce_enable_mca_cap(struct domain *d, uint64_t cap); DECLARE_PER_CPU(unsigned int, nr_mce_banks); diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 9babd441f9..289cf10b78 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -24,6 +24,8 @@ #include +#include "cpu/mcheck/mce.h" /* for vmce_has_lmce() */ + DEFINE_PER_CPU(uint32_t, tsc_aux); int init_vcpu_msr_policy(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 08:00:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 08:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731583.1137151 (Exim 4.92) (envelope-from ) id 1sCEEJ-0000ei-Fx; Wed, 29 May 2024 08:00:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731583.1137151; Wed, 29 May 2024 08:00:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEEJ-0000eb-Cy; Wed, 29 May 2024 08:00:15 +0000 Received: by outflank-mailman (input) for mailman id 731583; Wed, 29 May 2024 08:00:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEEI-0000bp-CJ for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEEI-0001gL-Ba for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCEEI-0001KZ-Ao for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0a+o4tsrLCtSwLFXzpqJfLNNjhMFjdyYXuJTOHEKkn8=; b=UiLqADZUIR0ilorLZ+oNKzj//2 uFyga4zE/VJKGMWPUDIXcRvxTXvuaFBkdBv7h2DaAhQ4Tg+6YO0akyvWIY0xqXwZ4HviVYGZmv3/k 47XxL17e0G3kMUJsaTWd5ss8lfS+GlXwnLmMp5rlmI3hGhCfM59Jwm8HyuLf/QDWasAU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/MCE: add default switch case in init_nonfatal_mce_checker() Message-Id: Date: Wed, 29 May 2024 08:00:14 +0000 commit 5effd810c629d9a836e46ee321ca7409dad27212 Author: Sergiy Kibrik AuthorDate: Wed May 29 09:56:15 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 09:56:15 2024 +0200 x86/MCE: add default switch case in init_nonfatal_mce_checker() The default switch case block is wanted here, to handle situation e.g. of unexpected c->x86_vendor value -- then no mcheck init is done, but misleading message still gets logged anyway. Signed-off-by: Sergiy Kibrik Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/non-fatal.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/non-fatal.c index 33cacd15c2..5a53bcd0b7 100644 --- a/xen/arch/x86/cpu/mcheck/non-fatal.c +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c @@ -29,9 +29,14 @@ static int __init cf_check init_nonfatal_mce_checker(void) /* Assume we are on K8 or newer AMD or Hygon CPU here */ amd_nonfatal_mcheck_init(c); break; + case X86_VENDOR_INTEL: intel_nonfatal_mcheck_init(c); break; + + default: + /* unhandled vendor isn't really an error */ + return 0; } printk(KERN_INFO "mcheck_poll: Machine check polling timer started.\n"); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 08:00:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 08:00:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731584.1137155 (Exim 4.92) (envelope-from ) id 1sCEET-0000mZ-HE; Wed, 29 May 2024 08:00:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731584.1137155; Wed, 29 May 2024 08:00:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEET-0000mQ-Ej; Wed, 29 May 2024 08:00:25 +0000 Received: by outflank-mailman (input) for mailman id 731584; Wed, 29 May 2024 08:00:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEES-0000mF-Hz for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEES-0001gV-Go for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCEES-0001LV-Dv for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HOKhj8tGyP+AmaHkEOYGsQtPHLrvfi36qiuptiuxYt8=; b=KlPIKHKrdatErTtRX9hAR017QJ SIJW6Rd0loSt3hKHuOiwR+YnA1NCkFgKkRHex3zqpd1VuUZb6AbQygOvNSJ5q15yaol5VSfg3LPmy QsayWMin301fEHc+WSuKVDc3DJPDb3Zwrgycv9TyWX2UTpP7BzzF52EEHWQ1HGCPGDI8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/MCE: optional build of AMD/Intel MCE code Message-Id: Date: Wed, 29 May 2024 08:00:24 +0000 commit 19b6e9f9149f028e729493b733c6019b2270c751 Author: Sergiy Kibrik AuthorDate: Wed May 29 09:56:57 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 09:56:57 2024 +0200 x86/MCE: optional build of AMD/Intel MCE code Separate Intel/AMD-specific MCE code using CONFIG_{INTEL,AMD} config options. Now we can avoid build of mcheck code if support for specific platform is intentionally disabled by configuration. Also global variables lmce_support & cmci_support from Intel-specific mce_intel.c have to moved to common mce.c, as they get checked in common code. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/Makefile | 8 ++++---- xen/arch/x86/cpu/mcheck/mce.c | 4 ++++ xen/arch/x86/cpu/mcheck/mce_intel.c | 4 ---- xen/arch/x86/cpu/mcheck/non-fatal.c | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/Makefile b/xen/arch/x86/cpu/mcheck/Makefile index f927f10b4d..e6cb4dd503 100644 --- a/xen/arch/x86/cpu/mcheck/Makefile +++ b/xen/arch/x86/cpu/mcheck/Makefile @@ -1,12 +1,12 @@ -obj-y += amd_nonfatal.o -obj-y += mce_amd.o +obj-$(CONFIG_AMD) += amd_nonfatal.o +obj-$(CONFIG_AMD) += mce_amd.o obj-y += mcaction.o obj-y += barrier.o -obj-y += intel-nonfatal.o +obj-$(CONFIG_INTEL) += intel-nonfatal.o obj-y += mctelem.o obj-y += mce.o obj-y += mce-apei.o -obj-y += mce_intel.o +obj-$(CONFIG_INTEL) += mce_intel.o obj-y += non-fatal.o obj-y += util.o obj-y += vmce.o diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index fb9dec5b89..1664ca6412 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -38,6 +38,10 @@ DEFINE_PER_CPU_READ_MOSTLY(unsigned int, nr_mce_banks); unsigned int __read_mostly firstbank; unsigned int __read_mostly ppin_msr; uint8_t __read_mostly cmci_apic_vector; +bool __ro_after_init cmci_support; + +/* If mce_force_broadcast == 1, lmce_support will be disabled forcibly. */ +bool __ro_after_init lmce_support; DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, poll_bankmask); DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, no_cmci_banks); diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index af43281cc6..dd812f4b8a 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -26,16 +26,12 @@ #include "mcaction.h" static DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, mce_banks_owned); -bool __read_mostly cmci_support; static bool __read_mostly ser_support; static bool __read_mostly mce_force_broadcast; boolean_param("mce_fb", mce_force_broadcast); static int __read_mostly nr_intel_ext_msrs; -/* If mce_force_broadcast == 1, lmce_support will be disabled forcibly. */ -bool __read_mostly lmce_support; - /* Intel SDM define bit15~bit0 of IA32_MCi_STATUS as the MC error code */ #define INTEL_MCCOD_MASK 0xFFFF diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/non-fatal.c index 5a53bcd0b7..a9ee9bb94f 100644 --- a/xen/arch/x86/cpu/mcheck/non-fatal.c +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c @@ -24,15 +24,19 @@ static int __init cf_check init_nonfatal_mce_checker(void) * Check for non-fatal errors every MCE_RATE s */ switch (c->x86_vendor) { +#ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: /* Assume we are on K8 or newer AMD or Hygon CPU here */ amd_nonfatal_mcheck_init(c); break; +#endif +#ifdef CONFIG_INTEL case X86_VENDOR_INTEL: intel_nonfatal_mcheck_init(c); break; +#endif default: /* unhandled vendor isn't really an error */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 08:00:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 08:00:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731586.1137169 (Exim 4.92) (envelope-from ) id 1sCEEd-00015q-Pd; Wed, 29 May 2024 08:00:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731586.1137169; Wed, 29 May 2024 08:00: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 1sCEEd-00015g-N7; Wed, 29 May 2024 08:00:35 +0000 Received: by outflank-mailman (input) for mailman id 731586; Wed, 29 May 2024 08:00:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEEc-000155-LI for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCEEc-0001gi-KD for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCEEc-0001Mb-JJ for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 08:00:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PXek76JIhCRVIq5QuhJaKaLo8XWIJFrI2wkCulyyXMY=; b=eBzuaHsMX/YQDra+9nEprNPWbX 5PUHoDSM86APOODVcM84k5O0lnYExp7ZrJT+sgOcj5Bpyfks0MZnfg/Z993IIal3/fFRDARlnex1n v5GDcFGN0QiXOGPtJBsgYLQI/lvjic2yzxFSVZ3Dyn/Vl7ExPOxrsCY4GmTLXybuOqok=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: address violations of MISRA C Rule 8.4 Message-Id: Date: Wed, 29 May 2024 08:00:34 +0000 commit 2bc462f645824a439879190ed19a231cb5b8034c Author: Nicola Vetrini AuthorDate: Wed May 29 09:57:28 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 09:57:28 2024 +0200 x86: address violations of MISRA C Rule 8.4 Rule 8.4 states: "A compatible declaration shall be visible when an object or function with external linkage is defined." These variables are only referenced from assembly code, so they need to be extern and there is negligible risk of them being used improperly without noticing. As a result, they can be exempted using a comment-based deviation. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- xen/arch/x86/desc.c | 1 + xen/arch/x86/mm.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/desc.c b/xen/arch/x86/desc.c index 39080ca672..9f63928154 100644 --- a/xen/arch/x86/desc.c +++ b/xen/arch/x86/desc.c @@ -91,6 +91,7 @@ seg_desc_t boot_compat_gdt[PAGE_SIZE / sizeof(seg_desc_t)] = * References boot_cpu_gdt_table for a short period, until the CPUs switch * onto their per-CPU GDTs. */ +/* SAF-1-safe */ const struct desc_ptr boot_gdtr = { .limit = LAST_RESERVED_GDT_BYTE, .base = (unsigned long)(boot_gdt - FIRST_RESERVED_GDT_ENTRY), diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d968bbbc73..17987eb519 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -144,7 +144,7 @@ l1_pgentry_t __section(".bss.page_aligned") __aligned(PAGE_SIZE) l1_fixmap[L1_PAGETABLE_ENTRIES]; l1_pgentry_t __section(".bss.page_aligned") __aligned(PAGE_SIZE) - l1_fixmap_x[L1_PAGETABLE_ENTRIES]; + l1_fixmap_x[L1_PAGETABLE_ENTRIES]; /* SAF-1-safe */ bool __read_mostly machine_to_phys_mapping_valid; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 09:55:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 09:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.731769.1137453 (Exim 4.92) (envelope-from ) id 1sCG1Q-0007fQ-CT; Wed, 29 May 2024 09:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 731769.1137453; Wed, 29 May 2024 09: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 1sCG1Q-0007fI-9f; Wed, 29 May 2024 09:55:04 +0000 Received: by outflank-mailman (input) for mailman id 731769; Wed, 29 May 2024 09:55:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCG1P-0007fC-9e for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 09:55:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCG1P-0003mh-85 for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 09:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCG1P-0008Bo-6P for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 09:55:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7VNMcUzh7sRtXBjW1/SITZmH7XGzBRGEKFAsRdHYcWM=; b=VZp8VgVYFs6tnD/xy+96kRc2Kn oFZgWf3AXUyg/98AQSfIC8gDNc9nc1+95ax5b7Xu+q1321eWN8l+96F+NghPfNUHXyxNopsjDSH2R BmZck02aoBR0azbjF/z0vYFuXLwGnw1NqjQwrQ5aEhhx0KBGyrdo3IGV6SdlvE8dGW4s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Introduce CONFIG_SELF_TESTS Message-Id: Date: Wed, 29 May 2024 09:55:03 +0000 commit 0840bc5ea114f536a4bdfb2ca095b79f2069aae6 Author: Andrew Cooper AuthorDate: Tue May 28 15:11:54 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 29 10:44:03 2024 +0100 xen: Introduce CONFIG_SELF_TESTS ... and move x86's stub_selftest() under this new option. There is value in having these tests included in release builds too. It will shortly be used to gate the bitops unit tests on all architectures. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/Kconfig.debug | 6 ++++++ xen/arch/x86/extable.c | 4 ++-- xen/arch/x86/setup.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index 61b24ac552..07ff7eb7ba 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -29,6 +29,12 @@ config FRAME_POINTER maybe slower, but it gives very useful debugging information in case of any Xen bugs. +config SELF_TESTS + bool "Extra self-testing" + default DEBUG + help + Enable extra unit and functional testing. + config COVERAGE bool "Code coverage support" depends on !LIVEPATCH diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 8415cd1fa2..705cf9eb94 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -144,7 +144,7 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) return 0; } -#ifdef CONFIG_DEBUG +#ifdef CONFIG_SELF_TESTS #include #include @@ -214,7 +214,7 @@ int __init cf_check stub_selftest(void) return 0; } __initcall(stub_selftest); -#endif +#endif /* CONFIG_SELF_TESTS */ unsigned long asmlinkage search_pre_exception_table(struct cpu_user_regs *regs) { diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index b50c9c84af..dd51e68dbe 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -742,7 +742,7 @@ static void noreturn init_done(void) system_state = SYS_STATE_active; /* Re-run stub recovery self-tests with CET-SS active. */ - if ( IS_ENABLED(CONFIG_DEBUG) && cpu_has_xen_shstk ) + if ( IS_ENABLED(CONFIG_SELF_TESTS) && cpu_has_xen_shstk ) stub_selftest(); domain_unpause_by_systemcontroller(dom0); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 14:22:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 14:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732054.1137857 (Exim 4.92) (envelope-from ) id 1sCKBo-0003w7-B3; Wed, 29 May 2024 14:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732054.1137857; Wed, 29 May 2024 14:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKBo-0003vu-8H; Wed, 29 May 2024 14:22:04 +0000 Received: by outflank-mailman (input) for mailman id 732054; Wed, 29 May 2024 14:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKBn-0003vC-DF for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKBn-0000AG-Bc for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCKBn-0000HC-Aa for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bgx6p+vt295jRgZQ2MfO3VhEAmU/P+vvF9AsINmdCMw=; b=6z1kMZ17H0OjqsBc8KeSVNNvti ixJDRLuiUthiwitE2cTPGQOmGpLd3V1DaDEkfK4qYv1b6zZG8vAiEv4nYulmUjibXUtDZF41k9M4Y D6qBlKR4/jDTL4+uK3mUpud/l3HIgTAVGb+u18P/SFtxZFyF0kg5X3T89rkF9v3ihiH4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: account number of foreign mappings in the p2m Message-Id: Date: Wed, 29 May 2024 14:22:03 +0000 commit 8ef1e96a04fb177c89791749234d873ac883a92a Author: Roger Pau Monné AuthorDate: Wed May 29 16:07:55 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 16:07:55 2024 +0200 xen/x86: account number of foreign mappings in the p2m Such information will be needed in order to remove foreign mappings during teardown for HVM guests. Right now the introduced counter is not consumed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/p2m.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 111badf89a..107b9f2608 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -380,6 +380,9 @@ struct p2m_domain { unsigned int flags; unsigned long entry_count; } ioreq; + + /* Number of foreign mappings. */ + unsigned long nr_foreign; #endif /* CONFIG_HVM */ }; @@ -1049,6 +1052,8 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt, if ( !page_get_owner_and_reference(mfn_to_page(nfn)) ) return -EBUSY; + p2m->nr_foreign++; + break; default: @@ -1069,6 +1074,7 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt, return -EINVAL; } put_page(mfn_to_page(ofn)); + p2m->nr_foreign--; break; default: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 14:22:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 14:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732055.1137862 (Exim 4.92) (envelope-from ) id 1sCKBy-0003yj-CY; Wed, 29 May 2024 14:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732055.1137862; Wed, 29 May 2024 14:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKBy-0003yc-9k; Wed, 29 May 2024 14:22:14 +0000 Received: by outflank-mailman (input) for mailman id 732055; Wed, 29 May 2024 14:22:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKBx-0003yU-Gw for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKBx-0000AS-GB for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCKBx-0000Hd-EP for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3TyMSOs8DWKjjY1wZWblzKV4MCZqIyz0rtJz/PU8LZU=; b=Qfe8vSDEhFGVcl4H58xPYnNsKL AT1j5Z//+xVLWRDXGVGU2kgDzSyg/SZFfdC6VCSar9I3pptTyAyZBsGthL+U5Qm++37iecPCfT6q5 RrmG0c9uJkTeA1XYj7yOT3Rn2aDNCJyhXrh5mu2O/fajjuw5u2g3JBPc78yQaOmOeXDc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: enable altp2m at create domain domctl Message-Id: Date: Wed, 29 May 2024 14:22:13 +0000 commit 0291089f6ea81690f37035a124d54c51fa7ba097 Author: Roger Pau Monné AuthorDate: Wed May 29 16:10:04 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 16:10:04 2024 +0200 xen: enable altp2m at create domain domctl Enabling it using an HVM param is fragile, and complicates the logic when deciding whether options that interact with altp2m can also be enabled. Leave the HVM param value for consumption by the guest, but prevent it from being set. Enabling is now done using and additional altp2m specific field in xen_domctl_createdomain. Note that albeit only currently implemented in x86, altp2m could be implemented in other architectures, hence why the field is added to xen_domctl_createdomain instead of xen_arch_domainconfig. Signed-off-by: Roger Pau Monné Acked-by: Christian Lindig Reviewed-by: Jan Beulich # hypervisor Acked-by: Stefano Stabellini Reviewed-by: Juergen Gross # tools/libs/ Release-acked-by: Oleksii Kurochko --- tools/libs/light/libxl_create.c | 23 ++++++++++++++++++++++- tools/libs/light/libxl_x86.c | 26 ++++++++++++-------------- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- xen/arch/arm/domain.c | 6 ++++++ xen/arch/x86/domain.c | 22 ++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 23 ++++++++++++++++++++++- xen/include/public/domctl.h | 18 ++++++++++++++++++ xen/include/public/hvm/params.h | 9 ++------- 8 files changed, 105 insertions(+), 24 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 41252ec553..edeadd57ef 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -372,7 +372,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->u.hvm.viridian, false); libxl_defbool_setdefault(&b_info->u.hvm.hpet, true); libxl_defbool_setdefault(&b_info->u.hvm.vpt_align, true); - libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); libxl_defbool_setdefault(&b_info->u.hvm.usb, false); libxl_defbool_setdefault(&b_info->u.hvm.vkb_device, true); libxl_defbool_setdefault(&b_info->u.hvm.xen_platform_pci, true); @@ -678,6 +677,28 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, if (info->passthrough == LIBXL_PASSTHROUGH_SYNC_PT) create.iommu_opts |= XEN_DOMCTL_IOMMU_no_sharept; + LOG(DETAIL, "altp2m: %s", libxl_altp2m_mode_to_string(b_info->altp2m)); + switch(b_info->altp2m) { + case LIBXL_ALTP2M_MODE_MIXED: + create.altp2m_opts |= + XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_mixed); + break; + + case LIBXL_ALTP2M_MODE_EXTERNAL: + create.altp2m_opts |= + XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_external); + break; + + case LIBXL_ALTP2M_MODE_LIMITED: + create.altp2m_opts |= + XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_limited); + break; + + case LIBXL_ALTP2M_MODE_DISABLED: + /* Nothing to do - altp2m disabled is signaled as mode == 0. */ + break; + } + /* Ultimately, handle is an array of 16 uint8_t, same as uuid */ libxl_uuid_copy(ctx, (libxl_uuid *)&create.handle, &info->uuid); diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index a50ec37eb3..60643d6f53 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -407,19 +407,9 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid, libxl_ctx *ctx = libxl__gc_owner(gc); xc_interface *xch = ctx->xch; int ret = ERROR_FAIL; - unsigned int altp2m = info->altp2m; switch(info->type) { case LIBXL_DOMAIN_TYPE_HVM: - /* The config parameter "altp2m" replaces the parameter "altp2mhvm". For - * legacy reasons, both parameters are accepted on x86 HVM guests. - * - * If the legacy field info->u.hvm.altp2m is set, activate altp2m. - * Otherwise set altp2m based on the field info->altp2m. */ - if (info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && - libxl_defbool_val(info->u.hvm.altp2m)) - altp2m = libxl_defbool_val(info->u.hvm.altp2m); - if (xc_hvm_param_set(xch, domid, HVM_PARAM_HPET_ENABLED, libxl_defbool_val(info->u.hvm.hpet))) { LOG(ERROR, "Couldn't set HVM_PARAM_HPET_ENABLED"); @@ -444,10 +434,6 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid, LOG(ERROR, "Couldn't set HVM_PARAM_TIMER_MODE"); goto out; } - if (xc_hvm_param_set(xch, domid, HVM_PARAM_ALTP2M, altp2m)) { - LOG(ERROR, "Couldn't set HVM_PARAM_ALTP2M"); - goto out; - } break; default: @@ -818,6 +804,18 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); + /* + * The config parameter "altp2m" replaces the parameter "altp2mhvm". + * For legacy reasons, both parameters are accepted on x86 HVM guests. + * + * If the legacy field info->u.hvm.altp2m is set, activate altp2m. + * Otherwise set altp2m based on the field info->altp2m. + */ + libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); + if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && + libxl_defbool_val(b_info->u.hvm.altp2m)) + b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + return 0; } diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 2b6d3c09df..c6da9bb091 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -257,7 +257,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co #if defined(__i386__) || defined(__x86_64__) /* Quick & dirty check for ABI changes. */ - BUILD_BUG_ON(sizeof(cfg) != 64); + BUILD_BUG_ON(sizeof(cfg) != 68); /* Mnemonics for the named fields inside xen_x86_arch_domainconfig */ #define VAL_EMUL_FLAGS Field(arch_domconfig, 0) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 34cbfe699a..8bde2f730d 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -688,6 +688,12 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( config->altp2m_opts ) + { + dprintk(XENLOG_INFO, "Altp2m not supported\n"); + return -EINVAL; + } + return 0; } diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 00a3aaa576..1988f5e19a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -637,6 +637,8 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) bool hap = config->flags & XEN_DOMCTL_CDF_hap; bool nested_virt = config->flags & XEN_DOMCTL_CDF_nested_virt; unsigned int max_vcpus; + unsigned int altp2m_mode = MASK_EXTR(config->altp2m_opts, + XEN_DOMCTL_ALTP2M_mode_mask); if ( hvm ? !hvm_enabled : !IS_ENABLED(CONFIG_PV) ) { @@ -715,6 +717,26 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( config->altp2m_opts & ~XEN_DOMCTL_ALTP2M_mode_mask ) + { + dprintk(XENLOG_INFO, "Invalid altp2m options selected: %#x\n", + config->flags); + return -EINVAL; + } + + if ( altp2m_mode && nested_virt ) + { + dprintk(XENLOG_INFO, + "Nested virt and altp2m are not supported together\n"); + return -EINVAL; + } + + if ( altp2m_mode && !hap ) + { + dprintk(XENLOG_INFO, "altp2m is only supported with HAP\n"); + return -EINVAL; + } + return 0; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2c66fe0f7a..8334ab1711 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -658,6 +658,22 @@ int hvm_domain_initialise(struct domain *d, d->arch.hvm.params[HVM_PARAM_TRIPLE_FAULT_REASON] = SHUTDOWN_reboot; + /* Set altp2m based on domctl flags. */ + switch ( MASK_EXTR(config->altp2m_opts, XEN_DOMCTL_ALTP2M_mode_mask) ) + { + case XEN_DOMCTL_ALTP2M_mixed: + d->arch.hvm.params[HVM_PARAM_ALTP2M] = XEN_ALTP2M_mixed; + break; + + case XEN_DOMCTL_ALTP2M_external: + d->arch.hvm.params[HVM_PARAM_ALTP2M] = XEN_ALTP2M_external; + break; + + case XEN_DOMCTL_ALTP2M_limited: + d->arch.hvm.params[HVM_PARAM_ALTP2M] = XEN_ALTP2M_limited; + break; + } + vpic_init(d); rc = vioapic_init(d); @@ -4166,6 +4182,12 @@ static int hvm_allow_set_param(struct domain *d, case HVM_PARAM_CONSOLE_EVTCHN: case HVM_PARAM_X87_FIP_WIDTH: break; + + /* The following parameters are read-only. */ + case HVM_PARAM_ALTP2M: + rc = -EEXIST; + break; + /* The following parameters are deprecated. */ case HVM_PARAM_PAE_ENABLED: case HVM_PARAM_DM_DOMAIN: @@ -4207,7 +4229,6 @@ static int hvm_allow_set_param(struct domain *d, case HVM_PARAM_BUFIOREQ_PFN: case HVM_PARAM_IOREQ_SERVER_PFN: case HVM_PARAM_NR_IOREQ_SERVER_PAGES: - case HVM_PARAM_ALTP2M: case HVM_PARAM_MCA_CAP: if ( value != 0 && new_value != value ) rc = -EEXIST; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 6cd39ea46d..2a49fe46ce 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -86,6 +86,24 @@ struct xen_domctl_createdomain { uint32_t grant_opts; +/* + * Enable altp2m mixed mode. + * + * Note that 'mixed' mode has not been evaluated for safety from a security + * perspective. Before using this mode in a security-critical environment, + * each subop should be evaluated for safety, with unsafe subops blacklisted in + * XSM. + */ +#define XEN_DOMCTL_ALTP2M_mixed (1U) +/* Enable altp2m external mode. */ +#define XEN_DOMCTL_ALTP2M_external (2U) +/* Enable altp2m limited mode. */ +#define XEN_DOMCTL_ALTP2M_limited (3U) +/* Altp2m mode signaling uses bits [0, 1]. */ +#define XEN_DOMCTL_ALTP2M_mode_mask (0x3U) +#define XEN_DOMCTL_ALTP2M_mode(m) ((m) & XEN_DOMCTL_ALTP2M_mode_mask) + uint32_t altp2m_opts; + /* Per-vCPU buffer size in bytes. 0 to disable. */ uint32_t vmtrace_size; diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index a22b4ed45d..99c40b4287 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -246,16 +246,11 @@ #define HVM_PARAM_VM_GENERATION_ID_ADDR 34 /* - * Set mode for altp2m: - * disabled: don't activate altp2m (default) + * Get mode for altp2m: + * disabled: altp2m not active (default) * mixed: allow access to all altp2m ops for both in-guest and external tools * external: allow access to external privileged tools only * limited: guest only has limited access (ie. control VMFUNC and #VE) - * - * Note that 'mixed' mode has not been evaluated for safety from a - * security perspective. Before using this mode in a - * security-critical environment, each subop should be evaluated for - * safety, with unsafe subops blacklisted in XSM. */ #define HVM_PARAM_ALTP2M 35 #define XEN_ALTP2M_disabled 0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 14:22:26 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 14:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732056.1137865 (Exim 4.92) (envelope-from ) id 1sCKC8-00041Q-E4; Wed, 29 May 2024 14:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732056.1137865; Wed, 29 May 2024 14:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKC8-00041J-BK; Wed, 29 May 2024 14:22:24 +0000 Received: by outflank-mailman (input) for mailman id 732056; Wed, 29 May 2024 14:22:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKC7-000416-KS for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKC7-0000Ae-Je for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCKC7-0000Ih-Ih for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HGAkUl8jPePq1ZvaJB3Q+bVcSihYm8VSFDzsTYUkehU=; b=h7D9yHiM5YTZg8kV5yr+WzoHin OIfyjT6tdGKqqiq9yxjN1W4vnpdsAF0lZjBdfOaFEo7030SbmKUh4RJJvjgA5DJQ3bm2kwf/6O1al 2or7Go+0am+9j5wufDLueLAXVRvS5bbVZmVxrdUQswFPUx6yIjAoM8osBRKli4rVdOns=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/x86: remove foreign mappings from the p2m on teardown Message-Id: Date: Wed, 29 May 2024 14:22:23 +0000 commit 845a60b63be11acfe435e2bd83ceebb0acc76d62 Author: Roger Pau Monné AuthorDate: Wed May 29 16:11:19 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 16:11:19 2024 +0200 xen/x86: remove foreign mappings from the p2m on teardown Iterate over the p2m up to the maximum recorded gfn and remove any foreign mappings, in order to drop the underlying page references and thus don't keep extra page references if a domain is destroyed while still having foreign mappings on it's p2m. The logic is similar to the one used on Arm. Note that foreign mappings cannot be created by guests that have altp2m or nested HVM enabled, as p2ms different than the host one are not currently scrubbed when destroyed in order to drop references to any foreign maps. It's unclear whether the right solution is to take an extra reference when foreign maps are added to p2ms different than the host one, or just rely on the host p2m already having a reference. The mapping being removed from the host p2m should cause it to be dropped on all domain p2ms. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- CHANGELOG.md | 1 + xen/arch/x86/domain.c | 6 ++++ xen/arch/x86/include/asm/p2m.h | 26 ++++++++-------- xen/arch/x86/mm/p2m-basic.c | 18 +++++++++++ xen/arch/x86/mm/p2m.c | 68 +++++++++++++++++++++++++++++++++++++++--- 5 files changed, 103 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 579329ff71..201478aa1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - On x86: - HVM PIRQs are disabled by default. - Reduce IOMMU setup time for hardware domain. + - Allow HVM/PVH domains to map foreign pages. - xl/libxl configures vkb=[] for HVM domains with priority over vkb_device. - Increase the maximum number of CPUs Xen can be built for from 4095 to 16383. diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1988f5e19a..536542841e 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2387,6 +2387,7 @@ int domain_relinquish_resources(struct domain *d) enum { PROG_iommu_pagetables = 1, PROG_shared, + PROG_mappings, PROG_paging, PROG_vcpu_pagetables, PROG_xen, @@ -2435,6 +2436,11 @@ int domain_relinquish_resources(struct domain *d) } #endif + PROGRESS(mappings): + ret = relinquish_p2m_mapping(d); + if ( ret ) + return ret; + PROGRESS(paging): /* Tear down paging-assistance stuff. */ diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 107b9f2608..c1478ffc36 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -383,6 +383,8 @@ struct p2m_domain { /* Number of foreign mappings. */ unsigned long nr_foreign; + /* Cursor for iterating over the p2m on teardown. */ + unsigned long teardown_gfn; #endif /* CONFIG_HVM */ }; @@ -395,16 +397,7 @@ struct p2m_domain { #endif #include -static inline bool arch_acquire_resource_check(struct domain *d) -{ - /* - * FIXME: Until foreign pages inserted into the P2M are properly - * reference counted, it is unsafe to allow mapping of - * resource pages unless the caller is the hardware domain - * (see set_foreign_p2m_entry()). - */ - return !paging_mode_translate(d) || is_hardware_domain(d); -} +bool arch_acquire_resource_check(const struct domain *d); /* * Updates vCPU's n2pm to match its np2m_base in VMCx12 and returns that np2m. @@ -720,6 +713,10 @@ p2m_pod_offline_or_broken_hit(struct page_info *p); void p2m_pod_offline_or_broken_replace(struct page_info *p); +/* Perform cleanup of p2m mappings ahead of teardown. */ +int +relinquish_p2m_mapping(struct domain *d); + #else static inline bool @@ -748,6 +745,11 @@ static inline void p2m_pod_offline_or_broken_replace(struct page_info *p) ASSERT_UNREACHABLE(); } +static inline int relinquish_p2m_mapping(struct domain *d) +{ + return 0; +} + #endif @@ -1043,7 +1045,7 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt, break; case p2m_map_foreign: - if ( !mfn_valid(nfn) ) + if ( !mfn_valid(nfn) || p2m != p2m_get_hostp2m(p2m->domain) ) { ASSERT_UNREACHABLE(); return -EINVAL; @@ -1068,7 +1070,7 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt, break; case p2m_map_foreign: - if ( !mfn_valid(ofn) ) + if ( !mfn_valid(ofn) || p2m != p2m_get_hostp2m(p2m->domain) ) { ASSERT_UNREACHABLE(); return -EINVAL; diff --git a/xen/arch/x86/mm/p2m-basic.c b/xen/arch/x86/mm/p2m-basic.c index 8599bd15c6..25d27a0a9f 100644 --- a/xen/arch/x86/mm/p2m-basic.c +++ b/xen/arch/x86/mm/p2m-basic.c @@ -13,6 +13,8 @@ #include #include +#include +#include #include #include "mm-locks.h" #include "p2m.h" @@ -207,6 +209,22 @@ void p2m_final_teardown(struct domain *d) p2m_teardown_hostp2m(d); } +bool arch_acquire_resource_check(const struct domain *d) +{ + /* + * altp2m is not supported as we would otherwise also need to walk the + * altp2m tables and drop any foreign map entries in order to drop the page + * reference. + * + * The same applies to nestedhvm nested p2m tables, as the type from the L0 + * p2m is replicated into the L1 p2m, and there's no filtering that + * prevents foreign mappings from being created in nestedp2m. + */ + return is_pv_domain(d) || + (d->arch.hvm.params[HVM_PARAM_ALTP2M] == XEN_ALTP2M_disabled && + !nestedhvm_enabled(d)); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index db5d9b6c2a..e7e327d6a6 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1862,10 +1862,6 @@ static int p2m_add_foreign(struct domain *tdom, unsigned long fgfn, int rc; struct domain *fdom; - /* - * hvm fixme: until support is added to p2m teardown code to cleanup any - * foreign entries, limit this to hardware domain only. - */ if ( !arch_acquire_resource_check(tdom) ) return -EPERM; @@ -2069,6 +2065,70 @@ int xenmem_add_to_physmap_one( return rc; } +/* + * Remove foreign mappings from the p2m, as that drops the page reference taken + * when mapped. + */ +int relinquish_p2m_mapping(struct domain *d) +{ + struct p2m_domain *p2m = p2m_get_hostp2m(d); + unsigned long gfn, count = 0; + int rc = 0; + + if ( !paging_mode_translate(d) ) + return 0; + + BUG_ON(!d->is_dying); + + p2m_lock(p2m); + + gfn = p2m->teardown_gfn; + + /* Iterate over the whole p2m on debug builds to ensure correctness. */ + while ( gfn <= p2m->max_mapped_pfn && + (IS_ENABLED(CONFIG_DEBUG) || p2m->nr_foreign) ) + { + unsigned int order; + p2m_type_t t; + p2m_access_t a; + + _get_gfn_type_access(p2m, _gfn(gfn), &t, &a, 0, &order, 0); + ASSERT(IS_ALIGNED(gfn, 1UL << order)); + + if ( t == p2m_map_foreign ) + { + ASSERT(p2m->nr_foreign); + ASSERT(order == 0); + + rc = p2m_set_entry(p2m, _gfn(gfn), INVALID_MFN, order, p2m_invalid, + p2m->default_access); + if ( rc ) + { + printk(XENLOG_ERR + "%pd: failed to unmap foreign page %" PRI_gfn " order %u error %d\n", + d, gfn, order, rc); + ASSERT_UNREACHABLE(); + break; + } + } + + gfn += 1UL << order; + + if ( !(++count & 0xff) && hypercall_preempt_check() ) + { + rc = -ERESTART; + break; + } + } + + ASSERT(gfn <= p2m->max_mapped_pfn || !p2m->nr_foreign); + p2m->teardown_gfn = gfn; + + p2m_unlock(p2m); + + return rc; +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 14:22:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 14:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732059.1137870 (Exim 4.92) (envelope-from ) id 1sCKCI-000448-Fg; Wed, 29 May 2024 14:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732059.1137870; Wed, 29 May 2024 14:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKCI-000440-Cv; Wed, 29 May 2024 14:22:34 +0000 Received: by outflank-mailman (input) for mailman id 732059; Wed, 29 May 2024 14:22:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKCH-00043t-OU for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKCH-0000Al-NZ for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCKCH-0000JB-M2 for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:22:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=U15jLcaAKQUM5VVRVZRZoKNi8bq8wGTdbhxhZ65t6vI=; b=unO06TIKbRVP31Na74EOS5brDQ sNwCDlF5qz1ebCxgPuWZ1dXv8GmFUxqBMUzoVpQp5vANxhT4bpZ+2Ahez7hq1ODWBtMRQ3uqQqDNB 54gSN4IK+i176UDb4CqJoGl93VzbwZh3atDBV0zQH6Oobbe5i3yVf8RjM7kg5vUj0wwM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Partial revert of "x86/MCE: optional build of AMD/Intel MCE code" Message-Id: Date: Wed, 29 May 2024 14:22:33 +0000 commit 12f9599a3b135afa270ccf0795f3e9665059955d Author: Andrew Cooper AuthorDate: Wed May 29 16:11:45 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 16:11:45 2024 +0200 Partial revert of "x86/MCE: optional build of AMD/Intel MCE code" {cmci,lmce}_support are written during S3 resume, so cannot live in __ro_after_init. Move them back to being __read_mostly, as they were originally. Link: https://gitlab.com/xen-project/xen/-/jobs/6966698361 Fixes: 19b6e9f9149f ("x86/MCE: optional build of AMD/Intel MCE code") Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpu/mcheck/mce.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 1664ca6412..32c1b2756b 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -38,10 +38,10 @@ DEFINE_PER_CPU_READ_MOSTLY(unsigned int, nr_mce_banks); unsigned int __read_mostly firstbank; unsigned int __read_mostly ppin_msr; uint8_t __read_mostly cmci_apic_vector; -bool __ro_after_init cmci_support; +bool __read_mostly cmci_support; /* If mce_force_broadcast == 1, lmce_support will be disabled forcibly. */ -bool __ro_after_init lmce_support; +bool __read_mostly lmce_support; DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, poll_bankmask); DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, no_cmci_banks); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 29 14:44:06 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 14:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732136.1137984 (Exim 4.92) (envelope-from ) id 1sCKX5-0007AL-LA; Wed, 29 May 2024 14:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732136.1137984; Wed, 29 May 2024 14:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKX5-0007AD-Ia; Wed, 29 May 2024 14:44:03 +0000 Received: by outflank-mailman (input) for mailman id 732136; Wed, 29 May 2024 14:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKX4-0007A7-AS for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKX4-0000Zj-8a for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCKX4-0001XP-7X for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ALIrSVHEtloPPy2GOqowGUBNmhjCdmlZg2UBQBvMi2Q=; b=uUATSCbvUIu0PHoRuMroWYoxzL ISPwx3V8nyJZrkWEwgoy23wds6mAvCMZoZ9N+qANTGuEb8y1p7wzYoVzxhBbp2q3i9usl5nB4LTXa KtEqBaA9vkf6IlypQmmhoYErcHPkgDeeXVWectQczhTyv3V2t6zWJbZCRJOi+cjxzPvg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/lzo: Implement COPY{4,8} using memcpy() Message-Id: Date: Wed, 29 May 2024 14:44:02 +0000 commit 56d3b24979b318e661f7542a10d073c720aa6b77 Author: Andrew Cooper AuthorDate: Tue May 21 17:08:32 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 28 17:26:39 2024 +0100 xen/lzo: Implement COPY{4,8} using memcpy() This is simpler and easier for both humans and compilers to read. It also addresses 6 instances of MISRA R5.3 violation (shadowing of the ptr_ local variable inside both {put,get}_unaligned()). No change, not even in the compiled binary. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/common/lzo.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index cc03f0f554..3454ce4a7e 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -25,15 +25,8 @@ */ -#define COPY4(dst, src) \ - put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) -#if defined(__x86_64__) -#define COPY8(dst, src) \ - put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst)) -#else -#define COPY8(dst, src) \ - COPY4(dst, src); COPY4((dst) + 4, (src) + 4) -#endif +#define COPY4(dst, src) memcpy(dst, src, 4) +#define COPY8(dst, src) memcpy(dst, src, 8) #ifdef __MINIOS__ # include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 14:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 14:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732137.1137987 (Exim 4.92) (envelope-from ) id 1sCKXF-0007Df-Mr; Wed, 29 May 2024 14:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732137.1137987; Wed, 29 May 2024 14: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 1sCKXF-0007DX-K4; Wed, 29 May 2024 14:44:13 +0000 Received: by outflank-mailman (input) for mailman id 732137; Wed, 29 May 2024 14:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKXE-0007DP-Cw for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKXE-0000Zr-C4 for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCKXE-0001YN-Aw for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14: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=6H29dkzJloR3xl1KRQ/qtGr4zXUal9d7u5eiaCOiKWw=; b=f7rFBK8aqtkFOZOdf9QuAm7oxn foIbkt50LsI0yHNz6GDs4/HIx3x9ywWYqrBfURTVbg3bCNmpXvUwPKqSEyieTDMFjOIuur5fBAckI p/qkDI+l3ACB5e6Xe1TFiLFFx9jAkpe9ViphWBgS3JSpovgA11fn7/DVJFfcR5HSCnKw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Drop useless non-Kconfig CONFIG_* variables Message-Id: Date: Wed, 29 May 2024 14:44:12 +0000 commit 2d082710f7820f4556bd96320db529d556ba9481 Author: Andrew Cooper AuthorDate: Tue May 21 18:07:09 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 28 17:26:39 2024 +0100 xen/x86: Drop useless non-Kconfig CONFIG_* variables These are all either completely unused, or do nothing useful. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/config.h | 2 -- xen/include/xen/acpi.h | 9 --------- 2 files changed, 11 deletions(-) diff --git a/xen/arch/x86/include/asm/config.h b/xen/arch/x86/include/asm/config.h index ab7288cb36..2a260a2581 100644 --- a/xen/arch/x86/include/asm/config.h +++ b/xen/arch/x86/include/asm/config.h @@ -20,7 +20,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG #define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1 -#define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 #define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) @@ -30,7 +29,6 @@ /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 -#define CONFIG_ACPI_SRAT 1 #define CONFIG_ACPI_CSTATE 1 #define CONFIG_WATCHDOG 1 diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index e78e7e7852..bc4818c943 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -140,15 +140,6 @@ int get_cpu_id(u32 acpi_id); unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); -/* - * This function undoes the effect of one call to acpi_register_gsi(). - * If this matches the last registration, any IRQ resources for gsi - * are freed. - */ -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ -void acpi_unregister_gsi (u32 gsi); -#endif - #ifdef CONFIG_ACPI_CSTATE /* * max_cstate sets the highest legal C-state. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 14:44:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 14:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732138.1137993 (Exim 4.92) (envelope-from ) id 1sCKXP-0007IM-Pf; Wed, 29 May 2024 14:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732138.1137993; Wed, 29 May 2024 14: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 1sCKXP-0007I7-Lh; Wed, 29 May 2024 14:44:23 +0000 Received: by outflank-mailman (input) for mailman id 732138; Wed, 29 May 2024 14:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKXO-0007Hx-Ge for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKXO-0000a7-FO for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCKXO-0001Yx-EL for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14: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=e7CI41/oZ/rTr2xBc9pXji6YM+857nw7fIXFLREIQjg=; b=PVkVDMI0i4N1kj0GiiZZVlnj9R lmTaWd0HbPN298MSGIzwIbMBf2lk56aEEq0En+4rCojiMClHpOxZDDgTLx7xYsAM4Y7BxoO+KeEhw nHx9CK8TCYLWEmX1IXo+7myTOqGQQtj0zD8haAO6GyXoVuKnfILad0/a8/3iOrWDUCdM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: Address two misc MISRA 17.7 violations Message-Id: Date: Wed, 29 May 2024 14:44:22 +0000 commit 58b3437bae50b835a3a9a04fe5e8d31cd115d6a3 Author: Andrew Cooper AuthorDate: Tue May 21 16:22:08 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 28 17:26:39 2024 +0100 xen/x86: Address two misc MISRA 17.7 violations Neither text_poke() nor watchdog_setup() have their return value consulted. Switch them to being void. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-acked-by: Oleksii Kurochko --- xen/arch/x86/alternative.c | 4 ++-- xen/arch/x86/nmi.c | 5 ++--- xen/include/xen/watchdog.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 2e7ba6e0b8..7824053c9d 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -155,10 +155,10 @@ void init_or_livepatch add_nops(void *insns, unsigned int len) * "noinline" to cause control flow change and thus invalidate I$ and * cause refetch after modification. */ -static void *init_or_livepatch noinline +static void init_or_livepatch noinline text_poke(void *addr, const void *opcode, size_t len) { - return memcpy(addr, opcode, len); + memcpy(addr, opcode, len); } extern void *const __initdata_cf_clobber_start[]; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index f6329cb027..9793fa2316 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -464,12 +464,12 @@ bool watchdog_enabled(void) return !atomic_read(&watchdog_disable_count); } -int __init watchdog_setup(void) +void __init watchdog_setup(void) { unsigned int cpu; /* - * Activate periodic heartbeats. We cannot do this earlier during + * Activate periodic heartbeats. We cannot do this earlier during * setup because the timer infrastructure is not available. */ for_each_online_cpu ( cpu ) @@ -477,7 +477,6 @@ int __init watchdog_setup(void) register_cpu_notifier(&cpu_nmi_nfb); watchdog_enable(); - return 0; } /* Returns false if this was not a watchdog NMI, true otherwise */ diff --git a/xen/include/xen/watchdog.h b/xen/include/xen/watchdog.h index 86fde0884a..4c2840bd91 100644 --- a/xen/include/xen/watchdog.h +++ b/xen/include/xen/watchdog.h @@ -12,7 +12,7 @@ #ifdef CONFIG_WATCHDOG /* Try to set up a watchdog. */ -int watchdog_setup(void); +void watchdog_setup(void); /* Enable the watchdog. */ void watchdog_enable(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 14:44:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 14:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732139.1137996 (Exim 4.92) (envelope-from ) id 1sCKXZ-0007Kk-Q0; Wed, 29 May 2024 14:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732139.1137996; Wed, 29 May 2024 14: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 1sCKXZ-0007Kc-NF; Wed, 29 May 2024 14:44:33 +0000 Received: by outflank-mailman (input) for mailman id 732139; Wed, 29 May 2024 14:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKXY-0007KS-JD for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCKXY-0000aE-IN for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCKXY-0001ay-HW for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 14: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=TNujp1C6cIQZF5xbY51/r0SCUcDncXHWMlrENiJVWlU=; b=t15BzuTu0AqnwxIcrVkDHMeGoq ZObp0uGDUWbYYAXXLzZNrEWMu1zU7niib9Ib0cHBTite3e0U7dh3yzgByJfGl51sZy1I84yeRLAC7 tlG8iDVFYz3LjsRgfldNceqpP2AQsMakNOMkpqey1g3axsae3t5VYg4xgXlhTLMBMV5U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/svm: Rework VMCB_ACCESSORS() to use a plain type name Message-Id: Date: Wed, 29 May 2024 14:44:32 +0000 commit d27c2835e0005200d464b57156c76455d46f74bb Author: Andrew Cooper AuthorDate: Tue May 28 16:29:11 2024 +0100 Commit: Andrew Cooper CommitDate: Tue May 28 17:26:39 2024 +0100 x86/svm: Rework VMCB_ACCESSORS() to use a plain type name This avoids having a function call in a typeof() expression. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/hvm/svm/vmcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/hvm/svm/vmcb.h b/xen/arch/x86/include/asm/hvm/svm/vmcb.h index 0396d10b90..28f715e376 100644 --- a/xen/arch/x86/include/asm/hvm/svm/vmcb.h +++ b/xen/arch/x86/include/asm/hvm/svm/vmcb.h @@ -630,7 +630,7 @@ vmcb_get_ ## name(const struct vmcb_struct *vmcb) \ } #define VMCB_ACCESSORS(name, cleanbit) \ - VMCB_ACCESSORS_(name, typeof(alloc_vmcb()->_ ## name), cleanbit) + VMCB_ACCESSORS_(name, typeof(((struct vmcb_struct){})._ ## name), cleanbit) VMCB_ACCESSORS(cr_intercepts, intercepts) VMCB_ACCESSORS(dr_intercepts, intercepts) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 22:33:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 22:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732410.1138400 (Exim 4.92) (envelope-from ) id 1sCRqx-0000Vp-NY; Wed, 29 May 2024 22:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732410.1138400; Wed, 29 May 2024 22: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 1sCRqx-0000Vh-Kw; Wed, 29 May 2024 22:33:03 +0000 Received: by outflank-mailman (input) for mailman id 732410; Wed, 29 May 2024 22:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCRqv-0000Vb-Rm for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCRqv-0000h7-PQ for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCRqv-0006mh-OP for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22: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=JQYZf8VIfVYU8gMHhg91BDqijiYjg9Tg9lAY/G7WhO0=; b=m3PPOrxVhQOFey8ECJCZnQmgtz 98WEFbwjr7YHhPiBGjIAkQpGrFKBxHeKgXsof0cMqO7N3HCs/MSE52hi9uhu5alVYd3oggQkuVeOc 0WIuzRzvLX8F2HVDE+/711MknNKYFJ7OligGdfEMLSwToP9/d6Ys9Zr9vWgNSzueqYdI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/intel: move vmce_has_lmce() routine to header Message-Id: Date: Wed, 29 May 2024 22:33:01 +0000 commit 498a4ded74b3f062c52e42568223dc5858d27731 Author: Sergiy Kibrik AuthorDate: Wed May 29 09:54:22 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 09:54:22 2024 +0200 x86/intel: move vmce_has_lmce() routine to header Moving this function out of mce_intel.c will make it possible to disable build of Intel MCE code later on, because the function gets called from common x86 code. Also replace boilerplate code that checks for MCG_LMCE_P flag with vmce_has_lmce(), which might contribute to readability a bit. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce.h | 5 +++++ xen/arch/x86/cpu/mcheck/mce_intel.c | 4 ---- xen/arch/x86/cpu/mcheck/vmce.c | 5 ++--- xen/arch/x86/include/asm/mce.h | 1 - xen/arch/x86/msr.c | 2 ++ 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index 4806405f96..eba4b536c7 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -170,6 +170,11 @@ static inline int mce_bank_msr(const struct vcpu *v, uint32_t msr) return 0; } +static inline bool vmce_has_lmce(const struct vcpu *v) +{ + return v->arch.vmce.mcg_cap & MCG_LMCE_P; +} + struct mce_callbacks { void (*handler)(const struct cpu_user_regs *regs); bool (*check_addr)(uint64_t status, uint64_t misc, int addr_type); diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 3f5199b531..af43281cc6 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -1050,7 +1050,3 @@ int vmce_intel_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val) return 1; } -bool vmce_has_lmce(const struct vcpu *v) -{ - return v->arch.vmce.mcg_cap & MCG_LMCE_P; -} diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index 4da6f4a3e4..5abdf4cb5f 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -203,7 +203,7 @@ int vmce_rdmsr(uint32_t msr, uint64_t *val) * bits are always set in guest MSR_IA32_FEATURE_CONTROL by Xen, so it * does not need to check them here. */ - if ( cur->arch.vmce.mcg_cap & MCG_LMCE_P ) + if ( vmce_has_lmce(cur) ) { *val = cur->arch.vmce.mcg_ext_ctl; mce_printk(MCE_VERBOSE, "MCE: %pv: rd MCG_EXT_CTL %#"PRIx64"\n", @@ -332,8 +332,7 @@ int vmce_wrmsr(uint32_t msr, uint64_t val) break; case MSR_IA32_MCG_EXT_CTL: - if ( (cur->arch.vmce.mcg_cap & MCG_LMCE_P) && - !(val & ~MCG_EXT_CTL_LMCE_EN) ) + if ( vmce_has_lmce(cur) && !(val & ~MCG_EXT_CTL_LMCE_EN) ) cur->arch.vmce.mcg_ext_ctl = val; else ret = -1; diff --git a/xen/arch/x86/include/asm/mce.h b/xen/arch/x86/include/asm/mce.h index 6ce56b5b85..2ec47a71ae 100644 --- a/xen/arch/x86/include/asm/mce.h +++ b/xen/arch/x86/include/asm/mce.h @@ -41,7 +41,6 @@ extern void vmce_init_vcpu(struct vcpu *v); extern int vmce_restore_vcpu(struct vcpu *v, const struct hvm_vmce_vcpu *ctxt); extern int vmce_wrmsr(uint32_t msr, uint64_t val); extern int vmce_rdmsr(uint32_t msr, uint64_t *val); -extern bool vmce_has_lmce(const struct vcpu *v); extern int vmce_enable_mca_cap(struct domain *d, uint64_t cap); DECLARE_PER_CPU(unsigned int, nr_mce_banks); diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 9babd441f9..289cf10b78 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -24,6 +24,8 @@ #include +#include "cpu/mcheck/mce.h" /* for vmce_has_lmce() */ + DEFINE_PER_CPU(uint32_t, tsc_aux); int init_vcpu_msr_policy(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 22:33:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 22:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732411.1138404 (Exim 4.92) (envelope-from ) id 1sCRr7-0000Xj-P1; Wed, 29 May 2024 22:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732411.1138404; Wed, 29 May 2024 22: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 1sCRr7-0000Xb-ML; Wed, 29 May 2024 22:33:13 +0000 Received: by outflank-mailman (input) for mailman id 732411; Wed, 29 May 2024 22:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCRr5-0000XF-Tr for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCRr5-0000hi-SY for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCRr5-0006nJ-Rc for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22: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=zwnWf9gWra1dKrZMRhRousv2ZRuBUfNOvH3JuG2/wRo=; b=ktnED/XOu58UhTHBCoXoOtmTD4 fIoN1x3uOOkv/Mf80QrqVjL0MBr14ePcu0fVf+mw8KE5RK9iulkKluQ1TBcpfHw8u6HX+ihsDgGkN Di7eNF8h8pcWENBaarZL9rXmlQ0fHv8yEcdGjwC5BK0dfyQnkCqUX4sS1IrwkKxQ5SoI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/MCE: add default switch case in init_nonfatal_mce_checker() Message-Id: Date: Wed, 29 May 2024 22:33:11 +0000 commit 5effd810c629d9a836e46ee321ca7409dad27212 Author: Sergiy Kibrik AuthorDate: Wed May 29 09:56:15 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 09:56:15 2024 +0200 x86/MCE: add default switch case in init_nonfatal_mce_checker() The default switch case block is wanted here, to handle situation e.g. of unexpected c->x86_vendor value -- then no mcheck init is done, but misleading message still gets logged anyway. Signed-off-by: Sergiy Kibrik Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/non-fatal.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/non-fatal.c index 33cacd15c2..5a53bcd0b7 100644 --- a/xen/arch/x86/cpu/mcheck/non-fatal.c +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c @@ -29,9 +29,14 @@ static int __init cf_check init_nonfatal_mce_checker(void) /* Assume we are on K8 or newer AMD or Hygon CPU here */ amd_nonfatal_mcheck_init(c); break; + case X86_VENDOR_INTEL: intel_nonfatal_mcheck_init(c); break; + + default: + /* unhandled vendor isn't really an error */ + return 0; } printk(KERN_INFO "mcheck_poll: Machine check polling timer started.\n"); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 22:33:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 22:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732415.1138418 (Exim 4.92) (envelope-from ) id 1sCRrH-0000r3-3D; Wed, 29 May 2024 22:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732415.1138418; Wed, 29 May 2024 22: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 1sCRrG-0000qq-W9; Wed, 29 May 2024 22:33:22 +0000 Received: by outflank-mailman (input) for mailman id 732415; Wed, 29 May 2024 22:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCRrG-0000qS-0I for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCRrF-0000i4-Vo for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCRrF-0006nl-Uo for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33: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=znqJLCfH+6YCZ/PTqGGw6qzJW7TagmnWNRw+QsnEjiM=; b=EdZjWHNiqcT+JKjlmuuQjAdMCK +MpvebW91PyHLaHQYbCe6SnBqIG25ux69BNgxChzjlFL7VGRf/D84eRupGto8+I+aWJPXdmPpBeus 8zMQMK0chPF9rMdFzpcEPaGUsIcEOmp0qMJiqg1aStg0BxhCWzh1bTh/NDJ9NaZJnlJQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/MCE: optional build of AMD/Intel MCE code Message-Id: Date: Wed, 29 May 2024 22:33:21 +0000 commit 19b6e9f9149f028e729493b733c6019b2270c751 Author: Sergiy Kibrik AuthorDate: Wed May 29 09:56:57 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 09:56:57 2024 +0200 x86/MCE: optional build of AMD/Intel MCE code Separate Intel/AMD-specific MCE code using CONFIG_{INTEL,AMD} config options. Now we can avoid build of mcheck code if support for specific platform is intentionally disabled by configuration. Also global variables lmce_support & cmci_support from Intel-specific mce_intel.c have to moved to common mce.c, as they get checked in common code. Signed-off-by: Sergiy Kibrik Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/Makefile | 8 ++++---- xen/arch/x86/cpu/mcheck/mce.c | 4 ++++ xen/arch/x86/cpu/mcheck/mce_intel.c | 4 ---- xen/arch/x86/cpu/mcheck/non-fatal.c | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/Makefile b/xen/arch/x86/cpu/mcheck/Makefile index f927f10b4d..e6cb4dd503 100644 --- a/xen/arch/x86/cpu/mcheck/Makefile +++ b/xen/arch/x86/cpu/mcheck/Makefile @@ -1,12 +1,12 @@ -obj-y += amd_nonfatal.o -obj-y += mce_amd.o +obj-$(CONFIG_AMD) += amd_nonfatal.o +obj-$(CONFIG_AMD) += mce_amd.o obj-y += mcaction.o obj-y += barrier.o -obj-y += intel-nonfatal.o +obj-$(CONFIG_INTEL) += intel-nonfatal.o obj-y += mctelem.o obj-y += mce.o obj-y += mce-apei.o -obj-y += mce_intel.o +obj-$(CONFIG_INTEL) += mce_intel.o obj-y += non-fatal.o obj-y += util.o obj-y += vmce.o diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index fb9dec5b89..1664ca6412 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -38,6 +38,10 @@ DEFINE_PER_CPU_READ_MOSTLY(unsigned int, nr_mce_banks); unsigned int __read_mostly firstbank; unsigned int __read_mostly ppin_msr; uint8_t __read_mostly cmci_apic_vector; +bool __ro_after_init cmci_support; + +/* If mce_force_broadcast == 1, lmce_support will be disabled forcibly. */ +bool __ro_after_init lmce_support; DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, poll_bankmask); DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, no_cmci_banks); diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index af43281cc6..dd812f4b8a 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -26,16 +26,12 @@ #include "mcaction.h" static DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, mce_banks_owned); -bool __read_mostly cmci_support; static bool __read_mostly ser_support; static bool __read_mostly mce_force_broadcast; boolean_param("mce_fb", mce_force_broadcast); static int __read_mostly nr_intel_ext_msrs; -/* If mce_force_broadcast == 1, lmce_support will be disabled forcibly. */ -bool __read_mostly lmce_support; - /* Intel SDM define bit15~bit0 of IA32_MCi_STATUS as the MC error code */ #define INTEL_MCCOD_MASK 0xFFFF diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/non-fatal.c index 5a53bcd0b7..a9ee9bb94f 100644 --- a/xen/arch/x86/cpu/mcheck/non-fatal.c +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c @@ -24,15 +24,19 @@ static int __init cf_check init_nonfatal_mce_checker(void) * Check for non-fatal errors every MCE_RATE s */ switch (c->x86_vendor) { +#ifdef CONFIG_AMD case X86_VENDOR_AMD: case X86_VENDOR_HYGON: /* Assume we are on K8 or newer AMD or Hygon CPU here */ amd_nonfatal_mcheck_init(c); break; +#endif +#ifdef CONFIG_INTEL case X86_VENDOR_INTEL: intel_nonfatal_mcheck_init(c); break; +#endif default: /* unhandled vendor isn't really an error */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 29 22:33:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 29 May 2024 22:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732417.1138422 (Exim 4.92) (envelope-from ) id 1sCRrR-00010s-5R; Wed, 29 May 2024 22:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732417.1138422; Wed, 29 May 2024 22: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 1sCRrR-00010l-2c; Wed, 29 May 2024 22:33:33 +0000 Received: by outflank-mailman (input) for mailman id 732417; Wed, 29 May 2024 22:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCRrQ-00010L-3i for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCRrQ-0000iG-2t for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCRrQ-0006oF-20 for xen-changelog@lists.xenproject.org; Wed, 29 May 2024 22: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=oJEiXyUgxKasgRkW3Y5Loce9a66FdMxKc41fG89OfYU=; b=gzEIzb9FTm3aLQZghzlOMwDeqx ftwUWpIDB40Tc/c0RqJRxpSaUySzNvpY45cVeGgracNi7JgUYunTv6nT2fT0cLZ0IehnkW94zq1Jo WE3DXPntOwUEKmlV7uTjtREkbSQXnvab4blsU6DqypnH5vV/0kpUOvEgOYRL3qAJF33s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: address violations of MISRA C Rule 8.4 Message-Id: Date: Wed, 29 May 2024 22:33:32 +0000 commit 2bc462f645824a439879190ed19a231cb5b8034c Author: Nicola Vetrini AuthorDate: Wed May 29 09:57:28 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 09:57:28 2024 +0200 x86: address violations of MISRA C Rule 8.4 Rule 8.4 states: "A compatible declaration shall be visible when an object or function with external linkage is defined." These variables are only referenced from assembly code, so they need to be extern and there is negligible risk of them being used improperly without noticing. As a result, they can be exempted using a comment-based deviation. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- xen/arch/x86/desc.c | 1 + xen/arch/x86/mm.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/desc.c b/xen/arch/x86/desc.c index 39080ca672..9f63928154 100644 --- a/xen/arch/x86/desc.c +++ b/xen/arch/x86/desc.c @@ -91,6 +91,7 @@ seg_desc_t boot_compat_gdt[PAGE_SIZE / sizeof(seg_desc_t)] = * References boot_cpu_gdt_table for a short period, until the CPUs switch * onto their per-CPU GDTs. */ +/* SAF-1-safe */ const struct desc_ptr boot_gdtr = { .limit = LAST_RESERVED_GDT_BYTE, .base = (unsigned long)(boot_gdt - FIRST_RESERVED_GDT_ENTRY), diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d968bbbc73..17987eb519 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -144,7 +144,7 @@ l1_pgentry_t __section(".bss.page_aligned") __aligned(PAGE_SIZE) l1_fixmap[L1_PAGETABLE_ENTRIES]; l1_pgentry_t __section(".bss.page_aligned") __aligned(PAGE_SIZE) - l1_fixmap_x[L1_PAGETABLE_ENTRIES]; + l1_fixmap_x[L1_PAGETABLE_ENTRIES]; /* SAF-1-safe */ bool __read_mostly machine_to_phys_mapping_valid; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 30 08:11:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 08:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732534.1138516 (Exim 4.92) (envelope-from ) id 1sCasI-0000Je-RF; Thu, 30 May 2024 08:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732534.1138516; Thu, 30 May 2024 08:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasI-0000JW-Ob; Thu, 30 May 2024 08:11:02 +0000 Received: by outflank-mailman (input) for mailman id 732534; Thu, 30 May 2024 08:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasH-0000JQ-U6 for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasH-0002jh-T7 for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCasH-0007Ab-RK for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NYpYqFTDKxBVos9fJE1caVhDQIRbVoNr372AAIAtRuQ=; b=gkhWC7+7M/EOdfDKHg6EitAW3D m3YxQLLsEkA6nxNJFcKsHbLzURQlX33YfMqETjhGjhEoBwf4fkcILN9igZtPn2x0g2t4AeSBxpV32 4Olmba1/sOxAh0UkX+3hd9/MMThUxu8l1PrcUXtztRoj5G77VSkwCfQ8XnxPrbGXfnCA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Introduce CONFIG_SELF_TESTS Message-Id: Date: Thu, 30 May 2024 08:11:01 +0000 commit 0840bc5ea114f536a4bdfb2ca095b79f2069aae6 Author: Andrew Cooper AuthorDate: Tue May 28 15:11:54 2024 +0100 Commit: Andrew Cooper CommitDate: Wed May 29 10:44:03 2024 +0100 xen: Introduce CONFIG_SELF_TESTS ... and move x86's stub_selftest() under this new option. There is value in having these tests included in release builds too. It will shortly be used to gate the bitops unit tests on all architectures. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/Kconfig.debug | 6 ++++++ xen/arch/x86/extable.c | 4 ++-- xen/arch/x86/setup.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index 61b24ac552..07ff7eb7ba 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -29,6 +29,12 @@ config FRAME_POINTER maybe slower, but it gives very useful debugging information in case of any Xen bugs. +config SELF_TESTS + bool "Extra self-testing" + default DEBUG + help + Enable extra unit and functional testing. + config COVERAGE bool "Code coverage support" depends on !LIVEPATCH diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 8415cd1fa2..705cf9eb94 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -144,7 +144,7 @@ search_exception_table(const struct cpu_user_regs *regs, unsigned long *stub_ra) return 0; } -#ifdef CONFIG_DEBUG +#ifdef CONFIG_SELF_TESTS #include #include @@ -214,7 +214,7 @@ int __init cf_check stub_selftest(void) return 0; } __initcall(stub_selftest); -#endif +#endif /* CONFIG_SELF_TESTS */ unsigned long asmlinkage search_pre_exception_table(struct cpu_user_regs *regs) { diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index b50c9c84af..dd51e68dbe 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -742,7 +742,7 @@ static void noreturn init_done(void) system_state = SYS_STATE_active; /* Re-run stub recovery self-tests with CET-SS active. */ - if ( IS_ENABLED(CONFIG_DEBUG) && cpu_has_xen_shstk ) + if ( IS_ENABLED(CONFIG_SELF_TESTS) && cpu_has_xen_shstk ) stub_selftest(); domain_unpause_by_systemcontroller(dom0); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 30 08:11:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 08:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732535.1138520 (Exim 4.92) (envelope-from ) id 1sCasS-0000LQ-T4; Thu, 30 May 2024 08:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732535.1138520; Thu, 30 May 2024 08:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasS-0000LE-QB; Thu, 30 May 2024 08:11:12 +0000 Received: by outflank-mailman (input) for mailman id 732535; Thu, 30 May 2024 08:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasS-0000L4-1c for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasS-0002kL-02 for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCasR-0007BR-VF for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bg8qKD0j9HPKv1nQZdU6MTt6ue6vp0k3O86AocI7O/8=; b=xP5qjdh3t3XuLiIqruhW8gMUzu LmN9kzOCAAqpz9GwxjzwrIJM5Ld/NrBjPIXDTa4SgQXB9eAQqdISejEgNNrDWE2LSP4uVHtN1JKBe HMSN6kihGtY3cNTKsiiVUUSC2KuBzZlkG5wFCsn5NlcP79fD7tVeYcROPiHPcMtmrAl8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: account number of foreign mappings in the p2m Message-Id: Date: Thu, 30 May 2024 08:11:11 +0000 commit 8ef1e96a04fb177c89791749234d873ac883a92a Author: Roger Pau Monné AuthorDate: Wed May 29 16:07:55 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 16:07:55 2024 +0200 xen/x86: account number of foreign mappings in the p2m Such information will be needed in order to remove foreign mappings during teardown for HVM guests. Right now the introduced counter is not consumed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/x86/include/asm/p2m.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 111badf89a..107b9f2608 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -380,6 +380,9 @@ struct p2m_domain { unsigned int flags; unsigned long entry_count; } ioreq; + + /* Number of foreign mappings. */ + unsigned long nr_foreign; #endif /* CONFIG_HVM */ }; @@ -1049,6 +1052,8 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt, if ( !page_get_owner_and_reference(mfn_to_page(nfn)) ) return -EBUSY; + p2m->nr_foreign++; + break; default: @@ -1069,6 +1074,7 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt, return -EINVAL; } put_page(mfn_to_page(ofn)); + p2m->nr_foreign--; break; default: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 30 08:11:22 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 08:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732537.1138525 (Exim 4.92) (envelope-from ) id 1sCasc-0000Nv-UO; Thu, 30 May 2024 08:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732537.1138525; Thu, 30 May 2024 08:11:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasc-0000Nn-Rd; Thu, 30 May 2024 08:11:22 +0000 Received: by outflank-mailman (input) for mailman id 732537; Thu, 30 May 2024 08:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasc-0000Nh-6J for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasc-0002kU-4l for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCasc-0007C6-2u for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OusUOKs6I0MwfaWLsAApaxH4IBdcqxesEORGpXY2zoA=; b=bfoV71Q0erq2gHUgY2apvbRxXR cuP0upHISH70yi9eD8GA08Clr0I6UsF38ra9kneFgCSIIMM1lYA8u6cDeGBKZiSdvh3Q0Lx4iKvlM nSGH+Zz/93wG07y/vE2RB9qY01CX39z4N96NdOAMfgTwgkgkIefcKITDRJOD7HJZXGOI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: enable altp2m at create domain domctl Message-Id: Date: Thu, 30 May 2024 08:11:22 +0000 commit 0291089f6ea81690f37035a124d54c51fa7ba097 Author: Roger Pau Monné AuthorDate: Wed May 29 16:10:04 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 16:10:04 2024 +0200 xen: enable altp2m at create domain domctl Enabling it using an HVM param is fragile, and complicates the logic when deciding whether options that interact with altp2m can also be enabled. Leave the HVM param value for consumption by the guest, but prevent it from being set. Enabling is now done using and additional altp2m specific field in xen_domctl_createdomain. Note that albeit only currently implemented in x86, altp2m could be implemented in other architectures, hence why the field is added to xen_domctl_createdomain instead of xen_arch_domainconfig. Signed-off-by: Roger Pau Monné Acked-by: Christian Lindig Reviewed-by: Jan Beulich # hypervisor Acked-by: Stefano Stabellini Reviewed-by: Juergen Gross # tools/libs/ Release-acked-by: Oleksii Kurochko --- tools/libs/light/libxl_create.c | 23 ++++++++++++++++++++++- tools/libs/light/libxl_x86.c | 26 ++++++++++++-------------- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- xen/arch/arm/domain.c | 6 ++++++ xen/arch/x86/domain.c | 22 ++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 23 ++++++++++++++++++++++- xen/include/public/domctl.h | 18 ++++++++++++++++++ xen/include/public/hvm/params.h | 9 ++------- 8 files changed, 105 insertions(+), 24 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 41252ec553..edeadd57ef 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -372,7 +372,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->u.hvm.viridian, false); libxl_defbool_setdefault(&b_info->u.hvm.hpet, true); libxl_defbool_setdefault(&b_info->u.hvm.vpt_align, true); - libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); libxl_defbool_setdefault(&b_info->u.hvm.usb, false); libxl_defbool_setdefault(&b_info->u.hvm.vkb_device, true); libxl_defbool_setdefault(&b_info->u.hvm.xen_platform_pci, true); @@ -678,6 +677,28 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, if (info->passthrough == LIBXL_PASSTHROUGH_SYNC_PT) create.iommu_opts |= XEN_DOMCTL_IOMMU_no_sharept; + LOG(DETAIL, "altp2m: %s", libxl_altp2m_mode_to_string(b_info->altp2m)); + switch(b_info->altp2m) { + case LIBXL_ALTP2M_MODE_MIXED: + create.altp2m_opts |= + XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_mixed); + break; + + case LIBXL_ALTP2M_MODE_EXTERNAL: + create.altp2m_opts |= + XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_external); + break; + + case LIBXL_ALTP2M_MODE_LIMITED: + create.altp2m_opts |= + XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_limited); + break; + + case LIBXL_ALTP2M_MODE_DISABLED: + /* Nothing to do - altp2m disabled is signaled as mode == 0. */ + break; + } + /* Ultimately, handle is an array of 16 uint8_t, same as uuid */ libxl_uuid_copy(ctx, (libxl_uuid *)&create.handle, &info->uuid); diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index a50ec37eb3..60643d6f53 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -407,19 +407,9 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid, libxl_ctx *ctx = libxl__gc_owner(gc); xc_interface *xch = ctx->xch; int ret = ERROR_FAIL; - unsigned int altp2m = info->altp2m; switch(info->type) { case LIBXL_DOMAIN_TYPE_HVM: - /* The config parameter "altp2m" replaces the parameter "altp2mhvm". For - * legacy reasons, both parameters are accepted on x86 HVM guests. - * - * If the legacy field info->u.hvm.altp2m is set, activate altp2m. - * Otherwise set altp2m based on the field info->altp2m. */ - if (info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && - libxl_defbool_val(info->u.hvm.altp2m)) - altp2m = libxl_defbool_val(info->u.hvm.altp2m); - if (xc_hvm_param_set(xch, domid, HVM_PARAM_HPET_ENABLED, libxl_defbool_val(info->u.hvm.hpet))) { LOG(ERROR, "Couldn't set HVM_PARAM_HPET_ENABLED"); @@ -444,10 +434,6 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid, LOG(ERROR, "Couldn't set HVM_PARAM_TIMER_MODE"); goto out; } - if (xc_hvm_param_set(xch, domid, HVM_PARAM_ALTP2M, altp2m)) { - LOG(ERROR, "Couldn't set HVM_PARAM_ALTP2M"); - goto out; - } break; default: @@ -818,6 +804,18 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->acpi, true); libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false); + /* + * The config parameter "altp2m" replaces the parameter "altp2mhvm". + * For legacy reasons, both parameters are accepted on x86 HVM guests. + * + * If the legacy field info->u.hvm.altp2m is set, activate altp2m. + * Otherwise set altp2m based on the field info->altp2m. + */ + libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false); + if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED && + libxl_defbool_val(b_info->u.hvm.altp2m)) + b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m); + return 0; } diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 2b6d3c09df..c6da9bb091 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -257,7 +257,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co #if defined(__i386__) || defined(__x86_64__) /* Quick & dirty check for ABI changes. */ - BUILD_BUG_ON(sizeof(cfg) != 64); + BUILD_BUG_ON(sizeof(cfg) != 68); /* Mnemonics for the named fields inside xen_x86_arch_domainconfig */ #define VAL_EMUL_FLAGS Field(arch_domconfig, 0) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 34cbfe699a..8bde2f730d 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -688,6 +688,12 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( config->altp2m_opts ) + { + dprintk(XENLOG_INFO, "Altp2m not supported\n"); + return -EINVAL; + } + return 0; } diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 00a3aaa576..1988f5e19a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -637,6 +637,8 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) bool hap = config->flags & XEN_DOMCTL_CDF_hap; bool nested_virt = config->flags & XEN_DOMCTL_CDF_nested_virt; unsigned int max_vcpus; + unsigned int altp2m_mode = MASK_EXTR(config->altp2m_opts, + XEN_DOMCTL_ALTP2M_mode_mask); if ( hvm ? !hvm_enabled : !IS_ENABLED(CONFIG_PV) ) { @@ -715,6 +717,26 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( config->altp2m_opts & ~XEN_DOMCTL_ALTP2M_mode_mask ) + { + dprintk(XENLOG_INFO, "Invalid altp2m options selected: %#x\n", + config->flags); + return -EINVAL; + } + + if ( altp2m_mode && nested_virt ) + { + dprintk(XENLOG_INFO, + "Nested virt and altp2m are not supported together\n"); + return -EINVAL; + } + + if ( altp2m_mode && !hap ) + { + dprintk(XENLOG_INFO, "altp2m is only supported with HAP\n"); + return -EINVAL; + } + return 0; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2c66fe0f7a..8334ab1711 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -658,6 +658,22 @@ int hvm_domain_initialise(struct domain *d, d->arch.hvm.params[HVM_PARAM_TRIPLE_FAULT_REASON] = SHUTDOWN_reboot; + /* Set altp2m based on domctl flags. */ + switch ( MASK_EXTR(config->altp2m_opts, XEN_DOMCTL_ALTP2M_mode_mask) ) + { + case XEN_DOMCTL_ALTP2M_mixed: + d->arch.hvm.params[HVM_PARAM_ALTP2M] = XEN_ALTP2M_mixed; + break; + + case XEN_DOMCTL_ALTP2M_external: + d->arch.hvm.params[HVM_PARAM_ALTP2M] = XEN_ALTP2M_external; + break; + + case XEN_DOMCTL_ALTP2M_limited: + d->arch.hvm.params[HVM_PARAM_ALTP2M] = XEN_ALTP2M_limited; + break; + } + vpic_init(d); rc = vioapic_init(d); @@ -4166,6 +4182,12 @@ static int hvm_allow_set_param(struct domain *d, case HVM_PARAM_CONSOLE_EVTCHN: case HVM_PARAM_X87_FIP_WIDTH: break; + + /* The following parameters are read-only. */ + case HVM_PARAM_ALTP2M: + rc = -EEXIST; + break; + /* The following parameters are deprecated. */ case HVM_PARAM_PAE_ENABLED: case HVM_PARAM_DM_DOMAIN: @@ -4207,7 +4229,6 @@ static int hvm_allow_set_param(struct domain *d, case HVM_PARAM_BUFIOREQ_PFN: case HVM_PARAM_IOREQ_SERVER_PFN: case HVM_PARAM_NR_IOREQ_SERVER_PAGES: - case HVM_PARAM_ALTP2M: case HVM_PARAM_MCA_CAP: if ( value != 0 && new_value != value ) rc = -EEXIST; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 6cd39ea46d..2a49fe46ce 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -86,6 +86,24 @@ struct xen_domctl_createdomain { uint32_t grant_opts; +/* + * Enable altp2m mixed mode. + * + * Note that 'mixed' mode has not been evaluated for safety from a security + * perspective. Before using this mode in a security-critical environment, + * each subop should be evaluated for safety, with unsafe subops blacklisted in + * XSM. + */ +#define XEN_DOMCTL_ALTP2M_mixed (1U) +/* Enable altp2m external mode. */ +#define XEN_DOMCTL_ALTP2M_external (2U) +/* Enable altp2m limited mode. */ +#define XEN_DOMCTL_ALTP2M_limited (3U) +/* Altp2m mode signaling uses bits [0, 1]. */ +#define XEN_DOMCTL_ALTP2M_mode_mask (0x3U) +#define XEN_DOMCTL_ALTP2M_mode(m) ((m) & XEN_DOMCTL_ALTP2M_mode_mask) + uint32_t altp2m_opts; + /* Per-vCPU buffer size in bytes. 0 to disable. */ uint32_t vmtrace_size; diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index a22b4ed45d..99c40b4287 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -246,16 +246,11 @@ #define HVM_PARAM_VM_GENERATION_ID_ADDR 34 /* - * Set mode for altp2m: - * disabled: don't activate altp2m (default) + * Get mode for altp2m: + * disabled: altp2m not active (default) * mixed: allow access to all altp2m ops for both in-guest and external tools * external: allow access to external privileged tools only * limited: guest only has limited access (ie. control VMFUNC and #VE) - * - * Note that 'mixed' mode has not been evaluated for safety from a - * security perspective. Before using this mode in a - * security-critical environment, each subop should be evaluated for - * safety, with unsafe subops blacklisted in XSM. */ #define HVM_PARAM_ALTP2M 35 #define XEN_ALTP2M_disabled 0 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 30 08:11:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 08:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732539.1138528 (Exim 4.92) (envelope-from ) id 1sCasm-0000Qf-Vq; Thu, 30 May 2024 08:11:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732539.1138528; Thu, 30 May 2024 08:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasm-0000QV-T7; Thu, 30 May 2024 08:11:32 +0000 Received: by outflank-mailman (input) for mailman id 732539; Thu, 30 May 2024 08:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasm-0000QP-9A for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasm-0002ke-8I for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCasm-0007DA-7B for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BBN+ivTChiHljVAqMzglA9J4NUhMeltrgZTrKByZz0Y=; b=DXXnFO1vQs4wYB1XOZ0XG6IHYv 9GeQ9pbr+OW4dCj55lL855+5669ACTbtUvhOejHnY/PCzwXqeBF4qHn+28qwdT7Q2U+7H0ackecn5 JepBKcoOl/KkolmSlMvMnlpivTcUzSvUb3Dsf/YA7Jfail2xCIKcDv6PHnKQ9wSqly4s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/x86: remove foreign mappings from the p2m on teardown Message-Id: Date: Thu, 30 May 2024 08:11:32 +0000 commit 845a60b63be11acfe435e2bd83ceebb0acc76d62 Author: Roger Pau Monné AuthorDate: Wed May 29 16:11:19 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 16:11:19 2024 +0200 xen/x86: remove foreign mappings from the p2m on teardown Iterate over the p2m up to the maximum recorded gfn and remove any foreign mappings, in order to drop the underlying page references and thus don't keep extra page references if a domain is destroyed while still having foreign mappings on it's p2m. The logic is similar to the one used on Arm. Note that foreign mappings cannot be created by guests that have altp2m or nested HVM enabled, as p2ms different than the host one are not currently scrubbed when destroyed in order to drop references to any foreign maps. It's unclear whether the right solution is to take an extra reference when foreign maps are added to p2ms different than the host one, or just rely on the host p2m already having a reference. The mapping being removed from the host p2m should cause it to be dropped on all domain p2ms. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- CHANGELOG.md | 1 + xen/arch/x86/domain.c | 6 ++++ xen/arch/x86/include/asm/p2m.h | 26 ++++++++-------- xen/arch/x86/mm/p2m-basic.c | 18 +++++++++++ xen/arch/x86/mm/p2m.c | 68 +++++++++++++++++++++++++++++++++++++++--- 5 files changed, 103 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 579329ff71..201478aa1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - On x86: - HVM PIRQs are disabled by default. - Reduce IOMMU setup time for hardware domain. + - Allow HVM/PVH domains to map foreign pages. - xl/libxl configures vkb=[] for HVM domains with priority over vkb_device. - Increase the maximum number of CPUs Xen can be built for from 4095 to 16383. diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1988f5e19a..536542841e 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2387,6 +2387,7 @@ int domain_relinquish_resources(struct domain *d) enum { PROG_iommu_pagetables = 1, PROG_shared, + PROG_mappings, PROG_paging, PROG_vcpu_pagetables, PROG_xen, @@ -2435,6 +2436,11 @@ int domain_relinquish_resources(struct domain *d) } #endif + PROGRESS(mappings): + ret = relinquish_p2m_mapping(d); + if ( ret ) + return ret; + PROGRESS(paging): /* Tear down paging-assistance stuff. */ diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 107b9f2608..c1478ffc36 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -383,6 +383,8 @@ struct p2m_domain { /* Number of foreign mappings. */ unsigned long nr_foreign; + /* Cursor for iterating over the p2m on teardown. */ + unsigned long teardown_gfn; #endif /* CONFIG_HVM */ }; @@ -395,16 +397,7 @@ struct p2m_domain { #endif #include -static inline bool arch_acquire_resource_check(struct domain *d) -{ - /* - * FIXME: Until foreign pages inserted into the P2M are properly - * reference counted, it is unsafe to allow mapping of - * resource pages unless the caller is the hardware domain - * (see set_foreign_p2m_entry()). - */ - return !paging_mode_translate(d) || is_hardware_domain(d); -} +bool arch_acquire_resource_check(const struct domain *d); /* * Updates vCPU's n2pm to match its np2m_base in VMCx12 and returns that np2m. @@ -720,6 +713,10 @@ p2m_pod_offline_or_broken_hit(struct page_info *p); void p2m_pod_offline_or_broken_replace(struct page_info *p); +/* Perform cleanup of p2m mappings ahead of teardown. */ +int +relinquish_p2m_mapping(struct domain *d); + #else static inline bool @@ -748,6 +745,11 @@ static inline void p2m_pod_offline_or_broken_replace(struct page_info *p) ASSERT_UNREACHABLE(); } +static inline int relinquish_p2m_mapping(struct domain *d) +{ + return 0; +} + #endif @@ -1043,7 +1045,7 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt, break; case p2m_map_foreign: - if ( !mfn_valid(nfn) ) + if ( !mfn_valid(nfn) || p2m != p2m_get_hostp2m(p2m->domain) ) { ASSERT_UNREACHABLE(); return -EINVAL; @@ -1068,7 +1070,7 @@ static inline int p2m_entry_modify(struct p2m_domain *p2m, p2m_type_t nt, break; case p2m_map_foreign: - if ( !mfn_valid(ofn) ) + if ( !mfn_valid(ofn) || p2m != p2m_get_hostp2m(p2m->domain) ) { ASSERT_UNREACHABLE(); return -EINVAL; diff --git a/xen/arch/x86/mm/p2m-basic.c b/xen/arch/x86/mm/p2m-basic.c index 8599bd15c6..25d27a0a9f 100644 --- a/xen/arch/x86/mm/p2m-basic.c +++ b/xen/arch/x86/mm/p2m-basic.c @@ -13,6 +13,8 @@ #include #include +#include +#include #include #include "mm-locks.h" #include "p2m.h" @@ -207,6 +209,22 @@ void p2m_final_teardown(struct domain *d) p2m_teardown_hostp2m(d); } +bool arch_acquire_resource_check(const struct domain *d) +{ + /* + * altp2m is not supported as we would otherwise also need to walk the + * altp2m tables and drop any foreign map entries in order to drop the page + * reference. + * + * The same applies to nestedhvm nested p2m tables, as the type from the L0 + * p2m is replicated into the L1 p2m, and there's no filtering that + * prevents foreign mappings from being created in nestedp2m. + */ + return is_pv_domain(d) || + (d->arch.hvm.params[HVM_PARAM_ALTP2M] == XEN_ALTP2M_disabled && + !nestedhvm_enabled(d)); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index db5d9b6c2a..e7e327d6a6 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1862,10 +1862,6 @@ static int p2m_add_foreign(struct domain *tdom, unsigned long fgfn, int rc; struct domain *fdom; - /* - * hvm fixme: until support is added to p2m teardown code to cleanup any - * foreign entries, limit this to hardware domain only. - */ if ( !arch_acquire_resource_check(tdom) ) return -EPERM; @@ -2069,6 +2065,70 @@ int xenmem_add_to_physmap_one( return rc; } +/* + * Remove foreign mappings from the p2m, as that drops the page reference taken + * when mapped. + */ +int relinquish_p2m_mapping(struct domain *d) +{ + struct p2m_domain *p2m = p2m_get_hostp2m(d); + unsigned long gfn, count = 0; + int rc = 0; + + if ( !paging_mode_translate(d) ) + return 0; + + BUG_ON(!d->is_dying); + + p2m_lock(p2m); + + gfn = p2m->teardown_gfn; + + /* Iterate over the whole p2m on debug builds to ensure correctness. */ + while ( gfn <= p2m->max_mapped_pfn && + (IS_ENABLED(CONFIG_DEBUG) || p2m->nr_foreign) ) + { + unsigned int order; + p2m_type_t t; + p2m_access_t a; + + _get_gfn_type_access(p2m, _gfn(gfn), &t, &a, 0, &order, 0); + ASSERT(IS_ALIGNED(gfn, 1UL << order)); + + if ( t == p2m_map_foreign ) + { + ASSERT(p2m->nr_foreign); + ASSERT(order == 0); + + rc = p2m_set_entry(p2m, _gfn(gfn), INVALID_MFN, order, p2m_invalid, + p2m->default_access); + if ( rc ) + { + printk(XENLOG_ERR + "%pd: failed to unmap foreign page %" PRI_gfn " order %u error %d\n", + d, gfn, order, rc); + ASSERT_UNREACHABLE(); + break; + } + } + + gfn += 1UL << order; + + if ( !(++count & 0xff) && hypercall_preempt_check() ) + { + rc = -ERESTART; + break; + } + } + + ASSERT(gfn <= p2m->max_mapped_pfn || !p2m->nr_foreign); + p2m->teardown_gfn = gfn; + + p2m_unlock(p2m); + + return rc; +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 30 08:11:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 08:11:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732540.1138532 (Exim 4.92) (envelope-from ) id 1sCasx-0000Tr-2V; Thu, 30 May 2024 08:11:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732540.1138532; Thu, 30 May 2024 08:11:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasw-0000Tk-Vw; Thu, 30 May 2024 08:11:42 +0000 Received: by outflank-mailman (input) for mailman id 732540; Thu, 30 May 2024 08:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasw-0000Te-Cv for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCasw-0002kn-BK for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCasw-0007Dz-AX for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 08: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=iDS8eJYr+68XqrfRf/DcmCsKGHlHNXLUkH9Jv9O1Li8=; b=YsfKJb4qyhmvXBzrD9dXYoH4hY WZhHebv9OK6FgqGgnIn1umusN4oZWAxHGJeDgJzfge+mD5mMQ6C+mr+CTBf+eijJaeSAdF9XX88m6 kwCfpjs95PBr9TceqL0RFMwZPRqw8X+GmZK9P6DYtdIb+mmy9T04PWUVjCxDQumc2B7c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Partial revert of "x86/MCE: optional build of AMD/Intel MCE code" Message-Id: Date: Thu, 30 May 2024 08:11:42 +0000 commit 12f9599a3b135afa270ccf0795f3e9665059955d Author: Andrew Cooper AuthorDate: Wed May 29 16:11:45 2024 +0200 Commit: Jan Beulich CommitDate: Wed May 29 16:11:45 2024 +0200 Partial revert of "x86/MCE: optional build of AMD/Intel MCE code" {cmci,lmce}_support are written during S3 resume, so cannot live in __ro_after_init. Move them back to being __read_mostly, as they were originally. Link: https://gitlab.com/xen-project/xen/-/jobs/6966698361 Fixes: 19b6e9f9149f ("x86/MCE: optional build of AMD/Intel MCE code") Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Release-Acked-by: Oleksii Kurochko --- xen/arch/x86/cpu/mcheck/mce.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 1664ca6412..32c1b2756b 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -38,10 +38,10 @@ DEFINE_PER_CPU_READ_MOSTLY(unsigned int, nr_mce_banks); unsigned int __read_mostly firstbank; unsigned int __read_mostly ppin_msr; uint8_t __read_mostly cmci_apic_vector; -bool __ro_after_init cmci_support; +bool __read_mostly cmci_support; /* If mce_force_broadcast == 1, lmce_support will be disabled forcibly. */ -bool __ro_after_init lmce_support; +bool __read_mostly lmce_support; DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, poll_bankmask); DEFINE_PER_CPU_READ_MOSTLY(struct mca_banks *, no_cmci_banks); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 30 11:22:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 11:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732679.1138706 (Exim 4.92) (envelope-from ) id 1sCdrA-0000Dy-79; Thu, 30 May 2024 11:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732679.1138706; Thu, 30 May 2024 11:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrA-0000Dp-40; Thu, 30 May 2024 11:22:04 +0000 Received: by outflank-mailman (input) for mailman id 732679; Thu, 30 May 2024 11:22:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdr9-0000DB-JU for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdr9-0005x1-Hc for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCdr9-0002HU-GY for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IazVyvdfEXuqaMvdBidb2greOVG3Pk5ccYi/FxLVjJU=; b=1Q0jCD+04zudDNT2NLOWCzL20S 45y3rb6+czhJod0v4J0EvmBi8dJLkMsFVr7M+liwXQf9cYQoygFZb6ki6U76MhMx5KdOxQhYVTdc1 dEYfTzn+jYajZDQ2aSQRyCCTF86X4ASJSqop+j05YQLp/shxMO+DTVjLUOtOPL293Bj4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: (Actually) drop libsystemd as a dependency Message-Id: Date: Thu, 30 May 2024 11:22:03 +0000 commit 6ef4fa1e7fe78c1dae07b451292b07facfce4902 Author: Andrew Cooper AuthorDate: Thu May 30 11:02:16 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 30 12:15:25 2024 +0100 tools: (Actually) drop libsystemd as a dependency When reinstating some of systemd.m4 between v1 and v2, I reintroduced a little too much. While {c,o}xenstored are indeed no longer linked against libsystemd, ./configure still looks for it. Drop this too. Fixes: ae26101f6bfc ("tools: Drop libsystemd as a dependency") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- m4/systemd.m4 | 8 -- tools/configure | 229 +------------------------------------------------------- 2 files changed, 1 insertion(+), 236 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index e4fe51a8ba..ab12ea313d 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -86,13 +86,6 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ ],[systemd=n]) ]) -AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"],[ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], - [systemd="y"],[systemd="n"]) - ]) -]) - dnl Enables systemd by default and requires a --disable-systemd option flag dnl to configure if you want to disable. AC_DEFUN([AX_ENABLE_SYSTEMD], [ @@ -112,6 +105,5 @@ dnl to have systemd build libraries it will be enabled. You can always force dnl disable with --disable-systemd AC_DEFUN([AX_AVAILABLE_SYSTEMD], [ AX_ALLOW_SYSTEMD_OPTS() - AX_CHECK_SYSTEMD_ENABLE_AVAILABLE() AX_CHECK_SYSTEMD() ]) diff --git a/tools/configure b/tools/configure index b8faa1d520..459bfb5652 100755 --- a/tools/configure +++ b/tools/configure @@ -626,8 +626,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS pvshim ninepfs -SYSTEMD_LIBS -SYSTEMD_CFLAGS SYSTEMD_MODULES_LOAD SYSTEMD_DIR systemd @@ -864,9 +862,7 @@ pixman_LIBS libzstd_CFLAGS libzstd_LIBS LIBNL3_CFLAGS -LIBNL3_LIBS -SYSTEMD_CFLAGS -SYSTEMD_LIBS' +LIBNL3_LIBS' # Initialize some variables set by options. @@ -1621,10 +1617,6 @@ Some influential environment variables: LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config - SYSTEMD_CFLAGS - C compiler flags for SYSTEMD, overriding pkg-config - SYSTEMD_LIBS - linker flags for SYSTEMD, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -3889,8 +3881,6 @@ esac - - @@ -9540,223 +9530,6 @@ fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - systemd="n" -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - systemd="n" -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd="y" -fi - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - systemd="n" -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - systemd="n" -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd="y" -fi - -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd="y" -fi - - if test "x$enable_systemd" != "xno"; then : if test "x$systemd" = "xy" ; then : -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 30 11:22:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 11:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732680.1138710 (Exim 4.92) (envelope-from ) id 1sCdrK-0000GG-7w; Thu, 30 May 2024 11:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732680.1138710; Thu, 30 May 2024 11:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrK-0000G8-5O; Thu, 30 May 2024 11:22:14 +0000 Received: by outflank-mailman (input) for mailman id 732680; Thu, 30 May 2024 11:22:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrJ-0000Fy-Ly for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrJ-0005x9-LA for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCdrJ-0002Hx-Jl for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QTIbVeiR5BcElbQXyfv7yRcUbyR+aIIv2UB0U/dOkjw=; b=ZOe2Sju3hqoiBxT718YPISvgYl ccN8pMfDElV1iSY42hzQ9DFQqOtnoOlR4uQGAEyN4fjgKxTHGJsObFYXqQCYL1EYhMOb0rsDhiBl/ d4dB1I3n+ANy6sCqjiHvBczXUJdG0vb0ER9DvyZAuVjNbaqJ3cqyZt78oXGun/rZRCp8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] ppc/boot: Run constructors on boot Message-Id: Date: Thu, 30 May 2024 11:22:13 +0000 commit e807b137f7e75fa3d78137a6c95b689630a72727 Author: Andrew Cooper AuthorDate: Fri May 24 11:38:37 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 30 12:15:25 2024 +0100 ppc/boot: Run constructors on boot PPC collects constructors, but doesn't run them yet. Do so. They'll shortly be used to confirm correct behaviour of the bitops primitives. Signed-off-by: Andrew Cooper Acked-by: Shawn Anastasio Release-acked-by: Oleksii Kurochko --- xen/arch/ppc/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/ppc/setup.c b/xen/arch/ppc/setup.c index 101bdd8bb6..7fe06aa4bf 100644 --- a/xen/arch/ppc/setup.c +++ b/xen/arch/ppc/setup.c @@ -39,6 +39,8 @@ void __init noreturn start_xen(unsigned long r3, unsigned long r4, setup_initial_pagetables(); + init_constructors(); + early_printk("Hello, ppc64le!\n"); for ( ; ; ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 30 11:22:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 11:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732681.1138714 (Exim 4.92) (envelope-from ) id 1sCdrU-0000Jn-9j; Thu, 30 May 2024 11:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732681.1138714; Thu, 30 May 2024 11:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrU-0000Jf-6r; Thu, 30 May 2024 11:22:24 +0000 Received: by outflank-mailman (input) for mailman id 732681; Thu, 30 May 2024 11:22:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrT-0000JO-PQ for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrT-0005xW-Oh for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCdrT-0002IO-NN for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OnGQVaji4QaPUQJHCvEixZU/q7dPnEFcgXdrd0Mh+Kc=; b=zJkccfJG0L+0PZRWiszgHpZfY9 NfQyi1XThxzTjnjrw/4xtuAmSUfNtklnKqf48Be9CiS0MwCnASZMxUjNGXckFPe7Kfy7Avs+0l4+K I2Pt+QWS1e7Wxrr6YOKtzEROOwbra2TLaKjqDf9w9ZHaQApyoyKWcc3QS3A/w5uGXMXM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/page_alloc: Coerce min(flsl(), foo) expressions to being unsigned Message-Id: Date: Thu, 30 May 2024 11:22:23 +0000 commit 1773a74469c8439b127327e4bf204a91b6bb2aa2 Author: Andrew Cooper AuthorDate: Fri May 24 13:36:15 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 30 12:15:25 2024 +0100 xen/page_alloc: Coerce min(flsl(), foo) expressions to being unsigned This is in order to maintain bisectability through the subsequent changes, where flsl() changes sign-ness non-atomically by architecture. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/common/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7c1bdfc046..8d3342e952 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1842,7 +1842,7 @@ static void _init_heap_pages(const struct page_info *pg, * Note that the value of ffsl() and flsl() starts from 1 so we need * to decrement it by 1. */ - unsigned int inc_order = min(MAX_ORDER, flsl(e - s) - 1); + unsigned int inc_order = min(MAX_ORDER + 0U, flsl(e - s) - 1U); if ( s ) inc_order = min(inc_order, ffsl(s) - 1U); @@ -2266,7 +2266,7 @@ void __init xenheap_max_mfn(unsigned long mfn) ASSERT(!first_node_initialised); ASSERT(!xenheap_bits); BUILD_BUG_ON((PADDR_BITS - PAGE_SHIFT) >= BITS_PER_LONG); - xenheap_bits = min(flsl(mfn + 1) - 1 + PAGE_SHIFT, PADDR_BITS); + xenheap_bits = min(flsl(mfn + 1) - 1U + PAGE_SHIFT, PADDR_BITS + 0U); printk(XENLOG_INFO "Xen heap: %u bits\n", xenheap_bits); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 30 11:22:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 30 May 2024 11:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.732682.1138718 (Exim 4.92) (envelope-from ) id 1sCdre-0000MV-B5; Thu, 30 May 2024 11:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 732682.1138718; Thu, 30 May 2024 11:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdre-0000ML-8U; Thu, 30 May 2024 11:22:34 +0000 Received: by outflank-mailman (input) for mailman id 732682; Thu, 30 May 2024 11:22:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrd-0000MF-Te for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCdrd-0005xe-Ss for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCdrd-0002Ir-Ra for xen-changelog@lists.xenproject.org; Thu, 30 May 2024 11:22:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=H7UkklIXxsat6rp0Bzn/cTPaJJygXjWgfhJSTar56qw=; b=a+55txleWYtKhjBze72g3WnYwI +dAHd2dhmW2x8Hniw17sup3AH9v1YbQ17GCDs9NOJTvQOXXREoFjoQKEOaz9/00iNbRdHYM77isNZ 5TLA4idnlzCBjnrLfEoXvwP12DhBphHCRddzxWB9HBAIo2jdTd7/59kIbvStphTbsywc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/bitops: Replace find_first_set_bit() with ffs()/ffsl() - 1 Message-Id: Date: Thu, 30 May 2024 11:22:33 +0000 commit 9a905d7dc65883af082532b4dc91ce0131e54047 Author: Andrew Cooper AuthorDate: Sat Mar 9 02:22:53 2024 +0000 Commit: Andrew Cooper CommitDate: Thu May 30 12:15:25 2024 +0100 xen/bitops: Replace find_first_set_bit() with ffs()/ffsl() - 1 find_first_set_bit() is a Xen-ism which has undefined behaviour with a 0 input. The latter is well defined with an input of 0, and is a found outside of Xen too. timer_sanitize_int_route(), pt_update_contig_markers() and set_iommu_ptes_present() are all already operating on unsigned int data, so switch straight to ffs(). The ffsl() in pvh_populate_memory_range() needs coercion to unsigned to keep the typecheck in min() happy in the short term. _init_heap_pages() is comparing the LSB of two different addresses, so the -1 cancels off both sides of the expression. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/x86/guest/xen/xen.c | 4 ++-- xen/arch/x86/hvm/dom0_build.c | 2 +- xen/arch/x86/hvm/hpet.c | 8 ++++---- xen/arch/x86/include/asm/pt-contig-markers.h | 2 +- xen/arch/x86/mm.c | 2 +- xen/arch/x86/mm/p2m-pod.c | 4 ++-- xen/common/page_alloc.c | 2 +- xen/common/softirq.c | 2 +- xen/drivers/passthrough/amd/iommu_map.c | 2 +- xen/drivers/passthrough/iommu.c | 4 ++-- xen/drivers/passthrough/x86/iommu.c | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index d9768cc952..7484b3f73a 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -168,14 +168,14 @@ static void cf_check xen_evtchn_upcall(void) while ( pending ) { - unsigned int l1 = find_first_set_bit(pending); + unsigned int l1 = ffsl(pending) - 1; unsigned long evtchn = xchg(&XEN_shared_info->evtchn_pending[l1], 0); __clear_bit(l1, &pending); evtchn &= ~XEN_shared_info->evtchn_mask[l1]; while ( evtchn ) { - unsigned int port = find_first_set_bit(evtchn); + unsigned int port = ffsl(evtchn) - 1; __clear_bit(port, &evtchn); port += l1 * BITS_PER_LONG; diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index b0cb96c3bc..6acbaceb94 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -139,7 +139,7 @@ static int __init pvh_populate_memory_range(struct domain *d, order = get_order_from_pages(end - start + 1); order = min(order ? order - 1 : 0, max_order); /* The order allocated and populated must be aligned to the address. */ - order = min(order, start ? find_first_set_bit(start) : MAX_ORDER); + order = min(order, start ? ffsl(start) - 1U : MAX_ORDER + 0U); page = alloc_domheap_pages(d, order, dom0_memflags | MEMF_no_scrub); if ( page == NULL ) { diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 12b00b7702..87642575f9 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -335,7 +335,7 @@ static void timer_sanitize_int_route(HPETState *h, unsigned int tn) * enabled pick the first irq. */ timer_config(h, tn) |= - MASK_INSR(find_first_set_bit(timer_int_route_cap(h, tn)), + MASK_INSR(ffs(timer_int_route_cap(h, tn)) - 1, HPET_TN_ROUTE); } @@ -409,7 +409,7 @@ static int cf_check hpet_write( { bool active; - i = find_first_set_bit(new_val); + i = ffsl(new_val) - 1; if ( i >= HPET_TIMER_NUM ) break; __clear_bit(i, &new_val); @@ -535,14 +535,14 @@ static int cf_check hpet_write( /* stop/start timers whos state was changed by this write. */ while (stop_timers) { - i = find_first_set_bit(stop_timers); + i = ffsl(stop_timers) - 1; __clear_bit(i, &stop_timers); hpet_stop_timer(h, i, guest_time); } while (start_timers) { - i = find_first_set_bit(start_timers); + i = ffsl(start_timers) - 1; __clear_bit(i, &start_timers); hpet_set_timer(h, i, guest_time); } diff --git a/xen/arch/x86/include/asm/pt-contig-markers.h b/xen/arch/x86/include/asm/pt-contig-markers.h index b3c1fe8035..1ad5c8fb6c 100644 --- a/xen/arch/x86/include/asm/pt-contig-markers.h +++ b/xen/arch/x86/include/asm/pt-contig-markers.h @@ -60,7 +60,7 @@ static bool pt_update_contig_markers(uint64_t *pt, unsigned int idx, /* Step 1: Reduce markers in lower numbered entries. */ while ( i ) { - b = find_first_set_bit(i); + b = ffs(i) - 1; i &= ~(1U << b); if ( GET_MARKER(pt[i]) <= b ) break; diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 17987eb519..648d6dd475 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3424,7 +3424,7 @@ static int vcpumask_to_pcpumask( { unsigned int cpu; - vcpu_id = find_first_set_bit(vmask); + vcpu_id = ffsl(vmask) - 1; vmask &= ~(1UL << vcpu_id); vcpu_id += vcpu_bias; if ( (vcpu_id >= d->max_vcpus) ) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 1c727c78c8..bd84fe9e27 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -684,7 +684,7 @@ unsigned long p2m_pod_decrease_reservation(struct domain *d, gfn_t gfn, unsigned int order) { unsigned long left = 1UL << order, ret = 0; - unsigned int chunk_order = find_first_set_bit(gfn_x(gfn) | left); + unsigned int chunk_order = ffsl(gfn_x(gfn) | left) - 1; do { ret += decrease_reservation(d, gfn, chunk_order); @@ -1393,7 +1393,7 @@ guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn, unsigned int order) { unsigned long left = 1UL << order; - unsigned int chunk_order = find_first_set_bit(gfn | left); + unsigned int chunk_order = ffsl(gfn | left) - 1; int rc; if ( !paging_mode_translate(d) ) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 8d3342e952..054b7edb39 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1819,7 +1819,7 @@ static void _init_heap_pages(const struct page_info *pg, if ( unlikely(!avail[nid]) ) { bool use_tail = IS_ALIGNED(s, 1UL << MAX_ORDER) && - (find_first_set_bit(e) <= find_first_set_bit(s)); + (ffsl(e) <= ffsl(s)); unsigned long n; n = init_node_heap(nid, s, nr_pages, &use_tail); diff --git a/xen/common/softirq.c b/xen/common/softirq.c index 321d26902d..bee4a82009 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -48,7 +48,7 @@ static void __do_softirq(unsigned long ignore_mask) || cpu_is_offline(cpu) ) break; - i = find_first_set_bit(pending); + i = ffsl(pending) - 1; clear_bit(i, &softirq_pending(cpu)); (*softirq_handlers[i])(); } diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index e0f4fe736a..1f0e416756 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -137,7 +137,7 @@ static void set_iommu_ptes_present(unsigned long pt_mfn, ASSERT(!pde->u); if ( pde > table ) - ASSERT(pde->ign0 == find_first_set_bit(pde - table)); + ASSERT(pde->ign0 == ffs(pde - table) - 1); else ASSERT(pde->ign0 == CONTIG_LEVEL_SHIFT); diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index ba18136c46..50bfd62553 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -305,7 +305,7 @@ static unsigned int mapping_order(const struct domain_iommu *hd, { unsigned long res = dfn_x(dfn) | mfn_x(mfn); unsigned long sizes = hd->platform_ops->page_sizes; - unsigned int bit = find_first_set_bit(sizes), order = 0; + unsigned int bit = ffsl(sizes) - 1, order = 0; ASSERT(bit == PAGE_SHIFT); @@ -313,7 +313,7 @@ static unsigned int mapping_order(const struct domain_iommu *hd, { unsigned long mask; - bit = find_first_set_bit(sizes); + bit = ffsl(sizes) - 1; mask = (1UL << bit) - 1; if ( nr <= mask || (res & mask) ) break; diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 304a2f5480..cc0062b027 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -641,7 +641,7 @@ struct page_info *iommu_alloc_pgtable(struct domain_iommu *hd, if ( contig_mask ) { /* See pt-contig-markers.h for a description of the marker scheme. */ - unsigned int i, shift = find_first_set_bit(contig_mask); + unsigned int i, shift = ffsl(contig_mask) - 1; ASSERT((CONTIG_LEVEL_SHIFT & (contig_mask >> shift)) == CONTIG_LEVEL_SHIFT); @@ -652,7 +652,7 @@ struct page_info *iommu_alloc_pgtable(struct domain_iommu *hd, for ( i = 4; i < PAGE_SIZE / sizeof(*p); i += 4 ) { - p[i + 0] = (find_first_set_bit(i) + 0ULL) << shift; + p[i + 0] = (ffsl(i) - 1ULL) << shift; p[i + 1] = 0; p[i + 2] = 1ULL << shift; p[i + 3] = 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 31 00:22:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 00:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733165.1139275 (Exim 4.92) (envelope-from ) id 1sCq21-0008OC-Vq; Fri, 31 May 2024 00:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733165.1139275; Fri, 31 May 2024 00:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCq21-0008O4-TD; Fri, 31 May 2024 00:22:05 +0000 Received: by outflank-mailman (input) for mailman id 733165; Fri, 31 May 2024 00:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCq20-0008Nk-5x for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 00:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCq20-0003Oe-3G for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 00:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCq20-0006NX-1K for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 00:22: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=/F60AURtWFX5gGCecBMXtAIppM7LrH5H6MeMSkztgWk=; b=r5hNIOGA6D7UGnuinNls9QxMa2 1v/dyIrq7BrjCPiQh+s7ppSWMT9353Wj7NBAxDafO0KxlfoGou6DUSOaGn0x8GyfdJlthXUUcfsCh DLX1kL3FoSCKUq9cbSbD+QiFHrE/m475kJGp9aZVzmgZOB1UnnOy/mPuhS8qoeEiZfEg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hvm: allow XENMEM_machine_memory_map Message-Id: Date: Fri, 31 May 2024 00:22:04 +0000 commit db04be9e7d80c06dc8aeab79e5e490d39a56ec87 Author: Roger Pau Monne AuthorDate: Thu May 30 09:53:18 2024 +0200 Commit: Andrew Cooper CommitDate: Fri May 31 01:20:28 2024 +0100 x86/hvm: allow XENMEM_machine_memory_map For HVM based control domains XENMEM_machine_memory_map must be available so that the `e820_host` xl.cfg option can be used. Signed-off-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/x86/hvm/hypercall.c | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 14679dd829..7fb3136f0c 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -25,7 +25,6 @@ long hvm_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) switch ( cmd & MEMOP_CMD_MASK ) { - case XENMEM_machine_memory_map: case XENMEM_machphys_mapping: return -ENOSYS; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 31 00:22:16 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 00:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733166.1139278 (Exim 4.92) (envelope-from ) id 1sCq2C-0008Q0-12; Fri, 31 May 2024 00:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733166.1139278; Fri, 31 May 2024 00:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCq2B-0008Pq-Ub; Fri, 31 May 2024 00:22:15 +0000 Received: by outflank-mailman (input) for mailman id 733166; Fri, 31 May 2024 00:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCq2A-0008Pc-7d for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 00:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCq2A-0003Ol-6n for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 00:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCq2A-0006O7-5t for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 00:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GDs11eTy0id00PivYrx6xMlqAGDcWa+J2SUhS6DUMsQ=; b=VNk7B4LoG6ZSlfcyKifCxz1laT XrX2DB6k18MQjS4cnpcpxoRwo6tmMKcp3ZPPJ/11LypP5AFzF1SChRCG65Pe06IFQm068+FfbfzSn px/+nlOeBgwwZv+Ez7UQDmy5VnLBWruEYcjz1wrx/s3OkPqudgotgsd/qGTje7rRzHZg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/riscv: Update Kconfig in preparation for a full Xen build Message-Id: Date: Fri, 31 May 2024 00:22:14 +0000 commit 1250c73c1ae2eec0308b4efe3e345127e9dbdb2b Author: Oleksii Kurochko AuthorDate: Wed May 29 21:55:02 2024 +0200 Commit: Andrew Cooper CommitDate: Fri May 31 01:20:28 2024 +0100 xen/riscv: Update Kconfig in preparation for a full Xen build Disable unnecessary configs for two cases: 1. By utilizing EXTRA_FIXED_RANDCONFIG for randconfig builds (GitLab CI jobs). 2. By using tiny64_defconfig for non-randconfig builds. Only configs which lead to compilation issues were disabled. Remove lines related to disablement of configs which aren't affected compilation: -# CONFIG_SCHED_CREDIT is not set -# CONFIG_SCHED_RTDS is not set -# CONFIG_SCHED_NULL is not set -# CONFIG_SCHED_ARINC653 is not set -# CONFIG_TRACEBUFFER is not set -# CONFIG_HYPFS is not set -# CONFIG_SPECULATIVE_HARDEN_ARRAY is not set Update argo.c to include asm/p2m.h directly, rather than on a transitive dependency through asm/domain.h Update asm/p2m.h to include xen/errno.h, rather than rely on it having included already. CONFIG_XSM=n as it requires an introduction of: * boot_module_find_by_kind() * BOOTMOD_XSM * struct bootmodule * copy_from_paddr() The mentioned things aren't introduced now. CONFIG_BOOT_TIME_CPUPOOLS requires an introduction of cpu_physical_id() and acpi_disabled, so it is disabled for now. PERF_COUNTERS requires asm/perf.h and asm/perfc-defn.h, so it is also disabled for now, as RISC-V hasn't introduced this headers yet. LIVEPATCH isn't ready for RISC-V too and it can be overriden by randconfig, so to avoid compilation errors for randconfig it is disabled for now. Signed-off-by: Oleksii Kurochko Acked-by: Andrew Cooper [Fix up common/argo.c rather than inserting a transitive dependency] Signed-off-by: Andrew Cooper --- automation/gitlab-ci/build.yaml | 4 ++++ xen/arch/riscv/configs/tiny64_defconfig | 12 +++++------- xen/arch/riscv/include/asm/p2m.h | 2 ++ xen/common/argo.c | 3 +++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 49d6265ad5..ff5c9055d1 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -494,10 +494,14 @@ alpine-3.18-gcc-debug-arm64-earlyprintk: .riscv-fixed-randconfig: variables: &riscv-fixed-randconfig EXTRA_FIXED_RANDCONFIG: | + CONFIG_BOOT_TIME_CPUPOOLS=n CONFIG_COVERAGE=n CONFIG_EXPERT=y CONFIG_GRANT_TABLE=n CONFIG_MEM_ACCESS=n + CONFIG_PERF_COUNTERS=n + CONFIG_LIVEPATCH=n + CONFIG_XSM=n archlinux-current-gcc-riscv64: extends: .gcc-riscv64-cross-build diff --git a/xen/arch/riscv/configs/tiny64_defconfig b/xen/arch/riscv/configs/tiny64_defconfig index 09defe236b..fc7a04872f 100644 --- a/xen/arch/riscv/configs/tiny64_defconfig +++ b/xen/arch/riscv/configs/tiny64_defconfig @@ -1,12 +1,10 @@ -# CONFIG_SCHED_CREDIT is not set -# CONFIG_SCHED_RTDS is not set -# CONFIG_SCHED_NULL is not set -# CONFIG_SCHED_ARINC653 is not set -# CONFIG_TRACEBUFFER is not set -# CONFIG_HYPFS is not set +# CONFIG_BOOT_TIME_CPUPOOLS is not set # CONFIG_GRANT_TABLE is not set -# CONFIG_SPECULATIVE_HARDEN_ARRAY is not set # CONFIG_MEM_ACCESS is not set +# CONFIG_PERF_COUNTERS is not set +# CONFIG_COVERAGE is not set +# CONFIG_LIVEPATCH is not set +# CONFIG_XSM is not set CONFIG_RISCV_64=y CONFIG_DEBUG=y diff --git a/xen/arch/riscv/include/asm/p2m.h b/xen/arch/riscv/include/asm/p2m.h index 387f372b5d..26860c0ae7 100644 --- a/xen/arch/riscv/include/asm/p2m.h +++ b/xen/arch/riscv/include/asm/p2m.h @@ -2,6 +2,8 @@ #ifndef __ASM_RISCV_P2M_H__ #define __ASM_RISCV_P2M_H__ +#include + #include #define paddr_bits PADDR_BITS diff --git a/xen/common/argo.c b/xen/common/argo.c index da3d3f325f..901f41eb2d 100644 --- a/xen/common/argo.c +++ b/xen/common/argo.c @@ -26,8 +26,11 @@ #include #include #include + #include +#include + #include #ifdef CONFIG_COMPAT -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 31 05:22:07 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 05:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733252.1139373 (Exim 4.92) (envelope-from ) id 1sCuiI-00068F-Ht; Fri, 31 May 2024 05:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733252.1139373; Fri, 31 May 2024 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 1sCuiI-000688-Ey; Fri, 31 May 2024 05:22:02 +0000 Received: by outflank-mailman (input) for mailman id 733252; Fri, 31 May 2024 05:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCuiH-000680-V0 for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 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 1sCuiH-00086p-Tz for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCuiH-0007lZ-T0 for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 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=EiUCb/9g3YH4Xs4zolflUe/8FFnJgFKahZAX1DH0I2U=; b=7CeJ7aELRxie7icejh0I7PO6Pj U+/7w+dokmLISA5CMtk5V55DEwGrfeqi1WCO32K9YTHzMi69NXiCZfpPLU6ofEPY4iGgjpcnap94N rSKYxu3ocIJJSaDkrZY/GpMh+GywYSPrkkhnGHnNKdpdZ8PIBX/cPM/BYypVinlBSov0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: (Actually) drop libsystemd as a dependency Message-Id: Date: Fri, 31 May 2024 05:22:01 +0000 commit 6ef4fa1e7fe78c1dae07b451292b07facfce4902 Author: Andrew Cooper AuthorDate: Thu May 30 11:02:16 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 30 12:15:25 2024 +0100 tools: (Actually) drop libsystemd as a dependency When reinstating some of systemd.m4 between v1 and v2, I reintroduced a little too much. While {c,o}xenstored are indeed no longer linked against libsystemd, ./configure still looks for it. Drop this too. Fixes: ae26101f6bfc ("tools: Drop libsystemd as a dependency") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- m4/systemd.m4 | 8 -- tools/configure | 229 +------------------------------------------------------- 2 files changed, 1 insertion(+), 236 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index e4fe51a8ba..ab12ea313d 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -86,13 +86,6 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ ],[systemd=n]) ]) -AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"],[ - PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], - [systemd="y"],[systemd="n"]) - ]) -]) - dnl Enables systemd by default and requires a --disable-systemd option flag dnl to configure if you want to disable. AC_DEFUN([AX_ENABLE_SYSTEMD], [ @@ -112,6 +105,5 @@ dnl to have systemd build libraries it will be enabled. You can always force dnl disable with --disable-systemd AC_DEFUN([AX_AVAILABLE_SYSTEMD], [ AX_ALLOW_SYSTEMD_OPTS() - AX_CHECK_SYSTEMD_ENABLE_AVAILABLE() AX_CHECK_SYSTEMD() ]) diff --git a/tools/configure b/tools/configure index b8faa1d520..459bfb5652 100755 --- a/tools/configure +++ b/tools/configure @@ -626,8 +626,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS pvshim ninepfs -SYSTEMD_LIBS -SYSTEMD_CFLAGS SYSTEMD_MODULES_LOAD SYSTEMD_DIR systemd @@ -864,9 +862,7 @@ pixman_LIBS libzstd_CFLAGS libzstd_LIBS LIBNL3_CFLAGS -LIBNL3_LIBS -SYSTEMD_CFLAGS -SYSTEMD_LIBS' +LIBNL3_LIBS' # Initialize some variables set by options. @@ -1621,10 +1617,6 @@ Some influential environment variables: LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config - SYSTEMD_CFLAGS - C compiler flags for SYSTEMD, overriding pkg-config - SYSTEMD_LIBS - linker flags for SYSTEMD, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -3889,8 +3881,6 @@ esac - - @@ -9540,223 +9530,6 @@ fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - systemd="n" -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - systemd="n" -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd="y" -fi - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } - -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 - - systemd="n" -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - systemd="n" -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd="y" -fi - -else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - systemd="y" -fi - - if test "x$enable_systemd" != "xno"; then : if test "x$systemd" = "xy" ; then : -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 31 05:22:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 05:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733253.1139377 (Exim 4.92) (envelope-from ) id 1sCuiS-0006CF-JB; Fri, 31 May 2024 05:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733253.1139377; Fri, 31 May 2024 05:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCuiS-0006C7-Gc; Fri, 31 May 2024 05:22:12 +0000 Received: by outflank-mailman (input) for mailman id 733253; Fri, 31 May 2024 05:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCuiS-0006C1-2F for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCuiS-00086z-0q for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCuiR-0007mH-W3 for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VWwbso/AtJG/y3iYqh8B7wJvlJa7ETCCsBhlXj8VAtE=; b=mHstgOXsl2tBrgYAyFlgwdbNfE j64eU5T18yiPatsDUWGBV+3OBrk+lykyU/KrLr86QTSjuE2dNkOLaieUxgdYNqFuJU+qAPKk7Oa3l iuGhx2f628p+b7xI4nlEih2UXzylL09TrYOytLOL8GIc/5yFF6yMgD27CBGxL1zQQHhk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] ppc/boot: Run constructors on boot Message-Id: Date: Fri, 31 May 2024 05:22:11 +0000 commit e807b137f7e75fa3d78137a6c95b689630a72727 Author: Andrew Cooper AuthorDate: Fri May 24 11:38:37 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 30 12:15:25 2024 +0100 ppc/boot: Run constructors on boot PPC collects constructors, but doesn't run them yet. Do so. They'll shortly be used to confirm correct behaviour of the bitops primitives. Signed-off-by: Andrew Cooper Acked-by: Shawn Anastasio Release-acked-by: Oleksii Kurochko --- xen/arch/ppc/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/ppc/setup.c b/xen/arch/ppc/setup.c index 101bdd8bb6..7fe06aa4bf 100644 --- a/xen/arch/ppc/setup.c +++ b/xen/arch/ppc/setup.c @@ -39,6 +39,8 @@ void __init noreturn start_xen(unsigned long r3, unsigned long r4, setup_initial_pagetables(); + init_constructors(); + early_printk("Hello, ppc64le!\n"); for ( ; ; ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 31 05:22:22 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 05:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733254.1139381 (Exim 4.92) (envelope-from ) id 1sCuic-0006FC-KW; Fri, 31 May 2024 05:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733254.1139381; Fri, 31 May 2024 05: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 1sCuic-0006F4-Hz; Fri, 31 May 2024 05:22:22 +0000 Received: by outflank-mailman (input) for mailman id 733254; Fri, 31 May 2024 05:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCuic-0006Ew-5T for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCuic-00087A-3n for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCuic-0007mi-2y for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uY3ekesHbybQ4iItPtuL3VFZp4d6U4R4ZEMhTrPTnlg=; b=3pAVnQEX97rCcL4A2dJfeOImvz LZ3Aio45+KiUDAwhXPIKE59kplvfMMX3Aj57a5NV8R9d7jw3ZLXh09kRmDIT0KgB4HnQYcTyy6x44 wxzeZs0j0Nh/0Aa8JFilpDfAAX79ASki3MlJcdHTSv/zTXPxL3x1VrHT/ZfYPw/VLAHM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/page_alloc: Coerce min(flsl(), foo) expressions to being unsigned Message-Id: Date: Fri, 31 May 2024 05:22:22 +0000 commit 1773a74469c8439b127327e4bf204a91b6bb2aa2 Author: Andrew Cooper AuthorDate: Fri May 24 13:36:15 2024 +0100 Commit: Andrew Cooper CommitDate: Thu May 30 12:15:25 2024 +0100 xen/page_alloc: Coerce min(flsl(), foo) expressions to being unsigned This is in order to maintain bisectability through the subsequent changes, where flsl() changes sign-ness non-atomically by architecture. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/common/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7c1bdfc046..8d3342e952 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1842,7 +1842,7 @@ static void _init_heap_pages(const struct page_info *pg, * Note that the value of ffsl() and flsl() starts from 1 so we need * to decrement it by 1. */ - unsigned int inc_order = min(MAX_ORDER, flsl(e - s) - 1); + unsigned int inc_order = min(MAX_ORDER + 0U, flsl(e - s) - 1U); if ( s ) inc_order = min(inc_order, ffsl(s) - 1U); @@ -2266,7 +2266,7 @@ void __init xenheap_max_mfn(unsigned long mfn) ASSERT(!first_node_initialised); ASSERT(!xenheap_bits); BUILD_BUG_ON((PADDR_BITS - PAGE_SHIFT) >= BITS_PER_LONG); - xenheap_bits = min(flsl(mfn + 1) - 1 + PAGE_SHIFT, PADDR_BITS); + xenheap_bits = min(flsl(mfn + 1) - 1U + PAGE_SHIFT, PADDR_BITS + 0U); printk(XENLOG_INFO "Xen heap: %u bits\n", xenheap_bits); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 31 05:22:32 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 05:22:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733255.1139385 (Exim 4.92) (envelope-from ) id 1sCuim-0006Ip-MF; Fri, 31 May 2024 05:22:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733255.1139385; Fri, 31 May 2024 05: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 1sCuim-0006Ig-JN; Fri, 31 May 2024 05:22:32 +0000 Received: by outflank-mailman (input) for mailman id 733255; Fri, 31 May 2024 05:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCuim-0006IX-8O for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sCuim-00087g-7V for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sCuim-0007n9-6W for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 05:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MqSH9vw79KtZw2zWLlMc/HkkVCqwIJbPA7kjUvUmk7k=; b=ZKtsH9PZHcynIJpilN4uPTok9u /ePq+F+Abn3Bkg114V7RbDq0EeD0WFYZrqcXYH//5q6LNu2JjhQ9RahULqPzZGeaCC3PrjmBpTtNv iRqDvYb0fu6U0kC6zI2RQHW1JS8xuZxszKaIX8ucpVOReDwWMMEq88HyAeKRbL898XQA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitops: Replace find_first_set_bit() with ffs()/ffsl() - 1 Message-Id: Date: Fri, 31 May 2024 05:22:32 +0000 commit 9a905d7dc65883af082532b4dc91ce0131e54047 Author: Andrew Cooper AuthorDate: Sat Mar 9 02:22:53 2024 +0000 Commit: Andrew Cooper CommitDate: Thu May 30 12:15:25 2024 +0100 xen/bitops: Replace find_first_set_bit() with ffs()/ffsl() - 1 find_first_set_bit() is a Xen-ism which has undefined behaviour with a 0 input. The latter is well defined with an input of 0, and is a found outside of Xen too. timer_sanitize_int_route(), pt_update_contig_markers() and set_iommu_ptes_present() are all already operating on unsigned int data, so switch straight to ffs(). The ffsl() in pvh_populate_memory_range() needs coercion to unsigned to keep the typecheck in min() happy in the short term. _init_heap_pages() is comparing the LSB of two different addresses, so the -1 cancels off both sides of the expression. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Oleksii Kurochko --- xen/arch/x86/guest/xen/xen.c | 4 ++-- xen/arch/x86/hvm/dom0_build.c | 2 +- xen/arch/x86/hvm/hpet.c | 8 ++++---- xen/arch/x86/include/asm/pt-contig-markers.h | 2 +- xen/arch/x86/mm.c | 2 +- xen/arch/x86/mm/p2m-pod.c | 4 ++-- xen/common/page_alloc.c | 2 +- xen/common/softirq.c | 2 +- xen/drivers/passthrough/amd/iommu_map.c | 2 +- xen/drivers/passthrough/iommu.c | 4 ++-- xen/drivers/passthrough/x86/iommu.c | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index d9768cc952..7484b3f73a 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -168,14 +168,14 @@ static void cf_check xen_evtchn_upcall(void) while ( pending ) { - unsigned int l1 = find_first_set_bit(pending); + unsigned int l1 = ffsl(pending) - 1; unsigned long evtchn = xchg(&XEN_shared_info->evtchn_pending[l1], 0); __clear_bit(l1, &pending); evtchn &= ~XEN_shared_info->evtchn_mask[l1]; while ( evtchn ) { - unsigned int port = find_first_set_bit(evtchn); + unsigned int port = ffsl(evtchn) - 1; __clear_bit(port, &evtchn); port += l1 * BITS_PER_LONG; diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index b0cb96c3bc..6acbaceb94 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -139,7 +139,7 @@ static int __init pvh_populate_memory_range(struct domain *d, order = get_order_from_pages(end - start + 1); order = min(order ? order - 1 : 0, max_order); /* The order allocated and populated must be aligned to the address. */ - order = min(order, start ? find_first_set_bit(start) : MAX_ORDER); + order = min(order, start ? ffsl(start) - 1U : MAX_ORDER + 0U); page = alloc_domheap_pages(d, order, dom0_memflags | MEMF_no_scrub); if ( page == NULL ) { diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 12b00b7702..87642575f9 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -335,7 +335,7 @@ static void timer_sanitize_int_route(HPETState *h, unsigned int tn) * enabled pick the first irq. */ timer_config(h, tn) |= - MASK_INSR(find_first_set_bit(timer_int_route_cap(h, tn)), + MASK_INSR(ffs(timer_int_route_cap(h, tn)) - 1, HPET_TN_ROUTE); } @@ -409,7 +409,7 @@ static int cf_check hpet_write( { bool active; - i = find_first_set_bit(new_val); + i = ffsl(new_val) - 1; if ( i >= HPET_TIMER_NUM ) break; __clear_bit(i, &new_val); @@ -535,14 +535,14 @@ static int cf_check hpet_write( /* stop/start timers whos state was changed by this write. */ while (stop_timers) { - i = find_first_set_bit(stop_timers); + i = ffsl(stop_timers) - 1; __clear_bit(i, &stop_timers); hpet_stop_timer(h, i, guest_time); } while (start_timers) { - i = find_first_set_bit(start_timers); + i = ffsl(start_timers) - 1; __clear_bit(i, &start_timers); hpet_set_timer(h, i, guest_time); } diff --git a/xen/arch/x86/include/asm/pt-contig-markers.h b/xen/arch/x86/include/asm/pt-contig-markers.h index b3c1fe8035..1ad5c8fb6c 100644 --- a/xen/arch/x86/include/asm/pt-contig-markers.h +++ b/xen/arch/x86/include/asm/pt-contig-markers.h @@ -60,7 +60,7 @@ static bool pt_update_contig_markers(uint64_t *pt, unsigned int idx, /* Step 1: Reduce markers in lower numbered entries. */ while ( i ) { - b = find_first_set_bit(i); + b = ffs(i) - 1; i &= ~(1U << b); if ( GET_MARKER(pt[i]) <= b ) break; diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 17987eb519..648d6dd475 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3424,7 +3424,7 @@ static int vcpumask_to_pcpumask( { unsigned int cpu; - vcpu_id = find_first_set_bit(vmask); + vcpu_id = ffsl(vmask) - 1; vmask &= ~(1UL << vcpu_id); vcpu_id += vcpu_bias; if ( (vcpu_id >= d->max_vcpus) ) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 1c727c78c8..bd84fe9e27 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -684,7 +684,7 @@ unsigned long p2m_pod_decrease_reservation(struct domain *d, gfn_t gfn, unsigned int order) { unsigned long left = 1UL << order, ret = 0; - unsigned int chunk_order = find_first_set_bit(gfn_x(gfn) | left); + unsigned int chunk_order = ffsl(gfn_x(gfn) | left) - 1; do { ret += decrease_reservation(d, gfn, chunk_order); @@ -1393,7 +1393,7 @@ guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn, unsigned int order) { unsigned long left = 1UL << order; - unsigned int chunk_order = find_first_set_bit(gfn | left); + unsigned int chunk_order = ffsl(gfn | left) - 1; int rc; if ( !paging_mode_translate(d) ) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 8d3342e952..054b7edb39 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1819,7 +1819,7 @@ static void _init_heap_pages(const struct page_info *pg, if ( unlikely(!avail[nid]) ) { bool use_tail = IS_ALIGNED(s, 1UL << MAX_ORDER) && - (find_first_set_bit(e) <= find_first_set_bit(s)); + (ffsl(e) <= ffsl(s)); unsigned long n; n = init_node_heap(nid, s, nr_pages, &use_tail); diff --git a/xen/common/softirq.c b/xen/common/softirq.c index 321d26902d..bee4a82009 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -48,7 +48,7 @@ static void __do_softirq(unsigned long ignore_mask) || cpu_is_offline(cpu) ) break; - i = find_first_set_bit(pending); + i = ffsl(pending) - 1; clear_bit(i, &softirq_pending(cpu)); (*softirq_handlers[i])(); } diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index e0f4fe736a..1f0e416756 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -137,7 +137,7 @@ static void set_iommu_ptes_present(unsigned long pt_mfn, ASSERT(!pde->u); if ( pde > table ) - ASSERT(pde->ign0 == find_first_set_bit(pde - table)); + ASSERT(pde->ign0 == ffs(pde - table) - 1); else ASSERT(pde->ign0 == CONTIG_LEVEL_SHIFT); diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index ba18136c46..50bfd62553 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -305,7 +305,7 @@ static unsigned int mapping_order(const struct domain_iommu *hd, { unsigned long res = dfn_x(dfn) | mfn_x(mfn); unsigned long sizes = hd->platform_ops->page_sizes; - unsigned int bit = find_first_set_bit(sizes), order = 0; + unsigned int bit = ffsl(sizes) - 1, order = 0; ASSERT(bit == PAGE_SHIFT); @@ -313,7 +313,7 @@ static unsigned int mapping_order(const struct domain_iommu *hd, { unsigned long mask; - bit = find_first_set_bit(sizes); + bit = ffsl(sizes) - 1; mask = (1UL << bit) - 1; if ( nr <= mask || (res & mask) ) break; diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 304a2f5480..cc0062b027 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -641,7 +641,7 @@ struct page_info *iommu_alloc_pgtable(struct domain_iommu *hd, if ( contig_mask ) { /* See pt-contig-markers.h for a description of the marker scheme. */ - unsigned int i, shift = find_first_set_bit(contig_mask); + unsigned int i, shift = ffsl(contig_mask) - 1; ASSERT((CONTIG_LEVEL_SHIFT & (contig_mask >> shift)) == CONTIG_LEVEL_SHIFT); @@ -652,7 +652,7 @@ struct page_info *iommu_alloc_pgtable(struct domain_iommu *hd, for ( i = 4; i < PAGE_SIZE / sizeof(*p); i += 4 ) { - p[i + 0] = (find_first_set_bit(i) + 0ULL) << shift; + p[i + 0] = (ffsl(i) - 1ULL) << shift; p[i + 1] = 0; p[i + 2] = 1ULL << shift; p[i + 3] = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 31 15:00:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 15:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733766.1140097 (Exim 4.92) (envelope-from ) id 1sD3jf-00054K-5F; Fri, 31 May 2024 15:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733766.1140097; Fri, 31 May 2024 15:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sD3jf-000543-2c; Fri, 31 May 2024 15:00:03 +0000 Received: by outflank-mailman (input) for mailman id 733766; Fri, 31 May 2024 15:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sD3je-0004vz-8r for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 15:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sD3je-0001bt-6p for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 15:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sD3je-0003Zb-5l for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 15:00:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UcstARomFOdzwAj91f744kqRf9p5uu43xsudrSyha2g=; b=OThxyt+QwnOWtSXBa1nDk/nNae zGEEbYx5K3js/L/MK2kZw26Uq5qeO7YWen862tny+WmQFDrvTmOVf3wo8xBmpsJy5AEOKiLR8nbuk hGApzy8NsbHZiu9+66DVxVw5N9Q9512NKfgj1R8ADb/nhmvihA7HyHi2NTMsByk8WoLA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: allow XENMEM_machine_memory_map Message-Id: Date: Fri, 31 May 2024 15:00:02 +0000 commit db04be9e7d80c06dc8aeab79e5e490d39a56ec87 Author: Roger Pau Monne AuthorDate: Thu May 30 09:53:18 2024 +0200 Commit: Andrew Cooper CommitDate: Fri May 31 01:20:28 2024 +0100 x86/hvm: allow XENMEM_machine_memory_map For HVM based control domains XENMEM_machine_memory_map must be available so that the `e820_host` xl.cfg option can be used. Signed-off-by: Roger Pau Monné Release-Acked-by: Oleksii Kurochko Acked-by: Andrew Cooper --- xen/arch/x86/hvm/hypercall.c | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 14679dd829..7fb3136f0c 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -25,7 +25,6 @@ long hvm_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) switch ( cmd & MEMOP_CMD_MASK ) { - case XENMEM_machine_memory_map: case XENMEM_machphys_mapping: return -ENOSYS; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 31 15:00:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 15:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733767.1140102 (Exim 4.92) (envelope-from ) id 1sD3jp-0005e8-7o; Fri, 31 May 2024 15:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733767.1140102; Fri, 31 May 2024 15:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sD3jp-0005e1-46; Fri, 31 May 2024 15:00:13 +0000 Received: by outflank-mailman (input) for mailman id 733767; Fri, 31 May 2024 15:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sD3jo-0005dv-CB for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 15:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sD3jo-0001c0-AT for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 15:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sD3jo-0003c3-9G for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 15:00:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=k1ip2gzLAD/UvVkohMWUtORjFAGN4m2wJFjOqBH7nbA=; b=X1K68sHDh/snoznNynqYiBPsQ/ TPD7r3HDT/qjrXHUIwev9bmAmSk8TKCL428ySiCIRA51xBxfXw4DbDULGlGrJGyV0J+nhwbwC7OZG 8bpEnoAmIT4uY2d7KEXHmumXugo1ZR4xIvbAgQm+cZe7uPT0xnBg3cDeGGDiMKYSOvtg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: Update Kconfig in preparation for a full Xen build Message-Id: Date: Fri, 31 May 2024 15:00:12 +0000 commit 1250c73c1ae2eec0308b4efe3e345127e9dbdb2b Author: Oleksii Kurochko AuthorDate: Wed May 29 21:55:02 2024 +0200 Commit: Andrew Cooper CommitDate: Fri May 31 01:20:28 2024 +0100 xen/riscv: Update Kconfig in preparation for a full Xen build Disable unnecessary configs for two cases: 1. By utilizing EXTRA_FIXED_RANDCONFIG for randconfig builds (GitLab CI jobs). 2. By using tiny64_defconfig for non-randconfig builds. Only configs which lead to compilation issues were disabled. Remove lines related to disablement of configs which aren't affected compilation: -# CONFIG_SCHED_CREDIT is not set -# CONFIG_SCHED_RTDS is not set -# CONFIG_SCHED_NULL is not set -# CONFIG_SCHED_ARINC653 is not set -# CONFIG_TRACEBUFFER is not set -# CONFIG_HYPFS is not set -# CONFIG_SPECULATIVE_HARDEN_ARRAY is not set Update argo.c to include asm/p2m.h directly, rather than on a transitive dependency through asm/domain.h Update asm/p2m.h to include xen/errno.h, rather than rely on it having included already. CONFIG_XSM=n as it requires an introduction of: * boot_module_find_by_kind() * BOOTMOD_XSM * struct bootmodule * copy_from_paddr() The mentioned things aren't introduced now. CONFIG_BOOT_TIME_CPUPOOLS requires an introduction of cpu_physical_id() and acpi_disabled, so it is disabled for now. PERF_COUNTERS requires asm/perf.h and asm/perfc-defn.h, so it is also disabled for now, as RISC-V hasn't introduced this headers yet. LIVEPATCH isn't ready for RISC-V too and it can be overriden by randconfig, so to avoid compilation errors for randconfig it is disabled for now. Signed-off-by: Oleksii Kurochko Acked-by: Andrew Cooper [Fix up common/argo.c rather than inserting a transitive dependency] Signed-off-by: Andrew Cooper --- automation/gitlab-ci/build.yaml | 4 ++++ xen/arch/riscv/configs/tiny64_defconfig | 12 +++++------- xen/arch/riscv/include/asm/p2m.h | 2 ++ xen/common/argo.c | 3 +++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 49d6265ad5..ff5c9055d1 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -494,10 +494,14 @@ alpine-3.18-gcc-debug-arm64-earlyprintk: .riscv-fixed-randconfig: variables: &riscv-fixed-randconfig EXTRA_FIXED_RANDCONFIG: | + CONFIG_BOOT_TIME_CPUPOOLS=n CONFIG_COVERAGE=n CONFIG_EXPERT=y CONFIG_GRANT_TABLE=n CONFIG_MEM_ACCESS=n + CONFIG_PERF_COUNTERS=n + CONFIG_LIVEPATCH=n + CONFIG_XSM=n archlinux-current-gcc-riscv64: extends: .gcc-riscv64-cross-build diff --git a/xen/arch/riscv/configs/tiny64_defconfig b/xen/arch/riscv/configs/tiny64_defconfig index 09defe236b..fc7a04872f 100644 --- a/xen/arch/riscv/configs/tiny64_defconfig +++ b/xen/arch/riscv/configs/tiny64_defconfig @@ -1,12 +1,10 @@ -# CONFIG_SCHED_CREDIT is not set -# CONFIG_SCHED_RTDS is not set -# CONFIG_SCHED_NULL is not set -# CONFIG_SCHED_ARINC653 is not set -# CONFIG_TRACEBUFFER is not set -# CONFIG_HYPFS is not set +# CONFIG_BOOT_TIME_CPUPOOLS is not set # CONFIG_GRANT_TABLE is not set -# CONFIG_SPECULATIVE_HARDEN_ARRAY is not set # CONFIG_MEM_ACCESS is not set +# CONFIG_PERF_COUNTERS is not set +# CONFIG_COVERAGE is not set +# CONFIG_LIVEPATCH is not set +# CONFIG_XSM is not set CONFIG_RISCV_64=y CONFIG_DEBUG=y diff --git a/xen/arch/riscv/include/asm/p2m.h b/xen/arch/riscv/include/asm/p2m.h index 387f372b5d..26860c0ae7 100644 --- a/xen/arch/riscv/include/asm/p2m.h +++ b/xen/arch/riscv/include/asm/p2m.h @@ -2,6 +2,8 @@ #ifndef __ASM_RISCV_P2M_H__ #define __ASM_RISCV_P2M_H__ +#include + #include #define paddr_bits PADDR_BITS diff --git a/xen/common/argo.c b/xen/common/argo.c index da3d3f325f..901f41eb2d 100644 --- a/xen/common/argo.c +++ b/xen/common/argo.c @@ -26,8 +26,11 @@ #include #include #include + #include +#include + #include #ifdef CONFIG_COMPAT -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 31 21:55:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 21:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733880.1140145 (Exim 4.92) (envelope-from ) id 1sDADJ-0003Qm-My; Fri, 31 May 2024 21:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733880.1140145; Fri, 31 May 2024 21:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADJ-0003Qc-K5; Fri, 31 May 2024 21:55:05 +0000 Received: by outflank-mailman (input) for mailman id 733880; Fri, 31 May 2024 21:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADI-0003QW-Dc for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADI-0000Z5-71 for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDADI-0002Js-5Y for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=y4USEdr4F0a0CuCekBTI6zf0QjjExeCFJBrwBm7+ugQ=; b=z+wvUTvEA+PTaIU4N2TV5qGj12 Poyfx/y1xPNbosh3Exmhjpg7vkqGLamSv3shYMe1qRWTbr2Itwzm7sT4uDTczqjvOLL/5NjebIOVc GYTC2DWYIMFkYto17AJMmPwa/+vKG4Dg7eGteOIiuY24WmurCkiFVXcXboCY6cR7my28=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Use a debug build of Xen for the Xilinx HW tests Message-Id: Date: Fri, 31 May 2024 21:55:04 +0000 commit 2ff6d17bc37e6d8bc412436e8734ea868cea124d Author: Andrew Cooper AuthorDate: Wed May 29 14:20:39 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 31 22:03:30 2024 +0100 CI: Use a debug build of Xen for the Xilinx HW tests ... like the other hardware tests. This gets more value out of the testing. Signed-off-by: Andrew Cooper Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/gitlab-ci/test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ad249fa0a5..902139e148 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -143,21 +143,21 @@ build-each-commit-gcc: tags: - x86_64 -xilinx-smoke-dom0less-arm64-gcc: +xilinx-smoke-dom0less-arm64-gcc-debug: extends: .xilinx-arm64 script: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.18-gcc-debug-arm64 -xilinx-smoke-dom0less-arm64-gcc-gem-passthrough: +xilinx-smoke-dom0less-arm64-gcc-debug-gem-passthrough: extends: .xilinx-arm64 script: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh gem-passthrough 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.18-gcc-debug-arm64 adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 31 21:55:15 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 21:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733881.1140149 (Exim 4.92) (envelope-from ) id 1sDADT-0003SE-O7; Fri, 31 May 2024 21:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733881.1140149; Fri, 31 May 2024 21:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADT-0003S6-LU; Fri, 31 May 2024 21:55:15 +0000 Received: by outflank-mailman (input) for mailman id 733881; Fri, 31 May 2024 21:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADS-0003S0-Ct for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADS-0000ZA-AN for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDADS-0002KJ-99 for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I2a8T/BdtLNmZvpn8IOb59JxhcidhoMkMUl4NPMyu6w=; b=5vuBgTvmLyVaI8AtBjk1QLdWdd UbFWr+UzgV3SDJvK9sqQwKC/R2dUtv+uZFdiTj91+bfsuzMptLdVgo+N7WzbTJNwwlzuuwciTeMtQ jjYeCWVU0Qi0f8duyw0nvPHMmS48ujLhWL7nUkmR+7+meCJNnc6gNAHIoZy0e7rrGQF8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CI: Improve serial handling in qemu-smoke-ppc64le.sh Message-Id: Date: Fri, 31 May 2024 21:55:14 +0000 commit 16884ac6c88da7d964adfd5d14cae411193554d1 Author: Andrew Cooper AuthorDate: Wed May 29 14:21:12 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 31 22:03:30 2024 +0100 CI: Improve serial handling in qemu-smoke-ppc64le.sh Have PPC put serial to stdout like all other tests, so it shows up in the main job log. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Release-Acked-by: Oleksii Kurochko --- automation/scripts/qemu-smoke-ppc64le.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/qemu-smoke-ppc64le.sh index 2adbdac87e..701d81107d 100755 --- a/automation/scripts/qemu-smoke-ppc64le.sh +++ b/automation/scripts/qemu-smoke-ppc64le.sh @@ -2,15 +2,15 @@ set -ex +serial_log="$(pwd)/smoke.serial" + # machine type from first arg passed directly to qemu -M machine=$1 # Run the test -rm -f smoke.serial +rm -f ${serial_log} set +e -touch smoke.serial - timeout -k 1 20 \ binaries/qemu-system-ppc64 \ -bios binaries/skiboot.lid \ @@ -20,9 +20,10 @@ binaries/qemu-system-ppc64 \ -vga none \ -monitor none \ -nographic \ - -serial file:smoke.serial \ - -kernel binaries/xen + -serial stdio \ + -kernel binaries/xen \ + |& tee ${serial_log} | sed 's/\r//' set -e -(grep -q "Hello, ppc64le!" smoke.serial) || exit 1 +(grep -q "Hello, ppc64le!" ${serial_log}) || exit 1 exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 31 21:55:25 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 21:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733882.1140155 (Exim 4.92) (envelope-from ) id 1sDADd-0003V2-Qf; Fri, 31 May 2024 21:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733882.1140155; Fri, 31 May 2024 21:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADd-0003Ut-Mq; Fri, 31 May 2024 21:55:25 +0000 Received: by outflank-mailman (input) for mailman id 733882; Fri, 31 May 2024 21:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADc-0003Ul-FZ for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADc-0000ZK-Dx for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDADc-0002Ko-Cj for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IReBuc/J2zxeXc0UCmybjxWdluAkgjnzLS88vQfsDRs=; b=vjFNviP6AkUcwCTdzIxPnebk0s DRISsmoQjd5ejHXBO0SqW04XRQTXh1lgBp4KmhNSKhUObOPNSRPcvP+m9V78NjkxW2btwZwIwmfpy D7kIPFJDjj7n4GQEERi5v9IER3jaO89kEvh4uaA++dLV/L9upDQukaoHLryH0+6Bwg3I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arch/irq: Make irq_ack_none() mandatory Message-Id: Date: Fri, 31 May 2024 21:55:24 +0000 commit 8aeda4a241ab9bc3e891dce140218be953631718 Author: Andrew Cooper AuthorDate: Thu May 30 19:00:45 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 31 22:03:30 2024 +0100 arch/irq: Make irq_ack_none() mandatory Any non-stub implementation is going to have to do something here. The related hook irq_end_none() is more complicated and has arch-specific interactions with irq_ack_none(), so make it optional. For PPC, introduce a stub irq_ack_none(). For ARM and x86, export the existing {ack,end}_none() helpers, gaining an irq_ prefix for consisntency with everything else in no_irq_type. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/include/asm/irq.h | 3 +++ xen/arch/arm/irq.c | 8 ++++---- xen/arch/ppc/stubs.c | 6 ++++++ xen/arch/x86/irq.c | 4 ++-- xen/include/xen/irq.h | 6 ++++++ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/irq.h b/xen/arch/arm/include/asm/irq.h index 1bae538887..ec437add09 100644 --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -98,6 +98,9 @@ void irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask); */ bool irq_type_set_by_domain(const struct domain *d); +void irq_end_none(struct irq_desc *irq); +#define irq_end_none irq_end_none + #endif /* _ASM_HW_IRQ_H */ /* * Local variables: diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index bcce80a4d6..7138f9e7c2 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -31,12 +31,12 @@ struct irq_guest unsigned int virq; }; -static void ack_none(struct irq_desc *irq) +void irq_ack_none(struct irq_desc *irq) { printk("unexpected IRQ trap at irq %02x\n", irq->irq); } -static void end_none(struct irq_desc *irq) +void irq_end_none(struct irq_desc *irq) { /* * Still allow a CPU to end an interrupt if we receive a spurious @@ -51,8 +51,8 @@ hw_irq_controller no_irq_type = { .shutdown = irq_shutdown_none, .enable = irq_enable_none, .disable = irq_disable_none, - .ack = ack_none, - .end = end_none + .ack = irq_ack_none, + .end = irq_end_none }; static irq_desc_t irq_desc[NR_IRQS]; diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index da193839bd..4e03428e07 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -134,12 +134,18 @@ void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) BUG_ON("unimplemented"); } +void irq_ack_none(struct irq_desc *desc) +{ + BUG_ON("unimplemented"); +} + hw_irq_controller no_irq_type = { .typename = "none", .startup = irq_startup_none, .shutdown = irq_shutdown_none, .enable = irq_enable_none, .disable = irq_disable_none, + .ack = irq_ack_none, }; int arch_init_one_irq_desc(struct irq_desc *desc) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index c16205a9be..cfd7a08479 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -467,7 +467,7 @@ int __init init_irq_data(void) return 0; } -static void cf_check ack_none(struct irq_desc *desc) +void cf_check irq_ack_none(struct irq_desc *desc) { ack_bad_irq(desc->irq); } @@ -478,7 +478,7 @@ hw_irq_controller no_irq_type = { irq_shutdown_none, irq_enable_none, irq_disable_none, - ack_none, + irq_ack_none, }; static vmask_t *irq_get_used_vector_mask(int irq) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 89f7a8317a..8fa8ef2e50 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -130,6 +130,12 @@ void cf_check irq_actor_none(struct irq_desc *desc); #define irq_disable_none irq_actor_none #define irq_enable_none irq_actor_none +/* + * irq_ack_none() must be provided by the architecture. + * irq_end_none() is optional, and opted into using a define. + */ +void cf_check irq_ack_none(struct irq_desc *irq); + /* * Per-cpu interrupted context register state - the inner-most interrupt frame * on the stack. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 31 21:55:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 31 May 2024 21:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.733883.1140157 (Exim 4.92) (envelope-from ) id 1sDADn-0003Xn-R5; Fri, 31 May 2024 21:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 733883.1140157; Fri, 31 May 2024 21:55:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADn-0003Xe-OJ; Fri, 31 May 2024 21:55:35 +0000 Received: by outflank-mailman (input) for mailman id 733883; Fri, 31 May 2024 21:55:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADm-0003XR-I8 for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sDADm-0000ZV-HB for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1sDADm-0002LY-GJ for xen-changelog@lists.xenproject.org; Fri, 31 May 2024 21:55:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AxFomoktFRLPURrs++JGMS7/alk/E6MLkQGSEDpKWWA=; b=Gl0Y7DsDrlulRGlMlE8uWKfXZr bw+NbJldbNKUFD9RBQN3xRtyq/eWovhj81kwd/3u/KlDfiW7gwJPx19uHrwI2W1GiJPsaoQVsUEPs +r93/DlZs2E/8K0SxI/q6Tuey2tSAJAllApARixnEUUYNwWjQvbcfepM2XarlvMFdj08=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arch/irq: Centralise no_irq_type Message-Id: Date: Fri, 31 May 2024 21:55:34 +0000 commit 03147e6837ff045dbc328be876b9600f7040c771 Author: Andrew Cooper AuthorDate: Thu May 30 18:58:18 2024 +0100 Commit: Andrew Cooper CommitDate: Fri May 31 22:03:30 2024 +0100 arch/irq: Centralise no_irq_type Having no_irq_type defined per arch, but using common callbacks is a mess, and is particualrly hard to bootstrap a new architecture with. Now that the ack()/end() hooks have been exported suitably, move the definition of no_irq_type into common/irq.c, and make it const too for good measure. No functional change, but a whole lot less tangled. Signed-off-by: Andrew Cooper Reviewed-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Julien Grall Release-Acked-by: Oleksii Kurochko --- xen/arch/arm/irq.c | 10 ---------- xen/arch/ppc/stubs.c | 9 --------- xen/arch/x86/irq.c | 9 --------- xen/common/irq.c | 13 +++++++++++++ xen/include/xen/irq.h | 2 +- 5 files changed, 14 insertions(+), 29 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 7138f9e7c2..e5fb26a3de 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -45,16 +45,6 @@ void irq_end_none(struct irq_desc *irq) gic_hw_ops->gic_host_irq_type->end(irq); } -hw_irq_controller no_irq_type = { - .typename = "none", - .startup = irq_startup_none, - .shutdown = irq_shutdown_none, - .enable = irq_enable_none, - .disable = irq_disable_none, - .ack = irq_ack_none, - .end = irq_end_none -}; - static irq_desc_t irq_desc[NR_IRQS]; static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc); diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index 4e03428e07..923f0e7b20 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -139,15 +139,6 @@ void irq_ack_none(struct irq_desc *desc) BUG_ON("unimplemented"); } -hw_irq_controller no_irq_type = { - .typename = "none", - .startup = irq_startup_none, - .shutdown = irq_shutdown_none, - .enable = irq_enable_none, - .disable = irq_disable_none, - .ack = irq_ack_none, -}; - int arch_init_one_irq_desc(struct irq_desc *desc) { BUG_ON("unimplemented"); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index cfd7a08479..e36e06deaa 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -472,15 +472,6 @@ void cf_check irq_ack_none(struct irq_desc *desc) ack_bad_irq(desc->irq); } -hw_irq_controller no_irq_type = { - "none", - irq_startup_none, - irq_shutdown_none, - irq_enable_none, - irq_disable_none, - irq_ack_none, -}; - static vmask_t *irq_get_used_vector_mask(int irq) { vmask_t *ret = NULL; diff --git a/xen/common/irq.c b/xen/common/irq.c index 7225b46374..29729349a6 100644 --- a/xen/common/irq.c +++ b/xen/common/irq.c @@ -3,6 +3,19 @@ DEFINE_PER_CPU(const struct cpu_user_regs *, irq_regs); +const hw_irq_controller no_irq_type = { + .typename = "none", + .startup = irq_startup_none, + .shutdown = irq_shutdown_none, + .enable = irq_enable_none, + .disable = irq_disable_none, + .ack = irq_ack_none, + +#ifdef irq_end_none /* Hook is optional per arch */ + .end = irq_end_none, +#endif +}; + int init_one_irq_desc(struct irq_desc *desc) { int err; diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 8fa8ef2e50..adf33547d2 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -122,7 +122,7 @@ extern int request_irq(unsigned int irq, unsigned int irqflags, void (*handler)(int irq, void *dev_id), const char *devname, void *dev_id); -extern hw_irq_controller no_irq_type; +extern const hw_irq_controller no_irq_type; void cf_check no_action(int cpl, void *dev_id); unsigned int cf_check irq_startup_none(struct irq_desc *desc); void cf_check irq_actor_none(struct irq_desc *desc); -- generated by git-patchbot for /home/xen/git/xen.git#staging