From xen-changelog-bounces@lists.xenproject.org Thu Feb 01 03:33:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Feb 2024 03:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674213.1049007 (Exim 4.92) (envelope-from ) id 1rVNp1-0004q8-EL; Thu, 01 Feb 2024 03:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674213.1049007; Thu, 01 Feb 2024 03:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVNp1-0004q0-BP; Thu, 01 Feb 2024 03:33:03 +0000 Received: by outflank-mailman (input) for mailman id 674213; Thu, 01 Feb 2024 03:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVNoz-0004ps-JA for xen-changelog@lists.xenproject.org; Thu, 01 Feb 2024 03:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVNoz-0005fp-HD for xen-changelog@lists.xenproject.org; Thu, 01 Feb 2024 03:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVNoz-0001XW-G6 for xen-changelog@lists.xenproject.org; Thu, 01 Feb 2024 03: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=88ViMEY5wZU1JZM4XUhcWfFspPEkt8xyV0+gi0JweaQ=; b=rgB2Tpx7pVeXknIAv5wyCs7k33 vg0hivacX2jniw1fJIfyEvUAirXh+xb+wOt1XwowsRN35OZcBjSqnvjLiH6R3RpA1XlquluSaqHf/ /MhZhPwY1RoWYQIXKXL7S5ufK7KIRh4XrViN75LNVjn32Zi8UlwAXS4+0sfKcMWz6Ots=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pci: fail device assignment if phantom functions cannot be assigned Message-Id: Date: Thu, 01 Feb 2024 03:33:01 +0000 commit cb4ecb3cc17b02c2814bc817efd05f3f3ba33d1e Author: Roger Pau Monné AuthorDate: Tue Jan 30 14:28:01 2024 +0100 Commit: Jan Beulich CommitDate: Tue Jan 30 14:28:01 2024 +0100 pci: fail device assignment if phantom functions cannot be assigned The current behavior is that no error is reported if (some) phantom functions fail to be assigned during device add or assignment, so the operation succeeds even if some phantom functions are not correctly setup. This can lead to devices possibly being successfully assigned to a domU while some of the device phantom functions are still assigned to dom0. Even when the device is assigned domIO before being assigned to a domU phantom functions might fail to be assigned to domIO, and also fail to be assigned to the domU, leaving them assigned to dom0. Since the device can generate requests using the IDs of those phantom functions, given the scenario above a device in such state would be in control of a domU, but still capable of generating transactions that use a context ID targeting dom0 owned memory. Modify device assign in order to attempt to deassign the device if phantom functions failed to be assigned. Note that device addition is not modified in the same way, as in that case the device is assigned to a trusted domain, and hence partial assign can lead to device malfunction but not a security issue. This is XSA-449 / CVE-2023-46839 Fixes: 4e9950dc1bd2 ('IOMMU: add phantom function support') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/passthrough/pci.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 1439d1ef2b..47c0eee7bd 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -1488,11 +1488,10 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag) pdev->fault.count = 0; - if ( (rc = iommu_call(hd->platform_ops, assign_device, d, devfn, - pci_to_dev(pdev), flag)) ) - goto done; + rc = iommu_call(hd->platform_ops, assign_device, d, devfn, pci_to_dev(pdev), + flag); - for ( ; pdev->phantom_stride; rc = 0 ) + while ( pdev->phantom_stride && !rc ) { devfn += pdev->phantom_stride; if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) ) @@ -1503,8 +1502,24 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag) done: if ( rc ) - printk(XENLOG_G_WARNING "%pd: assign (%pp) failed (%d)\n", - d, &PCI_SBDF(seg, bus, devfn), rc); + { + printk(XENLOG_G_WARNING "%pd: assign %s(%pp) failed (%d)\n", + d, devfn != pdev->devfn ? "phantom function " : "", + &PCI_SBDF(seg, bus, devfn), rc); + + if ( devfn != pdev->devfn && deassign_device(d, seg, bus, pdev->devfn) ) + { + /* + * Device with phantom functions that failed to both assign and + * rollback. Mark the device as broken and crash the target domain, + * as the state of the functions at this point is unknown and Xen + * has no way to assert consistent context assignment among them. + */ + pdev->broken = true; + if ( !is_hardware_domain(d) && d != dom_io ) + domain_crash(d); + } + } /* The device is assigned to dom_io so mark it as quarantined */ else if ( d == dom_io ) pdev->quarantine = true; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Feb 01 03:33:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Feb 2024 03:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674214.1049011 (Exim 4.92) (envelope-from ) id 1rVNpB-0004s5-FN; Thu, 01 Feb 2024 03:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674214.1049011; Thu, 01 Feb 2024 03:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVNpB-0004ry-Ct; Thu, 01 Feb 2024 03:33:13 +0000 Received: by outflank-mailman (input) for mailman id 674214; Thu, 01 Feb 2024 03:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVNp9-0004ro-N6 for xen-changelog@lists.xenproject.org; Thu, 01 Feb 2024 03:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVNp9-0005gC-MH for xen-changelog@lists.xenproject.org; Thu, 01 Feb 2024 03:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVNp9-0001Xv-JY for xen-changelog@lists.xenproject.org; Thu, 01 Feb 2024 03: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=pGx9MZ4x4PkJZzvR88vAKG/8A4QTGvqZY9Xpjymtqsw=; b=Fes8DPQ+X+o28dpjQkCoUYrGnb TEORqTrlxDZLVRxUXqR128vUf7kK7O9GFLTEfNX9qbuOUwl0cTA29S0Sk1X06rjbE9uY9ZVkN6vjT kDtEMyEYjcTS5uYKXiuFbQrR1xVIBPbhKqXpMQ4tC8qynVR6CzuqmBvYWiOSQyOQweoo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: Fix "else" vs "#endif" misplacement Message-Id: Date: Thu, 01 Feb 2024 03:33:11 +0000 commit cc6ba68edf6dcd18c3865e7d7c0f1ed822796426 Author: Andrew Cooper AuthorDate: Tue Jan 30 14:29:15 2024 +0100 Commit: Jan Beulich CommitDate: Tue Jan 30 14:29:15 2024 +0100 VT-d: Fix "else" vs "#endif" misplacement In domain_pgd_maddr() the "#endif" is misplaced with respect to "else". This generates incorrect logic when CONFIG_HVM is compiled out, as the "else" body is executed unconditionally. Rework the logic to use IS_ENABLED() instead of explicit #ifdef-ary, as it's clearer to follow. This in turn involves adjusting p2m_get_pagetable() to compile when CONFIG_HVM is disabled. This is XSA-450 / CVE-2023-46840. Fixes: 033ff90aa9c1 ("x86/P2M: p2m_{alloc,free}_ptp() and p2m_alloc_table() are HVM-only") Reported-by: Teddy Astie Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/p2m.h | 9 ++++++++- xen/drivers/passthrough/vtd/iommu.c | 4 +--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 32f3f394b0..6ada585eaa 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -435,7 +435,14 @@ static inline bool p2m_is_altp2m(const struct p2m_domain *p2m) return p2m->p2m_class == p2m_alternate; } -#define p2m_get_pagetable(p2m) ((p2m)->phys_table) +#ifdef CONFIG_HVM +static inline pagetable_t p2m_get_pagetable(const struct p2m_domain *p2m) +{ + return p2m->phys_table; +} +#else +pagetable_t p2m_get_pagetable(const struct p2m_domain *p2m); +#endif /* * Ensure any deferred p2m TLB flush has been completed on all VCPUs. diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 99b642f12e..4244855032 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -438,15 +438,13 @@ static paddr_t domain_pgd_maddr(struct domain *d, paddr_t pgd_maddr, if ( pgd_maddr ) /* nothing */; -#ifdef CONFIG_HVM - else if ( iommu_use_hap_pt(d) ) + else if ( IS_ENABLED(CONFIG_HVM) && iommu_use_hap_pt(d) ) { pagetable_t pgt = p2m_get_pagetable(p2m_get_hostp2m(d)); pgd_maddr = pagetable_get_paddr(pgt); } else -#endif { if ( !hd->arch.vtd.pgd_maddr ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 09:22:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 09:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674897.1050053 (Exim 4.92) (envelope-from ) id 1rVpkI-0003kW-Ve; Fri, 02 Feb 2024 09:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674897.1050053; Fri, 02 Feb 2024 09: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 1rVpkI-0003kP-TC; Fri, 02 Feb 2024 09:22:02 +0000 Received: by outflank-mailman (input) for mailman id 674897; Fri, 02 Feb 2024 09:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkH-0003kJ-JI for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkH-0004el-IP for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVpkH-0007CV-HR for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/O8DrlwY8UrmToLBV1e+NaLscmhZ2JDVXXf6LMIuF28=; b=kZEsPB5w7ubC7dr53OeWUMXJYb /DhrP4YbnemQ4OXSmcgO9qa7QzbTERo+3TzFUnSO3vQGBQfS0ev8NIIjIp8azTCj1xZDmSwMA6kY5 Wze2QNVa7hSZOzCx/PlmSSiEa/LIAElaidvzza4pl9fdUR/GSqBmHkix1VXHxgG2Zbms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/amd: Extend CPU erratum #1474 fix to more affected models Message-Id: Date: Fri, 02 Feb 2024 09:22:01 +0000 commit 62b3d7f8e45a7ec1597f0ed61a99d1f423b22315 Author: Roger Pau Monné AuthorDate: Thu Feb 1 17:58:17 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 17:58:17 2024 +0100 x86/amd: Extend CPU erratum #1474 fix to more affected models Erratum #1474 has now been extended to cover models from family 17h ranges 00-2Fh, so the errata now covers all the models released under Family 17h (Zen, Zen+ and Zen2). Additionally extend the workaround to Family 18h (Hygon), since it's based on the Zen architecture and very likely affected. Rename all the zen2 related symbols to fam17, since the errata doesn't exclusively affect Zen2 anymore. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper master commit: 23db507a01a4ec5259ec0ab43d296a41b1c326ba master date: 2023-12-21 12:19:40 +0000 --- xen/arch/x86/cpu/amd.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 0f305312ff..d43288ae97 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -54,7 +54,7 @@ bool __read_mostly amd_acpi_c1e_quirk; bool __ro_after_init amd_legacy_ssbd; bool __initdata amd_virt_spec_ctrl; -static bool __read_mostly zen2_c6_disabled; +static bool __read_mostly fam17_c6_disabled; static inline int rdmsr_amd_safe(unsigned int msr, unsigned int *lo, unsigned int *hi) @@ -978,24 +978,24 @@ void amd_check_zenbleed(void) val & chickenbit ? "chickenbit" : "microcode"); } -static void cf_check zen2_disable_c6(void *arg) +static void cf_check fam17_disable_c6(void *arg) { /* Disable C6 by clearing the CCR{0,1,2}_CC6EN bits. */ const uint64_t mask = ~((1ul << 6) | (1ul << 14) | (1ul << 22)); uint64_t val; - if (!zen2_c6_disabled) { + if (!fam17_c6_disabled) { printk(XENLOG_WARNING "Disabling C6 after 1000 days apparent uptime due to AMD errata 1474\n"); - zen2_c6_disabled = true; + fam17_c6_disabled = true; /* * Prevent CPU hotplug so that started CPUs will either see - * zen2_c6_disabled set, or will be handled by + * zen_c6_disabled set, or will be handled by * smp_call_function(). */ while (!get_cpu_maps()) process_pending_softirqs(); - smp_call_function(zen2_disable_c6, NULL, 0); + smp_call_function(fam17_disable_c6, NULL, 0); put_cpu_maps(); } @@ -1294,8 +1294,8 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) amd_check_zenbleed(); amd_check_erratum_1485(); - if (zen2_c6_disabled) - zen2_disable_c6(NULL); + if (fam17_c6_disabled) + fam17_disable_c6(NULL); check_syscfg_dram_mod_en(); @@ -1307,7 +1307,7 @@ const struct cpu_dev amd_cpu_dev = { .c_init = init_amd, }; -static int __init cf_check zen2_c6_errata_check(void) +static int __init cf_check amd_check_erratum_1474(void) { /* * Errata #1474: A Core May Hang After About 1044 Days @@ -1315,7 +1315,8 @@ static int __init cf_check zen2_c6_errata_check(void) */ s_time_t delta; - if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17 || !is_zen2_uarch()) + if (cpu_has_hypervisor || + (boot_cpu_data.x86 != 0x17 && boot_cpu_data.x86 != 0x18)) return 0; /* @@ -1330,10 +1331,10 @@ static int __init cf_check zen2_c6_errata_check(void) if (delta > 0) { static struct timer errata_c6; - init_timer(&errata_c6, zen2_disable_c6, NULL, 0); + init_timer(&errata_c6, fam17_disable_c6, NULL, 0); set_timer(&errata_c6, NOW() + delta); } else - zen2_disable_c6(NULL); + fam17_disable_c6(NULL); return 0; } @@ -1341,4 +1342,4 @@ static int __init cf_check zen2_c6_errata_check(void) * Must be executed after early_time_init() for tsc_ticks2ns() to have been * calibrated. That prevents us doing the check in init_amd(). */ -presmp_initcall(zen2_c6_errata_check); +presmp_initcall(amd_check_erratum_1474); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 09:22:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 09:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674898.1050058 (Exim 4.92) (envelope-from ) id 1rVpkT-0003mm-0u; Fri, 02 Feb 2024 09:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674898.1050058; Fri, 02 Feb 2024 09: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 1rVpkS-0003me-Uf; Fri, 02 Feb 2024 09:22:12 +0000 Received: by outflank-mailman (input) for mailman id 674898; Fri, 02 Feb 2024 09:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkR-0003mU-PD for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkR-0004er-NQ for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVpkR-0007DP-Kc for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09: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=yo0k9htEiPILV9g0ZPii7r+F4bSjrp/HqX2wsugp2sM=; b=Vo1VAhgdl77vLZxIWLSU8SsuOG dEd4e/pcQJPwzE0nRDJ4nxLCE5+ThI3Xq/IQdMlfmcmcnEIDNgp+aZghA4w9tJOb4SxN7iphcjLau vVpw3nse3sx8Q0YiwDJ+pORdxCIJJQcqszMQO22f4a5Xdlbr8+7mzTcI3fUpg108EMD0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] CirrusCI: drop FreeBSD 12 Message-Id: Date: Fri, 02 Feb 2024 09:22:11 +0000 commit b26c30a408255454f8ceb4e49e3c4385aa32fbc3 Author: Roger Pau Monné AuthorDate: Thu Feb 1 17:58:59 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 17:58:59 2024 +0100 CirrusCI: drop FreeBSD 12 Went EOL by the end of December 2023, and the pkg repos have been shut down. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: c2ce3466472e9c9eda79f5dc98eb701bc6fdba20 master date: 2024-01-15 12:20:11 +0100 --- .cirrus.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7e0beb200d..63f3afb104 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,12 +14,6 @@ freebsd_template: &FREEBSD_TEMPLATE - ./configure --with-system-seabios=/usr/local/share/seabios/bios.bin - gmake -j`sysctl -n hw.ncpu` clang=y -task: - name: 'FreeBSD 12' - freebsd_instance: - image_family: freebsd-12-4 - << : *FREEBSD_TEMPLATE - task: name: 'FreeBSD 13' freebsd_instance: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 09:22:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 09:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674899.1050061 (Exim 4.92) (envelope-from ) id 1rVpkd-0003pQ-2N; Fri, 02 Feb 2024 09:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674899.1050061; Fri, 02 Feb 2024 09: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 1rVpkc-0003pJ-W6; Fri, 02 Feb 2024 09:22:22 +0000 Received: by outflank-mailman (input) for mailman id 674899; Fri, 02 Feb 2024 09:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkb-0003p9-RC for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkb-0004f5-QS for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVpkb-0007Dx-PW for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09: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=yacq7mErTv2QJfnxkEdstP4c58PeTPYRwhSUSd/gDDQ=; b=QsZ30qEkSrqUusRloJv3/8v55D 1vIE0ZbsHITuKxyY6jT2ly43YrGuQlxBCsVN4sK4gEu3gq+iATDUlzBQ7JzTg94loiv9rDY1gWFI8 B9fsl+mJLsw3bM2GDldeaWQQn0epNXJa9zQKEeG28r0OYGVm6+yVjsqvWSflue/O7QT0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/intel: ensure Global Performance Counter Control is setup correctly Message-Id: Date: Fri, 02 Feb 2024 09:22:21 +0000 commit 6ccf064b0ce1d06449565129ab944b4fd9531b3a Author: Roger Pau Monné AuthorDate: Thu Feb 1 17:59:25 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 17:59:25 2024 +0100 x86/intel: ensure Global Performance Counter Control is setup correctly When Architectural Performance Monitoring is available, the PERF_GLOBAL_CTRL MSR contains per-counter enable bits that is ANDed with the enable bit in the counter EVNTSEL MSR in order for a PMC counter to be enabled. So far the watchdog code seems to have relied on the PERF_GLOBAL_CTRL enable bits being set by default, but at least on some Intel Sapphire and Emerald Rapids this is no longer the case, and Xen reports: Testing NMI watchdog on all CPUs: 0 40 stuck The first CPU on each package is started with PERF_GLOBAL_CTRL zeroed, so PMC0 doesn't start counting when the enable bit in EVNTSEL0 is set, due to the relevant enable bit in PERF_GLOBAL_CTRL not being set. Check and adjust PERF_GLOBAL_CTRL during CPU initialization so that all the general-purpose PMCs are enabled. Doing so brings the state of the package-BSP PERF_GLOBAL_CTRL in line with the rest of the CPUs on the system. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: 6bdb965178bbb3fc50cd4418d4770a7789956e2c master date: 2024-01-17 10:40:52 +0100 --- xen/arch/x86/cpu/intel.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index a8ba3191e6..aef8e4506c 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -533,9 +533,30 @@ static void cf_check init_intel(struct cpuinfo_x86 *c) init_intel_cacheinfo(c); if (c->cpuid_level > 9) { unsigned eax = cpuid_eax(10); + unsigned int cnt = (eax >> 8) & 0xff; + /* Check for version and the number of counters */ - if ((eax & 0xff) && (((eax>>8) & 0xff) > 1)) + if ((eax & 0xff) && (cnt > 1) && (cnt <= 32)) { + uint64_t global_ctrl; + unsigned int cnt_mask = (1UL << cnt) - 1; + + /* + * On (some?) Sapphire/Emerald Rapids platforms each + * package-BSP starts with all the enable bits for the + * general-purpose PMCs cleared. Adjust so counters + * can be enabled from EVNTSEL. + */ + rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, global_ctrl); + if ((global_ctrl & cnt_mask) != cnt_mask) { + printk("CPU%u: invalid PERF_GLOBAL_CTRL: %#" + PRIx64 " adjusting to %#" PRIx64 "\n", + smp_processor_id(), global_ctrl, + global_ctrl | cnt_mask); + wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, + global_ctrl | cnt_mask); + } __set_bit(X86_FEATURE_ARCH_PERFMON, c->x86_capability); + } } if ( !cpu_has(c, X86_FEATURE_XTOPOLOGY) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 09:22:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 09:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674900.1050066 (Exim 4.92) (envelope-from ) id 1rVpkn-0003sB-3u; Fri, 02 Feb 2024 09:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674900.1050066; Fri, 02 Feb 2024 09: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 1rVpkn-0003s3-1J; Fri, 02 Feb 2024 09:22:33 +0000 Received: by outflank-mailman (input) for mailman id 674900; Fri, 02 Feb 2024 09:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkm-0003rt-1t for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkl-0004fG-TZ for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVpkl-0007EQ-So for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09: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=cA7Zj+rvUYHVydKR0OJQQMff5qG/tunff3D1Hx6gUQQ=; b=4qfISGQ8KnXRVsNN44cuNCfVa5 3GG1iZy0vs5AP1H9r3skhHm9ceBTo9JMVTqbPJYL09g6tDQRdJHS96eHT3vVxS5DZUMvHk1lzqVOu VpRjdUIeuQ4lia+0Uie0AIOM3s5HvRlYXA1yFtnn3Y6GXPgSVO/OLYDraZ7P/TzCQY90=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/vmx: Fix IRQ handling for EXIT_REASON_INIT Message-Id: Date: Fri, 02 Feb 2024 09:22:31 +0000 commit 4cc0f88c42f374c7a8e2d05e38777fa18619482e Author: Andrew Cooper AuthorDate: Thu Feb 1 17:59:57 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 17:59:57 2024 +0100 x86/vmx: Fix IRQ handling for EXIT_REASON_INIT When receiving an INIT, a prior bugfix tried to ignore the INIT and continue onwards. Unfortunately it's not safe to return at that point in vmx_vmexit_handler(). Just out of context in the first hunk is a local_irqs_enabled() which is depended-upon by the return-to-guest path, causing the following checklock failure in debug builds: (XEN) Error: INIT received - ignoring (XEN) CHECKLOCK FAILURE: prev irqsafe: 0, curr irqsafe 1 (XEN) Xen BUG at common/spinlock.c:132 (XEN) ----[ Xen-4.19-unstable x86_64 debug=y Tainted: H ]---- ... (XEN) Xen call trace: (XEN) [] R check_lock+0xcd/0xe1 (XEN) [] F _spin_lock+0x1b/0x60 (XEN) [] F pt_update_irq+0x32/0x3bb (XEN) [] F vmx_intr_assist+0x3b/0x51d (XEN) [] F vmx_asm_vmexit_handler+0xf7/0x210 Luckily, this is benign in release builds. Accidentally having IRQs disabled when trying to take an IRQs-on lock isn't a deadlock-vulnerable pattern. Drop the problematic early return. In hindsight, it's wrong to skip other normal VMExit steps. Fixes: b1f11273d5a7 ("x86/vmx: Don't spuriously crash the domain when INIT is received") Reported-by: Reima ISHII Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: d1f8883aebe00f6a9632d77ab0cd5c6d02c9cbe4 master date: 2024-01-18 20:59:06 +0000 --- xen/arch/x86/hvm/vmx/vmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 1edc7f1e91..964891934b 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4100,7 +4100,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_INIT: printk(XENLOG_ERR "Error: INIT received - ignoring\n"); - return; /* Renter the guest without further processing */ + break; } /* Now enable interrupts so it's safe to take locks. */ @@ -4385,6 +4385,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; } case EXIT_REASON_EXTERNAL_INTERRUPT: + case EXIT_REASON_INIT: /* Already handled above. */ break; case EXIT_REASON_TRIPLE_FAULT: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 09:22:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 09:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674901.1050070 (Exim 4.92) (envelope-from ) id 1rVpkx-0003ut-5k; Fri, 02 Feb 2024 09:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674901.1050070; Fri, 02 Feb 2024 09: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 1rVpkx-0003ul-2n; Fri, 02 Feb 2024 09:22:43 +0000 Received: by outflank-mailman (input) for mailman id 674901; Fri, 02 Feb 2024 09:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkw-0003uS-1R for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpkw-0004fN-0e for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVpkv-0007Et-Vy for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09: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=RG9Dl26s3Z3kcbOsPB/ApS4xurnKeGqJEZUBkkQCeME=; b=Mzr3JLjjSehrN4Rnk3IQxKmTzA V6s9SPwsHnClyHvcWYfHGg4l4F82XYlYhQhCNe0z9yZjkCVXdClR8ZEOQmUUumiReP3LNQAzV/874 s/09x+gIcKDO4+eiCipZ14+EurAJ/vJlc28SYzDXnP43tsMxnd2UlYShhHuvCehNe40s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/vmx: Disallow the use of inactivity states Message-Id: Date: Fri, 02 Feb 2024 09:22:41 +0000 commit 00550e808c10c67710ebb8867200eda1fbee332c Author: Andrew Cooper AuthorDate: Thu Feb 1 18:00:32 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 18:00:32 2024 +0100 x86/vmx: Disallow the use of inactivity states Right now, vvmx will blindly copy L12's ACTIVITY_STATE into the L02 VMCS and enter the vCPU. Luckily for us, nested-virt is explicitly unsupported for security bugs. The inactivity states are HLT, SHUTDOWN and WAIT-FOR-SIPI, and as noted by the SDM in Vol3 27.7 "Special Features of VM Entry": If VM entry ends with the logical processor in an inactive activity state, the VM entry generates any special bus cycle that is normally generated when that activity state is entered from the active state. Also, Some activity states unconditionally block certain events. I.e. A VMEntry with ACTIVITY=SHUTDOWN will initiate a platform reset, while a VMEntry with ACTIVITY=WAIT-FOR-SIPI will really block everything other than SIPIs. Both of these activity states are for the TXT ACM to use, not for regular hypervisors, and Xen doesn't support dropping the HLT intercept either. There are two paths in Xen which operate on ACTIVITY_STATE. 1) The vmx_{get,set}_nonreg_state() helpers for VM-Fork. As regular VMs can't use any inactivity states, this is just duplicating the 0 from construct_vmcs(). Retain the ability to query activity_state, but crash the domain on any attempt to set an inactivity state. 2) Nested virt, because of ACTIVITY_STATE in vmcs_gstate_field[]. Explicitly hide the inactivity states in the guest's view of MSR_VMX_MISC, and remove ACTIVITY_STATE from vmcs_gstate_field[]. In virtual_vmentry(), we should trigger a VMEntry failure for the use of any inactivity states, but there's no support for that in the code at all so leave a TODO for when we finally start working on nested-virt in earnest. Reported-by: Reima Ishii Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tamas K Lengyel master commit: 3643bb53a05b7c8fbac072c63bef1538f2a6d0d2 master date: 2024-01-18 20:59:06 +0000 --- xen/arch/x86/hvm/vmx/vmx.c | 5 ++++- xen/arch/x86/hvm/vmx/vvmx.c | 9 +++++++-- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 964891934b..28dece7c6b 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1558,7 +1558,10 @@ static void cf_check vmx_set_nonreg_state(struct vcpu *v, { vmx_vmcs_enter(v); - __vmwrite(GUEST_ACTIVITY_STATE, nrs->vmx.activity_state); + if ( nrs->vmx.activity_state ) + domain_crash(v->domain, "Attempt to set %pv activity_state %#lx\n", + v, nrs->vmx.activity_state); + __vmwrite(GUEST_INTERRUPTIBILITY_INFO, nrs->vmx.interruptibility_info); __vmwrite(GUEST_PENDING_DBG_EXCEPTIONS, nrs->vmx.pending_dbg); diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 16b0ef82b6..fd0ae39166 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -899,7 +899,10 @@ static const u16 vmcs_gstate_field[] = { GUEST_LDTR_AR_BYTES, GUEST_TR_AR_BYTES, GUEST_INTERRUPTIBILITY_INFO, + /* + * ACTIVITY_STATE is handled specially. GUEST_ACTIVITY_STATE, + */ GUEST_SYSENTER_CS, GUEST_PREEMPTION_TIMER, /* natural */ @@ -1200,6 +1203,8 @@ static void virtual_vmentry(struct cpu_user_regs *regs) nvcpu->nv_vmentry_pending = 0; nvcpu->nv_vmswitch_in_progress = 1; + /* TODO: Fail VMentry for GUEST_ACTIVITY_STATE != 0 */ + /* * EFER handling: * hvm_set_efer won't work if CR0.PG = 1, so we change the value @@ -2316,8 +2321,8 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) data = hvm_cr4_guest_valid_bits(d); break; case MSR_IA32_VMX_MISC: - /* Do not support CR3-target feature now */ - data = host_data & ~VMX_MISC_CR3_TARGET; + /* Do not support CR3-targets or activity states. */ + data = host_data & ~(VMX_MISC_CR3_TARGET | VMX_MISC_ACTIVITY_MASK); break; case MSR_IA32_VMX_EPT_VPID_CAP: data = nept_get_ept_vpid_cap(); diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h index d07fcb2bc9..8de9977eb3 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h @@ -277,6 +277,7 @@ extern u32 vmx_secondary_exec_control; #define VMX_VPID_INVVPID_SINGLE_CONTEXT_RETAINING_GLOBAL 0x80000000000ULL extern u64 vmx_ept_vpid_cap; +#define VMX_MISC_ACTIVITY_MASK 0x000001c0 #define VMX_MISC_PROC_TRACE 0x00004000 #define VMX_MISC_CR3_TARGET 0x01ff0000 #define VMX_MISC_VMWRITE_ALL 0x20000000 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 09:22:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 09:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674902.1050073 (Exim 4.92) (envelope-from ) id 1rVpl7-0003xY-7D; Fri, 02 Feb 2024 09:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674902.1050073; Fri, 02 Feb 2024 09:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpl7-0003xR-4N; Fri, 02 Feb 2024 09:22:53 +0000 Received: by outflank-mailman (input) for mailman id 674902; Fri, 02 Feb 2024 09:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpl6-0003xB-4I for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVpl6-0004fU-3X for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVpl6-0007FM-2f for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09: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=NW1R0UJIkIGJEuC2rgp2K5Z3nt7XRdt7b1zTm3m+IyQ=; b=U9gE2l4/hfhO4X7JqSW1XV6lSu Sbwt23RaXVgQRQS08KpJMA4uFUq7rPbcrPcRBzpKLDKxRe73dr137jtyeqBDEne10qfhvYjJvjOC9 UuPgnl3Md8nboupRwxiD6rCRioPvGnfp8hITkrNIwGj9HAbW+KNu9pJkiFoxg9zJGXyc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] lib{fdt,elf}: move lib{fdt,elf}-temp.o and their deps to $(targets) Message-Id: Date: Fri, 02 Feb 2024 09:22:52 +0000 commit 579a622eb41cf4e1ae4d94100985a81eebda23b9 Author: Michal Orzel AuthorDate: Thu Feb 1 18:01:27 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 18:01:27 2024 +0100 lib{fdt,elf}: move lib{fdt,elf}-temp.o and their deps to $(targets) At the moment, trying to run xencov read/reset (calling SYSCTL_coverage_op under the hood) results in a crash. This is due to a profiler trying to access data in the .init.* sections (libfdt for Arm and libelf for x86) that are stripped after boot. Normally, the build system compiles any *.init.o file without COV_FLAGS. However, these two libraries are handled differently as sections will be renamed to init after linking. To override COV_FLAGS to empty for these libraries, lib{fdt,elf}.o were added to nocov-y. This worked until e321576f4047 ("xen/build: start using if_changed") that added lib{fdt,elf}-temp.o and their deps to extra-y. This way, even though these objects appear as prerequisites of lib{fdt,elf}.o and the settings should propagate to them, make can also build them as a prerequisite of __build, in which case COV_FLAGS would still have the unwanted flags. Fix it by switching to $(targets) instead. Also, for libfdt, append libfdt.o to nocov-y only if CONFIG_OVERLAY_DTB is not set. Otherwise, there is no section renaming and we should be able to run the coverage. Fixes: e321576f4047 ("xen/build: start using if_changed") Signed-off-by: Michal Orzel Reviewed-by: Anthony PERARD Acked-by: Jan Beulich master commit: 79519fcfa0605bbf19d8c02b979af3a2c8afed68 master date: 2024-01-23 12:02:44 +0100 --- xen/common/libelf/Makefile | 2 +- xen/common/libfdt/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/libelf/Makefile b/xen/common/libelf/Makefile index 8a4522e4e1..917d12b006 100644 --- a/xen/common/libelf/Makefile +++ b/xen/common/libelf/Makefile @@ -13,4 +13,4 @@ $(obj)/libelf.o: $(obj)/libelf-temp.o FORCE $(obj)/libelf-temp.o: $(addprefix $(obj)/,$(libelf-objs)) FORCE $(call if_changed,ld) -extra-y += libelf-temp.o $(libelf-objs) +targets += libelf-temp.o $(libelf-objs) diff --git a/xen/common/libfdt/Makefile b/xen/common/libfdt/Makefile index d50487aa6e..6ce679f98f 100644 --- a/xen/common/libfdt/Makefile +++ b/xen/common/libfdt/Makefile @@ -5,10 +5,10 @@ SECTIONS := text data $(SPECIAL_DATA_SECTIONS) # For CONFIG_OVERLAY_DTB, libfdt functionalities will be needed during runtime. ifneq ($(CONFIG_OVERLAY_DTB),y) OBJCOPYFLAGS := $(foreach s,$(SECTIONS),--rename-section .$(s)=.init.$(s)) +nocov-y += libfdt.o endif obj-y += libfdt.o -nocov-y += libfdt.o CFLAGS-y += -I$(srctree)/include/xen/libfdt/ @@ -18,4 +18,4 @@ $(obj)/libfdt.o: $(obj)/libfdt-temp.o FORCE $(obj)/libfdt-temp.o: $(addprefix $(obj)/,$(LIBFDT_OBJS)) FORCE $(call if_changed,ld) -extra-y += libfdt-temp.o $(LIBFDT_OBJS) +targets += libfdt-temp.o $(LIBFDT_OBJS) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 09:23:03 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 09:23:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674903.1050077 (Exim 4.92) (envelope-from ) id 1rVplH-000419-A5; Fri, 02 Feb 2024 09:23:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674903.1050077; Fri, 02 Feb 2024 09:23:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVplH-000412-7a; Fri, 02 Feb 2024 09:23:03 +0000 Received: by outflank-mailman (input) for mailman id 674903; Fri, 02 Feb 2024 09:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVplG-00040n-7L for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVplG-0004i0-6g for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVplG-0007Fz-5k for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09: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=ol3KubXqqYuEKsLqgGA1FKRKV4EMdIx3+hbGzkunLr8=; b=w8pwNq6oR3GQZS1wdXAAApUlun UikTf5cnLWLZS4abB3rCGx42g8NOzb5/LSIfwedOqMF5rTBiaFQy6UFy6ZiCodDMROq2aQ600WDqm XIGPEHpRw5dPM/dPcZ+sMINxIYiD2a+etoJYGxjUbCuns5jQibOhHjlwEChNFoKK9W6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/p2m-pt: fix off by one in entry check assert Message-Id: Date: Fri, 02 Feb 2024 09:23:02 +0000 commit 295ab8060d95ed8c365077946c7faf8793099ef8 Author: Roger Pau Monné AuthorDate: Thu Feb 1 18:01:52 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 18:01:52 2024 +0100 x86/p2m-pt: fix off by one in entry check assert The MMIO RO rangeset overlap check is bogus: the rangeset is inclusive so the passed end mfn should be the last mfn to be mapped (not last + 1). Fixes: 6fa1755644d0 ('amd/npt/shadow: replace assert that prevents creating 2M/1G MMIO entries') Signed-off-by: Roger Pau Monné Reviewed-by: George Dunlap master commit: 610775d0dd61c1bd2f4720c755986098e6a5bafd master date: 2024-01-25 16:09:04 +0100 --- xen/arch/x86/mm/p2m-pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index b2b14746c1..88d3733891 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -552,7 +552,7 @@ static void check_entry(mfn_t mfn, p2m_type_t new, p2m_type_t old, if ( new == p2m_mmio_direct ) ASSERT(!mfn_eq(mfn, INVALID_MFN) && !rangeset_overlaps_range(mmio_ro_ranges, mfn_x(mfn), - mfn_x(mfn) + (1UL << order))); + mfn_x(mfn) + (1UL << order) - 1)); else if ( p2m_allows_invalid_mfn(new) || new == p2m_invalid || new == p2m_mmio_dm ) ASSERT(mfn_valid(mfn) || mfn_eq(mfn, INVALID_MFN)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 09:23:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 09:23:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.674904.1050082 (Exim 4.92) (envelope-from ) id 1rVplR-000440-Bc; Fri, 02 Feb 2024 09:23:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674904.1050082; Fri, 02 Feb 2024 09: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 1rVplR-00043s-91; Fri, 02 Feb 2024 09:23:13 +0000 Received: by outflank-mailman (input) for mailman id 674904; Fri, 02 Feb 2024 09:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVplQ-00043e-AV for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVplQ-0004iL-9q for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVplQ-0007GX-8v for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 09: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=XDG4hly10qeDtBQbJBOKOq06KYGQFquLRSkMnHZ4+Sk=; b=z+zS+AwhOiaaJyFXbKB7wJesv5 9RWsJabfqC6bs8EMjzddo9u5H9aqbTmMV6eXYgP4XCsXHd/eH3LyCQevUTmfS6CwEUNPmRbfNkmJT asIVZ5M3b0rEPtpOaOxjzUwwWMJMyWzrRobxCC0qVTVk9ugVZJwUen0kWvMRdb4kUmMM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.18] x86/ucode: Fix stability of the raw CPU Policy rescan Message-Id: Date: Fri, 02 Feb 2024 09:23:12 +0000 commit b1fdd7d0e47e0831ac7a99d0417385fc10d3068c Author: Andrew Cooper AuthorDate: Thu Feb 1 18:02:24 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 18:02:24 2024 +0100 x86/ucode: Fix stability of the raw CPU Policy rescan Always run microcode_update_helper() on the BSP, so the the updated Raw CPU policy doesn't get non-BSP topology details included. Have calculate_raw_cpu_policy() clear the instantanious XSTATE sizes. The value XCR0 | MSR_XSS had when we scanned the policy isn't terribly interesting to report. When CPUID Masking is active, it affects CPUID instructions issued by Xen too. Transiently disable masking to get a clean scan. Fixes: 694d79ed5aac ("x86/ucode: Refresh raw CPU policy after microcode load") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: cf7fe8b72deaa94157ddf97d4bb391480205e9c2 master date: 2024-01-25 17:46:57 +0000 --- xen/arch/x86/cpu-policy.c | 7 +++++++ xen/arch/x86/cpu/microcode/core.c | 20 +++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index 81e574390f..bcb17b7ce3 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -353,6 +353,13 @@ void calculate_raw_cpu_policy(void) /* Nothing good will come from Xen and libx86 disagreeing on vendor. */ ASSERT(p->x86_vendor == boot_cpu_data.x86_vendor); + /* + * Clear the truly dynamic fields. These vary with the in-context XCR0 + * and MSR_XSS, and aren't interesting fields in the raw policy. + */ + p->xstate.raw[0].b = 0; + p->xstate.raw[1].b = 0; + /* 0x000000ce MSR_INTEL_PLATFORM_INFO */ /* Was already added by probe_cpuid_faulting() */ } diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 65ebeb50de..4e011cdc41 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -680,8 +680,18 @@ static long cf_check microcode_update_helper(void *data) microcode_update_cache(patch); spin_unlock(µcode_mutex); - /* Refresh the raw CPU policy, in case the features have changed. */ + /* + * Refresh the raw CPU policy, in case the features have changed. + * Disable CPUID masking if in use, to avoid having current's + * cpu_policy affect the rescan. + */ + if ( ctxt_switch_masking ) + alternative_vcall(ctxt_switch_masking, NULL); + calculate_raw_cpu_policy(); + + if ( ctxt_switch_masking ) + alternative_vcall(ctxt_switch_masking, current); } else microcode_free_patch(patch); @@ -721,8 +731,12 @@ int microcode_update(XEN_GUEST_HANDLE(const_void) buf, unsigned long len) } buffer->len = len; - return continue_hypercall_on_cpu(smp_processor_id(), - microcode_update_helper, buffer); + /* + * Always queue microcode_update_helper() on CPU0. Most of the logic + * won't care, but the update of the Raw CPU policy wants to (re)run on + * the BSP. + */ + return continue_hypercall_on_cpu(0, microcode_update_helper, buffer); } static int __init cf_check microcode_init(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18 From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 19:22:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 19:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675180.1050420 (Exim 4.92) (envelope-from ) id 1rVz6x-0000us-8g; Fri, 02 Feb 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 675180.1050420; Fri, 02 Feb 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 1rVz6x-0000uk-62; Fri, 02 Feb 2024 19:22:03 +0000 Received: by outflank-mailman (input) for mailman id 675180; Fri, 02 Feb 2024 19:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVz6v-0000uS-Pc for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVz6v-0007VQ-Og for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVz6v-0000LI-LT for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wBgKWnNowRbZRG8hm38ZyifO9RyLJe2B46TNgkzEXek=; b=A2+sqskxRWBe0iBevTxVexqijt Xm5RURWGY57P7W590vPzneFnullQDIiUifw6s5XjrbpK87kHzmpSmEpRJEZXA+l+AJWi99auM2zCM TdLVNANPoAD/Wb2gb1zT+mU5O0Ar6Rv+hXSpQ5IWr+yL8e8ijI3cy4zvKsjCcnyqW44g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PoD: simplify / improve p2m_pod_cache_add() Message-Id: Date: Fri, 02 Feb 2024 19:22:01 +0000 commit d3df0f180fe4e6545f7fa4817683bcdb7861741e Author: Jan Beulich AuthorDate: Thu Feb 1 16:18:28 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 16:18:28 2024 +0100 x86/PoD: simplify / improve p2m_pod_cache_add() Avoid recurring MFN -> page or page -> MFN translations. Drop the pretty pointless local variable "p". Make sure the MFN logged in a debugging error message is actually the offending one. Return negative errno values rather than -1 (presently no caller really cares, but imo this should change). Adjust style. Signed-off-by: Jan Beulich Reviewed-by: George Dunlap --- xen/arch/x86/mm/p2m-pod.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 9e5ad68df2..bc78c61062 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -48,34 +48,27 @@ p2m_pod_cache_add(struct p2m_domain *p2m, unsigned int order) { unsigned long i; - struct page_info *p; struct domain *d = p2m->domain; + mfn_t mfn = page_to_mfn(page); #ifndef NDEBUG - mfn_t mfn; - - mfn = page_to_mfn(page); - /* Check to make sure this is a contiguous region */ if ( mfn_x(mfn) & ((1UL << order) - 1) ) { printk("%s: mfn %lx not aligned order %u! (mask %lx)\n", __func__, mfn_x(mfn), order, ((1UL << order) - 1)); - return -1; + return -EINVAL; } - for ( i = 0; i < 1UL << order ; i++) + for ( i = 0; i < (1UL << order); i++) { - struct domain * od; + const struct domain *od = page_get_owner(page + i); - p = mfn_to_page(mfn_add(mfn, i)); - od = page_get_owner(p); if ( od != d ) { - printk("%s: mfn %lx expected owner d%d, got owner d%d!\n", - __func__, mfn_x(mfn), d->domain_id, - od ? od->domain_id : -1); - return -1; + printk("%s: mfn %lx owner: expected %pd, got %pd\n", + __func__, mfn_x(mfn) + i, d, od); + return -EACCES; } } #endif @@ -88,16 +81,12 @@ p2m_pod_cache_add(struct p2m_domain *p2m, * promise to provide zero pages. So we scrub pages before using. */ for ( i = 0; i < (1UL << order); i++ ) - clear_domain_page(mfn_add(page_to_mfn(page), i)); + clear_domain_page(mfn_add(mfn, i)); /* First, take all pages off the domain list */ lock_page_alloc(p2m); - for ( i = 0; i < 1UL << order ; i++ ) - { - p = page + i; - page_list_del(p, &d->page_list); - } - + for ( i = 0; i < (1UL << order); i++ ) + page_list_del(page + i, &d->page_list); unlock_page_alloc(p2m); /* Then add to the appropriate populate-on-demand list. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 19:22:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 19:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675181.1050423 (Exim 4.92) (envelope-from ) id 1rVz77-00010I-9z; Fri, 02 Feb 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 675181.1050423; Fri, 02 Feb 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 1rVz77-00010B-7Q; Fri, 02 Feb 2024 19:22:13 +0000 Received: by outflank-mailman (input) for mailman id 675181; Fri, 02 Feb 2024 19:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVz75-0000zW-TC for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVz75-0007Vo-SM for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVz75-0000Mr-Qo for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19: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=tgLn51Nldp47iIgajj+9QQDOmWjVj70TXN1NzQMZ3Ns=; b=SRMRkn2ancIvxU8IbytlYc9vRK xc0qa6x3HP13oRUTEf8s2DKTtd45mxHs4G7JSOpoULrnU1LnhEaQ1IrRz83L9upn27PUqyA78adCg h9ouuaduJB0xrWpUL7YAeOdphallqW0G9UCh07b8/I/FqkweEglJG5NBdr+rW9ah1cn0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xenpm: Print message for disabled commands Message-Id: Date: Fri, 02 Feb 2024 19:22:11 +0000 commit 18cd98490545de0cfc1b326abeddd9b1188c0bd2 Author: Jason Andryuk AuthorDate: Thu Feb 1 16:19:36 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 16:19:36 2024 +0100 xenpm: Print message for disabled commands xenpm get-cpufreq-states currently just prints no output when cpufreq is disabled or HWP is running. Have it print an appropriate message. The cpufreq disabled one mirrors the cpuidle disabled one. cpufreq disabled: $ xenpm get-cpufreq-states Either Xen cpufreq is disabled or no valid information is registered! Under HWP: $ xenpm get-cpufreq-states P-State information not supported. Try 'get-cpufreq-average' or 'start'. Also allow xenpm to handle EOPNOTSUPP from the pmstat hypercalls. EOPNOTSUPP is returned when HWP is active in some cases and allows the differentiation from cpufreq being disabled. Signed-off-by: Jason Andryuk Acked-by: Jan Beulich --- tools/misc/xenpm.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index d982482a3f..336d246346 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -362,7 +362,15 @@ static int show_pxstat_by_cpuid(xc_interface *xc_handle, int cpuid) ret = get_pxstat_by_cpuid(xc_handle, cpuid, &pxstatinfo); if ( ret ) + { + if ( ret == -ENODEV ) + fprintf(stderr, + "Either Xen cpufreq is disabled or no valid information is registered!\n"); + else if ( ret == -EOPNOTSUPP ) + fprintf(stderr, + "P-State information not supported. Try 'get-cpufreq-average' or 'start'.\n"); return ret; + } print_pxstat(cpuid, &pxstatinfo); @@ -383,8 +391,12 @@ void pxstat_func(int argc, char *argv[]) /* show pxstates on all cpus */ int i; for ( i = 0; i < max_cpu_nr; i++ ) - if ( show_pxstat_by_cpuid(xc_handle, i) == -ENODEV ) + { + int ret = show_pxstat_by_cpuid(xc_handle, i); + + if ( ret == -ENODEV || ret == -EOPNOTSUPP ) break; + } } else show_pxstat_by_cpuid(xc_handle, cpuid); @@ -432,7 +444,7 @@ static uint64_t *sum, *sum_cx, *sum_px; static void signal_int_handler(int signo) { - int i, j, k; + int i, j, k, ret; struct timeval tv; int cx_cap = 0, px_cap = 0; xc_cputopo_t *cputopo = NULL; @@ -473,7 +485,8 @@ static void signal_int_handler(int signo) } } - if ( get_pxstat_by_cpuid(xc_handle, 0, NULL) != -ENODEV ) + ret = get_pxstat_by_cpuid(xc_handle, 0, NULL); + if ( ret != -ENODEV && ret != -EOPNOTSUPP ) { px_cap = 1; for ( i = 0; i < max_cpu_nr; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 19:22:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 19:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675182.1050428 (Exim 4.92) (envelope-from ) id 1rVz7H-00017a-Bm; Fri, 02 Feb 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 675182.1050428; Fri, 02 Feb 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 1rVz7H-00017S-8x; Fri, 02 Feb 2024 19:22:23 +0000 Received: by outflank-mailman (input) for mailman id 675182; Fri, 02 Feb 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 1rVz7G-000170-12 for xen-changelog@lists.xenproject.org; Fri, 02 Feb 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 1rVz7G-0007Vy-0A for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVz7F-0000Na-Uf for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19: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=NqrywMWsz/MlrNC1T2HhmlQI7V4KGEcjIR+GGi7cPQo=; b=phsX/IaQJlbIBwHiKiodWVINAj n6A/1dOBphUwCj3SZBpiExcd4YVAGMLHKSM6cgenlUXka2aIOc4aMg9iX5AZ4ftjA+0zOe1putAVT Ei7gl6TMjBdqoNPRAtOLxYlFqRo3qELOzUVv0xHKNUHOQ8erabEQh4vwblfDAe1zy7nE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/page_alloc: introduce init_free_page_fields() helper Message-Id: Date: Fri, 02 Feb 2024 19:22:21 +0000 commit 1aee91fe9824d0b33fddbf548add5df1e63a94ad Author: Carlo Nonato AuthorDate: Thu Feb 1 16:19:51 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 16:19:51 2024 +0100 xen/page_alloc: introduce init_free_page_fields() helper Introduce a new helper to initialize fields that have different uses for free pages. Signed-off-by: Carlo Nonato Acked-by: Jan Beulich --- xen/common/page_alloc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 2f4f2859c4..2ec17df9b4 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -925,6 +925,13 @@ static struct page_info *get_free_buddy(unsigned int zone_lo, } } +/* Initialise fields which have other uses for free pages. */ +static void init_free_page_fields(struct page_info *pg) +{ + pg->u.inuse.type_info = PGT_TYPE_INFO_INITIALIZER; + page_set_owner(pg, NULL); +} + /* Allocate 2^@order contiguous pages. */ static struct page_info *alloc_heap_pages( unsigned int zone_lo, unsigned int zone_hi, @@ -1033,10 +1040,7 @@ static struct page_info *alloc_heap_pages( accumulate_tlbflush(&need_tlbflush, &pg[i], &tlbflush_timestamp); - /* Initialise fields which have other uses for free pages. */ - pg[i].u.inuse.type_info = PGT_TYPE_INFO_INITIALIZER; - page_set_owner(&pg[i], NULL); - + init_free_page_fields(&pg[i]); } spin_unlock(&heap_lock); @@ -2799,9 +2803,7 @@ static bool prepare_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, * to PGC_state_inuse. */ pg[i].count_info = PGC_static | PGC_state_inuse; - /* Initialise fields which have other uses for free pages. */ - pg[i].u.inuse.type_info = PGT_TYPE_INFO_INITIALIZER; - page_set_owner(&pg[i], NULL); + init_free_page_fields(&pg[i]); } spin_unlock(&heap_lock); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 19:22:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 19:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675184.1050432 (Exim 4.92) (envelope-from ) id 1rVz7R-0001Fu-E2; Fri, 02 Feb 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 675184.1050432; Fri, 02 Feb 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 1rVz7R-0001Fh-AP; Fri, 02 Feb 2024 19:22:33 +0000 Received: by outflank-mailman (input) for mailman id 675184; Fri, 02 Feb 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 1rVz7Q-0001FN-4U for xen-changelog@lists.xenproject.org; Fri, 02 Feb 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 1rVz7Q-0007W6-3n for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVz7Q-0000Nz-2U for xen-changelog@lists.xenproject.org; Fri, 02 Feb 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=0U0BV/u6Jw86grbD3KvF1sL+gZiz6JbOqPlybX0qb0M=; b=PTtCGatY6tC29LpkY979oCGGq1 F/wpUny1tj1jGiHczvjuBJnMG8+SibvM5BN4OQQpaJ4uptFHu8146wC2FKz3kVAXSdATtha57PA2v jmlvkImH/y2UU0R7FRk6ZRBQV0GXYe9VZqxpItzBhEOSHNp7r7LAlIkre65Bf5CkrnPQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] IOMMU: iommu_use_hap_pt() implies CONFIG_HVM Message-Id: Date: Fri, 02 Feb 2024 19:22:32 +0000 commit 9916fdff4b3e2955ed31113473699b111d78f385 Author: Jan Beulich AuthorDate: Thu Feb 1 16:21:04 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 16:21:04 2024 +0100 IOMMU: iommu_use_hap_pt() implies CONFIG_HVM Allow the compiler a little more room on DCE by moving the compile-time- constant condition into the predicate (from the one place where it was added in an open-coded fashion for XSA-450). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/xen/iommu.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 4244855032..54c4c0f9b9 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -438,7 +438,7 @@ static paddr_t domain_pgd_maddr(struct domain *d, paddr_t pgd_maddr, if ( pgd_maddr ) /* nothing */; - else if ( IS_ENABLED(CONFIG_HVM) && iommu_use_hap_pt(d) ) + else if ( iommu_use_hap_pt(d) ) { pagetable_t pgt = p2m_get_pagetable(p2m_get_hostp2m(d)); diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index f53d045e2c..a21f25df9f 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -381,7 +381,8 @@ struct domain_iommu { #define iommu_clear_feature(d, f) clear_bit(f, dom_iommu(d)->features) /* Are we using the domain P2M table as its IOMMU pagetable? */ -#define iommu_use_hap_pt(d) (dom_iommu(d)->hap_pt_share) +#define iommu_use_hap_pt(d) (IS_ENABLED(CONFIG_HVM) && \ + dom_iommu(d)->hap_pt_share) /* Does the IOMMU pagetable need to be kept synchronized with the P2M */ #ifdef CONFIG_HAS_PASSTHROUGH -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Feb 02 19:22:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Feb 2024 19:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675187.1050436 (Exim 4.92) (envelope-from ) id 1rVz7b-0001JO-Ed; Fri, 02 Feb 2024 19:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675187.1050436; Fri, 02 Feb 2024 19: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 1rVz7b-0001JC-Bo; Fri, 02 Feb 2024 19:22:43 +0000 Received: by outflank-mailman (input) for mailman id 675187; Fri, 02 Feb 2024 19:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVz7a-0001J2-AZ for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVz7a-0007WD-80 for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rVz7a-0000OQ-5n for xen-changelog@lists.xenproject.org; Fri, 02 Feb 2024 19: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=Q3Bxjw4/mNaH0tDUotQLIHhuLjCsCKBCLJTKFtzUWvU=; b=sxRUXMEDMM1yD8oAiRui07dyZ+ AsVAb9my7TlQqrYMIyn2yZTAy1cprsSq7gnNMrSdvtXhkK7wiakaxLG9MEpcAF4kxc0lA9ZPsQJzL eC1TXHQEkarWH3OGAz/B7+TZxuZN2p6JzRh/pp2ZPKckcWYeydtjd0Y55nbUbx2mK/vc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] shim: avoid building of vendor IOMMU code Message-Id: Date: Fri, 02 Feb 2024 19:22:42 +0000 commit bc45f20c01f1711bc56a4bb0955c49c182a5a03a Author: Jan Beulich AuthorDate: Thu Feb 1 16:21:51 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 1 16:21:51 2024 +0100 shim: avoid building of vendor IOMMU code There's no use for IOMMU code in the shim. Disable at least the vendor- specific code, until eventually IOMMU code can be disabled altogether. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/configs/pvshim_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig index a8ab1d4337..2ad27f898e 100644 --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -22,5 +22,7 @@ CONFIG_EXPERT=y # CONFIG_LIVEPATCH is not set # CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS is not set # CONFIG_TRACEBUFFER is not set +# CONFIG_AMD_IOMMU is not set +# CONFIG_INTEL_IOMMU is not set # CONFIG_DEBUG is not set # CONFIG_GDBSX is not set -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 05:55:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 05:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675310.1050658 (Exim 4.92) (envelope-from ) id 1rW8zY-0008L9-8x; Sat, 03 Feb 2024 05:55:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675310.1050658; Sat, 03 Feb 2024 05: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 1rW8zY-0008L1-6M; Sat, 03 Feb 2024 05:55:04 +0000 Received: by outflank-mailman (input) for mailman id 675310; Sat, 03 Feb 2024 05:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rW8zW-0008Kf-6N for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rW8zW-0007oD-5X for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rW8zW-0003qw-4Q for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FpdkHno074v3qvqSbOqJMrftqSgXNPMBloe5uCjLTgg=; b=lGgLbxuJKOtIUUhSuewy/imcgu VRXkk41ltn4Vrb/cHbvxxcJ0hSwIpc7AlmxZ35tOFraQdGWfXMz10pFZ5zRBfxHnCWd2EYICJ3gEx 5mKrpCJT/u3gqjWyC8i2N1r7um4lrTW6YpnIEaNZvBX2gCtCWXbXh++ufQjCRMplbef0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/amd: Extend CPU erratum #1474 fix to more affected models Message-Id: Date: Sat, 03 Feb 2024 05:55:02 +0000 commit abcc32f0634627fe21117a48bd10e792bfbdd6dc Author: Roger Pau Monné AuthorDate: Fri Feb 2 08:01:09 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 2 08:01:09 2024 +0100 x86/amd: Extend CPU erratum #1474 fix to more affected models Erratum #1474 has now been extended to cover models from family 17h ranges 00-2Fh, so the errata now covers all the models released under Family 17h (Zen, Zen+ and Zen2). Additionally extend the workaround to Family 18h (Hygon), since it's based on the Zen architecture and very likely affected. Rename all the zen2 related symbols to fam17, since the errata doesn't exclusively affect Zen2 anymore. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper master commit: 23db507a01a4ec5259ec0ab43d296a41b1c326ba master date: 2023-12-21 12:19:40 +0000 --- xen/arch/x86/cpu/amd.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 29ae97e7c0..3d85e9797d 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -54,7 +54,7 @@ bool __read_mostly amd_acpi_c1e_quirk; bool __ro_after_init amd_legacy_ssbd; bool __initdata amd_virt_spec_ctrl; -static bool __read_mostly zen2_c6_disabled; +static bool __read_mostly fam17_c6_disabled; static inline int rdmsr_amd_safe(unsigned int msr, unsigned int *lo, unsigned int *hi) @@ -951,24 +951,24 @@ void amd_check_zenbleed(void) val & chickenbit ? "chickenbit" : "microcode"); } -static void cf_check zen2_disable_c6(void *arg) +static void cf_check fam17_disable_c6(void *arg) { /* Disable C6 by clearing the CCR{0,1,2}_CC6EN bits. */ const uint64_t mask = ~((1ul << 6) | (1ul << 14) | (1ul << 22)); uint64_t val; - if (!zen2_c6_disabled) { + if (!fam17_c6_disabled) { printk(XENLOG_WARNING "Disabling C6 after 1000 days apparent uptime due to AMD errata 1474\n"); - zen2_c6_disabled = true; + fam17_c6_disabled = true; /* * Prevent CPU hotplug so that started CPUs will either see - * zen2_c6_disabled set, or will be handled by + * zen_c6_disabled set, or will be handled by * smp_call_function(). */ while (!get_cpu_maps()) process_pending_softirqs(); - smp_call_function(zen2_disable_c6, NULL, 0); + smp_call_function(fam17_disable_c6, NULL, 0); put_cpu_maps(); } @@ -1273,8 +1273,8 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) amd_check_zenbleed(); amd_check_erratum_1485(); - if (zen2_c6_disabled) - zen2_disable_c6(NULL); + if (fam17_c6_disabled) + fam17_disable_c6(NULL); check_syscfg_dram_mod_en(); @@ -1286,7 +1286,7 @@ const struct cpu_dev amd_cpu_dev = { .c_init = init_amd, }; -static int __init cf_check zen2_c6_errata_check(void) +static int __init cf_check amd_check_erratum_1474(void) { /* * Errata #1474: A Core May Hang After About 1044 Days @@ -1294,7 +1294,8 @@ static int __init cf_check zen2_c6_errata_check(void) */ s_time_t delta; - if (cpu_has_hypervisor || boot_cpu_data.x86 != 0x17 || !is_zen2_uarch()) + if (cpu_has_hypervisor || + (boot_cpu_data.x86 != 0x17 && boot_cpu_data.x86 != 0x18)) return 0; /* @@ -1309,10 +1310,10 @@ static int __init cf_check zen2_c6_errata_check(void) if (delta > 0) { static struct timer errata_c6; - init_timer(&errata_c6, zen2_disable_c6, NULL, 0); + init_timer(&errata_c6, fam17_disable_c6, NULL, 0); set_timer(&errata_c6, NOW() + delta); } else - zen2_disable_c6(NULL); + fam17_disable_c6(NULL); return 0; } @@ -1320,4 +1321,4 @@ static int __init cf_check zen2_c6_errata_check(void) * Must be executed after early_time_init() for tsc_ticks2ns() to have been * calibrated. That prevents us doing the check in init_amd(). */ -presmp_initcall(zen2_c6_errata_check); +presmp_initcall(amd_check_erratum_1474); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 05:55:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 05:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675311.1050663 (Exim 4.92) (envelope-from ) id 1rW8zi-0008N6-Ay; Sat, 03 Feb 2024 05:55:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675311.1050663; Sat, 03 Feb 2024 05: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 1rW8zi-0008My-7q; Sat, 03 Feb 2024 05:55:14 +0000 Received: by outflank-mailman (input) for mailman id 675311; Sat, 03 Feb 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 1rW8zg-0008Mh-AT for xen-changelog@lists.xenproject.org; Sat, 03 Feb 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 1rW8zg-0007oH-9X for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rW8zg-0003rM-7b for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05: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=eHJ1fXWE4Z5N3FOrYsUbibGaULRjsn00QqNxjuLDHqU=; b=RX/Y12jViPE/UVGsZ6TpENRGYW dZCVao52/7mbOl70snxYuWlHG2HWC6bb2Tv+ylQ29XMgpCv3+JC/i4XSHO0FvOCn7NSR3xtQf3JYA zR1xasFwVaX2nKACx2dEy9IOH4crlR/N/4jW0zBZMJhcpB7A378xrfGPIcUXqKqG3nkQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] CirrusCI: drop FreeBSD 12 Message-Id: Date: Sat, 03 Feb 2024 05:55:12 +0000 commit 0ef1fb43ddd61b3c4c953e833e012ac21ad5ca0f Author: Roger Pau Monné AuthorDate: Fri Feb 2 08:01:50 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 2 08:01:50 2024 +0100 CirrusCI: drop FreeBSD 12 Went EOL by the end of December 2023, and the pkg repos have been shut down. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: c2ce3466472e9c9eda79f5dc98eb701bc6fdba20 master date: 2024-01-15 12:20:11 +0100 --- .cirrus.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7e0beb200d..63f3afb104 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,12 +14,6 @@ freebsd_template: &FREEBSD_TEMPLATE - ./configure --with-system-seabios=/usr/local/share/seabios/bios.bin - gmake -j`sysctl -n hw.ncpu` clang=y -task: - name: 'FreeBSD 12' - freebsd_instance: - image_family: freebsd-12-4 - << : *FREEBSD_TEMPLATE - task: name: 'FreeBSD 13' freebsd_instance: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 05:55:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 05:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675312.1050667 (Exim 4.92) (envelope-from ) id 1rW8zr-0008QQ-E4; Sat, 03 Feb 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 675312.1050667; Sat, 03 Feb 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 1rW8zr-0008QI-BA; Sat, 03 Feb 2024 05:55:23 +0000 Received: by outflank-mailman (input) for mailman id 675312; Sat, 03 Feb 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 1rW8zq-0008Q6-FA for xen-changelog@lists.xenproject.org; Sat, 03 Feb 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 1rW8zq-0007om-Ch for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rW8zq-0003rs-Bl for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DC0bHZcCGG+WI/Se+rdh7W1AtAFZ6Ygs8CmtacuG3gw=; b=DFm+I7/jArl4fZCSSiC7ltAluD 1WoxatHBwkikr6pKCFZLEPuoL9HCduy798c4BJWQkPjURXnNUdbwCclAMBTOdL0tzCUW6PAZuLTot VrfjEMwnDMo/ABa8A/V5N4MJgS1t1+T/NUxGXSQ7+ym7VY3i54Z/Qefso+OCACjjVwgk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/intel: ensure Global Performance Counter Control is setup correctly Message-Id: Date: Sat, 03 Feb 2024 05:55:22 +0000 commit d0ad2cc5eac1b5d3cfd14204d377ce2384f52607 Author: Roger Pau Monné AuthorDate: Fri Feb 2 08:02:20 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 2 08:02:20 2024 +0100 x86/intel: ensure Global Performance Counter Control is setup correctly When Architectural Performance Monitoring is available, the PERF_GLOBAL_CTRL MSR contains per-counter enable bits that is ANDed with the enable bit in the counter EVNTSEL MSR in order for a PMC counter to be enabled. So far the watchdog code seems to have relied on the PERF_GLOBAL_CTRL enable bits being set by default, but at least on some Intel Sapphire and Emerald Rapids this is no longer the case, and Xen reports: Testing NMI watchdog on all CPUs: 0 40 stuck The first CPU on each package is started with PERF_GLOBAL_CTRL zeroed, so PMC0 doesn't start counting when the enable bit in EVNTSEL0 is set, due to the relevant enable bit in PERF_GLOBAL_CTRL not being set. Check and adjust PERF_GLOBAL_CTRL during CPU initialization so that all the general-purpose PMCs are enabled. Doing so brings the state of the package-BSP PERF_GLOBAL_CTRL in line with the rest of the CPUs on the system. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich master commit: 6bdb965178bbb3fc50cd4418d4770a7789956e2c master date: 2024-01-17 10:40:52 +0100 --- xen/arch/x86/cpu/intel.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index b40ac696e6..96723b5d44 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -528,9 +528,30 @@ static void cf_check init_intel(struct cpuinfo_x86 *c) init_intel_cacheinfo(c); if (c->cpuid_level > 9) { unsigned eax = cpuid_eax(10); + unsigned int cnt = (eax >> 8) & 0xff; + /* Check for version and the number of counters */ - if ((eax & 0xff) && (((eax>>8) & 0xff) > 1)) + if ((eax & 0xff) && (cnt > 1) && (cnt <= 32)) { + uint64_t global_ctrl; + unsigned int cnt_mask = (1UL << cnt) - 1; + + /* + * On (some?) Sapphire/Emerald Rapids platforms each + * package-BSP starts with all the enable bits for the + * general-purpose PMCs cleared. Adjust so counters + * can be enabled from EVNTSEL. + */ + rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, global_ctrl); + if ((global_ctrl & cnt_mask) != cnt_mask) { + printk("CPU%u: invalid PERF_GLOBAL_CTRL: %#" + PRIx64 " adjusting to %#" PRIx64 "\n", + smp_processor_id(), global_ctrl, + global_ctrl | cnt_mask); + wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, + global_ctrl | cnt_mask); + } __set_bit(X86_FEATURE_ARCH_PERFMON, c->x86_capability); + } } if ( !cpu_has(c, X86_FEATURE_XTOPOLOGY) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 05:55:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 05:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675313.1050671 (Exim 4.92) (envelope-from ) id 1rW901-0008TB-FG; Sat, 03 Feb 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 675313.1050671; Sat, 03 Feb 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 1rW901-0008T4-Cj; Sat, 03 Feb 2024 05:55:33 +0000 Received: by outflank-mailman (input) for mailman id 675313; Sat, 03 Feb 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 1rW900-0008Sm-IX for xen-changelog@lists.xenproject.org; Sat, 03 Feb 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 1rW900-0007ot-Hp for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rW900-0003sH-F6 for xen-changelog@lists.xenproject.org; Sat, 03 Feb 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=stzOP+rnTyzcSzT64xGuJT6q+t7xlWGalsq78Gcf5PE=; b=EHfQQ5AA1FLzlAKo1My8Kn/K2l JlSSA38UzsumN454yFfycPHjF7avutrthl5XlSqgYq6hf4Cgk52bvBpPtnPWJdbo6Khb4tLqzsTCQ dDak8EjVh2bnizJc/LgwsPyqsNDCsLAaGMzQk+0s0NMa5ZRsBSy8tqynafZ7ldSp9wj4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/vmx: Fix IRQ handling for EXIT_REASON_INIT Message-Id: Date: Sat, 03 Feb 2024 05:55:32 +0000 commit eca5416f9b0e179de9553900de8de660ab09199d Author: Andrew Cooper AuthorDate: Fri Feb 2 08:02:51 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 2 08:02:51 2024 +0100 x86/vmx: Fix IRQ handling for EXIT_REASON_INIT When receiving an INIT, a prior bugfix tried to ignore the INIT and continue onwards. Unfortunately it's not safe to return at that point in vmx_vmexit_handler(). Just out of context in the first hunk is a local_irqs_enabled() which is depended-upon by the return-to-guest path, causing the following checklock failure in debug builds: (XEN) Error: INIT received - ignoring (XEN) CHECKLOCK FAILURE: prev irqsafe: 0, curr irqsafe 1 (XEN) Xen BUG at common/spinlock.c:132 (XEN) ----[ Xen-4.19-unstable x86_64 debug=y Tainted: H ]---- ... (XEN) Xen call trace: (XEN) [] R check_lock+0xcd/0xe1 (XEN) [] F _spin_lock+0x1b/0x60 (XEN) [] F pt_update_irq+0x32/0x3bb (XEN) [] F vmx_intr_assist+0x3b/0x51d (XEN) [] F vmx_asm_vmexit_handler+0xf7/0x210 Luckily, this is benign in release builds. Accidentally having IRQs disabled when trying to take an IRQs-on lock isn't a deadlock-vulnerable pattern. Drop the problematic early return. In hindsight, it's wrong to skip other normal VMExit steps. Fixes: b1f11273d5a7 ("x86/vmx: Don't spuriously crash the domain when INIT is received") Reported-by: Reima ISHII Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: d1f8883aebe00f6a9632d77ab0cd5c6d02c9cbe4 master date: 2024-01-18 20:59:06 +0000 --- xen/arch/x86/hvm/vmx/vmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 072288a5ef..31f4a861c6 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4037,7 +4037,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) case EXIT_REASON_INIT: printk(XENLOG_ERR "Error: INIT received - ignoring\n"); - return; /* Renter the guest without further processing */ + break; } /* Now enable interrupts so it's safe to take locks. */ @@ -4323,6 +4323,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) break; } case EXIT_REASON_EXTERNAL_INTERRUPT: + case EXIT_REASON_INIT: /* Already handled above. */ break; case EXIT_REASON_TRIPLE_FAULT: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 05:55:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 05:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675314.1050675 (Exim 4.92) (envelope-from ) id 1rW90B-00004u-HX; Sat, 03 Feb 2024 05:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675314.1050675; Sat, 03 Feb 2024 05: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 1rW90B-0008WS-EJ; Sat, 03 Feb 2024 05:55:43 +0000 Received: by outflank-mailman (input) for mailman id 675314; Sat, 03 Feb 2024 05:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rW90A-0008WM-Nt for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rW90A-0007p0-N4 for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rW90A-0003su-KL for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05: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=vLFwBAxX1iQ4uDRasPkn+1b9MR2i5oHGCZxEdZKqHE0=; b=BKpK4R3ZNgOLUolxdEUmIeyJs+ 8MZosC4OlJDJkDCTZsVWmfRfxNDy+26U+/UakoLuXK7w7aZYbW3upuXjqzZFHY3FGR6c2GWO+94dZ YXlx5s7HgAGUj7HJX3CSZlNg0aULMQCA5f9Cjp57OWvJ+S9iUVr8CHyi94HS5xZgB7M0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/vmx: Disallow the use of inactivity states Message-Id: Date: Sat, 03 Feb 2024 05:55:42 +0000 commit 7bd612727df792671e44152a8205f0cf821ad984 Author: Andrew Cooper AuthorDate: Fri Feb 2 08:03:26 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 2 08:03:26 2024 +0100 x86/vmx: Disallow the use of inactivity states Right now, vvmx will blindly copy L12's ACTIVITY_STATE into the L02 VMCS and enter the vCPU. Luckily for us, nested-virt is explicitly unsupported for security bugs. The inactivity states are HLT, SHUTDOWN and WAIT-FOR-SIPI, and as noted by the SDM in Vol3 27.7 "Special Features of VM Entry": If VM entry ends with the logical processor in an inactive activity state, the VM entry generates any special bus cycle that is normally generated when that activity state is entered from the active state. Also, Some activity states unconditionally block certain events. I.e. A VMEntry with ACTIVITY=SHUTDOWN will initiate a platform reset, while a VMEntry with ACTIVITY=WAIT-FOR-SIPI will really block everything other than SIPIs. Both of these activity states are for the TXT ACM to use, not for regular hypervisors, and Xen doesn't support dropping the HLT intercept either. There are two paths in Xen which operate on ACTIVITY_STATE. 1) The vmx_{get,set}_nonreg_state() helpers for VM-Fork. As regular VMs can't use any inactivity states, this is just duplicating the 0 from construct_vmcs(). Retain the ability to query activity_state, but crash the domain on any attempt to set an inactivity state. 2) Nested virt, because of ACTIVITY_STATE in vmcs_gstate_field[]. Explicitly hide the inactivity states in the guest's view of MSR_VMX_MISC, and remove ACTIVITY_STATE from vmcs_gstate_field[]. In virtual_vmentry(), we should trigger a VMEntry failure for the use of any inactivity states, but there's no support for that in the code at all so leave a TODO for when we finally start working on nested-virt in earnest. Reported-by: Reima Ishii Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tamas K Lengyel master commit: 3643bb53a05b7c8fbac072c63bef1538f2a6d0d2 master date: 2024-01-18 20:59:06 +0000 --- xen/arch/x86/hvm/vmx/vmx.c | 8 +++++++- xen/arch/x86/hvm/vmx/vvmx.c | 9 +++++++-- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 31f4a861c6..35d391d8e5 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1499,7 +1499,13 @@ static void cf_check vmx_set_nonreg_state(struct vcpu *v, { vmx_vmcs_enter(v); - __vmwrite(GUEST_ACTIVITY_STATE, nrs->vmx.activity_state); + if ( nrs->vmx.activity_state ) + { + printk("Attempt to set %pv activity_state %#lx\n", + v, nrs->vmx.activity_state); + domain_crash(v->domain); + } + __vmwrite(GUEST_INTERRUPTIBILITY_INFO, nrs->vmx.interruptibility_info); __vmwrite(GUEST_PENDING_DBG_EXCEPTIONS, nrs->vmx.pending_dbg); diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index f8fe8d0c14..515cb5ae77 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -910,7 +910,10 @@ static const u16 vmcs_gstate_field[] = { GUEST_LDTR_AR_BYTES, GUEST_TR_AR_BYTES, GUEST_INTERRUPTIBILITY_INFO, + /* + * ACTIVITY_STATE is handled specially. GUEST_ACTIVITY_STATE, + */ GUEST_SYSENTER_CS, GUEST_PREEMPTION_TIMER, /* natural */ @@ -1211,6 +1214,8 @@ static void virtual_vmentry(struct cpu_user_regs *regs) nvcpu->nv_vmentry_pending = 0; nvcpu->nv_vmswitch_in_progress = 1; + /* TODO: Fail VMentry for GUEST_ACTIVITY_STATE != 0 */ + /* * EFER handling: * hvm_set_efer won't work if CR0.PG = 1, so we change the value @@ -2327,8 +2332,8 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) data = hvm_cr4_guest_valid_bits(d); break; case MSR_IA32_VMX_MISC: - /* Do not support CR3-target feature now */ - data = host_data & ~VMX_MISC_CR3_TARGET; + /* Do not support CR3-targets or activity states. */ + data = host_data & ~(VMX_MISC_CR3_TARGET | VMX_MISC_ACTIVITY_MASK); break; case MSR_IA32_VMX_EPT_VPID_CAP: data = nept_get_ept_vpid_cap(); diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h index 78404e42b3..0af021d5f5 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h @@ -288,6 +288,7 @@ extern u32 vmx_secondary_exec_control; #define VMX_VPID_INVVPID_SINGLE_CONTEXT_RETAINING_GLOBAL 0x80000000000ULL extern u64 vmx_ept_vpid_cap; +#define VMX_MISC_ACTIVITY_MASK 0x000001c0 #define VMX_MISC_PROC_TRACE 0x00004000 #define VMX_MISC_CR3_TARGET 0x01ff0000 #define VMX_MISC_VMWRITE_ALL 0x20000000 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 05:55:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 05:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675315.1050679 (Exim 4.92) (envelope-from ) id 1rW90L-00008I-Ia; Sat, 03 Feb 2024 05:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675315.1050679; Sat, 03 Feb 2024 05: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 1rW90L-000087-G2; Sat, 03 Feb 2024 05:55:53 +0000 Received: by outflank-mailman (input) for mailman id 675315; Sat, 03 Feb 2024 05:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rW90K-00007w-Qr for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rW90K-0007p7-QC for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rW90K-0003tJ-PB for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05: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=Jjld+oAVbN3Cf0eCKKOu0A07/ATOl8qRjG7ERYlbNOE=; b=aAgO28WxRVLgwFnQj8fB8q7wGV GG8r31FsNoUUMLSBDdayjD2eTaTsY7dnThCmIR0W25W53niMBo/4zrYJpBZBJ5h9TuRIDSwEzyT4a oriNtRumVaipFLIujajgLESFGzK5yFSoJwTXGrwpWzPoIflhzzA2ZZ17E3AHTi+1a9dk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] lib{fdt,elf}: move lib{fdt,elf}-temp.o and their deps to $(targets) Message-Id: Date: Sat, 03 Feb 2024 05:55:52 +0000 commit afb85cf1e8f165abf88de9d8a6df625692a753b1 Author: Michal Orzel AuthorDate: Fri Feb 2 08:04:07 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 2 08:04:07 2024 +0100 lib{fdt,elf}: move lib{fdt,elf}-temp.o and their deps to $(targets) At the moment, trying to run xencov read/reset (calling SYSCTL_coverage_op under the hood) results in a crash. This is due to a profiler trying to access data in the .init.* sections (libfdt for Arm and libelf for x86) that are stripped after boot. Normally, the build system compiles any *.init.o file without COV_FLAGS. However, these two libraries are handled differently as sections will be renamed to init after linking. To override COV_FLAGS to empty for these libraries, lib{fdt,elf}.o were added to nocov-y. This worked until e321576f4047 ("xen/build: start using if_changed") that added lib{fdt,elf}-temp.o and their deps to extra-y. This way, even though these objects appear as prerequisites of lib{fdt,elf}.o and the settings should propagate to them, make can also build them as a prerequisite of __build, in which case COV_FLAGS would still have the unwanted flags. Fix it by switching to $(targets) instead. Also, for libfdt, append libfdt.o to nocov-y only if CONFIG_OVERLAY_DTB is not set. Otherwise, there is no section renaming and we should be able to run the coverage. Fixes: e321576f4047 ("xen/build: start using if_changed") Signed-off-by: Michal Orzel Reviewed-by: Anthony PERARD Acked-by: Jan Beulich master commit: 79519fcfa0605bbf19d8c02b979af3a2c8afed68 master date: 2024-01-23 12:02:44 +0100 --- xen/common/libelf/Makefile | 2 +- xen/common/libfdt/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/libelf/Makefile b/xen/common/libelf/Makefile index 8a4522e4e1..917d12b006 100644 --- a/xen/common/libelf/Makefile +++ b/xen/common/libelf/Makefile @@ -13,4 +13,4 @@ $(obj)/libelf.o: $(obj)/libelf-temp.o FORCE $(obj)/libelf-temp.o: $(addprefix $(obj)/,$(libelf-objs)) FORCE $(call if_changed,ld) -extra-y += libelf-temp.o $(libelf-objs) +targets += libelf-temp.o $(libelf-objs) diff --git a/xen/common/libfdt/Makefile b/xen/common/libfdt/Makefile index 75aaefa2e3..4d14fd61ba 100644 --- a/xen/common/libfdt/Makefile +++ b/xen/common/libfdt/Makefile @@ -2,9 +2,9 @@ include $(src)/Makefile.libfdt SECTIONS := text data $(SPECIAL_DATA_SECTIONS) OBJCOPYFLAGS := $(foreach s,$(SECTIONS),--rename-section .$(s)=.init.$(s)) +nocov-y += libfdt.o obj-y += libfdt.o -nocov-y += libfdt.o CFLAGS-y += -I$(srctree)/include/xen/libfdt/ @@ -14,4 +14,4 @@ $(obj)/libfdt.o: $(obj)/libfdt-temp.o FORCE $(obj)/libfdt-temp.o: $(addprefix $(obj)/,$(LIBFDT_OBJS)) FORCE $(call if_changed,ld) -extra-y += libfdt-temp.o $(LIBFDT_OBJS) +targets += libfdt-temp.o $(LIBFDT_OBJS) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 05:56:03 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 05:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675316.1050683 (Exim 4.92) (envelope-from ) id 1rW90V-0000Bq-KN; Sat, 03 Feb 2024 05:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675316.1050683; Sat, 03 Feb 2024 05: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 1rW90V-0000Bi-HZ; Sat, 03 Feb 2024 05:56:03 +0000 Received: by outflank-mailman (input) for mailman id 675316; Sat, 03 Feb 2024 05:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rW90U-0000BV-Ty for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rW90U-0007pb-TH for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rW90U-0003uO-SL for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 05: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=td5/i7QtxEe9hlWwUvMobWwcxjTUFmjPTmhEo0J8/bs=; b=GtLTZSkPErR6iBuIYJkSeZAS3D zKZgn/vSMXH1jSMLsUdOKc3Y8EddKmntD0KdnRtS1kxGH76rW9DEeOswqbmjTigKiDj9Y0E4hDUot FvPYjZx34BzaqF2wdernHsOMpt1yKFmYxTEbqfjEwtp56M9v+ChJtPKozIw4cVKSiCq0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.17] x86/p2m-pt: fix off by one in entry check assert Message-Id: Date: Sat, 03 Feb 2024 05:56:02 +0000 commit 091466ba55d1e2e75738f751818ace2e3ed08ccf Author: Roger Pau Monné AuthorDate: Fri Feb 2 08:04:33 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 2 08:04:33 2024 +0100 x86/p2m-pt: fix off by one in entry check assert The MMIO RO rangeset overlap check is bogus: the rangeset is inclusive so the passed end mfn should be the last mfn to be mapped (not last + 1). Fixes: 6fa1755644d0 ('amd/npt/shadow: replace assert that prevents creating 2M/1G MMIO entries') Signed-off-by: Roger Pau Monné Reviewed-by: George Dunlap master commit: 610775d0dd61c1bd2f4720c755986098e6a5bafd master date: 2024-01-25 16:09:04 +0100 --- xen/arch/x86/mm/p2m-pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index eaba2b0fb4..f02ebae372 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -564,7 +564,7 @@ static void check_entry(mfn_t mfn, p2m_type_t new, p2m_type_t old, if ( new == p2m_mmio_direct ) ASSERT(!mfn_eq(mfn, INVALID_MFN) && !rangeset_overlaps_range(mmio_ro_ranges, mfn_x(mfn), - mfn_x(mfn) + (1ul << order))); + mfn_x(mfn) + (1UL << order) - 1)); else if ( p2m_allows_invalid_mfn(new) || new == p2m_invalid || new == p2m_mmio_dm ) ASSERT(mfn_valid(mfn) || mfn_eq(mfn, INVALID_MFN)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17 From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:11:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675406.1050770 (Exim 4.92) (envelope-from ) id 1rWIbg-0005vJ-2g; Sat, 03 Feb 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 675406.1050770; Sat, 03 Feb 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 1rWIbg-0005vB-05; Sat, 03 Feb 2024 16:11:04 +0000 Received: by outflank-mailman (input) for mailman id 675406; Sat, 03 Feb 2024 16:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIbe-0005v5-Ck for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIbe-0002tR-8m for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIbe-0002Bl-4D for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rP2P9aAzk2E8Cib4Yaz3aR48/W8LxjX6XuySNel6Bao=; b=YVSlIKQXJcLCcBupkAywNAKpLY IuCKNJNAP+sbvzbgk/CLV5TOstlluUycf+GPJOdJsmowl8UFRCQna/MDTtVltzuCm/xcD+QD6kvpp slNzy+j5sFsEi/K8LJ8WypJ5X3mfBPLaBoMUoso2EhI4q01rMt3GJZS4YwUAVXqWYAGU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Properly clean update to init_ttbr and smp_up_cpu Message-Id: Date: Sat, 03 Feb 2024 16:11:02 +0000 commit 4c2d50d586717533f6bee4c6340be0432d0a76d0 Author: Julien Grall AuthorDate: Thu Feb 1 17:35:22 2024 +0000 Commit: Julien Grall CommitDate: Thu Feb 1 17:35:45 2024 +0000 xen/arm: Properly clean update to init_ttbr and smp_up_cpu Recent rework to the secondary boot code modified how init_ttbr and smp_up_cpu are accessed. Rather than directly accessing them, we are using a pointer to them. The helper clean_dcache() is expected to take the variable in parameter and then clean its content. As we now pass a pointer to the variable, we will clean the area storing the address rather than the content itself. Switch to use clean_dcache_va_range() to avoid casting the pointer. Fixes: a5ed59e62c6f ("arm/mmu: Move init_ttbr to a new section .data.idmap") Fixes: 9a5114074b04 ("arm/smpboot: Move smp_up_cpu to a new section .data.idmap) Reported-by: Oleksandr Tyshchenko Signed-off-by: Julien Grall Tested-by: Oleksandr Tyshchenko Reviewed-by: Bertrand Marquis --- xen/arch/arm/mmu/smpboot.c | 2 +- xen/arch/arm/smpboot.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/mmu/smpboot.c b/xen/arch/arm/mmu/smpboot.c index bc91fdfe33..4ffc8254a4 100644 --- a/xen/arch/arm/mmu/smpboot.c +++ b/xen/arch/arm/mmu/smpboot.c @@ -88,7 +88,7 @@ static void set_init_ttbr(lpae_t *root) * init_ttbr will be accessed with the MMU off, so ensure the update * is visible by cleaning the cache. */ - clean_dcache(ptr); + clean_dcache_va_range(ptr, sizeof(uint64_t)); unmap_domain_page(ptr); } diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 119bfa3160..a84e706d77 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -449,7 +449,7 @@ static void set_smp_up_cpu(unsigned long mpidr) * smp_up_cpu will be accessed with the MMU off, so ensure the update * is visible by cleaning the cache. */ - clean_dcache(ptr); + clean_dcache_va_range(ptr, sizeof(unsigned long)); unmap_domain_page(ptr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675407.1050774 (Exim 4.92) (envelope-from ) id 1rWIbq-0005x9-4C; Sat, 03 Feb 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 675407.1050774; Sat, 03 Feb 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 1rWIbq-0005x2-1W; Sat, 03 Feb 2024 16:11:14 +0000 Received: by outflank-mailman (input) for mailman id 675407; Sat, 03 Feb 2024 16:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIbo-0005wi-Cr for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIbo-0002tZ-C1 for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIbo-0002CU-B3 for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=5IBIXwHi3GnXwb1fWWjalI+XRuXPlrOPYHBBVkz4Lw4=; b=XmHCmjlTG3BNBRCksQc8dgvxLe voVCqms/LMTXcSqa2+554Whi3+Xs+wrYinJNgEWroV9khgh+6Pf05imlkB1i8nP/Ui45Dqxdg9Y+X lI+k4p8/c6PuylYpC8fpItUJiEbnf9+HdNAQ2sIu1PWZHyHgcp87gyGUOapwo6CVKECc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Drop superfluous semi-colons Message-Id: Date: Sat, 03 Feb 2024 16:11:12 +0000 commit 8e36c668ca107be8225bd31bf93520fc68d44fb8 Author: Andrew Cooper AuthorDate: Tue Jan 30 22:13:17 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 xen: Drop superfluous semi-colons All these cases happen to be benign, but drop them anyway. This is one step towards making -Wextra-semi work. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/sched/private.h | 2 +- xen/drivers/acpi/apei/hest.c | 2 +- xen/include/xen/livepatch.h | 2 +- xen/include/xen/serial.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index 79e3f56c5a..26a196f428 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -518,7 +518,7 @@ static inline void sched_unit_unpause(const struct sched_unit *unit) } #define REGISTER_SCHEDULER(x) static const struct scheduler *x##_entry \ - __used_section(".data.schedulers") = &x; + __used_section(".data.schedulers") = &x struct cpupool { diff --git a/xen/drivers/acpi/apei/hest.c b/xen/drivers/acpi/apei/hest.c index 4ec28c3c11..34b376bc2d 100644 --- a/xen/drivers/acpi/apei/hest.c +++ b/xen/drivers/acpi/apei/hest.c @@ -86,7 +86,7 @@ static int hest_esrc_len(const struct acpi_hest_header *hest_hdr) BUG_ON(len == -1); return len; -}; +} int apei_hest_parse(apei_hest_func_t func, void *data) { diff --git a/xen/include/xen/livepatch.h b/xen/include/xen/livepatch.h index df339a134e..45df4bba4f 100644 --- a/xen/include/xen/livepatch.h +++ b/xen/include/xen/livepatch.h @@ -182,7 +182,7 @@ static inline int livepatch_op(struct xen_sysctl_livepatch_op *op) return -ENOSYS; } -static inline void check_for_livepatch_work(void) { }; +static inline void check_for_livepatch_work(void) {} static inline bool is_patch(const void *addr) { return 0; diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 870ca2f6eb..12ef24351d 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -175,7 +175,7 @@ void ehci_dbgp_init(void); #ifdef CONFIG_XHCI void xhci_dbc_uart_init(void); #else -static void inline xhci_dbc_uart_init(void) {}; +static void inline xhci_dbc_uart_init(void) {} #endif void arm_uart_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:11:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675408.1050777 (Exim 4.92) (envelope-from ) id 1rWIc0-0005zP-5g; Sat, 03 Feb 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 675408.1050777; Sat, 03 Feb 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 1rWIc0-0005zG-2t; Sat, 03 Feb 2024 16:11:24 +0000 Received: by outflank-mailman (input) for mailman id 675408; Sat, 03 Feb 2024 16:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIby-0005z6-GP for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIby-0002u6-FZ for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIby-0002DG-EM for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=tsasbaqU23ZM0fr3Fl7NDlo4FQRwTuczKyLDahrL1SQ=; b=U60vH6FkIVw7hjhbykWHajKBoG NUwjW6QiEUejCLL5gjEGTa3027Hvaa/Am2+X1BgYDqH9SsPN2YHxuT88lgWRZdaH6PlM54jXUXCFh GYJPgZRSlFYP35sLw5d1ek37YdE5avmbNdhIWbnxGD2qKfgClhc7Wb1J897bK4CsSzmM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Fix UBSAN failure in do_hvm_op() printk Message-Id: Date: Sat, 03 Feb 2024 16:11:22 +0000 commit 9d701bc9abaf1e9ab458545a8f320d36dc54d686 Author: Andrew Cooper AuthorDate: Tue Jan 30 18:13:14 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 x86/hvm: Fix UBSAN failure in do_hvm_op() printk Tamas reported this UBSAN failure from fuzzing: (XEN) ================================================================================ (XEN) UBSAN: Undefined behaviour in common/vsprintf.c:64:19 (XEN) negation of -9223372036854775808 cannot be represented in type 'long long int': (XEN) ----[ Xen-4.19-unstable x86_64 debug=y ubsan=y Not tainted ]---- ... (XEN) Xen call trace: (XEN) [] R ubsan.c#ubsan_epilogue+0xa/0xd9 (XEN) [] F __ubsan_handle_negate_overflow+0x99/0xce (XEN) [] F vsprintf.c#number+0x10a/0x93e (XEN) [] F vsnprintf+0x19e2/0x1c56 (XEN) [] F console.c#vprintk_common+0x76/0x34d (XEN) [] F printk+0x4d/0x4f (XEN) [] F do_hvm_op+0x288e/0x28f5 (XEN) [] F hvm_hypercall+0xad2/0x149a (XEN) [] F vmx_vmexit_handler+0x1596/0x279c (XEN) [] F vmx_asm_vmexit_handler+0xdb/0x200 The problem is an unsigned -> signed converstion because of a bad formatter (%ld trying to format an unsigned long). We could fix it by swapping to %lu, but this is a useless printk() even in debug builds, so just drop it completely. Reported-by: Tamas K Lengyel Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e3bd9157d7..e8deeb0222 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5147,12 +5147,9 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) break; default: - { - gdprintk(XENLOG_DEBUG, "Bad HVM op %ld.\n", op); rc = -ENOSYS; break; } - } if ( rc == -ERESTART ) rc = hypercall_create_continuation(__HYPERVISOR_hvm_op, "lh", -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:11:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:11:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675412.1050792 (Exim 4.92) (envelope-from ) id 1rWIcA-0006Ie-FS; Sat, 03 Feb 2024 16:11:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675412.1050792; Sat, 03 Feb 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 1rWIcA-0006IW-Cm; Sat, 03 Feb 2024 16:11:34 +0000 Received: by outflank-mailman (input) for mailman id 675412; Sat, 03 Feb 2024 16:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIc8-0006Hm-Mz for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIc8-0002uN-KT for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIc8-0002Dq-Hq for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=y7VdItx8syB32g+iWJJ4DQ/otvRVKZqLZu0c9mjnaVE=; b=I2i8115576M+DZMpjeZYIdcRnu DuH4XhJt8mRQLUerctbNbKbWbsnWGPalQLLV7JMn76yTSR2aa6d62EmV5zoUffHgULdpbYFIdv6sy 3OgWWbCuIfGWa52lktphQGDpyUz9bByskVtlihcBM1UR6dmv5Q7+MkoljxQnqFl1WkDY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/sched: Fix UB shift in compat_set_timer_op() Message-Id: Date: Sat, 03 Feb 2024 16:11:32 +0000 commit ae6d4fd876765e6d623eec67d14f5d0464be09cb Author: Andrew Cooper AuthorDate: Tue Jan 30 20:44:34 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 xen/sched: Fix UB shift in compat_set_timer_op() Tamas reported this UBSAN failure from fuzzing: (XEN) ================================================================================ (XEN) UBSAN: Undefined behaviour in common/sched/compat.c:48:37 (XEN) left shift of negative value -2147425536 (XEN) ----[ Xen-4.19-unstable x86_64 debug=y ubsan=y Not tainted ]---- ... (XEN) Xen call trace: (XEN) [] R ubsan.c#ubsan_epilogue+0xa/0xd9 (XEN) [] F __ubsan_handle_shift_out_of_bounds+0x11a/0x1c5 (XEN) [] F compat_set_timer_op+0x41/0x43 (XEN) [] F hvm_do_multicall_call+0x77f/0xa75 (XEN) [] F arch_do_multicall_call+0xec/0xf1 (XEN) [] F do_multicall+0x1dc/0xde3 (XEN) [] F hvm_hypercall+0xa00/0x149a (XEN) [] F vmx_vmexit_handler+0x1596/0x279c (XEN) [] F vmx_asm_vmexit_handler+0xdb/0x200 Left-shifting any negative value is strictly undefined behaviour in C, and the two parameters here come straight from the guest. The fuzzer happened to choose lo 0xf, hi 0x8000e300. Switch everything to be unsigned values, making the shift well defined. As GCC documents: As an extension to the C language, GCC does not use the latitude given in C99 and C11 only to treat certain aspects of signed '<<' as undefined. However, -fsanitize=shift (and -fsanitize=undefined) will diagnose such cases. this was deemed not to need an XSA. Note: The unsigned -> signed conversion for do_set_timer_op()'s s_time_t parameter is also well defined. C makes it implementation defined, and GCC defines it as reduction modulo 2^N to be within range of the new type. Fixes: 2942f45e09fb ("Enable compatibility mode operation for HYPERVISOR_sched_op and HYPERVISOR_set_timer_op.") Reported-by: Tamas K Lengyel Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/sched/compat.c | 4 ++-- xen/include/hypercall-defs.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/sched/compat.c b/xen/common/sched/compat.c index d718e450d4..dd97593630 100644 --- a/xen/common/sched/compat.c +++ b/xen/common/sched/compat.c @@ -43,9 +43,9 @@ static int compat_poll(struct compat_sched_poll *compat) #include "core.c" -int compat_set_timer_op(uint32_t lo, int32_t hi) +int compat_set_timer_op(uint32_t lo, uint32_t hi) { - return do_set_timer_op(((s64)hi << 32) | lo); + return do_set_timer_op(((uint64_t)hi << 32) | lo); } #endif /* __COMMON_SCHED_COMPAT_C__ */ diff --git a/xen/include/hypercall-defs.c b/xen/include/hypercall-defs.c index 6d361ddfce..47c093acc8 100644 --- a/xen/include/hypercall-defs.c +++ b/xen/include/hypercall-defs.c @@ -134,7 +134,7 @@ xenoprof_op(int op, void *arg) #ifdef CONFIG_COMPAT prefix: compat -set_timer_op(uint32_t lo, int32_t hi) +set_timer_op(uint32_t lo, uint32_t hi) multicall(multicall_entry_compat_t *call_list, uint32_t nr_calls) memory_op(unsigned int cmd, void *arg) #ifdef CONFIG_IOREQ_SERVER -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:11:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:11:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675413.1050797 (Exim 4.92) (envelope-from ) id 1rWIcK-0006Qp-HX; Sat, 03 Feb 2024 16:11:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675413.1050797; Sat, 03 Feb 2024 16: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 1rWIcK-0006Qf-EB; Sat, 03 Feb 2024 16:11:44 +0000 Received: by outflank-mailman (input) for mailman id 675413; Sat, 03 Feb 2024 16:11:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcI-0006Nb-OF for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcI-0002uX-NX for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIcI-0002EP-Mf for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=pozZ4NSH82MMYqPO4fNFW3ztpIvzxm/cDozymrYHQxg=; b=cadplSWbshmGUjwrLIYEpICj2y u4OJKSiuGbKjePJ8+nPXbZcok2qXzwlHplmldfJh76b/4ioi/fqFqwFaloqCn/MLIYWr3ygSihj9w xbktHEoyv7R6XDRDlJxH/6Ciyl7duYjrB/RhWto5SLoq3i5k25sgVROiWiLHovrQqiMY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Add braces in reloc.c Message-Id: Date: Sat, 03 Feb 2024 16:11:42 +0000 commit fb22c33d17633ab16b16955ba691296f1ff230fc Author: Andrew Cooper AuthorDate: Tue Jan 30 13:59:07 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 x86/boot: Add braces in reloc.c 107 lines is an unreasonably large switch statement to live inside a brace-less for loop. Drop the comment that's clumsily trying to cover the fact that this logic has wrong-looking indentation. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/boot/reloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index 77fdb2be05..4033557481 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -230,6 +230,7 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out) /* Put all needed data into mbi_out. */ for ( tag = _p(ptr); (u32)tag - mbi_in < mbi_fix->total_size; tag = _p(ALIGN_UP((u32)tag + tag->size, MULTIBOOT2_TAG_ALIGN)) ) + { switch ( tag->type ) { case MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME: @@ -332,11 +333,12 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out) #endif /* CONFIG_VIDEO */ case MULTIBOOT2_TAG_TYPE_END: - goto end; /* Cannot "break;" here. */ + goto end; default: break; } + } end: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:11:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:11:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675414.1050800 (Exim 4.92) (envelope-from ) id 1rWIcU-0006YU-IS; Sat, 03 Feb 2024 16:11:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675414.1050800; Sat, 03 Feb 2024 16: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 1rWIcU-0006YM-Fg; Sat, 03 Feb 2024 16:11:54 +0000 Received: by outflank-mailman (input) for mailman id 675414; Sat, 03 Feb 2024 16:11:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcS-0006Y1-RH for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcS-0002ug-QX for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIcS-0002Eo-Pi for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=bMmF4xgNEoJVY5L7e7F1g3moS/EwBjclf+9b6M8XPgc=; b=DK59mkYKeZYGJvYjhSfn5NnXy5 fUWhkDHN31gMWSm4i522w5fsMLuY32MYKQHsbLEbg7F2EgJopl94cVhhSgPmfKKUU8xNzfgcMLYhD IRG1TjU8nvfh7T35Ub4ABPm2NnbnnZm6XTQa9enpK2Fk3Kt3oapxPUs3sQS11I3Vp5ws=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Annotate {l,c}star_enter() as nocall Message-Id: Date: Sat, 03 Feb 2024 16:11:52 +0000 commit 4f0b0ffff379818f39f34d5682e7350f618db691 Author: Andrew Cooper AuthorDate: Tue Jan 30 15:06:32 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 x86/traps: Annotate {l,c}star_enter() as nocall ... as with other declarations which aren't legal to call from C. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/x86_64/traps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 668605e5bc..02fdb3637d 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -333,8 +333,8 @@ static unsigned int write_stub_trampoline( DEFINE_PER_CPU(struct stubs, stubs); -void lstar_enter(void); -void cstar_enter(void); +void nocall lstar_enter(void); +void nocall cstar_enter(void); void subarch_percpu_traps_init(void) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:12:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:12:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675416.1050804 (Exim 4.92) (envelope-from ) id 1rWIce-0006c4-KI; Sat, 03 Feb 2024 16:12:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675416.1050804; Sat, 03 Feb 2024 16: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 1rWIce-0006bw-H9; Sat, 03 Feb 2024 16:12:04 +0000 Received: by outflank-mailman (input) for mailman id 675416; Sat, 03 Feb 2024 16:12:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcc-0006bW-US for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcc-0002v6-TY for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIcc-0002Fm-Sd for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=qFe/712owj8f9LFnWtjyhcsNyqYdQu1E1peHhcIj4R8=; b=sgGgpH3JoTRoopoJ8cRyHhiiX9 JFGKG4vmmqHY6R6wL4Q4CcDn0Eq6fSr63pPJkQPAeRrFmWAzvsrWFGROnHsLXjlwmdZdQ1LkWs01e NDDQbaGPCUM7ybJJlWbc7oioBNPQFBo05y+yRqI7LRgO0nT0yzgV587D66ITt3qgSvgE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitmap: Consistently use unsigned bits values Message-Id: Date: Sat, 03 Feb 2024 16:12:02 +0000 commit 558e84b7ffec77cc8b1b4cf3256b5febc84f17f9 Author: Andrew Cooper AuthorDate: Wed Jan 31 17:05:47 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 xen/bitmap: Consistently use unsigned bits values Right now, most of the static inline helpers take an unsigned nbits quantity, and most of the library functions take a signed quanity. Because BITMAP_LAST_WORD_MASK() is expressed as a divide, the compiler is forced to emit two different paths to get the correct semantics for signed division. Swap all signed bit-counts to being unsigned bit-counts for the simple cases. This includes the return value of bitmap_weight(). Bloat-o-meter for a random x86 build reports: add/remove: 0/0 grow/shrink: 8/19 up/down: 167/-413 (-246) which all comes from compiler not emitting "dead" logic paths for negative bit counts. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/bitmap.c | 24 ++++++++++++------------ xen/include/xen/bitmap.h | 43 ++++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/xen/common/bitmap.c b/xen/common/bitmap.c index 7d4551f782..c57b35f004 100644 --- a/xen/common/bitmap.c +++ b/xen/common/bitmap.c @@ -55,7 +55,7 @@ static void clamp_last_byte(uint8_t *bp, unsigned int nbits) bp[nbits/8] &= (1U << remainder) - 1; } -int __bitmap_empty(const unsigned long *bitmap, int bits) +int __bitmap_empty(const unsigned long *bitmap, unsigned int bits) { int k, lim = bits/BITS_PER_LONG; for (k = 0; k < lim; ++k) @@ -70,7 +70,7 @@ int __bitmap_empty(const unsigned long *bitmap, int bits) } EXPORT_SYMBOL(__bitmap_empty); -int __bitmap_full(const unsigned long *bitmap, int bits) +int __bitmap_full(const unsigned long *bitmap, unsigned int bits) { int k, lim = bits/BITS_PER_LONG; for (k = 0; k < lim; ++k) @@ -86,7 +86,7 @@ int __bitmap_full(const unsigned long *bitmap, int bits) EXPORT_SYMBOL(__bitmap_full); int __bitmap_equal(const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits) + const unsigned long *bitmap2, unsigned int bits) { int k, lim = bits/BITS_PER_LONG; for (k = 0; k < lim; ++k) @@ -101,7 +101,7 @@ int __bitmap_equal(const unsigned long *bitmap1, } EXPORT_SYMBOL(__bitmap_equal); -void __bitmap_complement(unsigned long *dst, const unsigned long *src, int bits) +void __bitmap_complement(unsigned long *dst, const unsigned long *src, unsigned int bits) { int k, lim = bits/BITS_PER_LONG; for (k = 0; k < lim; ++k) @@ -113,7 +113,7 @@ void __bitmap_complement(unsigned long *dst, const unsigned long *src, int bits) EXPORT_SYMBOL(__bitmap_complement); void __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits) + const unsigned long *bitmap2, unsigned int bits) { int k; int nr = BITS_TO_LONGS(bits); @@ -124,7 +124,7 @@ void __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, EXPORT_SYMBOL(__bitmap_and); void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits) + const unsigned long *bitmap2, unsigned int bits) { int k; int nr = BITS_TO_LONGS(bits); @@ -135,7 +135,7 @@ void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, EXPORT_SYMBOL(__bitmap_or); void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits) + const unsigned long *bitmap2, unsigned int bits) { int k; int nr = BITS_TO_LONGS(bits); @@ -146,7 +146,7 @@ void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1, EXPORT_SYMBOL(__bitmap_xor); void __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits) + const unsigned long *bitmap2, unsigned int bits) { int k; int nr = BITS_TO_LONGS(bits); @@ -157,7 +157,7 @@ void __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1, EXPORT_SYMBOL(__bitmap_andnot); int __bitmap_intersects(const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits) + const unsigned long *bitmap2, unsigned int bits) { int k, lim = bits/BITS_PER_LONG; for (k = 0; k < lim; ++k) @@ -172,7 +172,7 @@ int __bitmap_intersects(const unsigned long *bitmap1, EXPORT_SYMBOL(__bitmap_intersects); int __bitmap_subset(const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits) + const unsigned long *bitmap2, unsigned int bits) { int k, lim = bits/BITS_PER_LONG; for (k = 0; k < lim; ++k) @@ -187,7 +187,7 @@ int __bitmap_subset(const unsigned long *bitmap1, EXPORT_SYMBOL(__bitmap_subset); #if BITS_PER_LONG == 32 -int __bitmap_weight(const unsigned long *bitmap, int bits) +unsigned int __bitmap_weight(const unsigned long *bitmap, unsigned int bits) { int k, w = 0, lim = bits/BITS_PER_LONG; @@ -200,7 +200,7 @@ int __bitmap_weight(const unsigned long *bitmap, int bits) return w; } #else -int __bitmap_weight(const unsigned long *bitmap, int bits) +unsigned int __bitmap_weight(const unsigned long *bitmap, unsigned int bits) { int k, w = 0, lim = bits/BITS_PER_LONG; diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index 657390e32e..b9f980e919 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -66,25 +66,25 @@ * lib/bitmap.c provides these functions: */ -extern int __bitmap_empty(const unsigned long *bitmap, int bits); -extern int __bitmap_full(const unsigned long *bitmap, int bits); -extern int __bitmap_equal(const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits); -extern void __bitmap_complement(unsigned long *dst, const unsigned long *src, - int bits); -extern void __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits); -extern void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits); -extern void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits); -extern void __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits); -extern int __bitmap_intersects(const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits); -extern int __bitmap_subset(const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits); -extern int __bitmap_weight(const unsigned long *bitmap, int bits); +int __bitmap_empty(const unsigned long *bitmap, unsigned int bits); +int __bitmap_full(const unsigned long *bitmap, unsigned int bits); +int __bitmap_equal(const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits); +void __bitmap_complement(unsigned long *dst, const unsigned long *src, + unsigned int bits); +void __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits); +void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits); +void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits); +void __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits); +int __bitmap_intersects(const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits); +int __bitmap_subset(const unsigned long *bitmap1, + const unsigned long *bitmap2, unsigned int bits); +unsigned int __bitmap_weight(const unsigned long *bitmap, unsigned int bits); extern void __bitmap_set(unsigned long *map, unsigned int start, int len); extern void __bitmap_clear(unsigned long *map, unsigned int start, int len); @@ -117,7 +117,7 @@ static inline void bitmap_zero(unsigned long *dst, unsigned int nbits) memset(dst, 0, bitmap_bytes(nbits))); } -static inline void bitmap_fill(unsigned long *dst, int nbits) +static inline void bitmap_fill(unsigned long *dst, unsigned int nbits) { size_t nlongs = BITS_TO_LONGS(nbits); @@ -224,7 +224,8 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits) return __bitmap_full(src, nbits)); } -static inline int bitmap_weight(const unsigned long *src, int nbits) +static inline unsigned int bitmap_weight(const unsigned long *src, + unsigned int nbits) { return __bitmap_weight(src, nbits); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:12:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:12:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675417.1050808 (Exim 4.92) (envelope-from ) id 1rWIco-0006g4-Mw; Sat, 03 Feb 2024 16:12:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675417.1050808; Sat, 03 Feb 2024 16: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 1rWIco-0006fw-K9; Sat, 03 Feb 2024 16:12:14 +0000 Received: by outflank-mailman (input) for mailman id 675417; Sat, 03 Feb 2024 16:12:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcn-0006fZ-1i for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcn-0002vG-0z for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIcm-0002GY-WF for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=AOODkOp2Wx+3eb3uEFv8+nLENAGmF2ZUrPd1TG5muok=; b=vXj+y3oGd+DByaROOZ2WjRn7/G n1V/8MtCANmpn0TjIptDPZYuvvNdH9rna5gAP6eKmRaBkTlgVqWV88bfIxR+icIJkP2pKVaJUC5il gYpI5xD+hSC7nxIu2P3SEUrJ/TvkKDnUnrk1WA8pW1I3YEK94WjUILyVoryavDwbQMqQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/ocaml: Bump minimum version to OCaml 4.05 Message-Id: Date: Sat, 03 Feb 2024 16:12:12 +0000 commit c852ca5c05f32d23928ce756b6f1114dd4aeb0cf Author: Edwin Török AuthorDate: Wed Jan 31 10:42:48 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 tools/ocaml: Bump minimum version to OCaml 4.05 Char.lowercase got removed in OCaml 5.0 (it has been deprecated since 2014), and doesn't build any more. Char.lowercase_ascii has existed since OCaml 4.03, so that is the new minimum version for oxenstored. However, OCaml 4.05 is the oldest new-enough version found in common distros, so pick this as a baseline. Signed-off-by: Edwin Török Acked-by: Christian Lindig Acked-by: Anthony PERARD [Update CHANGELOG.md] Signed-off-by: Andrew Cooper --- CHANGELOG.md | 1 + tools/configure | 2 +- tools/configure.ac | 2 +- tools/ocaml/xenstored/disk.ml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f55c9c72d..bfe3b2b6f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Changed - Changed flexible array definitions in public I/O interface headers to not use "1" as the number of array elements. + - The minimum supported OCaml toolchain version is now 4.05 - On x86: - HVM PIRQs are disabled by default. - Reduce IOMMU setup time for hardware domain. diff --git a/tools/configure b/tools/configure index 0135a0059a..3d557234b3 100755 --- a/tools/configure +++ b/tools/configure @@ -6836,7 +6836,7 @@ else -e 's/[^0-9]//g'` - ax_compare_version_B=`echo "4.02.0" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + ax_compare_version_B=`echo "4.05.0" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ diff --git a/tools/configure.ac b/tools/configure.ac index 618ef8c63f..851887080c 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -336,7 +336,7 @@ AS_IF([test "x$ocamltools" = "xy"], [ AC_MSG_ERROR([Ocaml tools enabled, but missing ocamlopt or ocamlfind])]) ocamltools="n" ], [ - AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [4.02.0], [ + AX_COMPARE_VERSION([$OCAMLVERSION], [lt], [4.05.0], [ AS_IF([test "x$enable_ocamltools" = "xyes"], [ AC_MSG_ERROR([Your version of OCaml: $OCAMLVERSION is not supported])]) ocamltools="n" diff --git a/tools/ocaml/xenstored/disk.ml b/tools/ocaml/xenstored/disk.ml index 91f945f2bd..ccaa048faf 100644 --- a/tools/ocaml/xenstored/disk.ml +++ b/tools/ocaml/xenstored/disk.ml @@ -30,7 +30,7 @@ let undec c = | _ -> raise (Failure "undecify") let unhex c = - let c = Char.lowercase c in + let c = Char.lowercase_ascii c in match c with | '0' .. '9' -> (Char.code c) - (Char.code '0') | 'a' .. 'f' -> (Char.code c) - (Char.code 'a') + 10 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:12:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:12:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675418.1050812 (Exim 4.92) (envelope-from ) id 1rWIcy-0006ir-OZ; Sat, 03 Feb 2024 16:12:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675418.1050812; Sat, 03 Feb 2024 16: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 1rWIcy-0006ii-Lc; Sat, 03 Feb 2024 16:12:24 +0000 Received: by outflank-mailman (input) for mailman id 675418; Sat, 03 Feb 2024 16:12:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcx-0006iP-6n for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIcx-0002vh-4F for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIcx-0002HB-3D for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=xZGe6a9wJNarZdYMBrBUZvlqNTRAQQp7D7wP66QvZ5k=; b=sRl3tngh61tAcsD6s83LsDIUU6 nXa7NW6Tygu0UF3rM36qKCzKdCkjux6GGt9XXOz7qXuxnJNezZlIUjkvVzb9B76uMBSKrQTnfhToF VowVUDVYaghn3k4R2dkxy/E7SzPklPcmm51E/cLLI3p76oh2MYmL3CDkXQ2MTrMrXpTA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Expose IPRED_CTRL to guests Message-Id: Date: Sat, 03 Feb 2024 16:12:23 +0000 commit 4dd6760706848de30f7c8b5f83462b9bcb070c91 Author: Roger Pau Monné AuthorDate: Tue Jan 30 10:13:58 2024 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 x86/spec-ctrl: Expose IPRED_CTRL to guests The CPUID feature bit signals the presence of the IPRED_DIS_{U,S} controls in SPEC_CTRL MSR, first available in Intel AlderLake and Sapphire Rapids CPUs. Xen already knows how to context switch MSR_SPEC_CTRL properly between guest and hypervisor context. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 6 ++++-- xen/include/public/arch-x86/cpufeatureset.h | 2 +- xen/tools/gen-cpuid.py | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index c33dc78cd8..54d3752e93 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -309,8 +309,8 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) /* * Caller to confirm that MSR_SPEC_CTRL is available. Intel and AMD have - * separate CPUID features for this functionality, but only set will be - * active. + * separate CPUID features for some of this functionality, but only one + * vendors-worth will be active on a single host. */ uint64_t msr_spec_ctrl_valid_bits(const struct cpu_policy *cp) { @@ -324,6 +324,8 @@ uint64_t msr_spec_ctrl_valid_bits(const struct cpu_policy *cp) return (SPEC_CTRL_IBRS | SPEC_CTRL_STIBP | (ssbd ? SPEC_CTRL_SSBD : 0) | (psfd ? SPEC_CTRL_PSFD : 0) | + (cp->feat.ipred_ctrl + ? (SPEC_CTRL_IPRED_DIS_U | SPEC_CTRL_IPRED_DIS_S) : 0) | 0); } diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index c897c20401..e586e141c3 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -302,7 +302,7 @@ XEN_CPUFEATURE(INTEL_PPIN, 12*32+ 0) /* Protected Processor Inventory /* Intel-defined CPU features, CPUID level 0x00000007:2.edx, word 13 */ XEN_CPUFEATURE(INTEL_PSFD, 13*32+ 0) /*A MSR_SPEC_CTRL.PSFD */ -XEN_CPUFEATURE(IPRED_CTRL, 13*32+ 1) /* MSR_SPEC_CTRL.IPRED_DIS_* */ +XEN_CPUFEATURE(IPRED_CTRL, 13*32+ 1) /*A MSR_SPEC_CTRL.IPRED_DIS_* */ XEN_CPUFEATURE(RRSBA_CTRL, 13*32+ 2) /* MSR_SPEC_CTRL.RRSBA_DIS_* */ XEN_CPUFEATURE(DDP_CTRL, 13*32+ 3) /* MSR_SPEC_CTRL.DDP_DIS_U */ XEN_CPUFEATURE(BHI_CTRL, 13*32+ 4) /* MSR_SPEC_CTRL.BHI_DIS_S */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index df5222a3cd..45fab5e75d 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -319,7 +319,8 @@ def crunch_numbers(state): # IBRSB/IBRS, and we pass this MSR directly to guests. Treating them # as dependent features simplifies Xen's logic, and prevents the guest # from seeing implausible configurations. - IBRSB: [STIBP, SSBD, INTEL_PSFD, EIBRS], + IBRSB: [STIBP, SSBD, INTEL_PSFD, EIBRS, + IPRED_CTRL], IBRS: [AMD_STIBP, AMD_SSBD, PSFD, AUTO_IBRS, IBRS_ALWAYS, IBRS_FAST, IBRS_SAME_MODE], IBPB: [IBPB_RET, SBPB, IBPB_BRTYPE], -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:12:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:12:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675419.1050815 (Exim 4.92) (envelope-from ) id 1rWId8-0006mq-PW; Sat, 03 Feb 2024 16:12:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675419.1050815; Sat, 03 Feb 2024 16: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 1rWId8-0006mi-N2; Sat, 03 Feb 2024 16:12:34 +0000 Received: by outflank-mailman (input) for mailman id 675419; Sat, 03 Feb 2024 16:12:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWId7-0006lL-86 for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWId7-0002vt-7J for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWId7-0002He-6V for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=o2KgbCXdJflO3xLCm7ljjK6mNZvQg3UAkDVhgdsY+qM=; b=WlbS/4HDMLXU2sido3fhnsls2M IHe7kFBEbJYui7Djfw3RIOgzR4L9g9eftG81BWlct2uDsG7VaG90degOZbZ3dkifCY06jmUmZ44Yt ScUrNHx87J4gpoy+8L7CTWCXvwS/Y73z9kATRaDiiRn0Z4CucCWYMx6nbUmT5C57/TrQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Expose RRSBA_CTRL to guests Message-Id: Date: Sat, 03 Feb 2024 16:12:33 +0000 commit 478e4787fa64b621061177a7843c452e9a19916d Author: Roger Pau Monné AuthorDate: Tue Jan 30 10:13:59 2024 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 x86/spec-ctrl: Expose RRSBA_CTRL to guests The CPUID feature bit signals the presence of the RRSBA_DIS_{U,S} controls in SPEC_CTRL MSR, first available in Intel AlderLake and Sapphire Rapids CPUs. Xen already knows how to context switch MSR_SPEC_CTRL properly between guest and hypervisor context. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 2 ++ xen/include/public/arch-x86/cpufeatureset.h | 2 +- xen/tools/gen-cpuid.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 54d3752e93..d42f5bd6ef 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -326,6 +326,8 @@ uint64_t msr_spec_ctrl_valid_bits(const struct cpu_policy *cp) (psfd ? SPEC_CTRL_PSFD : 0) | (cp->feat.ipred_ctrl ? (SPEC_CTRL_IPRED_DIS_U | SPEC_CTRL_IPRED_DIS_S) : 0) | + (cp->feat.rrsba_ctrl + ? (SPEC_CTRL_RRSBA_DIS_U | SPEC_CTRL_RRSBA_DIS_S) : 0) | 0); } diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index e586e141c3..bade4edab3 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -303,7 +303,7 @@ XEN_CPUFEATURE(INTEL_PPIN, 12*32+ 0) /* Protected Processor Inventory /* Intel-defined CPU features, CPUID level 0x00000007:2.edx, word 13 */ XEN_CPUFEATURE(INTEL_PSFD, 13*32+ 0) /*A MSR_SPEC_CTRL.PSFD */ XEN_CPUFEATURE(IPRED_CTRL, 13*32+ 1) /*A MSR_SPEC_CTRL.IPRED_DIS_* */ -XEN_CPUFEATURE(RRSBA_CTRL, 13*32+ 2) /* MSR_SPEC_CTRL.RRSBA_DIS_* */ +XEN_CPUFEATURE(RRSBA_CTRL, 13*32+ 2) /*A MSR_SPEC_CTRL.RRSBA_DIS_* */ XEN_CPUFEATURE(DDP_CTRL, 13*32+ 3) /* MSR_SPEC_CTRL.DDP_DIS_U */ XEN_CPUFEATURE(BHI_CTRL, 13*32+ 4) /* MSR_SPEC_CTRL.BHI_DIS_S */ XEN_CPUFEATURE(MCDT_NO, 13*32+ 5) /*A MCDT_NO */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 45fab5e75d..1c6d762441 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -320,7 +320,7 @@ def crunch_numbers(state): # as dependent features simplifies Xen's logic, and prevents the guest # from seeing implausible configurations. IBRSB: [STIBP, SSBD, INTEL_PSFD, EIBRS, - IPRED_CTRL], + IPRED_CTRL, RRSBA_CTRL], IBRS: [AMD_STIBP, AMD_SSBD, PSFD, AUTO_IBRS, IBRS_ALWAYS, IBRS_FAST, IBRS_SAME_MODE], IBPB: [IBPB_RET, SBPB, IBPB_BRTYPE], -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:12:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:12:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675420.1050820 (Exim 4.92) (envelope-from ) id 1rWIdI-0006pX-RO; Sat, 03 Feb 2024 16:12:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675420.1050820; Sat, 03 Feb 2024 16: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 1rWIdI-0006pP-OT; Sat, 03 Feb 2024 16:12:44 +0000 Received: by outflank-mailman (input) for mailman id 675420; Sat, 03 Feb 2024 16:12:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIdH-0006pE-BH for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIdH-0002w0-Ad for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIdH-0002I5-9f for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=y7gCwczxXBfI2nfI/2fa/FsaLqhJRzaU1AzDUfzzIbk=; b=nVfnODSxG/m9KVPcoMLzJewbHp wjr0NKc6P0PpuhwlhYHUjUBdZafSUkx/0UuDL7auLXWuuzTlwyfVsvBwrz7UeD0/4TPieTpJmWbKQ jZ4+M15KG/72RK5IZodJvErV/DaVLm+PjHCQD81AupjLfmm1qod3I7HHOB1qoOXPTz/4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Expose BHI_CTRL to guests Message-Id: Date: Sat, 03 Feb 2024 16:12:43 +0000 commit 583f1d0950529f3517b1741c2b21a028a82ba831 Author: Roger Pau Monné AuthorDate: Tue Jan 30 10:14:00 2024 +0100 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 x86/spec-ctrl: Expose BHI_CTRL to guests The CPUID feature bit signals the presence of the BHI_DIS_S control in SPEC_CTRL MSR, first available in Intel AlderLake and Sapphire Rapids CPUs Xen already knows how to context switch MSR_SPEC_CTRL properly between guest and hypervisor context. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 1 + xen/include/public/arch-x86/cpufeatureset.h | 2 +- xen/tools/gen-cpuid.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index d42f5bd6ef..9babd441f9 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -328,6 +328,7 @@ uint64_t msr_spec_ctrl_valid_bits(const struct cpu_policy *cp) ? (SPEC_CTRL_IPRED_DIS_U | SPEC_CTRL_IPRED_DIS_S) : 0) | (cp->feat.rrsba_ctrl ? (SPEC_CTRL_RRSBA_DIS_U | SPEC_CTRL_RRSBA_DIS_S) : 0) | + (cp->feat.bhi_ctrl ? SPEC_CTRL_BHI_DIS_S : 0) | 0); } diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index bade4edab3..be5c1b748e 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -305,7 +305,7 @@ XEN_CPUFEATURE(INTEL_PSFD, 13*32+ 0) /*A MSR_SPEC_CTRL.PSFD */ XEN_CPUFEATURE(IPRED_CTRL, 13*32+ 1) /*A MSR_SPEC_CTRL.IPRED_DIS_* */ XEN_CPUFEATURE(RRSBA_CTRL, 13*32+ 2) /*A MSR_SPEC_CTRL.RRSBA_DIS_* */ XEN_CPUFEATURE(DDP_CTRL, 13*32+ 3) /* MSR_SPEC_CTRL.DDP_DIS_U */ -XEN_CPUFEATURE(BHI_CTRL, 13*32+ 4) /* MSR_SPEC_CTRL.BHI_DIS_S */ +XEN_CPUFEATURE(BHI_CTRL, 13*32+ 4) /*A MSR_SPEC_CTRL.BHI_DIS_S */ XEN_CPUFEATURE(MCDT_NO, 13*32+ 5) /*A MCDT_NO */ /* Intel-defined CPU features, CPUID level 0x00000007:1.ecx, word 14 */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 1c6d762441..25d329ce48 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -320,7 +320,7 @@ def crunch_numbers(state): # as dependent features simplifies Xen's logic, and prevents the guest # from seeing implausible configurations. IBRSB: [STIBP, SSBD, INTEL_PSFD, EIBRS, - IPRED_CTRL, RRSBA_CTRL], + IPRED_CTRL, RRSBA_CTRL, BHI_CTRL], IBRS: [AMD_STIBP, AMD_SSBD, PSFD, AUTO_IBRS, IBRS_ALWAYS, IBRS_FAST, IBRS_SAME_MODE], IBPB: [IBPB_RET, SBPB, IBPB_BRTYPE], -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:12:54 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:12:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675421.1050824 (Exim 4.92) (envelope-from ) id 1rWIdS-0006t2-T3; Sat, 03 Feb 2024 16:12:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675421.1050824; Sat, 03 Feb 2024 16: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 1rWIdS-0006sv-Pz; Sat, 03 Feb 2024 16:12:54 +0000 Received: by outflank-mailman (input) for mailman id 675421; Sat, 03 Feb 2024 16:12:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIdR-0006si-Eq for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIdR-0002wG-E1 for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIdR-0002IU-D1 for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16: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=LiIslhOXGJ9IXguyzho6NecXIyyDq5X7jKWvUpNhZ2Q=; b=BlFh6qqlIb+CR2whE9ESbUwcap OIBR0mWSkhJPwLTLSLqmsP2rAtgKSqKamuqovG9ywYcO3voNOFICugwHVfj3srxo/rHU5P8FNjpwH 2xGANosyDTdwDQakErmO2YMhuqqb7olk5Fxj3j79fc4Iuz0Z/L/jZYbKYgm+aFz4XGe0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Remove gdbstub Message-Id: Date: Sat, 03 Feb 2024 16:12:53 +0000 commit d182f9feae6d8085121fbf5f8978e9a43b90da41 Author: Andrew Cooper AuthorDate: Fri Jan 26 19:57:01 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 x86: Remove gdbstub In 13y of working on Xen, I've never seen seen it used. The implementation was introduced (commit b69f92f3012e, Jul 28 2004) with known issues such as: /* Resuming after we've stopped used to work, but more through luck than any actual intention. It doesn't at the moment. */ which appear to have gone unfixed for the 20 years since. Nowadays there are more robust ways of inspecting crashed state, such as a kexec crash kernel, or running Xen in a VM. This will allow us to clean up some hooks around the codebase which are proving awkward for other tasks. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CHANGELOG.md | 1 + docs/misc/xen-command-line.pandoc | 7 - xen/Kconfig.debug | 7 - xen/arch/x86/Makefile | 1 - xen/arch/x86/gdbstub.c | 91 ----- xen/arch/x86/x86_64/Makefile | 2 - xen/arch/x86/x86_64/gdbstub.c | 150 -------- xen/common/Makefile | 1 - xen/common/gdbstub.c | 748 -------------------------------------- xen/include/xen/gdbstub.h | 103 ------ 10 files changed, 1 insertion(+), 1110 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfe3b2b6f5..f9874f9bb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - /usr/bin/pygrub symlink. This was deprecated in Xen 4.2 (2012) but left for compatibility reasons. VMs configured with bootloader="/usr/bin/pygrub" should be updated to just bootloader="pygrub". +- The Xen gdbstub on x86. ## [4.18.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.0) - 2023-11-16 diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 8e65f8bd18..be76be8d53 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1242,13 +1242,6 @@ requirement can be relaxed. This option is particularly useful for nested virtualization, to allow the L1 hypervisor to use EPT even if the L0 hypervisor does not provide `VM_ENTRY_LOAD_GUEST_PAT`. -### gdb -> `= com1[H,L] | com2[H,L] | dbgp` - -> Default: `` - -Specify which console gdbstub should use. See **console**. - ### gnttab > `= List of [ max-ver:, transitive=, transfer= ]` diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index e19e9d4881..fa81853e93 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -13,13 +13,6 @@ config DEBUG if DEBUG || EXPERT -config CRASH_DEBUG - bool "Crash Debugging Support" - depends on X86 - ---help--- - If you want to attach gdb to Xen to debug Xen if it crashes - then say Y. - config GDBSX bool "Guest debugging with gdbsx" depends on X86 diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 9f326b9e32..26d8740529 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -35,7 +35,6 @@ obj-y += e820.o obj-y += emul-i8254.o obj-y += extable.o obj-y += flushtlb.o -obj-$(CONFIG_CRASH_DEBUG) += gdbstub.o obj-$(CONFIG_GDBSX) += gdbsx.o obj-y += hypercall.o obj-y += i387.o diff --git a/xen/arch/x86/gdbstub.c b/xen/arch/x86/gdbstub.c deleted file mode 100644 index 961cae0be7..0000000000 --- a/xen/arch/x86/gdbstub.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * x86-specific gdb stub routines - * based on x86 cdb(xen/arch/x86/cdb.c), but Extensively modified. - * - * Copyright (C) 2006 Isaku Yamahata - * VA Linux Systems Japan. K.K. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . - */ -#include -#include - -#include - -u16 -gdb_arch_signal_num(struct cpu_user_regs *regs, unsigned long cookie) -{ - return 5; /* TRAP signal. see include/gdb/signals.h */ -} - -/* - * Use __copy_*_user to make us page-fault safe, but not otherwise restrict - * our access to the full virtual address space. - */ -unsigned int -gdb_arch_copy_from_user(void *dest, const void *src, unsigned len) -{ - return copy_from_unsafe(dest, src, len); -} - -unsigned int -gdb_arch_copy_to_user(void *dest, const void *src, unsigned len) -{ - return copy_to_unsafe(dest, src, len); -} - -void -gdb_arch_print_state(struct cpu_user_regs *regs) -{ - /* XXX */ -} - -void -gdb_arch_enter(struct cpu_user_regs *regs) -{ - /* nothing */ -} - -void -gdb_arch_exit(struct cpu_user_regs *regs) -{ - /* nothing */ -} - -void -gdb_arch_resume(struct cpu_user_regs *regs, - unsigned long addr, unsigned long type, - struct gdb_context *ctx) -{ - if ( addr != -1UL ) - regs->rip = addr; - - regs->eflags &= ~X86_EFLAGS_TF; - - /* Set eflags.RF to ensure we do not re-enter. */ - regs->eflags |= X86_EFLAGS_RF; - - /* Set the trap flag if we are single stepping. */ - if ( type == GDB_STEP ) - regs->eflags |= X86_EFLAGS_TF; -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/xen/arch/x86/x86_64/Makefile b/xen/arch/x86/x86_64/Makefile index 213b789c42..472b2bab52 100644 --- a/xen/arch/x86/x86_64/Makefile +++ b/xen/arch/x86/x86_64/Makefile @@ -12,5 +12,3 @@ obj-$(CONFIG_COMPAT) += domain.o obj-$(CONFIG_COMPAT) += cpu_idle.o obj-$(CONFIG_COMPAT) += cpufreq.o obj-bin-$(CONFIG_KEXEC) += kexec_reloc.o - -obj-$(CONFIG_CRASH_DEBUG) += gdbstub.o diff --git a/xen/arch/x86/x86_64/gdbstub.c b/xen/arch/x86/x86_64/gdbstub.c deleted file mode 100644 index 8287124dfb..0000000000 --- a/xen/arch/x86/x86_64/gdbstub.c +++ /dev/null @@ -1,150 +0,0 @@ -/* - * x86_64 -specific gdb stub routines - * - * Copyright (C) 2007 Dan Doucette ddoucette@teradici.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . - */ - -#include - -#define GDB_REG64(r) gdb_write_to_packet_hex(r, sizeof(u64), ctx) -#define GDB_REG32(r) gdb_write_to_packet_hex(r, sizeof(u32), ctx) - -void -gdb_arch_read_reg_array(struct cpu_user_regs *regs, struct gdb_context *ctx) -{ - GDB_REG64(regs->rax); - GDB_REG64(regs->rbx); - GDB_REG64(regs->rcx); - GDB_REG64(regs->rdx); - GDB_REG64(regs->rsi); - GDB_REG64(regs->rdi); - GDB_REG64(regs->rbp); - GDB_REG64(regs->rsp); - - GDB_REG64(regs->r8); - GDB_REG64(regs->r9); - GDB_REG64(regs->r10); - GDB_REG64(regs->r11); - GDB_REG64(regs->r12); - GDB_REG64(regs->r13); - GDB_REG64(regs->r14); - GDB_REG64(regs->r15); - - GDB_REG64(regs->rip); - GDB_REG32(regs->eflags); - - GDB_REG32(regs->cs); - GDB_REG32(regs->ss); - GDB_REG32(regs->ds); - GDB_REG32(regs->es); - GDB_REG32(regs->fs); - GDB_REG32(regs->gs); - - gdb_send_packet(ctx); -} - -void -gdb_arch_write_reg_array(struct cpu_user_regs *regs, const char* buf, - struct gdb_context *ctx) -{ - gdb_send_reply("", ctx); -} - -void -gdb_arch_read_reg(unsigned long regnum, struct cpu_user_regs *regs, - struct gdb_context *ctx) -{ - switch (regnum) - { - case 0: GDB_REG64(regs->rax); break; - case 1: GDB_REG64(regs->rbx); break; - case 2: GDB_REG64(regs->rcx); break; - case 3: GDB_REG64(regs->rdx); break; - case 4: GDB_REG64(regs->rsi); break; - case 5: GDB_REG64(regs->rdi); break; - case 6: GDB_REG64(regs->rbp); break; - case 7: GDB_REG64(regs->rsp); break; - - case 8: GDB_REG64(regs->r8); break; - case 9: GDB_REG64(regs->r9); break; - case 10: GDB_REG64(regs->r10); break; - case 11: GDB_REG64(regs->r11); break; - case 12: GDB_REG64(regs->r12); break; - case 13: GDB_REG64(regs->r13); break; - case 14: GDB_REG64(regs->r14); break; - case 15: GDB_REG64(regs->r15); break; - - case 16: GDB_REG64(regs->rip); break; - case 17: GDB_REG32(regs->rflags); break; - case 18: GDB_REG32(regs->cs); break; - case 19: GDB_REG32(regs->ss); break; - case 20: GDB_REG32(regs->ds); break; - case 21: GDB_REG32(regs->es); break; - case 22: GDB_REG32(regs->fs); break; - case 23: GDB_REG32(regs->gs); break; - default: - GDB_REG64(0xbaadf00ddeadbeef); - break; - } - gdb_send_packet(ctx); -} - -void -gdb_arch_write_reg(unsigned long regnum, unsigned long val, - struct cpu_user_regs *regs, struct gdb_context *ctx) -{ - switch (regnum) - { - case 0: regs->rax = val; break; - case 1: regs->rbx = val; break; - case 2: regs->rcx = val; break; - case 3: regs->rdx = val; break; - case 4: regs->rsi = val; break; - case 5: regs->rdi = val; break; - case 6: regs->rbp = val; break; - case 7: regs->rsp = val; break; - - case 8: regs->r8 = val; break; - case 9: regs->r9 = val; break; - case 10: regs->r10 = val; break; - case 11: regs->r11 = val; break; - case 12: regs->r12 = val; break; - case 13: regs->r13 = val; break; - case 14: regs->r14 = val; break; - case 15: regs->r15 = val; break; - - case 16: regs->rip = val; break; - case 17: regs->rflags = (u32)val; break; - case 18: regs->cs = (u16)val; break; - case 19: regs->ss = (u16)val; break; - case 20: regs->ds = (u16)val; break; - case 21: regs->es = (u16)val; break; - case 22: regs->fs = (u16)val; break; - case 23: regs->gs = (u16)val; break; - default: - break; - } - gdb_send_reply("OK", ctx); -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/xen/common/Makefile b/xen/common/Makefile index 69d6aa626c..e5eee19a85 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_OVERLAY_DTB) += dt-overlay.o obj-y += event_2l.o obj-y += event_channel.o obj-y += event_fifo.o -obj-$(CONFIG_CRASH_DEBUG) += gdbstub.o obj-$(CONFIG_GRANT_TABLE) += grant_table.o obj-y += guestcopy.o obj-bin-y += gunzip.init.o diff --git a/xen/common/gdbstub.c b/xen/common/gdbstub.c deleted file mode 100644 index df8d122bce..0000000000 --- a/xen/common/gdbstub.c +++ /dev/null @@ -1,748 +0,0 @@ -/* - * Copyright (C) 2005 Jimi Xenidis , IBM Corporation - * Copyright (C) 2006 Isaku Yamahata - * VA Linux Systems Japan. K.K. - * - * gdbstub arch neutral part - * Based on x86 cdb (xen/arch/x86/cdb.c) and ppc gdbstub(xen/common/gdbstub.c) - * But extensively modified. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . - */ - -/* - * gdbstub: implements the architecture independant parts of the - * gdb remote protocol. - */ - -/* We try to avoid assuming much about what the rest of the system is - doing. In particular, dynamic memory allocation is out of the - question. */ - -/* Resuming after we've stopped used to work, but more through luck - than any actual intention. It doesn't at the moment. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -/* Printk isn't particularly safe just after we've trapped to the - debugger. so avoid it. */ -#define dbg_printk(...) -/*#define dbg_printk(...) printk(__VA_ARGS__)*/ - -#define GDB_RETRY_MAX 10 - -struct gdb_cpu_info -{ - atomic_t paused; - atomic_t ack; -}; - -static struct gdb_cpu_info gdb_cpu[NR_CPUS]; -static atomic_t gdb_smp_paused_count; - -static void gdb_smp_pause(void); -static void gdb_smp_resume(void); - -static char __initdata opt_gdb[30]; -string_param("gdb", opt_gdb); - -static void cf_check gdbstub_console_puts(const char *str, size_t nr); - -/* value <-> char (de)serialzers */ -static char -hex2char(unsigned long x) -{ - const char array[] = "0123456789abcdef"; - return array[x & 15]; -} - -static unsigned int -char2hex(unsigned char c) -{ - if ( (c >= '0') && (c <= '9') ) - return c - '0'; - else if ( (c >= 'a') && (c <= 'f') ) - return c - 'a' + 10; - else if ( (c >= 'A') && (c <= 'F') ) - return c - 'A' + 10; - else - BUG(); - return -1; -} - -static unsigned char -str2hex(const char *str) -{ - return (char2hex(str[0]) << 4) | char2hex(str[1]); -} - -static unsigned long -str2ulong(const char *str, unsigned long bytes) -{ - unsigned long x = 0; - unsigned long i = 0; - - while ( *str && (i < (bytes * 2)) ) - { - x <<= 4; - x += char2hex(*str); - ++str; - ++i; - } - - return x; -} - -static unsigned long -str_to_native_ulong(const char *str) -{ - unsigned long x = 0, i = 0; - - while ( *str && (i < BYTES_PER_LONG) ) - { -#ifdef __BIG_ENDIAN - x <<= 8; - x += str2hex(str); -#elif defined(__LITTLE_ENDIAN) - x += (unsigned long)str2hex(str) << (i*8); -#else -# error unknown endian -#endif - str += 2; - i++; - } - - return x; -} - -/* gdb io wrappers */ -static signed long -gdb_io_write(const char *buf, unsigned long len, struct gdb_context *ctx) -{ - int i; - for ( i = 0; i < len; i++ ) - serial_putc(ctx->serhnd, buf[i]); - return i; -} - -static int -gdb_io_write_char(u8 data, struct gdb_context *ctx) -{ - return gdb_io_write((char*)&data, 1, ctx); -} - -static unsigned char -gdb_io_read(struct gdb_context *ctx) -{ - return serial_getc(ctx->serhnd); -} - -/* Receive a command. Returns -1 on csum error, 0 otherwise. */ -/* Does not acknowledge. */ -static int -attempt_receive_packet(struct gdb_context *ctx) -{ - u8 csum; - u8 received_csum; - u8 ch; - - /* Skip over everything up to the first '$' */ - while ( (ch = gdb_io_read(ctx)) != '$' ) - continue; - - csum = 0; - for ( ctx->in_bytes = 0; - ctx->in_bytes < sizeof(ctx->in_buf); - ctx->in_bytes++ ) - { - ch = gdb_io_read(ctx); - if ( ch == '#' ) - break; - ctx->in_buf[ctx->in_bytes] = ch; - csum += ch; - } - - if ( ctx->in_bytes == sizeof(ctx->in_buf) ) - { - dbg_printk("WARNING: GDB sent a stupidly big packet.\n"); - return -1; - } - - ctx->in_buf[ctx->in_bytes] = '\0'; - received_csum = char2hex(gdb_io_read(ctx)) * 16 + - char2hex(gdb_io_read(ctx)); - - return (received_csum == csum) ? 0 : -1; -} - -/* Receive a command, discarding up to ten packets with csum - * errors. Acknowledges all received packets. */ -static int -receive_command(struct gdb_context *ctx) -{ - int r, count = 0; - - count = 0; - do { - r = attempt_receive_packet(ctx); - gdb_io_write_char((r < 0) ? '-' : '+', ctx); - count++; - } while ( (r < 0) && (count < GDB_RETRY_MAX) ); - - return r; -} - -/* routines to send reply packets */ - -static void -gdb_start_packet(struct gdb_context *ctx) -{ - ctx->out_buf[0] = '$'; - ctx->out_offset = 1; - ctx->out_csum = 0; -} - -static void -gdb_write_to_packet_char(u8 data, struct gdb_context *ctx) -{ - ctx->out_csum += data; - ctx->out_buf[ctx->out_offset] = data; - ctx->out_offset++; -} - -void -gdb_write_to_packet(const char *buf, int count, struct gdb_context *ctx) -{ - int x; - for ( x = 0; x < count; x++ ) - gdb_write_to_packet_char(buf[x], ctx); -} - -void -gdb_write_to_packet_str(const char *buf, struct gdb_context *ctx) -{ - gdb_write_to_packet(buf, strlen(buf), ctx); -} - -void -gdb_write_to_packet_hex(unsigned long x, int int_size, struct gdb_context *ctx) -{ - char buf[sizeof(unsigned long) * 2 + 1]; - int i, width = int_size * 2; - - buf[sizeof(unsigned long) * 2] = 0; - - switch ( int_size ) - { - case sizeof(u8): - case sizeof(u16): - case sizeof(u32): - case sizeof(u64): - break; - default: - dbg_printk("WARNING: %s x: %#lx int_size: %d\n", - __func__, x, int_size); - break; - } - -#ifdef __BIG_ENDIAN - i = sizeof(unsigned long) * 2 - do { - buf[--i] = hex2char(x & 15); - x >>= 4; - } while ( x ); - - while ( (i + width) > (sizeof(unsigned long) * 2) ) - buf[--i] = '0'; - - gdb_write_to_packet(&buf[i], width, ctx); -#elif defined(__LITTLE_ENDIAN) - i = 0; - while ( i < width ) - { - buf[i++] = hex2char(x>>4); - buf[i++] = hex2char(x); - x >>= 8; - } - gdb_write_to_packet(buf, width, ctx); -#else -# error unknown endian -#endif -} - -static int -gdb_check_ack(struct gdb_context *ctx) -{ - u8 c = gdb_io_read(ctx); - - switch ( c ) - { - case '+': - return 1; - case '-': - return 0; - default: - printk("Bad ack: %c\n", c); - return 0; - } -} - -/* Return 0 if the reply was successfully received, !0 otherwise. */ -void -gdb_send_packet(struct gdb_context *ctx) -{ - char buf[3]; - int count; - - snprintf(buf, sizeof(buf), "%.02x\n", ctx->out_csum); - - gdb_write_to_packet_char('#', ctx); - gdb_write_to_packet(buf, 2, ctx); - - count = 0; - do { - gdb_io_write(ctx->out_buf, ctx->out_offset, ctx); - } while ( !gdb_check_ack(ctx) && (count++ < GDB_RETRY_MAX) ); - - if ( count == GDB_RETRY_MAX ) - dbg_printk("WARNING: %s reached max retry %d\n", - __func__, GDB_RETRY_MAX); -} - -void -gdb_send_reply(const char *buf, struct gdb_context *ctx) -{ - gdb_start_packet(ctx); - gdb_write_to_packet_str(buf, ctx); - gdb_send_packet(ctx); -} - -/* arch neutral command handlers */ - -static void -gdb_cmd_signum(struct gdb_context *ctx) -{ - gdb_write_to_packet_char('S', ctx); - gdb_write_to_packet_hex(ctx->signum, sizeof(ctx->signum), ctx); - gdb_send_packet(ctx); -} - -static void -gdb_cmd_read_mem(unsigned long addr, unsigned long length, - struct gdb_context *ctx) -{ - int x, r; - unsigned char val; - - dbg_printk("Memory read starting at %lx, length %lx.\n", addr, - length); - - for ( x = 0; x < length; x++ ) - { - r = gdb_arch_copy_from_user(&val, (void *)(addr + x), 1); - if ( r != 0 ) - { - dbg_printk("Error reading from %lx.\n", addr + x); - break; - } - gdb_write_to_packet_hex(val, sizeof(val), ctx); - } - - if ( x == 0 ) - gdb_write_to_packet_str("E05", ctx); - - dbg_printk("Read done.\n"); - - gdb_send_packet(ctx); -} - -static void -gdb_cmd_write_mem(unsigned long addr, unsigned long length, - const char *buf, struct gdb_context *ctx) -{ - int x, r; - unsigned char val; - - dbg_printk("Memory write starting at %lx, length %lx.\n", addr, length); - - for ( x = 0; x < length; x++, addr++, buf += 2 ) - { - val = str2ulong(buf, sizeof(val)); - r = gdb_arch_copy_to_user((void*)addr, (void*)&val, 1); - if ( r != 0 ) - { - dbg_printk("Error writing to %lx.\n", addr); - break; - } - } - - if (x == length) - gdb_write_to_packet_str("OK", ctx); - else - gdb_write_to_packet_str("E11", ctx); - - dbg_printk("Write done.\n"); - - gdb_send_packet(ctx); -} - -static void -gdbstub_attach(struct gdb_context *ctx) -{ - if ( ctx->currently_attached ) - return; - ctx->currently_attached = 1; - ctx->console_steal_id = console_steal(ctx->serhnd, gdbstub_console_puts); -} - -static void -gdbstub_detach(struct gdb_context *ctx) -{ - if ( !ctx->currently_attached ) - return; - ctx->currently_attached = 0; - console_giveback(ctx->console_steal_id); -} - -/* command dispatcher */ -static int -process_command(struct cpu_user_regs *regs, struct gdb_context *ctx) -{ - const char *ptr; - unsigned long addr, length, val; - int resume = 0; - unsigned long type = GDB_CONTINUE; - - /* XXX check ctx->in_bytes >= 2 or similar. */ - - gdb_start_packet(ctx); - switch ( ctx->in_buf[0] ) - { - case '?': /* query signal number */ - gdb_cmd_signum(ctx); - break; - case 'H': /* thread operations */ - gdb_send_reply("OK", ctx); - break; - case 'g': /* Read registers */ - gdb_arch_read_reg_array(regs, ctx); - break; - case 'G': /* Write registers */ - gdb_arch_write_reg_array(regs, ctx->in_buf + 1, ctx); - break; - case 'm': /* Read memory */ - addr = simple_strtoul(ctx->in_buf + 1, &ptr, 16); - if ( (ptr == (ctx->in_buf + 1)) || (ptr[0] != ',') ) - { - gdb_send_reply("E03", ctx); - return 0; - } - length = simple_strtoul(ptr + 1, &ptr, 16); - if ( ptr[0] != 0 ) - { - gdb_send_reply("E04", ctx); - return 0; - } - gdb_cmd_read_mem(addr, length, ctx); - break; - case 'M': /* Write memory */ - addr = simple_strtoul(ctx->in_buf + 1, &ptr, 16); - if ( (ptr == (ctx->in_buf + 1)) || (ptr[0] != ',') ) - { - gdb_send_reply("E03", ctx); - return 0; - } - length = simple_strtoul(ptr + 1, &ptr, 16); - if ( ptr[0] != ':') - { - gdb_send_reply("E04", ctx); - return 0; - } - gdb_cmd_write_mem(addr, length, ptr + 1, ctx); - break; - case 'p': /* read register */ - addr = simple_strtoul(ctx->in_buf + 1, &ptr, 16); - if ( ptr == (ctx->in_buf + 1) ) - { - gdb_send_reply("E03", ctx); - return 0; - } - if ( ptr[0] != 0 ) - { - gdb_send_reply("E04", ctx); - return 0; - } - gdb_arch_read_reg(addr, regs, ctx); - break; - case 'P': /* write register */ - addr = simple_strtoul(ctx->in_buf + 1, &ptr, 16); - if ( ptr == (ctx->in_buf + 1) ) - { - gdb_send_reply("E03", ctx); - return 0; - } - if ( ptr[0] != '=' ) - { - gdb_send_reply("E04", ctx); - return 0; - } - ptr++; - val = str_to_native_ulong(ptr); - gdb_arch_write_reg(addr, val, regs, ctx); - break; - case 'D': - case 'k': - gdbstub_detach(ctx); - gdb_send_reply("OK", ctx); - ctx->connected = 0; - resume = 1; - break; - case 's': /* Single step */ - type = GDB_STEP; - case 'c': /* Resume at current address */ - addr = ~((unsigned long)0); - - if ( ctx->in_buf[1] ) - addr = str2ulong(&ctx->in_buf[1], sizeof(unsigned long)); - gdbstub_attach(ctx); - resume = 1; - gdb_arch_resume(regs, addr, type, ctx); - break; - default: - gdb_send_reply("", ctx); - break; - } - return resume; -} - -static struct gdb_context -__gdb_ctx = { - .serhnd = -1, - .running = ATOMIC_INIT(1), - .signum = 1 -}; -static struct gdb_context *gdb_ctx = &__gdb_ctx; - -static void cf_check gdbstub_console_puts(const char *str, size_t nr) -{ - const char *p; - - gdb_start_packet(gdb_ctx); - gdb_write_to_packet_char('O', gdb_ctx); - - for ( p = str; nr > 0; p++, nr-- ) - { - gdb_write_to_packet_char(hex2char((*p>>4) & 0x0f), gdb_ctx ); - gdb_write_to_packet_char(hex2char((*p) & 0x0f), gdb_ctx ); - } - - gdb_send_packet(gdb_ctx); -} - -/* trap handler: main entry point */ -int -__trap_to_gdb(struct cpu_user_regs *regs, unsigned long cookie) -{ - int rc = 0; - unsigned long flags; - - if ( gdb_ctx->serhnd < 0 ) - { - printk("Debugging connection not set up.\n"); - return -EBUSY; - } - - /* We rely on our caller to ensure we're only on one processor - * at a time... We should probably panic here, but given that - * we're a debugger we should probably be a little tolerant of - * things going wrong. */ - /* We don't want to use a spin lock here, because we're doing - two distinct things: - - 1 -- we don't want to run on more than one processor at a time, - and - 2 -- we want to do something sensible if we re-enter ourselves. - - Spin locks are good for 1, but useless for 2. */ - if ( !atomic_dec_and_test(&gdb_ctx->running) ) - { - printk("WARNING WARNING WARNING: Avoiding recursive gdb.\n"); - atomic_inc(&gdb_ctx->running); - return -EBUSY; - } - - if ( !gdb_ctx->connected ) - { - printk("GDB connection activated.\n"); - gdb_arch_print_state(regs); - gdb_ctx->connected = 1; - } - - gdb_smp_pause(); - - local_irq_save(flags); - - watchdog_disable(); - console_start_sync(); - - gdb_arch_enter(regs); - gdb_ctx->signum = gdb_arch_signal_num(regs, cookie); - - /* If gdb is already attached, tell it we've stopped again. */ - if ( gdb_ctx->currently_attached ) - { - gdb_start_packet(gdb_ctx); - gdb_cmd_signum(gdb_ctx); - } - - do { - if ( receive_command(gdb_ctx) < 0 ) - { - dbg_printk("Error in GDB session...\n"); - rc = -EIO; - break; - } - } while ( process_command(regs, gdb_ctx) == 0 ); - - gdb_smp_resume(); - - gdb_arch_exit(regs); - console_end_sync(); - watchdog_enable(); - atomic_inc(&gdb_ctx->running); - - local_irq_restore(flags); - - return rc; -} - -static int __init cf_check initialise_gdb(void) -{ - if ( *opt_gdb == '\0' ) - return 0; - - gdb_ctx->serhnd = serial_parse_handle(opt_gdb); - if ( gdb_ctx->serhnd == -1 ) - { - printk("Bad gdb= option '%s'\n", opt_gdb); - return 0; - } - - serial_start_sync(gdb_ctx->serhnd); - - printk("GDB stub initialised.\n"); - - return 0; -} -presmp_initcall(initialise_gdb); - -static void cf_check gdb_pause_this_cpu(void *unused) -{ - unsigned long flags; - - local_irq_save(flags); - - atomic_set(&gdb_cpu[smp_processor_id()].ack, 1); - atomic_inc(&gdb_smp_paused_count); - - while ( atomic_read(&gdb_cpu[smp_processor_id()].paused) ) - mdelay(1); - - atomic_dec(&gdb_smp_paused_count); - atomic_set(&gdb_cpu[smp_processor_id()].ack, 0); - - /* Restore interrupts */ - local_irq_restore(flags); -} - -static void gdb_smp_pause(void) -{ - int timeout = 100; - int cpu; - - for_each_online_cpu(cpu) - { - atomic_set(&gdb_cpu[cpu].ack, 0); - atomic_set(&gdb_cpu[cpu].paused, 1); - } - - atomic_set(&gdb_smp_paused_count, 0); - - smp_call_function(gdb_pause_this_cpu, NULL, /* dont wait! */0); - - /* Wait 100ms for all other CPUs to enter pause loop */ - while ( (atomic_read(&gdb_smp_paused_count) < (num_online_cpus() - 1)) - && (timeout-- > 0) ) - mdelay(1); - - if ( atomic_read(&gdb_smp_paused_count) < (num_online_cpus() - 1) ) - { - printk("GDB: Not all CPUs have paused, missing CPUs "); - for_each_online_cpu(cpu) - { - if ( (cpu != smp_processor_id()) && - !atomic_read(&gdb_cpu[cpu].ack) ) - printk("%d ", cpu); - } - printk("\n"); - } -} - -static void gdb_smp_resume(void) -{ - int cpu; - int timeout = 100; - - for_each_online_cpu(cpu) - atomic_set(&gdb_cpu[cpu].paused, 0); - - /* Make sure all CPUs resume */ - while ( (atomic_read(&gdb_smp_paused_count) > 0) - && (timeout-- > 0) ) - mdelay(1); - - if ( atomic_read(&gdb_smp_paused_count) > 0 ) - { - printk("GDB: Not all CPUs have resumed execution, missing CPUs "); - for_each_online_cpu(cpu) - { - if ( (cpu != smp_processor_id()) && - atomic_read(&gdb_cpu[cpu].ack) ) - printk("%d ", cpu); - } - printk("\n"); - } -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/xen/include/xen/gdbstub.h b/xen/include/xen/gdbstub.h deleted file mode 100644 index d2efeb0e3a..0000000000 --- a/xen/include/xen/gdbstub.h +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2005 Hollis Blanchard , IBM Corporation - * Copyright (C) 2006 Isaku Yamahata - * VA Linux Systems Japan. K.K. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; If not, see . - */ - -#ifndef __XEN_GDBSTUB_H__ -#define __XEN_GDBSTUB_H__ - -#include -#include - -#ifdef CONFIG_CRASH_DEBUG - -struct cpu_user_regs; - -struct gdb_context { - int serhnd; /* handle on our serial line */ - int console_steal_id; /* handle on stolen console */ - bool currently_attached; - atomic_t running; - unsigned long connected; - u8 signum; - - char in_buf[PAGE_SIZE]; - unsigned long in_bytes; - - char out_buf[PAGE_SIZE]; - unsigned long out_offset; - u8 out_csum; -}; - -/* interface to arch specific routines */ -void gdb_write_to_packet( - const char *buf, int count, struct gdb_context *ctx); -void gdb_write_to_packet_hex( - unsigned long x, int int_size, struct gdb_context *ctx); - /* ... writes in target native byte order as required by gdb spec. */ -void gdb_send_packet(struct gdb_context *ctx); -void gdb_send_reply(const char *buf, struct gdb_context *ctx); - -/* gdb stub trap handler: entry point */ -int __trap_to_gdb(struct cpu_user_regs *regs, unsigned long cookie); - -/* arch specific routines */ -u16 gdb_arch_signal_num( - struct cpu_user_regs *regs, unsigned long cookie); -void gdb_arch_read_reg_array( - struct cpu_user_regs *regs, struct gdb_context *ctx); -void gdb_arch_write_reg_array( - struct cpu_user_regs *regs, const char* buf, struct gdb_context *ctx); -void gdb_arch_read_reg( - unsigned long regnum, struct cpu_user_regs *regs, struct gdb_context *ctx); -void gdb_arch_write_reg( - unsigned long regnum, unsigned long val, struct cpu_user_regs *regs, - struct gdb_context *ctx); -unsigned int gdb_arch_copy_from_user( - void *dest, const void *src, unsigned len); -unsigned int gdb_arch_copy_to_user( - void *dest, const void *src, unsigned len); -void gdb_arch_resume( - struct cpu_user_regs *regs, unsigned long addr, - unsigned long type, struct gdb_context *ctx); -void gdb_arch_print_state(struct cpu_user_regs *regs); -void gdb_arch_enter(struct cpu_user_regs *regs); -void gdb_arch_exit(struct cpu_user_regs *regs); - -#define GDB_CONTINUE 0 -#define GDB_STEP 1 - -#define SIGILL 4 -#define SIGTRAP 5 -#define SIGBUS 7 -#define SIGFPE 8 -#define SIGSEGV 11 -#define SIGALRM 14 -#define SIGTERM 15 - -#endif - -#endif /* __XEN_GDBSTUB_H__ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 03 16:13:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Feb 2024 16:13:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.675423.1050828 (Exim 4.92) (envelope-from ) id 1rWIdb-0006wL-WF; Sat, 03 Feb 2024 16:13:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 675423.1050828; Sat, 03 Feb 2024 16:13: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 1rWIdb-0006wD-TZ; Sat, 03 Feb 2024 16:13:03 +0000 Received: by outflank-mailman (input) for mailman id 675423; Sat, 03 Feb 2024 16:13:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIdb-0006w7-IE for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:13:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rWIdb-0002y7-HM for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:13:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rWIdb-0002J2-GV for xen-changelog@lists.xenproject.org; Sat, 03 Feb 2024 16:13: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=JiU7KtfOPvCQ9R4pY9MMD62SfwrJP4TuzQkjVvP/p+M=; b=Zar14GqdREHX+CKsc3zkoOHG8N WRIYNi1J1qk7wA3TiSWpx/84ht3K6B4Q2c8MqnWFVMFfh/yCdub5qPxwSBLqs8PD7pJFfybJXeqDY xjd5FTKLnB57nyI5tqbx3rpXeChtmbDhjGcLu8+k6EY5puiIkploaw0nd2tVAoeweU2I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Remove debugger.h Message-Id: Date: Sat, 03 Feb 2024 16:13:03 +0000 commit 3f819af8a796c0e2f798dd301ec8c3f8cccbc9fc Author: Andrew Cooper AuthorDate: Fri Jan 26 19:55:18 2024 +0000 Commit: Andrew Cooper CommitDate: Thu Feb 1 19:52:44 2024 +0000 xen: Remove debugger.h With x86 having dropped gdbstub, Xen's only debugger has gone. Drop xen/debugger.h and remove the hooks spread around the codebase. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/bug.h | 2 -- xen/arch/x86/include/asm/debugger.h | 30 ------------------------- xen/arch/x86/traps.c | 30 ++++--------------------- xen/common/bug.c | 27 ----------------------- xen/common/keyhandler.c | 22 +------------------ xen/common/shutdown.c | 2 -- xen/drivers/char/console.c | 3 --- xen/include/xen/bug.h | 4 ---- xen/include/xen/debugger.h | 44 ------------------------------------- 9 files changed, 5 insertions(+), 159 deletions(-) diff --git a/xen/arch/x86/include/asm/bug.h b/xen/arch/x86/include/asm/bug.h index 7fe879a8cc..e748b6c2f2 100644 --- a/xen/arch/x86/include/asm/bug.h +++ b/xen/arch/x86/include/asm/bug.h @@ -21,8 +21,6 @@ #ifndef __ASSEMBLY__ -#define BUG_DEBUGGER_TRAP_FATAL(regs) debugger_trap_fatal(X86_EXC_GP,regs) - #define BUG_INSTR "ud2" #define BUG_ASM_CONST "c" diff --git a/xen/arch/x86/include/asm/debugger.h b/xen/arch/x86/include/asm/debugger.h deleted file mode 100644 index a5c299c6c3..0000000000 --- a/xen/arch/x86/include/asm/debugger.h +++ /dev/null @@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** - * xen/arch/x86/include/asm/debugger.h - * - * x86-specific debugger hooks. - */ -#ifndef __X86_DEBUGGER_H__ -#define __X86_DEBUGGER_H__ - -#include -#include - -#include - -/* Returns true if GDB handled the trap, or it is surviveable. */ -static inline bool debugger_trap_fatal( - unsigned int vector, struct cpu_user_regs *regs) -{ - int rc = __trap_to_gdb(regs, vector); - - if ( rc == 0 ) - return true; - - return vector == X86_EXC_BP; -} - -/* Int3 is a trivial way to gather cpu_user_regs context. */ -#define debugger_trap_immediate() __asm__ __volatile__ ( "int3" ) - -#endif /* __X86_DEBUGGER_H__ */ diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 7724306116..5f4bcc0537 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -835,11 +834,6 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) void asmlinkage do_unhandled_trap(struct cpu_user_regs *regs) { - unsigned int trapnr = regs->entry_vector; - - if ( debugger_trap_fatal(trapnr, regs) ) - return; - fatal_trap(regs, false); } @@ -941,9 +935,6 @@ void asmlinkage do_trap(struct cpu_user_regs *regs) return; hardware_trap: - if ( debugger_trap_fatal(trapnr, regs) ) - return; - fatal_trap(regs, false); } @@ -1190,9 +1181,6 @@ void asmlinkage do_invalid_op(struct cpu_user_regs *regs) if ( likely(extable_fixup(regs, true)) ) return; - if ( debugger_trap_fatal(X86_EXC_UD, regs) ) - return; - show_execution_state(regs); panic("FATAL TRAP: vector = %d (invalid opcode)\n", X86_EXC_UD); } @@ -1206,9 +1194,8 @@ void asmlinkage do_int3(struct cpu_user_regs *regs) if ( likely(extable_fixup(regs, true)) ) return; - if ( !debugger_trap_fatal(X86_EXC_BP, regs) ) - printk(XENLOG_DEBUG "Hit embedded breakpoint at %p [%ps]\n", - _p(regs->rip), _p(regs->rip)); + printk(XENLOG_DEBUG "Hit embedded breakpoint at %p [%ps]\n", + _p(regs->rip), _p(regs->rip)); return; } @@ -1294,9 +1281,6 @@ void do_general_protection(struct cpu_user_regs *regs) return; hardware_gp: - if ( debugger_trap_fatal(X86_EXC_GP, regs) ) - return; - show_execution_state(regs); panic("GENERAL PROTECTION FAULT\n[error_code=%04x]\n", regs->error_code); } @@ -1620,9 +1604,6 @@ void asmlinkage do_page_fault(struct cpu_user_regs *regs) } fatal: - if ( debugger_trap_fatal(X86_EXC_PF, regs) ) - return; - show_execution_state(regs); show_page_walk(addr); panic("FATAL PAGE FAULT\n" @@ -1933,11 +1914,8 @@ void asmlinkage do_debug(struct cpu_user_regs *regs) return; } #endif - if ( !debugger_trap_fatal(X86_EXC_DB, regs) ) - { - WARN(); - regs->eflags &= ~X86_EFLAGS_TF; - } + WARN(); + regs->eflags &= ~X86_EFLAGS_TF; } /* diff --git a/xen/common/bug.c b/xen/common/bug.c index ca166e102b..5fbe703a81 100644 --- a/xen/common/bug.c +++ b/xen/common/bug.c @@ -1,23 +1,4 @@ #include -/* - * Ideally should be included in - * but an issue with compilation can occur as uses - * BUG/ASSERT/etc macros inside but they will be defined later in - * after return from inclusion of : - * - * : - * ... - * : - * ... - * -> some of included header in it uses BUG/ASSERT/etc - * ... - * ... - * #define BUG() ... - * ... - * #define ASSERT() ... - * ... - */ -#include #include #include #include @@ -96,10 +77,6 @@ int do_bug_frame(struct cpu_user_regs *regs, unsigned long pc) case BUGFRAME_bug: printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno); - - if ( BUG_DEBUGGER_TRAP_FATAL(regs) ) - break; - show_execution_state(regs); panic("Xen BUG at %s%s:%d\n", prefix, filename, lineno); @@ -111,10 +88,6 @@ int do_bug_frame(struct cpu_user_regs *regs, unsigned long pc) printk("Assertion '%s' failed at %s%s:%d\n", predicate, prefix, filename, lineno); - - if ( BUG_DEBUGGER_TRAP_FATAL(regs) ) - break; - show_execution_state(regs); panic("Assertion '%s' failed at %s%s:%d\n", predicate, prefix, filename, lineno); diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 99a2d72a02..f131034d33 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -3,7 +3,6 @@ */ #include -#include #include #include #include @@ -29,8 +28,7 @@ static bool alt_key_handling; static keyhandler_fn_t cf_check show_handlers, cf_check dump_hwdom_registers, cf_check dump_domains, cf_check read_clocks; static irq_keyhandler_fn_t cf_check do_toggle_alt_key, cf_check dump_registers, - cf_check reboot_machine, cf_check run_all_keyhandlers, - cf_check do_debug_key; + cf_check reboot_machine, cf_check run_all_keyhandlers; static struct keyhandler { union { @@ -57,7 +55,6 @@ static struct keyhandler { IRQ_KEYHANDLER('R', reboot_machine, "reboot machine", 0), KEYHANDLER('t', read_clocks, "display multi-cpu clock info", 1), KEYHANDLER('0', dump_hwdom_registers, "dump Dom0 registers", 1), - IRQ_KEYHANDLER('%', do_debug_key, "trap to xendbg", 0), IRQ_KEYHANDLER('*', run_all_keyhandlers, "print all diagnostics", 0), #ifdef CONFIG_PERF_COUNTERS @@ -503,23 +500,6 @@ static void cf_check run_all_keyhandlers( tasklet_schedule(&run_all_keyhandlers_tasklet); } -static void cf_check do_debugger_trap_fatal(struct cpu_user_regs *regs) -{ - (void)debugger_trap_fatal(0xf001, regs); - - /* Prevent tail call optimisation, which confuses xendbg. */ - barrier(); -} - -static void cf_check do_debug_key(unsigned char key, struct cpu_user_regs *regs) -{ - printk("'%c' pressed -> trapping into debugger\n", key); - if ( regs ) - do_debugger_trap_fatal(regs); - else - run_in_exception_handler(do_debugger_trap_fatal); -} - static void cf_check do_toggle_alt_key( unsigned char key, struct cpu_user_regs *regs) { diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index dfd5e41097..5f8141edc6 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -40,7 +39,6 @@ void hwdom_shutdown(u8 reason) machine_halt(); case SHUTDOWN_crash: - debugger_trap_immediate(); printk("Hardware Dom%u crashed: ", hardware_domain->domain_id); kexec_crash(CRASHREASON_HWDOM); reboot_or_halt(); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 0666564ec9..dce0226e87 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -1297,8 +1296,6 @@ void panic(const char *fmt, ...) spin_unlock_irqrestore(&lock, flags); - debugger_trap_immediate(); - kexec_crash(CRASHREASON_PANIC); if ( opt_noreboot ) diff --git a/xen/include/xen/bug.h b/xen/include/xen/bug.h index 8cca4486a4..4bd0be5088 100644 --- a/xen/include/xen/bug.h +++ b/xen/include/xen/bug.h @@ -16,10 +16,6 @@ #ifndef __ASSEMBLY__ -#ifndef BUG_DEBUGGER_TRAP_FATAL -#define BUG_DEBUGGER_TRAP_FATAL(regs) 0 -#endif - #include #include diff --git a/xen/include/xen/debugger.h b/xen/include/xen/debugger.h deleted file mode 100644 index 72684268af..0000000000 --- a/xen/include/xen/debugger.h +++ /dev/null @@ -1,44 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** - * Arch specific debuggers should implement: - * - * debugger_trap_fatal(): - * Called when Xen is about to give up and crash. Typically you will use this - * hook to drop into a debug session. It can also be used to hook off - * deliberately caused traps (which you then handle and return non-zero). - * - * debugger_trap_immediate(): - * Called if we want to drop into a debugger now. This is essentially the - * same as debugger_trap_fatal, except that we use the current register state - * rather than the state which was in effect when we took the trap. - * For example: if we're dying because of an unhandled exception, we call - * debugger_trap_fatal; if we're dying because of a panic() we call - * debugger_trap_immediate(). - */ - -#ifndef __XEN_DEBUGGER_H__ -#define __XEN_DEBUGGER_H__ - -#ifdef CONFIG_CRASH_DEBUG - -#include - -#else - -#include - -struct cpu_user_regs; - -static inline bool debugger_trap_fatal( - unsigned int vector, const struct cpu_user_regs *regs) -{ - return false; -} - -static inline void debugger_trap_immediate(void) -{ -} - -#endif /* CONFIG_CRASH_DEBUG */ - -#endif /* __XEN_DEBUGGER_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Feb 05 21:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Feb 2024 21:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.676523.1052682 (Exim 4.92) (envelope-from ) id 1rX6vo-0004AQ-Vs; Mon, 05 Feb 2024 21:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 676523.1052682; Mon, 05 Feb 2024 21: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 1rX6vo-0004AJ-TO; Mon, 05 Feb 2024 21:55:12 +0000 Received: by outflank-mailman (input) for mailman id 676523; Mon, 05 Feb 2024 21:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rX6vn-0004AB-WD for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rX6vn-0007yt-VQ for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rX6vn-0001YA-UC for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21: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=zio71YzXWJKYEhc5CnqzjKPG7/R0ZEkagWfpmU4XDzg=; b=rNxqLABs8Bq9pOdeiLTHbSeKHp Bxy+qpgDfUoLhZI7Sy0rPSISXpWTgsmwhHsh2uRtAut8zHA5KCbQtOHZb53EEebBymfE+9ITRVdc9 H4NJWb5dehebdQnKOLAtZmzw70UWtFuPhh2GDj9U/1TcGlNs9jqbyGXO8y07Vr9oNtdc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/guest: finish conversion to altcall Message-Id: Date: Mon, 05 Feb 2024 21:55:11 +0000 commit e931edccc53c9dd6e9a505ad0ff3a03d985669bc Author: Jan Beulich AuthorDate: Mon Feb 5 10:45:31 2024 +0100 Commit: Jan Beulich CommitDate: Mon Feb 5 10:45:31 2024 +0100 x86/guest: finish conversion to altcall While .setup() and .e820_fixup() don't need fiddling with for being run only very early, both .ap_setup() and .resume() want converting too: This way both pre-filled struct hypervisor_ops instances can become __initconst_cf_clobber, thus allowing to eliminate up to 5 more ENDBR (configuration dependent) during the 2nd phase of alternatives patching. While fiddling with section annotations here, also move "ops" itself to .data.ro_after_init. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Paul Durrant --- xen/arch/x86/guest/hyperv/hyperv.c | 2 +- xen/arch/x86/guest/hypervisor.c | 6 +++--- xen/arch/x86/guest/xen/xen.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c index 912099564e..6989af38f1 100644 --- a/xen/arch/x86/guest/hyperv/hyperv.c +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -207,7 +207,7 @@ static int cf_check flush_tlb( return hyperv_flush_tlb(mask, va, flags); } -static const struct hypervisor_ops __initconstrel ops = { +static const struct hypervisor_ops __initconst_cf_clobber ops = { .name = "Hyper-V", .setup = setup, .ap_setup = ap_setup, diff --git a/xen/arch/x86/guest/hypervisor.c b/xen/arch/x86/guest/hypervisor.c index e0b046cc6c..ac80e83245 100644 --- a/xen/arch/x86/guest/hypervisor.c +++ b/xen/arch/x86/guest/hypervisor.c @@ -13,7 +13,7 @@ #include #include -static struct hypervisor_ops __read_mostly ops; +static struct hypervisor_ops __ro_after_init ops; const char *__init hypervisor_probe(void) { @@ -49,7 +49,7 @@ void __init hypervisor_setup(void) int hypervisor_ap_setup(void) { if ( ops.ap_setup ) - return ops.ap_setup(); + return alternative_call(ops.ap_setup); return 0; } @@ -57,7 +57,7 @@ int hypervisor_ap_setup(void) void hypervisor_resume(void) { if ( ops.resume ) - ops.resume(); + alternative_vcall(ops.resume); } void __init hypervisor_e820_fixup(void) diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index 2eed32fe46..44a689d439 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -318,7 +318,7 @@ static int cf_check flush_tlb( return xen_hypercall_hvm_op(HVMOP_flush_tlbs, NULL); } -static const struct hypervisor_ops __initconstrel ops = { +static const struct hypervisor_ops __initconst_cf_clobber ops = { .name = "Xen", .setup = setup, .ap_setup = ap_setup, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Feb 05 21:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Feb 2024 21:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.676522.1052678 (Exim 4.92) (envelope-from ) id 1rX6ve-00048s-UZ; Mon, 05 Feb 2024 21:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 676522.1052678; Mon, 05 Feb 2024 21: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 1rX6ve-00048l-Ro; Mon, 05 Feb 2024 21:55:02 +0000 Received: by outflank-mailman (input) for mailman id 676522; Mon, 05 Feb 2024 21:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rX6vd-00048f-U5 for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rX6vd-0007yp-Rs for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rX6vd-0001Wr-QN for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7+wOiW1FFhQUk/iAtuh4+zk6errUFw8s593h0aoF8Hc=; b=TD22+T+Y9eG13eWFyCG5mFgR+I J0l8Gt480yYfF/cSlpnrPAKMcK776nW6FBJEt8nFRtAZlx73Z+1DHB5QqK3+gFienmYqhOiwpQ4g0 9ivrH5pnrV74oL7zmr5YP2ZRKxj/Vf7jhgsIQ43jI0jqIJ4XgVidfZ3kQnE/x+8NcugI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: arrange for ENDBR zapping from _ctxt_switch_masking() Message-Id: Date: Mon, 05 Feb 2024 21:55:01 +0000 commit 044168fa3a65b6542bda5c21e373742de1bd5980 Author: Jan Beulich AuthorDate: Mon Feb 5 10:44:46 2024 +0100 Commit: Jan Beulich CommitDate: Mon Feb 5 10:44:46 2024 +0100 x86: arrange for ENDBR zapping from _ctxt_switch_masking() While altcall is already used for them, the functions want announcing in .init.rodata.cf_clobber, even if the resulting static variables aren't otherwise used. While doing this also move ctxt_switch_masking to .data.ro_after_init. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 5 +++++ xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/cpu/intel.c | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index d43288ae97..808cda46bc 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -258,6 +258,11 @@ static void cf_check amd_ctxt_switch_masking(const struct vcpu *next) #undef LAZY } +#ifdef CONFIG_XEN_IBT /* Announce the function to ENDBR clobbering logic. */ +static const typeof(ctxt_switch_masking) __initconst_cf_clobber __used csm = + amd_ctxt_switch_masking; +#endif + /* * Mask the features and extended features returned by CPUID. Parameters are * set from the boot line via two methods: diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 51509fece0..61e5e52151 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -119,7 +119,7 @@ static const struct cpu_dev default_cpu = { static const struct cpu_dev *this_cpu = &default_cpu; static DEFINE_PER_CPU(uint64_t, msr_misc_features); -void (* __read_mostly ctxt_switch_masking)(const struct vcpu *next); +void (* __ro_after_init ctxt_switch_masking)(const struct vcpu *next); bool __init probe_cpuid_faulting(void) { diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index b5490eb06e..cd9f101b8c 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -220,6 +220,11 @@ static void cf_check intel_ctxt_switch_masking(const struct vcpu *next) #undef LAZY } +#ifdef CONFIG_XEN_IBT /* Announce the function to ENDBR clobbering logic. */ +static const typeof(ctxt_switch_masking) __initconst_cf_clobber __used csm = + intel_ctxt_switch_masking; +#endif + /* * opt_cpuid_mask_ecx/edx: cpuid.1[ecx, edx] feature mask. * For example, E8400[Intel Core 2 Duo Processor series] ecx = 0x0008E3FD, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Feb 05 21:55:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Feb 2024 21:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.676524.1052687 (Exim 4.92) (envelope-from ) id 1rX6vz-0004Cv-1D; Mon, 05 Feb 2024 21:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 676524.1052687; Mon, 05 Feb 2024 21:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rX6vy-0004Cn-Uo; Mon, 05 Feb 2024 21:55:22 +0000 Received: by outflank-mailman (input) for mailman id 676524; Mon, 05 Feb 2024 21:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rX6vy-0004Cb-3o for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rX6vy-0007z4-2Z for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rX6vy-0001Z8-1W for xen-changelog@lists.xenproject.org; Mon, 05 Feb 2024 21:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xsYCcViJw9JoCJOTOdck+XXYKHt2UAOcTe0DGSFnT4I=; b=ck2SPEW3fuzTEdbUK9zaC1Nfrz lLd8hPsQQVXZzz4jlZQ/Tuta4aJEk5ZvurfIN8WJbQRTnUx6cycZYhC9jH/Q2blztuRJMhHP8BAwU haABTNGrOTAeZ50tgXvZRdCnWkeIy86HGLLTGE6ygliOv5Vl0Oc15w3h0yyx8mAnRz50=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/CPU: convert vendor hook invocations to altcall Message-Id: Date: Mon, 05 Feb 2024 21:55:22 +0000 commit 660f8a75013c947fbe5358a640032a1f9f1eece5 Author: Jan Beulich AuthorDate: Mon Feb 5 10:48:11 2024 +0100 Commit: Jan Beulich CommitDate: Mon Feb 5 10:48:11 2024 +0100 x86/CPU: convert vendor hook invocations to altcall While not performance critical, these hook invocations still want converting: This way all pre-filled struct cpu_dev instances can become __initconst_cf_clobber, thus allowing to eliminate further 8 ENDBR during the 2nd phase of alternatives patching (besides moving previously resident data to .init.*). Since all use sites need touching anyway, take the opportunity and also address a Misra C:2012 Rule 5.5 violation: Rename the this_cpu static variable. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/centaur.c | 2 +- xen/arch/x86/cpu/common.c | 24 ++++++++++++------------ xen/arch/x86/cpu/hygon.c | 2 +- xen/arch/x86/cpu/intel.c | 2 +- xen/arch/x86/cpu/shanghai.c | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 808cda46bc..ab92333673 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -1307,7 +1307,7 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) amd_log_freq(c); } -const struct cpu_dev amd_cpu_dev = { +const struct cpu_dev __initconst_cf_clobber amd_cpu_dev = { .c_early_init = early_init_amd, .c_init = init_amd, }; diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c index eac49d78db..750168d1e8 100644 --- a/xen/arch/x86/cpu/centaur.c +++ b/xen/arch/x86/cpu/centaur.c @@ -54,6 +54,6 @@ static void cf_check init_centaur(struct cpuinfo_x86 *c) init_c3(c); } -const struct cpu_dev centaur_cpu_dev = { +const struct cpu_dev __initconst_cf_clobber centaur_cpu_dev = { .c_init = init_centaur, }; diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 61e5e52151..26eed2ade1 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -113,10 +113,10 @@ static void cf_check default_init(struct cpuinfo_x86 * c) __clear_bit(X86_FEATURE_SEP, c->x86_capability); } -static const struct cpu_dev default_cpu = { +static const struct cpu_dev __initconst_cf_clobber __used default_cpu = { .c_init = default_init, }; -static const struct cpu_dev *this_cpu = &default_cpu; +static struct cpu_dev __ro_after_init actual_cpu; static DEFINE_PER_CPU(uint64_t, msr_misc_features); void (* __ro_after_init ctxt_switch_masking)(const struct vcpu *next); @@ -336,12 +336,13 @@ void __init early_cpu_init(bool verbose) c->x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); switch (c->x86_vendor) { - case X86_VENDOR_INTEL: this_cpu = &intel_cpu_dev; break; - case X86_VENDOR_AMD: this_cpu = &amd_cpu_dev; break; - case X86_VENDOR_CENTAUR: this_cpu = ¢aur_cpu_dev; break; - case X86_VENDOR_SHANGHAI: this_cpu = &shanghai_cpu_dev; break; - case X86_VENDOR_HYGON: this_cpu = &hygon_cpu_dev; break; + case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; + case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; + case X86_VENDOR_CENTAUR: actual_cpu = centaur_cpu_dev; break; + case X86_VENDOR_SHANGHAI: actual_cpu = shanghai_cpu_dev; break; + case X86_VENDOR_HYGON: actual_cpu = hygon_cpu_dev; break; default: + actual_cpu = default_cpu; if (!verbose) break; printk(XENLOG_ERR @@ -448,8 +449,8 @@ static void generic_identify(struct cpuinfo_x86 *c) if (c->extended_cpuid_level >= 0x80000021) c->x86_capability[FEATURESET_e21a] = cpuid_eax(0x80000021); - if (this_cpu->c_early_init) - this_cpu->c_early_init(c); + if (actual_cpu.c_early_init) + alternative_vcall(actual_cpu.c_early_init, c); /* c_early_init() may have adjusted cpuid levels/features. Reread. */ c->cpuid_level = cpuid_eax(0); @@ -546,9 +547,8 @@ void identify_cpu(struct cpuinfo_x86 *c) * At the end of this section, c->x86_capability better * indicate the features this CPU genuinely supports! */ - if (this_cpu->c_init) - this_cpu->c_init(c); - + if (actual_cpu.c_init) + alternative_vcall(actual_cpu.c_init, c); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 42029f2145..f7508cc8fc 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -87,7 +87,7 @@ static void cf_check init_hygon(struct cpuinfo_x86 *c) amd_log_freq(c); } -const struct cpu_dev hygon_cpu_dev = { +const struct cpu_dev __initconst_cf_clobber hygon_cpu_dev = { .c_early_init = early_init_amd, .c_init = init_hygon, }; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index cd9f101b8c..ce7a77a867 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -603,7 +603,7 @@ static void cf_check init_intel(struct cpuinfo_x86 *c) setup_clear_cpu_cap(X86_FEATURE_CLWB); } -const struct cpu_dev intel_cpu_dev = { +const struct cpu_dev __initconst_cf_clobber intel_cpu_dev = { .c_early_init = early_init_intel, .c_init = init_intel, }; diff --git a/xen/arch/x86/cpu/shanghai.c b/xen/arch/x86/cpu/shanghai.c index 95ae544f8c..910f2c32f3 100644 --- a/xen/arch/x86/cpu/shanghai.c +++ b/xen/arch/x86/cpu/shanghai.c @@ -15,6 +15,6 @@ static void cf_check init_shanghai(struct cpuinfo_x86 *c) init_intel_cacheinfo(c); } -const struct cpu_dev shanghai_cpu_dev = { +const struct cpu_dev __initconst_cf_clobber shanghai_cpu_dev = { .c_init = init_shanghai, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Feb 06 10:00:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Feb 2024 10:00:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.676731.1052972 (Exim 4.92) (envelope-from ) id 1rXIFI-0002TU-9U; Tue, 06 Feb 2024 10:00:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 676731.1052972; Tue, 06 Feb 2024 10:00:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFI-0002T8-6l; Tue, 06 Feb 2024 10:00:04 +0000 Received: by outflank-mailman (input) for mailman id 676731; Tue, 06 Feb 2024 10:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFG-0002Bd-JO for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFG-00081G-Go for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXIFG-0004PE-Dt for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10: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=5hH84+f+OL/KyzFeRCZ1sK/DLjxArPseebqTWAuhgP8=; b=A88kDri4YatYLD7D11FsYTpD42 c9QWFkkBHS2fm6okU3I14jFDiJ26dAIXH+Dy4s6WjsUhkdyB4ZAMkZxyBMvBd+sVb6nI1Yhi22TMJ 3FE27hlPlBD3exhJc0DjHEsdsH566/kAQMB5yZzg+lOV/MwoV+ln7aHQZYiejXBoCD94=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ucode: Remove accidentally introduced tabs Message-Id: Date: Tue, 06 Feb 2024 10:00:02 +0000 commit 930605f155cc8283afa153481cfba5056479fc42 Author: Andrew Cooper AuthorDate: Fri Feb 2 17:57:37 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Feb 5 10:36:47 2024 +0000 x86/ucode: Remove accidentally introduced tabs Fixes: cf7fe8b72dea ("x86/ucode: Fix stability of the raw CPU Policy rescan") Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/microcode/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 6f95f7bbe2..1c9f66ea8a 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -685,12 +685,12 @@ static long cf_check microcode_update_helper(void *data) * Disable CPUID masking if in use, to avoid having current's * cpu_policy affect the rescan. */ - if ( ctxt_switch_masking ) + if ( ctxt_switch_masking ) alternative_vcall(ctxt_switch_masking, NULL); calculate_raw_cpu_policy(); - if ( ctxt_switch_masking ) + if ( ctxt_switch_masking ) alternative_vcall(ctxt_switch_masking, current); } else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Feb 06 10:00:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Feb 2024 10:00:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.676732.1052976 (Exim 4.92) (envelope-from ) id 1rXIFS-0002tN-Am; Tue, 06 Feb 2024 10:00:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 676732.1052976; Tue, 06 Feb 2024 10:00:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFS-0002tF-8G; Tue, 06 Feb 2024 10:00:14 +0000 Received: by outflank-mailman (input) for mailman id 676732; Tue, 06 Feb 2024 10:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFQ-0002t8-L9 for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFQ-00081d-KG for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXIFQ-0004Rf-J5 for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10: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=xZ7aCvpW1dTZODYq5xXS76gbldL1HtYcNmYFNEs0X08=; b=4H6LJDE6R4VeYm7AcuqS13cH+C mAyaArY2RJ1381XHJS6HvZ4CsueWD75776S/Xs1OoiNQrK5aIc5H8hwkhi1UEYzcrL8GCD8r5D9yV WqR8QLY+hL/F7Mzgdx7Vmq4hJhXwtg9MCSB98z6/Vekr65juzxZIs5lUCI/muIKxrdiA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/bitmap: Deduplicate __bitmap_weight() implementations Message-Id: Date: Tue, 06 Feb 2024 10:00:12 +0000 commit 9eee78988ca081eeed0a69fc9773e2e4268d1ed7 Author: Andrew Cooper AuthorDate: Fri Feb 2 15:03:15 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Feb 5 10:36:47 2024 +0000 xen/bitmap: Deduplicate __bitmap_weight() implementations We have two copies of __bitmap_weight() that differ by whether they make hweight32() or hweight64() calls, yet we already have hweight_long() which is the form that __bitmap_weight() wants. Fix hweight_long() to return unsigned int like all the other hweight helpers, and fix __bitmap_weight() to used unsigned integers. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/bitmap.c | 21 +++------------------ xen/include/xen/bitops.h | 2 +- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/xen/common/bitmap.c b/xen/common/bitmap.c index c57b35f004..9d9ff09f3d 100644 --- a/xen/common/bitmap.c +++ b/xen/common/bitmap.c @@ -186,33 +186,18 @@ int __bitmap_subset(const unsigned long *bitmap1, } EXPORT_SYMBOL(__bitmap_subset); -#if BITS_PER_LONG == 32 unsigned int __bitmap_weight(const unsigned long *bitmap, unsigned int bits) { - int k, w = 0, lim = bits/BITS_PER_LONG; + unsigned int k, w = 0, lim = bits / BITS_PER_LONG; for (k = 0; k < lim; k++) - w += hweight32(bitmap[k]); + w += hweight_long(bitmap[k]); if (bits % BITS_PER_LONG) - w += hweight32(bitmap[k] & BITMAP_LAST_WORD_MASK(bits)); + w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits)); return w; } -#else -unsigned int __bitmap_weight(const unsigned long *bitmap, unsigned int bits) -{ - int k, w = 0, lim = bits/BITS_PER_LONG; - - for (k = 0; k < lim; k++) - w += hweight64(bitmap[k]); - - if (bits % BITS_PER_LONG) - w += hweight64(bitmap[k] & BITMAP_LAST_WORD_MASK(bits)); - - return w; -} -#endif EXPORT_SYMBOL(__bitmap_weight); void __bitmap_set(unsigned long *map, unsigned int start, int len) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index a88d45475c..2cb7892bcc 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -199,7 +199,7 @@ static inline unsigned int generic_hweight64(uint64_t w) return (w + (w >> 32)) & 0xFF; } -static inline unsigned long hweight_long(unsigned long w) +static inline unsigned int hweight_long(unsigned long w) { return sizeof(w) == 4 ? generic_hweight32(w) : generic_hweight64(w); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Feb 06 10:00:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Feb 2024 10:00:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.676733.1052980 (Exim 4.92) (envelope-from ) id 1rXIFc-0002v9-CH; Tue, 06 Feb 2024 10:00:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 676733.1052980; Tue, 06 Feb 2024 10:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFc-0002v2-9l; Tue, 06 Feb 2024 10:00:24 +0000 Received: by outflank-mailman (input) for mailman id 676733; Tue, 06 Feb 2024 10:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFa-0002uw-Of for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFa-00081r-Nn for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXIFa-0004SZ-MM for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10: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=YRdDOFaELa5Hyo2l1hfShtFs0rKv0exaCUmaxCD2b7E=; b=1SwX1VMQg/cUFaJKCKy4EW+KSN VB6dfVdyHl9DLAzK7B7fuhe3OmnifOwlKSVtKYn4mfbq1NnBEDkqvuKLgrr8Xa8gHu3iXTUYYO81k SQzbnW8x4LRWqYaB2G+PDdCq/FmCYLw9AuhNEBEqQy0gN+dUHfl3hGuAin1uR7Uquidc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu: Fix mixed tabs/spaces Message-Id: Date: Tue, 06 Feb 2024 10:00:22 +0000 commit 10e0fb655d811031553ad0fa319a7b58fe39f047 Author: Andrew Cooper AuthorDate: Mon Feb 5 14:13:02 2024 +0000 Commit: Andrew Cooper CommitDate: Mon Feb 5 17:58:23 2024 +0000 x86/cpu: Fix mixed tabs/spaces Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 26eed2ade1..28d7f34c4d 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -336,8 +336,8 @@ void __init early_cpu_init(bool verbose) c->x86_vendor = x86_cpuid_lookup_vendor(ebx, ecx, edx); switch (c->x86_vendor) { - case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; - case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; + case X86_VENDOR_INTEL: actual_cpu = intel_cpu_dev; break; + case X86_VENDOR_AMD: actual_cpu = amd_cpu_dev; break; case X86_VENDOR_CENTAUR: actual_cpu = centaur_cpu_dev; break; case X86_VENDOR_SHANGHAI: actual_cpu = shanghai_cpu_dev; break; case X86_VENDOR_HYGON: actual_cpu = hygon_cpu_dev; break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Feb 06 10:00:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Feb 2024 10:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.676734.1052985 (Exim 4.92) (envelope-from ) id 1rXIFm-0002xI-F6; Tue, 06 Feb 2024 10:00:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 676734.1052985; Tue, 06 Feb 2024 10:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFm-0002xC-BG; Tue, 06 Feb 2024 10:00:34 +0000 Received: by outflank-mailman (input) for mailman id 676734; Tue, 06 Feb 2024 10:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFk-0002x3-Th for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXIFk-00081y-Sw for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXIFk-0004Ti-Pq for xen-changelog@lists.xenproject.org; Tue, 06 Feb 2024 10: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=MCWDXBfCsnStxx5RX8pPgCT990KiKQui212pzcChO3g=; b=JeOqE9OzrHPxl7+DJ0OjTiLkjW RAeJPpUdMDvzFN/IOBcNMZ1SeyHiwh8yd50GkTsNnTspsAru/BxBE6ghV9UipB4W85UdqLNwLD4Gq lOZ6U+JN/AuGWPPSq7QRwVpVYAn2tIK7BYs5QrJtsQ79rYTkhOLZNsa7sp9u7num5Vj4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xentop: fix sorting bug for some columns Message-Id: Date: Tue, 06 Feb 2024 10:00:32 +0000 commit 29f17d837421f13c0e0010802de1b2d51d2ded4a Author: Cyril Rébert AuthorDate: Sun Feb 4 11:19:40 2024 +0100 Commit: Andrew Cooper CommitDate: Mon Feb 5 17:58:23 2024 +0000 tools/xentop: fix sorting bug for some columns Sort doesn't work on columns VBD_OO, VBD_RD, VBD_WR and VBD_RSECT. Fix by adjusting variables names in compare functions. Bug fix only. No functional change. Fixes: 91c3e3dc91d6 ("tools/xentop: Display '-' when stats are not available.") Signed-off-by: Cyril Rébert (zithro) Reviewed-by: Anthony PERARD --- tools/xentop/xentop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index 950e8935c4..545bd5e96d 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -684,7 +684,7 @@ static int compare_vbd_oo(xenstat_domain *domain1, xenstat_domain *domain2) unsigned long long dom1_vbd_oo = 0, dom2_vbd_oo = 0; tot_vbd_reqs(domain1, FIELD_VBD_OO, &dom1_vbd_oo); - tot_vbd_reqs(domain1, FIELD_VBD_OO, &dom2_vbd_oo); + tot_vbd_reqs(domain2, FIELD_VBD_OO, &dom2_vbd_oo); return -compare(dom1_vbd_oo, dom2_vbd_oo); } @@ -711,9 +711,9 @@ static int compare_vbd_rd(xenstat_domain *domain1, xenstat_domain *domain2) unsigned long long dom1_vbd_rd = 0, dom2_vbd_rd = 0; tot_vbd_reqs(domain1, FIELD_VBD_RD, &dom1_vbd_rd); - tot_vbd_reqs(domain1, FIELD_VBD_RD, &dom2_vbd_rd); + tot_vbd_reqs(domain2, FIELD_VBD_RD, &dom2_vbd_rd); - return -compare(dom1_vbd_rd, dom1_vbd_rd); + return -compare(dom1_vbd_rd, dom2_vbd_rd); } /* Prints number of total VBD READ requests statistic */ @@ -738,7 +738,7 @@ static int compare_vbd_wr(xenstat_domain *domain1, xenstat_domain *domain2) unsigned long long dom1_vbd_wr = 0, dom2_vbd_wr = 0; tot_vbd_reqs(domain1, FIELD_VBD_WR, &dom1_vbd_wr); - tot_vbd_reqs(domain1, FIELD_VBD_WR, &dom2_vbd_wr); + tot_vbd_reqs(domain2, FIELD_VBD_WR, &dom2_vbd_wr); return -compare(dom1_vbd_wr, dom2_vbd_wr); } @@ -765,7 +765,7 @@ static int compare_vbd_rsect(xenstat_domain *domain1, xenstat_domain *domain2) unsigned long long dom1_vbd_rsect = 0, dom2_vbd_rsect = 0; tot_vbd_reqs(domain1, FIELD_VBD_RSECT, &dom1_vbd_rsect); - tot_vbd_reqs(domain1, FIELD_VBD_RSECT, &dom2_vbd_rsect); + tot_vbd_reqs(domain2, FIELD_VBD_RSECT, &dom2_vbd_rsect); return -compare(dom1_vbd_rsect, dom2_vbd_rsect); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:44:08 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677185.1053595 (Exim 4.92) (envelope-from ) id 1rXW2m-0007Px-3f; Wed, 07 Feb 2024 00:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677185.1053595; Wed, 07 Feb 2024 00: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 1rXW2m-0007Pp-1A; Wed, 07 Feb 2024 00:44:04 +0000 Received: by outflank-mailman (input) for mailman id 677185; Wed, 07 Feb 2024 00:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW2k-0007PT-6k for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW2k-0001Jm-5W for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW2k-0003oi-4R for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rfpMwVkAdo10DkRe1RzTpGW8fP8eqPXkZMpi+omoCTc=; b=PKyETVq3qzGd9+/GGIWGJvHUX3 5djeLo0NwHfVbq8+evLDHxIq7JYaP4eXNFc3zCv7Qz7Rca4vYsMaiH84PEyr00S9E7mNvZ5qcXTnv RhF7OqL3DF9udWR2/Aox69V+/7BIvJSnDv1GQrMVlbTzb1WUJcohih6FjAIZobGhaCM0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/helpers: allocate xenstore event channel for xenstore stubdom Message-Id: Date: Wed, 07 Feb 2024 00:44:02 +0000 commit 9c076988fe5f9d55a0ecb846549bdbdfddcf3841 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:46 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/helpers: allocate xenstore event channel for xenstore stubdom In order to prepare support of PV frontends in xenstore-stubdom, add allocation of a Xenstore event channel to init-xenstore-domain.c. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- tools/helpers/init-xenstore-domain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index b2d5df8ba5..140ed610ae 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -248,6 +248,13 @@ static int build(xc_interface *xch) dom->cmdline = xc_dom_strdup(dom, cmdline); dom->xenstore_domid = domid; dom->console_evtchn = console_evtchn; + rv = xc_evtchn_alloc_unbound(xch, domid, domid); + if ( rv < 0 ) + { + fprintf(stderr, "xc_evtchn_alloc_unbound failed\n"); + goto err; + } + dom->xenstore_evtchn = rv; rv = xc_dom_mem_init(dom, memory); if ( rv ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:44:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677186.1053599 (Exim 4.92) (envelope-from ) id 1rXW2w-0007S0-5M; Wed, 07 Feb 2024 00:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677186.1053599; Wed, 07 Feb 2024 00: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 1rXW2w-0007Rt-2c; Wed, 07 Feb 2024 00:44:14 +0000 Received: by outflank-mailman (input) for mailman id 677186; Wed, 07 Feb 2024 00:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW2u-0007Rh-AC for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW2u-0001Jw-9L for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW2u-0003pG-7r for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=U8OD2iX0BY8cyPVSZXRNh7fUC8Jskc8vBXm5vwHk0Eo=; b=v01qBgfOQKpJdMakDoNKctCvI8 jjiUwA8lYAyugkLvEhfFqW/e5u8UdkS6bwFmsuYDU4Bosw4gvMdP9SW6j1NM2SqL/CWo9akM6VPlc NDxRGX1GXl4J9+WKU+qrlS6wJmYrC6GmaqLYocoDn15+AAR7qX36p7zfOF1H/aYtlK64=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: rename xenbus_evtchn() Message-Id: Date: Wed, 07 Feb 2024 00:44:12 +0000 commit 1c2c7f790147ca003270b32da41550c04c7d15d2 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:47 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: rename xenbus_evtchn() Rename the xenbus_evtchn() function to get_xenbus_evtchn() in order to avoid two externally visible symbols with the same name when Xenstore- stubdom is being built with a Mini-OS with CONFIG_XENBUS set. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Reviewed-by: Jason Andryuk --- tools/xenstored/core.h | 2 +- tools/xenstored/domain.c | 2 +- tools/xenstored/minios.c | 2 +- tools/xenstored/posix.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index ad87199042..480b0f5f7b 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -383,7 +383,7 @@ static inline bool domain_is_unprivileged(const struct connection *conn) } /* Return the event channel used by xenbus. */ -evtchn_port_t xenbus_evtchn(void); +evtchn_port_t get_xenbus_evtchn(void); /* Write out the pidfile */ void write_pidfile(const char *pidfile); diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 409b53acf9..6ef136e01f 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1208,7 +1208,7 @@ void dom0_init(void) evtchn_port_t port; struct domain *dom0; - port = xenbus_evtchn(); + port = get_xenbus_evtchn(); if (port == -1) barf_perror("Failed to initialize dom0 port"); diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index b5c3a205e6..0779efbf91 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -38,7 +38,7 @@ void init_pipe(int reopen_log_pipe[2]) reopen_log_pipe[1] = -1; } -evtchn_port_t xenbus_evtchn(void) +evtchn_port_t get_xenbus_evtchn(void) { return dom0_event; } diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 6ac45fdb45..7e03dd982d 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -111,7 +111,7 @@ void unmap_xenbus(void *interface) munmap(interface, getpagesize()); } -evtchn_port_t xenbus_evtchn(void) +evtchn_port_t get_xenbus_evtchn(void) { int fd; int rc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:44:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677187.1053602 (Exim 4.92) (envelope-from ) id 1rXW35-0007Ui-6o; Wed, 07 Feb 2024 00:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677187.1053602; Wed, 07 Feb 2024 00:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW35-0007Ub-4H; Wed, 07 Feb 2024 00:44:23 +0000 Received: by outflank-mailman (input) for mailman id 677187; Wed, 07 Feb 2024 00:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW34-0007UR-DN for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW34-0001KV-CZ for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW34-0003pi-Bb for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uwGhsPk9gH3enH+uGKs3LwZTFPnHiuQ1I9mSZeVztG4=; b=QP6DIWV3Wvo38O4ZKulLTn1gLO pmdZaE5iOpYN1GwFQll54yNrUvt853hRTipMLdUmVjqxhzQnFoAWT2RICvcKVFjCT34AnS4unRIGB kWBxZBHyFuemxdr9bw5uIVGMzja7fQZ+kSz5wNvz+iDq87K2OMy5WTsuOOeKnoULQ4/A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: add early_init() function Message-Id: Date: Wed, 07 Feb 2024 00:44:22 +0000 commit e767a98f040d8274b0f1dc991b9eefbc13b39e2d Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:50 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: add early_init() function Some xenstored initialization needs to be done in the daemon case only, so split it out into a new early_init() function being a stub in the stubdom case. Remove the call of talloc_enable_leak_report_full(), as it serves no real purpose: the daemon only ever exits due to a crash, in which case a log of talloc()ed memory hardly has any value. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Reviewed-by: Julien Grall --- tools/xenstored/core.c | 30 +++--------------------------- tools/xenstored/core.h | 7 +++---- tools/xenstored/minios.c | 11 +++-------- tools/xenstored/posix.c | 31 +++++++++++++++++++++++++++++-- 4 files changed, 38 insertions(+), 41 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index d4c76d71dc..eba7744fde 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -79,7 +79,7 @@ char **orig_argv; LIST_HEAD(connections); int tracefd = -1; bool keep_orphans = false; -static int reopen_log_pipe[2]; +int reopen_log_pipe[2]; static int reopen_log_pipe0_pollfd_idx = -1; char *tracefile = NULL; static struct hashtable *nodes; @@ -2612,7 +2612,7 @@ static void destroy_fds(void) close(sock); } -static void init_sockets(void) +void init_sockets(void) { struct sockaddr_un addr; const char *soc_str = xenstore_daemon_path(); @@ -2903,34 +2903,10 @@ int main(int argc, char *argv[]) if (optind != argc) barf("%s: No arguments desired", argv[0]); - reopen_log(); - - /* Make sure xenstored directory exists. */ - /* Errors ignored here, will be reported when we open files */ - mkdir(xenstore_daemon_rundir(), 0755); - - if (dofork) { - openlog("xenstored", 0, LOG_DAEMON); - if (!live_update) - daemonize(); - } - if (pidfile) - write_pidfile(pidfile); - - /* Talloc leak reports go to stderr, which is closed if we fork. */ - if (!dofork) - talloc_enable_leak_report_full(); - - /* Don't kill us with SIGPIPE. */ - signal(SIGPIPE, SIG_IGN); + early_init(live_update, dofork, pidfile); talloc_enable_null_tracking(); -#ifndef NO_SOCKETS - if (!live_update) - init_sockets(); -#endif - init_pipe(reopen_log_pipe); /* Listen to hypervisor. */ diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index 480b0f5f7b..72173f1684 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -384,12 +384,11 @@ static inline bool domain_is_unprivileged(const struct connection *conn) /* Return the event channel used by xenbus. */ evtchn_port_t get_xenbus_evtchn(void); +void early_init(bool live_update, bool dofork, const char *pidfile); -/* Write out the pidfile */ -void write_pidfile(const char *pidfile); +void init_sockets(void); +extern int reopen_log_pipe[2]; -/* Fork but do not close terminal FDs */ -void daemonize(void); /* Close stdin/stdout/stderr to complete daemonize */ void finish_daemonize(void); diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index 0779efbf91..4f48f63083 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -20,14 +20,6 @@ #include "core.h" #include -void write_pidfile(const char *pidfile) -{ -} - -void daemonize(void) -{ -} - void finish_daemonize(void) { } @@ -54,3 +46,6 @@ void unmap_xenbus(void *interface) xengnttab_unmap(*xgt_handle, interface, 1); } +void early_init(bool live_update, bool dofork, const char *pidfile) +{ +} diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 7e03dd982d..9463ef5c8d 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -20,14 +20,17 @@ #include #include #include +#include #include +#include #include +#include #include "utils.h" #include "core.h" #include "osdep.h" -void write_pidfile(const char *pidfile) +static void write_pidfile(const char *pidfile) { char buf[100]; int len; @@ -49,7 +52,7 @@ void write_pidfile(const char *pidfile) } /* Stevens. */ -void daemonize(void) +static void daemonize(void) { pid_t pid; @@ -157,3 +160,27 @@ void *xenbus_map(void) return addr; } + +void early_init(bool live_update, bool dofork, const char *pidfile) +{ + reopen_log(); + + /* Make sure xenstored directory exists. */ + /* Errors ignored here, will be reported when we open files */ + mkdir(xenstore_daemon_rundir(), 0755); + + if (dofork) { + openlog("xenstored", 0, LOG_DAEMON); + if (!live_update) + daemonize(); + } + + if (pidfile) + write_pidfile(pidfile); + + /* Don't kill us with SIGPIPE. */ + signal(SIGPIPE, SIG_IGN); + + if (!live_update) + init_sockets(); +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:44:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677188.1053607 (Exim 4.92) (envelope-from ) id 1rXW3F-0007Xk-97; Wed, 07 Feb 2024 00:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677188.1053607; Wed, 07 Feb 2024 00:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3F-0007Xc-5m; Wed, 07 Feb 2024 00:44:33 +0000 Received: by outflank-mailman (input) for mailman id 677188; Wed, 07 Feb 2024 00:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3E-0007XW-H7 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3E-0001Kk-Fq for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW3E-0003q7-Eo for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00: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=J+RUBM8wBtIm50Joe6NeBzSl2ilj+CJN2Ii1SPPSaOA=; b=QK10yPeG7ARiTogbwB3x9Qsrkq I5H3rY5QlzHEvG0z7IhVF0E53yQgLYlkONMaCQ15JLgre6pcwgnDLUiycYiEJowS2bqp//p95rcGu WYkqOPRi00UIiNuYGNIaRqvdrPqQvrozryNHdgxlhfPKXHibwbgaCgR0SGln/7fIONx4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: move systemd handling to posix.c Message-Id: Date: Wed, 07 Feb 2024 00:44:32 +0000 commit 511cc30cf8bbf083f2788cf4eee91edec0b85ac0 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:51 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: move systemd handling to posix.c Move systemd handling to a new late_init() function in posix.c. This prepares a future removal of the NO_SOCKETS macro. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Reviewed-by: Julien Grall --- tools/xenstored/core.c | 17 +---------------- tools/xenstored/core.h | 1 + tools/xenstored/minios.c | 4 ++++ tools/xenstored/posix.c | 13 +++++++++++++ 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index eba7744fde..7b5e1d0c0f 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -54,16 +54,6 @@ #include "control.h" #include "lu.h" -#ifndef NO_SOCKETS -#if defined(HAVE_SYSTEMD) -#define XEN_SYSTEMD_ENABLED 1 -#endif -#endif - -#if defined(XEN_SYSTEMD_ENABLED) -#include -#endif - extern xenevtchn_handle *xce_handle; /* in domain.c */ static int xce_pollfd_idx = -1; static struct pollfd *fds; @@ -2938,12 +2928,7 @@ int main(int argc, char *argv[]) /* Get ready to listen to the tools. */ initialize_fds(&sock_pollfd_idx, &timeout); -#if defined(XEN_SYSTEMD_ENABLED) - if (!live_update) { - sd_notify(1, "READY=1"); - fprintf(stderr, SD_NOTICE "xenstored is ready\n"); - } -#endif + late_init(live_update); /* Main loop. */ for (;;) { diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index 72173f1684..0de2d8a26e 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -385,6 +385,7 @@ static inline bool domain_is_unprivileged(const struct connection *conn) /* Return the event channel used by xenbus. */ evtchn_port_t get_xenbus_evtchn(void); void early_init(bool live_update, bool dofork, const char *pidfile); +void late_init(bool live_update); void init_sockets(void); extern int reopen_log_pipe[2]; diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index 4f48f63083..45bb0440be 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -49,3 +49,7 @@ void unmap_xenbus(void *interface) void early_init(bool live_update, bool dofork, const char *pidfile) { } + +void late_init(bool live_update) +{ +} diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 9463ef5c8d..97c8dcaba3 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -24,6 +24,9 @@ #include #include #include +#if defined(HAVE_SYSTEMD) +#include +#endif #include #include "utils.h" @@ -184,3 +187,13 @@ void early_init(bool live_update, bool dofork, const char *pidfile) if (!live_update) init_sockets(); } + +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"); + } +#endif +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:44:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677189.1053611 (Exim 4.92) (envelope-from ) id 1rXW3P-0007a9-A4; Wed, 07 Feb 2024 00:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677189.1053611; Wed, 07 Feb 2024 00: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 1rXW3P-0007a1-7N; Wed, 07 Feb 2024 00:44:43 +0000 Received: by outflank-mailman (input) for mailman id 677189; Wed, 07 Feb 2024 00:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3O-0007Zv-KW for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3O-0001L0-JK for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW3O-0003qW-IB for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00: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=PkRLzh9ncXuvIJy95u1Lnb8ZzMHzOnbuIJ5B5EOuPbI=; b=rkFSNk4q6AVc5VJpzLTbkOO1Xs I0BWTmBjAjCMUjf7T0YhXS1KsfQuOhJI/6/oqsOYtx3QJSC6uOtfwyeyGccxECDM6tUypnYdfOwo9 mq8W1uP2UEqpT3YMjN84xZFgmuyuMy8Dp0wkLTiRYs5Kwd7KFKqUazYd5Y0Ytak8VXgI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: move all log-pipe handling into posix.c Message-Id: Date: Wed, 07 Feb 2024 00:44:42 +0000 commit aae54458a1b5e947dbc4fb44beca7ec94fe80001 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:52 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: move all log-pipe handling into posix.c All of the log-pipe handling is needed only when running as daemon. Move it into posix.c. This requires to have a service function in the main event loop for handling the related requests and one for setting the fds[] array, which is renamed to poll_fds to have a more specific name. Use a generic name for those functions, as socket handling can be added to them later, too. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstored/core.c | 69 +++++++++++++----------------------------------- tools/xenstored/core.h | 11 +++++--- tools/xenstored/minios.c | 14 +++++----- tools/xenstored/posix.c | 47 ++++++++++++++++++++++++++++++++- 4 files changed, 79 insertions(+), 62 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 7b5e1d0c0f..86ab330eaf 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -56,7 +56,7 @@ extern xenevtchn_handle *xce_handle; /* in domain.c */ static int xce_pollfd_idx = -1; -static struct pollfd *fds; +struct pollfd *poll_fds; static unsigned int current_array_size; static unsigned int nr_fds; static unsigned int delayed_requests; @@ -69,8 +69,6 @@ char **orig_argv; LIST_HEAD(connections); int tracefd = -1; bool keep_orphans = false; -int reopen_log_pipe[2]; -static int reopen_log_pipe0_pollfd_idx = -1; char *tracefile = NULL; static struct hashtable *nodes; unsigned int trace_flags = TRACE_OBJ | TRACE_IO; @@ -145,18 +143,6 @@ void trace_destroy(const void *data, const char *type) trace("obj: DESTROY %s %p\n", type, data); } -/** - * Signal handler for SIGHUP, which requests that the trace log is reopened - * (in the main loop). A single byte is written to reopen_log_pipe, to awaken - * the poll() in the main loop. - */ -static void trigger_reopen_log(int signal __attribute__((unused))) -{ - char c = 'A'; - int dummy; - dummy = write(reopen_log_pipe[1], &c, 1); -} - void close_log(void) { if (tracefd >= 0) @@ -467,7 +453,7 @@ static bool conn_can_write(struct connection *conn) } /* This function returns index inside the array if succeed, -1 if fail */ -static int set_fd(int fd, short events) +int set_fd(int fd, short events) { int ret; if (current_array_size < nr_fds + 1) { @@ -479,18 +465,18 @@ static int set_fd(int fd, short events) */ newsize = ROUNDUP(nr_fds + 1, 8); - new_fds = realloc(fds, sizeof(struct pollfd)*newsize); + new_fds = realloc(poll_fds, sizeof(struct pollfd)*newsize); if (!new_fds) goto fail; - fds = new_fds; + poll_fds = new_fds; - memset(&fds[0] + current_array_size, 0, + memset(&poll_fds[0] + current_array_size, 0, sizeof(struct pollfd ) * (newsize-current_array_size)); current_array_size = newsize; } - fds[nr_fds].fd = fd; - fds[nr_fds].events = events; + poll_fds[nr_fds].fd = fd; + poll_fds[nr_fds].events = events; ret = nr_fds; nr_fds++; @@ -505,18 +491,16 @@ static void initialize_fds(int *p_sock_pollfd_idx, int *ptimeout) struct connection *conn; uint64_t msecs; - if (fds) - memset(fds, 0, sizeof(struct pollfd) * current_array_size); + if (poll_fds) + memset(poll_fds, 0, sizeof(struct pollfd) * current_array_size); nr_fds = 0; /* In case of delayed requests pause for max 1 second. */ *ptimeout = delayed_requests ? 1000 : -1; + set_special_fds(); if (sock != -1) *p_sock_pollfd_idx = set_fd(sock, POLLIN|POLLPRI); - if (reopen_log_pipe[0] != -1) - reopen_log_pipe0_pollfd_idx = - set_fd(reopen_log_pipe[0], POLLIN|POLLPRI); if (xce_handle != NULL) xce_pollfd_idx = set_fd(xenevtchn_fd(xce_handle), @@ -2324,12 +2308,12 @@ static bool socket_can_process(struct connection *conn, int mask) if (conn->pollfd_idx == -1) return false; - if (fds[conn->pollfd_idx].revents & ~(POLLIN | POLLOUT)) { + if (poll_fds[conn->pollfd_idx].revents & ~(POLLIN | POLLOUT)) { talloc_free(conn); return false; } - return (fds[conn->pollfd_idx].revents & mask); + return (poll_fds[conn->pollfd_idx].revents & mask); } static bool socket_can_write(struct connection *conn) @@ -2897,8 +2881,6 @@ int main(int argc, char *argv[]) talloc_enable_null_tracking(); - init_pipe(reopen_log_pipe); - /* Listen to hypervisor. */ if (!live_update) { domain_init(-1); @@ -2913,7 +2895,6 @@ int main(int argc, char *argv[]) xprintf = trace; #endif - signal(SIGHUP, trigger_reopen_log); if (tracefile) tracefile = talloc_strdup(NULL, tracefile); @@ -2934,43 +2915,29 @@ int main(int argc, char *argv[]) for (;;) { struct connection *conn, *next; - if (poll(fds, nr_fds, timeout) < 0) { + if (poll(poll_fds, nr_fds, timeout) < 0) { if (errno == EINTR) continue; barf_perror("Poll failed"); } - if (reopen_log_pipe0_pollfd_idx != -1) { - if (fds[reopen_log_pipe0_pollfd_idx].revents - & ~POLLIN) { - close(reopen_log_pipe[0]); - close(reopen_log_pipe[1]); - init_pipe(reopen_log_pipe); - } else if (fds[reopen_log_pipe0_pollfd_idx].revents - & POLLIN) { - char c; - if (read(reopen_log_pipe[0], &c, 1) != 1) - barf_perror("read failed"); - reopen_log(); - } - reopen_log_pipe0_pollfd_idx = -1; - } + handle_special_fds(); if (sock_pollfd_idx != -1) { - if (fds[sock_pollfd_idx].revents & ~POLLIN) { + if (poll_fds[sock_pollfd_idx].revents & ~POLLIN) { barf_perror("sock poll failed"); break; - } else if (fds[sock_pollfd_idx].revents & POLLIN) { + } else if (poll_fds[sock_pollfd_idx].revents & POLLIN) { accept_connection(sock); sock_pollfd_idx = -1; } } if (xce_pollfd_idx != -1) { - if (fds[xce_pollfd_idx].revents & ~POLLIN) { + if (poll_fds[xce_pollfd_idx].revents & ~POLLIN) { barf_perror("xce_handle poll failed"); break; - } else if (fds[xce_pollfd_idx].revents & POLLIN) { + } else if (poll_fds[xce_pollfd_idx].revents & POLLIN) { handle_event(); xce_pollfd_idx = -1; } diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index 0de2d8a26e..44c4d0f8b8 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -361,6 +362,8 @@ extern int dom0_event; extern int priv_domid; extern bool keep_orphans; +extern struct pollfd *poll_fds; + extern unsigned int timeout_watch_event_msec; /* Get internal time in milliseconds. */ @@ -387,15 +390,15 @@ evtchn_port_t get_xenbus_evtchn(void); void early_init(bool live_update, bool dofork, const char *pidfile); void late_init(bool live_update); +int set_fd(int fd, short events); +void set_special_fds(void); +void handle_special_fds(void); + void init_sockets(void); -extern int reopen_log_pipe[2]; /* Close stdin/stdout/stderr to complete daemonize */ void finish_daemonize(void); -/* Open a pipe for signal handling */ -void init_pipe(int reopen_log_pipe[2]); - #ifndef NO_SOCKETS extern const struct interface_funcs socket_funcs; #endif diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index 45bb0440be..3208169187 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -24,12 +24,6 @@ void finish_daemonize(void) { } -void init_pipe(int reopen_log_pipe[2]) -{ - reopen_log_pipe[0] = -1; - reopen_log_pipe[1] = -1; -} - evtchn_port_t get_xenbus_evtchn(void) { return dom0_event; @@ -53,3 +47,11 @@ void early_init(bool live_update, bool dofork, const char *pidfile) void late_init(bool live_update) { } + +void set_special_fds(void) +{ +} + +void handle_special_fds(void) +{ +} diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 97c8dcaba3..1ea8475293 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -33,6 +33,9 @@ #include "core.h" #include "osdep.h" +static int reopen_log_pipe0_pollfd_idx = -1; +static int reopen_log_pipe[2]; + static void write_pidfile(const char *pidfile) { char buf[100]; @@ -82,6 +85,19 @@ static void daemonize(void) umask(0); } +/* + * Signal handler for SIGHUP, which requests that the trace log is reopened + * (in the main loop). A single byte is written to reopen_log_pipe, to awaken + * the poll() in the main loop. + */ +static void trigger_reopen_log(int signal __attribute__((unused))) +{ + char c = 'A'; + int dummy; + + dummy = write(reopen_log_pipe[1], &c, 1); +} + void finish_daemonize(void) { int devnull = open("/dev/null", O_RDWR); @@ -93,7 +109,7 @@ void finish_daemonize(void) close(devnull); } -void init_pipe(int reopen_log_pipe[2]) +static void init_pipe(void) { int flags; unsigned int i; @@ -183,9 +199,38 @@ void early_init(bool live_update, bool dofork, const char *pidfile) /* Don't kill us with SIGPIPE. */ signal(SIGPIPE, SIG_IGN); + signal(SIGHUP, trigger_reopen_log); if (!live_update) init_sockets(); + + init_pipe(); +} + +void set_special_fds(void) +{ + if (reopen_log_pipe[0] != -1) + reopen_log_pipe0_pollfd_idx = + set_fd(reopen_log_pipe[0], POLLIN|POLLPRI); +} + +void handle_special_fds(void) +{ + if (reopen_log_pipe0_pollfd_idx != -1) { + if (poll_fds[reopen_log_pipe0_pollfd_idx].revents & ~POLLIN) { + close(reopen_log_pipe[0]); + close(reopen_log_pipe[1]); + init_pipe(); + } else if (poll_fds[reopen_log_pipe0_pollfd_idx].revents & + POLLIN) { + char c; + + if (read(reopen_log_pipe[0], &c, 1) != 1) + barf_perror("read failed"); + reopen_log(); + } + reopen_log_pipe0_pollfd_idx = -1; + } } void late_init(bool live_update) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:44:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677190.1053615 (Exim 4.92) (envelope-from ) id 1rXW3Z-0007dV-Cp; Wed, 07 Feb 2024 00:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677190.1053615; Wed, 07 Feb 2024 00: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 1rXW3Z-0007dO-AF; Wed, 07 Feb 2024 00:44:53 +0000 Received: by outflank-mailman (input) for mailman id 677190; Wed, 07 Feb 2024 00:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3Y-0007dB-NP for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3Y-0001LJ-Mf for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW3Y-0004A3-Li for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00: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=nzup7i14qJhIASXA8Ig4ojbgzjr6w4EOyqPDln0NBm4=; b=4+CLemXnrm5VplkLj/liYZLpz7 b8VflkJxXMv89hZRv7omB8rZxAqY+yEMBvQ7fl1hGXnjVmJXtyexzVAUnZIoQKOeOM9CQjP5bO7QU yrPKl14NPkiisMCQu1JkmlXV+2gI1Uo2fGlqGU0UKAQI5PujxfKYzTf8hb+xdynUkexY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: move all socket handling into posix.c Message-Id: Date: Wed, 07 Feb 2024 00:44:52 +0000 commit e199a3068097708a9e712bf5d86f9fb51e6615e8 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:53 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: move all socket handling into posix.c All of the socket handling is needed only when running as daemon. Move it into posix.c, allowing to remove the NO_SOCKETS macro. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstored/Makefile.common | 4 - tools/xenstored/core.c | 160 ++------------------------------------- tools/xenstored/core.h | 7 +- tools/xenstored/domain.c | 9 +-- tools/xenstored/minios.c | 15 ++++ tools/xenstored/posix.c | 164 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 188 insertions(+), 171 deletions(-) diff --git a/tools/xenstored/Makefile.common b/tools/xenstored/Makefile.common index 189ab81b8d..ef63ef650c 100644 --- a/tools/xenstored/Makefile.common +++ b/tools/xenstored/Makefile.common @@ -16,10 +16,6 @@ CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenguest) CFLAGS += $(CFLAGS_libxentoolcore) -ifdef CONFIG_STUBDOM -CFLAGS += -DNO_SOCKETS=1 -endif - $(XENSTORED_OBJS-y): CFLAGS += $(CFLAGS_libxengnttab) xenstored.a: $(XENSTORED_OBJS-y) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 86ab330eaf..c045a6e5db 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -20,10 +20,6 @@ #include #include #include -#ifndef NO_SOCKETS -#include -#include -#endif #include #include #include @@ -61,8 +57,6 @@ static unsigned int current_array_size; static unsigned int nr_fds; static unsigned int delayed_requests; -static int sock = -1; - int orig_argc; char **orig_argv; @@ -486,7 +480,7 @@ fail: return -1; } -static void initialize_fds(int *p_sock_pollfd_idx, int *ptimeout) +static void initialize_fds(int *ptimeout) { struct connection *conn; uint64_t msecs; @@ -499,8 +493,6 @@ static void initialize_fds(int *p_sock_pollfd_idx, int *ptimeout) *ptimeout = delayed_requests ? 1000 : -1; set_special_fds(); - if (sock != -1) - *p_sock_pollfd_idx = set_fd(sock, POLLIN|POLLPRI); if (xce_handle != NULL) xce_pollfd_idx = set_fd(xenevtchn_fd(xce_handle), @@ -2260,97 +2252,6 @@ struct connection *get_connection_by_id(unsigned int conn_id) return NULL; } -#ifdef NO_SOCKETS -static void accept_connection(int sock) -{ -} -#else -static int writefd(struct connection *conn, const void *data, unsigned int len) -{ - int rc; - - while ((rc = write(conn->fd, data, len)) < 0) { - if (errno == EAGAIN) { - rc = 0; - break; - } - if (errno != EINTR) - break; - } - - return rc; -} - -static int readfd(struct connection *conn, void *data, unsigned int len) -{ - int rc; - - while ((rc = read(conn->fd, data, len)) < 0) { - if (errno == EAGAIN) { - rc = 0; - break; - } - if (errno != EINTR) - break; - } - - /* Reading zero length means we're done with this connection. */ - if ((rc == 0) && (len != 0)) { - errno = EBADF; - rc = -1; - } - - return rc; -} - -static bool socket_can_process(struct connection *conn, int mask) -{ - if (conn->pollfd_idx == -1) - return false; - - if (poll_fds[conn->pollfd_idx].revents & ~(POLLIN | POLLOUT)) { - talloc_free(conn); - return false; - } - - return (poll_fds[conn->pollfd_idx].revents & mask); -} - -static bool socket_can_write(struct connection *conn) -{ - return socket_can_process(conn, POLLOUT); -} - -static bool socket_can_read(struct connection *conn) -{ - return socket_can_process(conn, POLLIN); -} - -const struct interface_funcs socket_funcs = { - .write = writefd, - .read = readfd, - .can_write = socket_can_write, - .can_read = socket_can_read, -}; - -static void accept_connection(int sock) -{ - int fd; - struct connection *conn; - - fd = accept(sock, NULL, NULL); - if (fd < 0) - return; - - conn = new_connection(&socket_funcs); - if (conn) { - conn->fd = fd; - conn->id = dom0_domid; - } else - close(fd); -} -#endif - /* We create initial nodes manually. */ static void manual_node(const char *name, const char *child) { @@ -2579,46 +2480,6 @@ void corrupt(struct connection *conn, const char *fmt, ...) errno = saved_errno; } -#ifndef NO_SOCKETS -static void destroy_fds(void) -{ - if (sock >= 0) - close(sock); -} - -void init_sockets(void) -{ - struct sockaddr_un addr; - const char *soc_str = xenstore_daemon_path(); - - if (!soc_str) - barf_perror("Failed to obtain xs domain socket"); - - /* Create sockets for them to listen to. */ - atexit(destroy_fds); - sock = socket(PF_UNIX, SOCK_STREAM, 0); - if (sock < 0) - barf_perror("Could not create socket"); - - /* FIXME: Be more sophisticated, don't mug running daemon. */ - unlink(soc_str); - - addr.sun_family = AF_UNIX; - - if(strlen(soc_str) >= sizeof(addr.sun_path)) - barf_perror("socket string '%s' too long", soc_str); - strcpy(addr.sun_path, soc_str); - if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) - barf_perror("Could not bind socket to %s", soc_str); - - if (chmod(soc_str, 0600) != 0) - barf_perror("Could not chmod sockets"); - - if (listen(sock, 1) != 0) - barf_perror("Could not listen on sockets"); -} -#endif - static void usage(void) { fprintf(stderr, @@ -2796,7 +2657,6 @@ int set_trace_switch(const char *arg) int main(int argc, char *argv[]) { int opt; - int sock_pollfd_idx = -1; bool dofork = true; bool live_update = false; const char *pidfile = NULL; @@ -2907,7 +2767,7 @@ int main(int argc, char *argv[]) check_store(); /* Get ready to listen to the tools. */ - initialize_fds(&sock_pollfd_idx, &timeout); + initialize_fds(&timeout); late_init(live_update); @@ -2923,16 +2783,6 @@ int main(int argc, char *argv[]) handle_special_fds(); - if (sock_pollfd_idx != -1) { - if (poll_fds[sock_pollfd_idx].revents & ~POLLIN) { - barf_perror("sock poll failed"); - break; - } else if (poll_fds[sock_pollfd_idx].revents & POLLIN) { - accept_connection(sock); - sock_pollfd_idx = -1; - } - } - if (xce_pollfd_idx != -1) { if (poll_fds[xce_pollfd_idx].revents & ~POLLIN) { barf_perror("xce_handle poll failed"); @@ -2986,7 +2836,7 @@ int main(int argc, char *argv[]) } } - initialize_fds(&sock_pollfd_idx, &timeout); + initialize_fds(&timeout); } } @@ -2999,7 +2849,7 @@ const char *dump_state_global(FILE *fp) head.length = sizeof(glb); if (fwrite(&head, sizeof(head), 1, fp) != 1) return "Dump global state error"; - glb.socket_fd = sock; + glb.socket_fd = get_socket_fd(); glb.evtchn_fd = xenevtchn_fd(xce_handle); if (fwrite(&glb, sizeof(glb), 1, fp) != 1) return "Dump global state error"; @@ -3235,7 +3085,7 @@ void read_state_global(const void *ctx, const void *state) { const struct xs_state_global *glb = state; - sock = glb->socket_fd; + set_socket_fd(glb->socket_fd); domain_init(glb->evtchn_fd); } diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index 44c4d0f8b8..6180ec8b5c 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -301,6 +301,7 @@ int rm_node(struct connection *conn, const void *ctx, const char *name); void setup_structure(bool live_update); struct connection *new_connection(const struct interface_funcs *funcs); +struct connection *add_socket_connection(int fd); struct connection *get_connection_by_id(unsigned int conn_id); void check_store(void); void corrupt(struct connection *conn, const char *fmt, ...); @@ -394,14 +395,12 @@ int set_fd(int fd, short events); void set_special_fds(void); void handle_special_fds(void); -void init_sockets(void); +int get_socket_fd(void); +void set_socket_fd(int fd); /* Close stdin/stdout/stderr to complete daemonize */ void finish_daemonize(void); -#ifndef NO_SOCKETS -extern const struct interface_funcs socket_funcs; -#endif extern xengnttab_handle **xgt_handle; int remember_string(struct hashtable *hash, const char *str); diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 6ef136e01f..040df98b8c 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1739,14 +1739,7 @@ void read_state_connection(const void *ctx, const void *state) struct domain *domain, *tdomain; if (sc->conn_type == XS_STATE_CONN_TYPE_SOCKET) { -#ifdef NO_SOCKETS - barf("socket based connection without sockets"); -#else - conn = new_connection(&socket_funcs); - if (!conn) - barf("error restoring connection"); - conn->fd = sc->spec.socket_fd; -#endif + conn = add_socket_connection(sc->spec.socket_fd); } else { domain = introduce_domain(ctx, sc->spec.ring.domid, sc->spec.ring.evtchn, true); diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index 3208169187..6d0c11423c 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -18,12 +18,18 @@ #include #include #include "core.h" +#include "utils.h" #include void finish_daemonize(void) { } +struct connection *add_socket_connection(int fd) +{ + barf("socket based connection without sockets"); +} + evtchn_port_t get_xenbus_evtchn(void) { return dom0_event; @@ -55,3 +61,12 @@ void set_special_fds(void) void handle_special_fds(void) { } + +int get_socket_fd(void) +{ + return -1; +} + +void set_socket_fd(int fd) +{ +} diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index 1ea8475293..496329dfd1 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #if defined(HAVE_SYSTEMD) #include #endif @@ -32,10 +34,14 @@ #include "utils.h" #include "core.h" #include "osdep.h" +#include "talloc.h" static int reopen_log_pipe0_pollfd_idx = -1; static int reopen_log_pipe[2]; +static int sock_pollfd_idx = -1; +static int sock = -1; + static void write_pidfile(const char *pidfile) { char buf[100]; @@ -180,6 +186,142 @@ void *xenbus_map(void) return addr; } +static int writefd(struct connection *conn, const void *data, unsigned int len) +{ + int rc; + + while ((rc = write(conn->fd, data, len)) < 0) { + if (errno == EAGAIN) { + rc = 0; + break; + } + if (errno != EINTR) + break; + } + + return rc; +} + +static int readfd(struct connection *conn, void *data, unsigned int len) +{ + int rc; + + while ((rc = read(conn->fd, data, len)) < 0) { + if (errno == EAGAIN) { + rc = 0; + break; + } + if (errno != EINTR) + break; + } + + /* Reading zero length means we're done with this connection. */ + if ((rc == 0) && (len != 0)) { + errno = EBADF; + rc = -1; + } + + return rc; +} + +static bool socket_can_process(struct connection *conn, int mask) +{ + if (conn->pollfd_idx == -1) + return false; + + if (poll_fds[conn->pollfd_idx].revents & ~(POLLIN | POLLOUT)) { + talloc_free(conn); + return false; + } + + return (poll_fds[conn->pollfd_idx].revents & mask); +} + +static bool socket_can_write(struct connection *conn) +{ + return socket_can_process(conn, POLLOUT); +} + +static bool socket_can_read(struct connection *conn) +{ + return socket_can_process(conn, POLLIN); +} + +static const struct interface_funcs socket_funcs = { + .write = writefd, + .read = readfd, + .can_write = socket_can_write, + .can_read = socket_can_read, +}; + +static void accept_connection(int sock) +{ + int fd; + struct connection *conn; + + fd = accept(sock, NULL, NULL); + if (fd < 0) + return; + + conn = new_connection(&socket_funcs); + if (conn) { + conn->fd = fd; + conn->id = dom0_domid; + } else + close(fd); +} + +static void destroy_fds(void) +{ + if (sock >= 0) + close(sock); +} + +static void init_sockets(void) +{ + struct sockaddr_un addr; + const char *soc_str = xenstore_daemon_path(); + + if (!soc_str) + barf_perror("Failed to obtain xs domain socket"); + + /* Create sockets for them to listen to. */ + atexit(destroy_fds); + sock = socket(PF_UNIX, SOCK_STREAM, 0); + if (sock < 0) + barf_perror("Could not create socket"); + + /* FIXME: Be more sophisticated, don't mug running daemon. */ + unlink(soc_str); + + addr.sun_family = AF_UNIX; + + if (strlen(soc_str) >= sizeof(addr.sun_path)) + barf_perror("socket string '%s' too long", soc_str); + strcpy(addr.sun_path, soc_str); + if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) + barf_perror("Could not bind socket to %s", soc_str); + + if (chmod(soc_str, 0600) != 0) + barf_perror("Could not chmod sockets"); + + if (listen(sock, 1) != 0) + barf_perror("Could not listen on sockets"); +} + + +struct connection *add_socket_connection(int fd) +{ + struct connection *conn; + + conn = new_connection(&socket_funcs); + if (!conn) + barf("error restoring connection"); + conn->fd = fd; + + return conn; +} + void early_init(bool live_update, bool dofork, const char *pidfile) { reopen_log(); @@ -212,6 +354,9 @@ void set_special_fds(void) if (reopen_log_pipe[0] != -1) reopen_log_pipe0_pollfd_idx = set_fd(reopen_log_pipe[0], POLLIN|POLLPRI); + + if (sock != -1) + sock_pollfd_idx = set_fd(sock, POLLIN|POLLPRI); } void handle_special_fds(void) @@ -231,6 +376,15 @@ void handle_special_fds(void) } reopen_log_pipe0_pollfd_idx = -1; } + + if (sock_pollfd_idx != -1) { + if (poll_fds[sock_pollfd_idx].revents & ~POLLIN) { + barf_perror("sock poll failed"); + } else if (poll_fds[sock_pollfd_idx].revents & POLLIN) { + accept_connection(sock); + sock_pollfd_idx = -1; + } + } } void late_init(bool live_update) @@ -242,3 +396,13 @@ void late_init(bool live_update) } #endif } + +int get_socket_fd(void) +{ + return sock; +} + +void set_socket_fd(int fd) +{ + sock = fd; +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:45:03 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677191.1053619 (Exim 4.92) (envelope-from ) id 1rXW3j-0007gq-EZ; Wed, 07 Feb 2024 00:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677191.1053619; Wed, 07 Feb 2024 00:45:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3j-0007gi-Bn; Wed, 07 Feb 2024 00:45:03 +0000 Received: by outflank-mailman (input) for mailman id 677191; Wed, 07 Feb 2024 00:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3i-0007ga-Qd for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3i-0001Ly-Pt for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW3i-0004DL-Ow for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00: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=m8P1ycsKXYjCcUFPjooPDYVtF/9M9jS1G/vX33Zhns8=; b=GPMy/NhYfBrzXhwZkaCh/e8ZZr q5fPM+PMQZFaxnhMXYHaamyS5R2Wo+5xaRBcE4m+z2P45UIOPbHW3lWEbOVpOzDGXIENj28Xto4hu iF5STUnVxX8Oiw5OFhWwMa9JPX69LibC3dThL/960WadyZorW1cSq8K8QK7kzWPErLZA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: get own domid in stubdom case Message-Id: Date: Wed, 07 Feb 2024 00:45:02 +0000 commit a3e37f7024b0fb25c648315b2edf3583aa140b32 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:54 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: get own domid in stubdom case Obtain own domid when running as stubdom. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Reviewed-by: Julien Grall --- tools/xenstored/core.c | 1 + tools/xenstored/core.h | 1 + tools/xenstored/minios.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index c045a6e5db..9eb3cdf446 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2557,6 +2557,7 @@ static struct option options[] = { int dom0_domid = 0; int dom0_event = 0; int priv_domid = 0; +domid_t stub_domid = DOMID_INVALID; static unsigned int get_optval_uint(const char *arg) { diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h index 6180ec8b5c..f6af086f01 100644 --- a/tools/xenstored/core.h +++ b/tools/xenstored/core.h @@ -361,6 +361,7 @@ do { \ extern int dom0_domid; extern int dom0_event; extern int priv_domid; +extern domid_t stub_domid; extern bool keep_orphans; extern struct pollfd *poll_fds; diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c index 6d0c11423c..22ac8defbd 100644 --- a/tools/xenstored/minios.c +++ b/tools/xenstored/minios.c @@ -20,6 +20,7 @@ #include "core.h" #include "utils.h" #include +#include void finish_daemonize(void) { @@ -48,6 +49,9 @@ void unmap_xenbus(void *interface) void early_init(bool live_update, bool dofork, const char *pidfile) { + stub_domid = get_domid(); + if (stub_domid == DOMID_INVALID) + barf("could not get own domid"); } void late_init(bool live_update) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:45:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677192.1053623 (Exim 4.92) (envelope-from ) id 1rXW3t-0007jX-Fx; Wed, 07 Feb 2024 00:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677192.1053623; Wed, 07 Feb 2024 00: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 1rXW3t-0007jP-DH; Wed, 07 Feb 2024 00:45:13 +0000 Received: by outflank-mailman (input) for mailman id 677192; Wed, 07 Feb 2024 00:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3s-0007jI-Tg for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW3s-0001M5-Sw for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW3s-0004Fs-S9 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00: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=09QkLgbIV21PYBoN/4SX2KWAK7gsDPLOCbxInZZ7Fgg=; b=eGvJNvvcNpPQCr3FSzMy3h+1Ua 2N7GuQCC6YAGb5GKh+Y2WESs26P+Sh45ydwkrCfGOOVR7et9ojyo4aBAsiviIl472IgxGxHf92jm6 XovhObh/DjncKtvgpBHYvTRbNtH93/mIssSbKU6C3+zu3DWsx9OuYZseh81ZRl+abCwY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: rework ring page (un)map functions Message-Id: Date: Wed, 07 Feb 2024 00:45:12 +0000 commit 5edc819ed50d4d0bc0de422eed72301b69309862 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:55 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: rework ring page (un)map functions When [un]mapping the ring page of a Xenstore client, different actions are required for "normal" guests and dom0. Today this distinction is made at call site. Move this distinction into [un]map_interface() instead, avoiding code duplication and preparing special handling for [un]mapping the stub domain's ring page. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Reviewed-by: Julien Grall --- tools/xenstored/domain.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 040df98b8c..af80a8221d 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -497,14 +497,20 @@ static const struct interface_funcs domain_funcs = { static void *map_interface(domid_t domid) { + if (domid == xenbus_master_domid()) + return xenbus_map(); + return xengnttab_map_grant_ref(*xgt_handle, domid, GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); } -static void unmap_interface(void *interface) +static void unmap_interface(domid_t domid, void *interface) { - xengnttab_unmap(*xgt_handle, interface, 1); + if (domid == xenbus_master_domid()) + unmap_xenbus(interface); + else + xengnttab_unmap(*xgt_handle, interface, 1); } static int domain_tree_remove_sub(const void *ctx, struct connection *conn, @@ -594,14 +600,8 @@ static int destroy_domain(void *_domain) eprintf("> Unbinding port %i failed!\n", domain->port); } - if (domain->interface) { - /* Domain 0 was mapped by dom0_init, so it must be unmapped - using munmap() and not the grant unmap call. */ - if (domain->domid == dom0_domid) - unmap_xenbus(domain->interface); - else - unmap_interface(domain->interface); - } + if (domain->interface) + unmap_interface(domain->domid, domain->interface); fire_special_watches("@releaseDomain"); @@ -966,18 +966,13 @@ static struct domain *introduce_domain(const void *ctx, return NULL; if (!domain->introduced) { - interface = is_master_domain ? xenbus_map() - : map_interface(domid); + interface = map_interface(domid); if (!interface && !restore) return NULL; if (new_domain(domain, port, restore)) { rc = errno; - if (interface) { - if (is_master_domain) - unmap_xenbus(interface); - else - unmap_interface(interface); - } + if (interface) + unmap_interface(domid, interface); errno = rc; return NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:45:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:45:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677193.1053626 (Exim 4.92) (envelope-from ) id 1rXW43-0007m8-HN; Wed, 07 Feb 2024 00:45:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677193.1053626; Wed, 07 Feb 2024 00: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 1rXW43-0007m0-En; Wed, 07 Feb 2024 00:45:23 +0000 Received: by outflank-mailman (input) for mailman id 677193; Wed, 07 Feb 2024 00:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW43-0007lo-0j for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW43-0001MW-04 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW42-0004Gz-VP for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00: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=HmUu7MLWLAZ7MIhva4ah5AOvRTQYkYKKEo+3z8QO1Q4=; b=v8HndZ1u93DyVCgA86tTmHxvbx x0YAWvjiHWdAl6UuiV9xZDY/bcw46gTFnfob+c+tr/0tHP75Ki8JSvuRG8/hVZ80Mez6EgaTvYxKR zOfkIPXPZS9EaermyjzCvq7tEcFVubRLGUMDWglQhJTKJUquMXobxJJKVpbYE5dWiJMs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: split domain_init() Message-Id: Date: Wed, 07 Feb 2024 00:45:22 +0000 commit 097388d520eb104ebd93b486d126f319536a54e4 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:56 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: split domain_init() Today domain_init() is called either just before calling dom0_init() in case no live update is being performed, or it is called after reading the global state from read_state_global(), as the event channel fd is needed. Split up domain_init() into a preparation part which can be called unconditionally, and in a part setting up the event channel handle. Note that there is no chance that chk_domain_generation() can be called now before xc_handle has been setup, so there is no need for the related special case anymore. Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Reviewed-by: Julien Grall --- tools/xenstored/core.c | 2 ++ tools/xenstored/domain.c | 12 ++++++------ tools/xenstored/domain.h | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 9eb3cdf446..3bf2ec7734 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2742,6 +2742,8 @@ int main(int argc, char *argv[]) talloc_enable_null_tracking(); + domain_early_init(); + /* Listen to hypervisor. */ if (!live_update) { domain_init(-1); diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index af80a8221d..621b415088 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -1224,10 +1224,8 @@ static int domeq_fn(const void *key1, const void *key2) return *(const unsigned int *)key1 == *(const unsigned int *)key2; } -void domain_init(int evtfd) +void domain_early_init(void) { - int rc; - /* Start with a random rather low domain count for the hashtable. */ domhash = create_hashtable(NULL, "domains", domhash_fn, domeq_fn, 0); if (!domhash) @@ -1258,6 +1256,11 @@ void domain_init(int evtfd) xengnttab_set_max_grants(*xgt_handle, DOMID_FIRST_RESERVED); talloc_set_destructor(xgt_handle, close_xgt_handle); +} + +void domain_init(int evtfd) +{ + int rc; if (evtfd < 0) xce_handle = xenevtchn_open(NULL, XENEVTCHN_NO_CLOEXEC); @@ -1291,9 +1294,6 @@ static bool chk_domain_generation(unsigned int domid, uint64_t gen) { struct domain *d; - if (!xc_handle && domid == dom0_domid) - return true; - d = find_domain_struct(domid); return d && d->generation <= gen; diff --git a/tools/xenstored/domain.h b/tools/xenstored/domain.h index 7625dca8cd..224c4c23e2 100644 --- a/tools/xenstored/domain.h +++ b/tools/xenstored/domain.h @@ -82,6 +82,7 @@ int do_get_domain_path(const void *ctx, struct connection *conn, int do_reset_watches(const void *ctx, struct connection *conn, struct buffered_data *in); +void domain_early_init(void); void domain_init(int evtfd); void dom0_init(void); void domain_deinit(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:45:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677194.1053630 (Exim 4.92) (envelope-from ) id 1rXW4E-0007p9-Ig; Wed, 07 Feb 2024 00:45:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677194.1053630; Wed, 07 Feb 2024 00:45:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW4E-0007p2-GE; Wed, 07 Feb 2024 00:45:34 +0000 Received: by outflank-mailman (input) for mailman id 677194; Wed, 07 Feb 2024 00:45:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW4D-0007or-40 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW4D-0001Mh-3J for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW4D-0004Hu-2P for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XfANxJBCZmPoP2GXE7AhNuhf/C0zOjyykwITQc+slKw=; b=AZhv9AqXhoeiylWhEEpN6P1B5R M7oW3rqokj/ewc+oYiMk9WA2Z7JhgKotyfSKGZ4aHOEdjm0GpwTcqwymUFAO6c14QPba2bt0mfWWT r6Ztwgshqbthvb/4JeTAve6m2mhoDl2W6KP6pJQPm2Ug6OCnmeC9umAybr2kt/c0gDII=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: map stubdom interface Message-Id: Date: Wed, 07 Feb 2024 00:45:33 +0000 commit 3ce2e1f606cef3aa16b856396b31068c447b1262 Author: Juergen Gross AuthorDate: Mon Feb 5 11:49:57 2024 +0100 Commit: Julien Grall CommitDate: Mon Feb 5 19:26:32 2024 +0000 tools/xenstored: map stubdom interface When running as stubdom, map the stubdom's Xenstore ring page in order to support using the 9pfs frontend. Use the same pattern as in dom0_init() when running as daemon in dom0 (introduce the own domain, then send an event to the client side to signal Xenstore is ready to communicate). Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Reviewed-by: Julien Grall --- tools/xenstored/core.c | 2 ++ tools/xenstored/domain.c | 27 ++++++++++++++++++++++++++- tools/xenstored/domain.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 3bf2ec7734..48fc787ac1 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2767,6 +2767,8 @@ int main(int argc, char *argv[]) lu_read_state(); #endif + stubdom_init(); + check_store(); /* Get ready to listen to the tools. */ diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c index 621b415088..1a7d5e9756 100644 --- a/tools/xenstored/domain.c +++ b/tools/xenstored/domain.c @@ -37,6 +37,10 @@ #include #include +#ifdef __MINIOS__ +#include +#endif + static xc_interface **xc_handle; xengnttab_handle **xgt_handle; static evtchn_port_t virq_port; @@ -500,6 +504,11 @@ static void *map_interface(domid_t domid) if (domid == xenbus_master_domid()) return xenbus_map(); +#ifdef __MINIOS__ + if (domid == stub_domid) + return xenstore_buf; +#endif + return xengnttab_map_grant_ref(*xgt_handle, domid, GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE); @@ -509,7 +518,7 @@ static void unmap_interface(domid_t domid, void *interface) { if (domid == xenbus_master_domid()) unmap_xenbus(interface); - else + else if (domid != stub_domid) xengnttab_unmap(*xgt_handle, interface, 1); } @@ -1214,6 +1223,22 @@ void dom0_init(void) xenevtchn_notify(xce_handle, dom0->port); } +void stubdom_init(void) +{ +#ifdef __MINIOS__ + struct domain *stubdom; + + if (stub_domid < 0) + return; + + stubdom = introduce_domain(NULL, stub_domid, xenbus_evtchn, false); + if (!stubdom) + barf_perror("Failed to initialize stubdom"); + + xenevtchn_notify(xce_handle, stubdom->port); +#endif +} + static unsigned int domhash_fn(const void *k) { return *(const unsigned int *)k; diff --git a/tools/xenstored/domain.h b/tools/xenstored/domain.h index 224c4c23e2..844ac11510 100644 --- a/tools/xenstored/domain.h +++ b/tools/xenstored/domain.h @@ -85,6 +85,7 @@ int do_reset_watches(const void *ctx, struct connection *conn, void domain_early_init(void); void domain_init(int evtfd); void dom0_init(void); +void stubdom_init(void); void domain_deinit(void); void ignore_connection(struct connection *conn, unsigned int err); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 00:45:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 00:45:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677195.1053636 (Exim 4.92) (envelope-from ) id 1rXW4O-0007st-Mz; Wed, 07 Feb 2024 00:45:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677195.1053636; Wed, 07 Feb 2024 00:45:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW4O-0007sh-J9; Wed, 07 Feb 2024 00:45:44 +0000 Received: by outflank-mailman (input) for mailman id 677195; Wed, 07 Feb 2024 00:45:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW4N-0007sY-72 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXW4N-0001Mr-6F for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXW4N-0004Im-5T for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 00:45: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=Y1PhEQ+UDb2V+ibRRMyM2T30SLKNGGk+4cbur+22HW8=; b=FV+OuB1bQLmdh1tyQ2d67TbXl1 ZH3h4XrJSXxp1Nr21/dE0DiUzpIRFRRrfATE8QZQKG6puAroCLSbwl5LAjfdLZlmEpgcGLqkJgv7K EgpCt1pJJt0GZ8lOnUuZkrU86G7x9nOQur8LnSecJ6ZKvUcpO90+olc/mRAG03P3blG8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/evtchn: Remove useless assignment in evtchn_alloc_unbound() Message-Id: Date: Wed, 07 Feb 2024 00:45:43 +0000 commit 1cb7949b37b3d8892d8a3cea3ad1e2448352a34d Author: Frediano Ziglio AuthorDate: Mon Feb 5 10:46:37 2024 +0000 Commit: Julien Grall CommitDate: Mon Feb 5 21:17:44 2024 +0000 xen/evtchn: Remove useless assignment in evtchn_alloc_unbound() The variable 'rc' is assigned later, that value is never used. Signed-off-by: Frediano Ziglio Reviewed-by: Stefano Stabellini --- xen/common/event_channel.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index a7a004a084..15aec5dcbb 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -324,8 +324,6 @@ int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, evtchn_port_t port) goto out; } - rc = 0; - chn = evtchn_from_port(d, port); rc = xsm_evtchn_unbound(XSM_TARGET, d, chn, alloc->remote_dom); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:55:09 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677527.1054144 (Exim 4.92) (envelope-from ) id 1rXhSB-0000Nu-Mb; Wed, 07 Feb 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 677527.1054144; Wed, 07 Feb 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 1rXhSB-0000Nm-K8; Wed, 07 Feb 2024 12:55:03 +0000 Received: by outflank-mailman (input) for mailman id 677527; Wed, 07 Feb 2024 12:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSA-0000Ng-Mz for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSA-0001Vo-EH for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhSA-0004cq-BO for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12: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=JAEV5gPkKz+1TTaWHbc5c+Xc8eRi/JU6YsqoDdYYAt8=; b=Eu21ttmXy+1KPmC6/82KPa0cUN Ic+g8bASA87mFaebwwU5neFDg2hv++uKjq4PvOATYaRFw4SDP99qHa7B9jGWFuxEtwMUEbyj10RcB 0Riisomv4ifaGsB7Etp9eWvG27YPid05G5SBnhYxRDFWZSHglCov6TsqZfsjbSAT4ik0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] setup: Move vm_init() before acpi calls Message-Id: Date: Wed, 07 Feb 2024 12:55:02 +0000 commit 2213b5a293f7a93001917e1e97f5096a017c2a80 Author: Wei Liu AuthorDate: Tue Feb 6 11:53:04 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:53:04 2024 +0100 setup: Move vm_init() before acpi calls After the direct map removal, pages from the boot allocator are not going to be mapped in the direct map. Although we have map_domain_page, they are ephemeral and are less helpful for mappings that are more than a page, so we want a mechanism to globally map a range of pages, which is what vmap is for. Therefore, we bring vm_init into early boot stage. To allow vmap to be initialised and used in early boot, we need to modify vmap to receive pages from the boot allocator during early boot stage. Signed-off-by: Wei Liu Signed-off-by: David Woodhouse Signed-off-by: Hongyan Xia Signed-off-by: Julien Grall Signed-off-by: Elias El Yandouzi Reviewed-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/setup.c | 4 ++-- xen/arch/x86/setup.c | 31 ++++++++++++++++++++----------- xen/common/vmap.c | 35 +++++++++++++++++++++++++++-------- 3 files changed, 49 insertions(+), 21 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 59dd9bb25a..7e28f62d09 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -748,6 +748,8 @@ void asmlinkage __init start_xen(unsigned long boot_phys_offset, setup_mm(); + vm_init(); + /* Parse the ACPI tables for possible boot-time configuration */ acpi_boot_table_init(); @@ -759,8 +761,6 @@ void asmlinkage __init start_xen(unsigned long boot_phys_offset, */ system_state = SYS_STATE_boot; - vm_init(); - if ( acpi_disabled ) { printk("Booting using Device Tree\n"); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index ee682dd136..a0d99f8324 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -989,6 +989,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) int i, j, e820_warn = 0, bytes = 0; unsigned long eb_start, eb_end; bool acpi_boot_table_init_done = false, relocated = false; + bool vm_init_done = false; int ret; struct ns16550_defaults ns16550 = { .data_bits = 8, @@ -1531,12 +1532,23 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) continue; if ( !acpi_boot_table_init_done && - s >= (1ULL << 32) && - !acpi_boot_table_init() ) + s >= (1ULL << 32) ) { - acpi_boot_table_init_done = true; - srat_parse_regions(s); - setup_max_pdx(raw_max_page); + /* + * We only initialise vmap and acpi after going through the bottom + * 4GiB, so that we have enough pages in the boot allocator. + */ + if ( !vm_init_done ) + { + vm_init(); + vm_init_done = true; + } + if ( !acpi_boot_table_init() ) + { + acpi_boot_table_init_done = true; + srat_parse_regions(s); + setup_max_pdx(raw_max_page); + } } if ( pfn_to_pdx((e - 1) >> PAGE_SHIFT) >= max_pdx ) @@ -1722,6 +1734,9 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) init_frametable(); + if ( !vm_init_done ) + vm_init(); + if ( !acpi_boot_table_init_done ) acpi_boot_table_init(); @@ -1761,12 +1776,6 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) end_boot_allocator(); system_state = SYS_STATE_boot; - /* - * No calls involving ACPI code should go between the setting of - * SYS_STATE_boot and vm_init() (or else acpi_os_{,un}map_memory() - * will break). - */ - vm_init(); bsp_stack = cpu_alloc_stack(0); if ( !bsp_stack ) diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 830f64c5ef..fc5c70da4d 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -34,10 +34,19 @@ void __init vm_init_type(enum vmap_region type, void *start, void *end) for ( i = 0, va = (unsigned long)vm_bitmap(type); i < nr; ++i, va += PAGE_SIZE ) { - struct page_info *pg = alloc_domheap_page(NULL, 0); + mfn_t mfn; int rc; - rc = map_pages_to_xen(va, page_to_mfn(pg), 1, PAGE_HYPERVISOR); + if ( system_state == SYS_STATE_early_boot ) + mfn = alloc_boot_pages(1, 1); + else + { + struct page_info *pg = alloc_domheap_page(NULL, 0); + + BUG_ON(!pg); + mfn = page_to_mfn(pg); + } + rc = map_pages_to_xen(va, mfn, 1, PAGE_HYPERVISOR); BUG_ON(rc); clear_page((void *)va); @@ -65,7 +74,7 @@ static void *vm_alloc(unsigned int nr, unsigned int align, spin_lock(&vm_lock); for ( ; ; ) { - struct page_info *pg; + mfn_t mfn; ASSERT(vm_low[t] == vm_top[t] || !test_bit(vm_low[t], vm_bitmap(t))); for ( start = vm_low[t]; start < vm_top[t]; ) @@ -100,9 +109,16 @@ static void *vm_alloc(unsigned int nr, unsigned int align, if ( vm_top[t] >= vm_end[t] ) return NULL; - pg = alloc_domheap_page(NULL, 0); - if ( !pg ) - return NULL; + if ( system_state == SYS_STATE_early_boot ) + mfn = alloc_boot_pages(1, 1); + else + { + struct page_info *pg = alloc_domheap_page(NULL, 0); + + if ( !pg ) + return NULL; + mfn = page_to_mfn(pg); + } spin_lock(&vm_lock); @@ -110,7 +126,7 @@ static void *vm_alloc(unsigned int nr, unsigned int align, { unsigned long va = (unsigned long)vm_bitmap(t) + vm_top[t] / 8; - if ( !map_pages_to_xen(va, page_to_mfn(pg), 1, PAGE_HYPERVISOR) ) + if ( !map_pages_to_xen(va, mfn, 1, PAGE_HYPERVISOR) ) { clear_page((void *)va); vm_top[t] += PAGE_SIZE * 8; @@ -120,7 +136,10 @@ static void *vm_alloc(unsigned int nr, unsigned int align, } } - free_domheap_page(pg); + if ( system_state == SYS_STATE_early_boot ) + init_boot_pages(mfn_to_maddr(mfn), mfn_to_maddr(mfn) + PAGE_SIZE); + else + free_domheap_page(mfn_to_page(mfn)); if ( start >= vm_top[t] ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:55:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677528.1054149 (Exim 4.92) (envelope-from ) id 1rXhSL-0000Q7-OO; Wed, 07 Feb 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 677528.1054149; Wed, 07 Feb 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 1rXhSL-0000Pz-Le; Wed, 07 Feb 2024 12:55:13 +0000 Received: by outflank-mailman (input) for mailman id 677528; Wed, 07 Feb 2024 12:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSK-0000Pp-J9 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSK-0001Vz-I6 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhSK-0004dX-GN for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12: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=D3/gxrdsogjlGfdOrWyNf+3P6Of0qaOT+lwcriB2GyM=; b=PGlTlZA7UbkPutPntKWAVnx61X S0a48442677e4+wDuy0pkMkcnn2bvQQ2uui9B51SemW0PSW9zW8oZk7aTAdchiKc3c58p2YA5Xt9t vfxCedvlROO6Ge/tQXYmQuLo/MVshvRx1fiwmusoMLsTuuQDy3TEiZf0bseiHYFUwwQ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/vmap: Introduce vmap_size() and use it Message-Id: Date: Wed, 07 Feb 2024 12:55:12 +0000 commit ef0873946ce3850d6dc16ece512e706dda3bc51c Author: Julien Grall AuthorDate: Tue Feb 6 11:54:17 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:54:17 2024 +0100 xen/vmap: Introduce vmap_size() and use it vunmap() and vfree() currently duplicate the (small) logic to find the size of an vmap area. In a follow-up patch, we will want to introduce another one (this time externally). So introduce a new helper vmap_size() that will return the number of pages in the area starting at the given address. Take the opportunity to replace the open-coded version. Note that vfree() was storing the type of the area in a local variable. But this seems to have never been used (even when it was introduced). Signed-off-by: Julien Grall Signed-off-by: Elias El Yandouzi Acked-by: Jan Beulich --- xen/common/vmap.c | 19 ++++++++++--------- xen/include/xen/vmap.h | 3 +++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/xen/common/vmap.c b/xen/common/vmap.c index fc5c70da4d..171271fae3 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -245,14 +245,21 @@ void *vmap(const mfn_t *mfn, unsigned int nr) return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR, VMAP_DEFAULT); } -void vunmap(const void *va) +unsigned int vmap_size(const void *va) { - unsigned long addr = (unsigned long)va; unsigned int pages = vm_size(va, VMAP_DEFAULT); if ( !pages ) pages = vm_size(va, VMAP_XEN); + return pages; +} + +void vunmap(const void *va) +{ + unsigned long addr = (unsigned long)va; + unsigned pages = vmap_size(va); + #ifndef _PAGE_NONE destroy_xen_mappings(addr, addr + PAGE_SIZE * pages); #else /* Avoid tearing down intermediate page tables. */ @@ -328,17 +335,11 @@ void vfree(void *va) unsigned int i, pages; struct page_info *pg; PAGE_LIST_HEAD(pg_list); - enum vmap_region type = VMAP_DEFAULT; if ( !va ) return; - pages = vm_size(va, type); - if ( !pages ) - { - type = VMAP_XEN; - pages = vm_size(va, type); - } + pages = vmap_size(va); ASSERT(pages); for ( i = 0; i < pages; i++ ) diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index 2b7369e062..24c85de490 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -25,6 +25,9 @@ void vfree(void *va); void __iomem *ioremap(paddr_t pa, size_t len); +/* Return the number of pages in the mapping starting at address 'va' */ +unsigned int vmap_size(const void *va); + static inline void iounmap(void __iomem *va) { unsigned long addr = (unsigned long)(void __force *)va; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:55:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:55:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677529.1054153 (Exim 4.92) (envelope-from ) id 1rXhSV-0000Sb-Pk; Wed, 07 Feb 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 677529.1054153; Wed, 07 Feb 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 1rXhSV-0000ST-N8; Wed, 07 Feb 2024 12:55:23 +0000 Received: by outflank-mailman (input) for mailman id 677529; Wed, 07 Feb 2024 12:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSU-0000SL-Lz for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSU-0001W8-LH for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhSU-0004dz-KF for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HS5i00K4bTmjK2NbcaqVA4tILNsWXRCiXj8XQzFcSUg=; b=2zaxbT654jtbJqF/9B6gEn4ykx gQLhngxqTACYWq1HWjO8WVw70Ilv2vEWHCDNNjikz7HzvxJawmfv4rLdo3wfSHmgoTWcGNxFQqtKX rfpwMiSmUwf1zi4uJmZ3eyRu7MnmGcM7yCpC4Hsn+Fvk6f5IcR1fH0n7x4oSDdp6PvWs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] acpi: vmap pages in acpi_os_alloc_memory Message-Id: Date: Wed, 07 Feb 2024 12:55:22 +0000 commit f940facaa37059a95769ea9eb638efb062b85b52 Author: Hongyan Xia AuthorDate: Tue Feb 6 11:54:50 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:54:50 2024 +0100 acpi: vmap pages in acpi_os_alloc_memory Also, introduce a wrapper around vmap that maps a contiguous range for boot allocations. Unfortunately, the new helper cannot be a static inline because the dependencies are a mess. We would need to re-include asm/page.h (was removed in aa4b9d1ee653 "include: don't use asm/page.h from common headers") and it doesn't look to be enough anymore because bits from asm/cpufeature.h is used in the definition of PAGE_NX. Lastly, with the move to vmap(), it is now easier to find the size of the mapping. So pass the whole area to init_boot_pages() rather than just the first page. Signed-off-by: Hongyan Xia Signed-off-by: Julien Grall Signed-off-by: Elias El Yandouzi Acked-by: Jan Beulich --- xen/common/vmap.c | 5 +++++ xen/drivers/acpi/osl.c | 14 ++++++++++++-- xen/include/xen/vmap.h | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 171271fae3..966a7e763f 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -245,6 +245,11 @@ void *vmap(const mfn_t *mfn, unsigned int nr) return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR, VMAP_DEFAULT); } +void *vmap_contig(mfn_t mfn, unsigned int nr) +{ + return __vmap(&mfn, nr, 1, 1, PAGE_HYPERVISOR, VMAP_DEFAULT); +} + unsigned int vmap_size(const void *va) { unsigned int pages = vm_size(va, VMAP_DEFAULT); diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index 389505f786..ab80d6b2a9 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -221,7 +221,11 @@ void *__init acpi_os_alloc_memory(size_t sz) void *ptr; if (system_state == SYS_STATE_early_boot) - return mfn_to_virt(mfn_x(alloc_boot_pages(PFN_UP(sz), 1))); + { + mfn_t mfn = alloc_boot_pages(PFN_UP(sz), 1); + + return vmap_contig(mfn, PFN_UP(sz)); + } ptr = xmalloc_bytes(sz); ASSERT(!ptr || is_xmalloc_memory(ptr)); @@ -246,5 +250,11 @@ void __init acpi_os_free_memory(void *ptr) if (is_xmalloc_memory(ptr)) xfree(ptr); else if (ptr && system_state == SYS_STATE_early_boot) - init_boot_pages(__pa(ptr), __pa(ptr) + PAGE_SIZE); + { + paddr_t addr = mfn_to_maddr(vmap_to_mfn(ptr)); + unsigned int nr = vmap_size(ptr); + + vunmap(ptr); + init_boot_pages(addr, addr + nr * PAGE_SIZE); + } } diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index 24c85de490..0c16baa85f 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -15,6 +15,7 @@ void vm_init_type(enum vmap_region type, void *start, void *end); void *__vmap(const mfn_t *mfn, unsigned int granularity, unsigned int nr, unsigned int align, unsigned int flags, enum vmap_region type); void *vmap(const mfn_t *mfn, unsigned int nr); +void *vmap_contig(mfn_t mfn, unsigned int nr); void vunmap(const void *va); void *vmalloc(size_t size); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:55:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:55:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677530.1054157 (Exim 4.92) (envelope-from ) id 1rXhSf-0000Uw-RZ; Wed, 07 Feb 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 677530.1054157; Wed, 07 Feb 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 1rXhSf-0000Up-Oc; Wed, 07 Feb 2024 12:55:33 +0000 Received: by outflank-mailman (input) for mailman id 677530; Wed, 07 Feb 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 1rXhSe-0000Ui-R5 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSe-0001WV-OZ for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhSe-0004eS-NR for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12: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=ioNhQQ/LJbdgWGJ+e6+bx+YPCRFLTKX93qpCHGzPIg4=; b=jigNLZzs1TzScLaz+tQy+GTDvd HPeLJnZgwnKPBXNAHwggwuhLLIvE9XRdZ0LJ2q6UBwnlkcsMrJGtRGzK/N6yOFei+16wM+UbP5zP0 a6QtvGFHnFikDVQGsClNBZlWlrXiaeniJ4ZY3lo0xTxShjuKxvMnMegrjqxPNV/P+7b0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/numa: vmap the pages for memnodemap Message-Id: Date: Wed, 07 Feb 2024 12:55:32 +0000 commit 861d9877266e48a0007cb6ede59b134697b73025 Author: Hongyan Xia AuthorDate: Tue Feb 6 11:55:24 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:55:24 2024 +0100 xen/numa: vmap the pages for memnodemap This avoids the assumption that there is a direct map and boot pages fall inside the direct map. Clean up the variables so that mfn actually stores a type-safe mfn. Signed-off-by: Hongyan Xia Signed-off-by: Julien Grall Signed-off-by: Elias El Yandouzi Reviewed-by: Jan Beulich --- xen/common/numa.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/common/numa.c b/xen/common/numa.c index f454c4d894..6374ba1721 100644 --- a/xen/common/numa.c +++ b/xen/common/numa.c @@ -424,13 +424,14 @@ static int __init populate_memnodemap(const struct node *nodes, static int __init allocate_cachealigned_memnodemap(void) { unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap)); - unsigned long mfn = mfn_x(alloc_boot_pages(size, 1)); + mfn_t mfn = alloc_boot_pages(size, 1); - memnodemap = mfn_to_virt(mfn); - mfn <<= PAGE_SHIFT; + memnodemap = vmap_contig(mfn, size); + if ( !memnodemap ) + panic("Unable to map the NUMA node map. Retry with numa=off"); size <<= PAGE_SHIFT; printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n", - mfn, mfn + size); + mfn_to_maddr(mfn), mfn_to_maddr(mfn) + size); memnodemapsize = size / sizeof(*memnodemap); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:55:44 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677531.1054160 (Exim 4.92) (envelope-from ) id 1rXhSp-0000Xt-Sk; Wed, 07 Feb 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 677531.1054160; Wed, 07 Feb 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 1rXhSp-0000Xl-QF; Wed, 07 Feb 2024 12:55:43 +0000 Received: by outflank-mailman (input) for mailman id 677531; Wed, 07 Feb 2024 12:55:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSo-0000Xc-Ur for xen-changelog@lists.xenproject.org; Wed, 07 Feb 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 1rXhSo-0001Wg-SD for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhSo-0004f7-R2 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 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=MAAkPr21Ul0o+dd2n2FPedlafPV4Ld+sgZiZ32U5cVw=; b=4u8CX813zmL+UUTJpffo7UqnFo vX2i+ynCcqoETAh6lBaF4L8+SWhRWLfSJEf0Xyjdex0sH/g0k8RKsGec1jdyqyVjbrHIX0N8iC443 3b1grkc1w1K0A2nBwg42g5tsItfXwIfNJYlKH+rdOP8NS+SmI4bCevcC+8LdAUI/1qiI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/srat: vmap the pages for acpi_slit Message-Id: Date: Wed, 07 Feb 2024 12:55:42 +0000 commit 8ac8999d7011c4339a14ce01f2a9d1e6801eefb1 Author: Hongyan Xia AuthorDate: Tue Feb 6 11:55:49 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:55:49 2024 +0100 x86/srat: vmap the pages for acpi_slit This avoids the assumption that boot pages are in the direct map. Signed-off-by: Hongyan Xia Signed-off-by: Julien Grall Signed-off-by: Elias El Yandouzi Reviewed-by: Jan Beulich --- xen/arch/x86/srat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 3f70338e6e..688f410287 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -135,7 +135,9 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) return; } mfn = alloc_boot_pages(PFN_UP(slit->header.length), 1); - acpi_slit = mfn_to_virt(mfn_x(mfn)); + acpi_slit = vmap_contig(mfn, PFN_UP(slit->header.length)); + if ( !acpi_slit ) + panic("Unable to map the ACPI SLIT. Retry with numa=off"); memcpy(acpi_slit, slit, slit->header.length); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:55:53 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677532.1054165 (Exim 4.92) (envelope-from ) id 1rXhSz-0000aw-UA; Wed, 07 Feb 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 677532.1054165; Wed, 07 Feb 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 1rXhSz-0000ap-Ri; Wed, 07 Feb 2024 12:55:53 +0000 Received: by outflank-mailman (input) for mailman id 677532; Wed, 07 Feb 2024 12:55:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhSy-0000af-WA for xen-changelog@lists.xenproject.org; Wed, 07 Feb 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 1rXhSy-0001Wq-VR for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhSy-0004fY-UR for xen-changelog@lists.xenproject.org; Wed, 07 Feb 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=YEnBvZJJjkPRYLlg3zrWp8Sr+twzmw8CJ6U/O66Sy2E=; b=KhXa81e5djU5osfjwgHkMP5VGD kGwvMQvKW5t2GE8rDh/VzsylFOqTHRG6a9O2c6azKflJ6Gd3ZFjkOVqAsqLqYfVb8FDqn3zdfczaV I3TlfZWJ2ENqPMn9V1bqUpi/6BHKucccH56Kqosp4KUvOZ0j60eiFEQvENH4pq6R2LH0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] amd-vi: fix IVMD memory type checks Message-Id: Date: Wed, 07 Feb 2024 12:55:52 +0000 commit 83afa313583019d9f159c122cecf867735d27ec5 Author: Roger Pau Monné AuthorDate: Tue Feb 6 11:56:13 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:56:13 2024 +0100 amd-vi: fix IVMD memory type checks The current code that parses the IVMD blocks is relaxed with regard to the restriction that such unity regions should always fall into memory ranges marked as reserved in the memory map. However the type checks for the IVMD addresses are inverted, and as a result IVMD ranges falling into RAM areas are accepted. Note that having such ranges in the first place is a firmware bug, as IVMD should always fall into reserved ranges. Fixes: ed6c77ebf0c1 ('AMD/IOMMU: check / convert IVMD ranges for being / to be reserved') Reported-by: Ox Signed-off-by: Roger Pau Monné Tested-by: oxjo Reviewed-by: Jan Beulich --- xen/drivers/passthrough/amd/iommu_acpi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 2e3b83014b..ca70f4f3ae 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -426,9 +426,14 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) return -EIO; } - /* Types which won't be handed out are considered good enough. */ - if ( !(type & (RAM_TYPE_RESERVED | RAM_TYPE_ACPI | - RAM_TYPE_UNUSABLE)) ) + /* + * Types which aren't RAM are considered good enough. + * Note that a page being partially RESERVED, ACPI or UNUSABLE will + * force Xen into assuming the whole page as having that type in + * practice. + */ + if ( type & (RAM_TYPE_RESERVED | RAM_TYPE_ACPI | + RAM_TYPE_UNUSABLE) ) continue; AMD_IOMMU_ERROR("IVMD: page at %lx can't be converted\n", addr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:56:04 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677533.1054169 (Exim 4.92) (envelope-from ) id 1rXhTA-0000eP-0t; Wed, 07 Feb 2024 12:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677533.1054169; Wed, 07 Feb 2024 12: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 1rXhT9-0000eH-US; Wed, 07 Feb 2024 12:56:03 +0000 Received: by outflank-mailman (input) for mailman id 677533; Wed, 07 Feb 2024 12:56:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhT9-0000e5-2q for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhT9-0001XA-2A for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhT9-0004gk-1A for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=12ftxhGI844TywNttoKWAiebXeO78WoN40Yz5LAvvv0=; b=04nc0zy78RASdRpY0i6l7hNjWR tKZhPdTRh7zehwBSaTEiyDyv1lIm4rBtCHMnGnX+79bBigK4tJ8aP9tRaCtpqP/RuM2MmjcBOoxjg 3XT41PdHKSlyQdbzH+vXMISlhtT/qPX6bEZUnmTTj6LzbRdkdDZXrZ6Ml1zwv5kp+2VY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/paging: Use more specific constant Message-Id: Date: Wed, 07 Feb 2024 12:56:03 +0000 commit 80b01e20d0f45a8a3fb6758bfac6dd4d2eef3387 Author: Frediano Ziglio AuthorDate: Tue Feb 6 11:56:38 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:56:38 2024 +0100 x86/paging: Use more specific constant __HYPERVISOR_arch_1 and __HYPERVISOR_paging_domctl_cont for x86 have the same value but this function is handling "paging_domctl_cont" hypercall so using the latter mnemonic in the code is more clear. Signed-off-by: Frediano Ziglio Reviewed-by: Jan Beulich --- xen/arch/x86/mm/paging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 541c2ea9b2..2961ca734d 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -783,7 +783,7 @@ long do_paging_domctl_cont( rcu_unlock_domain(d); if ( ret == -ERESTART ) - ret = hypercall_create_continuation(__HYPERVISOR_arch_1, + ret = hypercall_create_continuation(__HYPERVISOR_paging_domctl_cont, "h", u_domctl); else if ( __copy_field_to_guest(u_domctl, &op, u.shadow_op) ) ret = -EFAULT; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:56:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677534.1054173 (Exim 4.92) (envelope-from ) id 1rXhTK-0000hY-2M; Wed, 07 Feb 2024 12:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677534.1054173; Wed, 07 Feb 2024 12:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTJ-0000hQ-Vu; Wed, 07 Feb 2024 12:56:13 +0000 Received: by outflank-mailman (input) for mailman id 677534; Wed, 07 Feb 2024 12:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTJ-0000hK-5x for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTJ-0001XP-56 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhTJ-0004hB-4C for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sSKxJPQ3Vik42714RsoRpgdFlyn5Sl+ytPgmSs6VHqg=; b=ZWCvObGXNJ0bRMDCPwgp/tXURC roueupiGjZEfnZT+W0eV+n6NJq0JVBNXimJr/zjmX+kBipipXqiylgsLkUJBN6AaJJE0pG4gQ3k3F jYCHbeyXQbrfw2nYjCVRqJXNPPsN7TKPuzIeXMxtsBjV70of5qAm9PDsuMbW1jerOYCM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/entry: Reduce assembly instruction size Message-Id: Date: Wed, 07 Feb 2024 12:56:13 +0000 commit 02c6ad45154b6dc47f588c98099b9084ee94c894 Author: Frediano Ziglio AuthorDate: Tue Feb 6 11:57:05 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:57:05 2024 +0100 x86/entry: Reduce assembly instruction size Use 32 bit versions in all cases, not only for registers till 8th. This reduces the encoding from (example with r14): 49 c7 c6 ff 7f 00 00 mov $0x7fff,%r14 to 41 be ff 7f 00 00 mov $0x7fff,%r14d Signed-off-by: Frediano Ziglio Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/asm_defns.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/asm_defns.h b/xen/arch/x86/include/asm/asm_defns.h index 51bf1cf1e6..a9a6c21c76 100644 --- a/xen/arch/x86/include/asm/asm_defns.h +++ b/xen/arch/x86/include/asm/asm_defns.h @@ -136,7 +136,7 @@ register unsigned long current_stack_pointer asm("rsp"); #define STACK_CPUINFO_FIELD(field) (1 - CPUINFO_sizeof + CPUINFO_##field) #define GET_STACK_END(reg) \ .if .Lr##reg >= 8; \ - movq $STACK_SIZE-1, %r##reg; \ + movl $STACK_SIZE-1, %r##reg##d; \ .else; \ movl $STACK_SIZE-1, %e##reg; \ .endif; \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:56:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677535.1054177 (Exim 4.92) (envelope-from ) id 1rXhTU-0000jq-3k; Wed, 07 Feb 2024 12:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677535.1054177; Wed, 07 Feb 2024 12:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTU-0000jh-13; Wed, 07 Feb 2024 12:56:24 +0000 Received: by outflank-mailman (input) for mailman id 677535; Wed, 07 Feb 2024 12:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTT-0000ja-90 for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTT-0001XZ-8G for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhTT-0004hh-7M for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z9NKZO7Tz42uTsIslYuiPWhgRanla6Kqc7QVbCbNQmM=; b=uNxC1a8dLj5W0j9/e2KIxwtLl1 Czk6Abb1d9xxhMcP3wEM1PJOP3BG+YneLwmws1BIsbZEEkHSVLpOcTCc170sQ9UNCj3r3aknVb/k/ BBNMwdXKqho2TYfkwmiQS84y75hyp3FrJX8zAUQQrn4Ec81rw38cOJyDT9zykAsVfQRM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] golang: Regen binding Message-Id: Date: Wed, 07 Feb 2024 12:56:23 +0000 commit 57a923bfd920307c5bfa533c95dba16a13ea0225 Author: Anthony PERARD AuthorDate: Tue Feb 6 11:57:40 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 6 11:57:40 2024 +0100 golang: Regen binding Fixes: 024e7131be5c ("tools: don't expose XENFEAT_hvm_pirqs by default") Signed-off-by: Anthony PERARD Acked-by: George Dunlap --- tools/golang/xenlight/helpers.gen.go | 6 ++++++ tools/golang/xenlight/types.gen.go | 1 + 2 files changed, 7 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 35e209ff1b..0f8e23773c 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1280,6 +1280,9 @@ return fmt.Errorf("converting field Rdm: %v", err) } x.RdmMemBoundaryMemkb = uint64(tmp.rdm_mem_boundary_memkb) x.McaCaps = uint64(tmp.mca_caps) +if err := x.Pirq.fromC(&tmp.pirq);err != nil { +return fmt.Errorf("converting field Pirq: %v", err) +} return nil } @@ -1613,6 +1616,9 @@ return fmt.Errorf("converting field Rdm: %v", err) } hvm.rdm_mem_boundary_memkb = C.uint64_t(tmp.RdmMemBoundaryMemkb) hvm.mca_caps = C.uint64_t(tmp.McaCaps) +if err := tmp.Pirq.toC(&hvm.pirq); err != nil { +return fmt.Errorf("converting field Pirq: %v", err) +} hvmBytes := C.GoBytes(unsafe.Pointer(&hvm),C.sizeof_libxl_domain_build_info_type_union_hvm) copy(xc.u[:],hvmBytes) case DomainTypePv: diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 7907aa8999..9c8b7b81f6 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -651,6 +651,7 @@ SerialList StringList Rdm RdmReserve RdmMemBoundaryMemkb uint64 McaCaps uint64 +Pirq Defbool } func (x DomainBuildInfoTypeUnionHvm) isDomainBuildInfoTypeUnion(){} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 07 12:56:35 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Feb 2024 12:56:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677536.1054181 (Exim 4.92) (envelope-from ) id 1rXhTf-0000mH-5P; Wed, 07 Feb 2024 12:56:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677536.1054181; Wed, 07 Feb 2024 12:56:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTf-0000m9-2Y; Wed, 07 Feb 2024 12:56:35 +0000 Received: by outflank-mailman (input) for mailman id 677536; Wed, 07 Feb 2024 12:56:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTe-0000ly-0s for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXhTe-0001Xz-0C for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXhTd-0004p6-VR for xen-changelog@lists.xenproject.org; Wed, 07 Feb 2024 12:56:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=v2QabKeR8S+F32kwwLEh6zJ8+SEixm7XHVP14gNCExQ=; b=av4UjReSvwzmfq2cTCcsq3OVFq xyMedZ7tZaOnX1BcdIy0X/XSaNkQMwhR7bVWtAODbcINvrmAOASObHX7QiFvjf3joBxR3AwOa5Bml UEwmqnQE1NpPDiQfb/7PGc7IIfrDIS7LmmPc4yLFJuOZCE5VulOmHV+c+6ztVTNVKp9Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] Mini-OS: fix 9pfs frontend error path Message-Id: Date: Wed, 07 Feb 2024 12:56:33 +0000 commit b119f0178fd86876d0678007dfcf435ab8bb7568 Author: Juergen Gross AuthorDate: Wed Feb 7 13:52:13 2024 +0100 Commit: Jan Beulich CommitDate: Wed Feb 7 13:52:13 2024 +0100 Mini-OS: fix 9pfs frontend error path The early error exit in p9_stat() returns without zeroing the p9_stat buffer, resulting in free() being called with an uninitialized pointer. Fix that by calling free_stat() in p9_stat() in case of returning an error and potentially having allocated strings. Reported-by: Julien Grall Fixes: 2d1dfccd3aa3 ("Mini-OS: add read and write support to 9pfsfront") Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- 9pfront.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/9pfront.c b/9pfront.c index 315089b..042879a 100644 --- a/9pfront.c +++ b/9pfront.c @@ -728,6 +728,8 @@ static int p9_stat(struct dev_9pfs *dev, uint32_t fid, struct p9_stat *stat) &stat->extension, &stat->n_uid, &stat->n_gid, &stat->n_muid); ret = req->result; + if ( ret ) + free_stat(&stat); put_free_req(dev, req); @@ -932,13 +934,13 @@ static int write_9pfs(struct file *file, const void *buf, size_t nbytes) if ( f9pfs->append ) { ret = p9_stat(f9pfs->dev, f9pfs->fid, &stat); - free_stat(&stat); if ( ret ) { errno = EIO; return -1; } file->offset = stat.length; + free_stat(&stat); } ret = p9_write(f9pfs->dev, f9pfs->fid, file->offset, buf, nbytes); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Thu Feb 08 01:11:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Feb 2024 01:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.677954.1054907 (Exim 4.92) (envelope-from ) id 1rXswQ-00084J-B6; Thu, 08 Feb 2024 01:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 677954.1054907; Thu, 08 Feb 2024 01: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 1rXswQ-00084B-7s; Thu, 08 Feb 2024 01:11:02 +0000 Received: by outflank-mailman (input) for mailman id 677954; Thu, 08 Feb 2024 01:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXswP-00083r-B3 for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 01:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rXswP-0000sC-AB for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 01:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rXswP-0005Gd-8k for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 01:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VpqhjYc9nALx+91Xj4+e75qHouZVIVZYvmG/Yt3zuVU=; b=LNp8sGosTzX5SUYIeNW5u0VmbG Ox/w+IR4KZ6otRfYOUsO8+n9vXflrIbzwsIz75LeEFvLlMPTFP6uRp/ATHbh8NGHs9oBUwChtqbp2 +u3OYC1cCg1FKejyLM87uE5LXG28xgGtvbwITz9i5ansAiW+OE5qivmZOPiMHCnKUTBE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Switch yocto-qemux86-64 job to run on x86 Message-Id: Date: Thu, 08 Feb 2024 01:11:01 +0000 commit 59a69674b533a2d0c0ad5cd7fbcd655295574509 Author: Michal Orzel AuthorDate: Tue Feb 6 16:20:12 2024 +0100 Commit: Stefano Stabellini CommitDate: Tue Feb 6 16:47:04 2024 -0800 automation: Switch yocto-qemux86-64 job to run on x86 At the moment, all Yocto jobs run on Arm64 runners. To address CI capacity issues, move yocto-qemux86-64 job to x86. Reflect the change in the makefile generating Yocto docker files and fix CONTAINER name definition that incorrectly expects YOCTO_HOST variable to be set for x86 container as well, which does not have a platform name appended. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- automation/build/yocto/yocto.inc | 6 ++++-- automation/gitlab-ci/build.yaml | 10 +++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/automation/build/yocto/yocto.inc b/automation/build/yocto/yocto.inc index e4328ec7f3..2f3b1a5b2a 100644 --- a/automation/build/yocto/yocto.inc +++ b/automation/build/yocto/yocto.inc @@ -18,11 +18,13 @@ YOCTO_TARGETS = qemuarm64 qemuarm qemux86-64 YOCTO_ARCHS = amd64 arm64v8 # Architecture we want to use in gitlab CI (depends on runners arch). -CI_ARCH = arm64v8 +CI_ARCH-qemuarm64 = arm64v8 +CI_ARCH-qemuarm = arm64v8 +CI_ARCH-qemux86-64 = amd64 define GEN_DOCKER # Make all is generating architecture we use in the CI. -ifeq ($(CI_ARCH),$(3)) +ifeq ($(CI_ARCH-$(2)),$(3)) CONTAINERS += yocto/$(1)-$(2)$(4) else CONTAINERS_EXTRA += yocto/$(1)-$(2)$(4) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 32af30cced..6d2cb18b88 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -213,7 +213,7 @@ - ./automation/build/yocto/build-yocto.sh -v --log-dir=./logs --xen-dir=`pwd` ${YOCTO_BOARD} ${YOCTO_OUTPUT} variables: YOCTO_VERSION: kirkstone - CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}-${YOCTO_HOST} + CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}${YOCTO_HOST} artifacts: paths: - 'logs/*' @@ -224,16 +224,12 @@ .yocto-test-arm64: extends: .yocto-test variables: - YOCTO_HOST: arm64v8 + YOCTO_HOST: -arm64v8 tags: - arm64 -# This is not used by any test job as we only run Yocto on arm based machines. -# Keep it here so that someone having x86 hardware can easily add jobs. .yocto-test-x86-64: extends: .yocto-test - variables: - YOCTO_HOST: amd64 tags: - x86_64 @@ -576,7 +572,7 @@ yocto-qemuarm: YOCTO_OUTPUT: --copy-output yocto-qemux86-64: - extends: .yocto-test-arm64 + extends: .yocto-test-x86-64 variables: YOCTO_BOARD: qemux86-64 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Feb 08 11:33:11 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Feb 2024 11:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678139.1055197 (Exim 4.92) (envelope-from ) id 1rY2eN-0007ge-1y; Thu, 08 Feb 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 678139.1055197; Thu, 08 Feb 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 1rY2eM-0007gW-VN; Thu, 08 Feb 2024 11:33:02 +0000 Received: by outflank-mailman (input) for mailman id 678139; Thu, 08 Feb 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 1rY2eM-0007gP-1H for xen-changelog@lists.xenproject.org; Thu, 08 Feb 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 1rY2eM-000574-0W for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 11:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rY2eL-0003Xv-Uz for xen-changelog@lists.xenproject.org; Thu, 08 Feb 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=Yi0Hk7DXi12kLXivuhleHoQ5eebo8qe7VFEMFZM2xbI=; b=dJ+vNBodXkM7WigeFJSoBI+6hF qcTHzXq+KV5JNEyorvVOhPu+V9vX7J6j8IqE2MKdusgz8g0kU/iTtLM6lQPL2opdKBhAdsOdFksnl A0il9ge32ax/CCK+FkGo8AYS5aZf0x9s81QTNMfgxiV2UBOtj6YvB1NjXJvNZxB6Ereo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VMX: tertiary execution control infrastructure Message-Id: Date: Thu, 08 Feb 2024 11:33:01 +0000 commit 878159bf259bfbd7a40312829f1ea0ce1f6645e2 Author: Jan Beulich AuthorDate: Wed Feb 7 13:46:11 2024 +0100 Commit: Jan Beulich CommitDate: Wed Feb 7 13:46:11 2024 +0100 VMX: tertiary execution control infrastructure This is a prereq to enabling e.g. the MSRLIST feature. Note that the PROCBASED_CTLS3 MSR is different from other VMX feature reporting MSRs, in that all 64 bits report allowed 1-settings. vVMX code is left alone, though, for the time being. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/vmx/vmcs.c | 58 +++++++++++++++++++++++++++++---- xen/arch/x86/hvm/vmx/vmx.c | 6 ++++ xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 13 ++++++++ xen/arch/x86/include/asm/hvm/vmx/vmx.h | 1 + xen/arch/x86/include/asm/msr-index.h | 1 + 5 files changed, 73 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 4fe1213855..9e016634ab 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -164,6 +164,7 @@ static int cf_check parse_ept_param_runtime(const char *s) u32 vmx_pin_based_exec_control __read_mostly; u32 vmx_cpu_based_exec_control __read_mostly; u32 vmx_secondary_exec_control __read_mostly; +uint64_t vmx_tertiary_exec_control __read_mostly; u32 vmx_vmexit_control __read_mostly; u32 vmx_vmentry_control __read_mostly; u64 vmx_ept_vpid_cap __read_mostly; @@ -228,10 +229,32 @@ static u32 adjust_vmx_controls( return ctl; } -static bool cap_check(const char *name, u32 expected, u32 saw) +static uint64_t adjust_vmx_controls2( + const char *name, uint64_t ctl_min, uint64_t ctl_opt, unsigned int msr, + bool *mismatch) +{ + uint64_t vmx_msr, ctl = ctl_min | ctl_opt; + + rdmsrl(msr, vmx_msr); + + ctl &= vmx_msr; /* bit == 0 ==> must be zero */ + + /* Ensure minimum (required) set of control bits are supported. */ + if ( ctl_min & ~ctl ) + { + *mismatch = true; + printk("VMX: CPU%u has insufficient %s (%#lx; requires %#lx)\n", + smp_processor_id(), name, ctl, ctl_min); + } + + return ctl; +} + +static bool cap_check( + const char *name, unsigned long expected, unsigned long saw) { if ( saw != expected ) - printk("VMX %s: saw %#x expected %#x\n", name, saw, expected); + printk("VMX %s: saw %#lx expected %#lx\n", name, saw, expected); return saw != expected; } @@ -241,6 +264,7 @@ static int vmx_init_vmcs_config(bool bsp) u32 _vmx_pin_based_exec_control; u32 _vmx_cpu_based_exec_control; u32 _vmx_secondary_exec_control = 0; + uint64_t _vmx_tertiary_exec_control = 0; u64 _vmx_ept_vpid_cap = 0; u64 _vmx_misc_cap = 0; u32 _vmx_vmexit_control; @@ -274,7 +298,8 @@ static int vmx_init_vmcs_config(bool bsp) opt = (CPU_BASED_ACTIVATE_MSR_BITMAP | CPU_BASED_TPR_SHADOW | CPU_BASED_MONITOR_TRAP_FLAG | - CPU_BASED_ACTIVATE_SECONDARY_CONTROLS); + CPU_BASED_ACTIVATE_SECONDARY_CONTROLS | + CPU_BASED_ACTIVATE_TERTIARY_CONTROLS); _vmx_cpu_based_exec_control = adjust_vmx_controls( "CPU-Based Exec Control", min, opt, MSR_IA32_VMX_PROCBASED_CTLS, &mismatch); @@ -338,6 +363,15 @@ static int vmx_init_vmcs_config(bool bsp) MSR_IA32_VMX_PROCBASED_CTLS2, &mismatch); } + if ( _vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_TERTIARY_CONTROLS ) + { + uint64_t opt = 0; + + _vmx_tertiary_exec_control = adjust_vmx_controls2( + "Tertiary Exec Control", 0, opt, + MSR_IA32_VMX_PROCBASED_CTLS3, &mismatch); + } + /* The IA32_VMX_EPT_VPID_CAP MSR exists only when EPT or VPID available */ if ( _vmx_secondary_exec_control & (SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_ENABLE_VPID) ) @@ -468,6 +502,7 @@ static int vmx_init_vmcs_config(bool bsp) vmx_pin_based_exec_control = _vmx_pin_based_exec_control; vmx_cpu_based_exec_control = _vmx_cpu_based_exec_control; vmx_secondary_exec_control = _vmx_secondary_exec_control; + vmx_tertiary_exec_control = _vmx_tertiary_exec_control; vmx_ept_vpid_cap = _vmx_ept_vpid_cap; vmx_vmexit_control = _vmx_vmexit_control; vmx_vmentry_control = _vmx_vmentry_control; @@ -502,6 +537,9 @@ static int vmx_init_vmcs_config(bool bsp) mismatch |= cap_check( "Secondary Exec Control", vmx_secondary_exec_control, _vmx_secondary_exec_control); + mismatch |= cap_check( + "Tertiary Exec Control", + vmx_tertiary_exec_control, _vmx_tertiary_exec_control); mismatch |= cap_check( "VMExit Control", vmx_vmexit_control, _vmx_vmexit_control); @@ -1080,6 +1118,7 @@ static int construct_vmcs(struct vcpu *v) v->arch.hvm.vmx.exec_control |= CPU_BASED_RDTSC_EXITING; v->arch.hvm.vmx.secondary_exec_control = vmx_secondary_exec_control; + v->arch.hvm.vmx.tertiary_exec_control = vmx_tertiary_exec_control; /* * Disable features which we don't want active by default: @@ -1134,6 +1173,10 @@ static int construct_vmcs(struct vcpu *v) __vmwrite(SECONDARY_VM_EXEC_CONTROL, v->arch.hvm.vmx.secondary_exec_control); + if ( cpu_has_vmx_tertiary_exec_control ) + __vmwrite(TERTIARY_VM_EXEC_CONTROL, + v->arch.hvm.vmx.tertiary_exec_control); + /* MSR access bitmap. */ if ( cpu_has_vmx_msr_bitmap ) { @@ -2068,10 +2111,12 @@ void vmcs_dump_vcpu(struct vcpu *v) vmr(HOST_PERF_GLOBAL_CTRL)); printk("*** Control State ***\n"); - printk("PinBased=%08x CPUBased=%08x SecondaryExec=%08x\n", + printk("PinBased=%08x CPUBased=%08x\n", vmr32(PIN_BASED_VM_EXEC_CONTROL), - vmr32(CPU_BASED_VM_EXEC_CONTROL), - vmr32(SECONDARY_VM_EXEC_CONTROL)); + vmr32(CPU_BASED_VM_EXEC_CONTROL)); + printk("SecondaryExec=%08x TertiaryExec=%016lx\n", + vmr32(SECONDARY_VM_EXEC_CONTROL), + vmr(TERTIARY_VM_EXEC_CONTROL)); printk("EntryControls=%08x ExitControls=%08x\n", vmentry_ctl, vmexit_ctl); printk("ExceptionBitmap=%08x PFECmask=%08x PFECmatch=%08x\n", vmr32(EXCEPTION_BITMAP), @@ -2174,6 +2219,7 @@ int __init vmx_vmcs_init(void) vmx_pin_based_exec_control = 0; vmx_cpu_based_exec_control = 0; vmx_secondary_exec_control = 0; + vmx_tertiary_exec_control = 0; vmx_vmexit_control = 0; vmx_vmentry_control = 0; vmx_ept_vpid_cap = 0; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 1500dca603..48376cc327 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -760,6 +760,12 @@ void vmx_update_secondary_exec_control(struct vcpu *v) v->arch.hvm.vmx.secondary_exec_control); } +void vmx_update_tertiary_exec_control(const struct vcpu *v) +{ + __vmwrite(TERTIARY_VM_EXEC_CONTROL, + v->arch.hvm.vmx.tertiary_exec_control); +} + void vmx_update_exception_bitmap(struct vcpu *v) { u32 bitmap = unlikely(v->arch.hvm.vmx.vmx_realmode) diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h index 5ec474c79c..a7dd2eeffc 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h @@ -114,6 +114,7 @@ struct vmx_vcpu { /* Cache of cpu execution control. */ u32 exec_control; u32 secondary_exec_control; + uint64_t tertiary_exec_control; u32 exception_bitmap; uint64_t shadow_gs; @@ -196,6 +197,7 @@ void vmx_vmcs_reload(struct vcpu *v); #define CPU_BASED_RDTSC_EXITING 0x00001000U #define CPU_BASED_CR3_LOAD_EXITING 0x00008000U #define CPU_BASED_CR3_STORE_EXITING 0x00010000U +#define CPU_BASED_ACTIVATE_TERTIARY_CONTROLS 0x00020000U #define CPU_BASED_CR8_LOAD_EXITING 0x00080000U #define CPU_BASED_CR8_STORE_EXITING 0x00100000U #define CPU_BASED_TPR_SHADOW 0x00200000U @@ -260,6 +262,14 @@ extern u32 vmx_vmentry_control; #define SECONDARY_EXEC_NOTIFY_VM_EXITING 0x80000000U extern u32 vmx_secondary_exec_control; +#define TERTIARY_EXEC_LOADIWKEY_EXITING BIT(0, UL) +#define TERTIARY_EXEC_ENABLE_HLAT BIT(1, UL) +#define TERTIARY_EXEC_EPT_PAGING_WRITE BIT(2, UL) +#define TERTIARY_EXEC_GUEST_PAGING_VERIFY BIT(3, UL) +#define TERTIARY_EXEC_IPI_VIRT BIT(4, UL) +#define TERTIARY_EXEC_VIRT_SPEC_CTRL BIT(7, UL) +extern uint64_t vmx_tertiary_exec_control; + #define VMX_EPT_EXEC_ONLY_SUPPORTED 0x00000001 #define VMX_EPT_WALK_LENGTH_4_SUPPORTED 0x00000040 #define VMX_EPT_MEMORY_TYPE_UC 0x00000100 @@ -296,6 +306,8 @@ extern u64 vmx_ept_vpid_cap; (vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_MSR_BITMAP) #define cpu_has_vmx_secondary_exec_control \ (vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) +#define cpu_has_vmx_tertiary_exec_control \ + (vmx_cpu_based_exec_control & CPU_BASED_ACTIVATE_TERTIARY_CONTROLS) #define cpu_has_vmx_ept \ (vmx_secondary_exec_control & SECONDARY_EXEC_ENABLE_EPT) #define cpu_has_vmx_dt_exiting \ @@ -423,6 +435,7 @@ enum vmcs_field { VIRT_EXCEPTION_INFO = 0x0000202a, XSS_EXIT_BITMAP = 0x0000202c, TSC_MULTIPLIER = 0x00002032, + TERTIARY_VM_EXEC_CONTROL = 0x00002034, GUEST_PHYSICAL_ADDRESS = 0x00002400, VMCS_LINK_POINTER = 0x00002800, GUEST_IA32_DEBUGCTL = 0x00002802, diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index 31643ed481..8ffab7d94c 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -81,6 +81,7 @@ void vmx_realmode(struct cpu_user_regs *regs); void vmx_update_exception_bitmap(struct vcpu *v); void vmx_update_cpu_exec_control(struct vcpu *v); void vmx_update_secondary_exec_control(struct vcpu *v); +void vmx_update_tertiary_exec_control(const struct vcpu *v); #define POSTED_INTR_ON 0 #define POSTED_INTR_SN 1 diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h index 492699c1b4..fc82afc246 100644 --- a/xen/arch/x86/include/asm/msr-index.h +++ b/xen/arch/x86/include/asm/msr-index.h @@ -347,6 +347,7 @@ #define MSR_IA32_VMX_TRUE_EXIT_CTLS 0x48f #define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x490 #define MSR_IA32_VMX_VMFUNC 0x491 +#define MSR_IA32_VMX_PROCBASED_CTLS3 0x492 /* K7/K8 MSRs. Not complete. See the architecture manual for a more complete list. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Feb 08 11:33:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Feb 2024 11:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678140.1055201 (Exim 4.92) (envelope-from ) id 1rY2eY-0007jU-5N; Thu, 08 Feb 2024 11:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678140.1055201; Thu, 08 Feb 2024 11:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rY2eY-0007jM-2f; Thu, 08 Feb 2024 11:33:14 +0000 Received: by outflank-mailman (input) for mailman id 678140; Thu, 08 Feb 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 1rY2eW-0007j6-6g for xen-changelog@lists.xenproject.org; Thu, 08 Feb 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 1rY2eW-00057I-5x for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 11:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rY2eW-0003YV-2g for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 11: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=BTtC2LW/o5HIeorEF2BReS7iQrSk7JppusmU9J9FskI=; b=dfZufzr57R/Nkv8CcfHOH34yQM XTc+Q3DyLDghMxxnUtRBjKiOwSuHmAsPvT/yMMf1+94meNtE6IbzWp6GMH+r9k1n8nzF4/EDicr55 U673+kof5ZNOSQ1I9hAg5LQuqTItk0H/XIdLy7Km4JuQt7P9We8ttIW7WGfmoCyMm/SY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] block-common: Fix same_vm for no targets Message-Id: Date: Thu, 08 Feb 2024 11:33:12 +0000 commit e8f1bb803fdf44db708991593568a9e3e6b3d130 Author: Jason Andryuk AuthorDate: Wed Feb 7 13:46:52 2024 +0100 Commit: Jan Beulich CommitDate: Wed Feb 7 13:46:52 2024 +0100 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 --- 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#master From xen-changelog-bounces@lists.xenproject.org Thu Feb 08 11:33:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Feb 2024 11:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678141.1055205 (Exim 4.92) (envelope-from ) id 1rY2ei-0007no-76; Thu, 08 Feb 2024 11:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678141.1055205; Thu, 08 Feb 2024 11:33:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rY2ei-0007ng-4D; Thu, 08 Feb 2024 11:33:24 +0000 Received: by outflank-mailman (input) for mailman id 678141; Thu, 08 Feb 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 1rY2eg-0007nI-AJ for xen-changelog@lists.xenproject.org; Thu, 08 Feb 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 1rY2eg-00057d-9Y for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 11:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rY2eg-0003Z2-85 for xen-changelog@lists.xenproject.org; Thu, 08 Feb 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=SFKCQM9iyThnp0PRwBTUIpnm7pS1RWWqX7CO7CFaiU0=; b=ewRpx5puLEgqOjdg2oVdwgpiR3 F8BIF9dH5RFGLxfymxU9dmI4/xWDHngdzePXyuXOlxwArow5L3YIGysQGyNOCJ8QfV+7OjXJI+un8 ZH3fKG/wvX8aGNakN118wospo81oBgiyzoJUY+k63sNDkleYryIWhACJSl1VzS+/CipA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/ns16550: address violations of MISRA C:2012 Rule 13.1 Message-Id: Date: Thu, 08 Feb 2024 11:33:22 +0000 commit 38ae4739d87c1025ad5d3b9282048b5311b8ef38 Author: Simone Ballarin AuthorDate: Wed Feb 7 13:47:32 2024 +0100 Commit: Jan Beulich CommitDate: Wed Feb 7 13:47:32 2024 +0100 xen/ns16550: address violations of MISRA C:2012 Rule 13.1 Rule 13.1: Initializer lists shall not contain persistent side effects The assignment operation in: .irq = rc = uart->irq, is a persistent side effect in a struct initializer list. This patch assigns rc separately outside the structure. No functional change. Signed-off-by: Simone Ballarin Signed-off-by: Maria Celeste Cesario Acked-by: Jan Beulich --- xen/drivers/char/ns16550.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index afe3d514b9..97bf098534 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -441,10 +441,12 @@ static void __init cf_check ns16550_init_postirq(struct serial_port *port) struct msi_info msi = { .sbdf = PCI_SBDF(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2]), - .irq = rc = uart->irq, + .irq = uart->irq, .entry_nr = 1 }; + rc = uart->irq; + if ( rc > 0 ) { struct msi_desc *msi_desc = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Feb 08 11:33:34 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Feb 2024 11:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678142.1055209 (Exim 4.92) (envelope-from ) id 1rY2es-0007vN-94; Thu, 08 Feb 2024 11:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678142.1055209; Thu, 08 Feb 2024 11:33:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rY2es-0007vG-5k; Thu, 08 Feb 2024 11:33:34 +0000 Received: by outflank-mailman (input) for mailman id 678142; Thu, 08 Feb 2024 11:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rY2eq-0007uw-DO for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 11:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rY2eq-00057n-Ca for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 11:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rY2eq-0003ZR-Bl for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 11: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=R/R6jjmV92ShtKrGsPI4koexeXw1WgsZdl44IPoioy0=; b=YBEn+3LNq40sjtSMEvRYb4T4b7 jZQeLPBSY0VBL3ckvi0SK+o2GWOOCe5hmjAZKhw+hbjBoGPWISjBMpJQVwkw2pBuQAA21OR0RJa20 aKMItV3/hBgfQA6lf3kMi54eSqsNX74nyybRHVymilt0vMO+x+XcfdwG7NHyEga1xof4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] eclair: move function and macro properties outside ECLAIR Message-Id: Date: Thu, 08 Feb 2024 11:33:32 +0000 commit f4519ee87ebfb74fe0451130d82c99453b75e2e1 Author: Maria Celeste Cesario AuthorDate: Wed Feb 7 13:49:12 2024 +0100 Commit: Jan Beulich CommitDate: Wed Feb 7 13:49:12 2024 +0100 eclair: move function and macro properties outside ECLAIR Function and macro properties contained in ECLAIR/call_properties.ecl are of general interest: this patch moves these annotations in a generaric JSON file in docs. In this way, they can be exploited for other purposes (i.e. documentation, other tools). Add rst file containing explanation on how to update function_macro_properties.json. Add script to convert the JSON file in ECL configurations. Remove ECLAIR/call_properties.ecl: the file is now automatically generated from the JSON file. Signed-off-by: Maria Celeste Cesario Signed-off-by: Simone Ballarin Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/analysis.ecl | 1 + .../eclair_analysis/ECLAIR/call_properties.ecl | 128 ---- automation/eclair_analysis/prepare.sh | 2 + automation/eclair_analysis/propertyparser.py | 37 + docs/function_macro_properties.json | 841 +++++++++++++++++++++ docs/function_macro_properties.rst | 58 ++ 6 files changed, 939 insertions(+), 128 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index a604582da3..684c5b0b39 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -30,6 +30,7 @@ if(not(scheduled_analysis), -eval_file=deviations.ecl -eval_file=call_properties.ecl -eval_file=tagging.ecl +-eval_file=properties.ecl -eval_file=concat(set,".ecl") -doc="Hide reports in external code." diff --git a/automation/eclair_analysis/ECLAIR/call_properties.ecl b/automation/eclair_analysis/ECLAIR/call_properties.ecl deleted file mode 100644 index c2b2a6182e..0000000000 --- a/automation/eclair_analysis/ECLAIR/call_properties.ecl +++ /dev/null @@ -1,128 +0,0 @@ - --call_properties+={"name(printk)", {"pointee_write(1..=never)", "taken()"}} --call_properties+={"name(debugtrace_printk)", {"pointee_write(1..=never)", "taken()"}} --call_properties+={"name(panic)", {"pointee_write(1..=never)", "taken()"}} --call_properties+={"macro(^domain_crash$)", {"pointee_write(2..=never)", "taken()"}} --call_properties+={"macro(^(g?d|mm_)?printk$)", {"pointee_write(2..=never)", "taken()"}} --call_properties+={"macro(^guest_bug_on_failed$)", {"pointee_write(1=never)", "taken()"}} --call_properties+={"macro(^spin_lock_init_prof$)", {"pointee_write(2=never)", "taken()"}} --call_properties+={"macro(^sched_test_func$)", {"pointee_write(1..=never)", "taken()"}} --call_properties+={"macro(^dev_(info|warn)$)", {"pointee_write(1..=never)", "taken()"}} --call_properties+={"macro(^PAGING_DEBUG$)", {"pointee_write(1..=never)", "taken()"}} --call_properties+={"macro(^ACPI_(WARNING|ERROR|INFO)$)", {"pointee_write(1..=never)", "taken()"}} --call_properties+={"name(fdt_get_property_by_offset_)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(read_atomic_size)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(device_tree_get_reg)", {"pointee_write(4..=always)", "pointee_read(4..=never)", "taken()"}} --call_properties+={"name(dt_get_range)", {"pointee_write(3..=always)", "pointee_read(3..=never)", "taken()"}} --call_properties+={"name(parse_static_mem_prop)", {"pointee_write(2..=always)", "pointee_read(2..=never)", "taken()"}} --call_properties+={"name(get_ttbr_and_gran_64bit)", {"pointee_write(1..2=always)", "pointee_read(1..2=never)", "taken()"}} --call_properties+={"name(hvm_emulate_init_once)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(__vmread)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(hvm_pci_decode_addr)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(vpci_mmcfg_decode_addr)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(x86emul_decode)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(unmap_grant_ref)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(arm_smmu_cmdq_build_cmd)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(pci_size_mem_bar)", {"pointee_write(4=always)", "pointee_read(4=never)", "taken()"}} --call_properties+={"name(_hvm_read_entry)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(hvm_map_guest_frame_rw)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(guest_cpuid)", {"pointee_write(4=always)", "pointee_read(4=never)", "taken()"}} --call_properties+={"name(epte_get_entry_emt)", {"pointee_write(5=always)", "pointee_read(5=never)", "taken()"}} --call_properties+={"name(mcheck_mca_logout)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(set_field_in_reg_u32)", {"pointee_write(5=always)", "pointee_read(5=never)", "taken()"}} --call_properties+={"name(alloc_affinity_masks)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(xasprintf)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(find_non_smt)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(call_rcu)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(getdomaininfo)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"^MAPPING_(INSERT|SEARCH)\\(.*$", {"pointee_write(2..=always)", "pointee_read(2..=never)", "taken()"}} --call_properties+={"name(FormatDec)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(FormatHex)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(p2m_get_ioreq_server)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(elf_memset_unchecked)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(set_iommu_pte_present)", {"pointee_write(7=always)", "pointee_read(7=never)", "taken()"}} --call_properties+={"name(clear_iommu_pte_present)", {"pointee_write(4=always)", "pointee_read(4=never)", "taken()"}} --call_properties+={"name(vcpu_runstate_get)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(va_start)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(sgi_target_init)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(get_hw_residencies)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(x86_cpu_policy_to_featureset)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"^simple_strtou?ll?\\(.*$", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(msi_compose_msg)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(print_tainted)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(get_hvm_registers)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(x86_insn_modrm)", {"pointee_write(2..3=always)", "pointee_read(2..3=never)", "taken()"}} --call_properties+={"name(cpuid_count_leaf)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --call_properties+={"name(rcu_lock_remote_domain_by_id)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(cpuid_count)", {"pointee_write(3..=always)", "pointee_read(3..=never)", "taken()"}} --call_properties+={"name(efi_boot_mem_unused)", {"pointee_write(1..=always)", "pointee_read(1..=never)", "taken()"}} --call_properties+={"name(collect_time_info)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --call_properties+={"name(setup_xstate_comp)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"name(map_domain_gfn)", {"pointee_read(5=never)", "taken()"}} --call_properties+={"name(fdt_getprop)", {"pointee_read(4=never)", "taken()"}} --call_properties+={"name(fdt_get_name)", {"pointee_read(3=never)", "taken()"}} --call_properties+={"name(fdt_get_property)", {"pointee_read(4=never)", "taken()"}} --call_properties+={"name(pci_get_host_bridge_segment)", {"pointee_read(2=never)", "taken()"}} --call_properties+={"name(dt_get_property)", {"pointee_read(3=never)", "taken()"}} --call_properties+={"name(dt_property_read_u32)", {"pointee_read(3=never)", "taken()"}} --call_properties+={"name(dt_device_get_paddr)", {"pointee_read(3..4=never)", "taken()"}} --call_properties+={"name(get_evtchn_dt_property)", {"pointee_write(2..3=maybe)", "pointee_read(2..3=never)", "taken()"}} --call_properties+={"name(setup_chosen_node)", {"pointee_write(2..3=maybe)", "pointee_read(2..3=never)", "taken()"}} --call_properties+={"name(queue_remove_raw)", {"pointee_read(2=never)", "taken()"}} --call_properties+={"macro(^memset$)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"macro(^va_start$)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"macro(^memcmp$)", {"pointee_write(1..2=never)", "taken()"}} --call_properties+={"macro(^memcpy$)", {"pointee_write(1=always&&2..=never)", "pointee_read(1=never&&2..=always)", "taken()"}} --call_properties+={"name(get_cpu_info)",{pure}} --call_properties+={"name(pdx_to_pfn)",{pure}} --call_properties+={"name(is_pci_passthrough_enabled)",{const}} --call_properties+={"name(get_cycles)", {"noeffect"}} --call_properties+={"name(msi_gflags)",{const}} --call_properties+={"name(hvm_save_size)",{pure}} --call_properties+={"name(cpu_has)",{pure}} --call_properties+={"name(boot_cpu_has)",{pure}} --call_properties+={"name(get_cpu_info)",{pure}} --call_properties+={"name(put_pte_flags)",{const}} --call_properties+={"name(is_pv_vcpu)",{pure}} - --doc_begin="Property inferred as a consequence of the semantics of device_tree_get_reg" --call_properties+={"name(acquire_static_memory_bank)", {"pointee_write(4..=always)", "pointee_read(4..=never)", "taken()"}} --doc_end - --doc_begin="Property inferred as a consequence of the semantics of dt_set_cell" --call_properties+={"name(set_interrupt)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --doc_end - --doc_begin="Property inferred as a consequence of the semantics of __p2m_get_mem_access" --call_properties+={"name(p2m_get_mem_access)", {"pointee_write(3=always)", "pointee_read(3=never)", "taken()"}} --doc_end - --doc_begin="This function has alternative definitions with props {write=always,read=never} and {write=never,read=never}" --call_properties+={"name(alloc_cpumask_var)", {"pointee_write(1=maybe)", "pointee_read(1=never)", "taken()"}} --doc_end - --doc_begin="Property inferred as a consequence of the semantics of alloc_cpumask_var" --call_properties+={"name(xenctl_bitmap_to_cpumask)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --doc_end - --doc_begin="The call to bitmap_and causes the pointee of dstp to be always written" --call_properties+={"^cpumask_(and|andnot|clear|copy|complement).*$", {"pointee_write(1=always)", "pointee_read(1=never)" "taken()"}} --call_properties+={"^bitmap_(andnot|complement|fill).*$", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --doc_end - --doc_begin="The .*copy_(to|from).* helpers all have a memcpy-like expectation that the destination is a copy of the source. -Furthermore, their uses do initialize the involved variables as needed by futher uses in the caller." --call_properties+={"macro(^(__)?(raw_)?copy_from_(paddr|guest|compat)(_offset)?$)", {"pointee_write(1=always)", "pointee_read(1=never)", "taken()"}} --call_properties+={"macro(^(__)?copy_to_(guest|compat)(_offset)?$)", {"pointee_write(2=always)", "pointee_read(2=never)", "taken()"}} --doc_end - --doc_begin="Functions generated by build_atomic_read cannot be considered pure -since the input pointer is volatile, but they do not produce any persistent side -effect." --call_properties+={"^read_u(8|16|32|64|int)_atomic.*$", {noeffect}} --doc_end - --doc_begin="Functions generated by TYPE_SAFE are const." --call_properties+={"^(mfn|gfn|pfn)_x\\(.*$",{const}} --call_properties+={"^_(mfn|gfn|pfn)\\(.*$",{const}} --doc_end diff --git a/automation/eclair_analysis/prepare.sh b/automation/eclair_analysis/prepare.sh index fe9d16e48e..47b2a2f32a 100755 --- a/automation/eclair_analysis/prepare.sh +++ b/automation/eclair_analysis/prepare.sh @@ -43,4 +43,6 @@ fi make -f "${script_dir}/Makefile.prepare" prepare # Translate the /* SAF-n-safe */ comments into ECLAIR CBTs scripts/xen-analysis.py --run-eclair --no-build --no-clean + # Translate function-properties.json into ECLAIR properties + python3 ${script_dir}/propertyparser.py ) diff --git a/automation/eclair_analysis/propertyparser.py b/automation/eclair_analysis/propertyparser.py new file mode 100644 index 0000000000..0d02f505a6 --- /dev/null +++ b/automation/eclair_analysis/propertyparser.py @@ -0,0 +1,37 @@ +import json +import os + +script_dir = os.path.dirname(__file__) +properties_path = os.path.join(script_dir, "../../docs/function_macro_properties.json") +output_path = os.path.join(script_dir, "ECLAIR/call_properties.ecl") + +with open(properties_path) as fp: + properties = json.load(fp)['content'] + +ecl = open(output_path, 'w') + +for record in properties: + + string = "-call_properties+={\"" + if record['type'] == "function": + string += f"{record['value']}\", {{".replace("\\", "\\\\") + else: + string += f"{record['type']}({record['value']})\", {{".replace("\\", "\\\\") + + i=0 + for prop in record['properties'].items(): + if prop[0] == 'attribute': + string += prop[1] + i+=1 + else: + string += f"\"{prop[0]}({prop[1]})\"" + i+=1 + + if i Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Feb 2024 13:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678201.1055282 (Exim 4.92) (envelope-from ) id 1rY4hA-0004m2-BD; Thu, 08 Feb 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 678201.1055282; Thu, 08 Feb 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 1rY4hA-0004lv-8i; Thu, 08 Feb 2024 13:44:04 +0000 Received: by outflank-mailman (input) for mailman id 678201; Thu, 08 Feb 2024 13:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rY4h8-0004ln-Es for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 13:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rY4h8-0007NG-61 for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 13:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rY4h8-0001ER-1T for xen-changelog@lists.xenproject.org; Thu, 08 Feb 2024 13:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xku8ODXNSFndZfERRpkI4bBJdAqNi/9Cn4cbjEFkGQc=; b=xN6plv/Bd//fz25nz0SlXNinOY FnP8AOGxrnUgCxyvoIhnqAwg0nHr0jsBj+Q3OLm9vXpQk9L+38PrzdTa8TaVka8vYgVQvnaM4M3mM H2O8NvaiKa8PMuMUHrFEzRzCkOmIn4ckGD6jvwQ/foQJbGS81yzhQTRGrOXafyeOnBac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] Mini-OS: fix 9pfront fix Message-Id: Date: Thu, 08 Feb 2024 13:44:02 +0000 commit 2bc8dbb9b6111113d27455cbca318ea337309c04 Author: Juergen Gross AuthorDate: Thu Feb 8 14:43:13 2024 +0100 Commit: Jan Beulich CommitDate: Thu Feb 8 14:43:13 2024 +0100 Mini-OS: fix 9pfront fix There was a typo in the recent 9pfront fix. Fixes: b119f0178fd8 ("Mini-OS: fix 9pfs frontend error path") Reported-by: Julien Grall Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- 9pfront.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9pfront.c b/9pfront.c index 042879a..1741d60 100644 --- a/9pfront.c +++ b/9pfront.c @@ -729,7 +729,7 @@ static int p9_stat(struct dev_9pfs *dev, uint32_t fid, struct p9_stat *stat) ret = req->result; if ( ret ) - free_stat(&stat); + free_stat(stat); put_free_req(dev, req); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Fri Feb 09 11:55:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Feb 2024 11:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678664.1056140 (Exim 4.92) (envelope-from ) id 1rYPTD-0005cS-9R; Fri, 09 Feb 2024 11:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678664.1056140; Fri, 09 Feb 2024 11: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 1rYPTD-0005cL-6u; Fri, 09 Feb 2024 11:55:03 +0000 Received: by outflank-mailman (input) for mailman id 678664; Fri, 09 Feb 2024 11:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYPTC-0005ao-2S for xen-changelog@lists.xenproject.org; Fri, 09 Feb 2024 11:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYPTB-00023o-Sc for xen-changelog@lists.xenproject.org; Fri, 09 Feb 2024 11:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rYPTB-0006vl-Ra for xen-changelog@lists.xenproject.org; Fri, 09 Feb 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=FC/ZvR4jzf4uj+AO9MLO1L6g9wXJ9In10Mgw9iF4mrc=; b=28MqX9oa1GQ3IPQ+Yurl5B+5WT gJGb11URVDGBJ4PLg+4iylmoTYuIHq986NcWNESKrsPwUBrkOK/R3sz8WrHICIesLXzqqhl2jRdWM FcSiRGPQZjMySRrE7DbMDI7j8luXuzm2UGRrFEEufOKghO7ypOXiRv0OS52gPtR9WUmk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Fix UBSAN failure in start_xen() Message-Id: Date: Fri, 09 Feb 2024 11:55:01 +0000 commit e11f5766503c0ff074b4e0f888bbfc931518a169 Author: Michal Orzel AuthorDate: Thu Feb 8 11:43:39 2024 +0100 Commit: Julien Grall CommitDate: Thu Feb 8 16:09:51 2024 +0000 xen/arm: Fix UBSAN failure in start_xen() When running Xen on arm32, in scenario where Xen is loaded at an address such as boot_phys_offset >= 2GB, UBSAN reports the following: (XEN) UBSAN: Undefined behaviour in arch/arm/setup.c:739:58 (XEN) pointer operation underflowed 00200000 to 86800000 (XEN) Xen WARN at common/ubsan/ubsan.c:172 (XEN) ----[ Xen-4.19-unstable arm32 debug=y ubsan=y Not tainted ]---- ... (XEN) Xen call trace: (XEN) [<0031b4c0>] ubsan.c#ubsan_epilogue+0x18/0xf0 (PC) (XEN) [<0031d134>] __ubsan_handle_pointer_overflow+0xb8/0xd4 (LR) (XEN) [<0031d134>] __ubsan_handle_pointer_overflow+0xb8/0xd4 (XEN) [<004d15a8>] start_xen+0xe0/0xbe0 (XEN) [<0020007c>] head.o#primary_switched+0x4/0x30 The failure is reported for the following line: (paddr_t)(uintptr_t)(_start + boot_phys_offset) This occurs because the compiler treats (ptr + size) with size bigger than PTRDIFF_MAX as undefined behavior. To address this, switch to macro virt_to_maddr(), given the future plans to eliminate boot_phys_offset. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Tested-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 7e28f62d09..424744ad5e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -736,7 +736,7 @@ void asmlinkage __init start_xen(unsigned long boot_phys_offset, /* Register Xen's load address as a boot module. */ xen_bootmodule = add_boot_module(BOOTMOD_XEN, - (paddr_t)(uintptr_t)(_start + boot_phys_offset), + virt_to_maddr(_start), (paddr_t)(uintptr_t)(_end - _start), false); BUG_ON(!xen_bootmodule); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 10 02:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Feb 2024 02:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678897.1056478 (Exim 4.92) (envelope-from ) id 1rYdLh-0003Yr-IP; Sat, 10 Feb 2024 02:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678897.1056478; Sat, 10 Feb 2024 02: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 1rYdLh-0003Yj-FT; Sat, 10 Feb 2024 02:44:13 +0000 Received: by outflank-mailman (input) for mailman id 678897; Sat, 10 Feb 2024 02:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdLg-0003YZ-A2 for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdLg-0004Fr-99 for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rYdLg-0005AM-7p for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02: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=0egh08QC66Sc4+s9x5NRXd6h1TbCcm+o02OKSetrLSI=; b=QDaxbB5LUpsm79MyJCui7FCPpw zacGUPvTr6eEfwN41XcsVMHzUBvJg0uFaJdLWGQM0QAugKw83J445padE3+E5sWX7CCl3Me46KfVE psjyMtKbEjS3CvZkFobCZu+vxUyuIGR87ZYfPFtEDGpZoDwVUev/pSl3UJrlYAw/ULrI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: convert misc assembly function annotations Message-Id: Date: Sat, 10 Feb 2024 02:44:12 +0000 commit 837e5144ac5ee0f93a19e086f73d065833ad70ea Author: Jan Beulich AuthorDate: Fri Feb 9 08:16:50 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 9 08:16:50 2024 +0100 x86: convert misc assembly function annotations Use the generic framework from xen/linkage.h. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/clear_page.S | 7 +++---- xen/arch/x86/copy_page.S | 7 +++---- xen/arch/x86/guest/xen/hypercall_page.S | 6 ++---- xen/arch/x86/indirect-thunk.S | 6 ++---- xen/arch/x86/pv/gpr_switch.S | 13 ++++--------- 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S index 5b5622cc52..d6c076f1d8 100644 --- a/xen/arch/x86/clear_page.S +++ b/xen/arch/x86/clear_page.S @@ -1,8 +1,9 @@ .file __FILE__ +#include #include -ENTRY(clear_page_sse2) +FUNC(clear_page_sse2) mov $PAGE_SIZE/32, %ecx xor %eax,%eax @@ -16,6 +17,4 @@ ENTRY(clear_page_sse2) sfence ret - - .type clear_page_sse2, @function - .size clear_page_sse2, . - clear_page_sse2 +END(clear_page_sse2) diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S index ddb6e0ebbb..c3c436545b 100644 --- a/xen/arch/x86/copy_page.S +++ b/xen/arch/x86/copy_page.S @@ -1,5 +1,6 @@ .file __FILE__ +#include #include #define src_reg %rsi @@ -10,7 +11,7 @@ #define tmp3_reg %r10 #define tmp4_reg %r11 -ENTRY(copy_page_sse2) +FUNC(copy_page_sse2) mov $PAGE_SIZE/(4*WORD_SIZE)-3, %ecx prefetchnta 2*4*WORD_SIZE(src_reg) @@ -41,6 +42,4 @@ ENTRY(copy_page_sse2) sfence ret - - .type copy_page_sse2, @function - .size copy_page_sse2, . - copy_page_sse2 +END(copy_page_sse2) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S index 9958d02cfd..7ab55fc1f6 100644 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ b/xen/arch/x86/guest/xen/hypercall_page.S @@ -3,13 +3,11 @@ #include .section ".text.page_aligned", "ax", @progbits - .p2align PAGE_SHIFT -GLOBAL(hypercall_page) +DATA(hypercall_page, PAGE_SIZE) /* Poisoned with `ret` for safety before hypercalls are set up. */ .fill PAGE_SIZE, 1, 0xc3 - .type hypercall_page, STT_OBJECT - .size hypercall_page, PAGE_SIZE +END(hypercall_page) /* * Identify a specific hypercall in the hypercall page diff --git a/xen/arch/x86/indirect-thunk.S b/xen/arch/x86/indirect-thunk.S index de6aef6068..fd5493c22b 100644 --- a/xen/arch/x86/indirect-thunk.S +++ b/xen/arch/x86/indirect-thunk.S @@ -35,15 +35,13 @@ .macro GEN_INDIRECT_THUNK reg:req .section .text.__x86_indirect_thunk_\reg, "ax", @progbits -ENTRY(__x86_indirect_thunk_\reg) +FUNC(__x86_indirect_thunk_\reg) ALTERNATIVE_2 __stringify(IND_THUNK_RETPOLINE \reg), \ __stringify(IND_THUNK_LFENCE \reg), X86_FEATURE_IND_THUNK_LFENCE, \ __stringify(IND_THUNK_JMP \reg), X86_FEATURE_IND_THUNK_JMP int3 /* Halt straight-line speculation */ - - .size __x86_indirect_thunk_\reg, . - __x86_indirect_thunk_\reg - .type __x86_indirect_thunk_\reg, @function +END(__x86_indirect_thunk_\reg) .endm /* Instantiate GEN_INDIRECT_THUNK for each register except %rsp. */ diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index e7f5bfcd2d..5409ad3b14 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -10,7 +10,7 @@ #include /* Load guest GPRs. Parameter in %rdi, clobbers all registers. */ -ENTRY(load_guest_gprs) +FUNC(load_guest_gprs) movq UREGS_rdx(%rdi), %rdx movq UREGS_rax(%rdi), %rax movq UREGS_rbx(%rdi), %rbx @@ -27,13 +27,10 @@ ENTRY(load_guest_gprs) movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi ret - - .size load_guest_gprs, . - load_guest_gprs - .type load_guest_gprs, STT_FUNC - +END(load_guest_gprs) /* Save guest GPRs. Parameter on the stack above the return address. */ -ENTRY(save_guest_gprs) +FUNC(save_guest_gprs) pushq %rdi movq 2*8(%rsp), %rdi movq %rax, UREGS_rax(%rdi) @@ -52,6 +49,4 @@ ENTRY(save_guest_gprs) movq %rdx, UREGS_rdx(%rdi) movq %rcx, UREGS_rcx(%rdi) ret - - .size save_guest_gprs, . - save_guest_gprs - .type save_guest_gprs, STT_FUNC +END(save_guest_gprs) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 10 02:44:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Feb 2024 02:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678896.1056474 (Exim 4.92) (envelope-from ) id 1rYdLY-0003XR-Gq; Sat, 10 Feb 2024 02:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678896.1056474; Sat, 10 Feb 2024 02: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 1rYdLY-0003XJ-Dw; Sat, 10 Feb 2024 02:44:04 +0000 Received: by outflank-mailman (input) for mailman id 678896; Sat, 10 Feb 2024 02:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdLW-0003XD-CK for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdLW-0004FV-5k for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rYdLW-00059i-4E for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02: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=lCf2wfD0pQIOZ/FzOsWfZEtgJkeFvYeQ8x1z16Hy/14=; b=H4I/IIWlUr26wHMGsb6TVfWFps fVYDv6s7Vst+CCdv6l0bjyT8zUgYmtxyWu2E0QF+5n//5m0GvtRWRg9HjLWbALEDRHqZrc8c6Ksxn fD13QBiqHQ9gW6WdL6ZPytUh5HFMMWN9hPCHXoiDWgkSTjP5TbABAYs5JdqmnMEr6Tmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] SVM: convert entry point annotations Message-Id: Date: Sat, 10 Feb 2024 02:44:02 +0000 commit 00ae55ad76d30c7159eee4e1be974a32f2dbea08 Author: Jan Beulich AuthorDate: Fri Feb 9 08:16:09 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 9 08:16:09 2024 +0100 SVM: convert entry point annotations Use the generic framework from xen/linkage.h. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/hvm/svm/entry.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S index c52528fed4..60b0b00ed0 100644 --- a/xen/arch/x86/hvm/svm/entry.S +++ b/xen/arch/x86/hvm/svm/entry.S @@ -24,7 +24,7 @@ #include #include -ENTRY(svm_asm_do_resume) +FUNC(svm_asm_do_resume) GET_CURRENT(bx) .Lsvm_do_resume: call svm_intr_assist @@ -132,7 +132,7 @@ __UNLIKELY_END(nsvm_hap) * to safely resolve any Spectre-v1 concerns in the above logic. */ stgi -GLOBAL(svm_stgi_label) +LABEL(svm_stgi_label, 0) call svm_vmexit_handler jmp .Lsvm_do_resume @@ -140,6 +140,4 @@ GLOBAL(svm_stgi_label) sti call do_softirq jmp .Lsvm_do_resume - - .type svm_asm_do_resume, @function - .size svm_asm_do_resume, . - svm_asm_do_resume +END(svm_asm_do_resume) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 10 02:44:23 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Feb 2024 02:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678898.1056482 (Exim 4.92) (envelope-from ) id 1rYdLr-0003bL-Jb; Sat, 10 Feb 2024 02:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678898.1056482; Sat, 10 Feb 2024 02: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 1rYdLr-0003bD-Gy; Sat, 10 Feb 2024 02:44:23 +0000 Received: by outflank-mailman (input) for mailman id 678898; Sat, 10 Feb 2024 02:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdLq-0003b3-DP for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdLq-0004G4-CH for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rYdLq-0005B7-BH for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02: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=V9ZbhKJiV7W82j4/VSiWXf6Dz7px46CRxxwVrY8hXoI=; b=m7/dkFOpccbCC4lFEiabhciwp3 z/p6XZU0P9gqgfOV6vWI6jQvAScwle6Kw4KUOEZbUTbAm7KJioLNYg6FX7u/nsELoVIdu90jFCwGS r59v+U4BxiaJhAg0Wnc6dy0JgEbruHCh25oWYy4OwfCKpzU+nxpXW8sZX/9D/RvkCg8g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/ocaml: Add missing vmtrace_buf_kb field Message-Id: Date: Sat, 10 Feb 2024 02:44:22 +0000 commit e36c106b0b0e66c43855cdfdb6d41356c57ec577 Author: Petr Beneš AuthorDate: Fri Feb 9 08:17:24 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 9 08:17:24 2024 +0100 tools/ocaml: Add missing vmtrace_buf_kb field Add the missing `vmtrace_buf_kb` field to the OCaml bindings to match the vm.cfg configuration, correcting an oversight from its initial introduction. Signed-off-by: Petr Beneš Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/ocaml/libs/xc/xenctrl_stubs.c | 13 +++++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index d6c6eb73db..55923857ec 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -85,6 +85,7 @@ type domctl_create_config = max_grant_frames: int; max_maptrack_frames: int; max_grant_version: int; + vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig; } diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 3bfc16edba..9b4b45db3a 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -77,6 +77,7 @@ type domctl_create_config = { max_grant_frames: int; max_maptrack_frames: int; max_grant_version: int; + vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig; } diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 3703f48c74..2b6d3c09df 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -210,10 +210,17 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co #define VAL_MAX_GRANT_FRAMES Field(config, 6) #define VAL_MAX_MAPTRACK_FRAMES Field(config, 7) #define VAL_MAX_GRANT_VERSION Field(config, 8) -#define VAL_CPUPOOL_ID Field(config, 9) -#define VAL_ARCH Field(config, 10) +#define VAL_VMTRACE_BUF_KB Field(config, 9) +#define VAL_CPUPOOL_ID Field(config, 10) +#define VAL_ARCH Field(config, 11) uint32_t domid = Int_val(wanted_domid); + uint64_t vmtrace_size = Int32_val(VAL_VMTRACE_BUF_KB); + + vmtrace_size = ROUNDUP(vmtrace_size << 10, XC_PAGE_SHIFT); + if ( vmtrace_size != (uint32_t)vmtrace_size ) + caml_invalid_argument("vmtrace_buf_kb"); + int result; struct xen_domctl_createdomain cfg = { .ssidref = Int32_val(VAL_SSIDREF), @@ -223,6 +230,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co .max_maptrack_frames = Int_val(VAL_MAX_MAPTRACK_FRAMES), .grant_opts = XEN_DOMCTL_GRANT_version(Int_val(VAL_MAX_GRANT_VERSION)), + .vmtrace_size = vmtrace_size, .cpupool_id = Int32_val(VAL_CPUPOOL_ID), }; @@ -279,6 +287,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co #undef VAL_ARCH #undef VAL_CPUPOOL_ID +#undef VAL_VMTRACE_BUF_KB #undef VAL_MAX_GRANT_VERSION #undef VAL_MAX_MAPTRACK_FRAMES #undef VAL_MAX_GRANT_FRAMES -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 10 02:44:33 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Feb 2024 02:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678899.1056485 (Exim 4.92) (envelope-from ) id 1rYdM1-0003e2-Ko; Sat, 10 Feb 2024 02:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678899.1056485; Sat, 10 Feb 2024 02: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 1rYdM1-0003dv-IQ; Sat, 10 Feb 2024 02:44:33 +0000 Received: by outflank-mailman (input) for mailman id 678899; Sat, 10 Feb 2024 02:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdM0-0003dl-GX for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdM0-0004GI-Ff for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rYdM0-0005Bo-EM for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02: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=I1gCtAw9o/EXUWNNzH98YLUmzwebmYG35pRwGDaUEHA=; b=nrRcFS8BKx3e3MD987xM4aO7JJ NtGYEQ2K1XbDAJfO4zb89F726x/dFr6ZdcdTEeJ46yDerq17qVF4XMmHwA8x9PRDQSiyWQfau0bp/ P3s15evJsCJKJPyFQhQoirBkgjNvOFhSLaOT7qHHOTmulheSN4a3R9az2jnk/tja0uM4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/serial: Drop serial_{put,get}c Message-Id: Date: Sat, 10 Feb 2024 02:44:32 +0000 commit 06024b26191eb6aed9cce77e7134f4159335b1ff Author: Michal Orzel AuthorDate: Fri Feb 9 08:17:39 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 9 08:17:39 2024 +0100 xen/serial: Drop serial_{put,get}c After removal of gdbstub by commit d182f9feae6d ("x86: Remove gdbstub"), we no longer have users of serial_{put,get}c functions, so remove them. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- xen/drivers/char/serial.c | 72 ----------------------------------------------- xen/include/xen/serial.h | 10 ------- 2 files changed, 82 deletions(-) diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 324024c29a..93e217d348 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -196,36 +196,6 @@ static void __serial_putc(struct serial_port *port, char c) } } -void serial_putc(int handle, char c) -{ - struct serial_port *port; - unsigned long flags; - - if ( handle == -1 ) - return; - - port = &com[handle & SERHND_IDX]; - if ( !port->driver || !port->driver->putc ) - return; - - spin_lock_irqsave(&port->tx_lock, flags); - - if ( (c == '\n') && (handle & SERHND_COOKED) ) - __serial_putc(port, '\r' | ((handle & SERHND_HI) ? 0x80 : 0x00)); - - if ( handle & SERHND_HI ) - c |= 0x80; - else if ( handle & SERHND_LO ) - c &= 0x7f; - - __serial_putc(port, c); - - if ( port->driver->flush ) - port->driver->flush(port); - - spin_unlock_irqrestore(&port->tx_lock, flags); -} - void serial_puts(int handle, const char *s, size_t nr) { struct serial_port *port; @@ -261,48 +231,6 @@ void serial_puts(int handle, const char *s, size_t nr) spin_unlock_irqrestore(&port->tx_lock, flags); } -char serial_getc(int handle) -{ - struct serial_port *port; - char c; - unsigned long flags; - - if ( handle == -1 ) - return '\0'; - - port = &com[handle & SERHND_IDX]; - if ( !port->driver || !port->driver->getc ) - return '\0'; - - do { - for ( ; ; ) - { - spin_lock_irqsave(&port->rx_lock, flags); - - if ( port->rxbufp != port->rxbufc ) - { - c = port->rxbuf[mask_serial_rxbuf_idx(port->rxbufc++)]; - spin_unlock_irqrestore(&port->rx_lock, flags); - break; - } - - if ( port->driver->getc(port, &c) ) - { - spin_unlock_irqrestore(&port->rx_lock, flags); - break; - } - - spin_unlock_irqrestore(&port->rx_lock, flags); - - cpu_relax(); - udelay(100); - } - } while ( ((handle & SERHND_LO) && (c & 0x80)) || - ((handle & SERHND_HI) && !(c & 0x80)) ); - - return c & 0x7f; -} - int __init serial_parse_handle(const char *conf) { int handle, flags = 0; diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index 12ef24351d..7548bb7324 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -112,19 +112,9 @@ void serial_endboot(void); /* Takes a config string and creates a numeric handle on the COM port. */ int serial_parse_handle(const char *conf); -/* Transmit a single character via the specified COM port. */ -void serial_putc(int handle, char c); - /* Transmit a string via the specified COM port. */ void serial_puts(int handle, const char *s, size_t nr); -/* - * An alternative to registering a character-receive hook. This function - * will not return until a character is available. It can safely be - * called with interrupts disabled. - */ -char serial_getc(int handle); - /* Forcibly prevent serial lockup when the system is in a bad way. */ /* (NB. This also forces an implicit serial_start_sync()). */ void serial_force_unlock(int handle); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Feb 10 02:44:43 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Feb 2024 02:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.678900.1056489 (Exim 4.92) (envelope-from ) id 1rYdMB-0003gW-MO; Sat, 10 Feb 2024 02:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 678900.1056489; Sat, 10 Feb 2024 02: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 1rYdMB-0003gP-Jt; Sat, 10 Feb 2024 02:44:43 +0000 Received: by outflank-mailman (input) for mailman id 678900; Sat, 10 Feb 2024 02:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdMA-0003gH-K2 for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rYdMA-0004GP-It for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rYdMA-0005CQ-Hq for xen-changelog@lists.xenproject.org; Sat, 10 Feb 2024 02: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=qblI67rXqlOe8dcsaJzKcAZlHThsf+zNEMFtKtb8G0I=; b=1cl1dy9DoC5pF8TcfZuA3Ei9nv LzqR78oBP1aFlv5kAxQ8q6AFV2teb4hIRnC8+mTjRuKz1OOiyU+6IxK+zTA8hDbUBPl283UyX9HZ9 Ca6M4mZgLBmvxEqWzO44QeqPF52xBtzgA83A0PJjT2TXLRXXcL7iK4ZUKzWKYzmysrio=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] config: update Mini-OS commit Message-Id: Date: Sat, 10 Feb 2024 02:44:42 +0000 commit 4e5bd87d24ac2b08f33c6a9c0d530daef99ed369 Author: Juergen Gross AuthorDate: Fri Feb 9 08:18:04 2024 +0100 Commit: Jan Beulich CommitDate: Fri Feb 9 08:18:04 2024 +0100 config: update Mini-OS commit Update the Mini-OS upstream revision. Signed-off-by: Juergen Gross Acked-by: Jan Beulich --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index f7d6d84847..6f6e0425ba 100644 --- a/Config.mk +++ b/Config.mk @@ -224,7 +224,7 @@ QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git QEMU_UPSTREAM_REVISION ?= master MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git -MINIOS_UPSTREAM_REVISION ?= 090eeeb1631f00a9a41ebf66d9b4aacb97eb51e7 +MINIOS_UPSTREAM_REVISION ?= 2bc8dbb9b6111113d27455cbca318ea337309c04 SEABIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/seabios.git SEABIOS_UPSTREAM_REVISION ?= rel-1.16.3 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Feb 13 06:11:12 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Feb 2024 06:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.679746.1057393 (Exim 4.92) (envelope-from ) id 1rZm0W-0005g4-EE; Tue, 13 Feb 2024 06:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 679746.1057393; Tue, 13 Feb 2024 06: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 1rZm0W-0005fx-Bb; Tue, 13 Feb 2024 06:11:04 +0000 Received: by outflank-mailman (input) for mailman id 679746; Tue, 13 Feb 2024 06:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rZm0U-0005fp-BM for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rZm0U-0007Rj-9E for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rZm0U-0007Fy-88 for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06: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=NOHys9yXdoW1DsNwfru8YHc+Z+p8PkzrtChwPNOngk8=; b=VfQ+XMIcDGTF0Q6V9hzazpEl+9 7TJkb+BoXEtA+j/51jppOc7MD1xlYxIftseBb33SMGOh88t4aBcQS2aMEnCRV9VP2l3P0MmLMNVJl 6LD9BakW8HvsZM8HcmSh5/0IycNjvVug3gvKUPgcMsN5aalqsTO6T5bVMhSlxD8WNu84=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV32: restore PAE-extended-CR3 logic Message-Id: Date: Tue, 13 Feb 2024 06:11:02 +0000 commit a773adedbd913966e812bddcd6b223c2e4ce3061 Author: Jan Beulich AuthorDate: Mon Feb 12 09:37:18 2024 +0100 Commit: Jan Beulich CommitDate: Mon Feb 12 09:37:18 2024 +0100 x86/PV32: restore PAE-extended-CR3 logic While the PAE-extended-CR3 VM assist is a 32-bit only concept, it still applies to guests also when run on a 64-bit hypervisor: The "extended CR3" format has to be used there as well, to fit the address in the only 32-bit wide register there. As a result it was a mistake that the check was never enabled for that case, and was then mistakenly deleted in the course of removal of 32-bit-Xen code (218adf199e68 ["x86: We can assume CONFIG_PAGING_LEVELS==4"]). Similarly during Dom0 construction kernel awareness needs to be taken into account, and respective code was again mistakenly never enabled for 32-bit Dom0 when running on 64-bit Xen (and thus wrongly deleted by 5d1181a5ea5e ["xen: Remove x86_32 build target"]). At the same time restrict enabling of the assist for Dom0 to just the 32-bit case. Furthermore there's no need for an atomic update there. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/mm.c | 17 +++++++++++++++++ xen/arch/x86/pv/dom0_build.c | 11 +++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index b56e0d8065..4d6d7bfe4f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1504,6 +1504,23 @@ static int promote_l3_table(struct page_info *page) unsigned int partial_flags = page->partial_flags; l3_pgentry_t l3e = l3e_empty(); + /* + * PAE pgdirs above 4GB are unacceptable if a 32-bit guest does not + * understand the weird 'extended cr3' format for dealing with high-order + * address bits. We cut some slack for control tools (before vcpu0 is + * initialised). + */ + if ( is_pv_32bit_domain(d) && + unlikely(!VM_ASSIST(d, pae_extended_cr3)) && + mfn_x(l3mfn) >= PFN_DOWN(GB(4)) && + d->vcpu[0] && d->vcpu[0]->is_initialised ) + { + gdprintk(XENLOG_WARNING, + "PAE pgd must be below 4GB (%#lx >= 0x100000)", + mfn_x(l3mfn)); + return -ERANGE; + } + pl3e = map_domain_page(l3mfn); /* diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index 5bbed3a36a..16d08c6796 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -495,12 +495,12 @@ int __init dom0_construct_pv(struct domain *d, nr_pages = dom0_compute_nr_pages(d, &parms, initrd_len); - if ( parms.pae == XEN_PAE_EXTCR3 ) - set_bit(VMASST_TYPE_pae_extended_cr3, &d->vm_assist); - #ifdef CONFIG_PV32 if ( elf_32bit(&elf) ) { + if ( parms.pae == XEN_PAE_EXTCR3 ) + __set_bit(VMASST_TYPE_pae_extended_cr3, &d->vm_assist); + if ( !pv_shim && (parms.virt_hv_start_low != UNSET_ADDR) ) { unsigned long value = ROUNDUP(parms.virt_hv_start_low, @@ -599,7 +599,10 @@ int __init dom0_construct_pv(struct domain *d, vphysmap_start = parms.p2m_base; vphysmap_end = vphysmap_start + nr_pages * sizeof(unsigned long); } - page = alloc_domheap_pages(d, order, MEMF_no_scrub); + page = alloc_domheap_pages(d, order, + MEMF_no_scrub | + (VM_ASSIST(d, pae_extended_cr3) || + !compat ? 0 : MEMF_bits(32))); if ( page == NULL ) panic("Not enough RAM for domain 0 allocation\n"); alloc_spfn = mfn_x(page_to_mfn(page)); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Feb 13 06:11:14 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Feb 2024 06:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.679747.1057398 (Exim 4.92) (envelope-from ) id 1rZm0g-0005hd-Fz; Tue, 13 Feb 2024 06:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 679747.1057398; Tue, 13 Feb 2024 06: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 1rZm0g-0005hV-DD; Tue, 13 Feb 2024 06:11:14 +0000 Received: by outflank-mailman (input) for mailman id 679747; Tue, 13 Feb 2024 06:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rZm0e-0005hB-FB for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rZm0e-0007Rs-Ce for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rZm0e-0007HE-Bi for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06: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=zQUYMy3jRFamlzNN/OYuGV9r5vFfu9+0yjigxbeDqBA=; b=R0Ac2YYtCp/sc4bzSi5sto+T0b hvRAoqvf82i7RH/cVv/weKKqtDTaTSpSHLwsMAWdRboW/d05lNulLSDP+gM/v4h4FQwB0eHGmXTNT Z8yj8hzclwibuq3GZ6Yah4TjCRHJ3Z2/NwrM56/FqE8KtgnrehFyaMBi+nc0TLSSQU+A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Fix fast singlestep state persistence Message-Id: Date: Tue, 13 Feb 2024 06:11:12 +0000 commit 897def94b56175ce569673a05909d2f223e1e749 Author: Petr Beneš AuthorDate: Mon Feb 12 09:37:58 2024 +0100 Commit: Jan Beulich CommitDate: Mon Feb 12 09:37:58 2024 +0100 x86/hvm: Fix fast singlestep state persistence This patch addresses an issue where the fast singlestep setting would persist despite xc_domain_debug_control being called with XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF. Specifically, if fast singlestep was enabled in a VMI session and that session stopped before the MTF trap occurred, the fast singlestep setting remained active even though MTF itself was disabled. This led to a situation where, upon starting a new VMI session, the first event to trigger an EPT violation would cause the corresponding EPT event callback to be skipped due to the lingering fast singlestep setting. The fix ensures that the fast singlestep setting is properly reset when disabling single step debugging operations. Signed-off-by: Petr Beneš Reviewed-by: Tamas K Lengyel --- xen/arch/x86/hvm/hvm.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e8deeb0222..0cb822a41c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5160,26 +5160,40 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) int hvm_debug_op(struct vcpu *v, int32_t op) { - int rc; + int rc = 0; switch ( op ) { case XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON: case XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF: - rc = -EOPNOTSUPP; if ( !cpu_has_monitor_trap_flag ) - break; - rc = 0; - vcpu_pause(v); - v->arch.hvm.single_step = - (op == XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON); - vcpu_unpause(v); /* guest will latch new state */ + return -EOPNOTSUPP; break; default: - rc = -ENOSYS; - break; + return -ENOSYS; + } + + vcpu_pause(v); + + switch ( op ) + { + case XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON: + v->arch.hvm.single_step = true; + break; + + case XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF: + v->arch.hvm.single_step = false; + v->arch.hvm.fast_single_step.enabled = false; + v->arch.hvm.fast_single_step.p2midx = 0; + break; + + default: /* Excluded above */ + ASSERT_UNREACHABLE(); + return -ENOSYS; } + vcpu_unpause(v); /* guest will latch new state */ + return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Feb 13 06:11:24 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Feb 2024 06:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.679748.1057402 (Exim 4.92) (envelope-from ) id 1rZm0q-0005k6-HL; Tue, 13 Feb 2024 06:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 679748.1057402; Tue, 13 Feb 2024 06: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 1rZm0q-0005jy-El; Tue, 13 Feb 2024 06:11:24 +0000 Received: by outflank-mailman (input) for mailman id 679748; Tue, 13 Feb 2024 06:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rZm0o-0005jk-H2 for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rZm0o-0007SG-GC for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1rZm0o-0007IR-En for xen-changelog@lists.xenproject.org; Tue, 13 Feb 2024 06: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=svNnoNTwkbEPF6/RCvX1q7q/w9xgUHTK5mdcyAqvkzw=; b=yc3yUWdQghpU2D3ox/HnBNcMwp qUvEgJ2ECArcCo6Bn40Px1Z19Sw0F/FyCWa5nlfVU08+jFtIo137CS/tcBWxXzZVtyZYGkhpLPudU YfD5cFhn/RYa2IU+MOSirtqgsW3U+t82l8EA0gM8qpsuT8E9qvMvXGUHKwOjn5CyMNJE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] eclair: remove wrongly added -eval_file Message-Id: Date: Tue, 13 Feb 2024 06:11:22 +0000 commit 772380f7547bac7e4c10c9ceff87af3f54151ae5 Author: Simone Ballarin AuthorDate: Mon Feb 12 09:38:22 2024 +0100 Commit: Jan Beulich CommitDate: Mon Feb 12 09:38:22 2024 +0100 eclair: remove wrongly added -eval_file properties.ecl does not exist and it is not even generated by propertyparser.py. Loading this file causes empty ECLAIR analysis. Fixes: f4519ee8 ("eclair: move function and macro properties outside ECLAIR") Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/analysis.ecl | 1 - 1 file changed, 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/analysis.ecl b/automation/eclair_analysis/ECLAIR/analysis.ecl index 684c5b0b39..a604582da3 100644 --- a/automation/eclair_analysis/ECLAIR/analysis.ecl +++ b/automation/eclair_analysis/ECLAIR/analysis.ecl @@ -30,7 +30,6 @@ if(not(scheduled_analysis), -eval_file=deviations.ecl -eval_file=call_properties.ecl -eval_file=tagging.ecl --eval_file=properties.ecl -eval_file=concat(set,".ecl") -doc="Hide reports in external code." -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 14 08:22:10 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Feb 2024 08:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.680235.1058187 (Exim 4.92) (envelope-from ) id 1raAWp-0007TV-RB; Wed, 14 Feb 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 680235.1058187; Wed, 14 Feb 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 1raAWp-0007TN-Oa; Wed, 14 Feb 2024 08:22:03 +0000 Received: by outflank-mailman (input) for mailman id 680235; Wed, 14 Feb 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 1raAWo-0007TG-Il for xen-changelog@lists.xenproject.org; Wed, 14 Feb 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 1raAWo-0005vg-HX for xen-changelog@lists.xenproject.org; Wed, 14 Feb 2024 08:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1raAWo-0003I3-Eh for xen-changelog@lists.xenproject.org; Wed, 14 Feb 2024 08: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=7FxMDzzoUaxMqqXixiFNaSiNZ3iJT18TpEWYmpQ8Gvo=; b=iNdrwUuO6SqxYbQaZpL7BapVK6 qtdCs+dUpirfORwK7Uyp7nM6rCvyrT3YsUOI86x9HxhL6jmfkpEfl5XyO4BPbCMGTK3GIAIlW2eZq CvutP7WS2pGAUONunzpfUxLOuHYYl0eGlFaDEhNJPno8g5uOybDIR8iDfa2cA0k06cZY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: make p2m_get_page_from_gfn() handle grant case correctly Message-Id: Date: Wed, 14 Feb 2024 08:22:02 +0000 commit cbbca7be4aaadbe0a65cd6a7d6a1f7c412d339f4 Author: Jan Beulich AuthorDate: Tue Feb 13 09:27:47 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 13 09:27:47 2024 +0100 x86/p2m: make p2m_get_page_from_gfn() handle grant case correctly The 'fast' path of p2m_get_page_from_gfn handles three cases: normal ram, foreign p2m entries, and grant map entries. For normal ram and grant table entries, get_page() is called, but for foreign entries, page_get_owner_and_reference() is called, since the current domain is expected not to be the owner. Unfortunately, grant maps are *also* generally expected to be owned by foreign domains; so this function will fail for any p2m entry containing a grant map that doesn't happen to be local. Have grant maps take the same path as foreign entries. Since grants may actually be either foreign or local, adjust the assertion to allow for this. Signed-off-by: Jan Beulich Signed-off-by: George Dunlap Reviewed-by: George Dunlap --- xen/arch/x86/mm/p2m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 6eb446e437..d118d27ab9 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -346,11 +346,11 @@ struct page_info *p2m_get_page_from_gfn( && !((q & P2M_UNSHARE) && p2m_is_shared(*t)) ) { page = mfn_to_page(mfn); - if ( unlikely(p2m_is_foreign(*t)) ) + if ( unlikely(p2m_is_foreign(*t)) || unlikely(p2m_is_grant(*t)) ) { struct domain *fdom = page_get_owner_and_reference(page); - ASSERT(fdom != p2m->domain); + ASSERT(!p2m_is_foreign(*t) || fdom != p2m->domain); if ( fdom == NULL ) page = NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Feb 14 08:22:13 2024 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Feb 2024 08:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.680236.1058191 (Exim 4.92) (envelope-from ) id 1raAWz-0007VQ-SV; Wed, 14 Feb 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 680236.1058191; Wed, 14 Feb 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 1raAWz-0007VI-Q1; Wed, 14 Feb 2024 08:22:13 +0000 Received: by outflank-mailman (input) for mailman id 680236; Wed, 14 Feb 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 1raAWy-0007V6-NH for xen-changelog@lists.xenproject.org; Wed, 14 Feb 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 1raAWy-0005vm-MR for xen-changelog@lists.xenproject.org; Wed, 14 Feb 2024 08:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1raAWy-0003JO-K7 for xen-changelog@lists.xenproject.org; Wed, 14 Feb 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=d7BJ1GLMJZaW1QghtwqtY5rEccZRVSgSkQdJHj9bMwU=; b=t+EWsunRPFOavL3ib7ychrSB2V H2qNYaeiDP4S59oZpKhrYHljlWBxcfWFeCgqYJJ7+Jq/pOCSxMPOvKNcTrB8txBu50GIEOs0UkBnh D3fG++lyGYmCSMpqinhLsriYyP2IhujRLyJdRDd5aseLRmjoZ2YNhRqS5wKaohe9KEgM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: Add support for blktap vbd3 Message-Id: Date: Wed, 14 Feb 2024 08:22:12 +0000 commit 6d7d8d2b3e3791c2005589bad0d608c9025a4bc4 Author: Jason Andryuk AuthorDate: Tue Feb 13 09:28:58 2024 +0100 Commit: Jan Beulich CommitDate: Tue Feb 13 09:28:58 2024 +0100 libxl: Add support for blktap vbd3 This patch re-introduces blktap support to libxl. Unlike earlier versions, it does not link against any blktap library. libxl changes are needed to write to the vbd3 backend XenStore nodes. blktap has three components. tapdisk is a daemon implementing the disk IO, NBD (Network Block Device), and Xen PV interfaces. tap-ctl is a tool to control tapdisks - creating, starting, stopping and freeing. tapback manages the XenStore operations and instructs tapdisk to connect. It is notable that tapdisk performs the grant and event channel ops, but doesn't interact with XenStore. tapback performs XenStore operations and notifies tapdisks of values and changes. The flow is: libxl writes to the "vbd3" XenStore nodes and runs the block-tap script. The block-tap script runs tap-ctl to create a tapdisk instance as the physical device. tapback then sees the tapdisk and instructs the tapdisk to connect up the PV blkif interface. This is expected to work without the kernel blktap driver, so the block-tap script is modified accordingly to write the UNIX NBD path. backendtype=tap was not fully removed previously, but it would never succeed since it would hit the hardcoded error in disk_try_backend(). It is reused now. An example command to attach a vhd: xl block-attach vm 'vdev=xvdf,backendtype=tap,format=vhd,target=/srv/target.vhd' Format raw also works to run an "aio:" tapdisk. Signed-off-by: Jason Andryuk Reviewed-by: Anthony PERARD --- docs/man/xl-disk-configuration.5.pod.in | 4 +++- tools/libs/light/libxl_device.c | 14 ++++++++++---- tools/libs/light/libxl_disk.c | 20 +++++++++++++++----- tools/libs/light/libxl_linux.c | 1 + tools/libs/light/libxl_types_internal.idl | 1 + tools/libs/light/libxl_utils.c | 2 ++ 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/docs/man/xl-disk-configuration.5.pod.in b/docs/man/xl-disk-configuration.5.pod.in index bc945cc517..cb442bd5b4 100644 --- a/docs/man/xl-disk-configuration.5.pod.in +++ b/docs/man/xl-disk-configuration.5.pod.in @@ -232,7 +232,7 @@ Specifies the backend implementation to use =item Supported values -phy, qdisk, standalone +phy, qdisk, standalone, tap =item Mandatory @@ -254,6 +254,8 @@ and "standalone" does not support specifications other than "virtio". Normally this option should not be specified, in which case libxl will automatically determine the most suitable backend. +"tap" needs blktap's tapback to be running. + =item B