From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 01:33:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 01:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200372.354884 (Exim 4.92) (envelope-from ) id 1mW7Q9-0000r5-L1; Fri, 01 Oct 2021 01:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200372.354884; Fri, 01 Oct 2021 01:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Q9-0000qv-Hg; Fri, 01 Oct 2021 01:33:05 +0000 Received: by outflank-mailman (input) for mailman id 200372; Fri, 01 Oct 2021 01:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Q8-0000qj-MI for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Q8-0003JU-KY for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mW7Q8-0002PC-JR for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0tkymKlYgsul6mCmhElVT0pRa35mVCrRVx5jFfa7eYA=; b=xtcCnVoRRBXql2TMlJOTYlO38v /TxisXyDDaEgWQ7Upso6GXgm/9IQm1Qj2szyw34/SbRcz9lyhvRTz/Ak62tDqvHXggj0Fgav9Hw1K pEENfTcs3kVQT2K5wq8vUrdK/98N6GrNa1AmL6scIQM7eEKBrMCqR7s0XliDZB20Ssh0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/pci: Refactor MSI code that implements MSI functionality within XEN Message-Id: Date: Fri, 01 Oct 2021 01:33:04 +0000 commit a12ceae85be64f8edcfaa4bf94b5b7d8dba8a2f3 Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:10 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:22:05 2021 -0700 xen/pci: Refactor MSI code that implements MSI functionality within XEN On Arm, the initial plan is to only support GICv3 ITS which doesn't require us to manage the MSIs because the HW will protect against spoofing. Move the code under CONFIG_HAS_PCI_MSI flag to gate the code for ARM. No functional change intended. Signed-off-by: Rahul Singh Reviewed-by: Daniel P. Smith Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/drivers/passthrough/Makefile | 1 + xen/drivers/passthrough/msi.c | 83 ++++++++++++++++++++++++++++++++++++++++ xen/drivers/passthrough/pci.c | 54 +++++++------------------- xen/drivers/pci/Kconfig | 4 ++ xen/include/xen/msi.h | 43 +++++++++++++++++++++ xen/xsm/flask/hooks.c | 8 ++-- 7 files changed, 149 insertions(+), 45 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 1f83518ee0..b4abfca46f 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -20,6 +20,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI + select HAS_PCI_MSI select HAS_PDX select HAS_SCHED_GRANULARITY select HAS_UBSAN diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index 445690e3e5..a5efa22714 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -7,3 +7,4 @@ obj-y += iommu.o obj-$(CONFIG_HAS_PCI) += pci.o obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o obj-$(CONFIG_HAS_PCI) += ats.o +obj-$(CONFIG_HAS_PCI_MSI) += msi.o diff --git a/xen/drivers/passthrough/msi.c b/xen/drivers/passthrough/msi.c new file mode 100644 index 0000000000..ce1a450f6f --- /dev/null +++ b/xen/drivers/passthrough/msi.c @@ -0,0 +1,83 @@ +#include +#include +#include +#include + +int pdev_msix_assign(struct domain *d, struct pci_dev *pdev) +{ + int rc; + + if ( pdev->msix ) + { + rc = pci_reset_msix_state(pdev); + if ( rc ) + return rc; + msixtbl_init(d); + } + + return 0; +} + +int pdev_msi_init(struct pci_dev *pdev) +{ + unsigned int pos; + + INIT_LIST_HEAD(&pdev->msi_list); + + pos = pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), + PCI_FUNC(pdev->devfn), PCI_CAP_ID_MSI); + if ( pos ) + { + uint16_t ctrl = pci_conf_read16(pdev->sbdf, msi_control_reg(pos)); + + pdev->msi_maxvec = multi_msi_capable(ctrl); + } + + pos = pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), + PCI_FUNC(pdev->devfn), PCI_CAP_ID_MSIX); + if ( pos ) + { + struct arch_msix *msix = xzalloc(struct arch_msix); + uint16_t ctrl; + + if ( !msix ) + return -ENOMEM; + + spin_lock_init(&msix->table_lock); + + ctrl = pci_conf_read16(pdev->sbdf, msix_control_reg(pos)); + msix->nr_entries = msix_table_size(ctrl); + + pdev->msix = msix; + } + + return 0; +} + +void pdev_msi_deinit(struct pci_dev *pdev) +{ + XFREE(pdev->msix); +} + +void pdev_dump_msi(const struct pci_dev *pdev) +{ + const struct msi_desc *msi; + + if ( list_empty(&pdev->msi_list) ) + return; + + printk(" - MSIs < "); + list_for_each_entry ( msi, &pdev->msi_list, list ) + printk("%d ", msi->irq); + printk(">"); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index d65cda856b..5456ca3a63 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -32,8 +32,8 @@ #include #include #include +#include #include -#include #include "ats.h" struct pci_seg { @@ -314,6 +314,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) { struct pci_dev *pdev; unsigned int pos; + int rc; list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list ) if ( pdev->bus == bus && pdev->devfn == devfn ) @@ -327,35 +328,12 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) *((u8*) &pdev->bus) = bus; *((u8*) &pdev->devfn) = devfn; pdev->domain = NULL; - INIT_LIST_HEAD(&pdev->msi_list); - - pos = pci_find_cap_offset(pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), - PCI_CAP_ID_MSI); - if ( pos ) - { - uint16_t ctrl = pci_conf_read16(pdev->sbdf, msi_control_reg(pos)); - - pdev->msi_maxvec = multi_msi_capable(ctrl); - } - pos = pci_find_cap_offset(pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), - PCI_CAP_ID_MSIX); - if ( pos ) + rc = pdev_msi_init(pdev); + if ( rc ) { - struct arch_msix *msix = xzalloc(struct arch_msix); - uint16_t ctrl; - - if ( !msix ) - { - xfree(pdev); - return NULL; - } - spin_lock_init(&msix->table_lock); - - ctrl = pci_conf_read16(pdev->sbdf, msix_control_reg(pos)); - msix->nr_entries = msix_table_size(ctrl); - - pdev->msix = msix; + xfree(pdev); + return NULL; } list_add(&pdev->alldevs_list, &pseg->alldevs_list); @@ -448,7 +426,7 @@ static void free_pdev(struct pci_seg *pseg, struct pci_dev *pdev) } list_del(&pdev->alldevs_list); - xfree(pdev->msix); + pdev_msi_deinit(pdev); xfree(pdev); } @@ -1270,18 +1248,16 @@ bool_t pcie_aer_get_firmware_first(const struct pci_dev *pdev) static int _dump_pci_devices(struct pci_seg *pseg, void *arg) { struct pci_dev *pdev; - struct msi_desc *msi; printk("==== segment %04x ====\n", pseg->nr); list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list ) { - printk("%pp - %pd - node %-3d - MSIs < ", + printk("%pp - %pd - node %-3d", &pdev->sbdf, pdev->domain, (pdev->node != NUMA_NO_NODE) ? pdev->node : -1); - list_for_each_entry ( msi, &pdev->msi_list, list ) - printk("%d ", msi->irq); - printk(">\n"); + pdev_dump_msi(pdev); + printk("\n"); } return 0; @@ -1421,13 +1397,9 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag) ASSERT(pdev && (pdev->domain == hardware_domain || pdev->domain == dom_io)); - if ( pdev->msix ) - { - rc = pci_reset_msix_state(pdev); - if ( rc ) - goto done; - msixtbl_init(d); - } + rc = pdev_msix_assign(d, pdev); + if ( rc ) + goto done; pdev->fault.count = 0; diff --git a/xen/drivers/pci/Kconfig b/xen/drivers/pci/Kconfig index 7da03fa13b..c6a7bc8007 100644 --- a/xen/drivers/pci/Kconfig +++ b/xen/drivers/pci/Kconfig @@ -1,3 +1,7 @@ config HAS_PCI bool + +config HAS_PCI_MSI + bool + depends on HAS_PCI diff --git a/xen/include/xen/msi.h b/xen/include/xen/msi.h new file mode 100644 index 0000000000..c903d0050c --- /dev/null +++ b/xen/include/xen/msi.h @@ -0,0 +1,43 @@ +#ifndef __XEN_MSI_H_ +#define __XEN_MSI_H_ + +#include + +#ifdef CONFIG_HAS_PCI_MSI + +#include + +int pdev_msix_assign(struct domain *d, struct pci_dev *pdev); +int pdev_msi_init(struct pci_dev *pdev); +void pdev_msi_deinit(struct pci_dev *pdev); +void pdev_dump_msi(const struct pci_dev *pdev); + +#else /* !CONFIG_HAS_PCI_MSI */ + +static inline int pdev_msix_assign(struct domain *d, struct pci_dev *pdev) +{ + return 0; +} + +static inline int pdev_msi_init(struct pci_dev *pdev) +{ + return 0; +} + +static inline void pdev_msi_deinit(struct pci_dev *pdev) {} +static inline void pci_cleanup_msi(struct pci_dev *pdev) {} +static inline void pdev_dump_msi(const struct pci_dev *pdev) {} + +#endif /* CONFIG_HAS_PCI_MSI */ + +#endif /* __XEN_MSI_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 25e87180b4..ea9a12bd71 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -21,7 +21,7 @@ #include #include #include -#ifdef CONFIG_HAS_PCI +#ifdef CONFIG_HAS_PCI_MSI #include #endif #include @@ -114,7 +114,7 @@ static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad) } return security_irq_sid(irq, sid); } -#ifdef CONFIG_HAS_PCI +#ifdef CONFIG_HAS_PCI_MSI { struct irq_desc *desc = irq_to_desc(irq); if ( desc->msi_desc && desc->msi_desc->dev ) { @@ -874,7 +874,7 @@ static int flask_map_domain_pirq (struct domain *d) static int flask_map_domain_msi (struct domain *d, int irq, const void *data, u32 *sid, struct avc_audit_data *ad) { -#ifdef CONFIG_HAS_PCI +#ifdef CONFIG_HAS_PCI_MSI const struct msi_info *msi = data; u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; @@ -940,7 +940,7 @@ static int flask_unmap_domain_pirq (struct domain *d) static int flask_unmap_domain_msi (struct domain *d, int irq, const void *data, u32 *sid, struct avc_audit_data *ad) { -#ifdef CONFIG_HAS_PCI +#ifdef CONFIG_HAS_PCI_MSI const struct pci_dev *pdev = data; u32 machine_bdf = (pdev->seg << 16) | (pdev->bus << 8) | pdev->devfn; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 01:33:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 01:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200373.354888 (Exim 4.92) (envelope-from ) id 1mW7QJ-0000tS-MT; Fri, 01 Oct 2021 01:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200373.354888; Fri, 01 Oct 2021 01:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7QJ-0000tK-JJ; Fri, 01 Oct 2021 01:33:15 +0000 Received: by outflank-mailman (input) for mailman id 200373; Fri, 01 Oct 2021 01:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7QJ-0000tC-1A for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7QJ-0003Ji-0O for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mW7QI-0002QO-Ts for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=f0HtkGpOcNZVx2vwC3mLzDPZOycf3LcFKieWNYp0jIA=; b=gPf6S5D1gjhx2Oe4qgNThoOuBK utXl3Yt1MLQEhinXpi2z9xVcA4eXKjcspsAiKPi5M1gTgBsvWpj2p4B1M7Ny8g/TPIdBg6G1YgN+g JWJgzquQG4QbJsSQ+ty7ir+QUgdHIC95bik+QsjlbzvY0K0bnXkmFhhEpbQOq+h9xtyA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: pci: Add stubs to allow selecting HAS_PCI Message-Id: Date: Fri, 01 Oct 2021 01:33:14 +0000 commit a3a476fb744d4c516838353f3bc6a42d03e031a3 Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:11 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:22:24 2021 -0700 xen/arm: pci: Add stubs to allow selecting HAS_PCI In a follow-up we will enable PCI support in Xen on Arm (i.e select HAS_PCI). The generic code expects the arch to implement a few functions: arch_iommu_use_permitted() arch_pci_clean_pirqs() Note that this is not yet sufficient to enable HAS_PCI and will be addressed in follow-ups. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/arch/arm/Makefile | 1 + xen/arch/arm/pci/Makefile | 1 + xen/arch/arm/pci/pci.c | 33 +++++++++++++++++++++++++++++++++ xen/drivers/passthrough/arm/iommu.c | 9 +++++++++ xen/include/asm-arm/pci.h | 31 ++++++++++++++++++++++++++++--- 5 files changed, 72 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 3d3b97b5b4..44d7cc81fa 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_ARM_32) += arm32/ obj-$(CONFIG_ARM_64) += arm64/ obj-$(CONFIG_ARM_64) += efi/ obj-$(CONFIG_ACPI) += acpi/ +obj-$(CONFIG_HAS_PCI) += pci/ ifneq ($(CONFIG_NO_PLAT),y) obj-y += platforms/ endif diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile new file mode 100644 index 0000000000..a98035df4c --- /dev/null +++ b/xen/arch/arm/pci/Makefile @@ -0,0 +1 @@ +obj-y += pci.o diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c new file mode 100644 index 0000000000..a7a7bc3213 --- /dev/null +++ b/xen/arch/arm/pci/pci.c @@ -0,0 +1,33 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 + +/* + * PIRQ event channels are not supported on Arm, so nothing to do. + */ +int arch_pci_clean_pirqs(struct domain *d) +{ + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/passthrough/arm/iommu.c b/xen/drivers/passthrough/arm/iommu.c index db3b07a571..ee653a9c48 100644 --- a/xen/drivers/passthrough/arm/iommu.c +++ b/xen/drivers/passthrough/arm/iommu.c @@ -135,3 +135,12 @@ void arch_iommu_domain_destroy(struct domain *d) void __hwdom_init arch_iommu_hwdom_init(struct domain *d) { } + +/* + * Unlike x86, Arm doesn't support mem-sharing, mem-paging and log-dirty (yet). + * So there is no restriction to use the IOMMU. + */ +bool arch_iommu_use_permitted(const struct domain *d) +{ + return true; +} diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index de13359f65..7dd9eb3dba 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -1,7 +1,32 @@ -#ifndef __X86_PCI_H__ -#define __X86_PCI_H__ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 __ARM_PCI_H__ +#define __ARM_PCI_H__ + +#ifdef CONFIG_HAS_PCI + +#define pci_to_dev(pcidev) (&(pcidev)->arch.dev) + +/* Arch pci dev struct */ struct arch_pci_dev { + struct device dev; }; -#endif /* __X86_PCI_H__ */ +#else /*!CONFIG_HAS_PCI*/ + +struct arch_pci_dev { }; + +#endif /*!CONFIG_HAS_PCI*/ +#endif /* __ARM_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 01:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 01:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200374.354892 (Exim 4.92) (envelope-from ) id 1mW7QU-0000ww-Np; Fri, 01 Oct 2021 01:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200374.354892; Fri, 01 Oct 2021 01:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7QU-0000wo-Kx; Fri, 01 Oct 2021 01:33:26 +0000 Received: by outflank-mailman (input) for mailman id 200374; Fri, 01 Oct 2021 01:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7QT-0000wR-5n for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7QT-0003K0-4v for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mW7QT-0002RV-3z for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=x33EIz9Dcv2G+EQd5LbdlVbYY4xhx+7bT/ERVTeCbww=; b=Dfv7fkSV/pdPwJ0oFZEmhRs5Y7 QqpICuHYjYD27dxoIWi7NRRiNvQ4uNLUN/D38wN8WLKkXKVhbkuXQjF2UWXm7t3iC7lnRViq8EpH2 r8NU/zoCAEEibNSJKpvzuBWfTEb6mRNaxjOr8uEDGmiv00VZj8e5+jXKsLTGVfX//zbs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/device-tree: Add dt_property_read_variable_u32_array helper Message-Id: Date: Fri, 01 Oct 2021 01:33:25 +0000 commit 1907cfc8b2ac516cde82a7e6acf0ee244c263adf Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:15 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:25:19 2021 -0700 xen/device-tree: Add dt_property_read_variable_u32_array helper Based Linux commit a67e9472da423ec47a3586920b526ebaedf25fc3 Import the Linux helper of_property_read_variable_u32_array. This function find and read an array of 32 bit integers from a property, with bounds on the minimum and maximum array size. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/common/device_tree.c | 61 +++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 26 ++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 03d25a81ce..53160d61f8 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -208,6 +208,67 @@ int dt_property_read_string(const struct dt_device_node *np, return 0; } +/** + * dt_find_property_value_of_size + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @min: minimum allowed length of property value + * @max: maximum allowed length of property value (0 means unlimited) + * @len: if !=NULL, actual length is written to here + * + * Search for a property in a device node and valid the requested size. + * + * Return: The property value on success, -EINVAL if the property does not + * exist, -ENODATA if property does not have a value, and -EOVERFLOW if the + * property data is too small or too large. + */ +static void *dt_find_property_value_of_size(const struct dt_device_node *np, + const char *propname, u32 min, + u32 max, size_t *len) +{ + const struct dt_property *prop = dt_find_property(np, propname, NULL); + + if ( !prop ) + return ERR_PTR(-EINVAL); + if ( !prop->value ) + return ERR_PTR(-ENODATA); + if ( prop->length < min ) + return ERR_PTR(-EOVERFLOW); + if ( max && prop->length > max ) + return ERR_PTR(-EOVERFLOW); + + if ( len ) + *len = prop->length; + + return prop->value; +} + +int dt_property_read_variable_u32_array(const struct dt_device_node *np, + const char *propname, u32 *out_values, + size_t sz_min, size_t sz_max) +{ + size_t sz, count; + const __be32 *val = dt_find_property_value_of_size(np, propname, + (sz_min * sizeof(*out_values)), + (sz_max * sizeof(*out_values)), + &sz); + + if ( IS_ERR(val) ) + return PTR_ERR(val); + + if ( !sz_max ) + sz = sz_min; + else + sz /= sizeof(*out_values); + + count = sz; + while ( count-- ) + *out_values++ = be32_to_cpup(val++); + + return sz; +} + int dt_property_match_string(const struct dt_device_node *np, const char *propname, const char *string) { diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index b02696be94..1693fb8e8c 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -366,6 +366,32 @@ bool_t dt_property_read_u32(const struct dt_device_node *np, bool_t dt_property_read_u64(const struct dt_device_node *np, const char *name, u64 *out_value); + +/** + * dt_property_read_variable_u32_array - Find and read an array of 32 bit + * integers from a property, with bounds on the minimum and maximum array size. + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @out_values: pointer to return found values. + * @sz_min: minimum number of array elements to read + * @sz_max: maximum number of array elements to read, if zero there is no + * upper limit on the number of elements in the dts entry but only + * sz_min will be read. + * + * Search for a property in a device node and read 32-bit value(s) from + * it. + * + * Return: The number of elements read on success, -EINVAL if the property + * does not exist, -ENODATA if property does not have a value, and -EOVERFLOW + * if the property data is smaller than sz_min or longer than sz_max. + * + * The out_values is modified only if a valid u32 value can be decoded. + */ +int dt_property_read_variable_u32_array(const struct dt_device_node *np, + const char *propname, u32 *out_values, + size_t sz_min, size_t sz_max); + /** * dt_property_read_bool - Check if a property exists * @np: node to get the value -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 01:33:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 01:33:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200376.354896 (Exim 4.92) (envelope-from ) id 1mW7Qe-00011i-PJ; Fri, 01 Oct 2021 01:33:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200376.354896; Fri, 01 Oct 2021 01:33:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Qe-00011a-MU; Fri, 01 Oct 2021 01:33:36 +0000 Received: by outflank-mailman (input) for mailman id 200376; Fri, 01 Oct 2021 01:33:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Qd-00011Q-8c for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Qd-0003KH-7t for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mW7Qd-0002Sr-6x for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MQ6odduW47CniQWFAXA0fMfcaqadvWGTqOPMY8fXWOA=; b=wN5zaPIINvjBj6v3CDU75EBGTI EQOgSaE2INYaDjzBoaB4kNeu/MxrQ6OERU8r59J46vq1NWrim7ICgxKdg80WQelRvQEf4KYy7Nj9e R2hsyCNX8yUZxdb8kysT9SnyFx7kp2EwnIN2rFBa7QRR9fEXK2zhLFHXZ1hrcSmJTEIM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/device-tree: Add dt_property_read_u32_array helper Message-Id: Date: Fri, 01 Oct 2021 01:33:35 +0000 commit 65ca66cf42420842039eb0f61ea8bcb9f56a355e Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:16 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:25:45 2021 -0700 xen/device-tree: Add dt_property_read_u32_array helper Based Linux commit a67e9472da423ec47a3586920b526ebaedf25fc3 Import the Linux helper of_property_read_u32_array. This function find and read an array of 32 bit integers from a property. Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/include/xen/device_tree.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 1693fb8e8c..3ffe3eb3d2 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -392,6 +392,36 @@ int dt_property_read_variable_u32_array(const struct dt_device_node *np, const char *propname, u32 *out_values, size_t sz_min, size_t sz_max); +/** + * dt_property_read_u32_array - Find and read an array of 32 bit integers + * from a property. + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @out_values: pointer to return value, modified only if return value is 0. + * @sz: number of array elements to read + * + * Search for a property in a device node and read 32-bit value(s) from + * it. + * + * Return: 0 on success, -EINVAL if the property does not exist, + * -ENODATA if property does not have a value, and -EOVERFLOW if the + * property data isn't large enough. + * + * The out_values is modified only if a valid u32 value can be decoded. + */ +static inline int dt_property_read_u32_array(const struct dt_device_node *np, + const char *propname, + u32 *out_values, size_t sz) +{ + int ret = dt_property_read_variable_u32_array(np, propname, out_values, + sz, 0); + if ( ret >= 0 ) + return 0; + else + return ret; +} + /** * dt_property_read_bool - Check if a property exists * @np: node to get the value -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 01:33:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 01:33:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200377.354900 (Exim 4.92) (envelope-from ) id 1mW7Qo-00015I-SJ; Fri, 01 Oct 2021 01:33:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200377.354900; Fri, 01 Oct 2021 01:33:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Qo-00015A-PY; Fri, 01 Oct 2021 01:33:46 +0000 Received: by outflank-mailman (input) for mailman id 200377; Fri, 01 Oct 2021 01:33:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Qn-00014y-Bo for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mW7Qn-0003Ka-B1 for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mW7Qn-0002Uf-A1 for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 01:33:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KnC0IbFbX01awDL5e/lvPHhY4FNC61Ox3TFpwLt623o=; b=X8igpXAf2K1yuGNl3tfZcTtLWg OtbPRicQepWZyGyaQMm1TcViy0JEtxhrsBK/mYLNkEfu/Q+ENpk36GBLEn2iqWosc/XX5/+8Y2Lag Dwxni6kUPfqjtK5sSwVrFqpjiO+Eil/4KiBXCmTDL4FnfQedErOZKpVjyYdoUTPHpxk0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/device-tree: Add dt_get_pci_domain_nr helper Message-Id: Date: Fri, 01 Oct 2021 01:33:45 +0000 commit f01be299050969f842fbc353f3d465b92979d3d7 Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:17 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:26:13 2021 -0700 xen/device-tree: Add dt_get_pci_domain_nr helper Based Linux commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9d7 Import the Linux helper of_get_pci_domain_nr. This function will try to obtain the host bridge domain number by finding a property called "linux,pci-domain" of the given device node. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/common/device_tree.c | 12 ++++++++++++ xen/include/xen/device_tree.h | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 53160d61f8..ea93da1725 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -2183,6 +2183,18 @@ void __init dt_unflatten_host_device_tree(void) dt_alias_scan(); } +int dt_get_pci_domain_nr(struct dt_device_node *node) +{ + u32 domain; + int error; + + error = dt_property_read_u32(node, "linux,pci-domain", &domain); + if ( !error ) + return -EINVAL; + + return (u16)domain; +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 3ffe3eb3d2..2297c59ce6 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -832,6 +832,23 @@ int dt_count_phandle_with_args(const struct dt_device_node *np, const char *list_name, const char *cells_name); +/** + * dt_get_pci_domain_nr - Find the host bridge domain number + * of the given device node. + * @node: Device tree node with the domain information. + * + * This function will try to obtain the host bridge domain number by finding + * a property called "linux,pci-domain" of the given device node. + * + * Return: + * * > 0 - On success, an associated domain number. + * * -EINVAL - The property "linux,pci-domain" does not exist. + * + * Returns the associated domain number from DT in the range [0-0xffff], or + * a negative value if the required property is not found. + */ +int dt_get_pci_domain_nr(struct dt_device_node *node); + #ifdef CONFIG_DEVICE_TREE_DEBUG #define dt_dprintk(fmt, args...) \ printk(XENLOG_DEBUG fmt, ## args) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 08:55:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 08:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200506.355025 (Exim 4.92) (envelope-from ) id 1mWEJt-0001d2-HD; Fri, 01 Oct 2021 08:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200506.355025; Fri, 01 Oct 2021 08:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWEJt-0001cu-E8; Fri, 01 Oct 2021 08:55:05 +0000 Received: by outflank-mailman (input) for mailman id 200506; Fri, 01 Oct 2021 08:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWEJs-0001co-Jz for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 08:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWEJs-0008OY-GZ for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 08:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mWEJs-00016l-FR for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 08:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pBO1QVFx2vJ+yQhKISjgt9wx5oPO8ROmRZqFsHVGcic=; b=4X+PAL2r5nUGi6jSkgNiBSA1mr KvoJfHfU4h7le2jeDOTsrTu4Q1Ob5mq4//vI7ZTbXu/3hpG4gCYADmilTPchvpKYbkCHeHmLI/Q5D dRFoKP2x+LX5/ho6/G9xaQA///oAaHEpPMhF7TEjyluYbftBkF0NIcXAeN88iOjRjI98=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: switch GitLab x86 smoke test to use PV 64bit binary Message-Id: Date: Fri, 01 Oct 2021 08:55:04 +0000 commit 5d15f905b9252d801101af0279fbedb0c50dc241 Author: Anthony PERARD AuthorDate: Thu Sep 30 17:17:19 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Oct 1 09:52:14 2021 +0100 automation: switch GitLab x86 smoke test to use PV 64bit binary Xen is now built without CONFIG_PV32 by default and thus test jobs "qemu-smoke-x86-64-gcc" and "qemu-smoke-x86-64-clang" fails because they are using XTF's "test-pv32pae-example" which is an hello word 32bit PV guest. As we are looking for whether Xen boot or not with a quick smoke test, just use 64bit tests instead. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- automation/scripts/qemu-smoke-x86-64.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh index 09152e3e9c..29cb44b757 100755 --- a/automation/scripts/qemu-smoke-x86-64.sh +++ b/automation/scripts/qemu-smoke-x86-64.sh @@ -15,8 +15,8 @@ git clone https://xenbits.xen.org/git-http/xtf.git cd xtf && make -j$(nproc) && cd - case $variant in - pvh) k=test-hvm32pae-example extra="dom0-iommu=none dom0=pvh" ;; - *) k=test-pv32pae-example extra= ;; + pvh) k=test-hvm64-example extra="dom0-iommu=none dom0=pvh" ;; + *) k=test-pv64-example extra= ;; esac rm -f smoke.serial -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 08:55:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 08:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200507.355029 (Exim 4.92) (envelope-from ) id 1mWEK3-0001ei-IP; Fri, 01 Oct 2021 08:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200507.355029; Fri, 01 Oct 2021 08:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWEK3-0001ea-Fb; Fri, 01 Oct 2021 08:55:15 +0000 Received: by outflank-mailman (input) for mailman id 200507; Fri, 01 Oct 2021 08:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWEK2-0001eQ-Kj for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 08:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWEK2-0008Oc-Jq for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 08:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mWEK2-00017o-Ik for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 08:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ch4njt3W81UyrBUiCS8o9KR4kNdkOfhFMKghaWDWTE0=; b=Rj/BOWmwXppAwPQsd5xTGUuez4 UVm7qIQ2t+Hi920OluQ4pQT02/EnM+qDdLiBRL9D6/pVGejbTz52aoqbEWncPZj9HUbyK2Fi2KAgt 5AZOmrKvznPJR701ROnP30c62ChDQSPnoccygqjYF4wtoczHFiBLkj9vlzxhW0RLETaM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: Add qemu to debian:stretch container for smoke test Message-Id: Date: Fri, 01 Oct 2021 08:55:14 +0000 commit c9aa02e48eda5378c19f3837e6c21bcaab1dcad5 Author: Anthony PERARD AuthorDate: Thu Sep 30 17:17:20 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Oct 1 09:52:14 2021 +0100 automation: Add qemu to debian:stretch container for smoke test We can add qemu into the container so that there's no need to install it everytime we run a test. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- automation/build/debian/stretch.dockerfile | 2 ++ automation/scripts/qemu-smoke-x86-64.sh | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile index e2ee14e201..da6aa874dd 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -47,6 +47,8 @@ RUN apt-get update && \ nasm \ gnupg \ apt-transport-https \ + # for test phase, qemu-smoke-* jobs + qemu-system-x86 \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh index 29cb44b757..188ff8e3d6 100755 --- a/automation/scripts/qemu-smoke-x86-64.sh +++ b/automation/scripts/qemu-smoke-x86-64.sh @@ -5,11 +5,6 @@ set -ex # variant should be either pv or pvh variant=$1 -# Install QEMU -export DEBIAN_FRONTENT=noninteractive -apt-get -qy update -apt-get -qy install qemu-system-x86 - # Clone and build XTF git clone https://xenbits.xen.org/git-http/xtf.git cd xtf && make -j$(nproc) && cd - -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 13:22:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 13:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200609.355131 (Exim 4.92) (envelope-from ) id 1mWIUH-00082t-Uk; Fri, 01 Oct 2021 13:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200609.355131; Fri, 01 Oct 2021 13:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUH-00082l-Rh; Fri, 01 Oct 2021 13:22:05 +0000 Received: by outflank-mailman (input) for mailman id 200609; Fri, 01 Oct 2021 13:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUG-00082c-GZ for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUG-0004YX-DG for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mWIUG-0003qH-C3 for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=X0ADFeOG4iHVsCjYuiJJig+T96qqcAYNFlWv8CrJLCU=; b=hdv2qhP1PMLUYy+b6TRjiHLiKt +VwoHCvdN54jU/eGAPMf9qZoMsVyIE1TI2k7GZvYQA2mXdv9lf+Yl71zwNGjOUFemutJBLx8NyWap 7WVWlIOfRcO2U0x5ugWfXAYUzeqexg3uCCH6CSNvQrjmM/Qn46uXeWOrqJv34IuCLQZo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] include/public: add possible status values to usbif.h Message-Id: Date: Fri, 01 Oct 2021 13:22:04 +0000 commit c2f40d8170464ac30eaeb4e090535da09b9c6b4e Author: Juergen Gross AuthorDate: Fri Oct 1 15:11:03 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 1 15:11:03 2021 +0200 include/public: add possible status values to usbif.h The interface definition of PV USB devices is lacking the specification of possible values of the status field in a response. Those are negative errno values as used in Linux, so they might differ in other OS's. Specify them via appropriate defines. Signed-off-by: Juergen Gross Reviewed-by: Luca Fancellu --- xen/include/public/io/usbif.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/include/public/io/usbif.h b/xen/include/public/io/usbif.h index c6a58639d6..96b9fb661d 100644 --- a/xen/include/public/io/usbif.h +++ b/xen/include/public/io/usbif.h @@ -221,6 +221,13 @@ struct usbif_urb_response { uint16_t id; /* request id */ uint16_t start_frame; /* start frame (ISO) */ int32_t status; /* status (non-ISO) */ +#define USBIF_STATUS_OK 0 +#define USBIF_STATUS_NODEV (-19) +#define USBIF_STATUS_INVAL (-22) +#define USBIF_STATUS_STALL (-32) +#define USBIF_STATUS_IOERROR (-71) +#define USBIF_STATUS_BABBLE (-75) +#define USBIF_STATUS_SHUTDOWN (-108) int32_t actual_length; /* actual transfer length */ int32_t error_count; /* number of ISO errors */ }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 13:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 13:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200610.355136 (Exim 4.92) (envelope-from ) id 1mWIUS-00084e-0K; Fri, 01 Oct 2021 13:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200610.355136; Fri, 01 Oct 2021 13:22:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUR-00084W-TU; Fri, 01 Oct 2021 13:22:15 +0000 Received: by outflank-mailman (input) for mailman id 200610; Fri, 01 Oct 2021 13:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUQ-00084J-HK for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUQ-0004Yu-GY for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mWIUQ-0003ro-FR for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+VmVp9M5WHNxhFzsVhJzleWitkk/2Cor1t++6xv/vg0=; b=zAf9BAItK5iSqhWdH7S8lm170d m2lqo29KNvSwPFUB+spa1020D/8bbiTKcn6uQ8tGtWzkld9mXd3L7X4eB+nuCA479Cl3RjW3Va0Cg 8Upo47uALHFRVct7ysu9+M0+y8EwCplMLBQxJk0MAuBQ8D07c59nnEnlj69zvH9T5w5A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] include/public: add better interface description to usbif.h Message-Id: Date: Fri, 01 Oct 2021 13:22:14 +0000 commit a9a34e2b6abf756a94f8fd599fd8060cfc0e7a00 Author: Juergen Gross AuthorDate: Fri Oct 1 15:11:28 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 1 15:11:28 2021 +0200 include/public: add better interface description to usbif.h The PV USB protocol is poorly described. Add a more detailed description to the usbif.h header file. Signed-off-by: Juergen Gross Reviewed-by: Luca Fancellu --- xen/include/public/io/usbif.h | 164 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/xen/include/public/io/usbif.h b/xen/include/public/io/usbif.h index 96b9fb661d..dd378bcba5 100644 --- a/xen/include/public/io/usbif.h +++ b/xen/include/public/io/usbif.h @@ -32,6 +32,34 @@ #include "../grant_table.h" /* + * Detailed Interface Description + * ============================== + * The pvUSB interface is using a split driver design: a frontend driver in + * the guest and a backend driver in a driver domain (normally dom0) having + * access to the physical USB device(s) being passed to the guest. + * + * The frontend and backend drivers use XenStore to initiate the connection + * between them, the I/O activity is handled via two shared ring pages and an + * event channel. As the interface between frontend and backend is at the USB + * host connector level, multiple (up to 31) physical USB devices can be + * handled by a single connection. + * + * The Xen pvUSB device name is "qusb", so the frontend's XenStore entries are + * to be found under "device/qusb", while the backend's XenStore entries are + * under "backend//qusb". + * + * When a new pvUSB connection is established, the frontend needs to setup the + * two shared ring pages for communication and the event channel. The ring + * pages need to be made available to the backend via the grant table + * interface. + * + * One of the shared ring pages is used by the backend to inform the frontend + * about USB device plug events (device to be added or removed). This is the + * "conn-ring". + * + * The other ring page is used for USB I/O communication (requests and + * responses). This is the "urb-ring". + * * Feature and Parameter Negotiation * ================================= * The two halves of a Xen pvUSB driver utilize nodes within the XenStore to @@ -99,6 +127,142 @@ * The machine ABI rules governing the format of all ring request and * response structures. * + * Protocol Description + * ==================== + * + *-------------------------- USB device plug events -------------------------- + * + * USB device plug events are send via the "conn-ring" shared page. As only + * events are being sent, the respective requests from the frontend to the + * backend are just dummy ones. + * The events sent to the frontend have the following layout: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | id | portnum | speed | 4 + * +----------------+----------------+----------------+----------------+ + * id - uint16_t, event id (taken from the actual frontend dummy request) + * portnum - uint8_t, port number (1 ... 31) + * speed - uint8_t, device USBIF_SPEED_*, USBIF_SPEED_NONE == unplug + * + * The dummy request: + * 0 1 octet + * +----------------+----------------+ + * | id | 2 + * +----------------+----------------+ + * id - uint16_t, guest supplied value (no need for being unique) + * + *-------------------------- USB I/O request --------------------------------- + * + * A single USB I/O request on the "urb-ring" has the following layout: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | id | nr_buffer_segs | 4 + * +----------------+----------------+----------------+----------------+ + * | pipe | 8 + * +----------------+----------------+----------------+----------------+ + * | transfer_flags | buffer_length | 12 + * +----------------+----------------+----------------+----------------+ + * | request type specific | 16 + * | data | 20 + * +----------------+----------------+----------------+----------------+ + * | seg[0] | 24 + * | data | 28 + * +----------------+----------------+----------------+----------------+ + * |/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/| + * +----------------+----------------+----------------+----------------+ + * | seg[USBIF_MAX_SEGMENTS_PER_REQUEST - 1] | 144 + * | data | 148 + * +----------------+----------------+----------------+----------------+ + * Bit field bit number 0 is always least significant bit, undefined bits must + * be zero. + * id - uint16_t, guest supplied value + * nr_buffer_segs - uint16_t, number of segment entries in seg[] array + * pipe - uint32_t, bit field with multiple information: + * bits 0-4: port request to send to + * bit 5: unlink request with specified id (cancel I/O) if set (see below) + * bit 7: direction (1 = read from device) + * bits 8-14: device number on port + * bits 15-18: endpoint of device + * bits 30-31: request type: 00 = isochronous, 01 = interrupt, + * 10 = control, 11 = bulk + * transfer_flags - uint16_t, bit field with processing flags: + * bit 0: less data than specified allowed + * buffer_length - uint16_t, total length of data + * request type specific data - 8 bytes, see below + * seg[] - array with 8 byte elements, see below + * + * Request type specific data for isochronous request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | interval | start_frame | 4 + * +----------------+----------------+----------------+----------------+ + * | number_of_packets | nr_frame_desc_segs | 8 + * +----------------+----------------+----------------+----------------+ + * interval - uint16_t, time interval in msecs between frames + * start_frame - uint16_t, start frame number + * number_of_packets - uint16_t, number of packets to transfer + * nr_frame_desc_segs - uint16_t number of seg[] frame descriptors elements + * + * Request type specific data for interrupt request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | interval | 0 | 4 + * +----------------+----------------+----------------+----------------+ + * | 0 | 8 + * +----------------+----------------+----------------+----------------+ + * interval - uint16_t, time in msecs until interruption + * + * Request type specific data for control request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | data of setup packet | 4 + * | | 8 + * +----------------+----------------+----------------+----------------+ + * + * Request type specific data for bulk request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | 0 | 4 + * | 0 | 8 + * +----------------+----------------+----------------+----------------+ + * + * Request type specific data for unlink request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | unlink_id | 0 | 4 + * +----------------+----------------+----------------+----------------+ + * | 0 | 8 + * +----------------+----------------+----------------+----------------+ + * unlink_id - uint16_t, request id of request to terminate + * + * seg[] array element layout: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | gref | 4 + * +----------------+----------------+----------------+----------------+ + * | offset | length | 8 + * +----------------+----------------+----------------+----------------+ + * gref - uint32_t, grant reference of buffer page + * offset - uint16_t, offset of buffer start in page + * length - uint16_t, length of buffer in page + * + *-------------------------- USB I/O response -------------------------------- + * + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | id | start_frame | 4 + * +----------------+----------------+----------------+----------------+ + * | status | 8 + * +----------------+----------------+----------------+----------------+ + * | actual_length | 12 + * +----------------+----------------+----------------+----------------+ + * | error_count | 16 + * +----------------+----------------+----------------+----------------+ + * id - uint16_t, id of the request this response belongs to + * start_frame - uint16_t, start_frame this response (iso requests only) + * status - int32_t, USBIF_STATUS_* (non-iso requests) + * actual_length - uint32_t, actual size of data transferred + * error_count - uint32_t, number of errors (iso requests) */ enum usb_spec_version { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 13:22:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 13:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200611.355139 (Exim 4.92) (envelope-from ) id 1mWIUc-00087t-1V; Fri, 01 Oct 2021 13:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200611.355139; Fri, 01 Oct 2021 13:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUb-00087j-Ux; Fri, 01 Oct 2021 13:22:25 +0000 Received: by outflank-mailman (input) for mailman id 200611; Fri, 01 Oct 2021 13:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUa-00087P-KU for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWIUa-0004Z9-Ji for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mWIUa-0003tF-Im for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 13:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PnHks6DW+XYBaCk4hmBdk2hpFXJQq2qQWSfwFG0oJvE=; b=B9ct+MqIK1DOVP9YPyAMlNZF1A BHnY9h1h0GGM75dOZh0RuzuZd/RI0QYvFf6R8hSi6LxH7bdk4SmkHPHdjvl0pvmpgDkUZSZKguCWz yuTza27S2DxxtepHXPRHp4/NnQhFDVwb0Hbh9nkfLXn9ZzvMiN0P0Fy9oiN9oy+0x4ww=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] include/public: fix style of usbif.h Message-Id: Date: Fri, 01 Oct 2021 13:22:24 +0000 commit 4eb172864321dfae6da59ea2c4e67f09a92cc525 Author: Juergen Gross AuthorDate: Fri Oct 1 15:11:41 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 1 15:11:41 2021 +0200 include/public: fix style of usbif.h usbif.h is violating the Xen hypervisor coding style. Fix that. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/include/public/io/usbif.h | 196 +++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/xen/include/public/io/usbif.h b/xen/include/public/io/usbif.h index dd378bcba5..c0a552e195 100644 --- a/xen/include/public/io/usbif.h +++ b/xen/include/public/io/usbif.h @@ -266,134 +266,134 @@ */ enum usb_spec_version { - USB_VER_UNKNOWN = 0, - USB_VER_USB11, - USB_VER_USB20, - USB_VER_USB30, /* not supported yet */ + USB_VER_UNKNOWN = 0, + USB_VER_USB11, + USB_VER_USB20, + USB_VER_USB30, /* not supported yet */ }; /* * USB pipe in usbif_request * - * - port number: bits 0-4 - * (USB_MAXCHILDREN is 31) + * - port number: bits 0-4 + * (USB_MAXCHILDREN is 31) * - * - operation flag: bit 5 - * (0 = submit urb, - * 1 = unlink urb) + * - operation flag: bit 5 + * (0 = submit urb, + * 1 = unlink urb) * - * - direction: bit 7 - * (0 = Host-to-Device [Out] - * 1 = Device-to-Host [In]) + * - direction: bit 7 + * (0 = Host-to-Device [Out] + * 1 = Device-to-Host [In]) * - * - device address: bits 8-14 + * - device address: bits 8-14 * - * - endpoint: bits 15-18 + * - endpoint: bits 15-18 * - * - pipe type: bits 30-31 - * (00 = isochronous, 01 = interrupt, - * 10 = control, 11 = bulk) + * - pipe type: bits 30-31 + * (00 = isochronous, 01 = interrupt, + * 10 = control, 11 = bulk) */ -#define USBIF_PIPE_PORT_MASK 0x0000001f -#define USBIF_PIPE_UNLINK 0x00000020 -#define USBIF_PIPE_DIR 0x00000080 -#define USBIF_PIPE_DEV_MASK 0x0000007f -#define USBIF_PIPE_DEV_SHIFT 8 -#define USBIF_PIPE_EP_MASK 0x0000000f -#define USBIF_PIPE_EP_SHIFT 15 -#define USBIF_PIPE_TYPE_MASK 0x00000003 -#define USBIF_PIPE_TYPE_SHIFT 30 -#define USBIF_PIPE_TYPE_ISOC 0 -#define USBIF_PIPE_TYPE_INT 1 -#define USBIF_PIPE_TYPE_CTRL 2 -#define USBIF_PIPE_TYPE_BULK 3 +#define USBIF_PIPE_PORT_MASK 0x0000001f +#define USBIF_PIPE_UNLINK 0x00000020 +#define USBIF_PIPE_DIR 0x00000080 +#define USBIF_PIPE_DEV_MASK 0x0000007f +#define USBIF_PIPE_DEV_SHIFT 8 +#define USBIF_PIPE_EP_MASK 0x0000000f +#define USBIF_PIPE_EP_SHIFT 15 +#define USBIF_PIPE_TYPE_MASK 0x00000003 +#define USBIF_PIPE_TYPE_SHIFT 30 +#define USBIF_PIPE_TYPE_ISOC 0 +#define USBIF_PIPE_TYPE_INT 1 +#define USBIF_PIPE_TYPE_CTRL 2 +#define USBIF_PIPE_TYPE_BULK 3 -#define usbif_pipeportnum(pipe) ((pipe) & USBIF_PIPE_PORT_MASK) -#define usbif_setportnum_pipe(pipe, portnum) ((pipe) | (portnum)) +#define usbif_pipeportnum(pipe) ((pipe) & USBIF_PIPE_PORT_MASK) +#define usbif_setportnum_pipe(pipe, portnum) ((pipe) | (portnum)) -#define usbif_pipeunlink(pipe) ((pipe) & USBIF_PIPE_UNLINK) -#define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) -#define usbif_setunlink_pipe(pipe) ((pipe) | USBIF_PIPE_UNLINK) +#define usbif_pipeunlink(pipe) ((pipe) & USBIF_PIPE_UNLINK) +#define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) +#define usbif_setunlink_pipe(pipe) ((pipe) | USBIF_PIPE_UNLINK) -#define usbif_pipein(pipe) ((pipe) & USBIF_PIPE_DIR) -#define usbif_pipeout(pipe) (!usbif_pipein(pipe)) +#define usbif_pipein(pipe) ((pipe) & USBIF_PIPE_DIR) +#define usbif_pipeout(pipe) (!usbif_pipein(pipe)) -#define usbif_pipedevice(pipe) \ - (((pipe) >> USBIF_PIPE_DEV_SHIFT) & USBIF_PIPE_DEV_MASK) +#define usbif_pipedevice(pipe) \ + (((pipe) >> USBIF_PIPE_DEV_SHIFT) & USBIF_PIPE_DEV_MASK) -#define usbif_pipeendpoint(pipe) \ - (((pipe) >> USBIF_PIPE_EP_SHIFT) & USBIF_PIPE_EP_MASK) +#define usbif_pipeendpoint(pipe) \ + (((pipe) >> USBIF_PIPE_EP_SHIFT) & USBIF_PIPE_EP_MASK) -#define usbif_pipetype(pipe) \ - (((pipe) >> USBIF_PIPE_TYPE_SHIFT) & USBIF_PIPE_TYPE_MASK) -#define usbif_pipeisoc(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_ISOC) -#define usbif_pipeint(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_INT) -#define usbif_pipectrl(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_CTRL) -#define usbif_pipebulk(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_BULK) +#define usbif_pipetype(pipe) \ + (((pipe) >> USBIF_PIPE_TYPE_SHIFT) & USBIF_PIPE_TYPE_MASK) +#define usbif_pipeisoc(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_ISOC) +#define usbif_pipeint(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_INT) +#define usbif_pipectrl(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_CTRL) +#define usbif_pipebulk(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_BULK) #define USBIF_MAX_SEGMENTS_PER_REQUEST (16) -#define USBIF_MAX_PORTNR 31 -#define USBIF_RING_SIZE 4096 +#define USBIF_MAX_PORTNR 31 +#define USBIF_RING_SIZE 4096 /* * RING for transferring urbs. */ struct usbif_request_segment { - grant_ref_t gref; - uint16_t offset; - uint16_t length; + grant_ref_t gref; + uint16_t offset; + uint16_t length; }; struct usbif_urb_request { - uint16_t id; /* request id */ - uint16_t nr_buffer_segs; /* number of urb->transfer_buffer segments */ + uint16_t id; /* request id */ + uint16_t nr_buffer_segs; /* number of urb->transfer_buffer segments */ - /* basic urb parameter */ - uint32_t pipe; - uint16_t transfer_flags; -#define USBIF_SHORT_NOT_OK 0x0001 - uint16_t buffer_length; - union { - uint8_t ctrl[8]; /* setup_packet (Ctrl) */ + /* basic urb parameter */ + uint32_t pipe; + uint16_t transfer_flags; +#define USBIF_SHORT_NOT_OK 0x0001 + uint16_t buffer_length; + union { + uint8_t ctrl[8]; /* setup_packet (Ctrl) */ - struct { - uint16_t interval; /* maximum (1024*8) in usb core */ - uint16_t start_frame; /* start frame */ - uint16_t number_of_packets; /* number of ISO packet */ - uint16_t nr_frame_desc_segs; /* number of iso_frame_desc segments */ - } isoc; + struct { + uint16_t interval; /* maximum (1024*8) in usb core */ + uint16_t start_frame; /* start frame */ + uint16_t number_of_packets; /* number of ISO packet */ + uint16_t nr_frame_desc_segs; /* number of iso_frame_desc segments */ + } isoc; - struct { - uint16_t interval; /* maximum (1024*8) in usb core */ - uint16_t pad[3]; - } intr; + struct { + uint16_t interval; /* maximum (1024*8) in usb core */ + uint16_t pad[3]; + } intr; - struct { - uint16_t unlink_id; /* unlink request id */ - uint16_t pad[3]; - } unlink; + struct { + uint16_t unlink_id; /* unlink request id */ + uint16_t pad[3]; + } unlink; - } u; + } u; - /* urb data segments */ - struct usbif_request_segment seg[USBIF_MAX_SEGMENTS_PER_REQUEST]; + /* urb data segments */ + struct usbif_request_segment seg[USBIF_MAX_SEGMENTS_PER_REQUEST]; }; typedef struct usbif_urb_request usbif_urb_request_t; struct usbif_urb_response { - uint16_t id; /* request id */ - uint16_t start_frame; /* start frame (ISO) */ - int32_t status; /* status (non-ISO) */ -#define USBIF_STATUS_OK 0 -#define USBIF_STATUS_NODEV (-19) -#define USBIF_STATUS_INVAL (-22) -#define USBIF_STATUS_STALL (-32) -#define USBIF_STATUS_IOERROR (-71) -#define USBIF_STATUS_BABBLE (-75) -#define USBIF_STATUS_SHUTDOWN (-108) - int32_t actual_length; /* actual transfer length */ - int32_t error_count; /* number of ISO errors */ + uint16_t id; /* request id */ + uint16_t start_frame; /* start frame (ISO) */ + int32_t status; /* status (non-ISO) */ +#define USBIF_STATUS_OK 0 +#define USBIF_STATUS_NODEV (-19) +#define USBIF_STATUS_INVAL (-22) +#define USBIF_STATUS_STALL (-32) +#define USBIF_STATUS_IOERROR (-71) +#define USBIF_STATUS_BABBLE (-75) +#define USBIF_STATUS_SHUTDOWN (-108) + int32_t actual_length; /* actual transfer length */ + int32_t error_count; /* number of ISO errors */ }; typedef struct usbif_urb_response usbif_urb_response_t; @@ -404,18 +404,18 @@ DEFINE_RING_TYPES(usbif_urb, struct usbif_urb_request, struct usbif_urb_response * RING for notifying connect/disconnect events to frontend */ struct usbif_conn_request { - uint16_t id; + uint16_t id; }; typedef struct usbif_conn_request usbif_conn_request_t; struct usbif_conn_response { - uint16_t id; /* request id */ - uint8_t portnum; /* port number */ - uint8_t speed; /* usb_device_speed */ -#define USBIF_SPEED_NONE 0 -#define USBIF_SPEED_LOW 1 -#define USBIF_SPEED_FULL 2 -#define USBIF_SPEED_HIGH 3 + uint16_t id; /* request id */ + uint8_t portnum; /* port number */ + uint8_t speed; /* usb_device_speed */ +#define USBIF_SPEED_NONE 0 +#define USBIF_SPEED_LOW 1 +#define USBIF_SPEED_FULL 2 +#define USBIF_SPEED_HIGH 3 }; typedef struct usbif_conn_response usbif_conn_response_t; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 01 23:33:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 Oct 2021 23:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200856.355408 (Exim 4.92) (envelope-from ) id 1mWS1b-0005Kr-0I; Fri, 01 Oct 2021 23:33:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200856.355408; Fri, 01 Oct 2021 23:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWS1a-0005Kj-TQ; Fri, 01 Oct 2021 23:33:06 +0000 Received: by outflank-mailman (input) for mailman id 200856; Fri, 01 Oct 2021 23:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWS1Y-0005Kd-Uu for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 23:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWS1Y-0006ya-SY for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 23:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mWS1Y-00033D-RN for xen-changelog@lists.xenproject.org; Fri, 01 Oct 2021 23:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+Xoi/rpCLP0j1R1H/tiGrmxTdosjzHcP7p+77P522NM=; b=ZQg7a20Y/N5VwzP8yIgoxx4aCY 6OizJ/kD3KwMFNQFiW3nyAhLuywZJzcLvAmssOx2nuASykSXHH+MMRFwWgrXqdOb4ZAaHKbhf6V79 HC7sNyQzvgG2AqFXyCtSj9ExtD5AQ+o3uTlhcO88ZJm0XhInGEhxDdOQ/a5yrJ9D2tW8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/efi: Introduce xen,uefi-cfg-load DT property Message-Id: Date: Fri, 01 Oct 2021 23:33:04 +0000 commit 60649d443dc395243e74d2b3e05594ac0c43cfe3 Author: Luca Fancellu AuthorDate: Thu Sep 30 15:28:44 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 1 16:26:04 2021 -0700 arm/efi: Introduce xen,uefi-cfg-load DT property Introduce the xen,uefi-cfg-load DT property of /chosen node for ARM whose presence decide whether to force the load of the UEFI Xen configuration file. The logic is that if any multiboot,module is found in the DT, then the xen,uefi-cfg-load property is used to see if the UEFI Xen configuration file is needed. Modify a comment in efi_arch_use_config_file, removing the part that states "dom0 required" because it's not true anymore with this commit. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- docs/misc/arm/device-tree/booting.txt | 8 ++++++++ docs/misc/efi.pandoc | 2 ++ xen/arch/arm/efi/efi-boot.h | 28 +++++++++++++++++++++++----- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 44cd9e1a9a..352b0ec43a 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -121,6 +121,14 @@ A Xen-aware bootloader would set xen,xen-bootargs for Xen, xen,dom0-bootargs for Dom0 and bootargs for native Linux. +UEFI boot and DT +================ + +When Xen is booted using UEFI, it doesn't read the configuration file if any +multiboot module is specified. To force Xen to load the configuration file, the +boolean property xen,uefi-cfg-load must be declared in the /chosen node. + + Creating Multiple Domains directly from Xen =========================================== diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index ac3cd58cae..ed85351541 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -14,6 +14,8 @@ loaded the modules and describes them in the device tree provided to Xen. If a bootloader provides a device tree containing modules then any configuration files are ignored, and the bootloader is responsible for populating all relevant device tree nodes. +The property "xen,uefi-cfg-load" can be specified in the /chosen node to force +Xen to load the configuration file even if multiboot modules are found. Once built, `make install-xen` will place the resulting binary directly into the EFI boot partition, provided `EFI_VENDOR` is set in the environment (and diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index cf9c37153f..a3e46453d4 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -581,22 +581,40 @@ static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) static bool __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) { + bool load_cfg_file = true; /* * For arm, we may get a device tree from GRUB (or other bootloader) * that contains modules that have already been loaded into memory. In - * this case, we do not use a configuration file, and rely on the - * bootloader to have loaded all required modules and appropriate - * options. + * this case, we search for the property xen,uefi-cfg-load in the /chosen + * node to decide whether to skip the UEFI Xen configuration file or not. */ fdt = lookup_fdt_config_table(SystemTable); dtbfile.ptr = fdt; dtbfile.need_to_free = false; /* Config table memory can't be freed. */ - if ( !fdt || fdt_node_offset_by_compatible(fdt, 0, "multiboot,module") < 0 ) + + if ( fdt_node_offset_by_compatible(fdt, 0, "multiboot,module") > 0 ) + { + /* Locate chosen node */ + int node = fdt_subnode_offset(fdt, 0, "chosen"); + const void *cfg_load_prop; + int cfg_load_len; + + if ( node > 0 ) + { + /* Check if xen,uefi-cfg-load property exists */ + cfg_load_prop = fdt_getprop(fdt, node, "xen,uefi-cfg-load", + &cfg_load_len); + if ( !cfg_load_prop ) + load_cfg_file = false; + } + } + + if ( !fdt || load_cfg_file ) { /* * We either have no FDT, or one without modules, so we must have a - * Xen EFI configuration file to specify modules. (dom0 required) + * Xen EFI configuration file to specify modules. */ return true; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Oct 02 00:44:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Oct 2021 00:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.200892.355456 (Exim 4.92) (envelope-from ) id 1mWT8H-0006RB-J4; Sat, 02 Oct 2021 00:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 200892.355456; Sat, 02 Oct 2021 00:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWT8H-0006R3-G6; Sat, 02 Oct 2021 00:44:05 +0000 Received: by outflank-mailman (input) for mailman id 200892; Sat, 02 Oct 2021 00:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWT8G-0006Qx-DY for xen-changelog@lists.xenproject.org; Sat, 02 Oct 2021 00:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mWT8G-0000Io-Ca for xen-changelog@lists.xenproject.org; Sat, 02 Oct 2021 00:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mWT8G-0000og-BT for xen-changelog@lists.xenproject.org; Sat, 02 Oct 2021 00:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hGStsLF3zsj52FKveL7NgGCxA5aaIsZAZDkSwd7UmRo=; b=EdEG+GR+kjfeoIEiUhedzjbHRZ 7OmswwHqBKDtzqHqwwbV02AEuspHnHBeYemwbfdODS7W/B5rvZbtoef+hMNDzF80mYv/fbQv6RPLn rch4pBb8/+yVQozc3ZbALli609EAvGe5dQ0zTzj1uc1Tf/frIxipUUYQHn9ApDXisheQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add handling of extended regions for Dom0 Message-Id: Date: Sat, 02 Oct 2021 00:44:04 +0000 commit b6fe410936e30b2089cc8c6d54d786e535efafa3 Author: Oleksandr Tyshchenko AuthorDate: Thu Sep 30 01:52:06 2021 +0300 Commit: Stefano Stabellini CommitDate: Fri Oct 1 17:29:22 2021 -0700 xen/arm: Add handling of extended regions for Dom0 The extended region (safe range) is a region of guest physical address space which is unused and could be safely used to create grant/foreign mappings instead of wasting real RAM pages from the domain memory for establishing these mappings. The extended regions are chosen at the domain creation time and advertised to it via "reg" property under hypervisor node in the guest device-tree. As region 0 is reserved for grant table space (always present), the indexes for extended regions are 1...N. If extended regions could not be allocated for some reason, Xen doesn't fail and behaves as usual, so only inserts region 0. Please note the following limitations: - The extended region feature is only supported for 64-bit domain currently. - The ACPI case is not covered. *** As Dom0 is direct mapped domain on Arm (e.g. MFN == GFN) the algorithm to choose extended regions for it is different in comparison with the algorithm for non-direct mapped DomU. What is more, that extended regions should be chosen differently whether IOMMU is enabled or not. Provide RAM not assigned to Dom0 if IOMMU is disabled or memory holes found in host device-tree if otherwise. Make sure that extended regions are 2MB-aligned and located within maximum possible addressable physical memory range. The minimum size of extended region is 64MB. The maximum number of extended regions is 128, which is an artificial limit to minimize code changes (we reuse struct meminfo to describe extended regions, so there are an array field for 128 elements). It worth mentioning that unallocated memory solution (when the IOMMU is disabled) will work safely until Dom0 is able to allocate memory outside of the original range. Also introduce command line option to be able to globally enable or disable support for extended regions for Dom0 (enabled by default). Suggested-by: Julien Grall Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- docs/misc/xen-command-line.pandoc | 11 ++ xen/arch/arm/domain_build.c | 286 +++++++++++++++++++++++++++++++++++++- 2 files changed, 294 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 177e656f12..5cae4adc58 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1081,6 +1081,17 @@ hardware domain is architecture dependent. Note that specifying zero as domU value means zero, while for dom0 it means to use the default. +### ext_regions (Arm) +> `= ` + +> Default : `true` + +Flag to enable or disable support for extended regions for Dom0. + +Extended regions are ranges of unused address space exposed to Dom0 as +"safe to use" for special memory mappings. Disable if your board device +tree is incomplete. + ### flask > `= permissive | enforcing | late | disabled` diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d233d634c1..c5afbe2e05 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -34,6 +34,10 @@ static unsigned int __initdata opt_dom0_max_vcpus; integer_param("dom0_max_vcpus", opt_dom0_max_vcpus); +/* If true, the extended regions support is enabled for dom0 */ +static bool __initdata opt_ext_regions = true; +boolean_param("ext_regions", opt_ext_regions); + static u64 __initdata dom0_mem; static bool __initdata dom0_mem_set; @@ -886,6 +890,232 @@ static int __init make_memory_node(const struct domain *d, return res; } +static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) +{ + struct meminfo *ext_regions = data; + paddr_t start, size; + + if ( ext_regions->nr_banks >= ARRAY_SIZE(ext_regions->bank) ) + return 0; + + /* Both start and size of the extended region should be 2MB aligned */ + start = (s + SZ_2M - 1) & ~(SZ_2M - 1); + if ( start > e ) + return 0; + + /* + * e is actually "end-1" because it is called by rangeset functions + * which are inclusive of the last address. + */ + e += 1; + size = (e - start) & ~(SZ_2M - 1); + if ( size < MB(64) ) + return 0; + + ext_regions->bank[ext_regions->nr_banks].start = start; + ext_regions->bank[ext_regions->nr_banks].size = size; + ext_regions->nr_banks++; + + return 0; +} + +static int __init find_unallocated_memory(const struct kernel_info *kinfo, + struct meminfo *ext_regions) +{ + const struct meminfo *assign_mem = &kinfo->mem; + struct rangeset *unalloc_mem; + paddr_t start, end; + unsigned int i; + int res; + + dt_dprintk("Find unallocated memory for extended regions\n"); + + unalloc_mem = rangeset_new(NULL, NULL, 0); + if ( !unalloc_mem ) + return -ENOMEM; + + /* Start with all available RAM */ + for ( i = 0; i < bootinfo.mem.nr_banks; i++ ) + { + start = bootinfo.mem.bank[i].start; + end = bootinfo.mem.bank[i].start + bootinfo.mem.bank[i].size; + res = rangeset_add_range(unalloc_mem, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + + /* Remove RAM assigned to Dom0 */ + for ( i = 0; i < assign_mem->nr_banks; i++ ) + { + start = assign_mem->bank[i].start; + end = assign_mem->bank[i].start + assign_mem->bank[i].size; + res = rangeset_remove_range(unalloc_mem, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + + /* Remove reserved-memory regions */ + for ( i = 0; i < bootinfo.reserved_mem.nr_banks; i++ ) + { + start = bootinfo.reserved_mem.bank[i].start; + end = bootinfo.reserved_mem.bank[i].start + + bootinfo.reserved_mem.bank[i].size; + res = rangeset_remove_range(unalloc_mem, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + + /* Remove grant table region */ + start = kinfo->gnttab_start; + end = kinfo->gnttab_start + kinfo->gnttab_size; + res = rangeset_remove_range(unalloc_mem, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + + start = 0; + end = (1ULL << p2m_ipa_bits) - 1; + res = rangeset_report_ranges(unalloc_mem, start, end, + add_ext_regions, ext_regions); + if ( res ) + ext_regions->nr_banks = 0; + else if ( !ext_regions->nr_banks ) + res = -ENOENT; + +out: + rangeset_destroy(unalloc_mem); + + return res; +} + +static int __init find_memory_holes(const struct kernel_info *kinfo, + struct meminfo *ext_regions) +{ + struct dt_device_node *np; + struct rangeset *mem_holes; + paddr_t start, end; + unsigned int i; + int res; + + dt_dprintk("Find memory holes for extended regions\n"); + + mem_holes = rangeset_new(NULL, NULL, 0); + if ( !mem_holes ) + return -ENOMEM; + + /* Start with maximum possible addressable physical memory range */ + start = 0; + end = (1ULL << p2m_ipa_bits) - 1; + res = rangeset_add_range(mem_holes, start, end); + if ( res ) + { + printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + + /* + * Remove regions described by "reg" and "ranges" properties where + * the memory is addressable (MMIO, RAM, PCI BAR, etc). + */ + dt_for_each_device_node( dt_host, np ) + { + unsigned int naddr; + u64 addr, size; + + naddr = dt_number_of_address(np); + + for ( i = 0; i < naddr; i++ ) + { + res = dt_device_get_address(np, i, &addr, &size); + if ( res ) + { + printk(XENLOG_ERR "Unable to retrieve address %u for %s\n", + i, dt_node_full_name(np)); + goto out; + } + + start = addr & PAGE_MASK; + end = PAGE_ALIGN(addr + size); + res = rangeset_remove_range(mem_holes, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + + if ( dt_device_type_is_equal(np, "pci" ) ) + { + unsigned int range_size, nr_ranges; + int na, ns, pna; + const __be32 *ranges; + u32 len; + + /* + * Looking for non-empty ranges property which in this context + * describes the PCI host bridge aperture. + */ + ranges = dt_get_property(np, "ranges", &len); + if ( !ranges || !len ) + continue; + + pna = dt_n_addr_cells(np); + na = dt_child_n_addr_cells(np); + ns = dt_child_n_size_cells(np); + range_size = pna + na + ns; + nr_ranges = len / sizeof(__be32) / range_size; + + for ( i = 0; i < nr_ranges; i++, ranges += range_size ) + { + /* Skip the child address and get the parent (CPU) address */ + addr = dt_read_number(ranges + na, pna); + size = dt_read_number(ranges + na + pna, ns); + + start = addr & PAGE_MASK; + end = PAGE_ALIGN(addr + size); + res = rangeset_remove_range(mem_holes, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + } + } + + start = 0; + end = (1ULL << p2m_ipa_bits) - 1; + res = rangeset_report_ranges(mem_holes, start, end, + add_ext_regions, ext_regions); + if ( res ) + ext_regions->nr_banks = 0; + else if ( !ext_regions->nr_banks ) + res = -ENOENT; + +out: + rangeset_destroy(mem_holes); + + return res; +} + static int __init make_hypervisor_node(struct domain *d, const struct kernel_info *kinfo, int addrcells, int sizecells) @@ -893,11 +1123,12 @@ static int __init make_hypervisor_node(struct domain *d, const char compat[] = "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" "xen,xen"; - __be32 reg[4]; + __be32 *reg, *cells; gic_interrupt_t intr; - __be32 *cells; int res; void *fdt = kinfo->fdt; + struct meminfo *ext_regions = NULL; + unsigned int i, nr_ext_regions; dt_dprintk("Create hypervisor node\n"); @@ -919,12 +1150,61 @@ static int __init make_hypervisor_node(struct domain *d, if ( res ) return res; + if ( !opt_ext_regions ) + { + printk(XENLOG_DEBUG "The extended regions support is disabled\n"); + nr_ext_regions = 0; + } + else if ( is_32bit_domain(d) ) + { + printk(XENLOG_DEBUG "The extended regions are only supported for 64-bit guest currently\n"); + nr_ext_regions = 0; + } + else + { + ext_regions = xzalloc(struct meminfo); + if ( !ext_regions ) + return -ENOMEM; + + if ( !is_iommu_enabled(d) ) + res = find_unallocated_memory(kinfo, ext_regions); + else + res = find_memory_holes(kinfo, ext_regions); + + if ( res ) + printk(XENLOG_WARNING "Failed to allocate extended regions\n"); + nr_ext_regions = ext_regions->nr_banks; + } + + reg = xzalloc_array(__be32, (nr_ext_regions + 1) * (addrcells + sizecells)); + if ( !reg ) + { + xfree(ext_regions); + return -ENOMEM; + } + /* reg 0 is grant table space */ cells = ®[0]; dt_child_set_range(&cells, addrcells, sizecells, kinfo->gnttab_start, kinfo->gnttab_size); + /* reg 1...N are extended regions */ + for ( i = 0; i < nr_ext_regions; i++ ) + { + u64 start = ext_regions->bank[i].start; + u64 size = ext_regions->bank[i].size; + + dt_dprintk("Extended region %d: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + dt_child_set_range(&cells, addrcells, sizecells, start, size); + } + res = fdt_property(fdt, "reg", reg, - dt_cells_to_size(addrcells + sizecells)); + dt_cells_to_size(addrcells + sizecells) * + (nr_ext_regions + 1)); + xfree(ext_regions); + xfree(reg); + if ( res ) return res; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 01:00:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 01:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.201866.356500 (Exim 4.92) (envelope-from ) id 1mXYoP-0004Ul-OH; Tue, 05 Oct 2021 01:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 201866.356500; Tue, 05 Oct 2021 01:00:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoP-0004Tu-Ki; Tue, 05 Oct 2021 01:00:05 +0000 Received: by outflank-mailman (input) for mailman id 201866; Tue, 05 Oct 2021 01:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoP-0004E7-20 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoO-00025y-W4 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXYoO-0005v7-Th for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fQIf33ydgUazj/YFHJmzTrJ/hCQpP9+VB9Q3ym7lLHU=; b=I6+InttCtWmpPONgS4DQxPN3tD CVJ5oeNBTfKIP/RsFp81oXvRQPkkSB3SLZrsbg4n624wrGnHVXrBIj1aLYSNbFsbnJ194XnJQQysw W9aRJ2QRyqVBf0NmvyutD2I7c2FXIKuN2Sd1cRKBxSoIBnzTXsZsZlg+CzVdYf9jvD94=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/pci: gate APEI support on ARM Message-Id: Date: Tue, 05 Oct 2021 01:00:04 +0000 commit 4b88b4bf21afedb5408860430e1d943aa386e0fb Author: Rahul Singh AuthorDate: Mon Oct 4 12:51:56 2021 +0100 Commit: Stefano Stabellini CommitDate: Mon Oct 4 17:39:59 2021 -0700 xen/pci: gate APEI support on ARM APEI not supported on ARM yet move the code under CONFIG_X86 flag to gate the code for ARM. This patch is the preparatory work to enable HAS_PCI on ARM to avoid compilation error on ARM. prelink.o: In function `pcie_aer_get_firmware_first’: drivers/passthrough/pci.c:1251: undefined reference to `apei_hest_parse' Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini Acked-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/drivers/passthrough/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 5456ca3a63..e1b735d9e8 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -1149,7 +1149,8 @@ void __hwdom_init setup_hwdom_pci_devices( pcidevs_unlock(); } -#ifdef CONFIG_ACPI +/* APEI not supported on ARM yet. */ +#if defined(CONFIG_ACPI) && defined(CONFIG_X86) #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 01:00:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 01:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.201867.356503 (Exim 4.92) (envelope-from ) id 1mXYoZ-0007y5-Pv; Tue, 05 Oct 2021 01:00:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 201867.356503; Tue, 05 Oct 2021 01:00:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoZ-0007xn-MY; Tue, 05 Oct 2021 01:00:15 +0000 Received: by outflank-mailman (input) for mailman id 201867; Tue, 05 Oct 2021 01:00:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoZ-0007lG-4g for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoZ-0006Tj-3n for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXYoZ-0005wk-29 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oiP3Mrbw1thjR5fxqVTzQjYq344DLD01Xl/Vi4aTBAI=; b=y205GgBY6ZHYOmKO5MI/Jdr3L/ Rkw7nzOs1gqgOrM/X3mnszC/PRsZE9tzUiK/zmDym3U+KT26wqaMB6qjK0/hEDoXgsPAqLSgeHoTC la8v8PU1aGKeCdK++E9VpMRzpiBDeUvzlTv+4V1x3U12KKMfYhzW16bx4aPDCBaxkSHc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/pci: Include asm/pci.h after pci_sbdf_t in xen/pci.h Message-Id: Date: Tue, 05 Oct 2021 01:00:15 +0000 commit 58ce57a11a28f0202d9ab12fdce995b7934de8d1 Author: Rahul Singh AuthorDate: Mon Oct 4 12:51:59 2021 +0100 Commit: Stefano Stabellini CommitDate: Mon Oct 4 17:40:25 2021 -0700 xen/pci: Include asm/pci.h after pci_sbdf_t in xen/pci.h Prototypes declared in asm/pci.h that take argument of type pci_sbdf_t are included in xen/pci.h before defining pci_sbdf_t. Include asm/pci.h after pci_sbdf_t in xen/pci.h to fix the issue. Signed-off-by: Rahul Singh Acked-by: Jan Beulich --- xen/include/xen/pci.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 8e3d4d9454..70ac25345c 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -15,7 +15,6 @@ #include #include #include -#include /* * The PCI interface treats multi-function devices as independent @@ -62,6 +61,8 @@ typedef union { }; } pci_sbdf_t; +#include + struct pci_dev_info { /* * VF's 'is_extfn' field is used to indicate whether its PF is an extended -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 01:00:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 01:00:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.201868.356508 (Exim 4.92) (envelope-from ) id 1mXYoj-0002yn-SG; Tue, 05 Oct 2021 01:00:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 201868.356508; Tue, 05 Oct 2021 01:00:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoj-0002yO-P9; Tue, 05 Oct 2021 01:00:25 +0000 Received: by outflank-mailman (input) for mailman id 201868; Tue, 05 Oct 2021 01:00:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoj-0002li-7g for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYoj-0001zL-6w for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXYoj-0005xU-5y for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0rmeQgyHDMx2Pdq2lF9I2GU3nfbhG0VXEZHjrNJVWbo=; b=WeCPwNiBpPBwRCDP6lFhI314K5 +9OHI4+ZsFjfEJEeZmomgMurihchgFEOrt3vwRfLNNOuDTgMrsOX+xccszh/HMkflLYRfKkVDkg49 5OPM2vEZZCXYoDsIrko5oOLR1nfiIJVrbjBK0mz13cjHdVwxRjC0ODzKLTloI78bqECg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add support for PCI init to initialize the PCI driver. Message-Id: Date: Tue, 05 Oct 2021 01:00:25 +0000 commit efbd25c4f2133e00ed2f32215f458ea28035b7fb Author: Rahul Singh AuthorDate: Mon Oct 4 12:52:00 2021 +0100 Commit: Stefano Stabellini CommitDate: Mon Oct 4 17:46:30 2021 -0700 xen/arm: Add support for PCI init to initialize the PCI driver. pci_init(..) will be called during xen startup to initialize and probe the PCI host-bridge driver. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/arch/arm/pci/pci.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/device.h | 1 + 2 files changed, 52 insertions(+) diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index a7a7bc3213..e359bab9ea 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -12,6 +12,10 @@ * along with this program. If not, see . */ +#include +#include +#include +#include #include /* @@ -22,6 +26,53 @@ int arch_pci_clean_pirqs(struct domain *d) return 0; } +static int __init dt_pci_init(void) +{ + struct dt_device_node *np; + int rc; + + dt_for_each_device_node(dt_host, np) + { + rc = device_init(np, DEVICE_PCI, NULL); + /* + * Ignore the following error codes: + * - EBADF: Indicate the current device is not a pci device. + * - ENODEV: The pci device is not present or cannot be used by + * Xen. + */ + if( !rc || rc == -EBADF || rc == -ENODEV ) + continue; + + return rc; + } + + return 0; +} + +#ifdef CONFIG_ACPI +static int __init acpi_pci_init(void) +{ + printk(XENLOG_ERR "ACPI pci init not supported \n"); + return -EOPNOTSUPP; +} +#else +static int __init acpi_pci_init(void) +{ + return -EINVAL; +} +#endif + +static int __init pci_init(void) +{ + pci_segments_init(); + + if ( acpi_disabled ) + return dt_pci_init(); + else + return acpi_pci_init(); +} +__initcall(pci_init); + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index ee7cff2d44..5ecd5e7bd1 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -34,6 +34,7 @@ enum device_class DEVICE_SERIAL, DEVICE_IOMMU, DEVICE_GIC, + DEVICE_PCI, /* Use for error */ DEVICE_UNKNOWN, }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 01:00:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 01:00:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.201869.356512 (Exim 4.92) (envelope-from ) id 1mXYou-0006u5-Tk; Tue, 05 Oct 2021 01:00:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 201869.356512; Tue, 05 Oct 2021 01:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYou-0006tZ-Qg; Tue, 05 Oct 2021 01:00:36 +0000 Received: by outflank-mailman (input) for mailman id 201869; Tue, 05 Oct 2021 01:00:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYot-0006Mk-Ak for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXYot-0006Ip-A2 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXYot-0005yP-8y for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 01:00:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bOJIpGy4XGRsO8JWyvHOVPYpM/iGNL8Lly0zv0dCjVY=; b=0LR+iilJKQeQp4ui+k/x1N7GT+ sju8j8jHKGyzTYcKgwrC0L3z+xEm3oRKq/RW+W/WzEy/HW9VxmGf1i1rHzAmtcYhpHuyJRuZCq2o5 a6FwImwpcz5f4IlFRHlhqqZ/CUaBa6vWXPtXRUR5/amI5ApngXzJTxEBvXhdmL6sL3jU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Fix dev_is_dt macro definition Message-Id: Date: Tue, 05 Oct 2021 01:00:35 +0000 commit d6bdad32cbb5dfbc68fac32078cc5882071c4f1d Author: Oleksandr Andrushchenko AuthorDate: Mon Oct 4 17:11:41 2021 +0300 Commit: Stefano Stabellini CommitDate: Mon Oct 4 17:53:56 2021 -0700 xen/arm: Fix dev_is_dt macro definition This macro is not currently used, but still has an error in it: a missing parenthesis. Fix this, so the macro is properly defined. Fixes: 6c5d3075d97e ("xen/arm: Introduce a generic way to describe device") Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Stefano Stabellini Reviewed-by: Michal Orzel --- xen/include/asm-arm/device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 5ecd5e7bd1..ebe84ea853 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -27,7 +27,7 @@ typedef struct device device_t; /* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */ #define dev_is_pci(dev) ((void)(dev), 0) -#define dev_is_dt(dev) ((dev->type == DEV_DT) +#define dev_is_dt(dev) ((dev)->type == DEV_DT) enum device_class { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:44:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:44:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202323.357069 (Exim 4.92) (envelope-from ) id 1mXpQ4-0001Lj-V1; Tue, 05 Oct 2021 18:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202323.357069; Tue, 05 Oct 2021 18: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 1mXpQ4-0001L6-Ra; Tue, 05 Oct 2021 18:44:04 +0000 Received: by outflank-mailman (input) for mailman id 202323; Tue, 05 Oct 2021 18:44:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQ3-0001JQ-5f for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQ2-0001pB-Ph for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpQ2-00078J-Ow for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18: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=FtW+b1afYswJzkLTyUbNgayM2o3e2vp0YemxcB8SoJU=; b=Si7r7ZQZYO3x77oAPGWxGAIbAg ZnMNq0yUu15xCJpKbi5n2StFO0MzD+RsE8PLcls70mTnnqvOS5ixPe9YNfKudQ7GDZUYEjbFrIuL1 BiGAQsDiX86tJ1vpyjQRJCU8yeJXXsvq6VUofHVQWXtOB6rGcnSe42iu8EPIU2BGQsok=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Implement xen/alternative-call.h for use in common code Message-Id: Date: Tue, 05 Oct 2021 18:44:02 +0000 commit f26bb285949b8c233816c4c6a87237ee14a06ebc Author: Andrew Cooper AuthorDate: Fri Sep 10 16:12:56 2021 -0400 Commit: Andrew Cooper CommitDate: Fri Sep 10 20:30:26 2021 +0100 xen: Implement xen/alternative-call.h for use in common code The alternative call infrastructure is x86-only for now, but the common iommu code has a variant and more common code wants to use the infrastructure. Introduce CONFIG_ALTERNATIVE_CALL and a conditional implementation so common code can use the optimisation when available, without requiring all architectures to implement no-op stubs. Write some documentation, which was thus far entirely absent, covering the requirements for an architecture to implement this optimisation, and how to use the infrastructure in general code. Signed-off-by: Andrew Cooper Signed-off-by: Daniel P. Smith Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 3 ++ xen/include/xen/alternative-call.h | 63 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 9b164db641..1f83518ee0 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -6,6 +6,7 @@ config X86 def_bool y select ACPI select ACPI_LEGACY_TABLES_LOOKUP + select ALTERNATIVE_CALL select ARCH_SUPPORTS_INT128 select CORE_PARKING select HAS_ALTERNATIVE diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0ddd18e11a..ac5491b1cc 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -22,6 +22,9 @@ config GRANT_TABLE If unsure, say Y. +config ALTERNATIVE_CALL + bool + config HAS_ALTERNATIVE bool diff --git a/xen/include/xen/alternative-call.h b/xen/include/xen/alternative-call.h new file mode 100644 index 0000000000..c2d3b70e31 --- /dev/null +++ b/xen/include/xen/alternative-call.h @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef XEN_ALTERNATIVE_CALL +#define XEN_ALTERNATIVE_CALL + +/* + * Some subsystems in Xen may have multiple implementations, which can be + * resolved to a single implementation at boot time. By default, this will + * result in the use of function pointers. + * + * Some architectures may have mechanisms for dynamically modifying .text. + * Using this mechanism, function pointers can be converted to direct calls + * which are typically more efficient at runtime. + * + * For architectures to support: + * + * - Implement alternative_{,v}call() in asm/alternative.h. Code generation + * requirements are to emit a function pointer call at build time, and stash + * enough metadata to simplify the call at boot once the implementation has + * been resolved. + * - Select ALTERNATIVE_CALL in Kconfig. + * + * To use: + * + * Consider the following simplified example. + * + * 1) struct foo_ops __alt_call_maybe_initdata ops; + * + * 2) const struct foo_ops __initconstrel foo_a_ops = { ... }; + * const struct foo_ops __initconstrel foo_b_ops = { ... }; + * + * void __init foo_init(void) + * { + * ... + * if ( use_impl_a ) + * ops = *foo_a_ops; + * else if ( use_impl_b ) + * ops = *foo_b_ops; + * ... + * } + * + * 3) alternative_call(ops.bar, ...); + * + * There needs to a single ops object (1) which will eventually contain the + * function pointers. This should be populated in foo's init() function (2) + * by one of the available implementations. To call functions, use + * alternative_{,v}call() referencing the main ops object (3). + */ + +#ifdef CONFIG_ALTERNATIVE_CALL + +#include + +#define __alt_call_maybe_initdata __initdata + +#else + +#define alternative_call(func, args...) (func)(args) +#define alternative_vcall(func, args...) (func)(args) + +#define __alt_call_maybe_initdata __read_mostly + +#endif /* !CONFIG_ALTERNATIVE_CALL */ +#endif /* XEN_ALTERNATIVE_CALL */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:44:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202331.357074 (Exim 4.92) (envelope-from ) id 1mXpQE-0001Tx-W8; Tue, 05 Oct 2021 18:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202331.357074; Tue, 05 Oct 2021 18: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 1mXpQE-0001Tp-TH; Tue, 05 Oct 2021 18:44:14 +0000 Received: by outflank-mailman (input) for mailman id 202331; Tue, 05 Oct 2021 18:44:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQD-0001St-2t for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQD-0001pf-22 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpQC-0007us-SQ for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18: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=Al3Ilq6mySLrfxt41M0bMQ9db0qW+aaH/z1476wWvII=; b=OeOauh9WlPOn0KrW5ifQokN6tw DHr6B8iAX0LivcHPHin0liCZuZForjqggkSDsyZT2QdoT9T6hvYNZboUNkHhV5+TVAWUIarR1VcRf /fkxeUMXBkCf+O7MBaygoLRIeARI2OyAoVrnlPm74tMHJhN8cvDQEpY2lyeLHnmgnfLU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm: remove the ability to disable flask Message-Id: Date: Tue, 05 Oct 2021 18:44:12 +0000 commit 4624912c0b5505387e53a12ef3417d001431a29d Author: Daniel P. Smith AuthorDate: Fri Sep 10 16:12:57 2021 -0400 Commit: Andrew Cooper CommitDate: Fri Sep 10 20:30:26 2021 +0100 xsm: remove the ability to disable flask On Linux when SELinux is put into permissive mode the discretionary access controls are still in place. Whereas for Xen when the enforcing state of flask is set to permissive, all operations for all domains would succeed, i.e. it does not fall back to the default access controls. To provide a means to mimic a similar but not equivalent behaviour, a flask op is present to allow a one-time switch back to the default access controls, aka the "dummy policy". While this may be desirable for an OS, Xen is a hypervisor and should not allow the switching of which security policy framework is being enforced after boot. This patch removes the flask op to enforce the desired XSM usage model requiring a reboot of Xen to change the XSM policy module in use. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/include/public/xsm/flask_op.h | 2 +- xen/xsm/flask/flask_op.c | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/xen/include/public/xsm/flask_op.h b/xen/include/public/xsm/flask_op.h index 16af7bc22f..b41dd6dac8 100644 --- a/xen/include/public/xsm/flask_op.h +++ b/xen/include/public/xsm/flask_op.h @@ -188,7 +188,7 @@ struct xen_flask_op { #define FLASK_SETBOOL 12 #define FLASK_COMMITBOOLS 13 #define FLASK_MLS 14 -#define FLASK_DISABLE 15 +#define FLASK_DISABLE 15 /* No longer implemented */ #define FLASK_GETAVC_THRESHOLD 16 #define FLASK_SETAVC_THRESHOLD 17 #define FLASK_AVC_HASHSTATS 18 diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 01e52138a1..f41c025391 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -223,32 +223,6 @@ static int flask_security_sid(struct xen_flask_sid_context *arg) #ifndef COMPAT -static int flask_disable(void) -{ - static int flask_disabled = 0; - - if ( ss_initialized ) - { - /* Not permitted after initial policy load. */ - return -EINVAL; - } - - if ( flask_disabled ) - { - /* Only do this once. */ - return -EINVAL; - } - - printk("Flask: Disabled at runtime.\n"); - - flask_disabled = 1; - - /* Reset xsm_ops to the original module. */ - xsm_ops = &dummy_xsm_ops; - - return 0; -} - static int flask_security_setavc_threshold(struct xen_flask_setavc_threshold *arg) { int rv = 0; @@ -698,10 +672,6 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) rv = flask_mls_enabled; break; - case FLASK_DISABLE: - rv = flask_disable(); - break; - case FLASK_GETAVC_THRESHOLD: rv = avc_cache_threshold; break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:44:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:44:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202339.357078 (Exim 4.92) (envelope-from ) id 1mXpQP-0001dC-1g; Tue, 05 Oct 2021 18:44:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202339.357078; Tue, 05 Oct 2021 18:44:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQO-0001d4-Un; Tue, 05 Oct 2021 18:44:24 +0000 Received: by outflank-mailman (input) for mailman id 202339; Tue, 05 Oct 2021 18:44:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQN-0001ax-6Q for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQN-0001ps-5e for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpQN-00007l-4Z for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Jo7KgOatnWx/JqjOltO7y2N39s8v38Jpo9slR3IJlmk=; b=f6W+kwmvF+sVh5wCPw1h1ldJDB wcT/rVgJZ9LeORA0jpNUeT6zUM53xo9Ys1qObMAsKryvIRJzCpmRJy6O+aYaGJmo3yl2/d1chuwmT yV2WTFX9s79jYcA13D3TJTU2phsl/TPB8jei58pDErO+KyAeXvid/6OZ7vmiYHTpg2sE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm: remove remnants of xsm_memtype hook Message-Id: Date: Tue, 05 Oct 2021 18:44:23 +0000 commit 2928c1d250b157fd4585ca47ba36ad4792723f1f Author: Daniel P. Smith AuthorDate: Fri Sep 10 16:12:58 2021 -0400 Commit: Andrew Cooper CommitDate: Fri Sep 10 20:30:26 2021 +0100 xsm: remove remnants of xsm_memtype hook In c/s fcb8baddf00e the xsm_memtype hook was removed but some remnants were left behind. This commit cleans up those remnants. Signed-off-by: Daniel P. Smith Acked-by: Jan Beulich --- xen/include/xsm/xsm.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index ad3cddbf7d..335ba1b022 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -161,7 +161,6 @@ struct xsm_operations { int (*shadow_control) (struct domain *d, uint32_t op); int (*mem_sharing_op) (struct domain *d, struct domain *cd, int op); int (*apic) (struct domain *d, int cmd); - int (*memtype) (uint32_t access); int (*machine_memory_map) (void); int (*domain_memory_map) (struct domain *d); #define XSM_MMU_UPDATE_READ 1 @@ -632,11 +631,6 @@ static inline int xsm_apic (xsm_default_t def, struct domain *d, int cmd) return xsm_ops->apic(d, cmd); } -static inline int xsm_memtype (xsm_default_t def, uint32_t access) -{ - return xsm_ops->memtype(access); -} - static inline int xsm_machine_memory_map(xsm_default_t def) { return xsm_ops->machine_memory_map(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:44:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:44:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202343.357083 (Exim 4.92) (envelope-from ) id 1mXpQZ-0001kP-4B; Tue, 05 Oct 2021 18:44:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202343.357083; Tue, 05 Oct 2021 18:44:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQZ-0001kH-07; Tue, 05 Oct 2021 18:44:35 +0000 Received: by outflank-mailman (input) for mailman id 202343; Tue, 05 Oct 2021 18:44:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQX-0001jR-AX for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQX-0001qB-9p for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpQX-0000Ve-8U for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Iydu/hEJphjjaZONneSF7IibQOfMleYQMD5zy5QIJkw=; b=c/U1VxzTsta9ad+Jy5qOqD82CI wzN/SF+QjAqeFAfpsfFyAzuGlVdSKD4zKJjI+nwPYZYkZHLd+SdFFKgZyL7kwkyCjTi3GHI4FXerf 73zI2uvvFP7ByyTWkiRzr7z2Ee4tGk70LmjHhRdYJf/rP8J9VChcbR1t3QcVbgasBZfk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm: drop dubious xsm_op_t type Message-Id: Date: Tue, 05 Oct 2021 18:44:33 +0000 commit 6d45368a0a89e01a3a01d156af61fea565db96cc Author: Daniel P. Smith AuthorDate: Fri Sep 10 16:12:59 2021 -0400 Commit: Andrew Cooper CommitDate: Fri Sep 10 20:30:26 2021 +0100 xsm: drop dubious xsm_op_t type The type xsm_op_t masks the use of void pointers. This commit drops the xsm_op_t type and replaces it and all its uses with an explicit void. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/include/xen/hypercall.h | 4 ++-- xen/include/xsm/dummy.h | 4 ++-- xen/include/xsm/xsm.h | 11 ++++------- xen/xsm/flask/flask_op.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- xen/xsm/xsm_core.c | 4 ++-- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 34b7f1fed6..3771487a30 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -127,7 +127,7 @@ do_kexec_op( extern long do_xsm_op( - XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_xsm_op); + XEN_GUEST_HANDLE_PARAM(void) u_xsm_op); #ifdef CONFIG_ARGO extern long do_argo_op( @@ -198,7 +198,7 @@ compat_set_timer_op( s32 hi); extern int compat_xsm_op( - XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); + XEN_GUEST_HANDLE_PARAM(void) op); extern int compat_kexec_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) uarg); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 363c6d7798..214b5408b1 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -442,13 +442,13 @@ static XSM_INLINE int xsm_hypfs_op(XSM_DEFAULT_VOID) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +static XSM_INLINE long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op) { return -ENOSYS; } #ifdef CONFIG_COMPAT -static XSM_INLINE int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +static XSM_INLINE int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op) { return -ENOSYS; } diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 335ba1b022..16b90be2c5 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -18,9 +18,6 @@ #include #include -typedef void xsm_op_t; -DEFINE_XEN_GUEST_HANDLE(xsm_op_t); - /* policy magic number (defined by XSM_MAGIC) */ typedef u32 xsm_magic_t; @@ -129,9 +126,9 @@ struct xsm_operations { int (*page_offline)(uint32_t cmd); int (*hypfs_op)(void); - long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); + long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(void) op); #ifdef CONFIG_COMPAT - int (*do_compat_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); + int (*do_compat_op) (XEN_GUEST_HANDLE_PARAM(void) op); #endif int (*hvm_param) (struct domain *d, unsigned long op); @@ -542,13 +539,13 @@ static inline int xsm_hypfs_op(xsm_default_t def) return xsm_ops->hypfs_op(); } -static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(void) op) { return xsm_ops->do_xsm_op(op); } #ifdef CONFIG_COMPAT -static inline int xsm_do_compat_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +static inline int xsm_do_compat_op (XEN_GUEST_HANDLE_PARAM(void) op) { return xsm_ops->do_compat_op(op); } diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index f41c025391..221ff00fd3 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -607,7 +607,7 @@ static int flask_relabel_domain(struct xen_flask_relabel *arg) #endif /* !COMPAT */ -ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) +ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(void) u_flask_op) { xen_flask_op_t op; int rv; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index f1a1217c98..1465db125a 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1742,8 +1742,8 @@ static int flask_argo_send(const struct domain *d, const struct domain *t) #endif -long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op); -int compat_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op); +long do_flask_op(XEN_GUEST_HANDLE_PARAM(void) u_flask_op); +int compat_flask_op(XEN_GUEST_HANDLE_PARAM(void) u_flask_op); static struct xsm_operations flask_ops = { .security_domaininfo = flask_security_domaininfo, diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 5eab21e1b1..ac553f9c0d 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -213,13 +213,13 @@ int __init register_xsm(struct xsm_operations *ops) #endif -long do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +long do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op) { return xsm_do_xsm_op(op); } #ifdef CONFIG_COMPAT -int compat_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +int compat_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op) { return xsm_do_compat_op(op); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:44:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:44:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202347.357087 (Exim 4.92) (envelope-from ) id 1mXpQj-0001pw-5J; Tue, 05 Oct 2021 18:44:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202347.357087; Tue, 05 Oct 2021 18:44:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQj-0001pm-1w; Tue, 05 Oct 2021 18:44:45 +0000 Received: by outflank-mailman (input) for mailman id 202347; Tue, 05 Oct 2021 18:44:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQh-0001pA-Dh for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQh-0001qb-Cv for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpQh-0000WZ-CG for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yP56ujdY6muny1fIJLNPpiPPyAVsxzqA87JUtO4q23E=; b=fCJJ9gCXAVtFSRe02t3UTUDOAP 1ZolQOh16dj/BQX3GKkmFXtk61jybs+Os460EC67EdIpKL5+Ll5oX+E9Qy4KBSzKr0a3L+GYQpbBA fuICNkOFAANkXDEzV3J5u1SChP8k1ejdMzYM2E4/l/vfHpiguguUwLZCvXgwWNjYqosc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/go: honor append build flags Message-Id: Date: Tue, 05 Oct 2021 18:44:43 +0000 commit a89bcd9737757e4d671783588a6041a84a5e1754 Author: Roger Pau Monne AuthorDate: Wed Jul 7 09:15:31 2021 +0200 Commit: Ian Jackson CommitDate: Mon Sep 13 13:38:36 2021 +0100 tools/go: honor append build flags Make the go build use APPEND_{C/LD}FLAGS when necessary, just like other parts of the build. Reported-by: Ting-Wei Lan Signed-off-by: Roger Pau Monné Acked-by: Nick Rosbrook Acked-by: Ian Jackson --- tools/golang/xenlight/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index e394ef9b2b..64671f246c 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -27,7 +27,7 @@ GOXL_GEN_FILES = types.gen.go helpers.gen.go # so that it can find the actual library. .PHONY: build build: xenlight.go $(GOXL_GEN_FILES) - CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_libxenlight) -L$(XEN_libxentoollog)" $(GO) build -x + CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog) $(APPEND_CFLAGS)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_libxenlight) -L$(XEN_libxentoollog) $(APPEND_LDFLAGS)" $(GO) build -x .PHONY: install install: build -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:44:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:44:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202351.357089 (Exim 4.92) (envelope-from ) id 1mXpQt-0001vD-6f; Tue, 05 Oct 2021 18:44:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202351.357089; Tue, 05 Oct 2021 18:44:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQt-0001v5-3N; Tue, 05 Oct 2021 18:44:55 +0000 Received: by outflank-mailman (input) for mailman id 202351; Tue, 05 Oct 2021 18:44:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQr-0001uT-Gv for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpQr-0001r3-G1 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpQr-0000XO-FC for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:44:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SiM2A7OrYL9lCVqNQVVF+WGAFIVY9tPgOsaCsCMxUis=; b=wuWD/IEyyqwlThaX8unuts5uSc f3hNAlRCkKVPoqZLQEtebzvcVP2+4MUWGgGIZRG8vSsSAEJ5Wwn7u2wECgxeHRA5d8FChVDGuvrsV shfOUXAgmktARy7Md4vFZsyTA/TpuJ273gNCjIzEZv0RdOk4q/EgKy3DFkfTmPrvfbQc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce new helper device_tree_get_meminfo Message-Id: Date: Tue, 05 Oct 2021 18:44:53 +0000 commit 904ba3ce2e46e59080dc09676cede5df63b59f20 Author: Penny Zheng AuthorDate: Fri Sep 10 02:52:09 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Sep 13 14:10:11 2021 -0700 xen/arm: introduce new helper device_tree_get_meminfo This commit creates a new helper device_tree_get_meminfo to iterate over a device tree property to get memory info, like "reg". Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/bootfdt.c | 83 ++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index 476e32e0f5..b01badda3e 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -63,6 +63,52 @@ void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, *size = dt_next_cell(size_cells, cell); } +static int __init device_tree_get_meminfo(const void *fdt, int node, + const char *prop_name, + u32 address_cells, u32 size_cells, + void *data) +{ + const struct fdt_property *prop; + unsigned int i, banks; + const __be32 *cell; + u32 reg_cells = address_cells + size_cells; + paddr_t start, size; + struct meminfo *mem = data; + + if ( address_cells < 1 || size_cells < 1 ) + { + printk("fdt: property `%s': invalid #address-cells or #size-cells", + prop_name); + return -EINVAL; + } + + prop = fdt_get_property(fdt, node, prop_name, NULL); + if ( !prop ) + return -ENOENT; + + cell = (const __be32 *)prop->data; + banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); + + for ( i = 0; i < banks && mem->nr_banks < NR_MEM_BANKS; i++ ) + { + device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); + /* Some DT may describe empty bank, ignore them */ + if ( !size ) + continue; + mem->bank[mem->nr_banks].start = start; + mem->bank[mem->nr_banks].size = size; + mem->nr_banks++; + } + + if ( i < banks ) + { + printk("Warning: Max number of supported memory regions reached.\n"); + return -ENOSPC; + } + + return 0; +} + u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, u32 dflt) { @@ -139,42 +185,7 @@ static int __init process_memory_node(const void *fdt, int node, u32 address_cells, u32 size_cells, void *data) { - const struct fdt_property *prop; - int i; - int banks; - const __be32 *cell; - paddr_t start, size; - u32 reg_cells = address_cells + size_cells; - struct meminfo *mem = data; - - if ( address_cells < 1 || size_cells < 1 ) - { - printk("fdt: node `%s': invalid #address-cells or #size-cells", - name); - return -EINVAL; - } - - prop = fdt_get_property(fdt, node, "reg", NULL); - if ( !prop ) - return -ENOENT; - - cell = (const __be32 *)prop->data; - banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); - - for ( i = 0; i < banks && mem->nr_banks < NR_MEM_BANKS; i++ ) - { - device_tree_get_reg(&cell, address_cells, size_cells, &start, &size); - /* Some DT may describe empty bank, ignore them */ - if ( !size ) - continue; - mem->bank[mem->nr_banks].start = start; - mem->bank[mem->nr_banks].size = size; - mem->nr_banks++; - } - - if ( i < banks ) - return -ENOSPC; - return 0; + return device_tree_get_meminfo(fdt, node, "reg", address_cells, size_cells, data); } static int __init process_reserved_memory_node(const void *fdt, int node, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:45:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:45:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202353.357094 (Exim 4.92) (envelope-from ) id 1mXpR3-00020y-9T; Tue, 05 Oct 2021 18:45:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202353.357094; Tue, 05 Oct 2021 18:45:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpR3-00020o-66; Tue, 05 Oct 2021 18:45:05 +0000 Received: by outflank-mailman (input) for mailman id 202353; Tue, 05 Oct 2021 18:45:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpR1-000205-Jv for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpR1-0001rX-J6 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpR1-0000YK-IT for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YFq7PfDL/OfD4B1BAWg+whBBxgEuIZp5Fbxzr7QaLkU=; b=Jn10nZhk25d37eOOHxO53Z85ZI 4fkRk2tUurgwUlFEWiDWssC9s147xREVcqAwVVqpkldPPLOm/Ejt0V8vr35O9549rT5D+kJUS3HmO svRyz71jrC8OfrhTioHVhjxCAbPHjaYvsGoqbqK1JEQxZ27DMwxPdnW9hPPi8F24eMnY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce domain on Static Allocation Message-Id: Date: Tue, 05 Oct 2021 18:45:03 +0000 commit 41c031ff437b66cfac4b120bd7698ca039850690 Author: Penny Zheng AuthorDate: Fri Sep 10 02:52:10 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Sep 13 14:10:14 2021 -0700 xen/arm: introduce domain on Static Allocation Static Allocation refers to system or sub-system(domains) for which memory areas are pre-defined by configuration using physical address ranges. Those pre-defined memory, -- Static Memory, as parts of RAM reserved in the beginning, shall never go to heap allocator or boot allocator for any use. Memory can be statically allocated to a domain using the property "xen,static- mem" defined in the domain configuration. The number of cells for the address and the size must be defined using respectively the properties "#xen,static-mem-address-cells" and "#xen,static-mem-size-cells". The property 'memory' is still needed and should match the amount of memory given to the guest. Currently, it either comes from static memory or lets Xen allocate from heap. *Mixing* is not supported. The static memory will be mapped in the guest at the usual guest memory addresses (GUEST_RAM0_BASE, GUEST_RAM1_BASE) defined by xen/include/public/arch-arm.h. This patch introduces this new `xen,static-mem` feature, and also documents and parses this new attribute at boot time. This patch also introduces a new field "bool xen_domain" in "struct membank" to tell whether the memory bank is reserved as the whole hardware resource, or bind to a xen domain node, through "xen,static-mem" Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/booting.txt | 42 +++++++++++++++++++++++++++++++++++ xen/arch/arm/bootfdt.c | 30 +++++++++++++++++++++++-- xen/include/asm-arm/setup.h | 1 + 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 5243bc7fd3..44cd9e1a9a 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -268,3 +268,45 @@ The DTB fragment is loaded at 0xc000000 in the example above. It should follow the convention explained in docs/misc/arm/passthrough.txt. The DTB fragment will be added to the guest device tree, so that the guest kernel will be able to discover the device. + + +Static Allocation +============= + +Static Allocation refers to system or sub-system(domains) for which memory +areas are pre-defined by configuration using physical address ranges. + +Memory can be statically allocated to a domain using the property "xen,static- +mem" defined in the domain configuration. The number of cells for the address +and the size must be defined using respectively the properties +"#xen,static-mem-address-cells" and "#xen,static-mem-size-cells". + +The property 'memory' is still needed and should match the amount of memory +given to the guest. Currently, it either comes from static memory or lets Xen +allocate from heap. *Mixing* is not supported. + +The static memory will be mapped in the guest at the usual guest memory +addresses (GUEST_RAM0_BASE, GUEST_RAM1_BASE) defined by +xen/include/public/arch-arm.h. + +Below is an example on how to specify the static memory region in the +device-tree: + + / { + chosen { + domU1 { + compatible = "xen,domain"; + #address-cells = <0x2>; + #size-cells = <0x2>; + cpus = <2>; + memory = <0x0 0x80000>; + #xen,static-mem-address-cells = <0x1>; + #xen,static-mem-size-cells = <0x1>; + xen,static-mem = <0x30000000 0x20000000>; + ... + }; + }; + }; + +This will reserve a 512MB region starting at the host physical address +0x30000000 to be exclusively used by DomU1. diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index b01badda3e..afaa0e249b 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -66,7 +66,7 @@ void __init device_tree_get_reg(const __be32 **cell, u32 address_cells, static int __init device_tree_get_meminfo(const void *fdt, int node, const char *prop_name, u32 address_cells, u32 size_cells, - void *data) + void *data, bool xen_domain) { const struct fdt_property *prop; unsigned int i, banks; @@ -97,6 +97,7 @@ static int __init device_tree_get_meminfo(const void *fdt, int node, continue; mem->bank[mem->nr_banks].start = start; mem->bank[mem->nr_banks].size = size; + mem->bank[mem->nr_banks].xen_domain = xen_domain; mem->nr_banks++; } @@ -185,7 +186,8 @@ static int __init process_memory_node(const void *fdt, int node, u32 address_cells, u32 size_cells, void *data) { - return device_tree_get_meminfo(fdt, node, "reg", address_cells, size_cells, data); + return device_tree_get_meminfo(fdt, node, "reg", address_cells, size_cells, + data, false); } static int __init process_reserved_memory_node(const void *fdt, int node, @@ -339,6 +341,28 @@ static void __init process_chosen_node(const void *fdt, int node, add_boot_module(BOOTMOD_RAMDISK, start, end-start, false); } +static int __init process_domain_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + + printk("Checking for \"xen,static-mem\" in domain node\n"); + + prop = fdt_get_property(fdt, node, "xen,static-mem", NULL); + if ( !prop ) + /* No "xen,static-mem" present. */ + return 0; + + address_cells = device_tree_get_u32(fdt, node, + "#xen,static-mem-address-cells", 0); + size_cells = device_tree_get_u32(fdt, node, + "#xen,static-mem-size-cells", 0); + + return device_tree_get_meminfo(fdt, node, "xen,static-mem", address_cells, + size_cells, &bootinfo.reserved_mem, true); +} + static int __init early_scan_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, @@ -357,6 +381,8 @@ static int __init early_scan_node(const void *fdt, process_multiboot_node(fdt, node, name, address_cells, size_cells); else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) process_chosen_node(fdt, node, name, address_cells, size_cells); + else if ( depth == 2 && device_tree_node_compatible(fdt, node, "xen,domain") ) + rc = process_domain_node(fdt, node, name, address_cells, size_cells); if ( rc < 0 ) printk("fdt: node `%s': parsing failed\n", name); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index c4b6af6029..95da0b7ab9 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -24,6 +24,7 @@ typedef enum { struct membank { paddr_t start; paddr_t size; + bool xen_domain; /* whether the memory bank is bound to a Xen domain. */ }; struct meminfo { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:45:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:45:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202355.357098 (Exim 4.92) (envelope-from ) id 1mXpRD-00026H-Ab; Tue, 05 Oct 2021 18:45:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202355.357098; Tue, 05 Oct 2021 18:45:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRD-000269-7Y; Tue, 05 Oct 2021 18:45:15 +0000 Received: by outflank-mailman (input) for mailman id 202355; Tue, 05 Oct 2021 18:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRB-00025k-NO for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRB-0001ry-MX for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpRB-0000Yv-Lf for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8HeuzzNBMk9MNatk54pmLe2nUeN1X4I7rgYs0X8yH4M=; b=saTsPC6tZaIia1nBLobIRENiaM UGeosZ7QOVed/XoVtQTPfWbKd36NRzje2h8Vt+yNILZdGtW5I9/1XNnNrjijioVZ4GxozcAC4ytym XOTRV3iejZtNsCRvoHBA3hGnhU5LOBuYh5FZyqiHEzIFmYC2VqDzTrducaPWi4c0yIO4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: introduce mark_page_free Message-Id: Date: Tue, 05 Oct 2021 18:45:13 +0000 commit 540a637c3410780b519fc055f432afe271f642f8 Author: Penny Zheng AuthorDate: Fri Sep 10 02:52:11 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Sep 13 14:10:17 2021 -0700 xen: introduce mark_page_free This commit defines a new helper mark_page_free to extract common code, like following the same cache/TLB coherency policy, between free_heap_pages and the new function free_staticmem_pages, which will be introduced later. The PDX compression makes that conversion between the MFN and the page can be potentially non-trivial. As the function is internal, pass the MFN and the page. They are both expected to match. Signed-off-by: Penny Zheng Acked-by: Jan Beulich Reviewed-by: Julien Grall --- xen/common/page_alloc.c | 89 ++++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 958ba0cd92..a3ee5eca9e 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1376,6 +1376,53 @@ bool scrub_free_pages(void) return node_to_scrub(false) != NUMA_NO_NODE; } +static void mark_page_free(struct page_info *pg, mfn_t mfn) +{ + ASSERT(mfn_x(mfn) == mfn_x(page_to_mfn(pg))); + + /* + * Cannot assume that count_info == 0, as there are some corner cases + * where it isn't the case and yet it isn't a bug: + * 1. page_get_owner() is NULL + * 2. page_get_owner() is a domain that was never accessible by + * its domid (e.g., failed to fully construct the domain). + * 3. page was never addressable by the guest (e.g., it's an + * auto-translate-physmap guest and the page was never included + * in its pseudophysical address space). + * In all the above cases there can be no guest mappings of this page. + */ + switch ( pg->count_info & PGC_state ) + { + case PGC_state_inuse: + BUG_ON(pg->count_info & PGC_broken); + pg->count_info = PGC_state_free; + break; + + case PGC_state_offlining: + pg->count_info = (pg->count_info & PGC_broken) | + PGC_state_offlined; + tainted = 1; + break; + + default: + printk(XENLOG_ERR + "pg MFN %"PRI_mfn" c=%#lx o=%u v=%#lx t=%#x\n", + mfn_x(mfn), + pg->count_info, pg->v.free.order, + pg->u.free.val, pg->tlbflush_timestamp); + BUG(); + } + + /* If a page has no owner it will need no safety TLB flush. */ + pg->u.free.need_tlbflush = (page_get_owner(pg) != NULL); + if ( pg->u.free.need_tlbflush ) + page_set_tlbflush_timestamp(pg); + + /* This page is not a guest frame any more. */ + page_set_owner(pg, NULL); /* set_gpfn_from_mfn snoops pg owner */ + set_gpfn_from_mfn(mfn_x(mfn), INVALID_M2P_ENTRY); +} + /* Free 2^@order set of pages. */ static void free_heap_pages( struct page_info *pg, unsigned int order, bool need_scrub) @@ -1392,47 +1439,7 @@ static void free_heap_pages( for ( i = 0; i < (1 << order); i++ ) { - /* - * Cannot assume that count_info == 0, as there are some corner cases - * where it isn't the case and yet it isn't a bug: - * 1. page_get_owner() is NULL - * 2. page_get_owner() is a domain that was never accessible by - * its domid (e.g., failed to fully construct the domain). - * 3. page was never addressable by the guest (e.g., it's an - * auto-translate-physmap guest and the page was never included - * in its pseudophysical address space). - * In all the above cases there can be no guest mappings of this page. - */ - switch ( pg[i].count_info & PGC_state ) - { - case PGC_state_inuse: - BUG_ON(pg[i].count_info & PGC_broken); - pg[i].count_info = PGC_state_free; - break; - - case PGC_state_offlining: - pg[i].count_info = (pg[i].count_info & PGC_broken) | - PGC_state_offlined; - tainted = 1; - break; - - default: - printk(XENLOG_ERR - "pg[%u] MFN %"PRI_mfn" c=%#lx o=%u v=%#lx t=%#x\n", - i, mfn_x(mfn) + i, - pg[i].count_info, pg[i].v.free.order, - pg[i].u.free.val, pg[i].tlbflush_timestamp); - BUG(); - } - - /* If a page has no owner it will need no safety TLB flush. */ - pg[i].u.free.need_tlbflush = (page_get_owner(&pg[i]) != NULL); - if ( pg[i].u.free.need_tlbflush ) - page_set_tlbflush_timestamp(&pg[i]); - - /* This page is not a guest frame any more. */ - page_set_owner(&pg[i], NULL); /* set_gpfn_from_mfn snoops pg owner */ - set_gpfn_from_mfn(mfn_x(mfn) + i, INVALID_M2P_ENTRY); + mark_page_free(&pg[i], mfn_add(mfn, i)); if ( need_scrub ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:45:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:45:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202358.357102 (Exim 4.92) (envelope-from ) id 1mXpRN-0002Ah-C9; Tue, 05 Oct 2021 18:45:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202358.357102; Tue, 05 Oct 2021 18:45:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRN-0002AZ-9A; Tue, 05 Oct 2021 18:45:25 +0000 Received: by outflank-mailman (input) for mailman id 202358; Tue, 05 Oct 2021 18:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRL-0002AA-Qj for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRL-0001sF-Q1 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpRL-0000Zf-PA for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=28R5sw4vJONut9l0hULB4Ni5bQGYcIDyB3JSXOlUCRU=; b=CtUxHqpVkmxtiXD4A4vhmh6s3P /3jmJA8IhVXMTx3WRyNcIf5sWznfCImCoPEVNvovRIPSEtkHPmoYrjj3DVy4EPi9uiHAsOITdJGMy sLTKsfI7IsS6yQWKaBWTCFIPOhWj2OzwcZdcAO+y+nmbqro86QBfTCLJwcfWT/tRRFa4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: static memory initialization Message-Id: Date: Tue, 05 Oct 2021 18:45:23 +0000 commit 4a9e73e6e53e9d8bc005a08c3968ec36d793f140 Author: Penny Zheng AuthorDate: Fri Sep 10 02:52:12 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Sep 13 14:10:22 2021 -0700 xen/arm: static memory initialization This patch introduces static memory initialization, during system boot-up. The new function init_staticmem_pages is responsible for static memory initialization. Helper free_staticmem_pages is the equivalent of free_heap_pages, to free nr_mfns pages of static memory. This commit also introduces a new CONFIG_STATIC_MEMORY option to wrap all static-allocation-related code. Put asynchronously scrubbing pages of static memory in TODO list. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/setup.c | 27 +++++++++++++++++++++++++++ xen/common/Kconfig | 13 +++++++++++++ xen/common/page_alloc.c | 21 +++++++++++++++++++++ xen/include/xen/mm.h | 6 ++++++ 4 files changed, 67 insertions(+) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 63a908e325..5be7f2b0c2 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -609,6 +609,29 @@ static void __init init_pdx(void) } } +/* Static memory initialization */ +static void __init init_staticmem_pages(void) +{ +#ifdef CONFIG_STATIC_MEMORY + unsigned int bank; + + for ( bank = 0 ; bank < bootinfo.reserved_mem.nr_banks; bank++ ) + { + if ( bootinfo.reserved_mem.bank[bank].xen_domain ) + { + mfn_t bank_start = _mfn(PFN_UP(bootinfo.reserved_mem.bank[bank].start)); + unsigned long bank_pages = PFN_DOWN(bootinfo.reserved_mem.bank[bank].size); + mfn_t bank_end = mfn_add(bank_start, bank_pages); + + if ( mfn_x(bank_end) <= mfn_x(bank_start) ) + return; + + free_staticmem_pages(mfn_to_page(bank_start), bank_pages, false); + } + } +#endif +} + #ifdef CONFIG_ARM_32 static void __init setup_mm(void) { @@ -736,6 +759,8 @@ static void __init setup_mm(void) /* Add xenheap memory that was not already added to the boot allocator. */ init_xenheap_pages(mfn_to_maddr(xenheap_mfn_start), mfn_to_maddr(xenheap_mfn_end)); + + init_staticmem_pages(); } #else /* CONFIG_ARM_64 */ static void __init setup_mm(void) @@ -789,6 +814,8 @@ static void __init setup_mm(void) setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); + + init_staticmem_pages(); } #endif diff --git a/xen/common/Kconfig b/xen/common/Kconfig index ac5491b1cc..db687b1785 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -70,6 +70,19 @@ config MEM_ACCESS config NEEDS_LIBELF bool +config STATIC_MEMORY + bool "Static Allocation Support (UNSUPPORTED)" if UNSUPPORTED + depends on ARM + help + Static Allocation refers to system or sub-system(domains) for + which memory areas are pre-defined by configuration using physical + address ranges. + + When enabled, memory can be statically allocated to a domain using + the property "xen,static-mem" defined in the domain configuration. + + If unsure, say N. + menu "Speculative hardening" config SPECULATIVE_HARDEN_ARRAY diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index a3ee5eca9e..ba7adc80db 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2604,6 +2604,27 @@ struct domain *get_pg_owner(domid_t domid) return pg_owner; } +#ifdef CONFIG_STATIC_MEMORY +/* Equivalent of free_heap_pages to free nr_mfns pages of static memory. */ +void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + bool need_scrub) +{ + mfn_t mfn = page_to_mfn(pg); + unsigned long i; + + for ( i = 0; i < nr_mfns; i++ ) + { + mark_page_free(&pg[i], mfn_add(mfn, i)); + + if ( need_scrub ) + { + /* TODO: asynchronous scrubbing for pages of static memory. */ + scrub_one_page(pg); + } + } +} +#endif + /* * Local variables: * mode: C diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 667f9dac83..8e8fb5a615 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -85,6 +85,12 @@ bool scrub_free_pages(void); } while ( false ) #define FREE_XENHEAP_PAGE(p) FREE_XENHEAP_PAGES(p, 0) +#ifdef CONFIG_STATIC_MEMORY +/* These functions are for static memory */ +void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, + bool need_scrub); +#endif + /* Map machine page range in Xen virtual address space. */ int map_pages_to_xen( unsigned long virt, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:45:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:45:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202361.357106 (Exim 4.92) (envelope-from ) id 1mXpRX-0002Eg-E6; Tue, 05 Oct 2021 18:45:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202361.357106; Tue, 05 Oct 2021 18:45: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 1mXpRX-0002ET-Ai; Tue, 05 Oct 2021 18:45:35 +0000 Received: by outflank-mailman (input) for mailman id 202361; Tue, 05 Oct 2021 18:45:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRV-0002E9-UJ for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRV-0001sL-Te for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpRV-0000aQ-Sr for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18: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=krJPJzDbHGcVkFaCnXUGIOuz/Cj50wFVYf7FMFNrkNs=; b=oIIQ1GOXQudiiUB7gfYkuFKzW3 YJv8Jf78uCM8FR73hSsM6e6vWxeLnYjnimxVyqHTrMTQHs4+OjE9chlEg1lztEjCAuecjQ7gZ498b zxByZ7iYCXzvXM5T/ysRCw7Gc2Vdn4O0VDCpQSJEusfv2G/uzUXSfKMl8DlEmL5KEb8g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: re-define assign_pages and introduce a new function assign_page Message-Id: Date: Tue, 05 Oct 2021 18:45:33 +0000 commit 5260e8fb93f0e1f094de4142b2abad45844ab89c Author: Penny Zheng AuthorDate: Fri Sep 10 02:52:13 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Sep 13 14:12:59 2021 -0700 xen: re-define assign_pages and introduce a new function assign_page In order to deal with the trouble of count-to-order conversion when page number is not in a power-of-two, this commit re-define assign_pages for nr pages and assign_page for original page with a single order. Backporting confusion could be helped by altering the order of assign_pages parameters, such that the compiler would point out that adjustments at call sites are needed. [stefano: switch to unsigned int for nr] Signed-off-by: Penny Zheng Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- xen/arch/x86/pv/dom0_build.c | 2 +- xen/common/grant_table.c | 2 +- xen/common/memory.c | 6 +++--- xen/common/page_alloc.c | 23 ++++++++++++++--------- xen/include/xen/mm.h | 6 ++++++ 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index d7f9e04b28..77efd3918c 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -568,7 +568,7 @@ int __init dom0_construct_pv(struct domain *d, else { while ( count-- ) - if ( assign_pages(d, mfn_to_page(_mfn(mfn++)), 0, 0) ) + if ( assign_pages(mfn_to_page(_mfn(mfn++)), 1, d, 0) ) BUG(); } initrd->mod_end = 0; diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e80f8d044d..fe1fc11b22 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2358,7 +2358,7 @@ gnttab_transfer( * is respected and speculative execution is blocked accordingly */ if ( unlikely(!evaluate_nospec(okay)) || - unlikely(assign_pages(e, page, 0, MEMF_no_refcount)) ) + unlikely(assign_pages(page, 1, e, MEMF_no_refcount)) ) { bool drop_dom_ref; diff --git a/xen/common/memory.c b/xen/common/memory.c index 74babb0bd7..63642278fd 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -728,8 +728,8 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) /* Assign each output page to the domain. */ for ( j = 0; (page = page_list_remove_head(&out_chunk_list)); ++j ) { - if ( assign_pages(d, page, exch.out.extent_order, - MEMF_no_refcount) ) + if ( assign_page(page, exch.out.extent_order, d, + MEMF_no_refcount) ) { unsigned long dec_count; bool_t drop_dom_ref; @@ -797,7 +797,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) * cleared PGC_allocated. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - if ( assign_pages(d, page, 0, MEMF_no_refcount) ) + if ( assign_pages(page, 1, d, MEMF_no_refcount) ) { BUG_ON(!d->is_dying); free_domheap_page(page); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index ba7adc80db..14ba89428b 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2259,9 +2259,9 @@ void init_domheap_pages(paddr_t ps, paddr_t pe) int assign_pages( - struct domain *d, struct page_info *pg, - unsigned int order, + unsigned int nr, + struct domain *d, unsigned int memflags) { int rc = 0; @@ -2281,7 +2281,7 @@ int assign_pages( { unsigned int extra_pages = 0; - for ( i = 0; i < (1ul << order); i++ ) + for ( i = 0; i < nr; i++ ) { ASSERT(!(pg[i].count_info & ~PGC_extra)); if ( pg[i].count_info & PGC_extra ) @@ -2290,18 +2290,18 @@ int assign_pages( ASSERT(!extra_pages || ((memflags & MEMF_no_refcount) && - extra_pages == 1u << order)); + extra_pages == nr)); } #endif if ( pg[0].count_info & PGC_extra ) { - d->extra_pages += 1u << order; + d->extra_pages += nr; memflags &= ~MEMF_no_refcount; } else if ( !(memflags & MEMF_no_refcount) ) { - unsigned int tot_pages = domain_tot_pages(d) + (1 << order); + unsigned int tot_pages = domain_tot_pages(d) + nr; if ( unlikely(tot_pages > d->max_pages) ) { @@ -2313,10 +2313,10 @@ int assign_pages( } if ( !(memflags & MEMF_no_refcount) && - unlikely(domain_adjust_tot_pages(d, 1 << order) == (1 << order)) ) + unlikely(domain_adjust_tot_pages(d, nr) == nr) ) get_knownalive_domain(d); - for ( i = 0; i < (1 << order); i++ ) + for ( i = 0; i < nr; i++ ) { ASSERT(page_get_owner(&pg[i]) == NULL); page_set_owner(&pg[i], d); @@ -2331,6 +2331,11 @@ int assign_pages( return rc; } +int assign_page(struct page_info *pg, unsigned int order, struct domain *d, + unsigned int memflags) +{ + return assign_pages(pg, 1UL << order, d, memflags); +} struct page_info *alloc_domheap_pages( struct domain *d, unsigned int order, unsigned int memflags) @@ -2373,7 +2378,7 @@ struct page_info *alloc_domheap_pages( pg[i].count_info = PGC_extra; } } - if ( assign_pages(d, pg, order, memflags) ) + if ( assign_page(pg, order, d, memflags) ) { free_heap_pages(pg, order, memflags & MEMF_no_scrub); return NULL; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 8e8fb5a615..2b7c5d580c 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -132,9 +132,15 @@ int query_page_offline(mfn_t mfn, uint32_t *status); void heap_init_late(void); int assign_pages( + struct page_info *pg, + unsigned int nr, struct domain *d, + unsigned int memflags); + +int assign_page( struct page_info *pg, unsigned int order, + struct domain *d, unsigned int memflags); /* Dump info to serial console */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:45:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:45:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202362.357110 (Exim 4.92) (envelope-from ) id 1mXpRg-0002Iy-HA; Tue, 05 Oct 2021 18:45:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202362.357110; Tue, 05 Oct 2021 18: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 1mXpRg-0002Ip-Dg; Tue, 05 Oct 2021 18:45:44 +0000 Received: by outflank-mailman (input) for mailman id 202362; Tue, 05 Oct 2021 18:45:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRg-0002If-1R for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRg-0001sP-0f for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpRf-0000bH-W3 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18: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=YMJYZs5TwG37lNfE8rO2hge7yOCrEe/klzVXq0qZUaw=; b=0CAk9Q3KeEKXR7A5YVpgb9GDtG peDggesTiFthNVftZ4sTQKsuuocKPN3C/vRUg5GeM61i4dHXv0+p5PI2f2SoZhoRyb9JdRGEDAHcz S5Om6NfXHohVpOoPIz0BM/i+VvWoUyJ75UfYXRuqVjzpoI6JZbjokcVKr4N7/1Tcc1FI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce acquire_staticmem_pages and acquire_domstatic_pages Message-Id: Date: Tue, 05 Oct 2021 18:45:43 +0000 commit c7fe462c0d274ffa30c9448c0a80affa075d789d Author: Penny Zheng AuthorDate: Fri Sep 10 02:52:14 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Sep 13 14:15:03 2021 -0700 xen/arm: introduce acquire_staticmem_pages and acquire_domstatic_pages New function acquire_staticmem_pages aims to acquire nr_mfns contiguous pages of static memory, starting at #smfn. And it is the equivalent of alloc_heap_pages for static memory. For each page, it shall check if the page is reserved(PGC_reserved) and free. It shall also do a set of necessary initialization, which are mostly the same ones in alloc_heap_pages, like, following the same cache-coherency policy and turning page status into PGC_state_inuse, etc. New function acquire_domstatic_pages is the equivalent of alloc_domheap_pages for static memory, and it is to acquire nr_mfns contiguous pages of static memory and assign them to one specific domain. It uses acquire_staticmem_pages to acquire nr_mfns pages of static memory. Then on success, it will use assign_pages to assign those pages to one specific domain. In order to differentiate pages of static memory from those allocated from heap, this patch introduces a new page flag PGC_reserved, then mark pages of static memory PGC_reserved when initializing them. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/page_alloc.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/mm.h | 3 ++ xen/include/xen/mm.h | 2 + 3 files changed, 121 insertions(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 14ba89428b..b9441cb06f 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -151,6 +151,10 @@ #define p2m_pod_offline_or_broken_replace(pg) BUG_ON(pg != NULL) #endif +#ifndef PGC_reserved +#define PGC_reserved 0 +#endif + /* * Comma-separated list of hexadecimal page numbers containing bad bytes. * e.g. 'badpage=0x3f45,0x8a321'. @@ -2283,7 +2287,7 @@ int assign_pages( for ( i = 0; i < nr; i++ ) { - ASSERT(!(pg[i].count_info & ~PGC_extra)); + ASSERT(!(pg[i].count_info & ~(PGC_extra | PGC_reserved))); if ( pg[i].count_info & PGC_extra ) extra_pages++; } @@ -2322,7 +2326,8 @@ int assign_pages( page_set_owner(&pg[i], d); smp_wmb(); /* Domain pointer must be visible before updating refcnt. */ pg[i].count_info = - (pg[i].count_info & PGC_extra) | PGC_allocated | 1; + (pg[i].count_info & (PGC_extra | PGC_reserved)) | PGC_allocated | 1; + page_list_add_tail(&pg[i], page_to_list(d, &pg[i])); } @@ -2626,8 +2631,117 @@ void __init free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, /* TODO: asynchronous scrubbing for pages of static memory. */ scrub_one_page(pg); } + + /* In case initializing page of static memory, mark it PGC_reserved. */ + pg[i].count_info |= PGC_reserved; } } + +/* + * Acquire nr_mfns contiguous reserved pages, starting at #smfn, of + * static memory. + * This function needs to be reworked if used outside of boot. + */ +static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, + unsigned long nr_mfns, + unsigned int memflags) +{ + bool need_tlbflush = false; + uint32_t tlbflush_timestamp = 0; + unsigned long i; + struct page_info *pg; + + ASSERT(nr_mfns); + for ( i = 0; i < nr_mfns; i++ ) + if ( !mfn_valid(mfn_add(smfn, i)) ) + return NULL; + + pg = mfn_to_page(smfn); + + spin_lock(&heap_lock); + + for ( i = 0; i < nr_mfns; i++ ) + { + /* The page should be reserved and not yet allocated. */ + if ( pg[i].count_info != (PGC_state_free | PGC_reserved) ) + { + printk(XENLOG_ERR + "pg[%lu] Static MFN %"PRI_mfn" c=%#lx t=%#x\n", + i, mfn_x(smfn) + i, + pg[i].count_info, pg[i].tlbflush_timestamp); + goto out_err; + } + + if ( !(memflags & MEMF_no_tlbflush) ) + accumulate_tlbflush(&need_tlbflush, &pg[i], + &tlbflush_timestamp); + + /* + * Preserve flag PGC_reserved and change page state + * to PGC_state_inuse. + */ + pg[i].count_info = PGC_reserved | PGC_state_inuse; + /* Initialise fields which have other uses for free pages. */ + pg[i].u.inuse.type_info = 0; + page_set_owner(&pg[i], NULL); + } + + spin_unlock(&heap_lock); + + if ( need_tlbflush ) + filtered_flush_tlb_mask(tlbflush_timestamp); + + /* + * Ensure cache and RAM are consistent for platforms where the guest + * can control its own visibility of/through the cache. + */ + for ( i = 0; i < nr_mfns; i++ ) + flush_page_to_ram(mfn_x(smfn) + i, !(memflags & MEMF_no_icache_flush)); + + return pg; + + out_err: + while ( i-- ) + pg[i].count_info = PGC_reserved | PGC_state_free; + + spin_unlock(&heap_lock); + + return NULL; +} + +/* + * Acquire nr_mfns contiguous pages, starting at #smfn, of static memory, + * then assign them to one specific domain #d. + */ +int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, + unsigned long nr_mfns, unsigned int memflags) +{ + struct page_info *pg; + + ASSERT(!in_irq()); + + pg = acquire_staticmem_pages(smfn, nr_mfns, memflags); + if ( !pg ) + return -ENOENT; + + if ( !d || (memflags & (MEMF_no_owner | MEMF_no_refcount)) ) + { + /* + * Respective handling omitted here because right now + * acquired static memory is only for guest RAM. + */ + ASSERT_UNREACHABLE(); + return -EINVAL; + } + + if ( assign_pages(pg, nr_mfns, d, memflags) ) + { + free_staticmem_pages(pg, nr_mfns, memflags & MEMF_no_scrub); + return -EINVAL; + } + + return 0; +} #endif /* diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index ded74d29da..7b5e7b7f69 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -108,6 +108,9 @@ struct page_info /* Page is Xen heap? */ #define _PGC_xen_heap PG_shift(2) #define PGC_xen_heap PG_mask(1, 2) + /* Page is reserved */ +#define _PGC_reserved PG_shift(3) +#define PGC_reserved PG_mask(1, 3) /* ... */ /* Page is broken? */ #define _PGC_broken PG_shift(7) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 2b7c5d580c..dd49237e86 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -89,6 +89,8 @@ bool scrub_free_pages(void); /* These functions are for static memory */ void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, bool need_scrub); +int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned long nr_mfns, + unsigned int memflags); #endif /* Map machine page range in Xen virtual address space. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:45:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202363.357114 (Exim 4.92) (envelope-from ) id 1mXpRq-0002Ns-In; Tue, 05 Oct 2021 18:45:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202363.357114; Tue, 05 Oct 2021 18:45:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRq-0002Nk-FP; Tue, 05 Oct 2021 18:45:54 +0000 Received: by outflank-mailman (input) for mailman id 202363; Tue, 05 Oct 2021 18:45:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRq-0002Nc-4u for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpRq-0001sW-41 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpRq-0000c0-3G for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:45:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kA/hbbTszsIF963Ljyv/yQVX5Ba88VmF2zcgB0E7nRQ=; b=Bnl3zD5WhWzVoc0m/kvIWBO19+ oKxqPiFDE1W4SPiVCvv3sj0YRinykljO49qdVuPJ/mzWcO99pTrXvHAc0C/m8WR6Rf2Pb4f88WtWk uyU+/D7jC6eqfVts2hznKbxvWhEaZvOqs7/QOTrcxTY7q97MOXfPpDOiyrbMyT/kG8HQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: introduce allocate_static_memory Message-Id: Date: Tue, 05 Oct 2021 18:45:54 +0000 commit 487975df53b5298316b594550c79934d646701bd Author: Penny Zheng AuthorDate: Fri Sep 10 02:52:15 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Sep 13 14:15:04 2021 -0700 xen/arm: introduce allocate_static_memory This commit introduces a new function allocate_static_memory to allocate static memory as guest RAM for domains on Static Allocation. It uses acquire_domstatic_pages to acquire pre-configured static memory for the domain, and uses guest_physmap_add_pages to set up the P2M table. These pre-defined static memory banks shall be mapped to the usual guest memory addresses (GUEST_RAM0_BASE, GUEST_RAM1_BASE) defined by xen/include/public/arch-arm.h. In order to deal with the trouble of count-to-order conversion when page number is not in a power-of-two, this commit exports p2m_insert_mapping and introduce a new function guest_physmap_add_pages to cope with adding guest RAM p2m mapping with nr_pages. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 161 +++++++++++++++++++++++++++++++++++++++++++- xen/arch/arm/p2m.c | 7 +- xen/include/asm-arm/p2m.h | 11 +++ 3 files changed, 173 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 206038d1c0..62ab7d0ead 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -480,6 +480,162 @@ fail: (unsigned long)kinfo->unassigned_mem >> 10); } +#ifdef CONFIG_STATIC_MEMORY +static bool __init append_static_memory_to_bank(struct domain *d, + struct membank *bank, + mfn_t smfn, + paddr_t size) +{ + int res; + unsigned int nr_pages = PFN_DOWN(size); + /* Infer next GFN. */ + gfn_t sgfn = gaddr_to_gfn(bank->start + bank->size); + + res = guest_physmap_add_pages(d, sgfn, smfn, nr_pages); + if ( res ) + { + dprintk(XENLOG_ERR, "Failed to map pages to DOMU: %d", res); + return false; + } + + bank->size = bank->size + size; + + return true; +} + +/* Allocate memory from static memory as RAM for one specific domain d. */ +static void __init allocate_static_memory(struct domain *d, + struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + const struct dt_property *prop; + u32 addr_cells, size_cells, reg_cells; + unsigned int nr_banks, gbank, bank = 0; + const uint64_t rambase[] = GUEST_RAM_BANK_BASES; + const uint64_t ramsize[] = GUEST_RAM_BANK_SIZES; + const __be32 *cell; + u64 tot_size = 0; + paddr_t pbase, psize, gsize; + mfn_t smfn; + int res; + + prop = dt_find_property(node, "xen,static-mem", NULL); + if ( !dt_property_read_u32(node, "#xen,static-mem-address-cells", + &addr_cells) ) + { + printk(XENLOG_ERR + "%pd: failed to read \"#xen,static-mem-address-cells\".\n", d); + goto fail; + } + + if ( !dt_property_read_u32(node, "#xen,static-mem-size-cells", + &size_cells) ) + { + printk(XENLOG_ERR + "%pd: failed to read \"#xen,static-mem-size-cells\".\n", d); + goto fail; + } + reg_cells = addr_cells + size_cells; + + /* + * The static memory will be mapped in the guest at the usual guest memory + * addresses (GUEST_RAM0_BASE, GUEST_RAM1_BASE) defined by + * xen/include/public/arch-arm.h. + */ + gbank = 0; + gsize = ramsize[gbank]; + kinfo->mem.bank[gbank].start = rambase[gbank]; + + cell = (const __be32 *)prop->value; + nr_banks = (prop->length) / (reg_cells * sizeof (u32)); + + for ( ; bank < nr_banks; bank++ ) + { + device_tree_get_reg(&cell, addr_cells, size_cells, &pbase, &psize); + ASSERT(IS_ALIGNED(pbase, PAGE_SIZE) && IS_ALIGNED(psize, PAGE_SIZE)); + + smfn = maddr_to_mfn(pbase); + res = acquire_domstatic_pages(d, smfn, PFN_DOWN(psize), 0); + if ( res ) + { + printk(XENLOG_ERR + "%pd: failed to acquire static memory: %d.\n", d, res); + goto fail; + } + + printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n", + d, bank, pbase, pbase + psize); + + while ( 1 ) + { + /* Map as much as possible the static range to the guest bank */ + if ( !append_static_memory_to_bank(d, &kinfo->mem.bank[gbank], smfn, + min(psize, gsize)) ) + goto fail; + + /* + * The current physical bank is fully mapped. + * Handle the next physical bank. + */ + if ( gsize >= psize ) + { + gsize = gsize - psize; + break; + } + /* + * When current guest bank is not enough to map, exhaust + * the current one and seek to the next. + * Before seeking to the next, check if we still have available + * guest bank. + */ + else if ( (gbank + 1) >= GUEST_RAM_BANKS ) + { + printk(XENLOG_ERR "Exhausted all possible guest banks.\n"); + goto fail; + } + else + { + psize = psize - gsize; + smfn = mfn_add(smfn, gsize >> PAGE_SHIFT); + /* Update to the next guest bank. */ + gbank++; + gsize = ramsize[gbank]; + kinfo->mem.bank[gbank].start = rambase[gbank]; + } + } + + tot_size += psize; + } + + kinfo->mem.nr_banks = ++gbank; + + kinfo->unassigned_mem -= tot_size; + /* + * The property 'memory' should match the amount of memory given to the + * guest. + * Currently, it is only possible to either acquire static memory or let + * Xen allocate. *Mixing* is not supported. + */ + if ( kinfo->unassigned_mem ) + { + printk(XENLOG_ERR + "Size of \"memory\" property doesn't match up with the sum-up of \"xen,static-mem\". Unsupported configuration.\n"); + goto fail; + } + + return; + + fail: + panic("Failed to allocate requested static memory for domain %pd.", d); +} +#else +static void __init allocate_static_memory(struct domain *d, + struct kernel_info *kinfo, + const struct dt_device_node *node) +{ +} +#endif + static int __init write_properties(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { @@ -2453,7 +2609,10 @@ static int __init construct_domU(struct domain *d, /* type must be set before allocate memory */ d->arch.type = kinfo.type; #endif - allocate_memory(d, &kinfo); + if ( !dt_find_property(node, "xen,static-mem", NULL) ) + allocate_memory(d, &kinfo); + else + allocate_static_memory(d, &kinfo, node); rc = prepare_dtb_domU(d, &kinfo); if ( rc < 0 ) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index eff9a105e7..6e01e83967 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1293,11 +1293,8 @@ out: return resolved; } -static inline int p2m_insert_mapping(struct domain *d, - gfn_t start_gfn, - unsigned long nr, - mfn_t mfn, - p2m_type_t t) +int p2m_insert_mapping(struct domain *d, gfn_t start_gfn, unsigned long nr, + mfn_t mfn, p2m_type_t t) { struct p2m_domain *p2m = p2m_get_hostp2m(d); int rc; diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 6a2108398f..f885cc522b 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -300,6 +300,9 @@ int map_dev_mmio_region(struct domain *d, unsigned long nr, mfn_t mfn); +int p2m_insert_mapping(struct domain *d, gfn_t start_gfn, unsigned long nr, + mfn_t mfn, p2m_type_t t); + int guest_physmap_add_entry(struct domain *d, gfn_t gfn, mfn_t mfn, @@ -315,6 +318,14 @@ static inline int guest_physmap_add_page(struct domain *d, return guest_physmap_add_entry(d, gfn, mfn, page_order, p2m_ram_rw); } +static inline int guest_physmap_add_pages(struct domain *d, + gfn_t gfn, + mfn_t mfn, + unsigned int nr_pages) +{ + return p2m_insert_mapping(d, gfn, nr_pages, mfn, p2m_ram_rw); +} + mfn_t gfn_to_mfn(struct domain *d, gfn_t gfn); /* Look up a GFN and take a reference count on the backing page. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:46:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:46:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202364.357118 (Exim 4.92) (envelope-from ) id 1mXpS1-0002S9-Jm; Tue, 05 Oct 2021 18:46:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202364.357118; Tue, 05 Oct 2021 18:46:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpS1-0002S1-Gw; Tue, 05 Oct 2021 18:46:05 +0000 Received: by outflank-mailman (input) for mailman id 202364; Tue, 05 Oct 2021 18:46:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpS0-0002Rj-7x for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpS0-0001st-7H for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpS0-0000d0-6b for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lePmkKACtXZ3kQsoIyMAnNvxHnHNdpIQeq++CH2IrxQ=; b=XoCl3oapikdc03nx2qCmg/5/44 fc2eT4ahJyET4pyrIMtc9x7TwLdAzp7wXE+eL5Fx4fy8+Nmw5L+oWArREO98JbWBAVrgUilRDXcOu Qyc5Bak2zW5BxPrDHUHw6we5TnpP+qm5TuVZ6/yEasSMwqXwA4HyqAlF2xqV2lDkZj84=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] sched: fix sched_move_domain() for domain without vcpus Message-Id: Date: Tue, 05 Oct 2021 18:46:04 +0000 commit 999e1582f289cfb8d59e2e58927c1cba0ac2ada3 Author: Juergen Gross AuthorDate: Wed Sep 15 10:57:47 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 15 10:57:47 2021 +0200 sched: fix sched_move_domain() for domain without vcpus In case a domain is created with a cpupool other than Pool-0 specified it will be moved to that cpupool before any vcpus are allocated. This will lead to a NULL pointer dereference in sched_move_domain(). Fix that by tolerating vcpus not being allocated yet. Fixes: 70fadc41635b9b6 ("xen/cpupool: support moving domain between cpupools with different granularity") Reported-by: Bertrand Marquis Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli --- xen/common/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 8d178baf3d..8f4b1ca10d 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -651,7 +651,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) struct scheduler *old_ops = dom_scheduler(d); void *old_domdata; unsigned int gran = cpupool_get_granularity(c); - unsigned int n_units = DIV_ROUND_UP(d->max_vcpus, gran); + unsigned int n_units = d->vcpu[0] ? DIV_ROUND_UP(d->max_vcpus, gran) : 0; int ret = 0; for_each_vcpu ( d, v ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:46:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:46:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202365.357121 (Exim 4.92) (envelope-from ) id 1mXpSB-0002WW-LI; Tue, 05 Oct 2021 18:46:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202365.357121; Tue, 05 Oct 2021 18:46:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSB-0002WN-IT; Tue, 05 Oct 2021 18:46:15 +0000 Received: by outflank-mailman (input) for mailman id 202365; Tue, 05 Oct 2021 18:46:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSA-0002W2-Bb for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSA-0001tL-Ar for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpSA-0000dr-A4 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IHS1qy/R6v2d9GxhobZRZ4nB5YTaW5Vr5zjIgWrBdsY=; b=1HbK16H9DY1bUrDP3ePEeOBPNb uVeQNbuzv3nskEpTNT6AAqWsAMh056RPY7Fg7C2UhX+J703BVD0DJpXbW31K/jWTGhYtQB+M8FWj0 +r6Z7SF56CCKD64C/lG0qCYfFB4HGJ4T5boPNk4Jb7fwHeMzf2JStpWAGkSNZMf2n3gU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ACPI: ignore processors which cannot be brought online Message-Id: Date: Tue, 05 Oct 2021 18:46:14 +0000 commit 0a7ebb1861062f795bab53272789ed2802d84ec0 Author: Jan Beulich AuthorDate: Wed Sep 15 11:00:40 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 15 11:00:40 2021 +0200 x86/ACPI: ignore processors which cannot be brought online ACPI 6.3 introduced a flag allowing to tell MADT entries describing hotpluggable processors from ones which are simply placeholders (often used by firmware writers to simplify handling there). Inspired by a Linux patch by Mario Limonciello . Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/acpi/boot.c | 16 ++++++++++++++++ xen/include/acpi/actbl1.h | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 8fe2d6fe0f..5e38b4b17c 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -53,6 +53,8 @@ bool __initdata acpi_ioapic; static bool __initdata acpi_skip_timer_override; boolean_param("acpi_skip_timer_override", acpi_skip_timer_override); +static uint8_t __initdata madt_revision; + static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; /* -------------------------------------------------------------------------- @@ -64,6 +66,8 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) struct acpi_table_madt *madt = container_of(table, struct acpi_table_madt, header); + madt_revision = madt->header.revision; + if (madt->address) { acpi_lapic_addr = (u64) madt->address; @@ -86,6 +90,12 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) if (BAD_MADT_ENTRY(processor, end)) return -EINVAL; + /* Don't register processors that cannot be onlined. */ + if (madt_revision >= 5 && + !(processor->lapic_flags & ACPI_MADT_ENABLED) && + !(processor->lapic_flags & ACPI_MADT_ONLINE_CAPABLE)) + return 0; + if ((processor->lapic_flags & ACPI_MADT_ENABLED) || processor->local_apic_id != 0xffffffff || opt_cpu_info) { acpi_table_print_madt_entry(header); @@ -136,6 +146,12 @@ acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end) if (BAD_MADT_ENTRY(processor, end)) return -EINVAL; + /* Don't register processors that cannot be onlined. */ + if (madt_revision >= 5 && + !(processor->lapic_flags & ACPI_MADT_ENABLED) && + !(processor->lapic_flags & ACPI_MADT_ONLINE_CAPABLE)) + return 0; + if ((processor->lapic_flags & ACPI_MADT_ENABLED) || processor->id != 0xff || opt_cpu_info) acpi_table_print_madt_entry(header); diff --git a/xen/include/acpi/actbl1.h b/xen/include/acpi/actbl1.h index e1991362dc..923641fc9e 100644 --- a/xen/include/acpi/actbl1.h +++ b/xen/include/acpi/actbl1.h @@ -858,7 +858,8 @@ struct acpi_madt_generic_translator { /* MADT Local APIC flags */ -#define ACPI_MADT_ENABLED (1) /* 00: Processor is usable if set */ +#define ACPI_MADT_ENABLED (1 << 0) /* 00: Processor is usable if set */ +#define ACPI_MADT_ONLINE_CAPABLE (1 << 1) /* 01: Processor can be onlined */ /* MADT MPS INTI flags (inti_flags) */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:46:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:46:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202366.357126 (Exim 4.92) (envelope-from ) id 1mXpSL-0002b2-NJ; Tue, 05 Oct 2021 18:46:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202366.357126; Tue, 05 Oct 2021 18:46:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSL-0002au-Jz; Tue, 05 Oct 2021 18:46:25 +0000 Received: by outflank-mailman (input) for mailman id 202366; Tue, 05 Oct 2021 18:46:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSK-0002aW-Em for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSK-0001tb-E6 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpSK-0000gB-DO for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+6HTyi9ME24f+TmX6yBxnEOkwzqSI3ho4XIaRrDJt50=; b=54dUkmAq2SFzsT10FUSUjsZuJf 4QC+K60znZpVrswdH9CL+/OTIRleUaKzOBIU6SQ8sZStPBqAmJ7wPf2rEW9Nk08eTDx3oyctklfbP s75YjRR/xKCHTJCPee2EqDwLZ0GNnKAlFz5KX2XO6EIPainpFRqL8krvzewUB6Bx5NG0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: properly "ignore" early evaluated "no-real-mode" Message-Id: Date: Tue, 05 Oct 2021 18:46:24 +0000 commit e5046fc6e99db83e2c21ff8d9bfa92a0b6d328ad Author: Jan Beulich AuthorDate: Wed Sep 15 11:01:29 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 15 11:01:29 2021 +0200 x86/boot: properly "ignore" early evaluated "no-real-mode" The option parser takes off "no-" prefixes before matching, so they also shouldn't be specified to match against. Fixes: e44d98608476 ("x86/setup: Ignore early boot parameters like no-real-mode") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 8105dc36bb..b101565f14 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -692,7 +692,7 @@ static void __init noreturn reinit_bsp_stack(void) * has options that are only used during the very initial boot process, * so they can be ignored now. */ -ignore_param("no-real-mode"); +ignore_param("real-mode"); ignore_param("edd"); ignore_param("edid"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:46:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:46:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202368.357130 (Exim 4.92) (envelope-from ) id 1mXpSV-0002fz-Px; Tue, 05 Oct 2021 18:46:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202368.357130; Tue, 05 Oct 2021 18:46: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 1mXpSV-0002fr-N6; Tue, 05 Oct 2021 18:46:35 +0000 Received: by outflank-mailman (input) for mailman id 202368; Tue, 05 Oct 2021 18:46:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSU-0002fW-Hh for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSU-0001tp-H5 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpSU-0000gy-GQ for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WYRaBVhsEYfNJINZxvetBLnst02XTQnCQOTmaKKr35o=; b=BxchcBW/gGeImJXlT/6VJhdi/M +PtMyn/O7qcxLuG9CC/aYxAG5aF8K19wT0EjZpNPY0709jhHSx/NkjKhh0jya+T3bkZizb625L/tb g8T+tL24O0CXmTCIX1X822KlOnZIAcnylVM7UoH/E35miTVeMXC75IhbWR1S4q39gyI4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: quote section names when defining them in linker script Message-Id: Date: Tue, 05 Oct 2021 18:46:34 +0000 commit 6254920587c33bcc7ab884e6c9a11cfc0d5867ab Author: Roger Pau Monné AuthorDate: Wed Sep 15 11:02:21 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 15 11:02:21 2021 +0200 x86: quote section names when defining them in linker script LLVM ld seems to require section names to be quoted at both definition and when referencing them for a match to happen, or else we get the following errors: ld: error: xen.lds:45: undefined section ".text" ld: error: xen.lds:69: undefined section ".rodata" ld: error: xen.lds:104: undefined section ".note.gnu.build-id" [...] The original fix for GNU ld 2.37 only quoted the section name when referencing it in the ADDR function. Fix by also quoting the section names when declaring them. Fixes: 58ad654ebce7 ("x86: work around build issue with GNU ld 2.37") Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 955d5cf4a0..11b1da2154 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -18,7 +18,7 @@ ENTRY(efi_start) #else /* !EFI */ #define FORMAT "elf64-x86-64" -#define DECL_SECTION(x) x : AT(ADDR(#x) - __XEN_VIRT_START) +#define DECL_SECTION(x) #x : AT(ADDR(#x) - __XEN_VIRT_START) ENTRY(start_pa) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:46:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:46:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202369.357134 (Exim 4.92) (envelope-from ) id 1mXpSf-0002jl-RV; Tue, 05 Oct 2021 18:46:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202369.357134; Tue, 05 Oct 2021 18:46:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSf-0002jd-OW; Tue, 05 Oct 2021 18:46:45 +0000 Received: by outflank-mailman (input) for mailman id 202369; Tue, 05 Oct 2021 18:46:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSe-0002jL-Kt for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSe-0001u1-KE for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpSe-0000hg-JR for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/KnjozHq8DJ+aHCZK408yn1HvBCkAqHyZEQYEAhwx9M=; b=xZDkenp9wvyy0vJR8JUFi+nuXr cdpkkRW8FdRxZZ7lhlJFi/7HyPN8N75uhIo3JtkqO1Sk6dI07eN70lCSNPAxqZrDe4EB29N7HOAuD RXojmrmb8NshzrI/cnFvaLVkjpyoigNj7WEs07wY1Y8rVg2sz5I2JJWRBxqkix5IEJ/Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m: fix xenmem_add_to_physmap_one double page removal Message-Id: Date: Tue, 05 Oct 2021 18:46:44 +0000 commit 3e910b648b99393561e7c523756c1ea49a6c1305 Author: Roger Pau Monné AuthorDate: Wed Sep 15 15:13:14 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 15 15:13:14 2021 +0200 x86/p2m: fix xenmem_add_to_physmap_one double page removal If the new gfn matches the previous one (ie: gpfn == old_gpfn) xenmem_add_to_physmap_one will issue a duplicated call to guest_physmap_remove_page with the same guest frame number, because the get_gpfn_from_mfn call has been moved by commit f8582da041 to be performed before the original page is removed. This leads to the second guest_physmap_remove_page failing, which was not the case before commit f8582da041. Fix this by adding a check that prevents a second call to guest_physmap_remove_page if the previous one has already removed the backing page from that gfn. Fixes: f8582da041 ('x86/mm: pull a sanity check earlier in xenmem_add_to_physmap_one()') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/mm/p2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 674a6f4fe9..2bd4d37286 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2813,7 +2813,7 @@ int xenmem_add_to_physmap_one( } /* Unmap from old location, if any. */ - if ( !rc && old_gpfn != INVALID_M2P_ENTRY ) + if ( !rc && old_gpfn != INVALID_M2P_ENTRY && !gfn_eq(_gfn(old_gpfn), gpfn) ) rc = guest_physmap_remove_page(d, _gfn(old_gpfn), mfn, PAGE_ORDER_4K); /* Map at new location. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:46:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:46:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202372.357138 (Exim 4.92) (envelope-from ) id 1mXpSp-0002nz-Ti; Tue, 05 Oct 2021 18:46:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202372.357138; Tue, 05 Oct 2021 18:46:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSp-0002nm-Q8; Tue, 05 Oct 2021 18:46:55 +0000 Received: by outflank-mailman (input) for mailman id 202372; Tue, 05 Oct 2021 18:46:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSo-0002nT-O4 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSo-0001uC-NP for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpSo-0000iP-Mf for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:46:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TjykmqqWkFyCSyx7fJynFNX46A3WVlY7+1Mb3WmXxTU=; b=z89VoWci05ybhg36i2FY3dWZus 9Jo+2l9dT5FYO8Cuxk4EmBQvDygFAUX9IqpenE+jpIvS0aWK6g6kfAC5vQ+zQ9/WYGJ96ghb4kd8v NwBA6SsaOpIw78i75QBHMqQzOJsBKetT/h8+TI9sUN6uAo5oIRlGlL/N8/2L6zMrUMTY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] IOMMU: page table dumping adjustments Message-Id: Date: Tue, 05 Oct 2021 18:46:54 +0000 commit fd7e0b14a82b36bfb7941150f1cc84e682780525 Author: Jan Beulich AuthorDate: Thu Sep 16 10:56:25 2021 +0200 Commit: Jan Beulich CommitDate: Thu Sep 16 10:56:25 2021 +0200 IOMMU: page table dumping adjustments For one none of the three IOMMU implementations on Arm specify a dumping hook. Generalize VT-d's "don't dump shared page tables" to cover for this. Further in the past I was told that on Arm in principle there could be multiple different IOMMUs, and hence different domains' platform_ops pointers could differ. Use each domain's ops for calling the dump hook. (In the long run all uses of iommu_get_ops() would likely need to disappear for this reason.) Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/iommu.c | 11 +++++++---- xen/drivers/passthrough/vtd/iommu.c | 6 ------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index fd2578d30a..6334370109 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -587,12 +587,9 @@ bool_t iommu_has_feature(struct domain *d, enum iommu_feature feature) static void iommu_dump_page_tables(unsigned char key) { struct domain *d; - const struct iommu_ops *ops; ASSERT(iommu_enabled); - ops = iommu_get_ops(); - rcu_read_lock(&domlist_read_lock); for_each_domain(d) @@ -600,7 +597,13 @@ static void iommu_dump_page_tables(unsigned char key) if ( is_hardware_domain(d) || !is_iommu_enabled(d) ) continue; - ops->dump_page_tables(d); + if ( iommu_use_hap_pt(d) ) + { + printk("%pd sharing page tables\n", d); + continue; + } + + dom_iommu(d)->platform_ops->dump_page_tables(d); } rcu_read_unlock(&domlist_read_lock); diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2034a95a87..08890c66d4 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2668,12 +2668,6 @@ static void vtd_dump_page_tables(struct domain *d) { const struct domain_iommu *hd = dom_iommu(d); - if ( iommu_use_hap_pt(d) ) - { - printk(VTDPREFIX " %pd sharing EPT table\n", d); - return; - } - printk(VTDPREFIX" %pd table has %d levels\n", d, agaw_to_level(hd->arch.vtd.agaw)); vtd_dump_page_table_level(hd->arch.vtd.pgd_maddr, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:47:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:47:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202376.357143 (Exim 4.92) (envelope-from ) id 1mXpSz-0002vC-Uz; Tue, 05 Oct 2021 18:47:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202376.357143; Tue, 05 Oct 2021 18:47:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSz-0002v3-Rj; Tue, 05 Oct 2021 18:47:05 +0000 Received: by outflank-mailman (input) for mailman id 202376; Tue, 05 Oct 2021 18:47:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSy-0002us-RG for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpSy-0001ua-QY for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpSy-0000jO-Pr for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VeHSwQuIM0IpRPqxVfNDp7Y9Dm/xk2apCS5Pc7R1tkQ=; b=Nc5nidhY9jUh3YB3GMaW/FNW0M pTu8t/602XN8cFB0R1767XgItLrkMGfYUF+MZnlWLXYGJ6hP4f6vUZX8EKYdeefvvGfnO9aP95lBr xrtc/hwAGmiaOMQNwsT8N7IKGotTYN15u7JT5SnLHqKwQ4lO52bKyqd8CrYYvPnSIg8Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: show permissions during page table walks Message-Id: Date: Tue, 05 Oct 2021 18:47:04 +0000 commit 8f009f13e9c71159fd718fb438bad63b48d7695c Author: Jan Beulich AuthorDate: Thu Sep 16 10:57:09 2021 +0200 Commit: Jan Beulich CommitDate: Thu Sep 16 10:57:09 2021 +0200 VT-d: show permissions during page table walks Besides the addresses this is the next crucial bit of information one might be after. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 6 ++++-- xen/drivers/passthrough/vtd/utils.c | 11 ++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 08890c66d4..fc55f16343 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2655,10 +2655,12 @@ static void vtd_dump_page_table_level(paddr_t pt_maddr, int level, paddr_t gpa, vtd_dump_page_table_level(dma_pte_addr(*pte), next_level, address, indent + 1); else - printk("%*sdfn: %08lx mfn: %08lx\n", + printk("%*sdfn: %08lx mfn: %08lx %c%c\n", indent, "", (unsigned long)(address >> PAGE_SHIFT_4K), - (unsigned long)(dma_pte_addr(*pte) >> PAGE_SHIFT_4K)); + (unsigned long)(dma_pte_addr(*pte) >> PAGE_SHIFT_4K), + dma_pte_read(*pte) ? 'r' : '-', + dma_pte_write(*pte) ? 'w' : '-'); } unmap_vtd_domain_page(pt_vaddr); diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index 70add3cc8e..788cbdeee4 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -159,14 +159,11 @@ void print_vtd_entries(struct vtd_iommu *iommu, int bus, int devfn, u64 gmfn) l_index = get_level_index(gmfn, level); pte.val = l[l_index]; unmap_vtd_domain_page(l); - printk(" l%u[%03x] = %"PRIx64"\n", level, l_index, pte.val); + printk(" l%u[%03x] = %"PRIx64" %c%c\n", level, l_index, pte.val, + dma_pte_read(pte) ? 'r' : '-', + dma_pte_write(pte) ? 'w' : '-'); - if ( !dma_pte_present(pte) ) - { - printk(" l%u[%03x] not present\n", level, l_index); - break; - } - if ( dma_pte_superpage(pte) ) + if ( !dma_pte_present(pte) || dma_pte_superpage(pte) ) break; val = dma_pte_addr(pte); } while ( --level ); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:47:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:47:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202377.357145 (Exim 4.92) (envelope-from ) id 1mXpT9-0002yH-Vz; Tue, 05 Oct 2021 18:47:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202377.357145; Tue, 05 Oct 2021 18:47:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpT9-0002y9-TD; Tue, 05 Oct 2021 18:47:15 +0000 Received: by outflank-mailman (input) for mailman id 202377; Tue, 05 Oct 2021 18:47:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpT8-0002xn-UU for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpT8-0001v4-To for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpT8-0000k1-T4 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AHnINWWdeCSIWFnUQAlNB5Oey0Ck+7rYuFvnIdIBGvA=; b=JIbsYcBWxVSj7tNXB+SZ2KKB4c cp4zrtwo1YAXK1mKkbX0r1x/hCmuTFXuZpV9paGvmaJbOWrhuhiimoLd6u3NlkIil3FGAL3LapOkz sFdVN3SVNAl1n3UKHlNqOWBYSic8/F6T5kKk6xKWejpS0U6sEuSF+Qei85FHBEdMEx4I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] IOMMU/x86: drop pointless NULL checks Message-Id: Date: Tue, 05 Oct 2021 18:47:14 +0000 commit 893335807d5b11d0899e7b7bb3cb45c5af289767 Author: Jan Beulich AuthorDate: Thu Sep 16 10:58:03 2021 +0200 Commit: Jan Beulich CommitDate: Thu Sep 16 10:58:03 2021 +0200 IOMMU/x86: drop pointless NULL checks map_domain_page() et al never fail; no need to check their return values against NULL, and no need to carry dead printk()s. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Kevin Tian --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 6 ------ xen/drivers/passthrough/vtd/iommu.c | 6 ------ xen/drivers/passthrough/vtd/utils.c | 15 --------------- 3 files changed, 27 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 342fce6fff..819b5a6cc3 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -566,12 +566,6 @@ static void amd_dump_page_table_level(struct page_info *pg, int level, return; table_vaddr = __map_domain_page(pg); - if ( table_vaddr == NULL ) - { - printk("AMD IOMMU failed to map domain page %"PRIpaddr"\n", - page_to_maddr(pg)); - return; - } for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ ) { diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index fc55f16343..bab19d79e8 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2633,12 +2633,6 @@ static void vtd_dump_page_table_level(paddr_t pt_maddr, int level, paddr_t gpa, return; pt_vaddr = map_vtd_domain_page(pt_maddr); - if ( pt_vaddr == NULL ) - { - printk(VTDPREFIX " failed to map domain page %"PRIpaddr"\n", - pt_maddr); - return; - } next_level = level - 1; for ( i = 0; i < PTE_NUM; i++ ) diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c index 788cbdeee4..56dfdff9bd 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -106,11 +106,6 @@ void print_vtd_entries(struct vtd_iommu *iommu, int bus, int devfn, u64 gmfn) } root_entry = (struct root_entry *)map_vtd_domain_page(iommu->root_maddr); - if ( root_entry == NULL ) - { - printk(" root_entry == NULL\n"); - return; - } printk(" root_entry[%02x] = %"PRIx64"\n", bus, root_entry[bus].val); if ( !root_present(root_entry[bus]) ) @@ -123,11 +118,6 @@ void print_vtd_entries(struct vtd_iommu *iommu, int bus, int devfn, u64 gmfn) val = root_entry[bus].val; unmap_vtd_domain_page(root_entry); ctxt_entry = map_vtd_domain_page(val); - if ( ctxt_entry == NULL ) - { - printk(" ctxt_entry == NULL\n"); - return; - } val = ctxt_entry[devfn].lo; printk(" context[%02x] = %"PRIx64"_%"PRIx64"\n", @@ -151,11 +141,6 @@ void print_vtd_entries(struct vtd_iommu *iommu, int bus, int devfn, u64 gmfn) do { l = map_vtd_domain_page(val); - if ( l == NULL ) - { - printk(" l%u == NULL\n", level); - break; - } l_index = get_level_index(gmfn, level); pte.val = l[l_index]; unmap_vtd_domain_page(l); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:47:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:47:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202378.357149 (Exim 4.92) (envelope-from ) id 1mXpTK-00031i-2b; Tue, 05 Oct 2021 18:47:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202378.357149; Tue, 05 Oct 2021 18:47:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTJ-00031a-V3; Tue, 05 Oct 2021 18:47:25 +0000 Received: by outflank-mailman (input) for mailman id 202378; Tue, 05 Oct 2021 18:47:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTJ-00031K-1a for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTJ-0001vF-0p for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpTJ-0000ke-06 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ozlR08jcxGqoSD04KKV8m+klYz/arIUlsbl4e61owEs=; b=z/jA6oK4kJvh+osiJMJD5/+kCt fA1EhPgnLHDeqI1SJ2UVb7GLvtqJCu5hx/+44Oi1NHD4DYbXMWy0Dq5WD6Y2Sm7Lh692V38NCLqET Q7iDs2PEW7FM/4JB0rIV38YieT+T32z6ovAvoWtpyxDOH8XbfEdbjS1aTm9dD/KhoxWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm: apply coding style Message-Id: Date: Tue, 05 Oct 2021 18:47:25 +0000 commit b17546d7f33e95103922470b1ae422b60a04ec06 Author: Daniel P. Smith AuthorDate: Thu Sep 16 10:58:59 2021 +0200 Commit: Jan Beulich CommitDate: Thu Sep 16 10:58:59 2021 +0200 xsm: apply coding style Instead of intermixing coding style changes with code changes as they are come upon in this patch set, moving all coding style changes into a single commit. The focus of coding style changes here are, - move trailing comments to line above - ensuring line length does not exceed 80 chars - ensuring proper indentation for 80 char wrapping - covert u32 type statements to uint32_t - remove space between closing and opening parens - drop extern on function declarations Signed-off-by: Daniel P. Smith Acked-by: Jan Beulich --- xen/include/xsm/dummy.h | 190 ++++++++++++------- xen/include/xsm/xsm.h | 495 ++++++++++++++++++++++++++---------------------- xen/xsm/xsm_core.c | 8 +- xen/xsm/xsm_policy.c | 7 +- 4 files changed, 396 insertions(+), 304 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 214b5408b1..3b1b378b58 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -19,7 +19,8 @@ #include #include -/* Cannot use BUILD_BUG_ON here because the expressions we check are not +/* + * Cannot use BUILD_BUG_ON here because the expressions we check are not * considered constant at compile time. Instead, rely on constant propagation to * inline out the calls to this invalid function, which will cause linker errors * if references remain at link time. @@ -44,7 +45,8 @@ void __xsm_action_mismatch_detected(void); #ifdef CONFIG_XSM -/* In CONFIG_XSM builds, this header file is included from xsm/dummy.c, and +/* + * In CONFIG_XSM builds, this header file is included from xsm/dummy.c, and * contains static (not inline) functions compiled to the dummy XSM module. * There is no xsm_default_t argument available, so the value from the assertion * is used to initialize the variable. @@ -57,7 +59,8 @@ void __xsm_action_mismatch_detected(void); #else /* CONFIG_XSM */ -/* In !CONFIG_XSM builds, this header file is included from xsm/xsm.h, and +/* + * In !CONFIG_XSM builds, this header file is included from xsm/xsm.h, and * contains inline functions for each XSM hook. These functions also perform * compile-time checks on the xsm_default_t argument to ensure that the behavior * of the dummy XSM module is the same as the behavior with XSM disabled. @@ -98,13 +101,14 @@ static always_inline int xsm_default_action( } } -static XSM_INLINE void xsm_security_domaininfo(struct domain *d, - struct xen_domctl_getdomaininfo *info) +static XSM_INLINE void xsm_security_domaininfo( + struct domain *d, struct xen_domctl_getdomaininfo *info) { return; } -static XSM_INLINE int xsm_domain_create(XSM_DEFAULT_ARG struct domain *d, u32 ssidref) +static XSM_INLINE int xsm_domain_create( + XSM_DEFAULT_ARG struct domain *d, uint32_t ssidref) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); @@ -116,7 +120,8 @@ static XSM_INLINE int xsm_getdomaininfo(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_domctl_scheduler_op(XSM_DEFAULT_ARG struct domain *d, int cmd) +static XSM_INLINE int xsm_domctl_scheduler_op( + XSM_DEFAULT_ARG struct domain *d, int cmd) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); @@ -128,7 +133,8 @@ static XSM_INLINE int xsm_sysctl_scheduler_op(XSM_DEFAULT_ARG int cmd) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_set_target(XSM_DEFAULT_ARG struct domain *d, struct domain *e) +static XSM_INLINE int xsm_set_target( + XSM_DEFAULT_ARG struct domain *d, struct domain *e) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, NULL); @@ -173,38 +179,43 @@ static XSM_INLINE void xsm_free_security_domain(struct domain *d) return; } -static XSM_INLINE int xsm_grant_mapref(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, - uint32_t flags) +static XSM_INLINE int xsm_grant_mapref( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, uint32_t flags) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_grant_unmapref(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_unmapref( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_grant_setup(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_setup( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_grant_transfer(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_transfer( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_grant_copy(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_copy( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_grant_query_size(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_query_size( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d1, d2); @@ -216,14 +227,15 @@ static XSM_INLINE int xsm_memory_exchange(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_memory_adjust_reservation(XSM_DEFAULT_ARG struct domain *d1, - struct domain *d2) +static XSM_INLINE int xsm_memory_adjust_reservation( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_memory_stat_reservation(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_memory_stat_reservation( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d1, d2); @@ -253,14 +265,16 @@ static XSM_INLINE int xsm_kexec(XSM_DEFAULT_VOID) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_schedop_shutdown(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_schedop_shutdown( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_DM_PRIV); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_memory_pin_page(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, - struct page_info *page) +static XSM_INLINE int xsm_memory_pin_page( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, + struct page_info *page) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, d1, d2); @@ -272,15 +286,16 @@ static XSM_INLINE int xsm_claim_pages(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_evtchn_unbound(XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn, - domid_t id2) +static XSM_INLINE int xsm_evtchn_unbound( + XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn, domid_t id2) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_evtchn_interdomain(XSM_DEFAULT_ARG struct domain *d1, struct evtchn - *chan1, struct domain *d2, struct evtchn *chan2) +static XSM_INLINE int xsm_evtchn_interdomain( + XSM_DEFAULT_ARG struct domain *d1, struct evtchn *chan1, struct domain *d2, + struct evtchn *chan2) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, d1, d2); @@ -291,19 +306,22 @@ static XSM_INLINE void xsm_evtchn_close_post(struct evtchn *chn) return; } -static XSM_INLINE int xsm_evtchn_send(XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn) +static XSM_INLINE int xsm_evtchn_send( + XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, d, NULL); } -static XSM_INLINE int xsm_evtchn_status(XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn) +static XSM_INLINE int xsm_evtchn_status( + XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_evtchn_reset( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d1, d2); @@ -321,7 +339,8 @@ static XSM_INLINE void xsm_free_security_evtchns( return; } -static XSM_INLINE char *xsm_show_security_evtchn(struct domain *d, const struct evtchn *chn) +static XSM_INLINE char *xsm_show_security_evtchn( + struct domain *d, const struct evtchn *chn) { return NULL; } @@ -357,13 +376,15 @@ static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_assign_device(XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf) +static XSM_INLINE int xsm_assign_device( + XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf) +static XSM_INLINE int xsm_deassign_device( + XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); @@ -372,15 +393,15 @@ static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint #endif /* HAS_PASSTHROUGH && HAS_PCI */ #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) -static XSM_INLINE int xsm_assign_dtdevice(XSM_DEFAULT_ARG struct domain *d, - const char *dtpath) +static XSM_INLINE int xsm_assign_dtdevice( + XSM_DEFAULT_ARG struct domain *d, const char *dtpath) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_deassign_dtdevice(XSM_DEFAULT_ARG struct domain *d, - const char *dtpath) +static XSM_INLINE int xsm_deassign_dtdevice( + XSM_DEFAULT_ARG struct domain *d, const char *dtpath) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); @@ -400,19 +421,22 @@ static XSM_INLINE int xsm_resource_unplug_core(XSM_DEFAULT_VOID) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_resource_plug_pci(XSM_DEFAULT_ARG uint32_t machine_bdf) +static XSM_INLINE int xsm_resource_plug_pci( + XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_PRIV); return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_resource_unplug_pci(XSM_DEFAULT_ARG uint32_t machine_bdf) +static XSM_INLINE int xsm_resource_unplug_pci( + XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_PRIV); return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_resource_setup_pci(XSM_DEFAULT_ARG uint32_t machine_bdf) +static XSM_INLINE int xsm_resource_setup_pci( + XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_PRIV); return xsm_default_action(action, current->domain, NULL); @@ -465,8 +489,8 @@ static XSM_INLINE int xsm_map_domain_pirq(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_map_domain_irq(XSM_DEFAULT_ARG struct domain *d, - int irq, const void *data) +static XSM_INLINE int xsm_map_domain_irq( + XSM_DEFAULT_ARG struct domain *d, int irq, const void *data) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); @@ -478,76 +502,86 @@ static XSM_INLINE int xsm_unmap_domain_pirq(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_bind_pt_irq(XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind) +static XSM_INLINE int xsm_bind_pt_irq( + XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_unbind_pt_irq(XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind) +static XSM_INLINE int xsm_unbind_pt_irq( + XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_unmap_domain_irq(XSM_DEFAULT_ARG struct domain *d, - int irq, const void *data) +static XSM_INLINE int xsm_unmap_domain_irq( + XSM_DEFAULT_ARG struct domain *d, int irq, const void *data) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_irq_permission(XSM_DEFAULT_ARG struct domain *d, int pirq, uint8_t allow) +static XSM_INLINE int xsm_irq_permission( + XSM_DEFAULT_ARG struct domain *d, int pirq, uint8_t allow) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_iomem_permission(XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow) +static XSM_INLINE int xsm_iomem_permission( + XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_iomem_mapping(XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow) +static XSM_INLINE int xsm_iomem_mapping( + XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_pci_config_permission(XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf, - uint16_t start, uint16_t end, - uint8_t access) +static XSM_INLINE int xsm_pci_config_permission( + XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf, uint16_t start, + uint16_t end, uint8_t access) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_add_to_physmap(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_add_to_physmap( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_remove_from_physmap(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_remove_from_physmap( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d1, d2); } -static XSM_INLINE int xsm_map_gmfn_foreign(XSM_DEFAULT_ARG struct domain *d, struct domain *t) +static XSM_INLINE int xsm_map_gmfn_foreign( + XSM_DEFAULT_ARG struct domain *d, struct domain *t) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d, t); } -static XSM_INLINE int xsm_hvm_param(XSM_DEFAULT_ARG struct domain *d, unsigned long op) +static XSM_INLINE int xsm_hvm_param( + XSM_DEFAULT_ARG struct domain *d, unsigned long op) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_hvm_control(XSM_DEFAULT_ARG struct domain *d, unsigned long op) +static XSM_INLINE int xsm_hvm_control( + XSM_DEFAULT_ARG struct domain *d, unsigned long op) { XSM_ASSERT_ACTION(XSM_DM_PRIV); return xsm_default_action(action, current->domain, d); @@ -559,7 +593,8 @@ static XSM_INLINE int xsm_hvm_param_altp2mhvm(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_hvm_altp2mhvm_op(XSM_DEFAULT_ARG struct domain *d, uint64_t mode, uint32_t op) +static XSM_INLINE int xsm_hvm_altp2mhvm_op( + XSM_DEFAULT_ARG struct domain *d, uint64_t mode, uint32_t op) { XSM_ASSERT_ACTION(XSM_OTHER); @@ -578,7 +613,8 @@ static XSM_INLINE int xsm_hvm_altp2mhvm_op(XSM_DEFAULT_ARG struct domain *d, uin } } -static XSM_INLINE int xsm_vm_event_control(XSM_DEFAULT_ARG struct domain *d, int mode, int op) +static XSM_INLINE int xsm_vm_event_control( + XSM_DEFAULT_ARG struct domain *d, int mode, int op) { XSM_ASSERT_ACTION(XSM_PRIV); return xsm_default_action(action, current->domain, d); @@ -621,13 +657,15 @@ static XSM_INLINE int xsm_do_mca(XSM_DEFAULT_VOID) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_shadow_control(XSM_DEFAULT_ARG struct domain *d, uint32_t op) +static XSM_INLINE int xsm_shadow_control( + XSM_DEFAULT_ARG struct domain *d, uint32_t op) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_mem_sharing_op(XSM_DEFAULT_ARG struct domain *d, struct domain *cd, int op) +static XSM_INLINE int xsm_mem_sharing_op( + XSM_DEFAULT_ARG struct domain *d, struct domain *cd, int op) { XSM_ASSERT_ACTION(XSM_DM_PRIV); return xsm_default_action(action, current->domain, cd); @@ -651,8 +689,9 @@ static XSM_INLINE int xsm_domain_memory_map(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct domain *t, - struct domain *f, uint32_t flags) +static XSM_INLINE int xsm_mmu_update( + XSM_DEFAULT_ARG struct domain *d, struct domain *t, struct domain *f, + uint32_t flags) { int rc = 0; XSM_ASSERT_ACTION(XSM_TARGET); @@ -663,38 +702,43 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct do return rc; } -static XSM_INLINE int xsm_mmuext_op(XSM_DEFAULT_ARG struct domain *d, struct domain *f) +static XSM_INLINE int xsm_mmuext_op( + XSM_DEFAULT_ARG struct domain *d, struct domain *f) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d, f); } -static XSM_INLINE int xsm_update_va_mapping(XSM_DEFAULT_ARG struct domain *d, struct domain *f, - l1_pgentry_t pte) +static XSM_INLINE int xsm_update_va_mapping( + XSM_DEFAULT_ARG struct domain *d, struct domain *f, l1_pgentry_t pte) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d, f); } -static XSM_INLINE int xsm_priv_mapping(XSM_DEFAULT_ARG struct domain *d, struct domain *t) +static XSM_INLINE int xsm_priv_mapping( + XSM_DEFAULT_ARG struct domain *d, struct domain *t) { XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, d, t); } -static XSM_INLINE int xsm_ioport_permission(XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow) +static XSM_INLINE int xsm_ioport_permission( + XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_ioport_mapping(XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow) +static XSM_INLINE int xsm_ioport_mapping( + XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_pmu_op (XSM_DEFAULT_ARG struct domain *d, unsigned int op) +static XSM_INLINE int xsm_pmu_op( + XSM_DEFAULT_ARG struct domain *d, unsigned int op) { XSM_ASSERT_ACTION(XSM_OTHER); switch ( op ) @@ -723,8 +767,8 @@ static XSM_INLINE int xsm_argo_enable(const struct domain *d) return 0; } -static XSM_INLINE int xsm_argo_register_single_source(const struct domain *d, - const struct domain *t) +static XSM_INLINE int xsm_argo_register_single_source( + const struct domain *d, const struct domain *t) { return 0; } @@ -734,8 +778,8 @@ static XSM_INLINE int xsm_argo_register_any_source(const struct domain *d) return 0; } -static XSM_INLINE int xsm_argo_send(const struct domain *d, - const struct domain *t) +static XSM_INLINE int xsm_argo_send( + const struct domain *d, const struct domain *t) { return 0; } @@ -743,7 +787,7 @@ static XSM_INLINE int xsm_argo_send(const struct domain *d, #endif /* CONFIG_ARGO */ #include -static XSM_INLINE int xsm_xen_version (XSM_DEFAULT_ARG uint32_t op) +static XSM_INLINE int xsm_xen_version(XSM_DEFAULT_ARG uint32_t op) { XSM_ASSERT_ACTION(XSM_OTHER); switch ( op ) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 16b90be2c5..7673d605a6 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -19,7 +19,7 @@ #include /* policy magic number (defined by XSM_MAGIC) */ -typedef u32 xsm_magic_t; +typedef uint32_t xsm_magic_t; #ifdef CONFIG_XSM_FLASK #define XSM_MAGIC 0xf97cff8c @@ -27,7 +27,8 @@ typedef u32 xsm_magic_t; #define XSM_MAGIC 0x0 #endif -/* These annotations are used by callers and in dummy.h to document the +/* + * These annotations are used by callers and in dummy.h to document the * default actions of XSM hooks. They should be compiled out otherwise. */ enum xsm_default { @@ -41,147 +42,154 @@ enum xsm_default { typedef enum xsm_default xsm_default_t; struct xsm_operations { - void (*security_domaininfo) (struct domain *d, - struct xen_domctl_getdomaininfo *info); - int (*domain_create) (struct domain *d, u32 ssidref); - int (*getdomaininfo) (struct domain *d); - int (*domctl_scheduler_op) (struct domain *d, int op); - int (*sysctl_scheduler_op) (int op); - int (*set_target) (struct domain *d, struct domain *e); - int (*domctl) (struct domain *d, int cmd); - int (*sysctl) (int cmd); - int (*readconsole) (uint32_t clear); - - int (*evtchn_unbound) (struct domain *d, struct evtchn *chn, domid_t id2); - int (*evtchn_interdomain) (struct domain *d1, struct evtchn *chn1, - struct domain *d2, struct evtchn *chn2); - void (*evtchn_close_post) (struct evtchn *chn); - int (*evtchn_send) (struct domain *d, struct evtchn *chn); - int (*evtchn_status) (struct domain *d, struct evtchn *chn); - int (*evtchn_reset) (struct domain *d1, struct domain *d2); - - int (*grant_mapref) (struct domain *d1, struct domain *d2, uint32_t flags); - int (*grant_unmapref) (struct domain *d1, struct domain *d2); - int (*grant_setup) (struct domain *d1, struct domain *d2); - int (*grant_transfer) (struct domain *d1, struct domain *d2); - int (*grant_copy) (struct domain *d1, struct domain *d2); - int (*grant_query_size) (struct domain *d1, struct domain *d2); - - int (*alloc_security_domain) (struct domain *d); - void (*free_security_domain) (struct domain *d); - int (*alloc_security_evtchns) (struct evtchn chn[], unsigned int nr); - void (*free_security_evtchns) (struct evtchn chn[], unsigned int nr); - char *(*show_security_evtchn) (struct domain *d, const struct evtchn *chn); - int (*init_hardware_domain) (struct domain *d); - - int (*get_pod_target) (struct domain *d); - int (*set_pod_target) (struct domain *d); - int (*memory_exchange) (struct domain *d); - int (*memory_adjust_reservation) (struct domain *d1, struct domain *d2); - int (*memory_stat_reservation) (struct domain *d1, struct domain *d2); - int (*memory_pin_page) (struct domain *d1, struct domain *d2, struct page_info *page); - int (*add_to_physmap) (struct domain *d1, struct domain *d2); - int (*remove_from_physmap) (struct domain *d1, struct domain *d2); - int (*map_gmfn_foreign) (struct domain *d, struct domain *t); - int (*claim_pages) (struct domain *d); - - int (*console_io) (struct domain *d, int cmd); - - int (*profile) (struct domain *d, int op); - - int (*kexec) (void); - int (*schedop_shutdown) (struct domain *d1, struct domain *d2); - - char *(*show_irq_sid) (int irq); - int (*map_domain_pirq) (struct domain *d); - int (*map_domain_irq) (struct domain *d, int irq, const void *data); - int (*unmap_domain_pirq) (struct domain *d); - int (*unmap_domain_irq) (struct domain *d, int irq, const void *data); - int (*bind_pt_irq) (struct domain *d, struct xen_domctl_bind_pt_irq *bind); - int (*unbind_pt_irq) (struct domain *d, struct xen_domctl_bind_pt_irq *bind); - int (*irq_permission) (struct domain *d, int pirq, uint8_t allow); - int (*iomem_permission) (struct domain *d, uint64_t s, uint64_t e, uint8_t allow); - int (*iomem_mapping) (struct domain *d, uint64_t s, uint64_t e, uint8_t allow); - int (*pci_config_permission) (struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access); + void (*security_domaininfo)(struct domain *d, + struct xen_domctl_getdomaininfo *info); + int (*domain_create)(struct domain *d, uint32_t ssidref); + int (*getdomaininfo)(struct domain *d); + int (*domctl_scheduler_op)(struct domain *d, int op); + int (*sysctl_scheduler_op)(int op); + int (*set_target)(struct domain *d, struct domain *e); + int (*domctl)(struct domain *d, int cmd); + int (*sysctl)(int cmd); + int (*readconsole)(uint32_t clear); + + int (*evtchn_unbound)(struct domain *d, struct evtchn *chn, domid_t id2); + int (*evtchn_interdomain)(struct domain *d1, struct evtchn *chn1, + struct domain *d2, struct evtchn *chn2); + void (*evtchn_close_post)(struct evtchn *chn); + int (*evtchn_send)(struct domain *d, struct evtchn *chn); + int (*evtchn_status)(struct domain *d, struct evtchn *chn); + int (*evtchn_reset)(struct domain *d1, struct domain *d2); + + int (*grant_mapref)(struct domain *d1, struct domain *d2, uint32_t flags); + int (*grant_unmapref)(struct domain *d1, struct domain *d2); + int (*grant_setup)(struct domain *d1, struct domain *d2); + int (*grant_transfer)(struct domain *d1, struct domain *d2); + int (*grant_copy)(struct domain *d1, struct domain *d2); + int (*grant_query_size)(struct domain *d1, struct domain *d2); + + int (*alloc_security_domain)(struct domain *d); + void (*free_security_domain)(struct domain *d); + int (*alloc_security_evtchns)(struct evtchn chn[], unsigned int nr); + void (*free_security_evtchns)(struct evtchn chn[], unsigned int nr); + char *(*show_security_evtchn)(struct domain *d, const struct evtchn *chn); + int (*init_hardware_domain)(struct domain *d); + + int (*get_pod_target)(struct domain *d); + int (*set_pod_target)(struct domain *d); + int (*memory_exchange)(struct domain *d); + int (*memory_adjust_reservation)(struct domain *d1, struct domain *d2); + int (*memory_stat_reservation)(struct domain *d1, struct domain *d2); + int (*memory_pin_page)(struct domain *d1, struct domain *d2, + struct page_info *page); + int (*add_to_physmap)(struct domain *d1, struct domain *d2); + int (*remove_from_physmap)(struct domain *d1, struct domain *d2); + int (*map_gmfn_foreign)(struct domain *d, struct domain *t); + int (*claim_pages)(struct domain *d); + + int (*console_io)(struct domain *d, int cmd); + + int (*profile)(struct domain *d, int op); + + int (*kexec)(void); + int (*schedop_shutdown)(struct domain *d1, struct domain *d2); + + char *(*show_irq_sid)(int irq); + int (*map_domain_pirq)(struct domain *d); + int (*map_domain_irq)(struct domain *d, int irq, const void *data); + int (*unmap_domain_pirq)(struct domain *d); + int (*unmap_domain_irq)(struct domain *d, int irq, const void *data); + int (*bind_pt_irq)(struct domain *d, struct xen_domctl_bind_pt_irq *bind); + int (*unbind_pt_irq)(struct domain *d, struct xen_domctl_bind_pt_irq *bind); + int (*irq_permission)(struct domain *d, int pirq, uint8_t allow); + int (*iomem_permission)(struct domain *d, uint64_t s, uint64_t e, + uint8_t allow); + int (*iomem_mapping)(struct domain *d, uint64_t s, uint64_t e, + uint8_t allow); + int (*pci_config_permission)(struct domain *d, uint32_t machine_bdf, + uint16_t start, uint16_t end, uint8_t access); #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) - int (*get_device_group) (uint32_t machine_bdf); - int (*assign_device) (struct domain *d, uint32_t machine_bdf); - int (*deassign_device) (struct domain *d, uint32_t machine_bdf); + int (*get_device_group)(uint32_t machine_bdf); + int (*assign_device)(struct domain *d, uint32_t machine_bdf); + int (*deassign_device)(struct domain *d, uint32_t machine_bdf); #endif #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) - int (*assign_dtdevice) (struct domain *d, const char *dtpath); - int (*deassign_dtdevice) (struct domain *d, const char *dtpath); + int (*assign_dtdevice)(struct domain *d, const char *dtpath); + int (*deassign_dtdevice)(struct domain *d, const char *dtpath); #endif - int (*resource_plug_core) (void); - int (*resource_unplug_core) (void); - int (*resource_plug_pci) (uint32_t machine_bdf); - int (*resource_unplug_pci) (uint32_t machine_bdf); - int (*resource_setup_pci) (uint32_t machine_bdf); - int (*resource_setup_gsi) (int gsi); - int (*resource_setup_misc) (void); + int (*resource_plug_core)(void); + int (*resource_unplug_core)(void); + int (*resource_plug_pci)(uint32_t machine_bdf); + int (*resource_unplug_pci)(uint32_t machine_bdf); + int (*resource_setup_pci)(uint32_t machine_bdf); + int (*resource_setup_gsi)(int gsi); + int (*resource_setup_misc)(void); int (*page_offline)(uint32_t cmd); int (*hypfs_op)(void); - long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(void) op); + long (*do_xsm_op)(XEN_GUEST_HANDLE_PARAM(void) op); #ifdef CONFIG_COMPAT - int (*do_compat_op) (XEN_GUEST_HANDLE_PARAM(void) op); + int (*do_compat_op)(XEN_GUEST_HANDLE_PARAM(void) op); #endif - int (*hvm_param) (struct domain *d, unsigned long op); - int (*hvm_control) (struct domain *d, unsigned long op); - int (*hvm_param_altp2mhvm) (struct domain *d); - int (*hvm_altp2mhvm_op) (struct domain *d, uint64_t mode, uint32_t op); - int (*get_vnumainfo) (struct domain *d); + int (*hvm_param)(struct domain *d, unsigned long op); + int (*hvm_control)(struct domain *d, unsigned long op); + int (*hvm_param_altp2mhvm)(struct domain *d); + int (*hvm_altp2mhvm_op)(struct domain *d, uint64_t mode, uint32_t op); + int (*get_vnumainfo)(struct domain *d); - int (*vm_event_control) (struct domain *d, int mode, int op); + int (*vm_event_control)(struct domain *d, int mode, int op); #ifdef CONFIG_MEM_ACCESS - int (*mem_access) (struct domain *d); + int (*mem_access)(struct domain *d); #endif #ifdef CONFIG_MEM_PAGING - int (*mem_paging) (struct domain *d); + int (*mem_paging)(struct domain *d); #endif #ifdef CONFIG_MEM_SHARING - int (*mem_sharing) (struct domain *d); + int (*mem_sharing)(struct domain *d); #endif - int (*platform_op) (uint32_t cmd); + int (*platform_op)(uint32_t cmd); #ifdef CONFIG_X86 - int (*do_mca) (void); - int (*shadow_control) (struct domain *d, uint32_t op); - int (*mem_sharing_op) (struct domain *d, struct domain *cd, int op); - int (*apic) (struct domain *d, int cmd); - int (*machine_memory_map) (void); - int (*domain_memory_map) (struct domain *d); + int (*do_mca)(void); + int (*shadow_control)(struct domain *d, uint32_t op); + int (*mem_sharing_op)(struct domain *d, struct domain *cd, int op); + int (*apic)(struct domain *d, int cmd); + int (*machine_memory_map)(void); + int (*domain_memory_map)(struct domain *d); #define XSM_MMU_UPDATE_READ 1 #define XSM_MMU_UPDATE_WRITE 2 #define XSM_MMU_NORMAL_UPDATE 4 #define XSM_MMU_MACHPHYS_UPDATE 8 - int (*mmu_update) (struct domain *d, struct domain *t, - struct domain *f, uint32_t flags); - int (*mmuext_op) (struct domain *d, struct domain *f); - int (*update_va_mapping) (struct domain *d, struct domain *f, l1_pgentry_t pte); - int (*priv_mapping) (struct domain *d, struct domain *t); - int (*ioport_permission) (struct domain *d, uint32_t s, uint32_t e, uint8_t allow); - int (*ioport_mapping) (struct domain *d, uint32_t s, uint32_t e, uint8_t allow); - int (*pmu_op) (struct domain *d, unsigned int op); + int (*mmu_update)(struct domain *d, struct domain *t, + struct domain *f, uint32_t flags); + int (*mmuext_op)(struct domain *d, struct domain *f); + int (*update_va_mapping)(struct domain *d, struct domain *f, + l1_pgentry_t pte); + int (*priv_mapping)(struct domain *d, struct domain *t); + int (*ioport_permission)(struct domain *d, uint32_t s, uint32_t e, + uint8_t allow); + int (*ioport_mapping)(struct domain *d, uint32_t s, uint32_t e, + uint8_t allow); + int (*pmu_op)(struct domain *d, unsigned int op); #endif - int (*dm_op) (struct domain *d); - int (*xen_version) (uint32_t cmd); - int (*domain_resource_map) (struct domain *d); + int (*dm_op)(struct domain *d); + int (*xen_version)(uint32_t cmd); + int (*domain_resource_map)(struct domain *d); #ifdef CONFIG_ARGO - int (*argo_enable) (const struct domain *d); - int (*argo_register_single_source) (const struct domain *d, - const struct domain *t); - int (*argo_register_any_source) (const struct domain *d); - int (*argo_send) (const struct domain *d, const struct domain *t); + int (*argo_enable)(const struct domain *d); + int (*argo_register_single_source)(const struct domain *d, + const struct domain *t); + int (*argo_register_any_source)(const struct domain *d); + int (*argo_send)(const struct domain *d, const struct domain *t); #endif }; @@ -191,121 +199,133 @@ extern struct xsm_operations *xsm_ops; #ifndef XSM_NO_WRAPPERS -static inline void xsm_security_domaininfo (struct domain *d, - struct xen_domctl_getdomaininfo *info) +static inline void xsm_security_domaininfo( + struct domain *d, struct xen_domctl_getdomaininfo *info) { xsm_ops->security_domaininfo(d, info); } -static inline int xsm_domain_create (xsm_default_t def, struct domain *d, u32 ssidref) +static inline int xsm_domain_create( + xsm_default_t def, struct domain *d, uint32_t ssidref) { return xsm_ops->domain_create(d, ssidref); } -static inline int xsm_getdomaininfo (xsm_default_t def, struct domain *d) +static inline int xsm_getdomaininfo(xsm_default_t def, struct domain *d) { return xsm_ops->getdomaininfo(d); } -static inline int xsm_domctl_scheduler_op (xsm_default_t def, struct domain *d, int cmd) +static inline int xsm_domctl_scheduler_op( + xsm_default_t def, struct domain *d, int cmd) { return xsm_ops->domctl_scheduler_op(d, cmd); } -static inline int xsm_sysctl_scheduler_op (xsm_default_t def, int cmd) +static inline int xsm_sysctl_scheduler_op(xsm_default_t def, int cmd) { return xsm_ops->sysctl_scheduler_op(cmd); } -static inline int xsm_set_target (xsm_default_t def, struct domain *d, struct domain *e) +static inline int xsm_set_target( + xsm_default_t def, struct domain *d, struct domain *e) { return xsm_ops->set_target(d, e); } -static inline int xsm_domctl (xsm_default_t def, struct domain *d, int cmd) +static inline int xsm_domctl(xsm_default_t def, struct domain *d, int cmd) { return xsm_ops->domctl(d, cmd); } -static inline int xsm_sysctl (xsm_default_t def, int cmd) +static inline int xsm_sysctl(xsm_default_t def, int cmd) { return xsm_ops->sysctl(cmd); } -static inline int xsm_readconsole (xsm_default_t def, uint32_t clear) +static inline int xsm_readconsole(xsm_default_t def, uint32_t clear) { return xsm_ops->readconsole(clear); } -static inline int xsm_evtchn_unbound (xsm_default_t def, struct domain *d1, struct evtchn *chn, - domid_t id2) +static inline int xsm_evtchn_unbound( + xsm_default_t def, struct domain *d1, struct evtchn *chn, domid_t id2) { return xsm_ops->evtchn_unbound(d1, chn, id2); } -static inline int xsm_evtchn_interdomain (xsm_default_t def, struct domain *d1, - struct evtchn *chan1, struct domain *d2, struct evtchn *chan2) +static inline int xsm_evtchn_interdomain( + xsm_default_t def, struct domain *d1, struct evtchn *chan1, + struct domain *d2, struct evtchn *chan2) { return xsm_ops->evtchn_interdomain(d1, chan1, d2, chan2); } -static inline void xsm_evtchn_close_post (struct evtchn *chn) +static inline void xsm_evtchn_close_post(struct evtchn *chn) { xsm_ops->evtchn_close_post(chn); } -static inline int xsm_evtchn_send (xsm_default_t def, struct domain *d, struct evtchn *chn) +static inline int xsm_evtchn_send( + xsm_default_t def, struct domain *d, struct evtchn *chn) { return xsm_ops->evtchn_send(d, chn); } -static inline int xsm_evtchn_status (xsm_default_t def, struct domain *d, struct evtchn *chn) +static inline int xsm_evtchn_status( + xsm_default_t def, struct domain *d, struct evtchn *chn) { return xsm_ops->evtchn_status(d, chn); } -static inline int xsm_evtchn_reset (xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_evtchn_reset( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->evtchn_reset(d1, d2); } -static inline int xsm_grant_mapref (xsm_default_t def, struct domain *d1, struct domain *d2, - uint32_t flags) +static inline int xsm_grant_mapref( + xsm_default_t def, struct domain *d1, struct domain *d2, uint32_t flags) { return xsm_ops->grant_mapref(d1, d2, flags); } -static inline int xsm_grant_unmapref (xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_grant_unmapref( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->grant_unmapref(d1, d2); } -static inline int xsm_grant_setup (xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_grant_setup( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->grant_setup(d1, d2); } -static inline int xsm_grant_transfer (xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_grant_transfer( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->grant_transfer(d1, d2); } -static inline int xsm_grant_copy (xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_grant_copy( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->grant_copy(d1, d2); } -static inline int xsm_grant_query_size (xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_grant_query_size( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->grant_query_size(d1, d2); } -static inline int xsm_alloc_security_domain (struct domain *d) +static inline int xsm_alloc_security_domain(struct domain *d) { return xsm_ops->alloc_security_domain(d); } -static inline void xsm_free_security_domain (struct domain *d) +static inline void xsm_free_security_domain(struct domain *d) { xsm_ops->free_security_domain(d); } @@ -322,60 +342,65 @@ static inline void xsm_free_security_evtchns( xsm_ops->free_security_evtchns(chn, nr); } -static inline char *xsm_show_security_evtchn (struct domain *d, const struct evtchn *chn) +static inline char *xsm_show_security_evtchn( + struct domain *d, const struct evtchn *chn) { return xsm_ops->show_security_evtchn(d, chn); } -static inline int xsm_init_hardware_domain (xsm_default_t def, struct domain *d) +static inline int xsm_init_hardware_domain(xsm_default_t def, struct domain *d) { return xsm_ops->init_hardware_domain(d); } -static inline int xsm_get_pod_target (xsm_default_t def, struct domain *d) +static inline int xsm_get_pod_target(xsm_default_t def, struct domain *d) { return xsm_ops->get_pod_target(d); } -static inline int xsm_set_pod_target (xsm_default_t def, struct domain *d) +static inline int xsm_set_pod_target(xsm_default_t def, struct domain *d) { return xsm_ops->set_pod_target(d); } -static inline int xsm_memory_exchange (xsm_default_t def, struct domain *d) +static inline int xsm_memory_exchange(xsm_default_t def, struct domain *d) { return xsm_ops->memory_exchange(d); } -static inline int xsm_memory_adjust_reservation (xsm_default_t def, struct domain *d1, struct - domain *d2) +static inline int xsm_memory_adjust_reservation( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->memory_adjust_reservation(d1, d2); } -static inline int xsm_memory_stat_reservation (xsm_default_t def, struct domain *d1, - struct domain *d2) +static inline int xsm_memory_stat_reservation( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->memory_stat_reservation(d1, d2); } -static inline int xsm_memory_pin_page(xsm_default_t def, struct domain *d1, struct domain *d2, - struct page_info *page) +static inline int xsm_memory_pin_page( + xsm_default_t def, struct domain *d1, struct domain *d2, + struct page_info *page) { return xsm_ops->memory_pin_page(d1, d2, page); } -static inline int xsm_add_to_physmap(xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_add_to_physmap( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->add_to_physmap(d1, d2); } -static inline int xsm_remove_from_physmap(xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_remove_from_physmap( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->remove_from_physmap(d1, d2); } -static inline int xsm_map_gmfn_foreign (xsm_default_t def, struct domain *d, struct domain *t) +static inline int xsm_map_gmfn_foreign( + xsm_default_t def, struct domain *d, struct domain *t) { return xsm_ops->map_gmfn_foreign(d, t); } @@ -385,79 +410,87 @@ static inline int xsm_claim_pages(xsm_default_t def, struct domain *d) return xsm_ops->claim_pages(d); } -static inline int xsm_console_io (xsm_default_t def, struct domain *d, int cmd) +static inline int xsm_console_io(xsm_default_t def, struct domain *d, int cmd) { return xsm_ops->console_io(d, cmd); } -static inline int xsm_profile (xsm_default_t def, struct domain *d, int op) +static inline int xsm_profile(xsm_default_t def, struct domain *d, int op) { return xsm_ops->profile(d, op); } -static inline int xsm_kexec (xsm_default_t def) +static inline int xsm_kexec(xsm_default_t def) { return xsm_ops->kexec(); } -static inline int xsm_schedop_shutdown (xsm_default_t def, struct domain *d1, struct domain *d2) +static inline int xsm_schedop_shutdown( + xsm_default_t def, struct domain *d1, struct domain *d2) { return xsm_ops->schedop_shutdown(d1, d2); } -static inline char *xsm_show_irq_sid (int irq) +static inline char *xsm_show_irq_sid(int irq) { return xsm_ops->show_irq_sid(irq); } -static inline int xsm_map_domain_pirq (xsm_default_t def, struct domain *d) +static inline int xsm_map_domain_pirq(xsm_default_t def, struct domain *d) { return xsm_ops->map_domain_pirq(d); } -static inline int xsm_map_domain_irq (xsm_default_t def, struct domain *d, int irq, void *data) +static inline int xsm_map_domain_irq( + xsm_default_t def, struct domain *d, int irq, void *data) { return xsm_ops->map_domain_irq(d, irq, data); } -static inline int xsm_unmap_domain_pirq (xsm_default_t def, struct domain *d) +static inline int xsm_unmap_domain_pirq(xsm_default_t def, struct domain *d) { return xsm_ops->unmap_domain_pirq(d); } -static inline int xsm_unmap_domain_irq (xsm_default_t def, struct domain *d, int irq, void *data) +static inline int xsm_unmap_domain_irq( + xsm_default_t def, struct domain *d, int irq, void *data) { return xsm_ops->unmap_domain_irq(d, irq, data); } -static inline int xsm_bind_pt_irq(xsm_default_t def, struct domain *d, - struct xen_domctl_bind_pt_irq *bind) +static inline int xsm_bind_pt_irq( + xsm_default_t def, struct domain *d, struct xen_domctl_bind_pt_irq *bind) { return xsm_ops->bind_pt_irq(d, bind); } -static inline int xsm_unbind_pt_irq(xsm_default_t def, struct domain *d, - struct xen_domctl_bind_pt_irq *bind) +static inline int xsm_unbind_pt_irq( + xsm_default_t def, struct domain *d, struct xen_domctl_bind_pt_irq *bind) { return xsm_ops->unbind_pt_irq(d, bind); } -static inline int xsm_irq_permission (xsm_default_t def, struct domain *d, int pirq, uint8_t allow) +static inline int xsm_irq_permission( + xsm_default_t def, struct domain *d, int pirq, uint8_t allow) { return xsm_ops->irq_permission(d, pirq, allow); } -static inline int xsm_iomem_permission (xsm_default_t def, struct domain *d, uint64_t s, uint64_t e, uint8_t allow) +static inline int xsm_iomem_permission( + xsm_default_t def, struct domain *d, uint64_t s, uint64_t e, uint8_t allow) { return xsm_ops->iomem_permission(d, s, e, allow); } -static inline int xsm_iomem_mapping (xsm_default_t def, struct domain *d, uint64_t s, uint64_t e, uint8_t allow) +static inline int xsm_iomem_mapping( + xsm_default_t def, struct domain *d, uint64_t s, uint64_t e, uint8_t allow) { return xsm_ops->iomem_mapping(d, s, e, allow); } -static inline int xsm_pci_config_permission (xsm_default_t def, struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access) +static inline int xsm_pci_config_permission( + xsm_default_t def, struct domain *d, uint32_t machine_bdf, uint16_t start, + uint16_t end, uint8_t access) { return xsm_ops->pci_config_permission(d, machine_bdf, start, end, access); } @@ -468,63 +501,67 @@ static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) return xsm_ops->get_device_group(machine_bdf); } -static inline int xsm_assign_device(xsm_default_t def, struct domain *d, uint32_t machine_bdf) +static inline int xsm_assign_device( + xsm_default_t def, struct domain *d, uint32_t machine_bdf) { return xsm_ops->assign_device(d, machine_bdf); } -static inline int xsm_deassign_device(xsm_default_t def, struct domain *d, uint32_t machine_bdf) +static inline int xsm_deassign_device( + xsm_default_t def, struct domain *d, uint32_t machine_bdf) { return xsm_ops->deassign_device(d, machine_bdf); } #endif /* HAS_PASSTHROUGH && HAS_PCI) */ #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) -static inline int xsm_assign_dtdevice(xsm_default_t def, struct domain *d, - const char *dtpath) +static inline int xsm_assign_dtdevice( + xsm_default_t def, struct domain *d, const char *dtpath) { return xsm_ops->assign_dtdevice(d, dtpath); } -static inline int xsm_deassign_dtdevice(xsm_default_t def, struct domain *d, - const char *dtpath) +static inline int xsm_deassign_dtdevice( + xsm_default_t def, struct domain *d, const char *dtpath) { return xsm_ops->deassign_dtdevice(d, dtpath); } #endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE */ -static inline int xsm_resource_plug_pci (xsm_default_t def, uint32_t machine_bdf) +static inline int xsm_resource_plug_pci(xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->resource_plug_pci(machine_bdf); } -static inline int xsm_resource_unplug_pci (xsm_default_t def, uint32_t machine_bdf) +static inline int xsm_resource_unplug_pci( + xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->resource_unplug_pci(machine_bdf); } -static inline int xsm_resource_plug_core (xsm_default_t def) +static inline int xsm_resource_plug_core(xsm_default_t def) { return xsm_ops->resource_plug_core(); } -static inline int xsm_resource_unplug_core (xsm_default_t def) +static inline int xsm_resource_unplug_core(xsm_default_t def) { return xsm_ops->resource_unplug_core(); } -static inline int xsm_resource_setup_pci (xsm_default_t def, uint32_t machine_bdf) +static inline int xsm_resource_setup_pci( + xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->resource_setup_pci(machine_bdf); } -static inline int xsm_resource_setup_gsi (xsm_default_t def, int gsi) +static inline int xsm_resource_setup_gsi(xsm_default_t def, int gsi) { return xsm_ops->resource_setup_gsi(gsi); } -static inline int xsm_resource_setup_misc (xsm_default_t def) +static inline int xsm_resource_setup_misc(xsm_default_t def) { return xsm_ops->resource_setup_misc(); } @@ -539,70 +576,74 @@ static inline int xsm_hypfs_op(xsm_default_t def) return xsm_ops->hypfs_op(); } -static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(void) op) +static inline long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op) { return xsm_ops->do_xsm_op(op); } #ifdef CONFIG_COMPAT -static inline int xsm_do_compat_op (XEN_GUEST_HANDLE_PARAM(void) op) +static inline int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op) { return xsm_ops->do_compat_op(op); } #endif -static inline int xsm_hvm_param (xsm_default_t def, struct domain *d, unsigned long op) +static inline int xsm_hvm_param( + xsm_default_t def, struct domain *d, unsigned long op) { return xsm_ops->hvm_param(d, op); } -static inline int xsm_hvm_control(xsm_default_t def, struct domain *d, unsigned long op) +static inline int xsm_hvm_control( + xsm_default_t def, struct domain *d, unsigned long op) { return xsm_ops->hvm_control(d, op); } -static inline int xsm_hvm_param_altp2mhvm (xsm_default_t def, struct domain *d) +static inline int xsm_hvm_param_altp2mhvm(xsm_default_t def, struct domain *d) { return xsm_ops->hvm_param_altp2mhvm(d); } -static inline int xsm_hvm_altp2mhvm_op (xsm_default_t def, struct domain *d, uint64_t mode, uint32_t op) +static inline int xsm_hvm_altp2mhvm_op( + xsm_default_t def, struct domain *d, uint64_t mode, uint32_t op) { return xsm_ops->hvm_altp2mhvm_op(d, mode, op); } -static inline int xsm_get_vnumainfo (xsm_default_t def, struct domain *d) +static inline int xsm_get_vnumainfo(xsm_default_t def, struct domain *d) { return xsm_ops->get_vnumainfo(d); } -static inline int xsm_vm_event_control (xsm_default_t def, struct domain *d, int mode, int op) +static inline int xsm_vm_event_control( + xsm_default_t def, struct domain *d, int mode, int op) { return xsm_ops->vm_event_control(d, mode, op); } #ifdef CONFIG_MEM_ACCESS -static inline int xsm_mem_access (xsm_default_t def, struct domain *d) +static inline int xsm_mem_access(xsm_default_t def, struct domain *d) { return xsm_ops->mem_access(d); } #endif #ifdef CONFIG_MEM_PAGING -static inline int xsm_mem_paging (xsm_default_t def, struct domain *d) +static inline int xsm_mem_paging(xsm_default_t def, struct domain *d) { return xsm_ops->mem_paging(d); } #endif #ifdef CONFIG_MEM_SHARING -static inline int xsm_mem_sharing (xsm_default_t def, struct domain *d) +static inline int xsm_mem_sharing(xsm_default_t def, struct domain *d) { return xsm_ops->mem_sharing(d); } #endif -static inline int xsm_platform_op (xsm_default_t def, uint32_t op) +static inline int xsm_platform_op(xsm_default_t def, uint32_t op) { return xsm_ops->platform_op(op); } @@ -613,17 +654,19 @@ static inline int xsm_do_mca(xsm_default_t def) return xsm_ops->do_mca(); } -static inline int xsm_shadow_control (xsm_default_t def, struct domain *d, uint32_t op) +static inline int xsm_shadow_control( + xsm_default_t def, struct domain *d, uint32_t op) { return xsm_ops->shadow_control(d, op); } -static inline int xsm_mem_sharing_op (xsm_default_t def, struct domain *d, struct domain *cd, int op) +static inline int xsm_mem_sharing_op( + xsm_default_t def, struct domain *d, struct domain *cd, int op) { return xsm_ops->mem_sharing_op(d, cd, op); } -static inline int xsm_apic (xsm_default_t def, struct domain *d, int cmd) +static inline int xsm_apic(xsm_default_t def, struct domain *d, int cmd) { return xsm_ops->apic(d, cmd); } @@ -638,39 +681,45 @@ static inline int xsm_domain_memory_map(xsm_default_t def, struct domain *d) return xsm_ops->domain_memory_map(d); } -static inline int xsm_mmu_update (xsm_default_t def, struct domain *d, struct domain *t, - struct domain *f, uint32_t flags) +static inline int xsm_mmu_update( + xsm_default_t def, struct domain *d, struct domain *t, struct domain *f, + uint32_t flags) { return xsm_ops->mmu_update(d, t, f, flags); } -static inline int xsm_mmuext_op (xsm_default_t def, struct domain *d, struct domain *f) +static inline int xsm_mmuext_op( + xsm_default_t def, struct domain *d, struct domain *f) { return xsm_ops->mmuext_op(d, f); } -static inline int xsm_update_va_mapping(xsm_default_t def, struct domain *d, struct domain *f, - l1_pgentry_t pte) +static inline int xsm_update_va_mapping( + xsm_default_t def, struct domain *d, struct domain *f, l1_pgentry_t pte) { return xsm_ops->update_va_mapping(d, f, pte); } -static inline int xsm_priv_mapping(xsm_default_t def, struct domain *d, struct domain *t) +static inline int xsm_priv_mapping( + xsm_default_t def, struct domain *d, struct domain *t) { return xsm_ops->priv_mapping(d, t); } -static inline int xsm_ioport_permission (xsm_default_t def, struct domain *d, uint32_t s, uint32_t e, uint8_t allow) +static inline int xsm_ioport_permission( + xsm_default_t def, struct domain *d, uint32_t s, uint32_t e, uint8_t allow) { return xsm_ops->ioport_permission(d, s, e, allow); } -static inline int xsm_ioport_mapping (xsm_default_t def, struct domain *d, uint32_t s, uint32_t e, uint8_t allow) +static inline int xsm_ioport_mapping( + xsm_default_t def, struct domain *d, uint32_t s, uint32_t e, uint8_t allow) { return xsm_ops->ioport_mapping(d, s, e, allow); } -static inline int xsm_pmu_op (xsm_default_t def, struct domain *d, unsigned int op) +static inline int xsm_pmu_op( + xsm_default_t def, struct domain *d, unsigned int op) { return xsm_ops->pmu_op(d, op); } @@ -682,7 +731,7 @@ static inline int xsm_dm_op(xsm_default_t def, struct domain *d) return xsm_ops->dm_op(d); } -static inline int xsm_xen_version (xsm_default_t def, uint32_t op) +static inline int xsm_xen_version(xsm_default_t def, uint32_t op) { return xsm_ops->xen_version(op); } @@ -698,8 +747,8 @@ static inline int xsm_argo_enable(const struct domain *d) return xsm_ops->argo_enable(d); } -static inline int xsm_argo_register_single_source(const struct domain *d, - const struct domain *t) +static inline int xsm_argo_register_single_source( + const struct domain *d, const struct domain *t) { return xsm_ops->argo_register_single_source(d, t); } @@ -719,12 +768,11 @@ static inline int xsm_argo_send(const struct domain *d, const struct domain *t) #endif /* XSM_NO_WRAPPERS */ #ifdef CONFIG_MULTIBOOT -extern int xsm_multiboot_init(unsigned long *module_map, - const multiboot_info_t *mbi); -extern int xsm_multiboot_policy_init(unsigned long *module_map, - const multiboot_info_t *mbi, - void **policy_buffer, - size_t *policy_size); +int xsm_multiboot_init( + unsigned long *module_map, const multiboot_info_t *mbi); +int xsm_multiboot_policy_init( + unsigned long *module_map, const multiboot_info_t *mbi, + void **policy_buffer, size_t *policy_size); #endif #ifdef CONFIG_HAS_DEVICE_TREE @@ -733,18 +781,19 @@ extern int xsm_multiboot_policy_init(unsigned long *module_map, * * On success, return 1 if using SILO mode else 0. */ -extern int xsm_dt_init(void); -extern int xsm_dt_policy_init(void **policy_buffer, size_t *policy_size); -extern bool has_xsm_magic(paddr_t); +int xsm_dt_init(void); +int xsm_dt_policy_init(void **policy_buffer, size_t *policy_size); +bool has_xsm_magic(paddr_t); #endif -extern int register_xsm(struct xsm_operations *ops); +int register_xsm(struct xsm_operations *ops); extern struct xsm_operations dummy_xsm_ops; -extern void xsm_fixup_ops(struct xsm_operations *ops); + +void xsm_fixup_ops(struct xsm_operations *ops); #ifdef CONFIG_XSM_FLASK -extern void flask_init(const void *policy_buffer, size_t policy_size); +void flask_init(const void *policy_buffer, size_t policy_size); #else static inline void flask_init(const void *policy_buffer, size_t policy_size) { @@ -757,7 +806,7 @@ extern const unsigned int xsm_flask_init_policy_size; #endif #ifdef CONFIG_XSM_SILO -extern void silo_init(void); +void silo_init(void); #else static inline void silo_init(void) {} #endif @@ -767,8 +816,8 @@ static inline void silo_init(void) {} #include #ifdef CONFIG_MULTIBOOT -static inline int xsm_multiboot_init (unsigned long *module_map, - const multiboot_info_t *mbi) +static inline int xsm_multiboot_init ( + unsigned long *module_map, const multiboot_info_t *mbi) { return 0; } diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index ac553f9c0d..ac8560aade 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -117,8 +117,8 @@ static int __init xsm_core_init(const void *policy_buffer, size_t policy_size) } #ifdef CONFIG_MULTIBOOT -int __init xsm_multiboot_init(unsigned long *module_map, - const multiboot_info_t *mbi) +int __init xsm_multiboot_init( + unsigned long *module_map, const multiboot_info_t *mbi) { int ret = 0; void *policy_buffer = NULL; @@ -128,8 +128,8 @@ int __init xsm_multiboot_init(unsigned long *module_map, if ( XSM_MAGIC ) { - ret = xsm_multiboot_policy_init(module_map, mbi, - &policy_buffer, &policy_size); + ret = xsm_multiboot_policy_init(module_map, mbi, &policy_buffer, + &policy_size); if ( ret ) { bootstrap_map(NULL); diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 33ab37717f..8dafbc9381 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -30,10 +30,9 @@ #endif #ifdef CONFIG_MULTIBOOT -int __init xsm_multiboot_policy_init(unsigned long *module_map, - const multiboot_info_t *mbi, - void **policy_buffer, - size_t *policy_size) +int __init xsm_multiboot_policy_init( + unsigned long *module_map, const multiboot_info_t *mbi, + void **policy_buffer, size_t *policy_size) { int i; module_t *mod = (module_t *)__va(mbi->mods_addr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:47:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:47:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202379.357154 (Exim 4.92) (envelope-from ) id 1mXpTU-00034N-5z; Tue, 05 Oct 2021 18:47:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202379.357154; Tue, 05 Oct 2021 18:47:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTU-00034F-2v; Tue, 05 Oct 2021 18:47:36 +0000 Received: by outflank-mailman (input) for mailman id 202379; Tue, 05 Oct 2021 18:47:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTT-000347-59 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTT-0001vJ-4M for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpTT-0000lO-3b for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cGoi+KhmCnEK0vuFOab9baDb0Kqz/TQpC7EODgg53Og=; b=doT4yKv0HfVVMXYXk+Eep/KIpu vTc0C2PjP4KGrTsXMiqbYkoWPBpDRpDulMli+WNn5SjSDw+rYnLEU6s0xo2RyDQeVMp8ZBQ2v/X7r cxI0wiG4HfAaGJofdr49UVr06YRNza6Gl+jyoXTYWLdGIZZLxl8FaxskXh82tiO02kKg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm: refactor xsm_ops handling Message-Id: Date: Tue, 05 Oct 2021 18:47:35 +0000 commit 164a0b9653f49ba2a2dfc4e42b99f988212d0c64 Author: Daniel P. Smith AuthorDate: Thu Sep 16 10:59:40 2021 +0200 Commit: Jan Beulich CommitDate: Thu Sep 16 10:59:40 2021 +0200 xsm: refactor xsm_ops handling This renames the `struct xsm_operations` to the shorter `struct xsm_ops` and converts the global xsm_ops from being a pointer to an explicit instance. As part of this conversion, it reworks the XSM modules init function to return their xsm_ops struct which is copied in to the global xsm_ops instance. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/include/xsm/xsm.h | 220 +++++++++++++++++++++++++------------------------- xen/xsm/dummy.c | 4 +- xen/xsm/flask/hooks.c | 12 +-- xen/xsm/silo.c | 7 +- xen/xsm/xsm_core.c | 72 +++++++++-------- 5 files changed, 161 insertions(+), 154 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 7673d605a6..556903aa21 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -41,7 +41,7 @@ enum xsm_default { }; typedef enum xsm_default xsm_default_t; -struct xsm_operations { +struct xsm_ops { void (*security_domaininfo)(struct domain *d, struct xen_domctl_getdomaininfo *info); int (*domain_create)(struct domain *d, uint32_t ssidref); @@ -195,322 +195,322 @@ struct xsm_operations { #ifdef CONFIG_XSM -extern struct xsm_operations *xsm_ops; +extern struct xsm_ops xsm_ops; #ifndef XSM_NO_WRAPPERS static inline void xsm_security_domaininfo( struct domain *d, struct xen_domctl_getdomaininfo *info) { - xsm_ops->security_domaininfo(d, info); + xsm_ops.security_domaininfo(d, info); } static inline int xsm_domain_create( xsm_default_t def, struct domain *d, uint32_t ssidref) { - return xsm_ops->domain_create(d, ssidref); + return xsm_ops.domain_create(d, ssidref); } static inline int xsm_getdomaininfo(xsm_default_t def, struct domain *d) { - return xsm_ops->getdomaininfo(d); + return xsm_ops.getdomaininfo(d); } static inline int xsm_domctl_scheduler_op( xsm_default_t def, struct domain *d, int cmd) { - return xsm_ops->domctl_scheduler_op(d, cmd); + return xsm_ops.domctl_scheduler_op(d, cmd); } static inline int xsm_sysctl_scheduler_op(xsm_default_t def, int cmd) { - return xsm_ops->sysctl_scheduler_op(cmd); + return xsm_ops.sysctl_scheduler_op(cmd); } static inline int xsm_set_target( xsm_default_t def, struct domain *d, struct domain *e) { - return xsm_ops->set_target(d, e); + return xsm_ops.set_target(d, e); } static inline int xsm_domctl(xsm_default_t def, struct domain *d, int cmd) { - return xsm_ops->domctl(d, cmd); + return xsm_ops.domctl(d, cmd); } static inline int xsm_sysctl(xsm_default_t def, int cmd) { - return xsm_ops->sysctl(cmd); + return xsm_ops.sysctl(cmd); } static inline int xsm_readconsole(xsm_default_t def, uint32_t clear) { - return xsm_ops->readconsole(clear); + return xsm_ops.readconsole(clear); } static inline int xsm_evtchn_unbound( xsm_default_t def, struct domain *d1, struct evtchn *chn, domid_t id2) { - return xsm_ops->evtchn_unbound(d1, chn, id2); + return xsm_ops.evtchn_unbound(d1, chn, id2); } static inline int xsm_evtchn_interdomain( xsm_default_t def, struct domain *d1, struct evtchn *chan1, struct domain *d2, struct evtchn *chan2) { - return xsm_ops->evtchn_interdomain(d1, chan1, d2, chan2); + return xsm_ops.evtchn_interdomain(d1, chan1, d2, chan2); } static inline void xsm_evtchn_close_post(struct evtchn *chn) { - xsm_ops->evtchn_close_post(chn); + xsm_ops.evtchn_close_post(chn); } static inline int xsm_evtchn_send( xsm_default_t def, struct domain *d, struct evtchn *chn) { - return xsm_ops->evtchn_send(d, chn); + return xsm_ops.evtchn_send(d, chn); } static inline int xsm_evtchn_status( xsm_default_t def, struct domain *d, struct evtchn *chn) { - return xsm_ops->evtchn_status(d, chn); + return xsm_ops.evtchn_status(d, chn); } static inline int xsm_evtchn_reset( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->evtchn_reset(d1, d2); + return xsm_ops.evtchn_reset(d1, d2); } static inline int xsm_grant_mapref( xsm_default_t def, struct domain *d1, struct domain *d2, uint32_t flags) { - return xsm_ops->grant_mapref(d1, d2, flags); + return xsm_ops.grant_mapref(d1, d2, flags); } static inline int xsm_grant_unmapref( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->grant_unmapref(d1, d2); + return xsm_ops.grant_unmapref(d1, d2); } static inline int xsm_grant_setup( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->grant_setup(d1, d2); + return xsm_ops.grant_setup(d1, d2); } static inline int xsm_grant_transfer( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->grant_transfer(d1, d2); + return xsm_ops.grant_transfer(d1, d2); } static inline int xsm_grant_copy( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->grant_copy(d1, d2); + return xsm_ops.grant_copy(d1, d2); } static inline int xsm_grant_query_size( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->grant_query_size(d1, d2); + return xsm_ops.grant_query_size(d1, d2); } static inline int xsm_alloc_security_domain(struct domain *d) { - return xsm_ops->alloc_security_domain(d); + return xsm_ops.alloc_security_domain(d); } static inline void xsm_free_security_domain(struct domain *d) { - xsm_ops->free_security_domain(d); + xsm_ops.free_security_domain(d); } static inline int xsm_alloc_security_evtchns( struct evtchn chn[], unsigned int nr) { - return xsm_ops->alloc_security_evtchns(chn, nr); + return xsm_ops.alloc_security_evtchns(chn, nr); } static inline void xsm_free_security_evtchns( struct evtchn chn[], unsigned int nr) { - xsm_ops->free_security_evtchns(chn, nr); + xsm_ops.free_security_evtchns(chn, nr); } static inline char *xsm_show_security_evtchn( struct domain *d, const struct evtchn *chn) { - return xsm_ops->show_security_evtchn(d, chn); + return xsm_ops.show_security_evtchn(d, chn); } static inline int xsm_init_hardware_domain(xsm_default_t def, struct domain *d) { - return xsm_ops->init_hardware_domain(d); + return xsm_ops.init_hardware_domain(d); } static inline int xsm_get_pod_target(xsm_default_t def, struct domain *d) { - return xsm_ops->get_pod_target(d); + return xsm_ops.get_pod_target(d); } static inline int xsm_set_pod_target(xsm_default_t def, struct domain *d) { - return xsm_ops->set_pod_target(d); + return xsm_ops.set_pod_target(d); } static inline int xsm_memory_exchange(xsm_default_t def, struct domain *d) { - return xsm_ops->memory_exchange(d); + return xsm_ops.memory_exchange(d); } static inline int xsm_memory_adjust_reservation( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->memory_adjust_reservation(d1, d2); + return xsm_ops.memory_adjust_reservation(d1, d2); } static inline int xsm_memory_stat_reservation( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->memory_stat_reservation(d1, d2); + return xsm_ops.memory_stat_reservation(d1, d2); } static inline int xsm_memory_pin_page( xsm_default_t def, struct domain *d1, struct domain *d2, struct page_info *page) { - return xsm_ops->memory_pin_page(d1, d2, page); + return xsm_ops.memory_pin_page(d1, d2, page); } static inline int xsm_add_to_physmap( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->add_to_physmap(d1, d2); + return xsm_ops.add_to_physmap(d1, d2); } static inline int xsm_remove_from_physmap( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->remove_from_physmap(d1, d2); + return xsm_ops.remove_from_physmap(d1, d2); } static inline int xsm_map_gmfn_foreign( xsm_default_t def, struct domain *d, struct domain *t) { - return xsm_ops->map_gmfn_foreign(d, t); + return xsm_ops.map_gmfn_foreign(d, t); } static inline int xsm_claim_pages(xsm_default_t def, struct domain *d) { - return xsm_ops->claim_pages(d); + return xsm_ops.claim_pages(d); } static inline int xsm_console_io(xsm_default_t def, struct domain *d, int cmd) { - return xsm_ops->console_io(d, cmd); + return xsm_ops.console_io(d, cmd); } static inline int xsm_profile(xsm_default_t def, struct domain *d, int op) { - return xsm_ops->profile(d, op); + return xsm_ops.profile(d, op); } static inline int xsm_kexec(xsm_default_t def) { - return xsm_ops->kexec(); + return xsm_ops.kexec(); } static inline int xsm_schedop_shutdown( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops->schedop_shutdown(d1, d2); + return xsm_ops.schedop_shutdown(d1, d2); } static inline char *xsm_show_irq_sid(int irq) { - return xsm_ops->show_irq_sid(irq); + return xsm_ops.show_irq_sid(irq); } static inline int xsm_map_domain_pirq(xsm_default_t def, struct domain *d) { - return xsm_ops->map_domain_pirq(d); + return xsm_ops.map_domain_pirq(d); } static inline int xsm_map_domain_irq( xsm_default_t def, struct domain *d, int irq, void *data) { - return xsm_ops->map_domain_irq(d, irq, data); + return xsm_ops.map_domain_irq(d, irq, data); } static inline int xsm_unmap_domain_pirq(xsm_default_t def, struct domain *d) { - return xsm_ops->unmap_domain_pirq(d); + return xsm_ops.unmap_domain_pirq(d); } static inline int xsm_unmap_domain_irq( xsm_default_t def, struct domain *d, int irq, void *data) { - return xsm_ops->unmap_domain_irq(d, irq, data); + return xsm_ops.unmap_domain_irq(d, irq, data); } static inline int xsm_bind_pt_irq( xsm_default_t def, struct domain *d, struct xen_domctl_bind_pt_irq *bind) { - return xsm_ops->bind_pt_irq(d, bind); + return xsm_ops.bind_pt_irq(d, bind); } static inline int xsm_unbind_pt_irq( xsm_default_t def, struct domain *d, struct xen_domctl_bind_pt_irq *bind) { - return xsm_ops->unbind_pt_irq(d, bind); + return xsm_ops.unbind_pt_irq(d, bind); } static inline int xsm_irq_permission( xsm_default_t def, struct domain *d, int pirq, uint8_t allow) { - return xsm_ops->irq_permission(d, pirq, allow); + return xsm_ops.irq_permission(d, pirq, allow); } static inline int xsm_iomem_permission( xsm_default_t def, struct domain *d, uint64_t s, uint64_t e, uint8_t allow) { - return xsm_ops->iomem_permission(d, s, e, allow); + return xsm_ops.iomem_permission(d, s, e, allow); } static inline int xsm_iomem_mapping( xsm_default_t def, struct domain *d, uint64_t s, uint64_t e, uint8_t allow) { - return xsm_ops->iomem_mapping(d, s, e, allow); + return xsm_ops.iomem_mapping(d, s, e, allow); } static inline int xsm_pci_config_permission( xsm_default_t def, struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access) { - return xsm_ops->pci_config_permission(d, machine_bdf, start, end, access); + return xsm_ops.pci_config_permission(d, machine_bdf, start, end, access); } #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) { - return xsm_ops->get_device_group(machine_bdf); + return xsm_ops.get_device_group(machine_bdf); } static inline int xsm_assign_device( xsm_default_t def, struct domain *d, uint32_t machine_bdf) { - return xsm_ops->assign_device(d, machine_bdf); + return xsm_ops.assign_device(d, machine_bdf); } static inline int xsm_deassign_device( xsm_default_t def, struct domain *d, uint32_t machine_bdf) { - return xsm_ops->deassign_device(d, machine_bdf); + return xsm_ops.deassign_device(d, machine_bdf); } #endif /* HAS_PASSTHROUGH && HAS_PCI) */ @@ -518,249 +518,249 @@ static inline int xsm_deassign_device( static inline int xsm_assign_dtdevice( xsm_default_t def, struct domain *d, const char *dtpath) { - return xsm_ops->assign_dtdevice(d, dtpath); + return xsm_ops.assign_dtdevice(d, dtpath); } static inline int xsm_deassign_dtdevice( xsm_default_t def, struct domain *d, const char *dtpath) { - return xsm_ops->deassign_dtdevice(d, dtpath); + return xsm_ops.deassign_dtdevice(d, dtpath); } #endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE */ static inline int xsm_resource_plug_pci(xsm_default_t def, uint32_t machine_bdf) { - return xsm_ops->resource_plug_pci(machine_bdf); + return xsm_ops.resource_plug_pci(machine_bdf); } static inline int xsm_resource_unplug_pci( xsm_default_t def, uint32_t machine_bdf) { - return xsm_ops->resource_unplug_pci(machine_bdf); + return xsm_ops.resource_unplug_pci(machine_bdf); } static inline int xsm_resource_plug_core(xsm_default_t def) { - return xsm_ops->resource_plug_core(); + return xsm_ops.resource_plug_core(); } static inline int xsm_resource_unplug_core(xsm_default_t def) { - return xsm_ops->resource_unplug_core(); + return xsm_ops.resource_unplug_core(); } static inline int xsm_resource_setup_pci( xsm_default_t def, uint32_t machine_bdf) { - return xsm_ops->resource_setup_pci(machine_bdf); + return xsm_ops.resource_setup_pci(machine_bdf); } static inline int xsm_resource_setup_gsi(xsm_default_t def, int gsi) { - return xsm_ops->resource_setup_gsi(gsi); + return xsm_ops.resource_setup_gsi(gsi); } static inline int xsm_resource_setup_misc(xsm_default_t def) { - return xsm_ops->resource_setup_misc(); + return xsm_ops.resource_setup_misc(); } static inline int xsm_page_offline(xsm_default_t def, uint32_t cmd) { - return xsm_ops->page_offline(cmd); + return xsm_ops.page_offline(cmd); } static inline int xsm_hypfs_op(xsm_default_t def) { - return xsm_ops->hypfs_op(); + return xsm_ops.hypfs_op(); } static inline long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op) { - return xsm_ops->do_xsm_op(op); + return xsm_ops.do_xsm_op(op); } #ifdef CONFIG_COMPAT static inline int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op) { - return xsm_ops->do_compat_op(op); + return xsm_ops.do_compat_op(op); } #endif static inline int xsm_hvm_param( xsm_default_t def, struct domain *d, unsigned long op) { - return xsm_ops->hvm_param(d, op); + return xsm_ops.hvm_param(d, op); } static inline int xsm_hvm_control( xsm_default_t def, struct domain *d, unsigned long op) { - return xsm_ops->hvm_control(d, op); + return xsm_ops.hvm_control(d, op); } static inline int xsm_hvm_param_altp2mhvm(xsm_default_t def, struct domain *d) { - return xsm_ops->hvm_param_altp2mhvm(d); + return xsm_ops.hvm_param_altp2mhvm(d); } static inline int xsm_hvm_altp2mhvm_op( xsm_default_t def, struct domain *d, uint64_t mode, uint32_t op) { - return xsm_ops->hvm_altp2mhvm_op(d, mode, op); + return xsm_ops.hvm_altp2mhvm_op(d, mode, op); } static inline int xsm_get_vnumainfo(xsm_default_t def, struct domain *d) { - return xsm_ops->get_vnumainfo(d); + return xsm_ops.get_vnumainfo(d); } static inline int xsm_vm_event_control( xsm_default_t def, struct domain *d, int mode, int op) { - return xsm_ops->vm_event_control(d, mode, op); + return xsm_ops.vm_event_control(d, mode, op); } #ifdef CONFIG_MEM_ACCESS static inline int xsm_mem_access(xsm_default_t def, struct domain *d) { - return xsm_ops->mem_access(d); + return xsm_ops.mem_access(d); } #endif #ifdef CONFIG_MEM_PAGING static inline int xsm_mem_paging(xsm_default_t def, struct domain *d) { - return xsm_ops->mem_paging(d); + return xsm_ops.mem_paging(d); } #endif #ifdef CONFIG_MEM_SHARING static inline int xsm_mem_sharing(xsm_default_t def, struct domain *d) { - return xsm_ops->mem_sharing(d); + return xsm_ops.mem_sharing(d); } #endif static inline int xsm_platform_op(xsm_default_t def, uint32_t op) { - return xsm_ops->platform_op(op); + return xsm_ops.platform_op(op); } #ifdef CONFIG_X86 static inline int xsm_do_mca(xsm_default_t def) { - return xsm_ops->do_mca(); + return xsm_ops.do_mca(); } static inline int xsm_shadow_control( xsm_default_t def, struct domain *d, uint32_t op) { - return xsm_ops->shadow_control(d, op); + return xsm_ops.shadow_control(d, op); } static inline int xsm_mem_sharing_op( xsm_default_t def, struct domain *d, struct domain *cd, int op) { - return xsm_ops->mem_sharing_op(d, cd, op); + return xsm_ops.mem_sharing_op(d, cd, op); } static inline int xsm_apic(xsm_default_t def, struct domain *d, int cmd) { - return xsm_ops->apic(d, cmd); + return xsm_ops.apic(d, cmd); } static inline int xsm_machine_memory_map(xsm_default_t def) { - return xsm_ops->machine_memory_map(); + return xsm_ops.machine_memory_map(); } static inline int xsm_domain_memory_map(xsm_default_t def, struct domain *d) { - return xsm_ops->domain_memory_map(d); + return xsm_ops.domain_memory_map(d); } static inline int xsm_mmu_update( xsm_default_t def, struct domain *d, struct domain *t, struct domain *f, uint32_t flags) { - return xsm_ops->mmu_update(d, t, f, flags); + return xsm_ops.mmu_update(d, t, f, flags); } static inline int xsm_mmuext_op( xsm_default_t def, struct domain *d, struct domain *f) { - return xsm_ops->mmuext_op(d, f); + return xsm_ops.mmuext_op(d, f); } static inline int xsm_update_va_mapping( xsm_default_t def, struct domain *d, struct domain *f, l1_pgentry_t pte) { - return xsm_ops->update_va_mapping(d, f, pte); + return xsm_ops.update_va_mapping(d, f, pte); } static inline int xsm_priv_mapping( xsm_default_t def, struct domain *d, struct domain *t) { - return xsm_ops->priv_mapping(d, t); + return xsm_ops.priv_mapping(d, t); } static inline int xsm_ioport_permission( xsm_default_t def, struct domain *d, uint32_t s, uint32_t e, uint8_t allow) { - return xsm_ops->ioport_permission(d, s, e, allow); + return xsm_ops.ioport_permission(d, s, e, allow); } static inline int xsm_ioport_mapping( xsm_default_t def, struct domain *d, uint32_t s, uint32_t e, uint8_t allow) { - return xsm_ops->ioport_mapping(d, s, e, allow); + return xsm_ops.ioport_mapping(d, s, e, allow); } static inline int xsm_pmu_op( xsm_default_t def, struct domain *d, unsigned int op) { - return xsm_ops->pmu_op(d, op); + return xsm_ops.pmu_op(d, op); } #endif /* CONFIG_X86 */ static inline int xsm_dm_op(xsm_default_t def, struct domain *d) { - return xsm_ops->dm_op(d); + return xsm_ops.dm_op(d); } static inline int xsm_xen_version(xsm_default_t def, uint32_t op) { - return xsm_ops->xen_version(op); + return xsm_ops.xen_version(op); } static inline int xsm_domain_resource_map(xsm_default_t def, struct domain *d) { - return xsm_ops->domain_resource_map(d); + return xsm_ops.domain_resource_map(d); } #ifdef CONFIG_ARGO static inline int xsm_argo_enable(const struct domain *d) { - return xsm_ops->argo_enable(d); + return xsm_ops.argo_enable(d); } static inline int xsm_argo_register_single_source( const struct domain *d, const struct domain *t) { - return xsm_ops->argo_register_single_source(d, t); + return xsm_ops.argo_register_single_source(d, t); } static inline int xsm_argo_register_any_source(const struct domain *d) { - return xsm_ops->argo_register_any_source(d); + return xsm_ops.argo_register_any_source(d); } static inline int xsm_argo_send(const struct domain *d, const struct domain *t) { - return xsm_ops->argo_send(d, t); + return xsm_ops.argo_send(d, t); } #endif /* CONFIG_ARGO */ @@ -786,17 +786,18 @@ int xsm_dt_policy_init(void **policy_buffer, size_t *policy_size); bool has_xsm_magic(paddr_t); #endif -int register_xsm(struct xsm_operations *ops); +extern struct xsm_ops dummy_xsm_ops; -extern struct xsm_operations dummy_xsm_ops; - -void xsm_fixup_ops(struct xsm_operations *ops); +void xsm_fixup_ops(struct xsm_ops *ops); #ifdef CONFIG_XSM_FLASK -void flask_init(const void *policy_buffer, size_t policy_size); +extern const struct xsm_ops *flask_init(const void *policy_buffer, + size_t policy_size); #else -static inline void flask_init(const void *policy_buffer, size_t policy_size) +static const inline struct xsm_ops *flask_init(const void *policy_buffer, + size_t policy_size) { + return NULL; } #endif @@ -806,9 +807,12 @@ extern const unsigned int xsm_flask_init_policy_size; #endif #ifdef CONFIG_XSM_SILO -void silo_init(void); +extern const struct xsm_ops *silo_init(void); #else -static inline void silo_init(void) {} +static const inline struct xsm_ops *silo_init(void) +{ + return NULL; +} #endif #else /* CONFIG_XSM */ diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index de44b10130..d8c935328e 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -13,15 +13,13 @@ #define XSM_NO_WRAPPERS #include -struct xsm_operations dummy_xsm_ops; - #define set_to_dummy_if_null(ops, function) \ do { \ if ( !ops->function ) \ ops->function = xsm_##function; \ } while (0) -void __init xsm_fixup_ops (struct xsm_operations *ops) +void __init xsm_fixup_ops (struct xsm_ops *ops) { set_to_dummy_if_null(ops, security_domaininfo); set_to_dummy_if_null(ops, domain_create); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 1465db125a..25e87180b4 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1745,7 +1745,7 @@ static int flask_argo_send(const struct domain *d, const struct domain *t) long do_flask_op(XEN_GUEST_HANDLE_PARAM(void) u_flask_op); int compat_flask_op(XEN_GUEST_HANDLE_PARAM(void) u_flask_op); -static struct xsm_operations flask_ops = { +static const struct xsm_ops __initconstrel flask_ops = { .security_domaininfo = flask_security_domaininfo, .domain_create = flask_domain_create, .getdomaininfo = flask_getdomaininfo, @@ -1883,7 +1883,8 @@ static struct xsm_operations flask_ops = { #endif }; -void __init flask_init(const void *policy_buffer, size_t policy_size) +const struct xsm_ops *__init flask_init(const void *policy_buffer, + size_t policy_size) { int ret = -ENOENT; @@ -1891,7 +1892,7 @@ void __init flask_init(const void *policy_buffer, size_t policy_size) { case FLASK_BOOTPARAM_DISABLED: printk(XENLOG_INFO "Flask: Disabled at boot.\n"); - return; + return NULL; case FLASK_BOOTPARAM_PERMISSIVE: flask_enforcing = 0; @@ -1908,9 +1909,6 @@ void __init flask_init(const void *policy_buffer, size_t policy_size) avc_init(); - if ( register_xsm(&flask_ops) ) - panic("Flask: Unable to register with XSM\n"); - if ( policy_size && flask_bootparam != FLASK_BOOTPARAM_LATELOAD ) ret = security_load_policy(policy_buffer, policy_size); @@ -1923,6 +1921,8 @@ void __init flask_init(const void *policy_buffer, size_t policy_size) printk(XENLOG_INFO "Flask: Starting in enforcing mode.\n"); else printk(XENLOG_INFO "Flask: Starting in permissive mode.\n"); + + return &flask_ops; } /* diff --git a/xen/xsm/silo.c b/xen/xsm/silo.c index fc2ca5cd2d..3550dded7b 100644 --- a/xen/xsm/silo.c +++ b/xen/xsm/silo.c @@ -100,7 +100,7 @@ static int silo_argo_send(const struct domain *d1, const struct domain *d2) #endif -static struct xsm_operations silo_xsm_ops = { +static const struct xsm_ops __initconstrel silo_xsm_ops = { .evtchn_unbound = silo_evtchn_unbound, .evtchn_interdomain = silo_evtchn_interdomain, .grant_mapref = silo_grant_mapref, @@ -112,12 +112,11 @@ static struct xsm_operations silo_xsm_ops = { #endif }; -void __init silo_init(void) +const struct xsm_ops *__init silo_init(void) { printk("Initialising XSM SILO mode\n"); - if ( register_xsm(&silo_xsm_ops) ) - panic("SILO: Unable to register with XSM\n"); + return &silo_xsm_ops; } /* diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index ac8560aade..21fffbcb41 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -28,9 +28,17 @@ #include #endif -#define XSM_FRAMEWORK_VERSION "1.0.0" +#define XSM_FRAMEWORK_VERSION "1.0.1" -struct xsm_operations *xsm_ops; +struct xsm_ops __read_mostly xsm_ops; + +enum xsm_ops_state { + XSM_OPS_UNREGISTERED, + XSM_OPS_REG_FAILED, + XSM_OPS_REGISTERED, +}; + +static enum xsm_ops_state __initdata xsm_ops_registered = XSM_OPS_UNREGISTERED; enum xsm_bootparam { XSM_BOOTPARAM_DUMMY, @@ -68,17 +76,10 @@ static int __init parse_xsm_param(const char *s) } custom_param("xsm", parse_xsm_param); -static inline int verify(struct xsm_operations *ops) -{ - /* verify the security_operations structure exists */ - if ( !ops ) - return -EINVAL; - xsm_fixup_ops(ops); - return 0; -} - static int __init xsm_core_init(const void *policy_buffer, size_t policy_size) { + const struct xsm_ops *ops = NULL; + #ifdef CONFIG_XSM_FLASK_POLICY if ( policy_size == 0 ) { @@ -87,25 +88,25 @@ static int __init xsm_core_init(const void *policy_buffer, size_t policy_size) } #endif - if ( verify(&dummy_xsm_ops) ) + if ( xsm_ops_registered != XSM_OPS_UNREGISTERED ) { - printk(XENLOG_ERR "Could not verify dummy_xsm_ops structure\n"); + printk(XENLOG_ERR + "Could not init XSM, xsm_ops register already attempted\n"); return -EIO; } - xsm_ops = &dummy_xsm_ops; - switch ( xsm_bootparam ) { case XSM_BOOTPARAM_DUMMY: + xsm_ops_registered = XSM_OPS_REGISTERED; break; case XSM_BOOTPARAM_FLASK: - flask_init(policy_buffer, policy_size); + ops = flask_init(policy_buffer, policy_size); break; case XSM_BOOTPARAM_SILO: - silo_init(); + ops = silo_init(); break; default: @@ -113,6 +114,27 @@ static int __init xsm_core_init(const void *policy_buffer, size_t policy_size) break; } + if ( ops ) + { + xsm_ops_registered = XSM_OPS_REGISTERED; + xsm_ops = *ops; + } + /* + * This handles three cases, + * - dummy policy module was selected + * - a policy module does not provide all handlers + * - a policy module failed to init + */ + xsm_fixup_ops(&xsm_ops); + + if ( xsm_ops_registered != XSM_OPS_REGISTERED ) + { + xsm_ops_registered = XSM_OPS_REG_FAILED; + printk(XENLOG_ERR + "Could not init XSM, xsm_ops register failed\n"); + return -EFAULT; + } + return 0; } @@ -195,22 +217,6 @@ bool __init has_xsm_magic(paddr_t start) } #endif -int __init register_xsm(struct xsm_operations *ops) -{ - if ( verify(ops) ) - { - printk(XENLOG_ERR "Could not verify xsm_operations structure\n"); - return -EINVAL; - } - - if ( xsm_ops != &dummy_xsm_ops ) - return -EAGAIN; - - xsm_ops = ops; - - return 0; -} - #endif long do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:47:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:47:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202380.357158 (Exim 4.92) (envelope-from ) id 1mXpTe-00037i-8H; Tue, 05 Oct 2021 18:47:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202380.357158; Tue, 05 Oct 2021 18:47:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTe-00037a-4f; Tue, 05 Oct 2021 18:47:46 +0000 Received: by outflank-mailman (input) for mailman id 202380; Tue, 05 Oct 2021 18:47:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTd-00037G-8s for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTd-0001vg-8A for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpTd-0000m1-6q for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9xa0dtV+Gr93kCm7SnCQrgAJD3O+DP8z8NxMB8AG4Cw=; b=K64ty6rukA3i2D1SS6TR65aKrq bqldXCg+vfYeo44Hl6ps+u9Z5/vpngT/zK2yZzRsT5hEp6hnD0lCqC0hIuLUopF5oB+czrOhdMVmp DyQ1hd0KEBi1doCvp47jBTXbO9baGHylVAvmn6es9jH3QK1UzoYMvCc8U3iMudwoedNo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm: convert xsm_ops hook calls to alternative call Message-Id: Date: Tue, 05 Oct 2021 18:47:45 +0000 commit 737190abb174422b3a49c9ef2de7cd5bfb1bc991 Author: Daniel P. Smith AuthorDate: Thu Sep 16 11:00:17 2021 +0200 Commit: Jan Beulich CommitDate: Thu Sep 16 11:00:17 2021 +0200 xsm: convert xsm_ops hook calls to alternative call To reduce retpolines convert all the pointer function calls of the xsm_ops hooks over to the alternative_call infrastructure. Signed-off-by: Daniel P. Smith Acked-by: Andrew Cooper --- xen/include/xsm/xsm.h | 191 +++++++++++++++++++++++++------------------------- 1 file changed, 96 insertions(+), 95 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 556903aa21..c101e653f6 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -15,6 +15,7 @@ #ifndef __XSM_H__ #define __XSM_H__ +#include #include #include @@ -202,315 +203,315 @@ extern struct xsm_ops xsm_ops; static inline void xsm_security_domaininfo( struct domain *d, struct xen_domctl_getdomaininfo *info) { - xsm_ops.security_domaininfo(d, info); + alternative_vcall(xsm_ops.security_domaininfo, d, info); } static inline int xsm_domain_create( xsm_default_t def, struct domain *d, uint32_t ssidref) { - return xsm_ops.domain_create(d, ssidref); + return alternative_call(xsm_ops.domain_create, d, ssidref); } static inline int xsm_getdomaininfo(xsm_default_t def, struct domain *d) { - return xsm_ops.getdomaininfo(d); + return alternative_call(xsm_ops.getdomaininfo, d); } static inline int xsm_domctl_scheduler_op( xsm_default_t def, struct domain *d, int cmd) { - return xsm_ops.domctl_scheduler_op(d, cmd); + return alternative_call(xsm_ops.domctl_scheduler_op, d, cmd); } static inline int xsm_sysctl_scheduler_op(xsm_default_t def, int cmd) { - return xsm_ops.sysctl_scheduler_op(cmd); + return alternative_call(xsm_ops.sysctl_scheduler_op, cmd); } static inline int xsm_set_target( xsm_default_t def, struct domain *d, struct domain *e) { - return xsm_ops.set_target(d, e); + return alternative_call(xsm_ops.set_target, d, e); } static inline int xsm_domctl(xsm_default_t def, struct domain *d, int cmd) { - return xsm_ops.domctl(d, cmd); + return alternative_call(xsm_ops.domctl, d, cmd); } static inline int xsm_sysctl(xsm_default_t def, int cmd) { - return xsm_ops.sysctl(cmd); + return alternative_call(xsm_ops.sysctl, cmd); } static inline int xsm_readconsole(xsm_default_t def, uint32_t clear) { - return xsm_ops.readconsole(clear); + return alternative_call(xsm_ops.readconsole, clear); } static inline int xsm_evtchn_unbound( xsm_default_t def, struct domain *d1, struct evtchn *chn, domid_t id2) { - return xsm_ops.evtchn_unbound(d1, chn, id2); + return alternative_call(xsm_ops.evtchn_unbound, d1, chn, id2); } static inline int xsm_evtchn_interdomain( xsm_default_t def, struct domain *d1, struct evtchn *chan1, struct domain *d2, struct evtchn *chan2) { - return xsm_ops.evtchn_interdomain(d1, chan1, d2, chan2); + return alternative_call(xsm_ops.evtchn_interdomain, d1, chan1, d2, chan2); } static inline void xsm_evtchn_close_post(struct evtchn *chn) { - xsm_ops.evtchn_close_post(chn); + alternative_vcall(xsm_ops.evtchn_close_post, chn); } static inline int xsm_evtchn_send( xsm_default_t def, struct domain *d, struct evtchn *chn) { - return xsm_ops.evtchn_send(d, chn); + return alternative_call(xsm_ops.evtchn_send, d, chn); } static inline int xsm_evtchn_status( xsm_default_t def, struct domain *d, struct evtchn *chn) { - return xsm_ops.evtchn_status(d, chn); + return alternative_call(xsm_ops.evtchn_status, d, chn); } static inline int xsm_evtchn_reset( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.evtchn_reset(d1, d2); + return alternative_call(xsm_ops.evtchn_reset, d1, d2); } static inline int xsm_grant_mapref( xsm_default_t def, struct domain *d1, struct domain *d2, uint32_t flags) { - return xsm_ops.grant_mapref(d1, d2, flags); + return alternative_call(xsm_ops.grant_mapref, d1, d2, flags); } static inline int xsm_grant_unmapref( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.grant_unmapref(d1, d2); + return alternative_call(xsm_ops.grant_unmapref, d1, d2); } static inline int xsm_grant_setup( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.grant_setup(d1, d2); + return alternative_call(xsm_ops.grant_setup, d1, d2); } static inline int xsm_grant_transfer( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.grant_transfer(d1, d2); + return alternative_call(xsm_ops.grant_transfer, d1, d2); } static inline int xsm_grant_copy( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.grant_copy(d1, d2); + return alternative_call(xsm_ops.grant_copy, d1, d2); } static inline int xsm_grant_query_size( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.grant_query_size(d1, d2); + return alternative_call(xsm_ops.grant_query_size, d1, d2); } static inline int xsm_alloc_security_domain(struct domain *d) { - return xsm_ops.alloc_security_domain(d); + return alternative_call(xsm_ops.alloc_security_domain, d); } static inline void xsm_free_security_domain(struct domain *d) { - xsm_ops.free_security_domain(d); + alternative_vcall(xsm_ops.free_security_domain, d); } static inline int xsm_alloc_security_evtchns( struct evtchn chn[], unsigned int nr) { - return xsm_ops.alloc_security_evtchns(chn, nr); + return alternative_call(xsm_ops.alloc_security_evtchns, chn, nr); } static inline void xsm_free_security_evtchns( struct evtchn chn[], unsigned int nr) { - xsm_ops.free_security_evtchns(chn, nr); + alternative_vcall(xsm_ops.free_security_evtchns, chn, nr); } static inline char *xsm_show_security_evtchn( struct domain *d, const struct evtchn *chn) { - return xsm_ops.show_security_evtchn(d, chn); + return alternative_call(xsm_ops.show_security_evtchn, d, chn); } static inline int xsm_init_hardware_domain(xsm_default_t def, struct domain *d) { - return xsm_ops.init_hardware_domain(d); + return alternative_call(xsm_ops.init_hardware_domain, d); } static inline int xsm_get_pod_target(xsm_default_t def, struct domain *d) { - return xsm_ops.get_pod_target(d); + return alternative_call(xsm_ops.get_pod_target, d); } static inline int xsm_set_pod_target(xsm_default_t def, struct domain *d) { - return xsm_ops.set_pod_target(d); + return alternative_call(xsm_ops.set_pod_target, d); } static inline int xsm_memory_exchange(xsm_default_t def, struct domain *d) { - return xsm_ops.memory_exchange(d); + return alternative_call(xsm_ops.memory_exchange, d); } static inline int xsm_memory_adjust_reservation( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.memory_adjust_reservation(d1, d2); + return alternative_call(xsm_ops.memory_adjust_reservation, d1, d2); } static inline int xsm_memory_stat_reservation( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.memory_stat_reservation(d1, d2); + return alternative_call(xsm_ops.memory_stat_reservation, d1, d2); } static inline int xsm_memory_pin_page( xsm_default_t def, struct domain *d1, struct domain *d2, struct page_info *page) { - return xsm_ops.memory_pin_page(d1, d2, page); + return alternative_call(xsm_ops.memory_pin_page, d1, d2, page); } static inline int xsm_add_to_physmap( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.add_to_physmap(d1, d2); + return alternative_call(xsm_ops.add_to_physmap, d1, d2); } static inline int xsm_remove_from_physmap( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.remove_from_physmap(d1, d2); + return alternative_call(xsm_ops.remove_from_physmap, d1, d2); } static inline int xsm_map_gmfn_foreign( xsm_default_t def, struct domain *d, struct domain *t) { - return xsm_ops.map_gmfn_foreign(d, t); + return alternative_call(xsm_ops.map_gmfn_foreign, d, t); } static inline int xsm_claim_pages(xsm_default_t def, struct domain *d) { - return xsm_ops.claim_pages(d); + return alternative_call(xsm_ops.claim_pages, d); } static inline int xsm_console_io(xsm_default_t def, struct domain *d, int cmd) { - return xsm_ops.console_io(d, cmd); + return alternative_call(xsm_ops.console_io, d, cmd); } static inline int xsm_profile(xsm_default_t def, struct domain *d, int op) { - return xsm_ops.profile(d, op); + return alternative_call(xsm_ops.profile, d, op); } static inline int xsm_kexec(xsm_default_t def) { - return xsm_ops.kexec(); + return alternative_call(xsm_ops.kexec); } static inline int xsm_schedop_shutdown( xsm_default_t def, struct domain *d1, struct domain *d2) { - return xsm_ops.schedop_shutdown(d1, d2); + return alternative_call(xsm_ops.schedop_shutdown, d1, d2); } static inline char *xsm_show_irq_sid(int irq) { - return xsm_ops.show_irq_sid(irq); + return alternative_call(xsm_ops.show_irq_sid, irq); } static inline int xsm_map_domain_pirq(xsm_default_t def, struct domain *d) { - return xsm_ops.map_domain_pirq(d); + return alternative_call(xsm_ops.map_domain_pirq, d); } static inline int xsm_map_domain_irq( xsm_default_t def, struct domain *d, int irq, void *data) { - return xsm_ops.map_domain_irq(d, irq, data); + return alternative_call(xsm_ops.map_domain_irq, d, irq, data); } static inline int xsm_unmap_domain_pirq(xsm_default_t def, struct domain *d) { - return xsm_ops.unmap_domain_pirq(d); + return alternative_call(xsm_ops.unmap_domain_pirq, d); } static inline int xsm_unmap_domain_irq( xsm_default_t def, struct domain *d, int irq, void *data) { - return xsm_ops.unmap_domain_irq(d, irq, data); + return alternative_call(xsm_ops.unmap_domain_irq, d, irq, data); } static inline int xsm_bind_pt_irq( xsm_default_t def, struct domain *d, struct xen_domctl_bind_pt_irq *bind) { - return xsm_ops.bind_pt_irq(d, bind); + return alternative_call(xsm_ops.bind_pt_irq, d, bind); } static inline int xsm_unbind_pt_irq( xsm_default_t def, struct domain *d, struct xen_domctl_bind_pt_irq *bind) { - return xsm_ops.unbind_pt_irq(d, bind); + return alternative_call(xsm_ops.unbind_pt_irq, d, bind); } static inline int xsm_irq_permission( xsm_default_t def, struct domain *d, int pirq, uint8_t allow) { - return xsm_ops.irq_permission(d, pirq, allow); + return alternative_call(xsm_ops.irq_permission, d, pirq, allow); } static inline int xsm_iomem_permission( xsm_default_t def, struct domain *d, uint64_t s, uint64_t e, uint8_t allow) { - return xsm_ops.iomem_permission(d, s, e, allow); + return alternative_call(xsm_ops.iomem_permission, d, s, e, allow); } static inline int xsm_iomem_mapping( xsm_default_t def, struct domain *d, uint64_t s, uint64_t e, uint8_t allow) { - return xsm_ops.iomem_mapping(d, s, e, allow); + return alternative_call(xsm_ops.iomem_mapping, d, s, e, allow); } static inline int xsm_pci_config_permission( xsm_default_t def, struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access) { - return xsm_ops.pci_config_permission(d, machine_bdf, start, end, access); + return alternative_call(xsm_ops.pci_config_permission, d, machine_bdf, start, end, access); } #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) { - return xsm_ops.get_device_group(machine_bdf); + return alternative_call(xsm_ops.get_device_group, machine_bdf); } static inline int xsm_assign_device( xsm_default_t def, struct domain *d, uint32_t machine_bdf) { - return xsm_ops.assign_device(d, machine_bdf); + return alternative_call(xsm_ops.assign_device, d, machine_bdf); } static inline int xsm_deassign_device( xsm_default_t def, struct domain *d, uint32_t machine_bdf) { - return xsm_ops.deassign_device(d, machine_bdf); + return alternative_call(xsm_ops.deassign_device, d, machine_bdf); } #endif /* HAS_PASSTHROUGH && HAS_PCI) */ @@ -518,62 +519,62 @@ static inline int xsm_deassign_device( static inline int xsm_assign_dtdevice( xsm_default_t def, struct domain *d, const char *dtpath) { - return xsm_ops.assign_dtdevice(d, dtpath); + return alternative_call(xsm_ops.assign_dtdevice, d, dtpath); } static inline int xsm_deassign_dtdevice( xsm_default_t def, struct domain *d, const char *dtpath) { - return xsm_ops.deassign_dtdevice(d, dtpath); + return alternative_call(xsm_ops.deassign_dtdevice, d, dtpath); } #endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE */ static inline int xsm_resource_plug_pci(xsm_default_t def, uint32_t machine_bdf) { - return xsm_ops.resource_plug_pci(machine_bdf); + return alternative_call(xsm_ops.resource_plug_pci, machine_bdf); } static inline int xsm_resource_unplug_pci( xsm_default_t def, uint32_t machine_bdf) { - return xsm_ops.resource_unplug_pci(machine_bdf); + return alternative_call(xsm_ops.resource_unplug_pci, machine_bdf); } static inline int xsm_resource_plug_core(xsm_default_t def) { - return xsm_ops.resource_plug_core(); + return alternative_call(xsm_ops.resource_plug_core); } static inline int xsm_resource_unplug_core(xsm_default_t def) { - return xsm_ops.resource_unplug_core(); + return alternative_call(xsm_ops.resource_unplug_core); } static inline int xsm_resource_setup_pci( xsm_default_t def, uint32_t machine_bdf) { - return xsm_ops.resource_setup_pci(machine_bdf); + return alternative_call(xsm_ops.resource_setup_pci, machine_bdf); } static inline int xsm_resource_setup_gsi(xsm_default_t def, int gsi) { - return xsm_ops.resource_setup_gsi(gsi); + return alternative_call(xsm_ops.resource_setup_gsi, gsi); } static inline int xsm_resource_setup_misc(xsm_default_t def) { - return xsm_ops.resource_setup_misc(); + return alternative_call(xsm_ops.resource_setup_misc); } static inline int xsm_page_offline(xsm_default_t def, uint32_t cmd) { - return xsm_ops.page_offline(cmd); + return alternative_call(xsm_ops.page_offline, cmd); } static inline int xsm_hypfs_op(xsm_default_t def) { - return xsm_ops.hypfs_op(); + return alternative_call(xsm_ops.hypfs_op); } static inline long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op) @@ -591,107 +592,107 @@ static inline int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op) static inline int xsm_hvm_param( xsm_default_t def, struct domain *d, unsigned long op) { - return xsm_ops.hvm_param(d, op); + return alternative_call(xsm_ops.hvm_param, d, op); } static inline int xsm_hvm_control( xsm_default_t def, struct domain *d, unsigned long op) { - return xsm_ops.hvm_control(d, op); + return alternative_call(xsm_ops.hvm_control, d, op); } static inline int xsm_hvm_param_altp2mhvm(xsm_default_t def, struct domain *d) { - return xsm_ops.hvm_param_altp2mhvm(d); + return alternative_call(xsm_ops.hvm_param_altp2mhvm, d); } static inline int xsm_hvm_altp2mhvm_op( xsm_default_t def, struct domain *d, uint64_t mode, uint32_t op) { - return xsm_ops.hvm_altp2mhvm_op(d, mode, op); + return alternative_call(xsm_ops.hvm_altp2mhvm_op, d, mode, op); } static inline int xsm_get_vnumainfo(xsm_default_t def, struct domain *d) { - return xsm_ops.get_vnumainfo(d); + return alternative_call(xsm_ops.get_vnumainfo, d); } static inline int xsm_vm_event_control( xsm_default_t def, struct domain *d, int mode, int op) { - return xsm_ops.vm_event_control(d, mode, op); + return alternative_call(xsm_ops.vm_event_control, d, mode, op); } #ifdef CONFIG_MEM_ACCESS static inline int xsm_mem_access(xsm_default_t def, struct domain *d) { - return xsm_ops.mem_access(d); + return alternative_call(xsm_ops.mem_access, d); } #endif #ifdef CONFIG_MEM_PAGING static inline int xsm_mem_paging(xsm_default_t def, struct domain *d) { - return xsm_ops.mem_paging(d); + return alternative_call(xsm_ops.mem_paging, d); } #endif #ifdef CONFIG_MEM_SHARING static inline int xsm_mem_sharing(xsm_default_t def, struct domain *d) { - return xsm_ops.mem_sharing(d); + return alternative_call(xsm_ops.mem_sharing, d); } #endif static inline int xsm_platform_op(xsm_default_t def, uint32_t op) { - return xsm_ops.platform_op(op); + return alternative_call(xsm_ops.platform_op, op); } #ifdef CONFIG_X86 static inline int xsm_do_mca(xsm_default_t def) { - return xsm_ops.do_mca(); + return alternative_call(xsm_ops.do_mca); } static inline int xsm_shadow_control( xsm_default_t def, struct domain *d, uint32_t op) { - return xsm_ops.shadow_control(d, op); + return alternative_call(xsm_ops.shadow_control, d, op); } static inline int xsm_mem_sharing_op( xsm_default_t def, struct domain *d, struct domain *cd, int op) { - return xsm_ops.mem_sharing_op(d, cd, op); + return alternative_call(xsm_ops.mem_sharing_op, d, cd, op); } static inline int xsm_apic(xsm_default_t def, struct domain *d, int cmd) { - return xsm_ops.apic(d, cmd); + return alternative_call(xsm_ops.apic, d, cmd); } static inline int xsm_machine_memory_map(xsm_default_t def) { - return xsm_ops.machine_memory_map(); + return alternative_call(xsm_ops.machine_memory_map); } static inline int xsm_domain_memory_map(xsm_default_t def, struct domain *d) { - return xsm_ops.domain_memory_map(d); + return alternative_call(xsm_ops.domain_memory_map, d); } static inline int xsm_mmu_update( xsm_default_t def, struct domain *d, struct domain *t, struct domain *f, uint32_t flags) { - return xsm_ops.mmu_update(d, t, f, flags); + return alternative_call(xsm_ops.mmu_update, d, t, f, flags); } static inline int xsm_mmuext_op( xsm_default_t def, struct domain *d, struct domain *f) { - return xsm_ops.mmuext_op(d, f); + return alternative_call(xsm_ops.mmuext_op, d, f); } static inline int xsm_update_va_mapping( @@ -703,64 +704,64 @@ static inline int xsm_update_va_mapping( static inline int xsm_priv_mapping( xsm_default_t def, struct domain *d, struct domain *t) { - return xsm_ops.priv_mapping(d, t); + return alternative_call(xsm_ops.priv_mapping, d, t); } static inline int xsm_ioport_permission( xsm_default_t def, struct domain *d, uint32_t s, uint32_t e, uint8_t allow) { - return xsm_ops.ioport_permission(d, s, e, allow); + return alternative_call(xsm_ops.ioport_permission, d, s, e, allow); } static inline int xsm_ioport_mapping( xsm_default_t def, struct domain *d, uint32_t s, uint32_t e, uint8_t allow) { - return xsm_ops.ioport_mapping(d, s, e, allow); + return alternative_call(xsm_ops.ioport_mapping, d, s, e, allow); } static inline int xsm_pmu_op( xsm_default_t def, struct domain *d, unsigned int op) { - return xsm_ops.pmu_op(d, op); + return alternative_call(xsm_ops.pmu_op, d, op); } #endif /* CONFIG_X86 */ static inline int xsm_dm_op(xsm_default_t def, struct domain *d) { - return xsm_ops.dm_op(d); + return alternative_call(xsm_ops.dm_op, d); } static inline int xsm_xen_version(xsm_default_t def, uint32_t op) { - return xsm_ops.xen_version(op); + return alternative_call(xsm_ops.xen_version, op); } static inline int xsm_domain_resource_map(xsm_default_t def, struct domain *d) { - return xsm_ops.domain_resource_map(d); + return alternative_call(xsm_ops.domain_resource_map, d); } #ifdef CONFIG_ARGO static inline int xsm_argo_enable(const struct domain *d) { - return xsm_ops.argo_enable(d); + return alternative_call(xsm_ops.argo_enable, d); } static inline int xsm_argo_register_single_source( const struct domain *d, const struct domain *t) { - return xsm_ops.argo_register_single_source(d, t); + return alternative_call(xsm_ops.argo_register_single_source, d, t); } static inline int xsm_argo_register_any_source(const struct domain *d) { - return xsm_ops.argo_register_any_source(d); + return alternative_call(xsm_ops.argo_register_any_source, d); } static inline int xsm_argo_send(const struct domain *d, const struct domain *t) { - return xsm_ops.argo_send(d, t); + return alternative_call(xsm_ops.argo_send, d, t); } #endif /* CONFIG_ARGO */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:47:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:47:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202381.357162 (Exim 4.92) (envelope-from ) id 1mXpTo-0003Bt-Bz; Tue, 05 Oct 2021 18:47:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202381.357162; Tue, 05 Oct 2021 18:47:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTo-0003Bk-8u; Tue, 05 Oct 2021 18:47:56 +0000 Received: by outflank-mailman (input) for mailman id 202381; Tue, 05 Oct 2021 18:47:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTn-0003Bc-C6 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTn-0001vu-BT for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpTn-0000mc-Al for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:47:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Nr/9Q1rofcEgkndQ9lw/L02fNGz4jBPNo8vHhwL6a3M=; b=yGtPW3dSDASmMchHWnqeJVsm/Q b8Oq6qKaMRoruglABqqRXuNbUVZMb/2KfIl8nOdSxEZeyBnDQCa435tx6ECoZqXtnnNJA4Zm7hboT +elTckXHjBhlYQYcrzPyfNpl5eueJ6VVh20O5ByGG3snzkVullgRp9HctgMHh9k6zeNg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: defer "no DRHD" check when (un)mapping devices Message-Id: Date: Tue, 05 Oct 2021 18:47:55 +0000 commit 418b4d57416428c5bb5a3e796214367cbdcd9423 Author: Jan Beulich AuthorDate: Thu Sep 16 11:02:08 2021 +0200 Commit: Jan Beulich CommitDate: Thu Sep 16 11:02:08 2021 +0200 VT-d: defer "no DRHD" check when (un)mapping devices If devices are to be skipped anyway (which is the case in particular for host bridges), there's no point complaining about a missing DRHD (and hence a missing association with an IOMMU). While there convert assignments to initializers and constify "drhd" local variables. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index bab19d79e8..9827ab184d 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1460,14 +1460,10 @@ static int domain_context_unmap(struct domain *d, uint8_t devfn, static int domain_context_mapping(struct domain *domain, u8 devfn, struct pci_dev *pdev) { - struct acpi_drhd_unit *drhd; + const struct acpi_drhd_unit *drhd = acpi_find_matched_drhd_unit(pdev); int ret = 0; u8 seg = pdev->seg, bus = pdev->bus, secbus; - drhd = acpi_find_matched_drhd_unit(pdev); - if ( !drhd ) - return -ENODEV; - /* * Generally we assume only devices from one node to get assigned to a * given guest. But even if not, by replacing the prior value here we @@ -1476,7 +1472,7 @@ static int domain_context_mapping(struct domain *domain, u8 devfn, * this or other devices may be penalized then, but some would also be * if we left other than NUMA_NO_NODE untouched here. */ - if ( drhd->iommu->node != NUMA_NO_NODE ) + if ( drhd && drhd->iommu->node != NUMA_NO_NODE ) dom_iommu(domain)->node = drhd->iommu->node; ASSERT(pcidevs_locked()); @@ -1497,6 +1493,9 @@ static int domain_context_mapping(struct domain *domain, u8 devfn, break; case DEV_TYPE_PCIe_ENDPOINT: + if ( !drhd ) + return -ENODEV; + if ( iommu_debug ) printk(VTDPREFIX "%pd:PCIe: map %pp\n", domain, &PCI_SBDF3(seg, bus, devfn)); @@ -1508,6 +1507,9 @@ static int domain_context_mapping(struct domain *domain, u8 devfn, break; case DEV_TYPE_PCI: + if ( !drhd ) + return -ENODEV; + if ( iommu_debug ) printk(VTDPREFIX "%pd:PCI: map %pp\n", domain, &PCI_SBDF3(seg, bus, devfn)); @@ -1651,17 +1653,12 @@ int domain_context_unmap_one( static int domain_context_unmap(struct domain *domain, u8 devfn, struct pci_dev *pdev) { - struct acpi_drhd_unit *drhd; - struct vtd_iommu *iommu; + const struct acpi_drhd_unit *drhd = acpi_find_matched_drhd_unit(pdev); + struct vtd_iommu *iommu = drhd ? drhd->iommu : NULL; int ret; u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; int found = 0; - drhd = acpi_find_matched_drhd_unit(pdev); - if ( !drhd ) - return -ENODEV; - iommu = drhd->iommu; - switch ( pdev->type ) { case DEV_TYPE_PCI_HOST_BRIDGE: @@ -1676,6 +1673,9 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, return 0; case DEV_TYPE_PCIe_ENDPOINT: + if ( !iommu ) + return -ENODEV; + if ( iommu_debug ) printk(VTDPREFIX "%pd:PCIe: unmap %pp\n", domain, &PCI_SBDF3(seg, bus, devfn)); @@ -1686,6 +1686,9 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, break; case DEV_TYPE_PCI: + if ( !iommu ) + return -ENODEV; + if ( iommu_debug ) printk(VTDPREFIX "%pd:PCI: unmap %pp\n", domain, &PCI_SBDF3(seg, bus, devfn)); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:48:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:48:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202383.357166 (Exim 4.92) (envelope-from ) id 1mXpTy-0003FP-DN; Tue, 05 Oct 2021 18:48:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202383.357166; Tue, 05 Oct 2021 18:48:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTy-0003FG-AO; Tue, 05 Oct 2021 18:48:06 +0000 Received: by outflank-mailman (input) for mailman id 202383; Tue, 05 Oct 2021 18:48:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTx-0003F0-FH for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpTx-0001xo-Ee for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpTx-0000nX-Du for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8USVXSf4VMHB89vqrS2NAP1ST0UHQLrSuInvfOJj/nw=; b=ylH4hCqVyRoMcsOjC5edUIRnge cDX5KHHDUROyoMxwnflQ3pVw8AAN3oK5nSbFMjcTWTw069QL5GEGFCPLqIC83oVTiG3Rd11S6Bhqa mfh5t9FXDb2ZSlsRhAwjeW8tbUK/k6fjtRcQBLgtB9kJ249FAc2BJaZGRtj1XBPOKPzs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: skip IOMMU bitmap cleanup for phantom devices Message-Id: Date: Tue, 05 Oct 2021 18:48:05 +0000 commit 9d92140d0255e14d8c3eaba7edc931327eb96fd0 Author: Jan Beulich AuthorDate: Thu Sep 16 11:02:48 2021 +0200 Commit: Jan Beulich CommitDate: Thu Sep 16 11:02:48 2021 +0200 VT-d: skip IOMMU bitmap cleanup for phantom devices Doing the cleanup also for phantom devices is at best redundant with doing it for the corresponding real device. I couldn't force myself into checking all the code paths whether it really is: It seems better to explicitly skip this step in such cases. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 9827ab184d..aeb1dddc88 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1733,7 +1733,7 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, return -EINVAL; } - if ( ret || QUARANTINE_SKIP(domain) ) + if ( ret || QUARANTINE_SKIP(domain) || pdev->devfn != devfn ) return ret; /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:48:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:48:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202385.357170 (Exim 4.92) (envelope-from ) id 1mXpU9-0003Ib-Es; Tue, 05 Oct 2021 18:48:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202385.357170; Tue, 05 Oct 2021 18:48:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpU9-0003IT-Bp; Tue, 05 Oct 2021 18:48:17 +0000 Received: by outflank-mailman (input) for mailman id 202385; Tue, 05 Oct 2021 18:48:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpU7-0003IC-IX for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpU7-0001yN-Hn for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpU7-0000oH-Gz for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Gxm07dzfmpws8Du6nMAcvA6KALo1oN1GH2foi6Wfm2M=; b=qLmSIch9HbTkuCvzTqIPqGuFAK OGWNBBXTrVOmFrXV2yAxs/c7MbnocTXpmNF5Ggif4oX0sJCgnoA39d/XesbgWx0LbJ+AIgYf2+avb b+sntOacPvQbiTwm+dVlAEs3vjcNl0NY7QasXrEtnZKDHx6UMbEPz8uH2sbXQzwZf7YA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Import ID registers definitions from Linux Message-Id: Date: Tue, 05 Oct 2021 18:48:15 +0000 commit b1cbe8c8ef5c9cac77edbf42c32e2cf16826b85d Author: Bertrand Marquis AuthorDate: Thu Sep 16 07:25:34 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 16 14:15:40 2021 -0700 xen/arm: Import ID registers definitions from Linux Import some ID registers definitions from Linux sysreg header to have required shift definitions for all ID registers fields. Those are required to reuse the cpufeature sanitization system from Linux kernel. Signed-off-by: Bertrand Marquis Acked-by: Julien Grall --- xen/include/asm-arm/arm64/sysregs.h | 312 ++++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) diff --git a/xen/include/asm-arm/arm64/sysregs.h b/xen/include/asm-arm/arm64/sysregs.h index 795901e1ba..d7e4772f21 100644 --- a/xen/include/asm-arm/arm64/sysregs.h +++ b/xen/include/asm-arm/arm64/sysregs.h @@ -85,6 +85,318 @@ #define ID_DFR1_EL1 S3_0_C0_C3_5 #endif +/* ID registers (imported from arm64/include/asm/sysreg.h in Linux) */ + +/* id_aa64isar0 */ +#define ID_AA64ISAR0_RNDR_SHIFT 60 +#define ID_AA64ISAR0_TLB_SHIFT 56 +#define ID_AA64ISAR0_TS_SHIFT 52 +#define ID_AA64ISAR0_FHM_SHIFT 48 +#define ID_AA64ISAR0_DP_SHIFT 44 +#define ID_AA64ISAR0_SM4_SHIFT 40 +#define ID_AA64ISAR0_SM3_SHIFT 36 +#define ID_AA64ISAR0_SHA3_SHIFT 32 +#define ID_AA64ISAR0_RDM_SHIFT 28 +#define ID_AA64ISAR0_ATOMICS_SHIFT 20 +#define ID_AA64ISAR0_CRC32_SHIFT 16 +#define ID_AA64ISAR0_SHA2_SHIFT 12 +#define ID_AA64ISAR0_SHA1_SHIFT 8 +#define ID_AA64ISAR0_AES_SHIFT 4 + +#define ID_AA64ISAR0_TLB_RANGE_NI 0x0 +#define ID_AA64ISAR0_TLB_RANGE 0x2 + +/* id_aa64isar1 */ +#define ID_AA64ISAR1_I8MM_SHIFT 52 +#define ID_AA64ISAR1_DGH_SHIFT 48 +#define ID_AA64ISAR1_BF16_SHIFT 44 +#define ID_AA64ISAR1_SPECRES_SHIFT 40 +#define ID_AA64ISAR1_SB_SHIFT 36 +#define ID_AA64ISAR1_FRINTTS_SHIFT 32 +#define ID_AA64ISAR1_GPI_SHIFT 28 +#define ID_AA64ISAR1_GPA_SHIFT 24 +#define ID_AA64ISAR1_LRCPC_SHIFT 20 +#define ID_AA64ISAR1_FCMA_SHIFT 16 +#define ID_AA64ISAR1_JSCVT_SHIFT 12 +#define ID_AA64ISAR1_API_SHIFT 8 +#define ID_AA64ISAR1_APA_SHIFT 4 +#define ID_AA64ISAR1_DPB_SHIFT 0 + +#define ID_AA64ISAR1_APA_NI 0x0 +#define ID_AA64ISAR1_APA_ARCHITECTED 0x1 +#define ID_AA64ISAR1_APA_ARCH_EPAC 0x2 +#define ID_AA64ISAR1_APA_ARCH_EPAC2 0x3 +#define ID_AA64ISAR1_APA_ARCH_EPAC2_FPAC 0x4 +#define ID_AA64ISAR1_APA_ARCH_EPAC2_FPAC_CMB 0x5 +#define ID_AA64ISAR1_API_NI 0x0 +#define ID_AA64ISAR1_API_IMP_DEF 0x1 +#define ID_AA64ISAR1_API_IMP_DEF_EPAC 0x2 +#define ID_AA64ISAR1_API_IMP_DEF_EPAC2 0x3 +#define ID_AA64ISAR1_API_IMP_DEF_EPAC2_FPAC 0x4 +#define ID_AA64ISAR1_API_IMP_DEF_EPAC2_FPAC_CMB 0x5 +#define ID_AA64ISAR1_GPA_NI 0x0 +#define ID_AA64ISAR1_GPA_ARCHITECTED 0x1 +#define ID_AA64ISAR1_GPI_NI 0x0 +#define ID_AA64ISAR1_GPI_IMP_DEF 0x1 + +/* id_aa64pfr0 */ +#define ID_AA64PFR0_CSV3_SHIFT 60 +#define ID_AA64PFR0_CSV2_SHIFT 56 +#define ID_AA64PFR0_DIT_SHIFT 48 +#define ID_AA64PFR0_AMU_SHIFT 44 +#define ID_AA64PFR0_MPAM_SHIFT 40 +#define ID_AA64PFR0_SEL2_SHIFT 36 +#define ID_AA64PFR0_SVE_SHIFT 32 +#define ID_AA64PFR0_RAS_SHIFT 28 +#define ID_AA64PFR0_GIC_SHIFT 24 +#define ID_AA64PFR0_ASIMD_SHIFT 20 +#define ID_AA64PFR0_FP_SHIFT 16 +#define ID_AA64PFR0_EL3_SHIFT 12 +#define ID_AA64PFR0_EL2_SHIFT 8 +#define ID_AA64PFR0_EL1_SHIFT 4 +#define ID_AA64PFR0_EL0_SHIFT 0 + +#define ID_AA64PFR0_AMU 0x1 +#define ID_AA64PFR0_SVE 0x1 +#define ID_AA64PFR0_RAS_V1 0x1 +#define ID_AA64PFR0_FP_NI 0xf +#define ID_AA64PFR0_FP_SUPPORTED 0x0 +#define ID_AA64PFR0_ASIMD_NI 0xf +#define ID_AA64PFR0_ASIMD_SUPPORTED 0x0 +#define ID_AA64PFR0_EL1_64BIT_ONLY 0x1 +#define ID_AA64PFR0_EL1_32BIT_64BIT 0x2 +#define ID_AA64PFR0_EL0_64BIT_ONLY 0x1 +#define ID_AA64PFR0_EL0_32BIT_64BIT 0x2 + +/* id_aa64pfr1 */ +#define ID_AA64PFR1_MPAMFRAC_SHIFT 16 +#define ID_AA64PFR1_RASFRAC_SHIFT 12 +#define ID_AA64PFR1_MTE_SHIFT 8 +#define ID_AA64PFR1_SSBS_SHIFT 4 +#define ID_AA64PFR1_BT_SHIFT 0 + +#define ID_AA64PFR1_SSBS_PSTATE_NI 0 +#define ID_AA64PFR1_SSBS_PSTATE_ONLY 1 +#define ID_AA64PFR1_SSBS_PSTATE_INSNS 2 +#define ID_AA64PFR1_BT_BTI 0x1 + +#define ID_AA64PFR1_MTE_NI 0x0 +#define ID_AA64PFR1_MTE_EL0 0x1 +#define ID_AA64PFR1_MTE 0x2 + +/* id_aa64zfr0 */ +#define ID_AA64ZFR0_F64MM_SHIFT 56 +#define ID_AA64ZFR0_F32MM_SHIFT 52 +#define ID_AA64ZFR0_I8MM_SHIFT 44 +#define ID_AA64ZFR0_SM4_SHIFT 40 +#define ID_AA64ZFR0_SHA3_SHIFT 32 +#define ID_AA64ZFR0_BF16_SHIFT 20 +#define ID_AA64ZFR0_BITPERM_SHIFT 16 +#define ID_AA64ZFR0_AES_SHIFT 4 +#define ID_AA64ZFR0_SVEVER_SHIFT 0 + +#define ID_AA64ZFR0_F64MM 0x1 +#define ID_AA64ZFR0_F32MM 0x1 +#define ID_AA64ZFR0_I8MM 0x1 +#define ID_AA64ZFR0_BF16 0x1 +#define ID_AA64ZFR0_SM4 0x1 +#define ID_AA64ZFR0_SHA3 0x1 +#define ID_AA64ZFR0_BITPERM 0x1 +#define ID_AA64ZFR0_AES 0x1 +#define ID_AA64ZFR0_AES_PMULL 0x2 +#define ID_AA64ZFR0_SVEVER_SVE2 0x1 + +/* id_aa64mmfr0 */ +#define ID_AA64MMFR0_ECV_SHIFT 60 +#define ID_AA64MMFR0_FGT_SHIFT 56 +#define ID_AA64MMFR0_EXS_SHIFT 44 +#define ID_AA64MMFR0_TGRAN4_2_SHIFT 40 +#define ID_AA64MMFR0_TGRAN64_2_SHIFT 36 +#define ID_AA64MMFR0_TGRAN16_2_SHIFT 32 +#define ID_AA64MMFR0_TGRAN4_SHIFT 28 +#define ID_AA64MMFR0_TGRAN64_SHIFT 24 +#define ID_AA64MMFR0_TGRAN16_SHIFT 20 +#define ID_AA64MMFR0_BIGENDEL0_SHIFT 16 +#define ID_AA64MMFR0_SNSMEM_SHIFT 12 +#define ID_AA64MMFR0_BIGENDEL_SHIFT 8 +#define ID_AA64MMFR0_ASID_SHIFT 4 +#define ID_AA64MMFR0_PARANGE_SHIFT 0 + +#define ID_AA64MMFR0_TGRAN4_NI 0xf +#define ID_AA64MMFR0_TGRAN4_SUPPORTED 0x0 +#define ID_AA64MMFR0_TGRAN64_NI 0xf +#define ID_AA64MMFR0_TGRAN64_SUPPORTED 0x0 +#define ID_AA64MMFR0_TGRAN16_NI 0x0 +#define ID_AA64MMFR0_TGRAN16_SUPPORTED 0x1 +#define ID_AA64MMFR0_PARANGE_48 0x5 +#define ID_AA64MMFR0_PARANGE_52 0x6 + +/* id_aa64mmfr1 */ +#define ID_AA64MMFR1_ETS_SHIFT 36 +#define ID_AA64MMFR1_TWED_SHIFT 32 +#define ID_AA64MMFR1_XNX_SHIFT 28 +#define ID_AA64MMFR1_SPECSEI_SHIFT 24 +#define ID_AA64MMFR1_PAN_SHIFT 20 +#define ID_AA64MMFR1_LOR_SHIFT 16 +#define ID_AA64MMFR1_HPD_SHIFT 12 +#define ID_AA64MMFR1_VHE_SHIFT 8 +#define ID_AA64MMFR1_VMIDBITS_SHIFT 4 +#define ID_AA64MMFR1_HADBS_SHIFT 0 + +#define ID_AA64MMFR1_VMIDBITS_8 0 +#define ID_AA64MMFR1_VMIDBITS_16 2 + +/* id_aa64mmfr2 */ +#define ID_AA64MMFR2_E0PD_SHIFT 60 +#define ID_AA64MMFR2_EVT_SHIFT 56 +#define ID_AA64MMFR2_BBM_SHIFT 52 +#define ID_AA64MMFR2_TTL_SHIFT 48 +#define ID_AA64MMFR2_FWB_SHIFT 40 +#define ID_AA64MMFR2_IDS_SHIFT 36 +#define ID_AA64MMFR2_AT_SHIFT 32 +#define ID_AA64MMFR2_ST_SHIFT 28 +#define ID_AA64MMFR2_NV_SHIFT 24 +#define ID_AA64MMFR2_CCIDX_SHIFT 20 +#define ID_AA64MMFR2_LVA_SHIFT 16 +#define ID_AA64MMFR2_IESB_SHIFT 12 +#define ID_AA64MMFR2_LSM_SHIFT 8 +#define ID_AA64MMFR2_UAO_SHIFT 4 +#define ID_AA64MMFR2_CNP_SHIFT 0 + +/* id_aa64dfr0 */ +#define ID_AA64DFR0_DOUBLELOCK_SHIFT 36 +#define ID_AA64DFR0_PMSVER_SHIFT 32 +#define ID_AA64DFR0_CTX_CMPS_SHIFT 28 +#define ID_AA64DFR0_WRPS_SHIFT 20 +#define ID_AA64DFR0_BRPS_SHIFT 12 +#define ID_AA64DFR0_PMUVER_SHIFT 8 +#define ID_AA64DFR0_TRACEVER_SHIFT 4 +#define ID_AA64DFR0_DEBUGVER_SHIFT 0 + +#define ID_AA64DFR0_PMUVER_8_0 0x1 +#define ID_AA64DFR0_PMUVER_8_1 0x4 +#define ID_AA64DFR0_PMUVER_8_4 0x5 +#define ID_AA64DFR0_PMUVER_8_5 0x6 +#define ID_AA64DFR0_PMUVER_IMP_DEF 0xf + +#define ID_DFR0_PERFMON_SHIFT 24 + +#define ID_DFR0_PERFMON_8_1 0x4 + +#define ID_ISAR4_SWP_FRAC_SHIFT 28 +#define ID_ISAR4_PSR_M_SHIFT 24 +#define ID_ISAR4_SYNCH_PRIM_FRAC_SHIFT 20 +#define ID_ISAR4_BARRIER_SHIFT 16 +#define ID_ISAR4_SMC_SHIFT 12 +#define ID_ISAR4_WRITEBACK_SHIFT 8 +#define ID_ISAR4_WITHSHIFTS_SHIFT 4 +#define ID_ISAR4_UNPRIV_SHIFT 0 + +#define ID_DFR1_MTPMU_SHIFT 0 + +#define ID_ISAR0_DIVIDE_SHIFT 24 +#define ID_ISAR0_DEBUG_SHIFT 20 +#define ID_ISAR0_COPROC_SHIFT 16 +#define ID_ISAR0_CMPBRANCH_SHIFT 12 +#define ID_ISAR0_BITFIELD_SHIFT 8 +#define ID_ISAR0_BITCOUNT_SHIFT 4 +#define ID_ISAR0_SWAP_SHIFT 0 + +#define ID_ISAR5_RDM_SHIFT 24 +#define ID_ISAR5_CRC32_SHIFT 16 +#define ID_ISAR5_SHA2_SHIFT 12 +#define ID_ISAR5_SHA1_SHIFT 8 +#define ID_ISAR5_AES_SHIFT 4 +#define ID_ISAR5_SEVL_SHIFT 0 + +#define ID_ISAR6_I8MM_SHIFT 24 +#define ID_ISAR6_BF16_SHIFT 20 +#define ID_ISAR6_SPECRES_SHIFT 16 +#define ID_ISAR6_SB_SHIFT 12 +#define ID_ISAR6_FHM_SHIFT 8 +#define ID_ISAR6_DP_SHIFT 4 +#define ID_ISAR6_JSCVT_SHIFT 0 + +#define ID_MMFR0_INNERSHR_SHIFT 28 +#define ID_MMFR0_FCSE_SHIFT 24 +#define ID_MMFR0_AUXREG_SHIFT 20 +#define ID_MMFR0_TCM_SHIFT 16 +#define ID_MMFR0_SHARELVL_SHIFT 12 +#define ID_MMFR0_OUTERSHR_SHIFT 8 +#define ID_MMFR0_PMSA_SHIFT 4 +#define ID_MMFR0_VMSA_SHIFT 0 + +#define ID_MMFR4_EVT_SHIFT 28 +#define ID_MMFR4_CCIDX_SHIFT 24 +#define ID_MMFR4_LSM_SHIFT 20 +#define ID_MMFR4_HPDS_SHIFT 16 +#define ID_MMFR4_CNP_SHIFT 12 +#define ID_MMFR4_XNX_SHIFT 8 +#define ID_MMFR4_AC2_SHIFT 4 +#define ID_MMFR4_SPECSEI_SHIFT 0 + +#define ID_MMFR5_ETS_SHIFT 0 + +#define ID_PFR0_DIT_SHIFT 24 +#define ID_PFR0_CSV2_SHIFT 16 +#define ID_PFR0_STATE3_SHIFT 12 +#define ID_PFR0_STATE2_SHIFT 8 +#define ID_PFR0_STATE1_SHIFT 4 +#define ID_PFR0_STATE0_SHIFT 0 + +#define ID_DFR0_PERFMON_SHIFT 24 +#define ID_DFR0_MPROFDBG_SHIFT 20 +#define ID_DFR0_MMAPTRC_SHIFT 16 +#define ID_DFR0_COPTRC_SHIFT 12 +#define ID_DFR0_MMAPDBG_SHIFT 8 +#define ID_DFR0_COPSDBG_SHIFT 4 +#define ID_DFR0_COPDBG_SHIFT 0 + +#define ID_PFR2_SSBS_SHIFT 4 +#define ID_PFR2_CSV3_SHIFT 0 + +#define MVFR0_FPROUND_SHIFT 28 +#define MVFR0_FPSHVEC_SHIFT 24 +#define MVFR0_FPSQRT_SHIFT 20 +#define MVFR0_FPDIVIDE_SHIFT 16 +#define MVFR0_FPTRAP_SHIFT 12 +#define MVFR0_FPDP_SHIFT 8 +#define MVFR0_FPSP_SHIFT 4 +#define MVFR0_SIMD_SHIFT 0 + +#define MVFR1_SIMDFMAC_SHIFT 28 +#define MVFR1_FPHP_SHIFT 24 +#define MVFR1_SIMDHP_SHIFT 20 +#define MVFR1_SIMDSP_SHIFT 16 +#define MVFR1_SIMDINT_SHIFT 12 +#define MVFR1_SIMDLS_SHIFT 8 +#define MVFR1_FPDNAN_SHIFT 4 +#define MVFR1_FPFTZ_SHIFT 0 + +#define ID_PFR1_GIC_SHIFT 28 +#define ID_PFR1_VIRT_FRAC_SHIFT 24 +#define ID_PFR1_SEC_FRAC_SHIFT 20 +#define ID_PFR1_GENTIMER_SHIFT 16 +#define ID_PFR1_VIRTUALIZATION_SHIFT 12 +#define ID_PFR1_MPROGMOD_SHIFT 8 +#define ID_PFR1_SECURITY_SHIFT 4 +#define ID_PFR1_PROGMOD_SHIFT 0 + +#define MVFR2_FPMISC_SHIFT 4 +#define MVFR2_SIMDMISC_SHIFT 0 + +#define DCZID_DZP_SHIFT 4 +#define DCZID_BS_SHIFT 0 + +/* + * The ZCR_ELx_LEN_* definitions intentionally include bits [8:4] which + * are reserved by the SVE architecture for future expansion of the LEN + * field, with compatible semantics. + */ +#define ZCR_ELx_LEN_SHIFT 0 +#define ZCR_ELx_LEN_SIZE 9 +#define ZCR_ELx_LEN_MASK 0x1ff + /* Access to system registers */ #define WRITE_SYSREG64(v, name) do { \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:48:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:48:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202386.357174 (Exim 4.92) (envelope-from ) id 1mXpUJ-0003LF-GK; Tue, 05 Oct 2021 18:48:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202386.357174; Tue, 05 Oct 2021 18:48:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUJ-0003L7-DO; Tue, 05 Oct 2021 18:48:27 +0000 Received: by outflank-mailman (input) for mailman id 202386; Tue, 05 Oct 2021 18:48:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUH-0003Ki-LX for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUH-0001yY-Kr for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpUH-0000oq-K3 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WHZZLxMWcJfS1mDqoK4B0Tb+mBddCkpgMzMx+4k+eII=; b=Bm+tDTOZNYGILQxtMYAuRi7s10 ZbCfcRHU4wFtierpVbV/GRIBaeP4pozTOzrJj4cRpyU7cvrraJ+oU6yT25MHBYfwtON1/K4uUtVVQ ufxWb3ntPh2nDFDs8YIomt+Abd0r0LQcgrMVhOwNafgpSne9eUoDY+ysnBv3G3iZaPfI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Import ID features sanitize from linux Message-Id: Date: Tue, 05 Oct 2021 18:48:25 +0000 commit 3918da3abd41d5b08ba4484711a70c1441ae4110 Author: Bertrand Marquis AuthorDate: Thu Sep 16 07:25:35 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 16 14:15:41 2021 -0700 xen/arm: Import ID features sanitize from linux Import structures declared in Linux file arch/arm64/kernel/cpufeature.c and the required types from arch/arm64/include/asm/cpufeature.h. Current code has been imported from Linux 5.13-rc5 (Commit ID cd1245d75ce93b8fd206f4b34eb58bcfe156d5e9) and copied into cpufeature.c in arm64 code and cpufeature.h in arm64 specific headers. Those structure will be used to sanitize the cpu features available to the ones availble on all cores of a system even if we are on an heterogeneous platform (from example a big/LITTLE). For each feature field of all ID registers, those structures define what is the safest value and if we can allow to have different values in different cores. This patch is introducing Linux code without any changes to it. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/cpufeature.c | 514 +++++++++++++++++++++++++++++++++ xen/include/asm-arm/arm64/cpufeature.h | 104 +++++++ 2 files changed, 618 insertions(+) diff --git a/xen/arch/arm/arm64/cpufeature.c b/xen/arch/arm/arm64/cpufeature.c new file mode 100644 index 0000000000..152086dc9d --- /dev/null +++ b/xen/arch/arm/arm64/cpufeature.c @@ -0,0 +1,514 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Contains CPU feature definitions + * + * The following structures have been imported directly from Linux kernel and + * should be kept in sync. + * The current version has been imported from arch/arm64/kernel/cpufeature.c + * from kernel version 5.13-rc5 together with the required structures and + * macros from arch/arm64/include/asm/cpufeature.h which are stored in + * include/asm-arm/arm64/cpufeature.h + * + * Copyright (C) 2021 Arm Ltd. + * based on code from the Linux kernel, which is: + * Copyright (C) 2015 ARM Ltd. + * + * A note for the weary kernel hacker: the code here is confusing and hard to + * follow! That's partly because it's solving a nasty problem, but also because + * there's a little bit of over-abstraction that tends to obscure what's going + * on behind a maze of helper functions and macros. + * + * The basic problem is that hardware folks have started gluing together CPUs + * with distinct architectural features; in some cases even creating SoCs where + * user-visible instructions are available only on a subset of the available + * cores. We try to address this by snapshotting the feature registers of the + * boot CPU and comparing these with the feature registers of each secondary + * CPU when bringing them up. If there is a mismatch, then we update the + * snapshot state to indicate the lowest-common denominator of the feature, + * known as the "safe" value. This snapshot state can be queried to view the + * "sanitised" value of a feature register. + * + * The sanitised register values are used to decide which capabilities we + * have in the system. These may be in the form of traditional "hwcaps" + * advertised to userspace or internal "cpucaps" which are used to configure + * things like alternative patching and static keys. While a feature mismatch + * may result in a TAINT_CPU_OUT_OF_SPEC kernel taint, a capability mismatch + * may prevent a CPU from being onlined at all. + * + * Some implementation details worth remembering: + * + * - Mismatched features are *always* sanitised to a "safe" value, which + * usually indicates that the feature is not supported. + * + * - A mismatched feature marked with FTR_STRICT will cause a "SANITY CHECK" + * warning when onlining an offending CPU and the kernel will be tainted + * with TAINT_CPU_OUT_OF_SPEC. + * + * - Features marked as FTR_VISIBLE have their sanitised value visible to + * userspace. FTR_VISIBLE features in registers that are only visible + * to EL0 by trapping *must* have a corresponding HWCAP so that late + * onlining of CPUs cannot lead to features disappearing at runtime. + * + * - A "feature" is typically a 4-bit register field. A "capability" is the + * high-level description derived from the sanitised field value. + * + * - Read the Arm ARM (DDI 0487F.a) section D13.1.3 ("Principles of the ID + * scheme for fields in ID registers") to understand when feature fields + * may be signed or unsigned (FTR_SIGNED and FTR_UNSIGNED accordingly). + * + * - KVM exposes its own view of the feature registers to guest operating + * systems regardless of FTR_VISIBLE. This is typically driven from the + * sanitised register values to allow virtual CPUs to be migrated between + * arbitrary physical CPUs, but some features not present on the host are + * also advertised and emulated. Look at sys_reg_descs[] for the gory + * details. + * + * - If the arm64_ftr_bits[] for a register has a missing field, then this + * field is treated as STRICT RES0, including for read_sanitised_ftr_reg(). + * This is stronger than FTR_HIDDEN and can be used to hide features from + * KVM guests. + */ + +#include +#include +#include +#include +#include + +#define __ARM64_FTR_BITS(SIGNED, VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \ + { \ + .sign = SIGNED, \ + .visible = VISIBLE, \ + .strict = STRICT, \ + .type = TYPE, \ + .shift = SHIFT, \ + .width = WIDTH, \ + .safe_val = SAFE_VAL, \ + } + +/* Define a feature with unsigned values */ +#define ARM64_FTR_BITS(VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \ + __ARM64_FTR_BITS(FTR_UNSIGNED, VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) + +/* Define a feature with a signed value */ +#define S_ARM64_FTR_BITS(VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) \ + __ARM64_FTR_BITS(FTR_SIGNED, VISIBLE, STRICT, TYPE, SHIFT, WIDTH, SAFE_VAL) + +#define ARM64_FTR_END \ + { \ + .width = 0, \ + } + +/* + * NOTE: Any changes to the visibility of features should be kept in + * sync with the documentation of the CPU feature register ABI. + */ +static const struct arm64_ftr_bits ftr_id_aa64isar0[] = { + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_RNDR_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_TLB_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_TS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_FHM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_DP_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SM4_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SM3_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SHA3_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_RDM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_ATOMICS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_CRC32_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SHA2_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_SHA1_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_AES_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_aa64isar1[] = { + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_I8MM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_DGH_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_BF16_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_SPECRES_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_SB_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_FRINTTS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_GPI_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_GPA_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_LRCPC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_FCMA_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_JSCVT_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH), + FTR_STRICT, FTR_EXACT, ID_AA64ISAR1_API_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH), + FTR_STRICT, FTR_EXACT, ID_AA64ISAR1_APA_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_DPB_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_CSV3_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_CSV2_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_DIT_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_AMU_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_MPAM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_SEL2_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_SVE_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_RAS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_GIC_SHIFT, 4, 0), + S_ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_ASIMD_SHIFT, 4, ID_AA64PFR0_ASIMD_NI), + S_ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_FP_SHIFT, 4, ID_AA64PFR0_FP_NI), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL3_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL2_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL1_SHIFT, 4, ID_AA64PFR0_EL1_64BIT_ONLY), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_EL0_SHIFT, 4, ID_AA64PFR0_EL0_64BIT_ONLY), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_aa64pfr1[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_MPAMFRAC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_RASFRAC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_MTE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_MTE_SHIFT, 4, ID_AA64PFR1_MTE_NI), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR1_SSBS_SHIFT, 4, ID_AA64PFR1_SSBS_PSTATE_NI), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_BTI), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_BT_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_aa64zfr0[] = { + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_F64MM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_F32MM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_I8MM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_SM4_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_SHA3_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_BF16_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_BITPERM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_AES_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SVE), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ZFR0_SVEVER_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_ECV_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_FGT_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_EXS_SHIFT, 4, 0), + /* + * Page size not being supported at Stage-2 is not fatal. You + * just give up KVM if PAGE_SIZE isn't supported there. Go fix + * your favourite nesting hypervisor. + * + * There is a small corner case where the hypervisor explicitly + * advertises a given granule size at Stage-2 (value 2) on some + * vCPUs, and uses the fallback to Stage-1 (value 0) for other + * vCPUs. Although this is not forbidden by the architecture, it + * indicates that the hypervisor is being silly (or buggy). + * + * We make no effort to cope with this and pretend that if these + * fields are inconsistent across vCPUs, then it isn't worth + * trying to bring KVM up. + */ + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN4_2_SHIFT, 4, 1), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN64_2_SHIFT, 4, 1), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN16_2_SHIFT, 4, 1), + /* + * We already refuse to boot CPUs that don't support our configured + * page size, so we can only detect mismatches for a page size other + * than the one we're currently using. Unfortunately, SoCs like this + * exist in the wild so, even though we don't like it, we'll have to go + * along with it and treat them as non-strict. + */ + S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN4_SHIFT, 4, ID_AA64MMFR0_TGRAN4_NI), + S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN64_SHIFT, 4, ID_AA64MMFR0_TGRAN64_NI), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN16_SHIFT, 4, ID_AA64MMFR0_TGRAN16_NI), + + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_BIGENDEL0_SHIFT, 4, 0), + /* Linux shouldn't care about secure memory */ + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_SNSMEM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_BIGENDEL_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_ASID_SHIFT, 4, 0), + /* + * Differing PARange is fine as long as all peripherals and memory are mapped + * within the minimum PARange of all CPUs + */ + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_PARANGE_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_aa64mmfr1[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_ETS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_TWED_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_XNX_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64MMFR1_SPECSEI_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_PAN_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_LOR_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_HPD_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_VHE_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_VMIDBITS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_HADBS_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_E0PD_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_EVT_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_BBM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_TTL_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_FWB_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_IDS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_AT_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_ST_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_NV_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_CCIDX_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_LVA_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_IESB_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_LSM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_UAO_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR2_CNP_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_ctr[] = { + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 31, 1, 1), /* RES1 */ + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, CTR_DIC_SHIFT, 1, 1), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, CTR_IDC_SHIFT, 1, 1), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_OR_ZERO_SAFE, CTR_CWG_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_OR_ZERO_SAFE, CTR_ERG_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, CTR_DMINLINE_SHIFT, 4, 1), + /* + * Linux can handle differing I-cache policies. Userspace JITs will + * make use of *minLine. + * If we have differing I-cache policies, report it as the weakest - VIPT. + */ + ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_EXACT, CTR_L1IP_SHIFT, 2, ICACHE_POLICY_VIPT), /* L1Ip */ + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, CTR_IMINLINE_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_mmfr0[] = { + S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_INNERSHR_SHIFT, 4, 0xf), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_FCSE_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_MMFR0_AUXREG_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_TCM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_SHARELVL_SHIFT, 4, 0), + S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_OUTERSHR_SHIFT, 4, 0xf), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_PMSA_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_VMSA_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_aa64dfr0[] = { + S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_DOUBLELOCK_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64DFR0_PMSVER_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_CTX_CMPS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_WRPS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_BRPS_SHIFT, 4, 0), + /* + * We can instantiate multiple PMU instances with different levels + * of support. + */ + S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64DFR0_PMUVER_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_DEBUGVER_SHIFT, 4, 0x6), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_mvfr2[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, MVFR2_FPMISC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, MVFR2_SIMDMISC_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_dczid[] = { + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, DCZID_DZP_SHIFT, 1, 1), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, DCZID_BS_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_isar0[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_DIVIDE_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_DEBUG_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_COPROC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_CMPBRANCH_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_BITFIELD_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_BITCOUNT_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_SWAP_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_isar5[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR5_RDM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR5_CRC32_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR5_SHA2_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR5_SHA1_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR5_AES_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR5_SEVL_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_mmfr4[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR4_EVT_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR4_CCIDX_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR4_LSM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR4_HPDS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR4_CNP_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR4_XNX_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR4_AC2_SHIFT, 4, 0), + + /* + * SpecSEI = 1 indicates that the PE might generate an SError on an + * external abort on speculative read. It is safe to assume that an + * SError might be generated than it will not be. Hence it has been + * classified as FTR_HIGHER_SAFE. + */ + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_HIGHER_SAFE, ID_MMFR4_SPECSEI_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_isar4[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR4_SWP_FRAC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR4_PSR_M_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR4_SYNCH_PRIM_FRAC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR4_BARRIER_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR4_SMC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR4_WRITEBACK_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR4_WITHSHIFTS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR4_UNPRIV_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_mmfr5[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR5_ETS_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_isar6[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_I8MM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_BF16_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_SPECRES_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_SB_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_FHM_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_DP_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_JSCVT_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_pfr0[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_DIT_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_PFR0_CSV2_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_STATE3_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_STATE2_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_STATE1_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR0_STATE0_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_pfr1[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR1_GIC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR1_VIRT_FRAC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR1_SEC_FRAC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR1_GENTIMER_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR1_VIRTUALIZATION_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR1_MPROGMOD_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR1_SECURITY_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_PFR1_PROGMOD_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_pfr2[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_PFR2_SSBS_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_PFR2_CSV3_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_dfr0[] = { + /* [31:28] TraceFilt */ + S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR0_PERFMON_SHIFT, 4, 0xf), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR0_MPROFDBG_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR0_MMAPTRC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR0_COPTRC_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR0_MMAPDBG_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR0_COPSDBG_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR0_COPDBG_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_id_dfr1[] = { + S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_DFR1_MTPMU_SHIFT, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_zcr[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, + ZCR_ELx_LEN_SHIFT, ZCR_ELx_LEN_SIZE, 0), /* LEN */ + ARM64_FTR_END, +}; + +/* + * Common ftr bits for a 32bit register with all hidden, strict + * attributes, with 4bit feature fields and a default safe value of + * 0. Covers the following 32bit registers: + * id_isar[1-4], id_mmfr[1-3], id_pfr1, mvfr[0-1] + */ +static const struct arm64_ftr_bits ftr_generic_32bits[] = { + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 28, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 24, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 12, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 8, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 4, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, 0, 4, 0), + ARM64_FTR_END, +}; + +static const struct arm64_ftr_bits ftr_raz[] = { + ARM64_FTR_END, +}; + +static u64 arm64_ftr_set_value(const struct arm64_ftr_bits *ftrp, s64 reg, + s64 ftr_val) +{ + u64 mask = arm64_ftr_mask(ftrp); + + reg &= ~mask; + reg |= (ftr_val << ftrp->shift) & mask; + return reg; +} + +static s64 arm64_ftr_safe_value(const struct arm64_ftr_bits *ftrp, s64 new, + s64 cur) +{ + s64 ret = 0; + + switch (ftrp->type) { + case FTR_EXACT: + ret = ftrp->safe_val; + break; + case FTR_LOWER_SAFE: + ret = min(new, cur); + break; + case FTR_HIGHER_OR_ZERO_SAFE: + if (!cur || !new) + break; + fallthrough; + case FTR_HIGHER_SAFE: + ret = max(new, cur); + break; + default: + BUG(); + } + + return ret; +} + +/* + * End of imported linux structures and code + */ + diff --git a/xen/include/asm-arm/arm64/cpufeature.h b/xen/include/asm-arm/arm64/cpufeature.h new file mode 100644 index 0000000000..d9b9fa77cb --- /dev/null +++ b/xen/include/asm-arm/arm64/cpufeature.h @@ -0,0 +1,104 @@ +#ifndef __ASM_ARM_ARM64_CPUFEATURES_H +#define __ASM_ARM_ARM64_CPUFEATURES_H + +/* + * CPU feature register tracking + * + * The safe value of a CPUID feature field is dependent on the implications + * of the values assigned to it by the architecture. Based on the relationship + * between the values, the features are classified into 3 types - LOWER_SAFE, + * HIGHER_SAFE and EXACT. + * + * The lowest value of all the CPUs is chosen for LOWER_SAFE and highest + * for HIGHER_SAFE. It is expected that all CPUs have the same value for + * a field when EXACT is specified, failing which, the safe value specified + * in the table is chosen. + */ + +enum ftr_type { + FTR_EXACT, /* Use a predefined safe value */ + FTR_LOWER_SAFE, /* Smaller value is safe */ + FTR_HIGHER_SAFE, /* Bigger value is safe */ + FTR_HIGHER_OR_ZERO_SAFE, /* Bigger value is safe, but 0 is biggest */ +}; + +#define FTR_STRICT true /* SANITY check strict matching required */ +#define FTR_NONSTRICT false /* SANITY check ignored */ + +#define FTR_SIGNED true /* Value should be treated as signed */ +#define FTR_UNSIGNED false /* Value should be treated as unsigned */ + +#define FTR_VISIBLE true /* Feature visible to the user space */ +#define FTR_HIDDEN false /* Feature is hidden from the user */ + +#define FTR_VISIBLE_IF_IS_ENABLED(config) \ + (IS_ENABLED(config) ? FTR_VISIBLE : FTR_HIDDEN) + +struct arm64_ftr_bits { + bool sign; /* Value is signed ? */ + bool visible; + bool strict; /* CPU Sanity check: strict matching required ? */ + enum ftr_type type; + u8 shift; + u8 width; + s64 safe_val; /* safe value for FTR_EXACT features */ +}; + +static inline int __attribute_const__ +cpuid_feature_extract_signed_field_width(u64 features, int field, int width) +{ + return (s64)(features << (64 - width - field)) >> (64 - width); +} + +static inline int __attribute_const__ +cpuid_feature_extract_signed_field(u64 features, int field) +{ + return cpuid_feature_extract_signed_field_width(features, field, 4); +} + +static inline unsigned int __attribute_const__ +cpuid_feature_extract_unsigned_field_width(u64 features, int field, int width) +{ + return (u64)(features << (64 - width - field)) >> (64 - width); +} + +static inline unsigned int __attribute_const__ +cpuid_feature_extract_unsigned_field(u64 features, int field) +{ + return cpuid_feature_extract_unsigned_field_width(features, field, 4); +} + +static inline u64 arm64_ftr_mask(const struct arm64_ftr_bits *ftrp) +{ + return (u64)GENMASK(ftrp->shift + ftrp->width - 1, ftrp->shift); +} + +static inline int __attribute_const__ +cpuid_feature_extract_field_width(u64 features, int field, int width, bool sign) +{ + return (sign) ? + cpuid_feature_extract_signed_field_width(features, field, width) : + cpuid_feature_extract_unsigned_field_width(features, field, width); +} + +static inline int __attribute_const__ +cpuid_feature_extract_field(u64 features, int field, bool sign) +{ + return cpuid_feature_extract_field_width(features, field, 4, sign); +} + +static inline s64 arm64_ftr_value(const struct arm64_ftr_bits *ftrp, u64 val) +{ + return (s64)cpuid_feature_extract_field_width(val, ftrp->shift, ftrp->width, ftrp->sign); +} + +#endif /* _ASM_ARM_ARM64_CPUFEATURES_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:48:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:48:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202387.357177 (Exim 4.92) (envelope-from ) id 1mXpUT-0003Q6-Jj; Tue, 05 Oct 2021 18:48:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202387.357177; Tue, 05 Oct 2021 18:48:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUT-0003Pu-GP; Tue, 05 Oct 2021 18:48:37 +0000 Received: by outflank-mailman (input) for mailman id 202387; Tue, 05 Oct 2021 18:48:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUR-0003Pd-P9 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUR-0001yh-OH for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpUR-0000pX-NT for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KN1/UsDFVdx2vUj7vUzfClw7WCkDvzEKWjLnz9TozZU=; b=C4+OF2qaRToUGiDbnzWFCAkcql EzWESUHwxQ/y/Ko8FZluKXYEcDfJYGkZyG22H50ApzC1gX6AVAWOlsH3PktZWASjmH32s6kUe7B1r z0pwxDQigIU1rDcqesE13x9DJnRCKCSAS2a96J52ika6SrveYiZfHgeeac+oZjNG8/1I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Rename cpu_boot_data to system_cpuinfo Message-Id: Date: Tue, 05 Oct 2021 18:48:35 +0000 commit 3b78e2774a00c0341e99527179715e8cffcb0f36 Author: Bertrand Marquis AuthorDate: Thu Sep 16 07:25:36 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 16 14:15:43 2021 -0700 xen/arm: Rename cpu_boot_data to system_cpuinfo As we will sanitize the content of boot_cpu_data it will not really contain the boot cpu information but the system sanitize information. Rename the structure to system_cpuinfo so the user is informed that this is the system wide available feature and not anymore the features of the boot cpu. The original boot cpu data is still available in cpu_data. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/cpufeature.c | 8 ++------ xen/arch/arm/setup.c | 34 +++++++++++++++++++--------------- xen/arch/arm/smpboot.c | 6 +++--- xen/include/asm-arm/cpufeature.h | 6 +++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 1d88783809..f600a611bd 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -169,12 +169,8 @@ void identify_cpu(struct cpuinfo_arm *c) */ static int __init create_guest_cpuinfo(void) { - /* - * TODO: The code is currently using only the features detected on the boot - * core. In the long term we should try to compute values containing only - * features supported by all cores. - */ - guest_cpuinfo = boot_cpu_data; + /* Use the sanitized cpuinfo as initial guest cpuinfo */ + guest_cpuinfo = system_cpuinfo; #ifdef CONFIG_ARM_64 /* Hide MPAM support as xen does not support it */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 5be7f2b0c2..4ab13d0fbe 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -56,7 +56,11 @@ struct bootinfo __initdata bootinfo; -struct cpuinfo_arm __read_mostly boot_cpu_data; +/* + * Sanitized version of cpuinfo containing only features available on all + * cores (only on arm64 as there is no sanitization support on arm32). + */ +struct cpuinfo_arm __read_mostly system_cpuinfo; #ifdef CONFIG_ACPI bool __read_mostly acpi_disabled; @@ -100,7 +104,7 @@ static const char * __initdata processor_implementers[] = { static void __init processor_id(void) { const char *implementer = "Unknown"; - struct cpuinfo_arm *c = &boot_cpu_data; + struct cpuinfo_arm *c = &system_cpuinfo; identify_cpu(c); current_cpu_data = *c; @@ -120,7 +124,7 @@ static void __init processor_id(void) #if defined(CONFIG_ARM_64) printk("64-bit Execution:\n"); printk(" Processor Features: %016"PRIx64" %016"PRIx64"\n", - boot_cpu_data.pfr64.bits[0], boot_cpu_data.pfr64.bits[1]); + system_cpuinfo.pfr64.bits[0], system_cpuinfo.pfr64.bits[1]); printk(" Exception Levels: EL3:%s EL2:%s EL1:%s EL0:%s\n", cpu_has_el3_32 ? "64+32" : cpu_has_el3_64 ? "64" : "No", cpu_has_el2_32 ? "64+32" : cpu_has_el2_64 ? "64" : "No", @@ -144,13 +148,13 @@ static void __init processor_id(void) boot_cpu_feature64(simd)); printk(" Debug Features: %016"PRIx64" %016"PRIx64"\n", - boot_cpu_data.dbg64.bits[0], boot_cpu_data.dbg64.bits[1]); + system_cpuinfo.dbg64.bits[0], system_cpuinfo.dbg64.bits[1]); printk(" Auxiliary Features: %016"PRIx64" %016"PRIx64"\n", - boot_cpu_data.aux64.bits[0], boot_cpu_data.aux64.bits[1]); + system_cpuinfo.aux64.bits[0], system_cpuinfo.aux64.bits[1]); printk(" Memory Model Features: %016"PRIx64" %016"PRIx64"\n", - boot_cpu_data.mm64.bits[0], boot_cpu_data.mm64.bits[1]); + system_cpuinfo.mm64.bits[0], system_cpuinfo.mm64.bits[1]); printk(" ISA Features: %016"PRIx64" %016"PRIx64"\n", - boot_cpu_data.isa64.bits[0], boot_cpu_data.isa64.bits[1]); + system_cpuinfo.isa64.bits[0], system_cpuinfo.isa64.bits[1]); #endif /* @@ -161,7 +165,7 @@ static void __init processor_id(void) { printk("32-bit Execution:\n"); printk(" Processor Features: %"PRIregister":%"PRIregister"\n", - boot_cpu_data.pfr32.bits[0], boot_cpu_data.pfr32.bits[1]); + system_cpuinfo.pfr32.bits[0], system_cpuinfo.pfr32.bits[1]); printk(" Instruction Sets:%s%s%s%s%s%s\n", cpu_has_aarch32 ? " AArch32" : "", cpu_has_arm ? " A32" : "", @@ -174,18 +178,18 @@ static void __init processor_id(void) cpu_has_security ? " Security" : ""); printk(" Debug Features: %"PRIregister"\n", - boot_cpu_data.dbg32.bits[0]); + system_cpuinfo.dbg32.bits[0]); printk(" Auxiliary Features: %"PRIregister"\n", - boot_cpu_data.aux32.bits[0]); + system_cpuinfo.aux32.bits[0]); printk(" Memory Model Features: %"PRIregister" %"PRIregister"\n" " %"PRIregister" %"PRIregister"\n", - boot_cpu_data.mm32.bits[0], boot_cpu_data.mm32.bits[1], - boot_cpu_data.mm32.bits[2], boot_cpu_data.mm32.bits[3]); + system_cpuinfo.mm32.bits[0], system_cpuinfo.mm32.bits[1], + system_cpuinfo.mm32.bits[2], system_cpuinfo.mm32.bits[3]); printk(" ISA Features: %"PRIregister" %"PRIregister" %"PRIregister"\n" " %"PRIregister" %"PRIregister" %"PRIregister"\n", - boot_cpu_data.isa32.bits[0], boot_cpu_data.isa32.bits[1], - boot_cpu_data.isa32.bits[2], boot_cpu_data.isa32.bits[3], - boot_cpu_data.isa32.bits[4], boot_cpu_data.isa32.bits[5]); + system_cpuinfo.isa32.bits[0], system_cpuinfo.isa32.bits[1], + system_cpuinfo.isa32.bits[2], system_cpuinfo.isa32.bits[3], + system_cpuinfo.isa32.bits[4], system_cpuinfo.isa32.bits[5]); } else { diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index a1ee3146ef..c9f2827d56 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -124,7 +124,7 @@ static void __init dt_smp_init_cpus(void) bool bootcpu_valid = false; int rc; - mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK; + mpidr = system_cpuinfo.mpidr.bits & MPIDR_HWID_MASK; if ( !cpus ) { @@ -319,13 +319,13 @@ void start_secondary(void) * now. */ if ( !opt_hmp_unsafe && - current_cpu_data.midr.bits != boot_cpu_data.midr.bits ) + current_cpu_data.midr.bits != system_cpuinfo.midr.bits ) { printk(XENLOG_ERR "CPU%u MIDR (0x%"PRIregister") does not match boot CPU MIDR (0x%"PRIregister"),\n" XENLOG_ERR "disable cpu (see big.LITTLE.txt under docs/).\n", smp_processor_id(), current_cpu_data.midr.bits, - boot_cpu_data.midr.bits); + system_cpuinfo.midr.bits); stop_cpu(); } diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index ba48db3eac..8f2b8e7830 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -3,7 +3,7 @@ #ifdef CONFIG_ARM_64 #define cpu_feature64(c, feat) ((c)->pfr64.feat) -#define boot_cpu_feature64(feat) (boot_cpu_data.pfr64.feat) +#define boot_cpu_feature64(feat) (system_cpuinfo.pfr64.feat) #define cpu_feature64_has_el0_32(c) (cpu_feature64(c, el0) == 2) @@ -21,7 +21,7 @@ #endif #define cpu_feature32(c, feat) ((c)->pfr32.feat) -#define boot_cpu_feature32(feat) (boot_cpu_data.pfr32.feat) +#define boot_cpu_feature32(feat) (system_cpuinfo.pfr32.feat) #define cpu_has_arm (boot_cpu_feature32(arm) == 1) #define cpu_has_thumb (boot_cpu_feature32(thumb) >= 1) @@ -326,7 +326,7 @@ struct cpuinfo_arm { } mvfr; }; -extern struct cpuinfo_arm boot_cpu_data; +extern struct cpuinfo_arm system_cpuinfo; extern void identify_cpu(struct cpuinfo_arm *); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:48:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:48:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202389.357182 (Exim 4.92) (envelope-from ) id 1mXpUd-0003TP-L9; Tue, 05 Oct 2021 18:48:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202389.357182; Tue, 05 Oct 2021 18:48:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUd-0003TF-I4; Tue, 05 Oct 2021 18:48:47 +0000 Received: by outflank-mailman (input) for mailman id 202389; Tue, 05 Oct 2021 18:48:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUb-0003Ss-SQ for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUb-0001yu-Rm for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpUb-0000qA-R3 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+KQvRa/eGCXo04jnEll4A8E0vuM/twSAWwt039mKcIk=; b=cp4A1Y8SWtrcX/fTg6X1PkfxOv bcBcaTU0imUrI4xByaZ9objfXRZAWNxbtKwamWsgLK++6dPPrN2FtKntKtRXyh8cQ6jlyhoiJVQWW nKAbX4KFpCuScNppaow1htyEUkElZybAVeri8klpvjJXyiyCrZ4EkNyaOfF4foi4dodU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Sanitize cpuinfo ID registers fields Message-Id: Date: Tue, 05 Oct 2021 18:48:45 +0000 commit 0bf9efb9ee4cc6cdafbe0a0ed1529449bb9d6825 Author: Bertrand Marquis AuthorDate: Thu Sep 16 07:25:37 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 16 14:15:44 2021 -0700 xen/arm: Sanitize cpuinfo ID registers fields Define a sanitize_cpu function to be called on secondary cores to sanitize the system cpuinfo structure. The safest value is taken when possible and the system is marked tainted if we encounter values which are incompatible with each other. Call the update_system_features function on all secondary cores that are kept running and taint the system if different midr are found between cores but hmp-unsafe=true was passed on Xen command line. This is only supported on arm64 so update_system_features is an empty static inline on arm32. The patch is adding a new TAINT_CPU_OUT_OF_SPEC to warn the user if Xen is running on a system with features differences between cores which are not supported. The patch is disabling CTR_EL0, DCZID_EL0 and ZCRusing #if 0 with a TODO as this patch is not handling sanitization of those registers. CTR_EL0/DCZID will be handled in a future patch to properly handle different cache attributes when possible. ZCR should be sanitize once we add support for SVE in Xen. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/cpufeature.c | 117 +++++++++++++++++++++++++++++++++++++++ xen/arch/arm/smpboot.c | 34 +++++++++--- xen/common/kernel.c | 6 +- xen/include/asm-arm/cpufeature.h | 9 +++ xen/include/xen/lib.h | 1 + 6 files changed, 158 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 40642ff574..701d66883d 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -1,6 +1,7 @@ obj-y += lib/ obj-y += cache.o +obj-y += cpufeature.o obj-$(CONFIG_HARDEN_BRANCH_PREDICTOR) += bpi.o obj-$(CONFIG_EARLY_PRINTK) += debug.o obj-y += domctl.o diff --git a/xen/arch/arm/arm64/cpufeature.c b/xen/arch/arm/arm64/cpufeature.c index 152086dc9d..58596495a8 100644 --- a/xen/arch/arm/arm64/cpufeature.c +++ b/xen/arch/arm/arm64/cpufeature.c @@ -275,6 +275,9 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { ARM64_FTR_END, }; +#if 0 +/* TODO: use this to sanitize the cache line size among cores */ + static const struct arm64_ftr_bits ftr_ctr[] = { ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 31, 1, 1), /* RES1 */ ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, CTR_DIC_SHIFT, 1, 1), @@ -291,6 +294,7 @@ static const struct arm64_ftr_bits ftr_ctr[] = { ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, CTR_IMINLINE_SHIFT, 4, 0), ARM64_FTR_END, }; +#endif static const struct arm64_ftr_bits ftr_id_mmfr0[] = { S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_INNERSHR_SHIFT, 4, 0xf), @@ -325,11 +329,14 @@ static const struct arm64_ftr_bits ftr_mvfr2[] = { ARM64_FTR_END, }; +#if 0 +/* TODO: handle this when sanitizing cache related registers */ static const struct arm64_ftr_bits ftr_dczid[] = { ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, DCZID_DZP_SHIFT, 1, 1), ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, DCZID_BS_SHIFT, 4, 0), ARM64_FTR_END, }; +#endif static const struct arm64_ftr_bits ftr_id_isar0[] = { ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_DIVIDE_SHIFT, 4, 0), @@ -444,11 +451,15 @@ static const struct arm64_ftr_bits ftr_id_dfr1[] = { ARM64_FTR_END, }; +#if 0 +/* TODO: use this to sanitize SVE once we support it */ + static const struct arm64_ftr_bits ftr_zcr[] = { ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ZCR_ELx_LEN_SHIFT, ZCR_ELx_LEN_SIZE, 0), /* LEN */ ARM64_FTR_END, }; +#endif /* * Common ftr bits for a 32bit register with all hidden, strict @@ -512,3 +523,109 @@ static s64 arm64_ftr_safe_value(const struct arm64_ftr_bits *ftrp, s64 new, * End of imported linux structures and code */ +static void sanitize_reg(u64 *cur_reg, u64 new_reg, const char *reg_name, + const struct arm64_ftr_bits *ftrp) +{ + int taint = 0; + u64 old_reg = *cur_reg; + + for (;ftrp->width != 0;ftrp++) + { + s64 cur_field = arm64_ftr_value(ftrp, *cur_reg); + s64 new_field = arm64_ftr_value(ftrp, new_reg); + + if (cur_field == new_field) + continue; + + if (ftrp->strict) + taint = 1; + + *cur_reg = arm64_ftr_set_value(ftrp, *cur_reg, + arm64_ftr_safe_value(ftrp, new_field, cur_field)); + } + + if (old_reg != new_reg) + printk(XENLOG_DEBUG "SANITY DIF: %s 0x%"PRIx64" -> 0x%"PRIx64"\n", + reg_name, old_reg, new_reg); + if (old_reg != *cur_reg) + printk(XENLOG_DEBUG "SANITY FIX: %s 0x%"PRIx64" -> 0x%"PRIx64"\n", + reg_name, old_reg, *cur_reg); + + if (taint) + { + printk(XENLOG_WARNING "SANITY CHECK: Unexpected variation in %s.\n", + reg_name); + add_taint(TAINT_CPU_OUT_OF_SPEC); + } +} + + +/* + * This function should be called on secondary cores to sanitize the boot cpu + * cpuinfo. + */ +void update_system_features(const struct cpuinfo_arm *new) +{ + +#define SANITIZE_REG(field, num, reg) \ + sanitize_reg(&system_cpuinfo.field.bits[num], new->field.bits[num], \ + #reg, ftr_##reg) + +#define SANITIZE_ID_REG(field, num, reg) \ + sanitize_reg(&system_cpuinfo.field.bits[num], new->field.bits[num], \ + #reg, ftr_id_##reg) + +#define SANITIZE_RAZ_REG(field, num, reg) \ + sanitize_reg(&system_cpuinfo.field.bits[num], new->field.bits[num], \ + #reg, ftr_raz) + +#define SANITIZE_GENERIC_REG(field, num, reg) \ + sanitize_reg(&system_cpuinfo.field.bits[num], new->field.bits[num], \ + #reg, ftr_generic_32bits) + + SANITIZE_ID_REG(pfr64, 0, aa64pfr0); + SANITIZE_ID_REG(pfr64, 1, aa64pfr1); + + SANITIZE_ID_REG(dbg64, 0, aa64dfr0); + SANITIZE_RAZ_REG(dbg64, 1, aa64dfr1); + + SANITIZE_ID_REG(mm64, 0, aa64mmfr0); + SANITIZE_ID_REG(mm64, 1, aa64mmfr1); + SANITIZE_ID_REG(mm64, 2, aa64mmfr2); + + SANITIZE_ID_REG(isa64, 0, aa64isar0); + SANITIZE_ID_REG(isa64, 1, aa64isar1); + + SANITIZE_ID_REG(zfr64, 0, aa64zfr0); + + if ( cpu_feature64_has_el0_32(&system_cpuinfo) ) + { + SANITIZE_ID_REG(pfr32, 0, pfr0); + SANITIZE_ID_REG(pfr32, 1, pfr1); + SANITIZE_ID_REG(pfr32, 2, pfr2); + + SANITIZE_ID_REG(dbg32, 0, dfr0); + SANITIZE_ID_REG(dbg32, 1, dfr1); + + SANITIZE_ID_REG(mm32, 0, mmfr0); + SANITIZE_GENERIC_REG(mm32, 1, mmfr1); + SANITIZE_GENERIC_REG(mm32, 2, mmfr2); + SANITIZE_GENERIC_REG(mm32, 3, mmfr3); + SANITIZE_ID_REG(mm32, 4, mmfr4); + SANITIZE_ID_REG(mm32, 5, mmfr5); + + SANITIZE_ID_REG(isa32, 0, isar0); + SANITIZE_GENERIC_REG(isa32, 1, isar1); + SANITIZE_GENERIC_REG(isa32, 2, isar2); + SANITIZE_GENERIC_REG(isa32, 3, isar3); + SANITIZE_ID_REG(isa32, 4, isar4); + SANITIZE_ID_REG(isa32, 5, isar5); + SANITIZE_ID_REG(isa32, 6, isar6); + + SANITIZE_GENERIC_REG(mvfr, 0, mvfr0); + SANITIZE_GENERIC_REG(mvfr, 1, mvfr1); +#ifndef MVFR2_MAYBE_UNDEFINED + SANITIZE_REG(mvfr, 2, mvfr2); +#endif + } +} diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index c9f2827d56..60c0e82fc5 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -318,15 +318,26 @@ void start_secondary(void) * is manually specified for all domains). Better to park them for * now. */ - if ( !opt_hmp_unsafe && - current_cpu_data.midr.bits != system_cpuinfo.midr.bits ) + if ( current_cpu_data.midr.bits != system_cpuinfo.midr.bits ) { - printk(XENLOG_ERR - "CPU%u MIDR (0x%"PRIregister") does not match boot CPU MIDR (0x%"PRIregister"),\n" - XENLOG_ERR "disable cpu (see big.LITTLE.txt under docs/).\n", - smp_processor_id(), current_cpu_data.midr.bits, - system_cpuinfo.midr.bits); - stop_cpu(); + if ( !opt_hmp_unsafe ) + { + printk(XENLOG_ERR + "CPU%u MIDR (0x%"PRIregister") does not match boot CPU MIDR (0x%"PRIregister"),\n" + XENLOG_ERR "disable cpu (see big.LITTLE.txt under docs/).\n", + smp_processor_id(), current_cpu_data.midr.bits, + system_cpuinfo.midr.bits); + stop_cpu(); + } + else + { + printk(XENLOG_ERR + "CPU%u MIDR (0x%"PRIregister") does not match boot CPU MIDR (0x%"PRIregister"),\n" + XENLOG_ERR "hmp-unsafe turned on so tainting Xen and keep core on!!\n", + smp_processor_id(), current_cpu_data.midr.bits, + system_cpuinfo.midr.bits); + add_taint(TAINT_CPU_OUT_OF_SPEC); + } } if ( dcache_line_bytes != read_dcache_line_bytes() ) @@ -337,6 +348,13 @@ void start_secondary(void) stop_cpu(); } + /* + * system features must be updated only if we do not stop the core or + * we might disable features due to a non used core (for example when + * booting on big cores on a big.LITTLE system with hmp_unsafe) + */ + update_system_features(¤t_cpu_data); + mmu_init_secondary_cpu(); gic_init_secondary_cpu(); diff --git a/xen/common/kernel.c b/xen/common/kernel.c index d77756a81e..e119e5401f 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -327,6 +327,7 @@ unsigned int tainted; * 'H' - HVM forced emulation prefix is permitted. * 'M' - Machine had a machine check experience. * 'U' - Platform is unsecure (usually due to an errata on the platform). + * 'S' - Out of spec CPU (One core has a feature incompatible with others). * * The string is overwritten by the next call to print_taint(). */ @@ -334,12 +335,13 @@ char *print_tainted(char *str) { if ( tainted ) { - snprintf(str, TAINT_STRING_MAX_LEN, "Tainted: %c%c%c%c%c", + snprintf(str, TAINT_STRING_MAX_LEN, "Tainted: %c%c%c%c%c%c", tainted & TAINT_MACHINE_UNSECURE ? 'U' : ' ', tainted & TAINT_MACHINE_CHECK ? 'M' : ' ', tainted & TAINT_SYNC_CONSOLE ? 'C' : ' ', tainted & TAINT_ERROR_INJECT ? 'E' : ' ', - tainted & TAINT_HVM_FEP ? 'H' : ' '); + tainted & TAINT_HVM_FEP ? 'H' : ' ', + tainted & TAINT_CPU_OUT_OF_SPEC ? 'S' : ' '); } else { diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 8f2b8e7830..52cb3133e0 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -330,6 +330,15 @@ extern struct cpuinfo_arm system_cpuinfo; extern void identify_cpu(struct cpuinfo_arm *); +#ifdef CONFIG_ARM_64 +extern void update_system_features(const struct cpuinfo_arm *); +#else +static inline void update_system_features(const struct cpuinfo_arm *cpuinfo) +{ + /* Not supported on arm32 */ +} +#endif + extern struct cpuinfo_arm cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 1198c7c0b2..c6987973bf 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -192,6 +192,7 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c); #define TAINT_ERROR_INJECT (1u << 2) #define TAINT_HVM_FEP (1u << 3) #define TAINT_MACHINE_UNSECURE (1u << 4) +#define TAINT_CPU_OUT_OF_SPEC (1u << 5) extern unsigned int tainted; #define TAINT_STRING_MAX_LEN 20 extern char *print_tainted(char *str); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:48:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:48:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202390.357187 (Exim 4.92) (envelope-from ) id 1mXpUn-0003Wc-N9; Tue, 05 Oct 2021 18:48:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202390.357187; Tue, 05 Oct 2021 18:48:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUn-0003WQ-Jd; Tue, 05 Oct 2021 18:48:57 +0000 Received: by outflank-mailman (input) for mailman id 202390; Tue, 05 Oct 2021 18:48:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUl-0003WB-Vk for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUl-0001z3-Ux for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpUl-0000qj-UD for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:48:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pM4BhYOv2ny8EKM+43HugJcmjsvdBEJTioHUZethsvI=; b=Tg1l/4NRS3JelU+/KXEXk5zk+/ 8p9q8j5nqS4/7O2Hze2VOexPP2ih3iw9kEt9logn+ifac5JHc7CPi999DMXVyHaoQexS1y2t+CdXi K+3P6twTsj0YuJnW7nDAImW+S0ER5tgeRiQX1lhMS2pJ0Q32l8MLKtN7pROavc5wEVn8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Use sanitize values for p2m Message-Id: Date: Tue, 05 Oct 2021 18:48:55 +0000 commit 442d54c4459236bdb7379f89a8ebe7e7dcb4d1de Author: Bertrand Marquis AuthorDate: Thu Sep 16 07:25:38 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 16 14:15:50 2021 -0700 xen/arm: Use sanitize values for p2m Replace the code in p2m trying to find a sane value for the VMID size supported and the PAR to use. We are now using the boot cpuinfo as the values there are sanitized during boot and the value for those parameters is now the safest possible value on the system. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/p2m.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 6e01e83967..8b20b43077 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -2042,31 +2042,21 @@ void __init setup_virt_paging(void) [7] = { 0 } /* Invalid */ }; - unsigned int i, cpu; + unsigned int i; unsigned int pa_range = 0x10; /* Larger than any possible value */ - bool vmid_8_bit = false; - - for_each_online_cpu ( cpu ) - { - const struct cpuinfo_arm *info = &cpu_data[cpu]; - /* - * Restrict "p2m_ipa_bits" if needed. As P2M table is always configured - * with IPA bits == PA bits, compare against "pabits". - */ - if ( pa_range_info[info->mm64.pa_range].pabits < p2m_ipa_bits ) - p2m_ipa_bits = pa_range_info[info->mm64.pa_range].pabits; - - /* Set a flag if the current cpu does not support 16 bit VMIDs. */ - if ( info->mm64.vmid_bits != MM64_VMID_16_BITS_SUPPORT ) - vmid_8_bit = true; - } + /* + * Restrict "p2m_ipa_bits" if needed. As P2M table is always configured + * with IPA bits == PA bits, compare against "pabits". + */ + if ( pa_range_info[system_cpuinfo.mm64.pa_range].pabits < p2m_ipa_bits ) + p2m_ipa_bits = pa_range_info[system_cpuinfo.mm64.pa_range].pabits; /* - * If the flag is not set then it means all CPUs support 16-bit - * VMIDs. + * cpu info sanitization made sure we support 16bits VMID only if all + * cores are supporting it. */ - if ( !vmid_8_bit ) + if ( system_cpuinfo.mm64.vmid_bits == MM64_VMID_16_BITS_SUPPORT ) max_vmid = MAX_VMID_16_BIT; /* Choose suitable "pa_range" according to the resulted "p2m_ipa_bits". */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:49:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:49:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202392.357190 (Exim 4.92) (envelope-from ) id 1mXpUx-0003ZT-O4; Tue, 05 Oct 2021 18:49:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202392.357190; Tue, 05 Oct 2021 18:49:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUx-0003ZL-LG; Tue, 05 Oct 2021 18:49:07 +0000 Received: by outflank-mailman (input) for mailman id 202392; Tue, 05 Oct 2021 18:49:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUw-0003Yx-2m for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpUw-0001zU-1w for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpUw-0000rb-16 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=L3IIRUYzgg2hpdbBEzGpvybfU/z+xIGPHk+g5dqhTzE=; b=VXFkAwRRzsgRPdhpmZ4dvGnOxt 5ZsX6+4Q9CJnh4/VOjzKcoRCMmQP7qRCX3z/Ian+Qcahbt3o4ygT/vGLDVMPNV8rStpuybUqgZIAp 1UjSLw5JxoOb85P2uQO4LNURD5K8KQwayRhy8ae5kvupEUsD/2juG2RabbFPi8rXUQro=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Taint Xen on incompatible DCZID values Message-Id: Date: Tue, 05 Oct 2021 18:49:06 +0000 commit ef17eb9d3a89bea120ba3949b73cd482c6173648 Author: Bertrand Marquis AuthorDate: Thu Sep 16 07:25:39 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 16 14:15:51 2021 -0700 xen/arm: Taint Xen on incompatible DCZID values Use arm64 cpu feature sanitization to TAINT Xen if different DCZID values are found (ftr_dczid is using only STRICT method). In this case actual memory being cleaned by DC ZVA operations would be different depending on the cores which could make a guest zeroing too much or too little memory if it is merged between CPUs. We could, on processors supporting it, trap access to DCZID_EL0 register using HFGRTR_EL2 register but this would not solve the case where a process is being migrated during a copy or if it cached the value of the register. Signed-off-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/cpufeature.c | 14 +++++++++++--- xen/arch/arm/cpufeature.c | 2 ++ xen/include/asm-arm/cpufeature.h | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/arm64/cpufeature.c b/xen/arch/arm/arm64/cpufeature.c index 58596495a8..d4679f5df3 100644 --- a/xen/arch/arm/arm64/cpufeature.c +++ b/xen/arch/arm/arm64/cpufeature.c @@ -329,14 +329,11 @@ static const struct arm64_ftr_bits ftr_mvfr2[] = { ARM64_FTR_END, }; -#if 0 -/* TODO: handle this when sanitizing cache related registers */ static const struct arm64_ftr_bits ftr_dczid[] = { ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, DCZID_DZP_SHIFT, 1, 1), ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, DCZID_BS_SHIFT, 4, 0), ARM64_FTR_END, }; -#endif static const struct arm64_ftr_bits ftr_id_isar0[] = { ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR0_DIVIDE_SHIFT, 4, 0), @@ -598,6 +595,17 @@ void update_system_features(const struct cpuinfo_arm *new) SANITIZE_ID_REG(zfr64, 0, aa64zfr0); + /* + * Comment from Linux: + * Userspace may perform DC ZVA instructions. Mismatched block sizes + * could result in too much or too little memory being zeroed if a + * process is preempted and migrated between CPUs. + * + * ftr_dczid is using STRICT comparison so we will taint Xen if different + * values are found. + */ + SANITIZE_REG(dczid, 0, dczid); + if ( cpu_feature64_has_el0_32(&system_cpuinfo) ) { SANITIZE_ID_REG(pfr32, 0, pfr0); diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index f600a611bd..113f20f601 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -125,6 +125,8 @@ void identify_cpu(struct cpuinfo_arm *c) c->zfr64.bits[0] = READ_SYSREG(ID_AA64ZFR0_EL1); + c->dczid.bits[0] = READ_SYSREG(DCZID_EL0); + aarch32_el0 = cpu_feature64_has_el0_32(c); #endif diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 52cb3133e0..5219fd3bab 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -259,6 +259,14 @@ struct cpuinfo_arm { register_t bits[1]; } zfr64; + /* + * DCZID is only used to check for incoherent values between cores + * and taint Xen in this case + */ + struct { + register_t bits[1]; + } dczid; + #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:49:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:49:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202393.357195 (Exim 4.92) (envelope-from ) id 1mXpV7-0003cM-Ri; Tue, 05 Oct 2021 18:49:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202393.357195; Tue, 05 Oct 2021 18:49:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpV7-0003cE-OB; Tue, 05 Oct 2021 18:49:17 +0000 Received: by outflank-mailman (input) for mailman id 202393; Tue, 05 Oct 2021 18:49:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpV6-0003c0-5i for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpV6-0001zy-52 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpV6-0000sC-4Q for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=b+YCuep46eG4JNZGmMLy8TB2K7lQZfOi/qQkwkIOwiQ=; b=5vDvmsCXM1OebjzipgI5XYYlkB pN7V49k5cBxz5p6nldPlz9tHAIImWYJWHxdrmZuye74mGJHMsSc5tstefVHf81Az6RAn5wVBsGLlt z3c5TMpaJjG3B0c8B6E6FiDzzTtVxdicc4CoPl5APEKlRiBV/UFxrio/XudGl5d2jL6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Sanitize CTR_EL0 Message-Id: Date: Tue, 05 Oct 2021 18:49:16 +0000 commit 98f176b62b6136f696da88032f9c12a244ac9aed Author: Bertrand Marquis AuthorDate: Thu Sep 16 07:25:40 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 16 14:15:52 2021 -0700 xen/arm: Sanitize CTR_EL0 Sanitize CTR_EL0 value between cores and taint Xen if incompatible values are found. In the case of different i-cache types, the sanitize ctr_el0 will have a sanitize value but this is currently not used or exposed to guest which are seeing the original ctr_el0 value. Use the opportunity to rename CTR_L1Ip to use an upper case name like Linux does. The patch is also defining ICACHE_POLICY_xxx instead of only having CTR_L1IP_xxx to sync the definitions with Linux and is updating the code using those accordingly (arm32 setup). On platforms with only the same type of cores, this patch should not modify the current Xen behaviour. Signed-off-by: Bertrand Marquis Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/cpufeature.c | 6 ++---- xen/arch/arm/cpufeature.c | 2 ++ xen/arch/arm/setup.c | 2 +- xen/include/asm-arm/cpufeature.h | 8 ++++++++ xen/include/asm-arm/processor.h | 18 +++++++++++++++--- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm64/cpufeature.c b/xen/arch/arm/arm64/cpufeature.c index d4679f5df3..6e5d30dc7b 100644 --- a/xen/arch/arm/arm64/cpufeature.c +++ b/xen/arch/arm/arm64/cpufeature.c @@ -275,9 +275,6 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { ARM64_FTR_END, }; -#if 0 -/* TODO: use this to sanitize the cache line size among cores */ - static const struct arm64_ftr_bits ftr_ctr[] = { ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 31, 1, 1), /* RES1 */ ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, CTR_DIC_SHIFT, 1, 1), @@ -294,7 +291,6 @@ static const struct arm64_ftr_bits ftr_ctr[] = { ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, CTR_IMINLINE_SHIFT, 4, 0), ARM64_FTR_END, }; -#endif static const struct arm64_ftr_bits ftr_id_mmfr0[] = { S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR0_INNERSHR_SHIFT, 4, 0xf), @@ -606,6 +602,8 @@ void update_system_features(const struct cpuinfo_arm *new) */ SANITIZE_REG(dczid, 0, dczid); + SANITIZE_REG(ctr, 0, ctr); + if ( cpu_feature64_has_el0_32(&system_cpuinfo) ) { SANITIZE_ID_REG(pfr32, 0, pfr0); diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 113f20f601..6e51f530a8 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -127,6 +127,8 @@ void identify_cpu(struct cpuinfo_arm *c) c->dczid.bits[0] = READ_SYSREG(DCZID_EL0); + c->ctr.bits[0] = READ_SYSREG(CTR_EL0); + aarch32_el0 = cpu_feature64_has_el0_32(c); #endif diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 4ab13d0fbe..49dc90d198 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -650,7 +650,7 @@ static void __init setup_mm(void) panic("No memory bank\n"); /* We only supports instruction caches implementing the IVIPT extension. */ - if ( ((ctr >> CTR_L1Ip_SHIFT) & CTR_L1Ip_MASK) == CTR_L1Ip_AIVIVT ) + if ( ((ctr >> CTR_L1IP_SHIFT) & CTR_L1IP_MASK) == ICACHE_POLICY_AIVIVT ) panic("AIVIVT instruction cache not supported\n"); init_pdx(); diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 5219fd3bab..5ca09b0bff 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -267,6 +267,14 @@ struct cpuinfo_arm { register_t bits[1]; } dczid; + /* + * CTR is only used to check for different cache types or policies and + * taint Xen in this case + */ + struct { + register_t bits[1]; + } ctr; + #endif /* diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 2058b69447..8ab2940f68 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -7,9 +7,21 @@ #include /* CTR Cache Type Register */ -#define CTR_L1Ip_MASK 0x3 -#define CTR_L1Ip_SHIFT 14 -#define CTR_L1Ip_AIVIVT 0x1 +#define CTR_L1IP_MASK 0x3 +#define CTR_L1IP_SHIFT 14 +#define CTR_DMINLINE_SHIFT 16 +#define CTR_IMINLINE_SHIFT 0 +#define CTR_IMINLINE_MASK 0xf +#define CTR_ERG_SHIFT 20 +#define CTR_CWG_SHIFT 24 +#define CTR_CWG_MASK 15 +#define CTR_IDC_SHIFT 28 +#define CTR_DIC_SHIFT 29 + +#define ICACHE_POLICY_VPIPT 0 +#define ICACHE_POLICY_AIVIVT 1 +#define ICACHE_POLICY_VIPT 2 +#define ICACHE_POLICY_PIPT 3 /* MIDR Main ID Register */ #define MIDR_REVISION_MASK 0xf -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:49:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:49:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202394.357198 (Exim 4.92) (envelope-from ) id 1mXpVH-0003fC-Sm; Tue, 05 Oct 2021 18:49:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202394.357198; Tue, 05 Oct 2021 18:49:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVH-0003f4-Pp; Tue, 05 Oct 2021 18:49:27 +0000 Received: by outflank-mailman (input) for mailman id 202394; Tue, 05 Oct 2021 18:49:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVG-0003eq-9H for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVG-00020D-8a for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpVG-0000sp-7l for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6ZVAR6+FwiaY9rm0X88e8wM/G9mshopQ1kADvMh5Lhg=; b=owoeR9zfwIx0RoOlOY84giNX4D BvTXEtPa9L4s9HTi3hE267MbciMPYBmfSacqtUbU2Hxyv82vvO3vMZY5KoEY/eLq1QFNiQ9WhYieH +25DPN/ZKO0txb+VEJaWCSI4S/qogZGLRcGqtApaRFqpvoy/6Zb31azaBr7c7ocBTrhA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/amd: Introduce and use X86_BUG_NULL_SEG Message-Id: Date: Tue, 05 Oct 2021 18:49:26 +0000 commit 48a160f46251f9752bd39a854ca74d80fbbbe90c Author: Andrew Cooper AuthorDate: Thu Dec 27 15:13:58 2018 +0000 Commit: Andrew Cooper CommitDate: Fri Sep 17 13:27:06 2021 +0100 x86/amd: Introduce and use X86_BUG_NULL_SEG AMD/Hygon processors before the Zen2 microarchitecture don't clear the base or limit fields when loading a NULL segment. Express the logic in terms of cpu_bug_null_seg, and adjust the workaround in do_set_segment_base(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 7 +++++++ xen/arch/x86/cpu/hygon.c | 7 +++++++ xen/arch/x86/pv/misc-hypercalls.c | 3 +-- xen/include/asm-x86/cpufeature.h | 1 + xen/include/asm-x86/cpufeatures.h | 1 + 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index c4d84373a7..f87484b7ce 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -801,6 +801,13 @@ static void init_amd(struct cpuinfo_x86 *c) c->x86 == 0x17) detect_zen2_null_seg_behaviour(); + /* + * AMD CPUs before Zen2 don't clear segment bases/limits when loading + * a NULL selector. + */ + if (c == &boot_cpu_data && !cpu_has_nscb) + setup_force_cpu_cap(X86_BUG_NULL_SEG); + /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) __set_bit(X86_FEATURE_MFENCE_RDTSC, c->x86_capability); diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 429d6601fc..cdc94130dd 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -40,6 +40,13 @@ static void init_hygon(struct cpuinfo_x86 *c) c->x86 == 0x18) detect_zen2_null_seg_behaviour(); + /* + * Hygon CPUs before Zen2 don't clear segment bases/limits when + * loading a NULL selector. + */ + if (c == &boot_cpu_data && !cpu_has_nscb) + setup_force_cpu_cap(X86_BUG_NULL_SEG); + /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) __set_bit(X86_FEATURE_MFENCE_RDTSC, c->x86_capability); diff --git a/xen/arch/x86/pv/misc-hypercalls.c b/xen/arch/x86/pv/misc-hypercalls.c index 3a4e4aa460..5dade24726 100644 --- a/xen/arch/x86/pv/misc-hypercalls.c +++ b/xen/arch/x86/pv/misc-hypercalls.c @@ -227,8 +227,7 @@ long do_set_segment_base(unsigned int which, unsigned long base) if ( sel > 3 ) /* Fix up RPL for non-NUL selectors. */ sel |= 3; - else if ( boot_cpu_data.x86_vendor & - (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) + else if ( cpu_bug_null_seg ) /* Work around NUL segment behaviour on AMD hardware. */ asm volatile ( "mov %[sel], %%gs" :: [sel] "r" (FLAT_USER_DS32) ); diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 94a485f99c..802d9257b0 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -159,6 +159,7 @@ /* Bugs. */ #define cpu_bug_fpu_ptrs boot_cpu_has(X86_BUG_FPU_PTRS) +#define cpu_bug_null_seg boot_cpu_has(X86_BUG_NULL_SEG) enum _cache_type { CACHE_TYPE_NULL = 0, diff --git a/xen/include/asm-x86/cpufeatures.h b/xen/include/asm-x86/cpufeatures.h index 6c8f432aee..72beb7babc 100644 --- a/xen/include/asm-x86/cpufeatures.h +++ b/xen/include/asm-x86/cpufeatures.h @@ -45,6 +45,7 @@ XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks * #define X86_BUG(x) ((FSCAPINTS + X86_NR_SYNTH) * 32 + (x)) #define X86_BUG_FPU_PTRS X86_BUG( 0) /* (F)X{SAVE,RSTOR} doesn't save/restore FOP/FIP/FDP. */ +#define X86_BUG_NULL_SEG X86_BUG( 1) /* NULL-ing a selector preserves the base and limit. */ /* Total number of capability words, inc synth and bug words. */ #define NCAPINTS (FSCAPINTS + X86_NR_SYNTH + X86_NR_BUG) /* N 32-bit words worth of info */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:49:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:49:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202395.357202 (Exim 4.92) (envelope-from ) id 1mXpVR-0003iM-U5; Tue, 05 Oct 2021 18:49:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202395.357202; Tue, 05 Oct 2021 18:49:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVR-0003iE-RF; Tue, 05 Oct 2021 18:49:37 +0000 Received: by outflank-mailman (input) for mailman id 202395; Tue, 05 Oct 2021 18:49:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVQ-0003hw-Cl for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVQ-00020O-C4 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpVQ-0000tO-BE for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=s/RCkGr1HYdh0Zj61BwDWQ0Y+Ju3hYIqIBVn3pDO7SE=; b=ZCfaR+LSWO1F6Icwb5RnqzVwfN klRPCRQ9UYNURz5zIKlf0Z48+WhLWwiNT5Vovlp0gsp1j8wTKxKNB90ICDEeX+Z3mwO2kHkT9ydmW OquUgy9D2p9u08btESG/T8OCsj+7fvGP+a3mjp7aHJYDJIT2TSBaqRYO37aKZJA3M7Cw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] modify acquire_domstatic_pages to take an unsigned int size parameter Message-Id: Date: Tue, 05 Oct 2021 18:49:36 +0000 commit 437e88417bdea0d5cd012fe9d69a3e0f8a0c13e8 Author: Stefano Stabellini AuthorDate: Thu Sep 16 13:47:11 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Sep 17 12:04:40 2021 -0700 modify acquire_domstatic_pages to take an unsigned int size parameter acquire_domstatic_pages currently takes an unsigned long nr_mfns parameter, but actually it cannot handle anything larger than an unsigned int nr_mfns. That's because acquire_domstatic_pages is based on assign_pages which also takes an unsigned int nr parameter. So modify the nr_mfns parameter of acquire_domstatic_pages to be unsigned int. There is only one caller in xen/arch/arm/domain_build.c:allocate_static_memory. Check that the value to be passed to acquire_domstatic_pages is no larger than UINT_MAX. If it is, print an error and goto fail. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/arch/arm/domain_build.c | 6 ++++++ xen/common/page_alloc.c | 2 +- xen/include/xen/mm.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 62ab7d0ead..d233d634c1 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -554,6 +554,12 @@ static void __init allocate_static_memory(struct domain *d, device_tree_get_reg(&cell, addr_cells, size_cells, &pbase, &psize); ASSERT(IS_ALIGNED(pbase, PAGE_SIZE) && IS_ALIGNED(psize, PAGE_SIZE)); + if ( PFN_DOWN(psize) > UINT_MAX ) + { + printk(XENLOG_ERR "%pd: static memory size too large: %#"PRIpaddr, + d, psize); + goto fail; + } smfn = maddr_to_mfn(pbase); res = acquire_domstatic_pages(d, smfn, PFN_DOWN(psize), 0); if ( res ) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b9441cb06f..b64c07ae92 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2714,7 +2714,7 @@ static struct page_info * __init acquire_staticmem_pages(mfn_t smfn, * then assign them to one specific domain #d. */ int __init acquire_domstatic_pages(struct domain *d, mfn_t smfn, - unsigned long nr_mfns, unsigned int memflags) + unsigned int nr_mfns, unsigned int memflags) { struct page_info *pg; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index dd49237e86..5db26ed477 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -89,7 +89,7 @@ bool scrub_free_pages(void); /* These functions are for static memory */ void free_staticmem_pages(struct page_info *pg, unsigned long nr_mfns, bool need_scrub); -int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned long nr_mfns, +int acquire_domstatic_pages(struct domain *d, mfn_t smfn, unsigned int nr_mfns, unsigned int memflags); #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:49:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:49:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202397.357208 (Exim 4.92) (envelope-from ) id 1mXpVc-0003lO-06; Tue, 05 Oct 2021 18:49:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202397.357208; Tue, 05 Oct 2021 18:49:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVb-0003lG-SY; Tue, 05 Oct 2021 18:49:47 +0000 Received: by outflank-mailman (input) for mailman id 202397; Tue, 05 Oct 2021 18:49:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVa-0003ky-Fk for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVa-00020a-F7 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpVa-0000u6-ET for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZlbLMqHo2rLiw3bWRwujzeyIPH9W9wpNLdxcTvnMFB0=; b=tcdgFsCGDA47QdxCG+sCkwo8s0 T4J6bwsYCjBU9fIH/dFz8vMfQOLYK9NIjzioXp4BBuKEZZdIYi/Ef+74moVmn1mMW0vpKmkagz5Lr leZhB/2kTHoSiAAWnzcGO4EMS4Jq1FK7e6OhiqbqT3yUzk3WqJhnMF9CvsRNw6bFXJvQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] page-alloc: further adjust assign_page{,s}() Message-Id: Date: Tue, 05 Oct 2021 18:49:46 +0000 commit da2c65815c062fd012b7b77eee76be0905eb29f6 Author: Jan Beulich AuthorDate: Mon Sep 20 10:23:08 2021 +0200 Commit: Jan Beulich CommitDate: Mon Sep 20 10:23:08 2021 +0200 page-alloc: further adjust assign_page{,s}() The on-commit editing of 5260e8fb93f0 ("xen: re-define assign_pages and introduce a new function assign_page") didn't go quite far enough: A local variable and a function argument also would have wanted adjusting. Signed-off-by: Jan Beulich Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/common/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b64c07ae92..6142c7bb6a 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2269,7 +2269,7 @@ int assign_pages( unsigned int memflags) { int rc = 0; - unsigned long i; + unsigned int i; spin_lock(&d->page_alloc_lock); @@ -2339,7 +2339,7 @@ int assign_pages( int assign_page(struct page_info *pg, unsigned int order, struct domain *d, unsigned int memflags) { - return assign_pages(pg, 1UL << order, d, memflags); + return assign_pages(pg, 1U << order, d, memflags); } struct page_info *alloc_domheap_pages( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:49:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:49:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202398.357210 (Exim 4.92) (envelope-from ) id 1mXpVm-0003oc-0o; Tue, 05 Oct 2021 18:49:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202398.357210; Tue, 05 Oct 2021 18:49:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVl-0003oU-U2; Tue, 05 Oct 2021 18:49:57 +0000 Received: by outflank-mailman (input) for mailman id 202398; Tue, 05 Oct 2021 18:49:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVk-0003oI-J8 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVk-00020k-IN for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpVk-0000uw-Hg for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:49:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VmXecRp4S9mqx+ozM9FQ9kY0XRscbQRfHzou+h0QnwQ=; b=5+O4Q8mBxOVK0/ZlHmJXN9F81U P7BgwenLWoKCBT9q2liYxQ3kzjLU+w0zoOOzpzKRK9ciVgqvWpPQn9O2EoCd7IYhhGKUMqi129aS9 WjFdA5GaMqzjk/AqoUUbGmtJRe3rrQy690aAKSyaemdWDhP/l5K1RZbrypBHys+ZvEJs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: consider hidden devices when unmapping Message-Id: Date: Tue, 05 Oct 2021 18:49:56 +0000 commit 75bfe6ec4844f83b300b9807bceaed1e2fe23270 Author: Jan Beulich AuthorDate: Mon Sep 20 10:24:27 2021 +0200 Commit: Jan Beulich CommitDate: Mon Sep 20 10:24:27 2021 +0200 VT-d: consider hidden devices when unmapping Whether to clear an IOMMU's bit in the domain's bitmap should depend on all devices the domain can control. For the hardware domain this includes hidden devices, which are associated with DomXEN. While touching related logic - convert the "current device" exclusion check to a simple pointer comparison, - convert "found" to "bool", - adjust style and correct a typo in an existing comment. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 48 ++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index aeb1dddc88..859e6ddf62 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1650,6 +1650,27 @@ int domain_context_unmap_one( return rc; } +static bool any_pdev_behind_iommu(const struct domain *d, + const struct pci_dev *exclude, + const struct vtd_iommu *iommu) +{ + const struct pci_dev *pdev; + + for_each_pdev ( d, pdev ) + { + const struct acpi_drhd_unit *drhd; + + if ( pdev == exclude ) + continue; + + drhd = acpi_find_matched_drhd_unit(pdev); + if ( drhd && drhd->iommu == iommu ) + return true; + } + + return false; +} + static int domain_context_unmap(struct domain *domain, u8 devfn, struct pci_dev *pdev) { @@ -1657,7 +1678,7 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct vtd_iommu *iommu = drhd ? drhd->iommu : NULL; int ret; u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; - int found = 0; + bool found; switch ( pdev->type ) { @@ -1737,23 +1758,18 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, return ret; /* - * if no other devices under the same iommu owned by this domain, - * clear iommu in iommu_bitmap and clear domain_id in domid_bitmp + * If no other devices under the same iommu owned by this domain, + * clear iommu in iommu_bitmap and clear domain_id in domid_bitmap. */ - for_each_pdev ( domain, pdev ) - { - if ( pdev->seg == seg && pdev->bus == bus && pdev->devfn == devfn ) - continue; - - drhd = acpi_find_matched_drhd_unit(pdev); - if ( drhd && drhd->iommu == iommu ) - { - found = 1; - break; - } - } + found = any_pdev_behind_iommu(domain, pdev, iommu); + /* + * Hidden devices are associated with DomXEN but usable by the hardware + * domain. Hence they need considering here as well. + */ + if ( !found && is_hardware_domain(domain) ) + found = any_pdev_behind_iommu(dom_xen, pdev, iommu); - if ( found == 0 ) + if ( !found ) { clear_bit(iommu->index, &dom_iommu(domain)->arch.vtd.iommu_bitmap); cleanup_domid_map(domain, iommu); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:50:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:50:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202399.357214 (Exim 4.92) (envelope-from ) id 1mXpVw-0004Zl-35; Tue, 05 Oct 2021 18:50:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202399.357214; Tue, 05 Oct 2021 18:50:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVv-0004Zd-VW; Tue, 05 Oct 2021 18:50:07 +0000 Received: by outflank-mailman (input) for mailman id 202399; Tue, 05 Oct 2021 18:50:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVu-0004ZT-MS for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpVu-000218-Lm for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpVu-0000vz-Ky for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wNl504rVjJQzMEq9ZACSrcUt7wGJTCUgQNb9WupVpW0=; b=nw9HsORE5oE/cpqcQNkGtnOpKV dUvgaxglZMFvsIWywab5qSamPkZlj6XivteyW4pIX+0axNdc1CVlJIkkSxP3USqpkRmLN5/4O9cR1 evmU+2fplbq1NmEtXUYKf+NglLGC/V49Nj3ldeTG9kmLSaBjDI14lUCLGRW4qhatmngU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: PCI segment numbers are up to 16 bits wide Message-Id: Date: Tue, 05 Oct 2021 18:50:06 +0000 commit a3dd33e63c2c8c51102f223e6efe2e3d3bdcbec1 Author: Jan Beulich AuthorDate: Mon Sep 20 10:25:03 2021 +0200 Commit: Jan Beulich CommitDate: Mon Sep 20 10:25:03 2021 +0200 VT-d: PCI segment numbers are up to 16 bits wide We shouldn't silently truncate respective values. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 859e6ddf62..611c22fd52 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1462,7 +1462,8 @@ static int domain_context_mapping(struct domain *domain, u8 devfn, { const struct acpi_drhd_unit *drhd = acpi_find_matched_drhd_unit(pdev); int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, secbus; /* * Generally we assume only devices from one node to get assigned to a @@ -1677,7 +1678,8 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, const struct acpi_drhd_unit *drhd = acpi_find_matched_drhd_unit(pdev); struct vtd_iommu *iommu = drhd ? drhd->iommu : NULL; int ret; - u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, tmp_bus, tmp_devfn, secbus; bool found; switch ( pdev->type ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:50:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:50:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202400.357218 (Exim 4.92) (envelope-from ) id 1mXpW5-0004cz-5T; Tue, 05 Oct 2021 18:50:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202400.357218; Tue, 05 Oct 2021 18:50:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpW5-0004cr-2b; Tue, 05 Oct 2021 18:50:17 +0000 Received: by outflank-mailman (input) for mailman id 202400; Tue, 05 Oct 2021 18:50:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpW4-0004cl-QG for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpW4-00021Z-PR for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpW4-0000we-OZ for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ov8EBrtMVQvwcq2x0MonDrRdI6hpHwUtbHoM8s1LmRM=; b=udzfwT8shK603yoS1WTpg7IGLk pD5XLhA2+LvkrSgEJpT07dpljG0pb9LMaamf6Qc5jorq0CrRqMruSf+6vgNxUQHc3cdi6lUDihDFV n6v5HWv+APajPc7oXy7x3ReORT9oxC3TqhVZKw0m8z2fn7tcPuT0pMOWqHn++nufUgTw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Reduce stack usage from HVMTRACE_ND() Message-Id: Date: Tue, 05 Oct 2021 18:50:16 +0000 commit e083d753924b954f0185b907001de411a03ca495 Author: Andrew Cooper AuthorDate: Wed Sep 15 17:04:00 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 21 19:41:12 2021 +0100 x86/hvm: Reduce stack usage from HVMTRACE_ND() It is pointless to write all 6 entries and only consume the useful subset. bloat-o-meter shows quite how obscene the overhead is in vmx_vmexit_handler(), weighing in at 12% of the function arranging unread zeroes on the stack, and 8% for svm_vmexit_handler(). add/remove: 0/0 grow/shrink: 0/20 up/down: 0/-1929 (-1929) Function old new delta hvm_msr_write_intercept 1049 1033 -16 vmx_enable_intr_window 238 214 -24 svm_enable_intr_window 337 313 -24 hvmemul_write_xcr 115 91 -24 hvmemul_write_cr 350 326 -24 hvmemul_read_xcr 115 91 -24 hvmemul_read_cr 146 122 -24 hvm_mov_to_cr 438 414 -24 hvm_mov_from_cr 253 229 -24 vmx_intr_assist 1150 1118 -32 svm_intr_assist 459 427 -32 hvm_rdtsc_intercept 138 106 -32 hvm_msr_read_intercept 898 866 -32 vmx_vmenter_helper 1142 1094 -48 vmx_inject_event 813 765 -48 svm_vmenter_helper 238 187 -51 hvm_hlt 197 146 -51 svm_inject_event 1678 1614 -64 svm_vmexit_handler 5880 5392 -488 vmx_vmexit_handler 7281 6438 -843 Total: Before=3644277, After=3642348, chg -0.05% Adjust all users of HVMTRACE_ND(), using TRC_PAR_LONG() where appropriate instead of opencoding it. The 0 case needs a little help. All object in C must have a unique address and _d is passed by pointer. Explicitly permit the optimiser to drop the array. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 8 +++----- xen/arch/x86/hvm/vmx/vmx.c | 9 ++++----- xen/include/asm-x86/hvm/trace.h | 28 ++++++++++------------------ 3 files changed, 17 insertions(+), 28 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index afb1ccb342..f0e10dec04 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1052,7 +1052,7 @@ void svm_vmenter_helper(const struct cpu_user_regs *regs) if ( unlikely(tb_init_done) ) HVMTRACE_ND(VMENTRY, nestedhvm_vcpu_in_guestmode(curr) ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0); + 1/*cycles*/); svm_sync_vmcb(curr, vmcb_needs_vmsave); @@ -2565,12 +2565,10 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) if ( hvm_long_mode_active(v) ) HVMTRACE_ND(VMEXIT64, vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/, 3, exit_reason, - regs->eip, regs->rip >> 32, 0, 0, 0); + 1/*cycles*/, exit_reason, TRC_PAR_LONG(regs->rip)); else HVMTRACE_ND(VMEXIT, vcpu_guestmode ? TRC_HVM_NESTEDFLAG : 0, - 1/*cycles*/, 2, exit_reason, - regs->eip, 0, 0, 0, 0); + 1/*cycles*/, exit_reason, regs->eip); if ( vcpu_guestmode ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b0a42d05f8..d403e2d806 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3864,11 +3864,10 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) __vmread(VM_EXIT_REASON, &exit_reason); if ( hvm_long_mode_active(v) ) - HVMTRACE_ND(VMEXIT64, 0, 1/*cycles*/, 3, exit_reason, - regs->eip, regs->rip >> 32, 0, 0, 0); + HVMTRACE_ND(VMEXIT64, 0, 1/*cycles*/, exit_reason, + TRC_PAR_LONG(regs->rip)); else - HVMTRACE_ND(VMEXIT, 0, 1/*cycles*/, 2, exit_reason, - regs->eip, 0, 0, 0, 0); + HVMTRACE_ND(VMEXIT, 0, 1/*cycles*/, exit_reason, regs->eip); perfc_incra(vmexits, exit_reason); @@ -4645,7 +4644,7 @@ bool vmx_vmenter_helper(const struct cpu_user_regs *regs) if ( unlikely(curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_MASK) ) lbr_fixup(); - HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0); + HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/); __vmwrite(GUEST_RIP, regs->rip); __vmwrite(GUEST_RSP, regs->rsp); diff --git a/xen/include/asm-x86/hvm/trace.h b/xen/include/asm-x86/hvm/trace.h index 5cd459b855..145b59f6ac 100644 --- a/xen/include/asm-x86/hvm/trace.h +++ b/xen/include/asm-x86/hvm/trace.h @@ -67,38 +67,30 @@ #define TRACE_2_LONG_4D(_e, d1, d2, d3, d4, ...) \ TRACE_6D(_e, d1, d2, d3, d4) -#define HVMTRACE_ND(evt, modifier, cycles, count, d1, d2, d3, d4, d5, d6) \ +#define HVMTRACE_ND(evt, modifier, cycles, ...) \ do { \ if ( unlikely(tb_init_done) && DO_TRC_HVM_ ## evt ) \ { \ - struct { \ - u32 d[6]; \ - } _d; \ - _d.d[0]=(d1); \ - _d.d[1]=(d2); \ - _d.d[2]=(d3); \ - _d.d[3]=(d4); \ - _d.d[4]=(d5); \ - _d.d[5]=(d6); \ + uint32_t _d[] = { __VA_ARGS__ }; \ __trace_var(TRC_HVM_ ## evt | (modifier), cycles, \ - sizeof(*_d.d) * count, &_d); \ + sizeof(_d), sizeof(_d) ? _d : NULL); \ } \ } while(0) #define HVMTRACE_6D(evt, d1, d2, d3, d4, d5, d6) \ - HVMTRACE_ND(evt, 0, 0, 6, d1, d2, d3, d4, d5, d6) + HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4, d5, d6) #define HVMTRACE_5D(evt, d1, d2, d3, d4, d5) \ - HVMTRACE_ND(evt, 0, 0, 5, d1, d2, d3, d4, d5, 0) + HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4, d5) #define HVMTRACE_4D(evt, d1, d2, d3, d4) \ - HVMTRACE_ND(evt, 0, 0, 4, d1, d2, d3, d4, 0, 0) + HVMTRACE_ND(evt, 0, 0, d1, d2, d3, d4) #define HVMTRACE_3D(evt, d1, d2, d3) \ - HVMTRACE_ND(evt, 0, 0, 3, d1, d2, d3, 0, 0, 0) + HVMTRACE_ND(evt, 0, 0, d1, d2, d3) #define HVMTRACE_2D(evt, d1, d2) \ - HVMTRACE_ND(evt, 0, 0, 2, d1, d2, 0, 0, 0, 0) + HVMTRACE_ND(evt, 0, 0, d1, d2) #define HVMTRACE_1D(evt, d1) \ - HVMTRACE_ND(evt, 0, 0, 1, d1, 0, 0, 0, 0, 0) + HVMTRACE_ND(evt, 0, 0, d1) #define HVMTRACE_0D(evt) \ - HVMTRACE_ND(evt, 0, 0, 0, 0, 0, 0, 0, 0, 0) + HVMTRACE_ND(evt, 0, 0) #define HVMTRACE_LONG_1D(evt, d1) \ HVMTRACE_2D(evt ## 64, (d1) & 0xFFFFFFFF, (d1) >> 32) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:50:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:50:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202401.357222 (Exim 4.92) (envelope-from ) id 1mXpWG-0004fv-7J; Tue, 05 Oct 2021 18:50:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202401.357222; Tue, 05 Oct 2021 18:50:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWG-0004fm-46; Tue, 05 Oct 2021 18:50:28 +0000 Received: by outflank-mailman (input) for mailman id 202401; Tue, 05 Oct 2021 18:50:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWE-0004fX-TG for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWE-00021r-Sb for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpWE-0000xM-Rt for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HuAhNT1KdhUKXyeV++QH//HfwPFRzrNfsTCT1Oib1Jg=; b=PpDraT0alTlsvYL92/XtJDhLt9 z545m1jjW8hreg7k8lHPQbwE7Zkng7dPyxLnLqN1bM7ghuXJDJ/WC64ewkpxnYhIt7getuwTUmX6p gjMMCla+Dch2bzC8dzdJ5xz4C8L+XcNZh52TSFYrRBPT/UYWaKuM0dMf1T/BFdcjq+dQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Remove duplicate calls caused by tracing Message-Id: Date: Tue, 05 Oct 2021 18:50:26 +0000 commit 91bac8ad7c062e2779b97649eb0dca9035bc56be Author: Andrew Cooper AuthorDate: Sat Sep 18 00:32:12 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 21 19:41:12 2021 +0100 x86/hvm: Remove duplicate calls caused by tracing 1) vpic_ack_pending_irq() calls vlapic_accept_pic_intr() twice, once in the TRACE_2D() instantiation and once "for real". Make the call only once. 2) vlapic_accept_pic_intr() similarly calls __vlapic_accept_pic_intr() twice, although this is more complicated to disentangle. v cannot be NULL because it has already been dereferenced in the function, causing the ternary expression to always call __vlapic_accept_pic_intr(). However, the return expression of the function takes care to skip the call if this vCPU isn't the PIC target. As __vlapic_accept_pic_intr() is far from trivial, make the TRACE_2D() semantics match the return semantics by only calling __vlapic_accept_pic_intr() when the vCPU is the PIC target. 3) hpet_set_timer() duplicates calls to hpet_tick_to_ns(). Pull the logic out which simplifies both the TRACE and create_periodic_time() calls. 4) lapic_rearm() makes multiple calls to vlapic_lvtt_period(). Pull it out into a local variable. vlapic_accept_pic_intr() is called on every VMEntry, so this is a reduction in VMEntry complexity across the board. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hpet.c | 14 ++++++++------ xen/arch/x86/hvm/vlapic.c | 23 +++++++++++++++-------- xen/arch/x86/hvm/vpic.c | 9 +++++---- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index ee756abb82..8267f0b8a2 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -240,6 +240,7 @@ static void hpet_set_timer(HPETState *h, unsigned int tn, uint64_t tn_cmp, cur_tick, diff; unsigned int irq; unsigned int oneshot; + s_time_t diff_ns, period_ns = 0; ASSERT(tn < HPET_TIMER_NUM); ASSERT(rw_is_write_locked(&h->lock)); @@ -311,13 +312,14 @@ static void hpet_set_timer(HPETState *h, unsigned int tn, * status register) before another interrupt can be delivered. */ oneshot = !timer_is_periodic(h, tn) || timer_level(h, tn); + diff_ns = hpet_tick_to_ns(h, diff); + if ( !oneshot ) + period_ns = hpet_tick_to_ns(h, h->hpet.period[tn]); + TRACE_2_LONG_4D(TRC_HVM_EMUL_HPET_START_TIMER, tn, irq, - TRC_PAR_LONG(hpet_tick_to_ns(h, diff)), - TRC_PAR_LONG(oneshot ? 0LL : - hpet_tick_to_ns(h, h->hpet.period[tn]))); - create_periodic_time(vhpet_vcpu(h), &h->pt[tn], - hpet_tick_to_ns(h, diff), - oneshot ? 0 : hpet_tick_to_ns(h, h->hpet.period[tn]), + TRC_PAR_LONG(diff_ns), TRC_PAR_LONG(period_ns)); + + create_periodic_time(vhpet_vcpu(h), &h->pt[tn], diff_ns, period_ns, irq, timer_level(h, tn) ? hpet_timer_fired : NULL, timer_level(h, tn) ? (void *)(unsigned long)tn : NULL, timer_level(h, tn)); diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 5e21fb4937..b8c84458ff 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1267,15 +1267,18 @@ static int __vlapic_accept_pic_intr(struct vcpu *v) int vlapic_accept_pic_intr(struct vcpu *v) { + bool target, accept = false; + if ( vlapic_hw_disabled(vcpu_vlapic(v)) || !has_vpic(v->domain) ) return 0; - TRACE_2D(TRC_HVM_EMUL_LAPIC_PIC_INTR, - (v == v->domain->arch.hvm.i8259_target), - v ? __vlapic_accept_pic_intr(v) : -1); + target = v == v->domain->arch.hvm.i8259_target; + if ( target ) + accept = __vlapic_accept_pic_intr(v); + + TRACE_2D(TRC_HVM_EMUL_LAPIC_PIC_INTR, target, accept); - return ((v == v->domain->arch.hvm.i8259_target) && - __vlapic_accept_pic_intr(v)); + return target && accept; } void vlapic_adjust_i8259_target(struct domain *d) @@ -1449,6 +1452,7 @@ static void lapic_rearm(struct vlapic *s) { unsigned long tmict; uint64_t period, tdt_msr; + bool is_periodic; s->pt.irq = vlapic_get_reg(s, APIC_LVTT) & APIC_VECTOR_MASK; @@ -1464,12 +1468,15 @@ static void lapic_rearm(struct vlapic *s) period = ((uint64_t)APIC_BUS_CYCLE_NS * (uint32_t)tmict * s->hw.timer_divisor); + is_periodic = vlapic_lvtt_period(s); + TRACE_2_LONG_3D(TRC_HVM_EMUL_LAPIC_START_TIMER, TRC_PAR_LONG(period), - TRC_PAR_LONG(vlapic_lvtt_period(s) ? period : 0LL), s->pt.irq); + TRC_PAR_LONG(is_periodic ? period : 0LL), s->pt.irq); + create_periodic_time(vlapic_vcpu(s), &s->pt, period, - vlapic_lvtt_period(s) ? period : 0, + is_periodic ? period : 0, s->pt.irq, - vlapic_lvtt_period(s) ? vlapic_pt_cb : NULL, + is_periodic ? vlapic_pt_cb : NULL, &s->timer_last_update, false); s->timer_last_update = s->pt.last_plt_gtime; } diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index af988a868c..91c2c69833 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -512,14 +512,15 @@ void vpic_irq_negative_edge(struct domain *d, int irq) int vpic_ack_pending_irq(struct vcpu *v) { - int irq; + int irq, accept; struct hvm_hw_vpic *vpic = &v->domain->arch.hvm.vpic[0]; ASSERT(has_vpic(v->domain)); - TRACE_2D(TRC_HVM_EMUL_PIC_PEND_IRQ_CALL, vlapic_accept_pic_intr(v), - vpic->int_output); - if ( !vlapic_accept_pic_intr(v) || !vpic->int_output ) + accept = vlapic_accept_pic_intr(v); + + TRACE_2D(TRC_HVM_EMUL_PIC_PEND_IRQ_CALL, accept, vpic->int_output); + if ( !accept || !vpic->int_output ) return -1; irq = vpic_intack(vpic); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:50:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:50:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202402.357226 (Exim 4.92) (envelope-from ) id 1mXpWQ-0004ie-8o; Tue, 05 Oct 2021 18:50:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202402.357226; Tue, 05 Oct 2021 18:50:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWQ-0004iW-5b; Tue, 05 Oct 2021 18:50:38 +0000 Received: by outflank-mailman (input) for mailman id 202402; Tue, 05 Oct 2021 18:50:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWP-0004i8-0P for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWO-000222-Vw for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpWO-0000yC-V9 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GGdWOGJ0m5BnD7hds0lfHKNH3/IVR5n55DCVNJMJ9NU=; b=e403+/vTPCGuMzGJIkZmh+93F3 F7Snoa82tpbFQlnL5hveAHSm0DCHPUDYhyDPiFF4K+lDO5j+hB1fnw7ooj7y6TtF8b6kiQ182oOwr TgK7MQ7mkG/7N+gwClg+nzrrKFiwAMpff9kdei5YS1f/Pgy+Z5rwSf0MSTDt1dARPqXc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: Move x86/trace.c to x86/pv/trace.c Message-Id: Date: Tue, 05 Oct 2021 18:50:36 +0000 commit 8aae4f376ca59174a25938e95dc41e9883ee675c Author: Andrew Cooper AuthorDate: Mon Sep 20 15:02:32 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 21 19:41:12 2021 +0100 x86/pv: Move x86/trace.c to x86/pv/trace.c This entire file is pv-only, and not excluded from the build by CONFIG_TRACEBUFFER. Move it into the pv/ directory, build it conditionally, and drop unused includes. Also move the contents of asm/trace.h to asm/pv/trace.h to avoid the functions being declared across the entire hypervisor. One caller in fixup_page_fault() is effectively PV only, but is not subject to dead code elimination. Add an additional IS_ENABLED(CONFIG_PV) to keep the build happy. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/Makefile | 1 - xen/arch/x86/pv/Makefile | 1 + xen/arch/x86/pv/emul-inv-op.c | 2 +- xen/arch/x86/pv/emul-priv-op.c | 1 + xen/arch/x86/pv/ro-page-fault.c | 2 +- xen/arch/x86/pv/trace.c | 156 +++++++++++++++++++++++++++++++++++++++ xen/arch/x86/pv/traps.c | 2 +- xen/arch/x86/trace.c | 159 ---------------------------------------- xen/arch/x86/traps.c | 3 +- xen/include/asm-x86/pv/trace.h | 48 ++++++++++++ xen/include/asm-x86/trace.h | 42 ----------- 11 files changed, 211 insertions(+), 206 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 202d4d2782..82dd4e18bd 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -61,7 +61,6 @@ obj-y += spec_ctrl.o obj-y += srat.o obj-y += string.o obj-y += time.o -obj-y += trace.o obj-y += traps.o obj-y += tsx.o obj-y += usercopy.o diff --git a/xen/arch/x86/pv/Makefile b/xen/arch/x86/pv/Makefile index 75b01b0062..6cda354cc4 100644 --- a/xen/arch/x86/pv/Makefile +++ b/xen/arch/x86/pv/Makefile @@ -12,6 +12,7 @@ obj-y += misc-hypercalls.o obj-y += mm.o obj-y += ro-page-fault.o obj-$(CONFIG_PV_SHIM) += shim.o +obj-$(CONFIG_TRACEBUFFER) += trace.o obj-y += traps.o obj-bin-y += dom0_build.init.o diff --git a/xen/arch/x86/pv/emul-inv-op.c b/xen/arch/x86/pv/emul-inv-op.c index b15f302bca..2c07eed9a0 100644 --- a/xen/arch/x86/pv/emul-inv-op.c +++ b/xen/arch/x86/pv/emul-inv-op.c @@ -19,7 +19,7 @@ * along with this program; If not, see . */ -#include +#include #include "emulate.h" diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 11467a1e3a..d0df5bc616 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/x86/pv/ro-page-fault.c b/xen/arch/x86/pv/ro-page-fault.c index 335aa8dc5d..ac5b66870c 100644 --- a/xen/arch/x86/pv/ro-page-fault.c +++ b/xen/arch/x86/pv/ro-page-fault.c @@ -20,7 +20,7 @@ * along with this program; If not, see . */ -#include +#include #include #include "emulate.h" diff --git a/xen/arch/x86/pv/trace.c b/xen/arch/x86/pv/trace.c new file mode 100644 index 0000000000..550c22765b --- /dev/null +++ b/xen/arch/x86/pv/trace.c @@ -0,0 +1,156 @@ +#include + +#include + +void __trace_pv_trap(int trapnr, unsigned long eip, + int use_error_code, unsigned error_code) +{ + if ( is_pv_32bit_vcpu(current) ) + { + struct __packed { + unsigned eip:32, + trapnr:15, + use_error_code:1, + error_code:16; + } d; + + d.eip = eip; + d.trapnr = trapnr; + d.error_code = error_code; + d.use_error_code=!!use_error_code; + + __trace_var(TRC_PV_TRAP, 1, sizeof(d), &d); + } + else + { + struct __packed { + unsigned long eip; + unsigned trapnr:15, + use_error_code:1, + error_code:16; + } d; + unsigned event; + + d.eip = eip; + d.trapnr = trapnr; + d.error_code = error_code; + d.use_error_code=!!use_error_code; + + event = TRC_PV_TRAP; + event |= TRC_64_FLAG; + __trace_var(event, 1, sizeof(d), &d); + } +} + +void __trace_pv_page_fault(unsigned long addr, unsigned error_code) +{ + unsigned long eip = guest_cpu_user_regs()->rip; + + if ( is_pv_32bit_vcpu(current) ) + { + struct __packed { + u32 eip, addr, error_code; + } d; + + d.eip = eip; + d.addr = addr; + d.error_code = error_code; + + __trace_var(TRC_PV_PAGE_FAULT, 1, sizeof(d), &d); + } + else + { + struct __packed { + unsigned long eip, addr; + u32 error_code; + } d; + unsigned event; + + d.eip = eip; + d.addr = addr; + d.error_code = error_code; + event = TRC_PV_PAGE_FAULT; + event |= TRC_64_FLAG; + __trace_var(event, 1, sizeof(d), &d); + } +} + +void __trace_trap_one_addr(unsigned event, unsigned long va) +{ + if ( is_pv_32bit_vcpu(current) ) + { + u32 d = va; + __trace_var(event, 1, sizeof(d), &d); + } + else + { + event |= TRC_64_FLAG; + __trace_var(event, 1, sizeof(va), &va); + } +} + +void __trace_trap_two_addr(unsigned event, unsigned long va1, + unsigned long va2) +{ + if ( is_pv_32bit_vcpu(current) ) + { + struct __packed { + u32 va1, va2; + } d; + d.va1=va1; + d.va2=va2; + __trace_var(event, 1, sizeof(d), &d); + } + else + { + struct __packed { + unsigned long va1, va2; + } d; + d.va1=va1; + d.va2=va2; + event |= TRC_64_FLAG; + __trace_var(event, 1, sizeof(d), &d); + } +} + +void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) +{ + unsigned long eip = guest_cpu_user_regs()->rip; + + /* We have a couple of different modes to worry about: + * - 32-on-32: 32-bit pte, 32-bit virtual addresses + * - pae-on-pae, pae-on-64: 64-bit pte, 32-bit virtual addresses + * - 64-on-64: 64-bit pte, 64-bit virtual addresses + * pae-on-64 is the only one that requires extra code; in all other + * cases, "unsigned long" is the size of a guest virtual address. + */ + + if ( is_pv_32bit_vcpu(current) ) + { + struct __packed { + l1_pgentry_t pte; + u32 addr, eip; + } d; + d.addr = addr; + d.eip = eip; + d.pte = npte; + + __trace_var(TRC_PV_PTWR_EMULATION_PAE, 1, sizeof(d), &d); + } + else + { + struct { + l1_pgentry_t pte; + unsigned long addr, eip; + } d; + unsigned event; + + d.addr = addr; + d.eip = eip; + d.pte = npte; + + event = TRC_PV_PTWR_EMULATION; + event |= TRC_64_FLAG; + __trace_var(event, 1/*tsc*/, sizeof(d), &d); + } +} diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 7439b76df8..764773c021 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -22,10 +22,10 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/xen/arch/x86/trace.c b/xen/arch/x86/trace.c deleted file mode 100644 index 4a953c5b2f..0000000000 --- a/xen/arch/x86/trace.c +++ /dev/null @@ -1,159 +0,0 @@ -#include -#include -#include -#include -#include -#include - -void __trace_pv_trap(int trapnr, unsigned long eip, - int use_error_code, unsigned error_code) -{ - if ( is_pv_32bit_vcpu(current) ) - { - struct __packed { - unsigned eip:32, - trapnr:15, - use_error_code:1, - error_code:16; - } d; - - d.eip = eip; - d.trapnr = trapnr; - d.error_code = error_code; - d.use_error_code=!!use_error_code; - - __trace_var(TRC_PV_TRAP, 1, sizeof(d), &d); - } - else - { - struct __packed { - unsigned long eip; - unsigned trapnr:15, - use_error_code:1, - error_code:16; - } d; - unsigned event; - - d.eip = eip; - d.trapnr = trapnr; - d.error_code = error_code; - d.use_error_code=!!use_error_code; - - event = TRC_PV_TRAP; - event |= TRC_64_FLAG; - __trace_var(event, 1, sizeof(d), &d); - } -} - -void __trace_pv_page_fault(unsigned long addr, unsigned error_code) -{ - unsigned long eip = guest_cpu_user_regs()->rip; - - if ( is_pv_32bit_vcpu(current) ) - { - struct __packed { - u32 eip, addr, error_code; - } d; - - d.eip = eip; - d.addr = addr; - d.error_code = error_code; - - __trace_var(TRC_PV_PAGE_FAULT, 1, sizeof(d), &d); - } - else - { - struct __packed { - unsigned long eip, addr; - u32 error_code; - } d; - unsigned event; - - d.eip = eip; - d.addr = addr; - d.error_code = error_code; - event = TRC_PV_PAGE_FAULT; - event |= TRC_64_FLAG; - __trace_var(event, 1, sizeof(d), &d); - } -} - -void __trace_trap_one_addr(unsigned event, unsigned long va) -{ - if ( is_pv_32bit_vcpu(current) ) - { - u32 d = va; - __trace_var(event, 1, sizeof(d), &d); - } - else - { - event |= TRC_64_FLAG; - __trace_var(event, 1, sizeof(va), &va); - } -} - -void __trace_trap_two_addr(unsigned event, unsigned long va1, - unsigned long va2) -{ - if ( is_pv_32bit_vcpu(current) ) - { - struct __packed { - u32 va1, va2; - } d; - d.va1=va1; - d.va2=va2; - __trace_var(event, 1, sizeof(d), &d); - } - else - { - struct __packed { - unsigned long va1, va2; - } d; - d.va1=va1; - d.va2=va2; - event |= TRC_64_FLAG; - __trace_var(event, 1, sizeof(d), &d); - } -} - -void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) -{ - unsigned long eip = guest_cpu_user_regs()->rip; - - /* We have a couple of different modes to worry about: - * - 32-on-32: 32-bit pte, 32-bit virtual addresses - * - pae-on-pae, pae-on-64: 64-bit pte, 32-bit virtual addresses - * - 64-on-64: 64-bit pte, 64-bit virtual addresses - * pae-on-64 is the only one that requires extra code; in all other - * cases, "unsigned long" is the size of a guest virtual address. - */ - - if ( is_pv_32bit_vcpu(current) ) - { - struct __packed { - l1_pgentry_t pte; - u32 addr, eip; - } d; - d.addr = addr; - d.eip = eip; - d.pte = npte; - - __trace_var(TRC_PV_PTWR_EMULATION_PAE, 1, sizeof(d), &d); - } - else - { - struct { - l1_pgentry_t pte; - unsigned long addr, eip; - } d; - unsigned event; - - d.addr = addr; - d.eip = eip; - d.pte = npte; - - event = TRC_PV_PTWR_EMULATION; - event |= TRC_64_FLAG; - __trace_var(event, 1/*tsc*/, sizeof(d), &d); - } -} diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4a0e498b4c..0cc1ee95cb 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -82,6 +82,7 @@ #include #include #include +#include #include /* @@ -1480,7 +1481,7 @@ static int fixup_page_fault(unsigned long addr, struct cpu_user_regs *regs) { int ret = paging_fault(addr, regs); - if ( ret == EXCRET_fault_fixed ) + if ( IS_ENABLED(CONFIG_PV) && ret == EXCRET_fault_fixed ) trace_trap_two_addr(TRC_PV_PAGING_FIXUP, regs->rip, addr); return ret; } diff --git a/xen/include/asm-x86/pv/trace.h b/xen/include/asm-x86/pv/trace.h new file mode 100644 index 0000000000..c616206eeb --- /dev/null +++ b/xen/include/asm-x86/pv/trace.h @@ -0,0 +1,48 @@ +#ifndef XEN_X86_PV_TRACE_H +#define XEN_X86_PV_TRACE_H + +#include + +#include + +void __trace_pv_trap(int trapnr, unsigned long eip, + int use_error_code, unsigned error_code); +static inline void trace_pv_trap(int trapnr, unsigned long eip, + int use_error_code, unsigned error_code) +{ + if ( unlikely(tb_init_done) ) + __trace_pv_trap(trapnr, eip, use_error_code, error_code); +} + +void __trace_pv_page_fault(unsigned long addr, unsigned error_code); +static inline void trace_pv_page_fault(unsigned long addr, + unsigned error_code) +{ + if ( unlikely(tb_init_done) ) + __trace_pv_page_fault(addr, error_code); +} + +void __trace_trap_one_addr(unsigned event, unsigned long va); +static inline void trace_trap_one_addr(unsigned event, unsigned long va) +{ + if ( unlikely(tb_init_done) ) + __trace_trap_one_addr(event, va); +} + +void __trace_trap_two_addr(unsigned event, unsigned long va1, + unsigned long va2); +static inline void trace_trap_two_addr(unsigned event, unsigned long va1, + unsigned long va2) +{ + if ( unlikely(tb_init_done) ) + __trace_trap_two_addr(event, va1, va2); +} + +void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte); +static inline void trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) +{ + if ( unlikely(tb_init_done) ) + __trace_ptwr_emulation(addr, npte); +} + +#endif /* XEN_X86_PV_TRACE_H */ diff --git a/xen/include/asm-x86/trace.h b/xen/include/asm-x86/trace.h index e65b5de6ee..edef1bb099 100644 --- a/xen/include/asm-x86/trace.h +++ b/xen/include/asm-x86/trace.h @@ -1,46 +1,4 @@ #ifndef __ASM_TRACE_H__ #define __ASM_TRACE_H__ -#include - -void __trace_pv_trap(int trapnr, unsigned long eip, - int use_error_code, unsigned error_code); -static inline void trace_pv_trap(int trapnr, unsigned long eip, - int use_error_code, unsigned error_code) -{ - if ( unlikely(tb_init_done) ) - __trace_pv_trap(trapnr, eip, use_error_code, error_code); -} - -void __trace_pv_page_fault(unsigned long addr, unsigned error_code); -static inline void trace_pv_page_fault(unsigned long addr, - unsigned error_code) -{ - if ( unlikely(tb_init_done) ) - __trace_pv_page_fault(addr, error_code); -} - -void __trace_trap_one_addr(unsigned event, unsigned long va); -static inline void trace_trap_one_addr(unsigned event, unsigned long va) -{ - if ( unlikely(tb_init_done) ) - __trace_trap_one_addr(event, va); -} - -void __trace_trap_two_addr(unsigned event, unsigned long va1, - unsigned long va2); -static inline void trace_trap_two_addr(unsigned event, unsigned long va1, - unsigned long va2) -{ - if ( unlikely(tb_init_done) ) - __trace_trap_two_addr(event, va1, va2); -} - -void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte); -static inline void trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) -{ - if ( unlikely(tb_init_done) ) - __trace_ptwr_emulation(addr, npte); -} - #endif /* __ASM_TRACE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:50:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:50:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202403.357230 (Exim 4.92) (envelope-from ) id 1mXpWa-0004lo-Bv; Tue, 05 Oct 2021 18:50:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202403.357230; Tue, 05 Oct 2021 18:50:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWa-0004lg-8y; Tue, 05 Oct 2021 18:50:48 +0000 Received: by outflank-mailman (input) for mailman id 202403; Tue, 05 Oct 2021 18:50:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWZ-0004lW-45 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWZ-00022A-3N for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpWZ-0000yw-2W for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nUyMr4GW/HiljCA4EbOIKIOUVivQ4Vsy7JOjWXVVmfs=; b=TJNaZBdOLaPci5srXNRZ+15jJX SdMkytjNTndR6uqyHrePPP8TsYjF2l2SNGASCjHGGWhsF+hLnEoTNTKVkh1A0OMTmEvhl76w5Wd3I DJ9k7F/LoutlTlqWrcRkisbZqy8BKAp/E7EhEDkzzDfU7hckOFwU4MlJ6x/LKdSFjayQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/trace: Clean up trace handling Message-Id: Date: Tue, 05 Oct 2021 18:50:47 +0000 commit 4e467d390eaf6736377766adae0166711866fac3 Author: Andrew Cooper AuthorDate: Mon Sep 20 14:30:49 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 21 19:41:12 2021 +0100 x86/trace: Clean up trace handling Use more appropriate types. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/irq.c | 4 +- xen/arch/x86/mm/p2m-pt.c | 6 +- xen/arch/x86/mm/shadow/multi.c | 2 +- xen/arch/x86/pv/trace.c | 159 +++++++++++++++++++---------------------- 4 files changed, 78 insertions(+), 93 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index a1693f92dd..67cbf6b979 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -130,8 +130,8 @@ static void _trace_irq_mask(uint32_t event, int irq, int vector, const cpumask_t *mask) { struct { - unsigned int irq:16, vec:16; - unsigned int mask[6]; + uint16_t irq, vec; + uint32_t mask[6]; } d = { .irq = irq, .vec = vector, diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 5a0c0f5ace..09c99d78aa 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -609,9 +609,9 @@ p2m_pt_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, if ( tb_init_done ) { struct { - u64 gfn, mfn; - int p2mt; - int d:16,order:16; + uint64_t gfn, mfn; + uint32_t p2mt; + uint16_t d, order; } t; t.gfn = gfn; diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 8bb028c2e2..15265fc81d 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2118,7 +2118,7 @@ static inline void trace_shadow_emulate(guest_l1e_t gl1e, unsigned long va) so put it first for alignment sake. */ guest_l1e_t gl1e, write_val; guest_va_t va; - unsigned flags:29, emulation_count:3; + uint32_t flags:29, emulation_count:3; } d; u32 event; diff --git a/xen/arch/x86/pv/trace.c b/xen/arch/x86/pv/trace.c index 550c22765b..cf3897061e 100644 --- a/xen/arch/x86/pv/trace.c +++ b/xen/arch/x86/pv/trace.c @@ -7,38 +7,35 @@ void __trace_pv_trap(int trapnr, unsigned long eip, { if ( is_pv_32bit_vcpu(current) ) { - struct __packed { - unsigned eip:32, - trapnr:15, - use_error_code:1, - error_code:16; - } d; - - d.eip = eip; - d.trapnr = trapnr; - d.error_code = error_code; - d.use_error_code=!!use_error_code; + struct { + uint32_t eip; + uint16_t trapnr:15; + bool use_error_code:1; + uint16_t error_code; + } d = { + .eip = eip, + .trapnr = trapnr, + .use_error_code = use_error_code, + .error_code = error_code, + }; __trace_var(TRC_PV_TRAP, 1, sizeof(d), &d); } else { struct __packed { - unsigned long eip; - unsigned trapnr:15, - use_error_code:1, - error_code:16; - } d; - unsigned event; - - d.eip = eip; - d.trapnr = trapnr; - d.error_code = error_code; - d.use_error_code=!!use_error_code; - - event = TRC_PV_TRAP; - event |= TRC_64_FLAG; - __trace_var(event, 1, sizeof(d), &d); + uint64_t rip; + uint16_t trapnr:15; + bool use_error_code:1; + uint16_t error_code; + } d = { + .rip = eip, + .trapnr = trapnr, + .use_error_code = use_error_code, + .error_code = error_code, + }; + + __trace_var(TRC_PV_TRAP | TRC_64_FLAG, 1, sizeof(d), &d); } } @@ -48,30 +45,28 @@ void __trace_pv_page_fault(unsigned long addr, unsigned error_code) if ( is_pv_32bit_vcpu(current) ) { - struct __packed { - u32 eip, addr, error_code; - } d; - - d.eip = eip; - d.addr = addr; - d.error_code = error_code; + struct { + uint32_t eip, addr, error_code; + } d = { + .eip = eip, + .addr = addr, + .error_code = error_code, + }; __trace_var(TRC_PV_PAGE_FAULT, 1, sizeof(d), &d); } else { struct __packed { - unsigned long eip, addr; - u32 error_code; - } d; - unsigned event; - - d.eip = eip; - d.addr = addr; - d.error_code = error_code; - event = TRC_PV_PAGE_FAULT; - event |= TRC_64_FLAG; - __trace_var(event, 1, sizeof(d), &d); + uint64_t rip, addr; + uint32_t error_code; + } d = { + .rip = eip, + .addr = addr, + .error_code = error_code, + }; + + __trace_var(TRC_PV_PAGE_FAULT | TRC_64_FLAG, 1, sizeof(d), &d); } } @@ -83,10 +78,7 @@ void __trace_trap_one_addr(unsigned event, unsigned long va) __trace_var(event, 1, sizeof(d), &d); } else - { - event |= TRC_64_FLAG; - __trace_var(event, 1, sizeof(va), &va); - } + __trace_var(event | TRC_64_FLAG, 1, sizeof(va), &va); } void __trace_trap_two_addr(unsigned event, unsigned long va1, @@ -94,22 +86,25 @@ void __trace_trap_two_addr(unsigned event, unsigned long va1, { if ( is_pv_32bit_vcpu(current) ) { - struct __packed { - u32 va1, va2; - } d; - d.va1=va1; - d.va2=va2; + struct { + uint32_t va1, va2; + } d = { + .va1 = va1, + .va2 = va2, + }; + __trace_var(event, 1, sizeof(d), &d); } else { - struct __packed { - unsigned long va1, va2; - } d; - d.va1=va1; - d.va2=va2; - event |= TRC_64_FLAG; - __trace_var(event, 1, sizeof(d), &d); + struct { + uint64_t va1, va2; + } d = { + .va1 = va1, + .va2 = va2, + }; + + __trace_var(event | TRC_64_FLAG, 1, sizeof(d), &d); } } @@ -117,40 +112,30 @@ void __trace_ptwr_emulation(unsigned long addr, l1_pgentry_t npte) { unsigned long eip = guest_cpu_user_regs()->rip; - /* We have a couple of different modes to worry about: - * - 32-on-32: 32-bit pte, 32-bit virtual addresses - * - pae-on-pae, pae-on-64: 64-bit pte, 32-bit virtual addresses - * - 64-on-64: 64-bit pte, 64-bit virtual addresses - * pae-on-64 is the only one that requires extra code; in all other - * cases, "unsigned long" is the size of a guest virtual address. - */ - if ( is_pv_32bit_vcpu(current) ) { - struct __packed { - l1_pgentry_t pte; - u32 addr, eip; - } d; - d.addr = addr; - d.eip = eip; - d.pte = npte; + struct { + uint64_t pte; + uint32_t addr, eip; + } d = { + .pte = l1e_get_intpte(npte), + .addr = addr, + .eip = eip, + }; __trace_var(TRC_PV_PTWR_EMULATION_PAE, 1, sizeof(d), &d); } else { struct { - l1_pgentry_t pte; - unsigned long addr, eip; - } d; - unsigned event; - - d.addr = addr; - d.eip = eip; - d.pte = npte; - - event = TRC_PV_PTWR_EMULATION; - event |= TRC_64_FLAG; - __trace_var(event, 1/*tsc*/, sizeof(d), &d); + uint64_t pte; + uint64_t addr, rip; + } d = { + .pte = l1e_get_intpte(npte), + .addr = addr, + .rip = eip, + }; + + __trace_var(TRC_PV_PTWR_EMULATION | TRC_64_FLAG, 1, sizeof(d), &d); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:50:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:50:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202404.357234 (Exim 4.92) (envelope-from ) id 1mXpWk-0004p1-DP; Tue, 05 Oct 2021 18:50:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202404.357234; Tue, 05 Oct 2021 18:50:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWk-0004ot-AT; Tue, 05 Oct 2021 18:50:58 +0000 Received: by outflank-mailman (input) for mailman id 202404; Tue, 05 Oct 2021 18:50:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWj-0004og-7E for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWj-00022N-6a for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpWj-0000zh-5s for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:50:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LgJ8wB3E8zUixKaZwgZh1yXwn6RMOG4Z/4rj1u6YBL8=; b=gOHxnFUdtU6KEgxuMG/UySfnAB ymKW8hGckMUpf1473cki/RGI4YmfUQTea2iSql2+jlHczz53ebyuquA3iWQXzaVLAiuGqgEsDn1fE GWslU1Gp5FaRwJAUtitHKGLO1tFT8ybSRuaEB47p5jnCUbWfjgUeWTRf4PXv+DKQZDR8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: check / convert IVMD ranges for being / to be reserved Message-Id: Date: Tue, 05 Oct 2021 18:50:57 +0000 commit ed6c77ebf0c1f865b45596c3e793fe87160251a6 Author: Jan Beulich AuthorDate: Wed Sep 22 16:14:19 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 22 16:14:19 2021 +0200 AMD/IOMMU: check / convert IVMD ranges for being / to be reserved While the specification doesn't say so, just like for VT-d's RMRRs no good can come from these ranges being e.g. conventional RAM or entirely unmarked and hence usable for placing e.g. PCI device BARs. Check whether they are, and put in some limited effort to convert to reserved. (More advanced logic can be added if actual problems are found with this simplistic variant.) Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu_acpi.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 2fdebd2d74..bc3c946fe5 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -384,6 +384,38 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) AMD_IOMMU_DEBUG("IVMD Block: type %#x phys %#lx len %#lx\n", ivmd_block->header.type, start_addr, mem_length); + if ( !e820_all_mapped(base, limit + PAGE_SIZE, E820_RESERVED) ) + { + paddr_t addr; + + AMD_IOMMU_DEBUG("IVMD: [%lx,%lx) is not (entirely) in reserved memory\n", + base, limit + PAGE_SIZE); + + for ( addr = base; addr <= limit; addr += PAGE_SIZE ) + { + unsigned int type = page_get_ram_type(maddr_to_mfn(addr)); + + if ( type == RAM_TYPE_UNKNOWN ) + { + if ( e820_add_range(&e820, addr, addr + PAGE_SIZE, + E820_RESERVED) ) + continue; + AMD_IOMMU_DEBUG("IVMD Error: Page at %lx couldn't be reserved\n", + addr); + return -EIO; + } + + /* Types which won't be handed out are considered good enough. */ + if ( !(type & (RAM_TYPE_RESERVED | RAM_TYPE_ACPI | + RAM_TYPE_UNUSABLE)) ) + continue; + + AMD_IOMMU_DEBUG("IVMD Error: Page at %lx can't be converted\n", + addr); + return -EIO; + } + } + if ( ivmd_block->header.flags & ACPI_IVMD_EXCLUSION_RANGE ) exclusion = true; else if ( ivmd_block->header.flags & ACPI_IVMD_UNITY ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:51:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:51:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202405.357238 (Exim 4.92) (envelope-from ) id 1mXpWu-0004s3-FL; Tue, 05 Oct 2021 18:51:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202405.357238; Tue, 05 Oct 2021 18:51:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWu-0004ru-Bz; Tue, 05 Oct 2021 18:51:08 +0000 Received: by outflank-mailman (input) for mailman id 202405; Tue, 05 Oct 2021 18:51:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWt-0004rl-AT for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpWt-00022m-9l for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpWt-00010n-8z for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dkfMOvotQe+fulITkw79xrLnPErFa8GYLUUi/WmPILE=; b=vQVynkP+qyYl65wy0jNIrqUF76 iLW5WpuhHF9f2zROjema0kANrPLnDY4gtsG4qv2EK1q07nuhXHidLv3B7lGE22z0kTZuwZlKvLgTg Ioo+ja9oxPgdOdM6X6kylK4tmIBp8/4yIfu0lMOHRLQgSU/61BGKoELvgNcbLN2ok2D8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: also insert IVMD ranges into Dom0's page tables Message-Id: Date: Tue, 05 Oct 2021 18:51:07 +0000 commit a0fe9a1e8c1f28ac528625bd3be99e14a74253ee Author: Jan Beulich AuthorDate: Wed Sep 22 16:15:29 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 22 16:15:29 2021 +0200 AMD/IOMMU: also insert IVMD ranges into Dom0's page tables So far only one region would be taken care of, if it can be placed in the exclusion range registers of the IOMMU. Take care of further ranges as well. Seeing that we've been doing fine without this, make both insertion and removal best effort only. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 819b5a6cc3..d2678b365a 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -513,6 +513,14 @@ static int amd_iommu_add_device(u8 devfn, struct pci_dev *pdev) amd_iommu_flush_device(iommu, bdf); } + if ( amd_iommu_reserve_domain_unity_map( + pdev->domain, + ivrs_mappings[ivrs_mappings[bdf].dte_requestor_id].unity_map, + 0) ) + AMD_IOMMU_DEBUG("%pd: unity mapping failed for %04x:%02x:%02x.%u\n", + pdev->domain, pdev->seg, pdev->bus, PCI_SLOT(devfn), + PCI_FUNC(devfn)); + return amd_iommu_setup_domain_device(pdev->domain, iommu, devfn, pdev); } @@ -538,6 +546,14 @@ static int amd_iommu_remove_device(u8 devfn, struct pci_dev *pdev) ivrs_mappings = get_ivrs_mappings(pdev->seg); bdf = PCI_BDF2(pdev->bus, devfn); + + if ( amd_iommu_reserve_domain_unity_unmap( + pdev->domain, + ivrs_mappings[ivrs_mappings[bdf].dte_requestor_id].unity_map) ) + AMD_IOMMU_DEBUG("%pd: unity unmapping failed for %04x:%02x:%02x.%u\n", + pdev->domain, pdev->seg, pdev->bus, PCI_SLOT(devfn), + PCI_FUNC(devfn)); + if ( amd_iommu_perdev_intremap && ivrs_mappings[bdf].dte_requestor_id == bdf && ivrs_mappings[bdf].intremap_table ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:51:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:51:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202406.357242 (Exim 4.92) (envelope-from ) id 1mXpX4-0004uo-Gc; Tue, 05 Oct 2021 18:51:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202406.357242; Tue, 05 Oct 2021 18:51:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpX4-0004ug-Dc; Tue, 05 Oct 2021 18:51:18 +0000 Received: by outflank-mailman (input) for mailman id 202406; Tue, 05 Oct 2021 18:51:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpX3-0004uV-Dy for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpX3-00023G-DG for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpX3-00011R-CU for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=T0uWdVxdqPhIpLR9+Q/NkHRKLQa9mUMUVpjeOVunsuA=; b=xUKok510NjH1vdRcMseN32ukXP t6X6IlqZe8eq8sy2uZgDjw4rUr7LNkK1o6PuI9gJMhPD751AEAYGL9DuL3QN/xXJVfGewYosJnEbc G6bqLtCMK3z4UPMaYl3QbuW2vV5wqfC8Ywe0UpQuhoDf+ncH7GjgUdMAW0M5GPYuTJyg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: provide function backing XENMEM_reserved_device_memory_map Message-Id: Date: Tue, 05 Oct 2021 18:51:17 +0000 commit 2209c36007ec209ab1189ac0bfd5144a2db80090 Author: Jan Beulich AuthorDate: Wed Sep 22 16:16:28 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 22 16:16:28 2021 +0200 AMD/IOMMU: provide function backing XENMEM_reserved_device_memory_map Just like for VT-d, exclusion / unity map ranges would better be reflected in e.g. the guest's E820 map. The reporting infrastructure was put in place still pretty tailored to VT-d's needs; extend get_reserved_device_memory() to allow vendor specific code to probe whether a particular (seg,bus,dev,func) tuple would get its data actually recorded. I admit the de-duplication of entries is quite limited for now, but considering our trouble to find a system surfacing _any_ IVMD this is likely not a critical issue for this initial implementation. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/common/memory.c | 3 ++ xen/drivers/passthrough/amd/iommu.h | 2 + xen/drivers/passthrough/amd/iommu_acpi.c | 20 +++++--- xen/drivers/passthrough/amd/iommu_map.c | 75 +++++++++++++++++++++++++++++ xen/drivers/passthrough/amd/pci_amd_iommu.c | 1 + 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 63642278fd..f333c994c8 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1042,6 +1042,9 @@ static int get_reserved_device_memory(xen_pfn_t start, xen_ulong_t nr, if ( !(grdm->map.flags & XENMEM_RDM_ALL) && (sbdf != id) ) return 0; + if ( !nr ) + return 1; + if ( grdm->used_entries < grdm->map.nr_entries ) { struct xen_reserved_device_memory rdm = { diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index 721d0c395b..b0e6322906 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -110,6 +110,7 @@ struct amd_iommu { struct ivrs_unity_map { bool read:1; bool write:1; + bool global:1; paddr_t addr; unsigned long length; struct ivrs_unity_map *next; @@ -236,6 +237,7 @@ int amd_iommu_reserve_domain_unity_map(struct domain *domain, unsigned int flag); int amd_iommu_reserve_domain_unity_unmap(struct domain *d, const struct ivrs_unity_map *map); +int amd_iommu_get_reserved_device_memory(iommu_grdm_t *func, void *ctxt); int __must_check amd_iommu_flush_iotlb_pages(struct domain *d, dfn_t dfn, unsigned long page_count, unsigned int flush_flags); diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index bc3c946fe5..0860b23c88 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -143,7 +143,7 @@ static int __init reserve_iommu_exclusion_range( static int __init reserve_unity_map_for_device( uint16_t seg, uint16_t bdf, unsigned long base, - unsigned long length, bool iw, bool ir) + unsigned long length, bool iw, bool ir, bool global) { struct ivrs_mappings *ivrs_mappings = get_ivrs_mappings(seg); struct ivrs_unity_map *unity_map = ivrs_mappings[bdf].unity_map; @@ -162,7 +162,11 @@ static int __init reserve_unity_map_for_device( */ if ( base == unity_map->addr && length == unity_map->length && ir == unity_map->read && iw == unity_map->write ) + { + if ( global ) + unity_map->global = true; return 0; + } if ( unity_map->addr + unity_map->length > base && base + length > unity_map->addr ) @@ -181,6 +185,7 @@ static int __init reserve_unity_map_for_device( unity_map->read = ir; unity_map->write = iw; + unity_map->global = global; unity_map->addr = base; unity_map->length = length; unity_map->next = ivrs_mappings[bdf].unity_map; @@ -220,7 +225,8 @@ static int __init register_range_for_all_devices( /* reserve r/w unity-mapped page entries for devices */ for ( bdf = rc = 0; !rc && bdf < ivrs_bdf_entries; bdf++ ) - rc = reserve_unity_map_for_device(seg, bdf, base, length, iw, ir); + rc = reserve_unity_map_for_device(seg, bdf, base, length, iw, ir, + true); } return rc; @@ -253,8 +259,10 @@ static int __init register_range_for_device( paddr_t length = limit + PAGE_SIZE - base; /* reserve unity-mapped page entries for device */ - rc = reserve_unity_map_for_device(seg, bdf, base, length, iw, ir) ?: - reserve_unity_map_for_device(seg, req, base, length, iw, ir); + rc = reserve_unity_map_for_device(seg, bdf, base, length, iw, ir, + false) ?: + reserve_unity_map_for_device(seg, req, base, length, iw, ir, + false); } else { @@ -290,9 +298,9 @@ static int __init register_range_for_iommu_devices( req = get_ivrs_mappings(iommu->seg)[bdf].dte_requestor_id; rc = reserve_unity_map_for_device(iommu->seg, bdf, base, length, - iw, ir) ?: + iw, ir, false) ?: reserve_unity_map_for_device(iommu->seg, req, base, length, - iw, ir); + iw, ir, false); } return rc; diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index 10fda5519c..93501ee2c5 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -462,6 +462,81 @@ int amd_iommu_reserve_domain_unity_unmap(struct domain *d, return rc; } +int amd_iommu_get_reserved_device_memory(iommu_grdm_t *func, void *ctxt) +{ + unsigned int seg = 0 /* XXX */, bdf; + const struct ivrs_mappings *ivrs_mappings = get_ivrs_mappings(seg); + /* At least for global entries, avoid reporting them multiple times. */ + enum { pending, processing, done } global = pending; + + for ( bdf = 0; bdf < ivrs_bdf_entries; ++bdf ) + { + pci_sbdf_t sbdf = PCI_SBDF2(seg, bdf); + const struct ivrs_unity_map *um = ivrs_mappings[bdf].unity_map; + unsigned int req = ivrs_mappings[bdf].dte_requestor_id; + const struct amd_iommu *iommu = ivrs_mappings[bdf].iommu; + int rc; + + if ( !iommu ) + { + /* May need to trigger the workaround in find_iommu_for_device(). */ + const struct pci_dev *pdev; + + pcidevs_lock(); + pdev = pci_get_pdev(seg, sbdf.bus, sbdf.devfn); + pcidevs_unlock(); + + if ( pdev ) + iommu = find_iommu_for_device(seg, bdf); + if ( !iommu ) + continue; + } + + if ( func(0, 0, sbdf.sbdf, ctxt) ) + { + /* + * When the caller processes a XENMEM_RDM_ALL request, don't report + * multiple times the same range(s) for perhaps many devices with + * the same alias ID. + */ + if ( bdf != req && ivrs_mappings[req].iommu && + func(0, 0, PCI_SBDF2(seg, req).sbdf, ctxt) ) + continue; + + if ( global == pending ) + global = processing; + } + + if ( iommu->exclusion_enable && + (iommu->exclusion_allow_all ? + global == processing : + ivrs_mappings[bdf].dte_allow_exclusion) ) + { + rc = func(PFN_DOWN(iommu->exclusion_base), + PFN_UP(iommu->exclusion_limit | 1) - + PFN_DOWN(iommu->exclusion_base), sbdf.sbdf, ctxt); + if ( unlikely(rc < 0) ) + return rc; + } + + for ( ; um; um = um->next ) + { + if ( um->global && global != processing ) + continue; + + rc = func(PFN_DOWN(um->addr), PFN_DOWN(um->length), + sbdf.sbdf, ctxt); + if ( unlikely(rc < 0) ) + return rc; + } + + if ( global == processing ) + global = done; + } + + return 0; +} + int __init amd_iommu_quarantine_init(struct domain *d) { struct domain_iommu *hd = dom_iommu(d); diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index d2678b365a..86e4864e5d 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -652,6 +652,7 @@ static const struct iommu_ops __initconstrel _iommu_ops = { .suspend = amd_iommu_suspend, .resume = amd_iommu_resume, .crash_shutdown = amd_iommu_crash_shutdown, + .get_reserved_device_memory = amd_iommu_get_reserved_device_memory, .dump_page_tables = amd_dump_page_tables, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:51:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:51:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202407.357246 (Exim 4.92) (envelope-from ) id 1mXpXE-0004y0-JH; Tue, 05 Oct 2021 18:51:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202407.357246; Tue, 05 Oct 2021 18:51:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXE-0004xs-GP; Tue, 05 Oct 2021 18:51:28 +0000 Received: by outflank-mailman (input) for mailman id 202407; Tue, 05 Oct 2021 18:51:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXD-0004xi-HJ for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXD-00023Y-GX for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpXD-00013h-Fp for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7ahW3hrHfowkeMToickmfB4gTpd+bVEQu1GOhK7HUaA=; b=FaFukJDe9nbhnkfxhak5gVS7o7 ZzvOXpPr7UqBddVGTkY8wxVKXpvXr2g/b1jVW41rgCVtUXrDuDktx8/qEZm9PP83ysgp5nXGNhVBA F8YPWz73cqWYAMn32cijYkB9g7ZYq1WYzvaaQbKqbnINaRUntZRqTMiy+YqdpGQNRYRs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: add "ivmd=" command line option Message-Id: Date: Tue, 05 Oct 2021 18:51:27 +0000 commit c7146535d1b230d4ab0b4ad2a06327e0208ad8b9 Author: Jan Beulich AuthorDate: Wed Sep 22 16:17:04 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 22 16:17:04 2021 +0200 AMD/IOMMU: add "ivmd=" command line option Just like VT-d's "rmrr=" it can be used to cover for firmware omissions. Since systems surfacing IVMDs seem to be rare, it is also meant to allow testing of the involved code. Only the IVMD flavors actually understood by the IVMD parsing logic can be generated, and for this initial implementation there's also no way to control the flags field - unity r/w mappings are assumed. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- docs/misc/xen-command-line.pandoc | 29 ++++++++++- xen/drivers/passthrough/amd/iommu_acpi.c | 88 +++++++++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index b175645fde..177e656f12 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -836,12 +836,12 @@ Controls for the dom0 IOMMU setup. Typically, some devices in a system use bits of RAM for communication, and these areas should be listed as reserved in the E820 table and identified - via RMRR or IVMD entries in the APCI tables, so Xen can ensure that they + via RMRR or IVMD entries in the ACPI tables, so Xen can ensure that they are identity-mapped in the IOMMU. However, some firmware makes mistakes, and this option is a coarse-grain workaround for those errors. Where possible, finer grain corrections should be made with the `rmrr=`, - `ivrs_hpet=` or `ivrs_ioapic=` command line options. + `ivmd=`, `ivrs_hpet[]=`, or `ivrs_ioapic[]=` command line options. This option is disabled by default, and deprecated and intended for removal in future versions of Xen. If specifying `map-inclusive` is the @@ -1523,6 +1523,31 @@ _dom0-iommu=map-inclusive_ - using both options in combination is undefined.** > `= ` ### irq_vector_map (x86) + +### ivmd (x86) +> `= [-][=[-][,[-][,...]]][;...]` + +Define IVMD-like ranges that are missing from ACPI tables along with the +device(s) they belong to, and use them for 1:1 mapping. End addresses can be +omitted when exactly one page is meant. The ranges are inclusive when start +and end are specified. Note that only PCI segment 0 is supported at this time, +but it is fine to specify it explicitly. + +'start' and 'end' values are page numbers (not full physical addresses), +in hexadecimal format (can optionally be preceded by "0x"). + +Omitting the optional (range of) BDF spcifiers signals that the range is to +be applied to all devices. + +Usage example: If device 0:0:1d.0 requires one page (0xd5d45) to be +reserved, and devices 0:0:1a.0...0:0:1a.3 collectively require three pages +(0xd5d46 thru 0xd5d48) to be reserved, one usage would be: + +ivmd=d5d45=0:1d.0;0xd5d46-0xd5d48=0:1a.0-0:1a.3 + +Note: grub2 requires to escape or quote special characters, like ';' when +multiple ranges are specified - refer to the grub2 documentation. + ### ivrs_hpet[``] (AMD) > `=[:]:.` diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 0860b23c88..53f4b61d0d 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -1049,6 +1049,9 @@ static void __init dump_acpi_table_header(struct acpi_table_header *table) } +static struct acpi_ivrs_memory __initdata user_ivmds[8]; +static unsigned int __initdata nr_ivmd; + #define to_ivhd_block(hdr) \ container_of(hdr, const struct acpi_ivrs_hardware, header) #define to_ivmd_block(hdr) \ @@ -1072,7 +1075,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) { const struct acpi_ivrs_header *ivrs_block; unsigned long length; - unsigned int apic; + unsigned int apic, i; bool_t sb_ioapic = !iommu_intremap; int error = 0; @@ -1107,6 +1110,12 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) length += ivrs_block->length; } + /* Add command line specified IVMD-equivalents. */ + if ( nr_ivmd ) + AMD_IOMMU_DEBUG("IVMD: %u command line provided entries\n", nr_ivmd); + for ( i = 0; !error && i < nr_ivmd; ++i ) + error = parse_ivmd_block(user_ivmds + i); + /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) { @@ -1348,3 +1357,80 @@ int __init amd_iommu_get_supported_ivhd_type(void) { return acpi_table_parse(ACPI_SIG_IVRS, get_supported_ivhd_type); } + +/* + * Parse "ivmd" command line option to later add the parsed devices / regions + * into unity mapping lists, just like IVMDs parsed from ACPI. + * Format: + * ivmd=[-][=[-'][,[-'][,...]]][;...] + */ +static int __init parse_ivmd_param(const char *s) +{ + do { + unsigned long start, end; + const char *cur; + + if ( nr_ivmd >= ARRAY_SIZE(user_ivmds) ) + return -E2BIG; + + start = simple_strtoul(cur = s, &s, 16); + if ( cur == s ) + return -EINVAL; + + if ( *s == '-' ) + { + end = simple_strtoul(cur = s + 1, &s, 16); + if ( cur == s || end < start ) + return -EINVAL; + } + else + end = start; + + if ( *s != '=' ) + { + user_ivmds[nr_ivmd].start_address = start << PAGE_SHIFT; + user_ivmds[nr_ivmd].memory_length = (end - start + 1) << PAGE_SHIFT; + user_ivmds[nr_ivmd].header.flags = ACPI_IVMD_UNITY | + ACPI_IVMD_READ | ACPI_IVMD_WRITE; + user_ivmds[nr_ivmd].header.length = sizeof(*user_ivmds); + user_ivmds[nr_ivmd].header.type = ACPI_IVRS_TYPE_MEMORY_ALL; + ++nr_ivmd; + continue; + } + + do { + unsigned int seg, bus, dev, func; + + if ( nr_ivmd >= ARRAY_SIZE(user_ivmds) ) + return -E2BIG; + + s = parse_pci(s + 1, &seg, &bus, &dev, &func); + if ( !s || seg ) + return -EINVAL; + + user_ivmds[nr_ivmd].start_address = start << PAGE_SHIFT; + user_ivmds[nr_ivmd].memory_length = (end - start + 1) << PAGE_SHIFT; + user_ivmds[nr_ivmd].header.flags = ACPI_IVMD_UNITY | + ACPI_IVMD_READ | ACPI_IVMD_WRITE; + user_ivmds[nr_ivmd].header.length = sizeof(*user_ivmds); + user_ivmds[nr_ivmd].header.device_id = PCI_BDF(bus, dev, func); + user_ivmds[nr_ivmd].header.type = ACPI_IVRS_TYPE_MEMORY_ONE; + + if ( *s == '-' ) + { + s = parse_pci(s + 1, &seg, &bus, &dev, &func); + if ( !s || seg ) + return -EINVAL; + + user_ivmds[nr_ivmd].aux_data = PCI_BDF(bus, dev, func); + if ( user_ivmds[nr_ivmd].aux_data < + user_ivmds[nr_ivmd].header.device_id ) + return -EINVAL; + user_ivmds[nr_ivmd].header.type = ACPI_IVRS_TYPE_MEMORY_RANGE; + } + } while ( ++nr_ivmd, *s == ',' ); + } while ( *s++ == ';' ); + + return s[-1] ? -EINVAL : 0; +} +custom_param("ivmd", parse_ivmd_param); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:51:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:51:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202408.357250 (Exim 4.92) (envelope-from ) id 1mXpXO-00050q-Kt; Tue, 05 Oct 2021 18:51:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202408.357250; Tue, 05 Oct 2021 18:51:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXO-00050h-Ht; Tue, 05 Oct 2021 18:51:38 +0000 Received: by outflank-mailman (input) for mailman id 202408; Tue, 05 Oct 2021 18:51:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXN-00050X-KI for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXN-00023j-Je for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpXN-00014K-Is for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:37 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nXVWwVzVA3Mzw4K3fbI4Zpmj9m9ROZjTG8EIEh2aeGU=; b=f9uimu89zw5twxJ/XaZqUUNkxn ItOjYbbZaWfvyXFFNC1BVPdrJlt28EbfEDfVCmqLW+14/xC+sOb7gqdOWe0JE5+bHxWC3GytkmjcM o/ZbyMcY5toMdhDVqtM0xCC0MK0v0tCCwcsKWV4ujFDwrzmrBpGcB72QNEMaT7TOYXG8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mem_sharing: don't lock parent during fork reset Message-Id: Date: Tue, 05 Oct 2021 18:51:37 +0000 commit 01a8a51412343b8243403bbbaf0859db9a1edfab Author: Tamas K Lengyel AuthorDate: Wed Sep 22 16:17:54 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 22 16:17:54 2021 +0200 x86/mem_sharing: don't lock parent during fork reset During fork reset operation the parent domain doesn't need to be gathered using rcu_lock_live_remote_domain_by_id, the fork already has the parent pointer. Signed-off-by: Tamas K Lengyel Reviewed-by: Jan Beulich --- xen/arch/x86/mm/mem_sharing.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 8d5d44bdbc..74d2869c0e 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1861,9 +1861,9 @@ static int fork(struct domain *cd, struct domain *d) done: if ( rc && rc != -ERESTART ) { + cd->parent = NULL; domain_unpause(d); put_domain(d); - cd->parent = NULL; } return rc; @@ -1879,9 +1879,10 @@ static int fork(struct domain *cd, struct domain *d) * footprints the hypercall continuation should be implemented (or if this * feature needs to be become "stable"). */ -static int mem_sharing_fork_reset(struct domain *d, struct domain *pd) +static int mem_sharing_fork_reset(struct domain *d) { int rc; + struct domain *pd = d->parent; struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *page, *tmp; @@ -2226,8 +2227,6 @@ int mem_sharing_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_sharing_op_t) arg) case XENMEM_sharing_op_fork_reset: { - struct domain *pd; - rc = -EINVAL; if ( mso.u.fork.pad || mso.u.fork.flags ) goto out; @@ -2236,13 +2235,7 @@ int mem_sharing_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_sharing_op_t) arg) if ( !d->parent ) goto out; - rc = rcu_lock_live_remote_domain_by_id(d->parent->domain_id, &pd); - if ( rc ) - goto out; - - rc = mem_sharing_fork_reset(d, pd); - - rcu_unlock_domain(pd); + rc = mem_sharing_fork_reset(d); break; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:51:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:51:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202409.357254 (Exim 4.92) (envelope-from ) id 1mXpXY-00053c-MX; Tue, 05 Oct 2021 18:51:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202409.357254; Tue, 05 Oct 2021 18:51:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXY-00053W-JN; Tue, 05 Oct 2021 18:51:48 +0000 Received: by outflank-mailman (input) for mailman id 202409; Tue, 05 Oct 2021 18:51:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXX-00053J-NW for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXX-00023v-Mp for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpXX-000150-M3 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ubSH6ghRFlVM9BEvITTlDvP0VhYPLqwTZZtPU3Iw0nQ=; b=vbFwHY0PVSFCbEk1q6H4EbrY0M oE1/aMfOwB4zpSuGb9kRokQWbLse7T9mGGAa7EzLp8YTA7tfuZnCURYAMx9a3x+xFX57hJTgmkuGr Cxa7DS+NAeprAi7SNakc5ocu3l4LQQCKMnMp8QKD4q5LsOkUAIZGEsN5TXBFWw2PjZ/M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] mm: fix broken tainted value in mark_page_free Message-Id: Date: Tue, 05 Oct 2021 18:51:47 +0000 commit 289610483fc43e4082f0fc00c0ea8bca571b7ee5 Author: Penny Zheng AuthorDate: Wed Sep 22 16:18:30 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 22 16:18:30 2021 +0200 mm: fix broken tainted value in mark_page_free Commit 540a637c3410780b519fc055f432afe271f642f8 defines a new helper mark_page_free to extract common codes, while it accidently breaks the local variable "tainted". This patch fix it by letting mark_page_free() return bool of whether the page is offlined and rename local variable "tainted" to "pg_offlined". Coverity ID: 1491872 Fixes: 540a637c3410 ("xen: introduce mark_page_free") Signed-off-by: Penny Zheng Acked-by: Jan Beulich --- xen/common/page_alloc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 6142c7bb6a..5801358b4b 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1380,8 +1380,10 @@ bool scrub_free_pages(void) return node_to_scrub(false) != NUMA_NO_NODE; } -static void mark_page_free(struct page_info *pg, mfn_t mfn) +static bool mark_page_free(struct page_info *pg, mfn_t mfn) { + bool pg_offlined = false; + ASSERT(mfn_x(mfn) == mfn_x(page_to_mfn(pg))); /* @@ -1405,7 +1407,7 @@ static void mark_page_free(struct page_info *pg, mfn_t mfn) case PGC_state_offlining: pg->count_info = (pg->count_info & PGC_broken) | PGC_state_offlined; - tainted = 1; + pg_offlined = true; break; default: @@ -1425,6 +1427,8 @@ static void mark_page_free(struct page_info *pg, mfn_t mfn) /* This page is not a guest frame any more. */ page_set_owner(pg, NULL); /* set_gpfn_from_mfn snoops pg owner */ set_gpfn_from_mfn(mfn_x(mfn), INVALID_M2P_ENTRY); + + return pg_offlined; } /* Free 2^@order set of pages. */ @@ -1433,7 +1437,7 @@ static void free_heap_pages( { unsigned long mask; mfn_t mfn = page_to_mfn(pg); - unsigned int i, node = phys_to_nid(mfn_to_maddr(mfn)), tainted = 0; + unsigned int i, node = phys_to_nid(mfn_to_maddr(mfn)), pg_offlined = 0; unsigned int zone = page_to_zone(pg); ASSERT(order <= MAX_ORDER); @@ -1443,7 +1447,8 @@ static void free_heap_pages( for ( i = 0; i < (1 << order); i++ ) { - mark_page_free(&pg[i], mfn_add(mfn, i)); + if ( mark_page_free(&pg[i], mfn_add(mfn, i)) ) + pg_offlined = 1; if ( need_scrub ) { @@ -1517,7 +1522,7 @@ static void free_heap_pages( page_list_add_scrub(pg, node, zone, order, pg->u.free.first_dirty); - if ( tainted ) + if ( pg_offlined ) reserve_offlined_page(pg); spin_unlock(&heap_lock); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:51:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:51:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202410.357258 (Exim 4.92) (envelope-from ) id 1mXpXi-00056f-O5; Tue, 05 Oct 2021 18:51:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202410.357258; Tue, 05 Oct 2021 18:51:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXi-00056W-Ku; Tue, 05 Oct 2021 18:51:58 +0000 Received: by outflank-mailman (input) for mailman id 202410; Tue, 05 Oct 2021 18:51:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXh-00056F-Qt for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXh-000246-QD for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpXh-000160-PI for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:51:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mgYqYVX6/Z7hGnoWRLGUGX6+l5C9xSQtm5GmYyy6LlI=; b=h9YLJyilLrBohfZ920C9xnAvBR 3FJbuFPlGr8eMjCExK23MTH98K27PYa/hfBWbgu5Sc/ksSlvWcrXSzKUSYfrXN1SfO11BUWjjrL37 12gFFzgkxZGKWcz2PdNKEJvXtjPV4JiXtM2E+h+U2UYc1cYssQgESOtQOCwu08kKVj08=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: drop a bogus SHARED_M2P() check from PV Dom0 building code Message-Id: Date: Tue, 05 Oct 2021 18:51:57 +0000 commit 604be1b333b1b66052ab9b0133f156890549a4f0 Author: Jan Beulich AuthorDate: Wed Sep 22 16:19:21 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 22 16:19:21 2021 +0200 x86: drop a bogus SHARED_M2P() check from PV Dom0 building code If anything, a check covering a wider range of invalid M2P entries ought to be used (e.g. VALID_M2P()). But since everything is fully under Xen's control at this stage, simply remove the BUG_ON(). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/pv/dom0_build.c | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index 77efd3918c..cb68da75c1 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -821,7 +821,6 @@ int __init dom0_construct_pv(struct domain *d, page_list_for_each ( page, &d->page_list ) { mfn = mfn_x(page_to_mfn(page)); - BUG_ON(SHARED_M2P(get_gpfn_from_mfn(mfn))); if ( get_gpfn_from_mfn(mfn) >= count ) { BUG_ON(compat); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:52:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:52:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202411.357262 (Exim 4.92) (envelope-from ) id 1mXpXs-00059T-PQ; Tue, 05 Oct 2021 18:52:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202411.357262; Tue, 05 Oct 2021 18:52:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXs-00059L-MQ; Tue, 05 Oct 2021 18:52:08 +0000 Received: by outflank-mailman (input) for mailman id 202411; Tue, 05 Oct 2021 18:52:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXr-00059E-U9 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpXr-00024U-TS for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpXr-00016s-Sl for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FnNEEYDRIDJd3DyZoLNDuR4DMcNoVJgJ2viaB9NbBdw=; b=yjuGio6u+Ju8iAkV4G0H4VAoQ4 kdrg6IjuPQmm0A8x3xRXJ0dNOLbRMWbbwbtMKpcNb8fXkrE5PH456KtaU8RIvHYZtTScuirNupKFa GaLdpS8rw7SVeriT6ZJFWi5RIOOPdZSscdAPyhaRLg6qR8E1KNxD7FuHfXZJJkE2Rixc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] common: guest_physmap_add_page()'s return value needs checking Message-Id: Date: Tue, 05 Oct 2021 18:52:07 +0000 commit a16cf950fc22fe269d9bbbae270203811bafab67 Author: Jan Beulich AuthorDate: Fri Sep 24 11:00:30 2021 +0200 Commit: Jan Beulich CommitDate: Fri Sep 24 11:00:30 2021 +0200 common: guest_physmap_add_page()'s return value needs checking The function may fail; it is not correct to indicate "success" in this case up the call stack. Mark the function must-check to prove all cases have been caught (and no new ones will get introduced). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Ian Jackson Acked-by: Stefano Stabellini --- xen/common/grant_table.c | 6 +++--- xen/common/memory.c | 7 ++++--- xen/include/asm-arm/p2m.h | 7 +++---- xen/include/asm-x86/p2m.h | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index fe1fc11b22..e510395d08 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2394,7 +2394,7 @@ gnttab_transfer( { grant_entry_v1_t *sha = &shared_entry_v1(e->grant_table, gop.ref); - guest_physmap_add_page(e, _gfn(sha->frame), mfn, 0); + rc = guest_physmap_add_page(e, _gfn(sha->frame), mfn, 0); if ( !paging_mode_translate(e) ) sha->frame = mfn_x(mfn); } @@ -2402,7 +2402,7 @@ gnttab_transfer( { grant_entry_v2_t *sha = &shared_entry_v2(e->grant_table, gop.ref); - guest_physmap_add_page(e, _gfn(sha->full_page.frame), mfn, 0); + rc = guest_physmap_add_page(e, _gfn(sha->full_page.frame), mfn, 0); if ( !paging_mode_translate(e) ) sha->full_page.frame = mfn_x(mfn); } @@ -2415,7 +2415,7 @@ gnttab_transfer( rcu_unlock_domain(e); - gop.status = GNTST_okay; + gop.status = rc ? GNTST_general_error : GNTST_okay; copyback: if ( unlikely(__copy_field_to_guest(uop, &gop, status)) ) diff --git a/xen/common/memory.c b/xen/common/memory.c index f333c994c8..30d255da35 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -268,7 +268,8 @@ static void populate_physmap(struct memop_args *a) mfn = page_to_mfn(page); } - guest_physmap_add_page(d, _gfn(gpfn), mfn, a->extent_order); + if ( guest_physmap_add_page(d, _gfn(gpfn), mfn, a->extent_order) ) + goto out; if ( !paging_mode_translate(d) && /* Inform the domain of the new page's machine address. */ @@ -765,8 +766,8 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) } mfn = page_to_mfn(page); - guest_physmap_add_page(d, _gfn(gpfn), mfn, - exch.out.extent_order); + rc = guest_physmap_add_page(d, _gfn(gpfn), mfn, + exch.out.extent_order) ?: rc; if ( !paging_mode_translate(d) && __copy_mfn_to_guest_offset(exch.out.extent_start, diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index f885cc522b..8f11d9c97b 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -310,10 +310,9 @@ int guest_physmap_add_entry(struct domain *d, p2m_type_t t); /* Untyped version for RAM only, for compatibility */ -static inline int guest_physmap_add_page(struct domain *d, - gfn_t gfn, - mfn_t mfn, - unsigned int page_order) +static inline int __must_check +guest_physmap_add_page(struct domain *d, gfn_t gfn, mfn_t mfn, + unsigned int page_order) { return guest_physmap_add_entry(d, gfn, mfn, page_order, p2m_ram_rw); } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index c6d41ac0b6..357a808748 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -583,8 +583,8 @@ int guest_physmap_add_entry(struct domain *d, gfn_t gfn, p2m_type_t t); /* Untyped version for RAM only, for compatibility and PV. */ -int guest_physmap_add_page(struct domain *d, gfn_t gfn, mfn_t mfn, - unsigned int page_order); +int __must_check guest_physmap_add_page(struct domain *d, gfn_t gfn, mfn_t mfn, + unsigned int page_order); /* Set a p2m range as populate-on-demand */ int guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long gfn, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:52:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:52:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202412.357266 (Exim 4.92) (envelope-from ) id 1mXpY2-0005CD-R1; Tue, 05 Oct 2021 18:52:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202412.357266; Tue, 05 Oct 2021 18:52:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpY2-0005C5-Nz; Tue, 05 Oct 2021 18:52:18 +0000 Received: by outflank-mailman (input) for mailman id 202412; Tue, 05 Oct 2021 18:52:18 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpY2-0005By-0q for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:18 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpY2-00024u-09 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:18 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpY1-000180-Vm for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1DGAAsCWiu1DSu8N1Z0MHDJ2ULR1kAKlRGBLADK2dAg=; b=B1BMvWsxbzXOG3oFIZ3o/et9I4 hcgQy6cpXC9ZMNHEQ0PQJRjIA+noosBCkEzB89XE9pawg+Bd+sCTDUUtTQsN/HrYBzm8BAvzEB4gM wsgrNV2rQLr9/ihheIUT8FzFBCs6wmvIGMynYo1VS7V70gAlPnFA9pMdV6UuwDLe2IgI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: initialize memnodemapsize while faking NUMA node Message-Id: Date: Tue, 05 Oct 2021 18:52:17 +0000 commit 728998f6f2b7e1420e771236efec65cbf6143b7b Author: Wei Chen AuthorDate: Fri Sep 24 11:02:20 2021 +0200 Commit: Jan Beulich CommitDate: Fri Sep 24 11:02:20 2021 +0200 x86: initialize memnodemapsize while faking NUMA node When system turns NUMA off or system lacks of NUMA support, Xen will fake a NUMA node to make system works as a single node NUMA system. In this case the memory node map doesn't need to be allocated from boot pages, it will use the _memnodemap directly. But memnodemapsize hasn't been set. Xen should assert in phys_to_nid. Because x86 was using an empty macro "VIRTUAL_BUG_ON" to replace ASSERT, this bug will not be triggered on x86. Actually, Xen will only use 1 slot of memnodemap in this case. So we set memnodemap[0] to 0 and memnodemapsize to 1 in this patch to fix it. Signed-off-by: Wei Chen Acked-by: Jan Beulich --- xen/arch/x86/numa.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index f1066c59c7..ce79ee44ce 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -270,6 +270,10 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) /* setup dummy node covering all memory */ memnode_shift = BITS_PER_LONG - 1; memnodemap = _memnodemap; + /* Dummy node only uses 1 slot in reality */ + memnodemap[0] = 0; + memnodemapsize = 1; + nodes_clear(node_online_map); node_set_online(0); for ( i = 0; i < nr_cpu_ids; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:52:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:52:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202413.357270 (Exim 4.92) (envelope-from ) id 1mXpYC-0005FZ-Tw; Tue, 05 Oct 2021 18:52:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202413.357270; Tue, 05 Oct 2021 18:52:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYC-0005FR-R4; Tue, 05 Oct 2021 18:52:28 +0000 Received: by outflank-mailman (input) for mailman id 202413; Tue, 05 Oct 2021 18:52:28 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYC-0005FF-3q for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:28 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYC-000255-37 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:28 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpYC-00018d-2O for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:28 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KoD7/ZFN5FCeQuewg7ytev6ePkdjIKG6Svao2FJILs8=; b=Ngpowy1/LftB25WZjt3ErQg2gg cJzlK0hkdI6+yV7UbIpI9oxWCRW9SeDdx5G2cmCQZMSDNAjafz4UC06DJuHHdZZnEcOMGMhgaiqGS c7hLz2XgM80xiHKVWlqQjfOL9YRXUEkMwtPUrBAqIPWpgChHWyw54VXIsx0hrzPd+0sQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxl: Correctly align the ACPI tables Message-Id: Date: Tue, 05 Oct 2021 18:52:28 +0000 commit dd6c062a7a4abdb662c18af03d1396325969d155 Author: Kevin Stefanov AuthorDate: Wed Sep 15 15:30:00 2021 +0100 Commit: Ian Jackson CommitDate: Fri Sep 24 11:07:50 2021 +0100 tools/libxl: Correctly align the ACPI tables The memory allocator currently calculates alignment in libxl's virtual address space, rather than guest physical address space. This results in the FACS being commonly misaligned. Furthermore, the allocator has several other bugs. The opencoded align-up calculation is currently susceptible to a bug that occurs in the corner case that the buffer is already aligned to begin with. In that case, an align-sized memory hole is introduced. The while loop is dead logic because its effects are entirely and unconditionally overwritten immediately after it. Rework the memory allocator to align in guest physical address space instead of libxl's virtual memory and improve the calculation, drop errant extra page in allocated buffer for ACPI tables, and give some of the variables better names/types. Fixes: 14c0d328da2b ("libxl/acpi: Build ACPI tables for HVMlite guests") Signed-off-by: Kevin Stefanov Reviewed-by: Jan Beulich Acked-by: Ian Jackson --- tools/libs/light/libxl_x86_acpi.c | 49 +++++++++++++++------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/tools/libs/light/libxl_x86_acpi.c b/tools/libs/light/libxl_x86_acpi.c index 3eca1c7a9f..57a6b63790 100644 --- a/tools/libs/light/libxl_x86_acpi.c +++ b/tools/libs/light/libxl_x86_acpi.c @@ -20,6 +20,7 @@ /* Number of pages holding ACPI tables */ #define NUM_ACPI_PAGES 16 +#define ALIGN(p, a) (((p) + ((a) - 1)) & ~((a) - 1)) struct libxl_acpi_ctxt { struct acpi_ctxt c; @@ -28,10 +29,10 @@ struct libxl_acpi_ctxt { unsigned int page_shift; /* Memory allocator */ - unsigned long alloc_base_paddr; - unsigned long alloc_base_vaddr; - unsigned long alloc_currp; - unsigned long alloc_end; + unsigned long guest_start; + unsigned long guest_curr; + unsigned long guest_end; + void *buf; }; extern const unsigned char dsdt_pvh[]; @@ -43,8 +44,7 @@ static unsigned long virt_to_phys(struct acpi_ctxt *ctxt, void *v) struct libxl_acpi_ctxt *libxl_ctxt = CONTAINER_OF(ctxt, struct libxl_acpi_ctxt, c); - return (((unsigned long)v - libxl_ctxt->alloc_base_vaddr) + - libxl_ctxt->alloc_base_paddr); + return libxl_ctxt->guest_start + (v - libxl_ctxt->buf); } static void *mem_alloc(struct acpi_ctxt *ctxt, @@ -58,20 +58,16 @@ static void *mem_alloc(struct acpi_ctxt *ctxt, if (align < 16) align = 16; - s = (libxl_ctxt->alloc_currp + align) & ~((unsigned long)align - 1); + s = ALIGN(libxl_ctxt->guest_curr, align); e = s + size - 1; /* TODO: Reallocate memory */ - if ((e < s) || (e >= libxl_ctxt->alloc_end)) + if ((e < s) || (e >= libxl_ctxt->guest_end)) return NULL; - while (libxl_ctxt->alloc_currp >> libxl_ctxt->page_shift != - e >> libxl_ctxt->page_shift) - libxl_ctxt->alloc_currp += libxl_ctxt->page_size; + libxl_ctxt->guest_curr = e; - libxl_ctxt->alloc_currp = e; - - return (void *)s; + return libxl_ctxt->buf + (s - libxl_ctxt->guest_start); } static void acpi_mem_free(struct acpi_ctxt *ctxt, @@ -163,15 +159,12 @@ int libxl__dom_load_acpi(libxl__gc *gc, struct acpi_config config = {0}; struct libxl_acpi_ctxt libxl_ctxt; int rc = 0, acpi_pages_num; - void *acpi_pages; - unsigned long page_mask; if (b_info->type != LIBXL_DOMAIN_TYPE_PVH) goto out; libxl_ctxt.page_size = XC_DOM_PAGE_SIZE(dom); libxl_ctxt.page_shift = XC_DOM_PAGE_SHIFT(dom); - page_mask = (1UL << libxl_ctxt.page_shift) - 1; libxl_ctxt.c.mem_ops.alloc = mem_alloc; libxl_ctxt.c.mem_ops.v2p = virt_to_phys; @@ -186,19 +179,17 @@ int libxl__dom_load_acpi(libxl__gc *gc, config.rsdp = (unsigned long)libxl__malloc(gc, libxl_ctxt.page_size); config.infop = (unsigned long)libxl__malloc(gc, libxl_ctxt.page_size); /* Pages to hold ACPI tables */ - acpi_pages = libxl__malloc(gc, (NUM_ACPI_PAGES + 1) * - libxl_ctxt.page_size); + libxl_ctxt.buf = libxl__malloc(gc, NUM_ACPI_PAGES * + libxl_ctxt.page_size); /* * Set up allocator memory. * Start next to acpi_info page to avoid fracturing e820. */ - libxl_ctxt.alloc_base_paddr = ACPI_INFO_PHYSICAL_ADDRESS + - libxl_ctxt.page_size; - libxl_ctxt.alloc_base_vaddr = libxl_ctxt.alloc_currp = - (unsigned long)acpi_pages; - libxl_ctxt.alloc_end = (unsigned long)acpi_pages + - (NUM_ACPI_PAGES * libxl_ctxt.page_size); + libxl_ctxt.guest_start = libxl_ctxt.guest_curr = libxl_ctxt.guest_end = + ACPI_INFO_PHYSICAL_ADDRESS + libxl_ctxt.page_size; + + libxl_ctxt.guest_end += NUM_ACPI_PAGES * libxl_ctxt.page_size; /* Build the tables. */ rc = acpi_build_tables(&libxl_ctxt.c, &config); @@ -208,10 +199,8 @@ int libxl__dom_load_acpi(libxl__gc *gc, } /* Calculate how many pages are needed for the tables. */ - acpi_pages_num = - ((libxl_ctxt.alloc_currp - (unsigned long)acpi_pages) - >> libxl_ctxt.page_shift) + - ((libxl_ctxt.alloc_currp & page_mask) ? 1 : 0); + acpi_pages_num = (ALIGN(libxl_ctxt.guest_curr, libxl_ctxt.page_size) - + libxl_ctxt.guest_start) >> libxl_ctxt.page_shift; dom->acpi_modules[0].data = (void *)config.rsdp; dom->acpi_modules[0].length = 64; @@ -231,7 +220,7 @@ int libxl__dom_load_acpi(libxl__gc *gc, dom->acpi_modules[1].length = 4096; dom->acpi_modules[1].guest_addr_out = ACPI_INFO_PHYSICAL_ADDRESS; - dom->acpi_modules[2].data = acpi_pages; + dom->acpi_modules[2].data = libxl_ctxt.buf; dom->acpi_modules[2].length = acpi_pages_num << libxl_ctxt.page_shift; dom->acpi_modules[2].guest_addr_out = ACPI_INFO_PHYSICAL_ADDRESS + libxl_ctxt.page_size; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:52:40 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:52:40 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202414.357274 (Exim 4.92) (envelope-from ) id 1mXpYN-0005IR-Va; Tue, 05 Oct 2021 18:52:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202414.357274; Tue, 05 Oct 2021 18:52:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYN-0005IJ-Sd; Tue, 05 Oct 2021 18:52:39 +0000 Received: by outflank-mailman (input) for mailman id 202414; Tue, 05 Oct 2021 18:52:38 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYM-0005Hs-6w for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:38 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYM-00025I-6D for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:38 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpYM-00019J-5M for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:38 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5tYr9kSxIjiBOak1IfTaXue6cmqRcQVifa9o5vB8QRM=; b=OD560xU52FbXIqYtnPXwHShxgi LDDjomqKx4IaW6vUN23rlPVUSqxWDyd8jWUXrYAzhRDQdsmyjBpmkIjaiz1ATGS1xrPIyVEtx0xpL M3JMoKS3GZVYAgBqbHQteQrjPDbzKjFk/afmrH722+KrzIv9ILAHAx4drWBCT/Di11Us=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Config.mk: update OVMF to edk2-stable202108 Message-Id: Date: Tue, 05 Oct 2021 18:52:38 +0000 commit 8d73459193ad5d3e6bd220f3092643f3b1e44df2 Author: Anthony PERARD AuthorDate: Tue Aug 31 13:36:37 2021 +0100 Commit: Ian Jackson CommitDate: Tue Sep 28 12:47:50 2021 +0100 Config.mk: update OVMF to edk2-stable202108 Update to the latest stable tag. Signed-off-by: Anthony PERARD --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index 4d723eec1d..82b0c7c227 100644 --- a/Config.mk +++ b/Config.mk @@ -244,7 +244,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a +OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5 QEMU_UPSTREAM_REVISION ?= master MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:52:50 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:52:50 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202415.357278 (Exim 4.92) (envelope-from ) id 1mXpYY-0005L7-0m; Tue, 05 Oct 2021 18:52:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202415.357278; Tue, 05 Oct 2021 18:52:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYX-0005Kz-UA; Tue, 05 Oct 2021 18:52:49 +0000 Received: by outflank-mailman (input) for mailman id 202415; Tue, 05 Oct 2021 18:52:48 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYW-0005Kn-Bq for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:48 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYW-00025Z-B8 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:48 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpYW-0001AT-AR for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:48 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Pvm7Xc39fssbd7CUjDHwTmup1dpoumszTWp3lFSsW98=; b=lm/fd++XoGkFeU1JK1rTrEABV8 PgOjCkpGizmWHypwY/r7NNI/BHYruVMDd31gXgi/kzIBNvHs35bCK8wileYZhvhT/4ALLDRkguD2g iyKdHnfSmXhW28D5zm6fnE/hP6AKb9HBDbwKWSIU/w46ko3mY39udJTMu8LXnAQrZ5Zk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Config: use Mini-OS commit 9f09744aa3e5982 for xen-unstable Message-Id: Date: Tue, 05 Oct 2021 18:52:48 +0000 commit afacb0a98fca2c9848b67a60aea4f1ce8c5268a9 Author: Juergen Gross AuthorDate: Wed Sep 8 14:52:32 2021 +0200 Commit: Ian Jackson CommitDate: Mon Sep 27 15:34:56 2021 +0100 Config: use Mini-OS commit 9f09744aa3e5982 for xen-unstable Switch the used Mini-OS commit to 9f09744aa3e5982 in xen-unstable. [ 9f09744aa3e5982 is current mini-os.git#master -iwj. ] Signed-off-by: Juergen Gross Acked-by: Ian Jackson --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index 4d723eec1d..e85bf18654 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5 +MINIOS_UPSTREAM_REVISION ?= 9f09744aa3e5982a083ecf8e9cd2123f477081f9 SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:53:00 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:53:00 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202416.357282 (Exim 4.92) (envelope-from ) id 1mXpYi-0005ON-2L; Tue, 05 Oct 2021 18:53:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202416.357282; Tue, 05 Oct 2021 18:53:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYh-0005OF-Vh; Tue, 05 Oct 2021 18:52:59 +0000 Received: by outflank-mailman (input) for mailman id 202416; Tue, 05 Oct 2021 18:52:58 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYg-0005O4-Ej for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:58 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYg-00025n-E3 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:58 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpYg-0001B1-DR for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:52:58 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=igeK3gcN6wBUY68nxBkYJUwgdT3eJqqH/m6mfAsT1rM=; b=rqYVlj5IZv8G1IlkwlErG44K4i hLObFu7kMwkRgBwsjemBsmJXBdld3Y2KRy7qgATkJe4WQe7UczdJ+wHf/PlhbjpTbVff1t8zb4pFs Yc4styZVzM9GuWjtHU/+ubDBVJsFhrHdEUIGbq4iRek0ePnsRrDlCKzchdaxX+4xdcqc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs: fix build of stubdoms Message-Id: Date: Tue, 05 Oct 2021 18:52:58 +0000 commit 2e46d73b4c7562f7b104e9e10fe302316af13959 Author: Juergen Gross AuthorDate: Wed Sep 8 14:43:03 2021 +0200 Commit: Ian Jackson CommitDate: Mon Sep 27 15:36:18 2021 +0100 tools/libs: fix build of stubdoms In case abi-dumper is available the stubdom builds will fail due to a false dependency on dynamic loadable libraries. Fix that. Fixes: d7c9f7a7a3959913b4 ("tools/libs: Write out an ABI analysis when abi-dumper is available") Signed-off-by: Juergen Gross Acked-by: Andrew Cooper --- tools/libs/libs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 84130ccbaf..ebdb2a4782 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -98,10 +98,12 @@ lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map # If abi-dumper is available, write out the ABI analysis ifneq ($(ABI_DUMPER),) +ifneq ($(nosharedlibs),y) libs: $(PKG_ABI) $(PKG_ABI): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) headers.lst $(ABI_DUMPER) $< -o $@ -public-headers headers.lst -lver $(MAJOR).$(MINOR) endif +endif .PHONY: install install: build -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:53:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:53:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202417.357286 (Exim 4.92) (envelope-from ) id 1mXpYs-0005R4-3x; Tue, 05 Oct 2021 18:53:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202417.357286; Tue, 05 Oct 2021 18:53:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYs-0005Qv-0u; Tue, 05 Oct 2021 18:53:10 +0000 Received: by outflank-mailman (input) for mailman id 202417; Tue, 05 Oct 2021 18:53:08 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYq-0005Qh-Hj for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:08 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpYq-00027i-Gz for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:08 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpYq-0001C4-GM for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:08 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4PdeYLd3/6rNYakJ3toQf4d6KIyV+3zaGGaLPksQTKs=; b=CqUugEcUCWcrsif8rH1JaAC8UF oebi5QcDdakfrb2pLrxX4IDg/lqWUUkUnnWGhZ1UwrpqZvgSqWMGRI9aWpbKTZ0wMnXbU8uOeG48H 837AVjtKJINgbJHUZBO+nTv8vmIYFnBRjccKSFwwx/nX/bgCXC+IUWCz8eMTCQEYNRf0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: optee: Fix arm_smccc_smc's a0 for OPTEE_SMC_DISABLE_SHM_CACHE Message-Id: Date: Tue, 05 Oct 2021 18:53:08 +0000 commit 1c3ed9c908732d19660fbe83580674d585464d4c Author: Oleksandr Tyshchenko AuthorDate: Mon Sep 27 16:54:10 2021 +0300 Commit: Stefano Stabellini CommitDate: Mon Sep 27 21:49:54 2021 -0700 xen/arm: optee: Fix arm_smccc_smc's a0 for OPTEE_SMC_DISABLE_SHM_CACHE Fix a possible copy-paste error in arm_smccc_smc's first argument (a0) for OPTEE_SMC_DISABLE_SHM_CACHE case. This error causes Linux > v5.14-rc5 (b5c10dd04b7418793517e3286cde5c04759a86de optee: Clear stale cache entries during initialization) to stuck repeatedly issuing OPTEE_SMC_DISABLE_SHM_CACHE call and waiting for the result to be OPTEE_SMC_RETURN_ENOTAVAIL which will never happen. Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Bertrand Marquis Reviewed-by: Volodymyr Babchuk Acked-by: Stefano Stabellini Fixes: 2e35cdf9b2ca ("xen/arm: optee: add OP-TEE mediator skeleton") Backport: 4.13+ --- xen/arch/arm/tee/optee.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index 345361566e..6df0d44eb9 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -1692,7 +1692,7 @@ static bool optee_handle_call(struct cpu_user_regs *regs) return true; case OPTEE_SMC_DISABLE_SHM_CACHE: - arm_smccc_smc(OPTEE_SMC_ENABLE_SHM_CACHE, 0, 0, 0, 0, 0, 0, + arm_smccc_smc(OPTEE_SMC_DISABLE_SHM_CACHE, 0, 0, 0, 0, 0, 0, OPTEE_CLIENT_ID(current->domain), &resp); set_user_reg(regs, 0, resp.a0); if ( resp.a0 == OPTEE_SMC_RETURN_OK ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:53:20 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:53:20 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202418.357290 (Exim 4.92) (envelope-from ) id 1mXpZ2-0005Tr-5O; Tue, 05 Oct 2021 18:53:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202418.357290; Tue, 05 Oct 2021 18:53:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZ2-0005Ti-2J; Tue, 05 Oct 2021 18:53:20 +0000 Received: by outflank-mailman (input) for mailman id 202418; Tue, 05 Oct 2021 18:53:18 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZ0-0005TU-Kk for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:18 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZ0-00028F-K4 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:18 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpZ0-0001Cj-JH for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:18 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1OKXVHNl4MaGJsuTtpOSJZOUD9sFxm50IF7MvXsmyuw=; b=WzOHupkfynDVvs0OQApr0kLs1f wvRk5vLy+LtyC2Fs5qhBZatin4p3mt8Cod8LIdM5nEUBRvnew1d7VQWabbLilr6GEq8K9K1DtdTRQ QLehBi5mAnGBiOiGkn/DvlY5/LhdS3c+3nv5aJ+eFqJULhOFWiKnDU/lOyWS/EFIp9b8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Merge remote-tracking branch 'origin/staging' into staging Message-Id: Date: Tue, 05 Oct 2021 18:53:18 +0000 commit 890ceb9453171c85e881103e65dbb5cdcf81659e Merge: 8d73459193ad5d3e6bd220f3092643f3b1e44df2 1c3ed9c908732d19660fbe83580674d585464d4c Author: Ian Jackson AuthorDate: Tue Sep 28 12:51:00 2021 +0100 Commit: Ian Jackson CommitDate: Tue Sep 28 12:51:00 2021 +0100 Merge remote-tracking branch 'origin/staging' into staging Config.mk | 2 +- tools/libs/libs.mk | 2 ++ xen/arch/arm/tee/optee.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --cc Config.mk index 82b0c7c227,e85bf18654..e7af4a402d --- a/Config.mk +++ b/Config.mk @@@ -244,9 -244,9 +244,9 @@@ QEMU_TRADITIONAL_URL ?= git://xenbits.x SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a +OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5 QEMU_UPSTREAM_REVISION ?= master - MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5 + MINIOS_UPSTREAM_REVISION ?= 9f09744aa3e5982a083ecf8e9cd2123f477081f9 SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:53:30 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:53:30 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202419.357294 (Exim 4.92) (envelope-from ) id 1mXpZC-0005Wb-6w; Tue, 05 Oct 2021 18:53:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202419.357294; Tue, 05 Oct 2021 18:53:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZC-0005WT-3w; Tue, 05 Oct 2021 18:53:30 +0000 Received: by outflank-mailman (input) for mailman id 202419; Tue, 05 Oct 2021 18:53:28 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZA-0005WK-O6 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:28 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZA-00028Q-NS for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:28 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpZA-0001Dj-Mk for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:28 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zLwUjYP4xeM5omBVmZW4xaz0lgqE/xfS/Gz2aLzTJig=; b=kmylwuTQIa2vN/3lSsgqt1SmZV zABtyQ9UkeD6Jw9xbziy4P06E8pHlN43Fu8XsgMAcymTQVXBdNAvGYbOH4RLS3qpd4XZ8p5N35hzX WpjBFSJBcq1JS9qKGriJfYbYGswFbYHxKLd4rIlgsijJRw6OwQPTncLgDe/GpTU9oz28=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PVH: actually show Dom0's register state from debug key '0' Message-Id: Date: Tue, 05 Oct 2021 18:53:28 +0000 commit 1578322ac6bc4d66800a5a3caf6685f556b64054 Author: Jan Beulich AuthorDate: Tue Sep 28 16:03:38 2021 +0200 Commit: Jan Beulich CommitDate: Tue Sep 28 16:03:38 2021 +0200 x86/PVH: actually show Dom0's register state from debug key '0' vcpu_show_registers() didn't do anything for HVM so far. Note though that some extra hackery is needed for VMX - see the code comment. Note further that the show_guest_stack() invocation is left alone here: While strictly speaking guest_kernel_mode() should be predicated by a PV / !HVM check, show_guest_stack() itself will bail immediately for HVM. While there and despite not being PVH-specific, take the opportunity and filter offline vCPU-s: There's not really any register state associated with them, so avoid spamming the log with useless information while still leaving an indication of the fact. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/traps.c | 26 +++++++++++++ xen/arch/x86/x86_64/traps.c | 95 ++++++++++++++++++++++++++++----------------- 2 files changed, 86 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0cc1ee95cb..c2e2603c39 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -632,6 +632,12 @@ void vcpu_show_execution_state(struct vcpu *v) { unsigned long flags; + if ( test_bit(_VPF_down, &v->pause_flags) ) + { + printk("*** %pv is offline ***\n", v); + return; + } + printk("*** Dumping Dom%d vcpu#%d state: ***\n", v->domain->domain_id, v->vcpu_id); @@ -643,6 +649,21 @@ void vcpu_show_execution_state(struct vcpu *v) vcpu_pause(v); /* acceptably dangerous */ +#ifdef CONFIG_HVM + /* + * For VMX special care is needed: Reading some of the register state will + * require VMCS accesses. Engaging foreign VMCSes involves acquiring of a + * lock, which check_lock() would object to when done from an IRQs-disabled + * region. Despite this being a layering violation, engage the VMCS right + * here. This then also avoids doing so several times in close succession. + */ + if ( cpu_has_vmx && is_hvm_vcpu(v) ) + { + ASSERT(!in_irq()); + vmx_vmcs_enter(v); + } +#endif + /* Prevent interleaving of output. */ flags = console_lock_recursive_irqsave(); @@ -652,6 +673,11 @@ void vcpu_show_execution_state(struct vcpu *v) console_unlock_recursive_irqrestore(flags); +#ifdef CONFIG_HVM + if ( cpu_has_vmx && is_hvm_vcpu(v) ) + vmx_vmcs_exit(v); +#endif + vcpu_unpause(v); } diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 4116ecb9c0..d661d7ffca 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -49,6 +49,39 @@ static void read_registers(struct cpu_user_regs *regs, unsigned long crs[8]) crs[7] = read_gs_shadow(); } +static void get_hvm_registers(struct vcpu *v, struct cpu_user_regs *regs, + unsigned long crs[8]) +{ + struct segment_register sreg; + + crs[0] = v->arch.hvm.guest_cr[0]; + crs[2] = v->arch.hvm.guest_cr[2]; + crs[3] = v->arch.hvm.guest_cr[3]; + crs[4] = v->arch.hvm.guest_cr[4]; + + hvm_get_segment_register(v, x86_seg_cs, &sreg); + regs->cs = sreg.sel; + + hvm_get_segment_register(v, x86_seg_ds, &sreg); + regs->ds = sreg.sel; + + hvm_get_segment_register(v, x86_seg_es, &sreg); + regs->es = sreg.sel; + + hvm_get_segment_register(v, x86_seg_fs, &sreg); + regs->fs = sreg.sel; + crs[5] = sreg.base; + + hvm_get_segment_register(v, x86_seg_gs, &sreg); + regs->gs = sreg.sel; + crs[6] = sreg.base; + + hvm_get_segment_register(v, x86_seg_ss, &sreg); + regs->ss = sreg.sel; + + crs[7] = hvm_get_shadow_gs_base(v); +} + static void _show_registers( const struct cpu_user_regs *regs, unsigned long crs[8], enum context context, const struct vcpu *v) @@ -99,27 +132,8 @@ void show_registers(const struct cpu_user_regs *regs) if ( guest_mode(regs) && is_hvm_vcpu(v) ) { - struct segment_register sreg; + get_hvm_registers(v, &fault_regs, fault_crs); context = CTXT_hvm_guest; - fault_crs[0] = v->arch.hvm.guest_cr[0]; - fault_crs[2] = v->arch.hvm.guest_cr[2]; - fault_crs[3] = v->arch.hvm.guest_cr[3]; - fault_crs[4] = v->arch.hvm.guest_cr[4]; - hvm_get_segment_register(v, x86_seg_cs, &sreg); - fault_regs.cs = sreg.sel; - hvm_get_segment_register(v, x86_seg_ds, &sreg); - fault_regs.ds = sreg.sel; - hvm_get_segment_register(v, x86_seg_es, &sreg); - fault_regs.es = sreg.sel; - hvm_get_segment_register(v, x86_seg_fs, &sreg); - fault_regs.fs = sreg.sel; - fault_crs[5] = sreg.base; - hvm_get_segment_register(v, x86_seg_gs, &sreg); - fault_regs.gs = sreg.sel; - fault_crs[6] = sreg.base; - hvm_get_segment_register(v, x86_seg_ss, &sreg); - fault_regs.ss = sreg.sel; - fault_crs[7] = hvm_get_shadow_gs_base(v); } else { @@ -159,24 +173,35 @@ void show_registers(const struct cpu_user_regs *regs) void vcpu_show_registers(const struct vcpu *v) { const struct cpu_user_regs *regs = &v->arch.user_regs; - bool kernel = guest_kernel_mode(v, regs); + struct cpu_user_regs aux_regs; + enum context context; unsigned long crs[8]; - /* Only handle PV guests for now */ - if ( !is_pv_vcpu(v) ) - return; + if ( is_hvm_vcpu(v) ) + { + aux_regs = *regs; + get_hvm_registers(v->domain->vcpu[v->vcpu_id], &aux_regs, crs); + regs = &aux_regs; + context = CTXT_hvm_guest; + } + else + { + bool kernel = guest_kernel_mode(v, regs); + + crs[0] = v->arch.pv.ctrlreg[0]; + crs[2] = arch_get_cr2(v); + crs[3] = pagetable_get_paddr(kernel ? + v->arch.guest_table : + v->arch.guest_table_user); + crs[4] = v->arch.pv.ctrlreg[4]; + crs[5] = v->arch.pv.fs_base; + crs[6 + !kernel] = v->arch.pv.gs_base_kernel; + crs[7 - !kernel] = v->arch.pv.gs_base_user; + + context = CTXT_pv_guest; + } - crs[0] = v->arch.pv.ctrlreg[0]; - crs[2] = arch_get_cr2(v); - crs[3] = pagetable_get_paddr(kernel ? - v->arch.guest_table : - v->arch.guest_table_user); - crs[4] = v->arch.pv.ctrlreg[4]; - crs[5] = v->arch.pv.fs_base; - crs[6 + !kernel] = v->arch.pv.gs_base_kernel; - crs[7 - !kernel] = v->arch.pv.gs_base_user; - - _show_registers(regs, crs, CTXT_pv_guest, v); + _show_registers(regs, crs, context, v); } void show_page_walk(unsigned long addr) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:53:40 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:53:40 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202420.357297 (Exim 4.92) (envelope-from ) id 1mXpZM-0005bR-9N; Tue, 05 Oct 2021 18:53:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202420.357297; Tue, 05 Oct 2021 18:53:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZM-0005bJ-6c; Tue, 05 Oct 2021 18:53:40 +0000 Received: by outflank-mailman (input) for mailman id 202420; Tue, 05 Oct 2021 18:53:38 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZK-0005as-R7 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:38 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZK-00028Y-QS for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:38 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpZK-0001EO-Pj for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:38 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WQrbrpiPmMoBp8FQGP7zSb6KuCRHv1+1FdjvLaQHesg=; b=MEW/6wXsaoFaRyT2i+DnELwXOc 7YqrPeVvhCpur41P1kWVYYKc3yAbC1FUsIVzh6v3qRZVzeFv2hG2xiCPj8qiYpfUVMvWntgU0HFZ6 8gHrII3VIY6qxhJKHwcGYhGurDD+rVfhP4YVTAma/gIVJj0vv0f5a4DH8HjFRLcfB9uE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] pci: fix handling of PCI bridges with subordinate bus number 0xff Message-Id: Date: Tue, 05 Oct 2021 18:53:38 +0000 commit 9c3b9800e2019c93ab22da69e4a0b22d6fb059ec Author: Igor Druzhinin AuthorDate: Tue Sep 28 16:04:50 2021 +0200 Commit: Jan Beulich CommitDate: Tue Sep 28 16:04:50 2021 +0200 pci: fix handling of PCI bridges with subordinate bus number 0xff Bus number 0xff is valid according to the PCI spec. Using u8 typed sub_bus and assigning 0xff to it will result in the following loop getting stuck. for ( ; sec_bus <= sub_bus; sec_bus++ ) {...} Just change its type to unsigned int similarly to what is already done in dmar_scope_add_buses(). Signed-off-by: Igor Druzhinin Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/drivers/passthrough/pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index fc4fa2e5c3..d65cda856b 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -363,8 +363,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) /* update bus2bridge */ switch ( pdev->type = pdev_type(pseg->nr, bus, devfn) ) { - u16 cap; - u8 sec_bus, sub_bus; + unsigned int cap, sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: @@ -431,7 +430,7 @@ static void free_pdev(struct pci_seg *pseg, struct pci_dev *pdev) /* update bus2bridge */ switch ( pdev->type ) { - uint8_t sec_bus, sub_bus; + unsigned int sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:53:50 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:53:50 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202421.357302 (Exim 4.92) (envelope-from ) id 1mXpZW-0005eD-B2; Tue, 05 Oct 2021 18:53:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202421.357302; Tue, 05 Oct 2021 18:53:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZW-0005e5-86; Tue, 05 Oct 2021 18:53:50 +0000 Received: by outflank-mailman (input) for mailman id 202421; Tue, 05 Oct 2021 18:53:48 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZU-0005du-UE for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:48 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZU-00028i-TZ for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:48 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpZU-0001FG-Sx for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:48 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BHIFQ4NfzH1yQ4Hyt96uXOTACv6EsovuVPKZ6QgpSQ8=; b=0Bf8LkId1wboV40EIZTJv1EwOX PJ9T6PiuBLv4iafCYEl7yGFgc89K91yiEeEAfSs1GgS2ewF8qqj0xHJWH/uuNMXbjTQt3R6Fj5usH woNsYHJtXczqkoekG8D6y04bkslI6qTD/9xklc9XzhWhh2Ieeq5C7SBqFNYx3muYfewA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: convert hvm_virtual_to_linear_addr() to be remote-capable Message-Id: Date: Tue, 05 Oct 2021 18:53:48 +0000 commit dffe59c12444a97d9af82db6e6e4df7e2143c5f5 Author: Jan Beulich AuthorDate: Wed Sep 29 11:56:18 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 29 11:56:18 2021 +0200 x86/HVM: convert hvm_virtual_to_linear_addr() to be remote-capable While all present callers want to act on "current", stack dumping for HVM vCPU-s will require the function to be able to act on a remote vCPU. To avoid touching all present callers, convert the existing function to an inline wrapper around the extend new one. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/hvm.c | 20 ++++++++++++-------- xen/include/asm-x86/hvm/hvm.h | 17 ++++++++++++++++- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7b48a1b925..c8c86dd6a6 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2526,7 +2526,8 @@ int hvm_set_cr4(unsigned long value, bool may_defer) return X86EMUL_OKAY; } -bool_t hvm_virtual_to_linear_addr( +bool hvm_vcpu_virtual_to_linear( + struct vcpu *v, enum x86_segment seg, const struct segment_register *reg, unsigned long offset, @@ -2535,9 +2536,12 @@ bool_t hvm_virtual_to_linear_addr( const struct segment_register *active_cs, unsigned long *linear_addr) { - const struct vcpu *curr = current; unsigned long addr = offset, last_byte; - bool_t okay = 0; + const struct cpu_user_regs *regs = v == current ? guest_cpu_user_regs() + : &v->arch.user_regs; + bool okay = false; + + ASSERT(v == current || !vcpu_runnable(v)); /* * These checks are for a memory access through an active segment. @@ -2547,7 +2551,7 @@ bool_t hvm_virtual_to_linear_addr( */ ASSERT(seg < x86_seg_none); - if ( !(curr->arch.hvm.guest_cr[0] & X86_CR0_PE) ) + if ( !(v->arch.hvm.guest_cr[0] & X86_CR0_PE) ) { /* * REAL MODE: Don't bother with segment access checks. @@ -2555,7 +2559,7 @@ bool_t hvm_virtual_to_linear_addr( */ addr = (uint32_t)(addr + reg->base); } - else if ( (guest_cpu_user_regs()->eflags & X86_EFLAGS_VM) && + else if ( (regs->eflags & X86_EFLAGS_VM) && is_x86_user_segment(seg) ) { /* VM86 MODE: Fixed 64k limits on all user segments. */ @@ -2564,7 +2568,7 @@ bool_t hvm_virtual_to_linear_addr( if ( max(offset, last_byte) >> 16 ) goto out; } - else if ( hvm_long_mode_active(curr) && + else if ( hvm_long_mode_active(v) && (is_x86_system_segment(seg) || active_cs->l) ) { /* @@ -2636,12 +2640,12 @@ bool_t hvm_virtual_to_linear_addr( else if ( last_byte > reg->limit ) goto out; /* last byte is beyond limit */ else if ( last_byte < offset && - curr->domain->arch.cpuid->x86_vendor == X86_VENDOR_AMD ) + v->domain->arch.cpuid->x86_vendor == X86_VENDOR_AMD ) goto out; /* access wraps */ } /* All checks ok. */ - okay = 1; + okay = true; out: /* diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 7e842f2dc2..bd2cbb0e7b 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -314,7 +314,9 @@ enum hvm_access_type { hvm_access_read, hvm_access_write }; -bool_t hvm_virtual_to_linear_addr( + +bool hvm_vcpu_virtual_to_linear( + struct vcpu *v, enum x86_segment seg, const struct segment_register *reg, unsigned long offset, @@ -323,6 +325,19 @@ bool_t hvm_virtual_to_linear_addr( const struct segment_register *active_cs, unsigned long *linear_addr); +static inline bool hvm_virtual_to_linear_addr( + enum x86_segment seg, + const struct segment_register *reg, + unsigned long offset, + unsigned int bytes, + enum hvm_access_type access_type, + const struct segment_register *active_cs, + unsigned long *linear) +{ + return hvm_vcpu_virtual_to_linear(current, seg, reg, offset, bytes, + access_type, active_cs, linear); +} + void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent, bool_t *writable); void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:54:00 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:54:00 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202422.357306 (Exim 4.92) (envelope-from ) id 1mXpZg-0005hH-Cb; Tue, 05 Oct 2021 18:54:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202422.357306; Tue, 05 Oct 2021 18:54:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZg-0005h9-9Z; Tue, 05 Oct 2021 18:54:00 +0000 Received: by outflank-mailman (input) for mailman id 202422; Tue, 05 Oct 2021 18:53:59 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZf-0005gy-1m for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:59 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZf-00028t-0x for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:59 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpZf-0001G3-09 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:53:59 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9b73XBZWyygBsgT+Twt56FRK8KJiJpKPKIDjAaVK3BY=; b=MZ9w9JM9FFW24XITXCAkp4QwOW 17/IvAIVVwHsB/eWKiqEGATqveelcY1XwUBbsN/i0rje5iLYhFmYziStHi2UKnrtHOYVwacUOLg+k dLAKRhA15npGki0W3VFrI90Lk1uuMNKkQY4joG0Aoov7ZRcfuH+tWgS7n65TXfk+Gb4E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PVH: actually show Dom0's stacks from debug key '0' Message-Id: Date: Tue, 05 Oct 2021 18:53:59 +0000 commit cae8e262727bd5763210dd0e7ae314b39fde998b Author: Jan Beulich AuthorDate: Wed Sep 29 11:57:22 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 29 11:57:22 2021 +0200 x86/PVH: actually show Dom0's stacks from debug key '0' show_guest_stack() does nothing for HVM. Introduce a HVM-specific dumping function, paralleling the 64- and 32-bit PV ones. We don't know the real stack size, so only dump up to the next page boundary. Rather than adding a vcpu parameter to hvm_copy_from_guest_linear(), introduce hvm_copy_from_vcpu_linear() which - for now at least - in return won't need a "pfinfo" parameter. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/hvm.c | 9 ++++ xen/arch/x86/traps.c | 87 +++++++++++++++++++++++++++++++++++++-- xen/include/asm-x86/hvm/support.h | 3 ++ 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index c8c86dd6a6..aa418a3ca1 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3410,6 +3410,15 @@ enum hvm_translation_result hvm_copy_from_guest_linear( PFEC_page_present | pfec, pfinfo); } +enum hvm_translation_result hvm_copy_from_vcpu_linear( + void *buf, unsigned long addr, unsigned int size, struct vcpu *v, + unsigned int pfec) +{ + return __hvm_copy(buf, addr, size, v, + HVMCOPY_from_guest | HVMCOPY_linear, + PFEC_page_present | pfec, NULL); +} + unsigned int copy_to_user_hvm(void *to, const void *from, unsigned int len) { int rc; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c2e2603c39..64f3396f20 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -365,6 +365,71 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk("\n"); } +static void show_hvm_stack(struct vcpu *v, const struct cpu_user_regs *regs) +{ +#ifdef CONFIG_HVM + unsigned long sp = regs->rsp, addr; + unsigned int i, bytes, words_per_line, pfec = PFEC_page_present; + struct segment_register ss, cs; + + hvm_get_segment_register(v, x86_seg_ss, &ss); + hvm_get_segment_register(v, x86_seg_cs, &cs); + + if ( hvm_long_mode_active(v) && cs.l ) + i = 16, bytes = 8; + else + { + sp = ss.db ? (uint32_t)sp : (uint16_t)sp; + i = ss.db ? 8 : 4; + bytes = cs.db ? 4 : 2; + } + + if ( bytes == 8 || (ss.db && !ss.base) ) + printk("Guest stack trace from sp=%0*lx:", i, sp); + else + printk("Guest stack trace from ss:sp=%04x:%0*lx:", ss.sel, i, sp); + + if ( !hvm_vcpu_virtual_to_linear(v, x86_seg_ss, &ss, sp, bytes, + hvm_access_read, &cs, &addr) ) + { + printk(" Guest-inaccessible memory\n"); + return; + } + + if ( ss.dpl == 3 ) + pfec |= PFEC_user_mode; + + words_per_line = stack_words_per_line * (sizeof(void *) / bytes); + for ( i = 0; i < debug_stack_lines * words_per_line; ) + { + unsigned long val = 0; + + if ( (addr ^ (addr + bytes - 1)) & PAGE_SIZE ) + break; + + if ( !(i++ % words_per_line) ) + printk("\n "); + + if ( hvm_copy_from_vcpu_linear(&val, addr, bytes, v, + pfec) != HVMTRANS_okay ) + { + printk(" Fault while accessing guest memory."); + break; + } + + printk(" %0*lx", 2 * bytes, val); + + addr += bytes; + if ( !(addr & (PAGE_SIZE - 1)) ) + break; + } + + if ( !i ) + printk(" Stack empty."); + printk("\n"); +#endif +} + /* * Notes for get_{stack,shstk}*_bottom() helpers * @@ -630,7 +695,7 @@ void show_execution_state(const struct cpu_user_regs *regs) void vcpu_show_execution_state(struct vcpu *v) { - unsigned long flags; + unsigned long flags = 0; if ( test_bit(_VPF_down, &v->pause_flags) ) { @@ -668,10 +733,24 @@ void vcpu_show_execution_state(struct vcpu *v) flags = console_lock_recursive_irqsave(); vcpu_show_registers(v); - if ( guest_kernel_mode(v, &v->arch.user_regs) ) - show_guest_stack(v, &v->arch.user_regs); - console_unlock_recursive_irqrestore(flags); + if ( is_hvm_vcpu(v) ) + { + /* + * Stop interleaving prevention: The necessary P2M lookups involve + * locking, which has to occur with IRQs enabled. + */ + console_unlock_recursive_irqrestore(flags); + + show_hvm_stack(v, &v->arch.user_regs); + } + else + { + if ( guest_kernel_mode(v, &v->arch.user_regs) ) + show_guest_stack(v, &v->arch.user_regs); + + console_unlock_recursive_irqrestore(flags); + } #ifdef CONFIG_HVM if ( cpu_has_vmx && is_hvm_vcpu(v) ) diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index a4950e3d4b..6b583738ec 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -101,6 +101,9 @@ enum hvm_translation_result hvm_copy_to_guest_linear( enum hvm_translation_result hvm_copy_from_guest_linear( void *buf, unsigned long addr, unsigned int size, uint32_t pfec, pagefault_info_t *pfinfo); +enum hvm_translation_result hvm_copy_from_vcpu_linear( + void *buf, unsigned long addr, unsigned int size, struct vcpu *v, + unsigned int pfec); /* * Get a reference on the page under an HVM physical or linear address. If -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:54:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:54:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202423.357310 (Exim 4.92) (envelope-from ) id 1mXpZq-0005jz-EK; Tue, 05 Oct 2021 18:54:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202423.357310; Tue, 05 Oct 2021 18:54:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZq-0005jr-BB; Tue, 05 Oct 2021 18:54:10 +0000 Received: by outflank-mailman (input) for mailman id 202423; Tue, 05 Oct 2021 18:54:09 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZp-0005jf-6B for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:09 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZp-00029H-3v for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:09 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpZp-0001Gs-3H for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:09 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Iqd6GN6mhgwRmIazsUMyMG0Wrx+GTfkZxnWO/yCj//4=; b=KzlhdQ5OiBc4uu7J80kFzb2p78 HPmyL82vG7TcHJXdJMuH24qdYgZUGesaMWKTMq1kGlrFeQPyjySVKTyAGVzG8b2JUTiyXOnMt1t0M S7BA3Y4qqcnG8IGey6PtnUd1hqEPFn+FWDrDJBXyi5Z37s+N3w0mA9LKIuQ9w3HyU/2g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: rework `checkpolicy` detection when using "randconfig" Message-Id: Date: Tue, 05 Oct 2021 18:54:09 +0000 commit 0b000a2ce8131df442d6444d2d3e0a8c7f9a1cf5 Author: Anthony PERARD AuthorDate: Wed Sep 29 11:58:15 2021 +0200 Commit: Jan Beulich CommitDate: Wed Sep 29 11:58:15 2021 +0200 xen: rework `checkpolicy` detection when using "randconfig" This patch allows to easily add more override which depends on the environment. Also, move the check out of Config.mk and into xen/ build system. Nothing in tools/ is using that information as it's done by ./configure. We named the new file ".allconfig.tmp" as ".*.tmp" are already ignored via .gitignore. Signed-off-by: Anthony PERARD Reviewed-by: Luca Fancellu Reviewed-by: Jan Beulich --- Config.mk | 6 ------ xen/Makefile | 20 +++++++++++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Config.mk b/Config.mk index e7af4a402d..6587c7d626 100644 --- a/Config.mk +++ b/Config.mk @@ -137,12 +137,6 @@ export XEN_HAS_BUILD_ID=y build_id_linker := --build-id=sha1 endif -ifndef XEN_HAS_CHECKPOLICY - CHECKPOLICY ?= checkpolicy - XEN_HAS_CHECKPOLICY := $(shell $(CHECKPOLICY) -h 2>&1 | grep -q xen && echo y || echo n) - export XEN_HAS_CHECKPOLICY -endif - define buildmakevars2shellvars export PREFIX="$(prefix)"; \ export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)"; \ diff --git a/xen/Makefile b/xen/Makefile index f47423dacd..7c2ffce0fc 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -17,6 +17,8 @@ export XEN_BUILD_HOST ?= $(shell hostname) PYTHON_INTERPRETER := $(word 1,$(shell which python3 python python2 2>/dev/null) python) export PYTHON ?= $(PYTHON_INTERPRETER) +export CHECKPOLICY ?= checkpolicy + export BASEDIR := $(CURDIR) export XEN_ROOT := $(BASEDIR)/.. @@ -178,6 +180,8 @@ CFLAGS += $(CLANG_FLAGS) export CLANG_FLAGS endif +export XEN_HAS_CHECKPOLICY := $(call success,$(CHECKPOLICY) -h 2>&1 | grep -q xen) + export root-make-done := y endif # root-make-done @@ -189,14 +193,24 @@ ifeq ($(config-build),y) # *config targets only - make sure prerequisites are updated, and descend # in tools/kconfig to make the *config target +# Create a file for KCONFIG_ALLCONFIG which depends on the environment. +# This will be use by kconfig targets allyesconfig/allmodconfig/allnoconfig/randconfig +filechk_kconfig_allconfig = \ + $(if $(findstring n,$(XEN_HAS_CHECKPOLICY)), echo 'CONFIG_XSM_FLASK_POLICY=n';) \ + $(if $(KCONFIG_ALLCONFIG), cat $(KCONFIG_ALLCONFIG);) \ + : + +.allconfig.tmp: FORCE + set -e; { $(call filechk_kconfig_allconfig); } > $@ + config: FORCE $(MAKE) $(kconfig) $@ # Config.mk tries to include .config file, don't try to remake it %/.config: ; -%config: FORCE - $(MAKE) $(kconfig) $@ +%config: .allconfig.tmp FORCE + $(MAKE) $(kconfig) KCONFIG_ALLCONFIG=$< $@ else # !config-build @@ -368,7 +382,7 @@ _clean: delete-unfresh-files -o -name "*.gcno" -o -name ".*.cmd" -o -name "lib.a" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core rm -f asm-offsets.s include/asm-*/asm-offsets.h - rm -f .banner + rm -f .banner .allconfig.tmp .PHONY: _distclean _distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:54:20 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:54:20 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202424.357314 (Exim 4.92) (envelope-from ) id 1mXpa0-0005mj-Fc; Tue, 05 Oct 2021 18:54:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202424.357314; Tue, 05 Oct 2021 18:54:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpa0-0005mb-Cp; Tue, 05 Oct 2021 18:54:20 +0000 Received: by outflank-mailman (input) for mailman id 202424; Tue, 05 Oct 2021 18:54:19 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZz-0005mN-7f for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:19 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpZz-00029i-6t for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:19 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpZz-0001HQ-6C for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:19 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0KgvL5v70GNKm58PrHi8b24yuzx4jZ/fODb/6m/1wVg=; b=q99/Ls3++Y0PuxuI2f7c572AD2 IgGdSaGCKjD/BvkefWwfmNzY8CxC14eE91I3NBmaAPMME3aj5Hrc/GiC7jRlLsXNOvT09erAT86d7 iAWZDcZSgyoGj4D4egKJ+W8ggAL2uMcki9HzjUQPhx+c4GWUZheAJmibEEHGCWM7bGqg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: add --full to version.sh to guess $(XEN_FULLVERSION) Message-Id: Date: Tue, 05 Oct 2021 18:54:19 +0000 commit ab4a83023eda9f04ad864877c1956b087ec6fc4f Author: Anthony PERARD AuthorDate: Thu Sep 9 15:33:06 2021 +0100 Commit: Ian Jackson CommitDate: Wed Sep 29 15:29:55 2021 +0100 build: add --full to version.sh to guess $(XEN_FULLVERSION) Running $(MAKE) like that in a $(shell ) while parsing the Makefile doesn't work reliably. In some case, make will complain with "jobserver unavailable: using -j1. Add '+' to parent make rule.". Also, it isn't possible to distinguish between the output produced by the target "xenversion" and `make`'s own output. Instead of running make, this patch "improve" `version.sh` to try to guess the output of `make xenversion`. In order to have version.sh works in more scenario, it will use XEN_EXTRAVERSION and XEN_VENDORVERSION from the environment when present. As for the cases were those two variables are overridden by a make command line arguments, we export them when invoking version.sh via a new $(XEN_FULLVERSION) macro. That should hopefully get us to having ./version.sh returning the same value that `make xenversion` would. This fix GitLab CI's build job "debian-unstable-gcc-arm64". Signed-off-by: Anthony PERARD Reviewed-by: Daniel P. Smith Reviewed-by: Ian Jackson --- tools/Rules.mk | 5 +++++ tools/flask/policy/Makefile.common | 2 +- version.sh | 18 +++++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 2907ed2d39..b022da3336 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -6,6 +6,11 @@ all: -include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk +XEN_FULLVERSION=$(shell env \ + XEN_EXTRAVERSION=$(XEN_EXTRAVERSION) \ + XEN_VENDORVERSION=$(XEN_VENDORVERSION) \ + $(SHELL) $(XEN_ROOT)/version.sh --full $(XEN_ROOT)/xen/Makefile) + export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install diff --git a/tools/flask/policy/Makefile.common b/tools/flask/policy/Makefile.common index bea5ba4b6a..e5ed58200e 100644 --- a/tools/flask/policy/Makefile.common +++ b/tools/flask/policy/Makefile.common @@ -35,7 +35,7 @@ OUTPUT_POLICY ?= $(BEST_POLICY_VER) # ######################################## -POLICY_FILENAME = $(FLASK_BUILD_DIR)/xenpolicy-$(shell $(MAKE) -C $(XEN_ROOT)/xen xenversion --no-print-directory) +POLICY_FILENAME = $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) POLICY_LOADPATH = /boot # List of policy versions supported by the hypervisor diff --git a/version.sh b/version.sh index e894ee7e04..c6a5692c19 100755 --- a/version.sh +++ b/version.sh @@ -1,5 +1,21 @@ #!/bin/sh +opt_full=false +while [ $# -gt 1 ]; do + case "$1" in + --full) opt_full=true ;; + *) break ;; + esac + shift +done + MAJOR=`grep "export XEN_VERSION" $1 | sed 's/.*=//g' | tr -s " "` MINOR=`grep "export XEN_SUBVERSION" $1 | sed 's/.*=//g' | tr -s " "` -printf "%d.%d" $MAJOR $MINOR + +if $opt_full; then + extraversion=$(grep "export XEN_EXTRAVERSION" $1 | sed 's/^.* ?=\s\+//; s/\$([^)]*)//g; s/ //g') + : ${XEN_EXTRAVERSION:=${extraversion}${XEN_VENDORVERSION}} +else + unset XEN_EXTRAVERSION +fi +printf "%d.%d%s" $MAJOR $MINOR $XEN_EXTRAVERSION -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:54:30 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:54:30 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202426.357317 (Exim 4.92) (envelope-from ) id 1mXpaA-0005pw-Hg; Tue, 05 Oct 2021 18:54:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202426.357317; Tue, 05 Oct 2021 18:54:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpaA-0005po-EJ; Tue, 05 Oct 2021 18:54:30 +0000 Received: by outflank-mailman (input) for mailman id 202426; Tue, 05 Oct 2021 18:54:29 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpa9-0005pb-At for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:29 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpa9-0002A0-A4 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:29 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpa9-0001I5-9O for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:29 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=S3/koKYLuLvzle69WvDUzHjcD9Me9vWosC3R0FfmX5o=; b=RSZBR3zuModnnSt68d8jN4biT+ 63FA+1wrgZ+8/n5nhFiM7Zaga5eCWFed7PY3zge+RHSD6IcO/vVqvsrhx3VasJPDuaYDReexoo/3F CX6GFj14v/IBmzAGnN0+WQ8zXvM5vndF1g6RtKMqOBDfzYUJ8YXgf/p3O+VcRWFkxMUU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pci: Refactor MSI code that implements MSI functionality within XEN Message-Id: Date: Tue, 05 Oct 2021 18:54:29 +0000 commit a12ceae85be64f8edcfaa4bf94b5b7d8dba8a2f3 Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:10 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:22:05 2021 -0700 xen/pci: Refactor MSI code that implements MSI functionality within XEN On Arm, the initial plan is to only support GICv3 ITS which doesn't require us to manage the MSIs because the HW will protect against spoofing. Move the code under CONFIG_HAS_PCI_MSI flag to gate the code for ARM. No functional change intended. Signed-off-by: Rahul Singh Reviewed-by: Daniel P. Smith Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/drivers/passthrough/Makefile | 1 + xen/drivers/passthrough/msi.c | 83 ++++++++++++++++++++++++++++++++++++++++ xen/drivers/passthrough/pci.c | 54 +++++++------------------- xen/drivers/pci/Kconfig | 4 ++ xen/include/xen/msi.h | 43 +++++++++++++++++++++ xen/xsm/flask/hooks.c | 8 ++-- 7 files changed, 149 insertions(+), 45 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 1f83518ee0..b4abfca46f 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -20,6 +20,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI + select HAS_PCI_MSI select HAS_PDX select HAS_SCHED_GRANULARITY select HAS_UBSAN diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index 445690e3e5..a5efa22714 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -7,3 +7,4 @@ obj-y += iommu.o obj-$(CONFIG_HAS_PCI) += pci.o obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o obj-$(CONFIG_HAS_PCI) += ats.o +obj-$(CONFIG_HAS_PCI_MSI) += msi.o diff --git a/xen/drivers/passthrough/msi.c b/xen/drivers/passthrough/msi.c new file mode 100644 index 0000000000..ce1a450f6f --- /dev/null +++ b/xen/drivers/passthrough/msi.c @@ -0,0 +1,83 @@ +#include +#include +#include +#include + +int pdev_msix_assign(struct domain *d, struct pci_dev *pdev) +{ + int rc; + + if ( pdev->msix ) + { + rc = pci_reset_msix_state(pdev); + if ( rc ) + return rc; + msixtbl_init(d); + } + + return 0; +} + +int pdev_msi_init(struct pci_dev *pdev) +{ + unsigned int pos; + + INIT_LIST_HEAD(&pdev->msi_list); + + pos = pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), + PCI_FUNC(pdev->devfn), PCI_CAP_ID_MSI); + if ( pos ) + { + uint16_t ctrl = pci_conf_read16(pdev->sbdf, msi_control_reg(pos)); + + pdev->msi_maxvec = multi_msi_capable(ctrl); + } + + pos = pci_find_cap_offset(pdev->seg, pdev->bus, PCI_SLOT(pdev->devfn), + PCI_FUNC(pdev->devfn), PCI_CAP_ID_MSIX); + if ( pos ) + { + struct arch_msix *msix = xzalloc(struct arch_msix); + uint16_t ctrl; + + if ( !msix ) + return -ENOMEM; + + spin_lock_init(&msix->table_lock); + + ctrl = pci_conf_read16(pdev->sbdf, msix_control_reg(pos)); + msix->nr_entries = msix_table_size(ctrl); + + pdev->msix = msix; + } + + return 0; +} + +void pdev_msi_deinit(struct pci_dev *pdev) +{ + XFREE(pdev->msix); +} + +void pdev_dump_msi(const struct pci_dev *pdev) +{ + const struct msi_desc *msi; + + if ( list_empty(&pdev->msi_list) ) + return; + + printk(" - MSIs < "); + list_for_each_entry ( msi, &pdev->msi_list, list ) + printk("%d ", msi->irq); + printk(">"); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index d65cda856b..5456ca3a63 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -32,8 +32,8 @@ #include #include #include +#include #include -#include #include "ats.h" struct pci_seg { @@ -314,6 +314,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) { struct pci_dev *pdev; unsigned int pos; + int rc; list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list ) if ( pdev->bus == bus && pdev->devfn == devfn ) @@ -327,35 +328,12 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) *((u8*) &pdev->bus) = bus; *((u8*) &pdev->devfn) = devfn; pdev->domain = NULL; - INIT_LIST_HEAD(&pdev->msi_list); - - pos = pci_find_cap_offset(pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), - PCI_CAP_ID_MSI); - if ( pos ) - { - uint16_t ctrl = pci_conf_read16(pdev->sbdf, msi_control_reg(pos)); - - pdev->msi_maxvec = multi_msi_capable(ctrl); - } - pos = pci_find_cap_offset(pseg->nr, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), - PCI_CAP_ID_MSIX); - if ( pos ) + rc = pdev_msi_init(pdev); + if ( rc ) { - struct arch_msix *msix = xzalloc(struct arch_msix); - uint16_t ctrl; - - if ( !msix ) - { - xfree(pdev); - return NULL; - } - spin_lock_init(&msix->table_lock); - - ctrl = pci_conf_read16(pdev->sbdf, msix_control_reg(pos)); - msix->nr_entries = msix_table_size(ctrl); - - pdev->msix = msix; + xfree(pdev); + return NULL; } list_add(&pdev->alldevs_list, &pseg->alldevs_list); @@ -448,7 +426,7 @@ static void free_pdev(struct pci_seg *pseg, struct pci_dev *pdev) } list_del(&pdev->alldevs_list); - xfree(pdev->msix); + pdev_msi_deinit(pdev); xfree(pdev); } @@ -1270,18 +1248,16 @@ bool_t pcie_aer_get_firmware_first(const struct pci_dev *pdev) static int _dump_pci_devices(struct pci_seg *pseg, void *arg) { struct pci_dev *pdev; - struct msi_desc *msi; printk("==== segment %04x ====\n", pseg->nr); list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list ) { - printk("%pp - %pd - node %-3d - MSIs < ", + printk("%pp - %pd - node %-3d", &pdev->sbdf, pdev->domain, (pdev->node != NUMA_NO_NODE) ? pdev->node : -1); - list_for_each_entry ( msi, &pdev->msi_list, list ) - printk("%d ", msi->irq); - printk(">\n"); + pdev_dump_msi(pdev); + printk("\n"); } return 0; @@ -1421,13 +1397,9 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag) ASSERT(pdev && (pdev->domain == hardware_domain || pdev->domain == dom_io)); - if ( pdev->msix ) - { - rc = pci_reset_msix_state(pdev); - if ( rc ) - goto done; - msixtbl_init(d); - } + rc = pdev_msix_assign(d, pdev); + if ( rc ) + goto done; pdev->fault.count = 0; diff --git a/xen/drivers/pci/Kconfig b/xen/drivers/pci/Kconfig index 7da03fa13b..c6a7bc8007 100644 --- a/xen/drivers/pci/Kconfig +++ b/xen/drivers/pci/Kconfig @@ -1,3 +1,7 @@ config HAS_PCI bool + +config HAS_PCI_MSI + bool + depends on HAS_PCI diff --git a/xen/include/xen/msi.h b/xen/include/xen/msi.h new file mode 100644 index 0000000000..c903d0050c --- /dev/null +++ b/xen/include/xen/msi.h @@ -0,0 +1,43 @@ +#ifndef __XEN_MSI_H_ +#define __XEN_MSI_H_ + +#include + +#ifdef CONFIG_HAS_PCI_MSI + +#include + +int pdev_msix_assign(struct domain *d, struct pci_dev *pdev); +int pdev_msi_init(struct pci_dev *pdev); +void pdev_msi_deinit(struct pci_dev *pdev); +void pdev_dump_msi(const struct pci_dev *pdev); + +#else /* !CONFIG_HAS_PCI_MSI */ + +static inline int pdev_msix_assign(struct domain *d, struct pci_dev *pdev) +{ + return 0; +} + +static inline int pdev_msi_init(struct pci_dev *pdev) +{ + return 0; +} + +static inline void pdev_msi_deinit(struct pci_dev *pdev) {} +static inline void pci_cleanup_msi(struct pci_dev *pdev) {} +static inline void pdev_dump_msi(const struct pci_dev *pdev) {} + +#endif /* CONFIG_HAS_PCI_MSI */ + +#endif /* __XEN_MSI_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 25e87180b4..ea9a12bd71 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -21,7 +21,7 @@ #include #include #include -#ifdef CONFIG_HAS_PCI +#ifdef CONFIG_HAS_PCI_MSI #include #endif #include @@ -114,7 +114,7 @@ static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad) } return security_irq_sid(irq, sid); } -#ifdef CONFIG_HAS_PCI +#ifdef CONFIG_HAS_PCI_MSI { struct irq_desc *desc = irq_to_desc(irq); if ( desc->msi_desc && desc->msi_desc->dev ) { @@ -874,7 +874,7 @@ static int flask_map_domain_pirq (struct domain *d) static int flask_map_domain_msi (struct domain *d, int irq, const void *data, u32 *sid, struct avc_audit_data *ad) { -#ifdef CONFIG_HAS_PCI +#ifdef CONFIG_HAS_PCI_MSI const struct msi_info *msi = data; u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; @@ -940,7 +940,7 @@ static int flask_unmap_domain_pirq (struct domain *d) static int flask_unmap_domain_msi (struct domain *d, int irq, const void *data, u32 *sid, struct avc_audit_data *ad) { -#ifdef CONFIG_HAS_PCI +#ifdef CONFIG_HAS_PCI_MSI const struct pci_dev *pdev = data; u32 machine_bdf = (pdev->seg << 16) | (pdev->bus << 8) | pdev->devfn; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:54:40 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:54:40 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202427.357322 (Exim 4.92) (envelope-from ) id 1mXpaK-0005so-Kq; Tue, 05 Oct 2021 18:54:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202427.357322; Tue, 05 Oct 2021 18:54:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpaK-0005sg-Hr; Tue, 05 Oct 2021 18:54:40 +0000 Received: by outflank-mailman (input) for mailman id 202427; Tue, 05 Oct 2021 18:54:39 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpaJ-0005sW-E5 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:39 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpaJ-0002AC-DH for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:39 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpaJ-0001Ij-CX for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:39 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=c0Z/g9f1YcR3q1abqpoT22DI7Gui3ybml5r1BP9z0Z4=; b=qVoaur1ozAJoq07cUuqKngmWG+ vZyJLsV199K4BZ2AvhTeEiHtGg9tAA8eb1LeKTpoxjyGBrf78B3Oi1W/kKUtWsLMu7uXlFJx4TzY6 JvoYetCTHOIQ6kDBjXGbI3mbbq/yTVYGg78gSQ84FYBxZCgEoaocm/xaWkf1UMCVUkts=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: pci: Add stubs to allow selecting HAS_PCI Message-Id: Date: Tue, 05 Oct 2021 18:54:39 +0000 commit a3a476fb744d4c516838353f3bc6a42d03e031a3 Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:11 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:22:24 2021 -0700 xen/arm: pci: Add stubs to allow selecting HAS_PCI In a follow-up we will enable PCI support in Xen on Arm (i.e select HAS_PCI). The generic code expects the arch to implement a few functions: arch_iommu_use_permitted() arch_pci_clean_pirqs() Note that this is not yet sufficient to enable HAS_PCI and will be addressed in follow-ups. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/arch/arm/Makefile | 1 + xen/arch/arm/pci/Makefile | 1 + xen/arch/arm/pci/pci.c | 33 +++++++++++++++++++++++++++++++++ xen/drivers/passthrough/arm/iommu.c | 9 +++++++++ xen/include/asm-arm/pci.h | 31 ++++++++++++++++++++++++++++--- 5 files changed, 72 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 3d3b97b5b4..44d7cc81fa 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_ARM_32) += arm32/ obj-$(CONFIG_ARM_64) += arm64/ obj-$(CONFIG_ARM_64) += efi/ obj-$(CONFIG_ACPI) += acpi/ +obj-$(CONFIG_HAS_PCI) += pci/ ifneq ($(CONFIG_NO_PLAT),y) obj-y += platforms/ endif diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile new file mode 100644 index 0000000000..a98035df4c --- /dev/null +++ b/xen/arch/arm/pci/Makefile @@ -0,0 +1 @@ +obj-y += pci.o diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c new file mode 100644 index 0000000000..a7a7bc3213 --- /dev/null +++ b/xen/arch/arm/pci/pci.c @@ -0,0 +1,33 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 + +/* + * PIRQ event channels are not supported on Arm, so nothing to do. + */ +int arch_pci_clean_pirqs(struct domain *d) +{ + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/passthrough/arm/iommu.c b/xen/drivers/passthrough/arm/iommu.c index db3b07a571..ee653a9c48 100644 --- a/xen/drivers/passthrough/arm/iommu.c +++ b/xen/drivers/passthrough/arm/iommu.c @@ -135,3 +135,12 @@ void arch_iommu_domain_destroy(struct domain *d) void __hwdom_init arch_iommu_hwdom_init(struct domain *d) { } + +/* + * Unlike x86, Arm doesn't support mem-sharing, mem-paging and log-dirty (yet). + * So there is no restriction to use the IOMMU. + */ +bool arch_iommu_use_permitted(const struct domain *d) +{ + return true; +} diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index de13359f65..7dd9eb3dba 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -1,7 +1,32 @@ -#ifndef __X86_PCI_H__ -#define __X86_PCI_H__ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 __ARM_PCI_H__ +#define __ARM_PCI_H__ + +#ifdef CONFIG_HAS_PCI + +#define pci_to_dev(pcidev) (&(pcidev)->arch.dev) + +/* Arch pci dev struct */ struct arch_pci_dev { + struct device dev; }; -#endif /* __X86_PCI_H__ */ +#else /*!CONFIG_HAS_PCI*/ + +struct arch_pci_dev { }; + +#endif /*!CONFIG_HAS_PCI*/ +#endif /* __ARM_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:54:51 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:54:51 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202428.357326 (Exim 4.92) (envelope-from ) id 1mXpaV-0005w1-ML; Tue, 05 Oct 2021 18:54:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202428.357326; Tue, 05 Oct 2021 18:54:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpaV-0005vt-JP; Tue, 05 Oct 2021 18:54:51 +0000 Received: by outflank-mailman (input) for mailman id 202428; Tue, 05 Oct 2021 18:54:49 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpaT-0005va-HD for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:49 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpaT-0002AN-GV for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:49 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpaT-0001JX-Fl for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:49 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NPIOqiTcMVXnae5JdjPC/vddJB4WD41PTf3YTh0AQks=; b=sMksoqmLrSpG/jt6D2zqmVEnM3 K0SmJvtjGIkoyQ9A9RvYb63eFvTjeJpmWyirDTOeNpdPLsCVDtt7RxigCxXwHlyWuPghw0DqebX63 k3GdJ0D3PZSKwGSZwVltOtuQDEYjeG4c6p277GgWn0bSbiHXeDTNBT/t3bMc1f3dJxyU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/device-tree: Add dt_property_read_variable_u32_array helper Message-Id: Date: Tue, 05 Oct 2021 18:54:49 +0000 commit 1907cfc8b2ac516cde82a7e6acf0ee244c263adf Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:15 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:25:19 2021 -0700 xen/device-tree: Add dt_property_read_variable_u32_array helper Based Linux commit a67e9472da423ec47a3586920b526ebaedf25fc3 Import the Linux helper of_property_read_variable_u32_array. This function find and read an array of 32 bit integers from a property, with bounds on the minimum and maximum array size. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/common/device_tree.c | 61 +++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 26 ++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 03d25a81ce..53160d61f8 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -208,6 +208,67 @@ int dt_property_read_string(const struct dt_device_node *np, return 0; } +/** + * dt_find_property_value_of_size + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @min: minimum allowed length of property value + * @max: maximum allowed length of property value (0 means unlimited) + * @len: if !=NULL, actual length is written to here + * + * Search for a property in a device node and valid the requested size. + * + * Return: The property value on success, -EINVAL if the property does not + * exist, -ENODATA if property does not have a value, and -EOVERFLOW if the + * property data is too small or too large. + */ +static void *dt_find_property_value_of_size(const struct dt_device_node *np, + const char *propname, u32 min, + u32 max, size_t *len) +{ + const struct dt_property *prop = dt_find_property(np, propname, NULL); + + if ( !prop ) + return ERR_PTR(-EINVAL); + if ( !prop->value ) + return ERR_PTR(-ENODATA); + if ( prop->length < min ) + return ERR_PTR(-EOVERFLOW); + if ( max && prop->length > max ) + return ERR_PTR(-EOVERFLOW); + + if ( len ) + *len = prop->length; + + return prop->value; +} + +int dt_property_read_variable_u32_array(const struct dt_device_node *np, + const char *propname, u32 *out_values, + size_t sz_min, size_t sz_max) +{ + size_t sz, count; + const __be32 *val = dt_find_property_value_of_size(np, propname, + (sz_min * sizeof(*out_values)), + (sz_max * sizeof(*out_values)), + &sz); + + if ( IS_ERR(val) ) + return PTR_ERR(val); + + if ( !sz_max ) + sz = sz_min; + else + sz /= sizeof(*out_values); + + count = sz; + while ( count-- ) + *out_values++ = be32_to_cpup(val++); + + return sz; +} + int dt_property_match_string(const struct dt_device_node *np, const char *propname, const char *string) { diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index b02696be94..1693fb8e8c 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -366,6 +366,32 @@ bool_t dt_property_read_u32(const struct dt_device_node *np, bool_t dt_property_read_u64(const struct dt_device_node *np, const char *name, u64 *out_value); + +/** + * dt_property_read_variable_u32_array - Find and read an array of 32 bit + * integers from a property, with bounds on the minimum and maximum array size. + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @out_values: pointer to return found values. + * @sz_min: minimum number of array elements to read + * @sz_max: maximum number of array elements to read, if zero there is no + * upper limit on the number of elements in the dts entry but only + * sz_min will be read. + * + * Search for a property in a device node and read 32-bit value(s) from + * it. + * + * Return: The number of elements read on success, -EINVAL if the property + * does not exist, -ENODATA if property does not have a value, and -EOVERFLOW + * if the property data is smaller than sz_min or longer than sz_max. + * + * The out_values is modified only if a valid u32 value can be decoded. + */ +int dt_property_read_variable_u32_array(const struct dt_device_node *np, + const char *propname, u32 *out_values, + size_t sz_min, size_t sz_max); + /** * dt_property_read_bool - Check if a property exists * @np: node to get the value -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:55:01 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:55:01 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202429.357329 (Exim 4.92) (envelope-from ) id 1mXpaf-0005zG-OX; Tue, 05 Oct 2021 18:55:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202429.357329; Tue, 05 Oct 2021 18:55:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpaf-0005z7-L3; Tue, 05 Oct 2021 18:55:01 +0000 Received: by outflank-mailman (input) for mailman id 202429; Tue, 05 Oct 2021 18:54:59 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpad-0005yX-KV for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:59 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpad-0002AY-Jr for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:59 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpad-0001KA-J0 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:54:59 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ENWdG47YKc7/U3TVDXgPP/v4JcdMIyX2guTeRG/on7k=; b=jfBb4jE9DABMajbP+gnyQ+EIvg eGHJy/BD1ilHhwYl5Rh3SlIGwkq5NNWfCRPbNU/7blGh0yJqh7TwfdC5Mwznyt/kvOGgoLiSdUoqh 4kgOm2PEipoQfMbaCujbHAuJT5A4n0gTDFBAnbRBcZWnfMdHWKAQb/Emmvc4F30OY6bE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/device-tree: Add dt_property_read_u32_array helper Message-Id: Date: Tue, 05 Oct 2021 18:54:59 +0000 commit 65ca66cf42420842039eb0f61ea8bcb9f56a355e Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:16 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:25:45 2021 -0700 xen/device-tree: Add dt_property_read_u32_array helper Based Linux commit a67e9472da423ec47a3586920b526ebaedf25fc3 Import the Linux helper of_property_read_u32_array. This function find and read an array of 32 bit integers from a property. Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/include/xen/device_tree.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 1693fb8e8c..3ffe3eb3d2 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -392,6 +392,36 @@ int dt_property_read_variable_u32_array(const struct dt_device_node *np, const char *propname, u32 *out_values, size_t sz_min, size_t sz_max); +/** + * dt_property_read_u32_array - Find and read an array of 32 bit integers + * from a property. + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @out_values: pointer to return value, modified only if return value is 0. + * @sz: number of array elements to read + * + * Search for a property in a device node and read 32-bit value(s) from + * it. + * + * Return: 0 on success, -EINVAL if the property does not exist, + * -ENODATA if property does not have a value, and -EOVERFLOW if the + * property data isn't large enough. + * + * The out_values is modified only if a valid u32 value can be decoded. + */ +static inline int dt_property_read_u32_array(const struct dt_device_node *np, + const char *propname, + u32 *out_values, size_t sz) +{ + int ret = dt_property_read_variable_u32_array(np, propname, out_values, + sz, 0); + if ( ret >= 0 ) + return 0; + else + return ret; +} + /** * dt_property_read_bool - Check if a property exists * @np: node to get the value -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:55:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202430.357333 (Exim 4.92) (envelope-from ) id 1mXpao-00061s-PI; Tue, 05 Oct 2021 18:55:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202430.357333; Tue, 05 Oct 2021 18:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpao-00061l-MX; Tue, 05 Oct 2021 18:55:10 +0000 Received: by outflank-mailman (input) for mailman id 202430; Tue, 05 Oct 2021 18:55:09 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpan-00061V-Ny for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:09 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpan-0002BG-NI for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:09 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpan-0001LW-MW for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:09 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YM5hoToAQfNu5IN/SHLO+og3b0tdV96FOH68WgKchd8=; b=e966tqfDRtoFTa6KrjX3/wvAbV nLxp7jMZaf9+xEucnvXY/RD3L9UsnwF7WVGZNizpp3RZNNXBEO7t5iBsmh6Gi8d40rML6N+z9uXsj dILvo5VxPA+Lh52JzRqf2vzSdO+YCCvIND3xzLC+LGMKR5e3ViXm1ieDAM3wTVvxp1SE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/device-tree: Add dt_get_pci_domain_nr helper Message-Id: Date: Tue, 05 Oct 2021 18:55:09 +0000 commit f01be299050969f842fbc353f3d465b92979d3d7 Author: Rahul Singh AuthorDate: Tue Sep 28 19:18:17 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Sep 30 18:26:13 2021 -0700 xen/device-tree: Add dt_get_pci_domain_nr helper Based Linux commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9d7 Import the Linux helper of_get_pci_domain_nr. This function will try to obtain the host bridge domain number by finding a property called "linux,pci-domain" of the given device node. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/common/device_tree.c | 12 ++++++++++++ xen/include/xen/device_tree.h | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 53160d61f8..ea93da1725 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -2183,6 +2183,18 @@ void __init dt_unflatten_host_device_tree(void) dt_alias_scan(); } +int dt_get_pci_domain_nr(struct dt_device_node *node) +{ + u32 domain; + int error; + + error = dt_property_read_u32(node, "linux,pci-domain", &domain); + if ( !error ) + return -EINVAL; + + return (u16)domain; +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 3ffe3eb3d2..2297c59ce6 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -832,6 +832,23 @@ int dt_count_phandle_with_args(const struct dt_device_node *np, const char *list_name, const char *cells_name); +/** + * dt_get_pci_domain_nr - Find the host bridge domain number + * of the given device node. + * @node: Device tree node with the domain information. + * + * This function will try to obtain the host bridge domain number by finding + * a property called "linux,pci-domain" of the given device node. + * + * Return: + * * > 0 - On success, an associated domain number. + * * -EINVAL - The property "linux,pci-domain" does not exist. + * + * Returns the associated domain number from DT in the range [0-0xffff], or + * a negative value if the required property is not found. + */ +int dt_get_pci_domain_nr(struct dt_device_node *node); + #ifdef CONFIG_DEVICE_TREE_DEBUG #define dt_dprintk(fmt, args...) \ printk(XENLOG_DEBUG fmt, ## args) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:55:20 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:55:20 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202432.357338 (Exim 4.92) (envelope-from ) id 1mXpay-00064a-RC; Tue, 05 Oct 2021 18:55:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202432.357338; Tue, 05 Oct 2021 18:55:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpay-00064S-O9; Tue, 05 Oct 2021 18:55:20 +0000 Received: by outflank-mailman (input) for mailman id 202432; Tue, 05 Oct 2021 18:55:19 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpax-00064J-R3 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:19 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpax-0002BU-QP for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:19 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpax-0001MT-Pi for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:19 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XtcR1uwLC2/zdz2u2yeJS+61n8rWBDCHRD9LEaW6dno=; b=G/LkhMrCqDN878eGbJhuMgc73l Y8Dc7tjUCOV8yNOiwwUZ00MxGD90pq7WgYd17ig0lCKV93fR3af8hzbHF6BfH7GJGOr2qTvVXSFfZ F1f7hT/jhhJx12+kpKulW4goedzRMc0c/GPHaLmYbROYponwFzcwioJi+GmzhDgt5q0w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: switch GitLab x86 smoke test to use PV 64bit binary Message-Id: Date: Tue, 05 Oct 2021 18:55:19 +0000 commit 5d15f905b9252d801101af0279fbedb0c50dc241 Author: Anthony PERARD AuthorDate: Thu Sep 30 17:17:19 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Oct 1 09:52:14 2021 +0100 automation: switch GitLab x86 smoke test to use PV 64bit binary Xen is now built without CONFIG_PV32 by default and thus test jobs "qemu-smoke-x86-64-gcc" and "qemu-smoke-x86-64-clang" fails because they are using XTF's "test-pv32pae-example" which is an hello word 32bit PV guest. As we are looking for whether Xen boot or not with a quick smoke test, just use 64bit tests instead. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- automation/scripts/qemu-smoke-x86-64.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh index 09152e3e9c..29cb44b757 100755 --- a/automation/scripts/qemu-smoke-x86-64.sh +++ b/automation/scripts/qemu-smoke-x86-64.sh @@ -15,8 +15,8 @@ git clone https://xenbits.xen.org/git-http/xtf.git cd xtf && make -j$(nproc) && cd - case $variant in - pvh) k=test-hvm32pae-example extra="dom0-iommu=none dom0=pvh" ;; - *) k=test-pv32pae-example extra= ;; + pvh) k=test-hvm64-example extra="dom0-iommu=none dom0=pvh" ;; + *) k=test-pv64-example extra= ;; esac rm -f smoke.serial -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:55:30 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:55:30 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202433.357342 (Exim 4.92) (envelope-from ) id 1mXpb8-00067C-SO; Tue, 05 Oct 2021 18:55:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202433.357342; Tue, 05 Oct 2021 18:55:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpb8-000674-Pb; Tue, 05 Oct 2021 18:55:30 +0000 Received: by outflank-mailman (input) for mailman id 202433; Tue, 05 Oct 2021 18:55:29 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpb7-00066v-UC for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:29 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpb7-0002Bm-TU for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:29 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpb7-0001N5-So for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:29 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zzf1d1Hc0iNHl1jqJHVHpTZv2JgCAY7dB4Lzm0Llqog=; b=Ct51QiAgcWr9biq3u96nhT0emv TcjBNGr3v+Fsuo3l1k0A4zS+MbzVe/ZihyVkNoFUtm6vOzvXY8hxbHvnQa6ebtBv3FTJt4aW+mR1x 7PVo01a0D4/3BicB+Vtlk9rG1/gSvaj/Z2UQBt5hfIbWOrybL+61qkVWmie+SRyU+/lk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add qemu to debian:stretch container for smoke test Message-Id: Date: Tue, 05 Oct 2021 18:55:29 +0000 commit c9aa02e48eda5378c19f3837e6c21bcaab1dcad5 Author: Anthony PERARD AuthorDate: Thu Sep 30 17:17:20 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Oct 1 09:52:14 2021 +0100 automation: Add qemu to debian:stretch container for smoke test We can add qemu into the container so that there's no need to install it everytime we run a test. Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- automation/build/debian/stretch.dockerfile | 2 ++ automation/scripts/qemu-smoke-x86-64.sh | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile index e2ee14e201..da6aa874dd 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -47,6 +47,8 @@ RUN apt-get update && \ nasm \ gnupg \ apt-transport-https \ + # for test phase, qemu-smoke-* jobs + qemu-system-x86 \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh index 29cb44b757..188ff8e3d6 100755 --- a/automation/scripts/qemu-smoke-x86-64.sh +++ b/automation/scripts/qemu-smoke-x86-64.sh @@ -5,11 +5,6 @@ set -ex # variant should be either pv or pvh variant=$1 -# Install QEMU -export DEBIAN_FRONTENT=noninteractive -apt-get -qy update -apt-get -qy install qemu-system-x86 - # Clone and build XTF git clone https://xenbits.xen.org/git-http/xtf.git cd xtf && make -j$(nproc) && cd - -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:55:40 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:55:40 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202434.357345 (Exim 4.92) (envelope-from ) id 1mXpbI-0006AT-VF; Tue, 05 Oct 2021 18:55:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202434.357345; Tue, 05 Oct 2021 18:55:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbI-0006AL-SQ; Tue, 05 Oct 2021 18:55:40 +0000 Received: by outflank-mailman (input) for mailman id 202434; Tue, 05 Oct 2021 18:55:40 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbI-0006AB-11 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:40 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbI-0002Bx-0L for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:40 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpbH-0001O0-Vs for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:39 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=As8jW4E8t7I3kxClv+0VHwVzvgQgtMvy6/YfIpagsQg=; b=3b7jDqi0fWUeLAZP7HO05TnnKW 352Cl4awDGcw76KgLnq6per40SluAeFi6AIAalrW6pe9rMm8H4uWbjLTkEF64BuU7erLHR4ne80xq FGXcEkxd8I7uIRWYKDYQNLohxF8cjV26t/vaD5M+UHFyjXonDMA//we3iQQLvjfTnzao=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] include/public: add possible status values to usbif.h Message-Id: Date: Tue, 05 Oct 2021 18:55:39 +0000 commit c2f40d8170464ac30eaeb4e090535da09b9c6b4e Author: Juergen Gross AuthorDate: Fri Oct 1 15:11:03 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 1 15:11:03 2021 +0200 include/public: add possible status values to usbif.h The interface definition of PV USB devices is lacking the specification of possible values of the status field in a response. Those are negative errno values as used in Linux, so they might differ in other OS's. Specify them via appropriate defines. Signed-off-by: Juergen Gross Reviewed-by: Luca Fancellu --- xen/include/public/io/usbif.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/include/public/io/usbif.h b/xen/include/public/io/usbif.h index c6a58639d6..96b9fb661d 100644 --- a/xen/include/public/io/usbif.h +++ b/xen/include/public/io/usbif.h @@ -221,6 +221,13 @@ struct usbif_urb_response { uint16_t id; /* request id */ uint16_t start_frame; /* start frame (ISO) */ int32_t status; /* status (non-ISO) */ +#define USBIF_STATUS_OK 0 +#define USBIF_STATUS_NODEV (-19) +#define USBIF_STATUS_INVAL (-22) +#define USBIF_STATUS_STALL (-32) +#define USBIF_STATUS_IOERROR (-71) +#define USBIF_STATUS_BABBLE (-75) +#define USBIF_STATUS_SHUTDOWN (-108) int32_t actual_length; /* actual transfer length */ int32_t error_count; /* number of ISO errors */ }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:55:51 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:55:51 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202435.357350 (Exim 4.92) (envelope-from ) id 1mXpbT-0006DM-0a; Tue, 05 Oct 2021 18:55:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202435.357350; Tue, 05 Oct 2021 18:55:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbS-0006DE-Tu; Tue, 05 Oct 2021 18:55:50 +0000 Received: by outflank-mailman (input) for mailman id 202435; Tue, 05 Oct 2021 18:55:50 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbS-0006D5-44 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:50 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbS-0002C8-3Q for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:50 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpbS-0001On-2j for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:55:50 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QCRhDF1Fy6Hx1MAHe5pS52mabMK4B3LnKjg9fbQ5iSo=; b=wWzCvCQBBQolmnqqFq07TLWoqV keGbKsj8zc+8RgHW6rRfj4ESPPdkvUhwOtitxD2A4ES55qwddq8PZ1iVinqeqA4Vwzm2I8NeijJAV hnftjErGW4VKzt5oI1PtQx3HKnEyEJRHzgCCc3j2aOu1plzdlvZMAMRGDhmkNLwUBbBA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] include/public: add better interface description to usbif.h Message-Id: Date: Tue, 05 Oct 2021 18:55:50 +0000 commit a9a34e2b6abf756a94f8fd599fd8060cfc0e7a00 Author: Juergen Gross AuthorDate: Fri Oct 1 15:11:28 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 1 15:11:28 2021 +0200 include/public: add better interface description to usbif.h The PV USB protocol is poorly described. Add a more detailed description to the usbif.h header file. Signed-off-by: Juergen Gross Reviewed-by: Luca Fancellu --- xen/include/public/io/usbif.h | 164 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/xen/include/public/io/usbif.h b/xen/include/public/io/usbif.h index 96b9fb661d..dd378bcba5 100644 --- a/xen/include/public/io/usbif.h +++ b/xen/include/public/io/usbif.h @@ -32,6 +32,34 @@ #include "../grant_table.h" /* + * Detailed Interface Description + * ============================== + * The pvUSB interface is using a split driver design: a frontend driver in + * the guest and a backend driver in a driver domain (normally dom0) having + * access to the physical USB device(s) being passed to the guest. + * + * The frontend and backend drivers use XenStore to initiate the connection + * between them, the I/O activity is handled via two shared ring pages and an + * event channel. As the interface between frontend and backend is at the USB + * host connector level, multiple (up to 31) physical USB devices can be + * handled by a single connection. + * + * The Xen pvUSB device name is "qusb", so the frontend's XenStore entries are + * to be found under "device/qusb", while the backend's XenStore entries are + * under "backend//qusb". + * + * When a new pvUSB connection is established, the frontend needs to setup the + * two shared ring pages for communication and the event channel. The ring + * pages need to be made available to the backend via the grant table + * interface. + * + * One of the shared ring pages is used by the backend to inform the frontend + * about USB device plug events (device to be added or removed). This is the + * "conn-ring". + * + * The other ring page is used for USB I/O communication (requests and + * responses). This is the "urb-ring". + * * Feature and Parameter Negotiation * ================================= * The two halves of a Xen pvUSB driver utilize nodes within the XenStore to @@ -99,6 +127,142 @@ * The machine ABI rules governing the format of all ring request and * response structures. * + * Protocol Description + * ==================== + * + *-------------------------- USB device plug events -------------------------- + * + * USB device plug events are send via the "conn-ring" shared page. As only + * events are being sent, the respective requests from the frontend to the + * backend are just dummy ones. + * The events sent to the frontend have the following layout: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | id | portnum | speed | 4 + * +----------------+----------------+----------------+----------------+ + * id - uint16_t, event id (taken from the actual frontend dummy request) + * portnum - uint8_t, port number (1 ... 31) + * speed - uint8_t, device USBIF_SPEED_*, USBIF_SPEED_NONE == unplug + * + * The dummy request: + * 0 1 octet + * +----------------+----------------+ + * | id | 2 + * +----------------+----------------+ + * id - uint16_t, guest supplied value (no need for being unique) + * + *-------------------------- USB I/O request --------------------------------- + * + * A single USB I/O request on the "urb-ring" has the following layout: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | id | nr_buffer_segs | 4 + * +----------------+----------------+----------------+----------------+ + * | pipe | 8 + * +----------------+----------------+----------------+----------------+ + * | transfer_flags | buffer_length | 12 + * +----------------+----------------+----------------+----------------+ + * | request type specific | 16 + * | data | 20 + * +----------------+----------------+----------------+----------------+ + * | seg[0] | 24 + * | data | 28 + * +----------------+----------------+----------------+----------------+ + * |/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/| + * +----------------+----------------+----------------+----------------+ + * | seg[USBIF_MAX_SEGMENTS_PER_REQUEST - 1] | 144 + * | data | 148 + * +----------------+----------------+----------------+----------------+ + * Bit field bit number 0 is always least significant bit, undefined bits must + * be zero. + * id - uint16_t, guest supplied value + * nr_buffer_segs - uint16_t, number of segment entries in seg[] array + * pipe - uint32_t, bit field with multiple information: + * bits 0-4: port request to send to + * bit 5: unlink request with specified id (cancel I/O) if set (see below) + * bit 7: direction (1 = read from device) + * bits 8-14: device number on port + * bits 15-18: endpoint of device + * bits 30-31: request type: 00 = isochronous, 01 = interrupt, + * 10 = control, 11 = bulk + * transfer_flags - uint16_t, bit field with processing flags: + * bit 0: less data than specified allowed + * buffer_length - uint16_t, total length of data + * request type specific data - 8 bytes, see below + * seg[] - array with 8 byte elements, see below + * + * Request type specific data for isochronous request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | interval | start_frame | 4 + * +----------------+----------------+----------------+----------------+ + * | number_of_packets | nr_frame_desc_segs | 8 + * +----------------+----------------+----------------+----------------+ + * interval - uint16_t, time interval in msecs between frames + * start_frame - uint16_t, start frame number + * number_of_packets - uint16_t, number of packets to transfer + * nr_frame_desc_segs - uint16_t number of seg[] frame descriptors elements + * + * Request type specific data for interrupt request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | interval | 0 | 4 + * +----------------+----------------+----------------+----------------+ + * | 0 | 8 + * +----------------+----------------+----------------+----------------+ + * interval - uint16_t, time in msecs until interruption + * + * Request type specific data for control request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | data of setup packet | 4 + * | | 8 + * +----------------+----------------+----------------+----------------+ + * + * Request type specific data for bulk request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | 0 | 4 + * | 0 | 8 + * +----------------+----------------+----------------+----------------+ + * + * Request type specific data for unlink request: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | unlink_id | 0 | 4 + * +----------------+----------------+----------------+----------------+ + * | 0 | 8 + * +----------------+----------------+----------------+----------------+ + * unlink_id - uint16_t, request id of request to terminate + * + * seg[] array element layout: + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | gref | 4 + * +----------------+----------------+----------------+----------------+ + * | offset | length | 8 + * +----------------+----------------+----------------+----------------+ + * gref - uint32_t, grant reference of buffer page + * offset - uint16_t, offset of buffer start in page + * length - uint16_t, length of buffer in page + * + *-------------------------- USB I/O response -------------------------------- + * + * 0 1 2 3 octet + * +----------------+----------------+----------------+----------------+ + * | id | start_frame | 4 + * +----------------+----------------+----------------+----------------+ + * | status | 8 + * +----------------+----------------+----------------+----------------+ + * | actual_length | 12 + * +----------------+----------------+----------------+----------------+ + * | error_count | 16 + * +----------------+----------------+----------------+----------------+ + * id - uint16_t, id of the request this response belongs to + * start_frame - uint16_t, start_frame this response (iso requests only) + * status - int32_t, USBIF_STATUS_* (non-iso requests) + * actual_length - uint32_t, actual size of data transferred + * error_count - uint32_t, number of errors (iso requests) */ enum usb_spec_version { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:56:01 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:56:01 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202436.357354 (Exim 4.92) (envelope-from ) id 1mXpbd-0006Gm-2X; Tue, 05 Oct 2021 18:56:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202436.357354; Tue, 05 Oct 2021 18:56:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbc-0006Gc-VX; Tue, 05 Oct 2021 18:56:00 +0000 Received: by outflank-mailman (input) for mailman id 202436; Tue, 05 Oct 2021 18:56:00 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbc-0006GL-7f for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:00 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbc-0002CJ-6u for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:00 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpbc-0001Pz-61 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:00 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vM/gp2Xvg9XKmcdhUYO8lqxUDafbhvfBUhP9pcu5J3E=; b=Jy1iITiZmrQUtou+n8iY4oLCc+ RldTv4V7rhYJhRkEtJ+fO1WiQhcQh8jo+Q+ysumBef9n7ng/ux8JBTYRqFxRhqI8b33XEmmle9ZXw 6tuLcv2nCmbBjkHpdKR2qf99yxGBmOh74Ka7YnOAem0Rfo05/N0BHTynKTWFWRoEVnLM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] include/public: fix style of usbif.h Message-Id: Date: Tue, 05 Oct 2021 18:56:00 +0000 commit 4eb172864321dfae6da59ea2c4e67f09a92cc525 Author: Juergen Gross AuthorDate: Fri Oct 1 15:11:41 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 1 15:11:41 2021 +0200 include/public: fix style of usbif.h usbif.h is violating the Xen hypervisor coding style. Fix that. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/include/public/io/usbif.h | 196 +++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/xen/include/public/io/usbif.h b/xen/include/public/io/usbif.h index dd378bcba5..c0a552e195 100644 --- a/xen/include/public/io/usbif.h +++ b/xen/include/public/io/usbif.h @@ -266,134 +266,134 @@ */ enum usb_spec_version { - USB_VER_UNKNOWN = 0, - USB_VER_USB11, - USB_VER_USB20, - USB_VER_USB30, /* not supported yet */ + USB_VER_UNKNOWN = 0, + USB_VER_USB11, + USB_VER_USB20, + USB_VER_USB30, /* not supported yet */ }; /* * USB pipe in usbif_request * - * - port number: bits 0-4 - * (USB_MAXCHILDREN is 31) + * - port number: bits 0-4 + * (USB_MAXCHILDREN is 31) * - * - operation flag: bit 5 - * (0 = submit urb, - * 1 = unlink urb) + * - operation flag: bit 5 + * (0 = submit urb, + * 1 = unlink urb) * - * - direction: bit 7 - * (0 = Host-to-Device [Out] - * 1 = Device-to-Host [In]) + * - direction: bit 7 + * (0 = Host-to-Device [Out] + * 1 = Device-to-Host [In]) * - * - device address: bits 8-14 + * - device address: bits 8-14 * - * - endpoint: bits 15-18 + * - endpoint: bits 15-18 * - * - pipe type: bits 30-31 - * (00 = isochronous, 01 = interrupt, - * 10 = control, 11 = bulk) + * - pipe type: bits 30-31 + * (00 = isochronous, 01 = interrupt, + * 10 = control, 11 = bulk) */ -#define USBIF_PIPE_PORT_MASK 0x0000001f -#define USBIF_PIPE_UNLINK 0x00000020 -#define USBIF_PIPE_DIR 0x00000080 -#define USBIF_PIPE_DEV_MASK 0x0000007f -#define USBIF_PIPE_DEV_SHIFT 8 -#define USBIF_PIPE_EP_MASK 0x0000000f -#define USBIF_PIPE_EP_SHIFT 15 -#define USBIF_PIPE_TYPE_MASK 0x00000003 -#define USBIF_PIPE_TYPE_SHIFT 30 -#define USBIF_PIPE_TYPE_ISOC 0 -#define USBIF_PIPE_TYPE_INT 1 -#define USBIF_PIPE_TYPE_CTRL 2 -#define USBIF_PIPE_TYPE_BULK 3 +#define USBIF_PIPE_PORT_MASK 0x0000001f +#define USBIF_PIPE_UNLINK 0x00000020 +#define USBIF_PIPE_DIR 0x00000080 +#define USBIF_PIPE_DEV_MASK 0x0000007f +#define USBIF_PIPE_DEV_SHIFT 8 +#define USBIF_PIPE_EP_MASK 0x0000000f +#define USBIF_PIPE_EP_SHIFT 15 +#define USBIF_PIPE_TYPE_MASK 0x00000003 +#define USBIF_PIPE_TYPE_SHIFT 30 +#define USBIF_PIPE_TYPE_ISOC 0 +#define USBIF_PIPE_TYPE_INT 1 +#define USBIF_PIPE_TYPE_CTRL 2 +#define USBIF_PIPE_TYPE_BULK 3 -#define usbif_pipeportnum(pipe) ((pipe) & USBIF_PIPE_PORT_MASK) -#define usbif_setportnum_pipe(pipe, portnum) ((pipe) | (portnum)) +#define usbif_pipeportnum(pipe) ((pipe) & USBIF_PIPE_PORT_MASK) +#define usbif_setportnum_pipe(pipe, portnum) ((pipe) | (portnum)) -#define usbif_pipeunlink(pipe) ((pipe) & USBIF_PIPE_UNLINK) -#define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) -#define usbif_setunlink_pipe(pipe) ((pipe) | USBIF_PIPE_UNLINK) +#define usbif_pipeunlink(pipe) ((pipe) & USBIF_PIPE_UNLINK) +#define usbif_pipesubmit(pipe) (!usbif_pipeunlink(pipe)) +#define usbif_setunlink_pipe(pipe) ((pipe) | USBIF_PIPE_UNLINK) -#define usbif_pipein(pipe) ((pipe) & USBIF_PIPE_DIR) -#define usbif_pipeout(pipe) (!usbif_pipein(pipe)) +#define usbif_pipein(pipe) ((pipe) & USBIF_PIPE_DIR) +#define usbif_pipeout(pipe) (!usbif_pipein(pipe)) -#define usbif_pipedevice(pipe) \ - (((pipe) >> USBIF_PIPE_DEV_SHIFT) & USBIF_PIPE_DEV_MASK) +#define usbif_pipedevice(pipe) \ + (((pipe) >> USBIF_PIPE_DEV_SHIFT) & USBIF_PIPE_DEV_MASK) -#define usbif_pipeendpoint(pipe) \ - (((pipe) >> USBIF_PIPE_EP_SHIFT) & USBIF_PIPE_EP_MASK) +#define usbif_pipeendpoint(pipe) \ + (((pipe) >> USBIF_PIPE_EP_SHIFT) & USBIF_PIPE_EP_MASK) -#define usbif_pipetype(pipe) \ - (((pipe) >> USBIF_PIPE_TYPE_SHIFT) & USBIF_PIPE_TYPE_MASK) -#define usbif_pipeisoc(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_ISOC) -#define usbif_pipeint(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_INT) -#define usbif_pipectrl(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_CTRL) -#define usbif_pipebulk(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_BULK) +#define usbif_pipetype(pipe) \ + (((pipe) >> USBIF_PIPE_TYPE_SHIFT) & USBIF_PIPE_TYPE_MASK) +#define usbif_pipeisoc(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_ISOC) +#define usbif_pipeint(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_INT) +#define usbif_pipectrl(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_CTRL) +#define usbif_pipebulk(pipe) (usbif_pipetype(pipe) == USBIF_PIPE_TYPE_BULK) #define USBIF_MAX_SEGMENTS_PER_REQUEST (16) -#define USBIF_MAX_PORTNR 31 -#define USBIF_RING_SIZE 4096 +#define USBIF_MAX_PORTNR 31 +#define USBIF_RING_SIZE 4096 /* * RING for transferring urbs. */ struct usbif_request_segment { - grant_ref_t gref; - uint16_t offset; - uint16_t length; + grant_ref_t gref; + uint16_t offset; + uint16_t length; }; struct usbif_urb_request { - uint16_t id; /* request id */ - uint16_t nr_buffer_segs; /* number of urb->transfer_buffer segments */ + uint16_t id; /* request id */ + uint16_t nr_buffer_segs; /* number of urb->transfer_buffer segments */ - /* basic urb parameter */ - uint32_t pipe; - uint16_t transfer_flags; -#define USBIF_SHORT_NOT_OK 0x0001 - uint16_t buffer_length; - union { - uint8_t ctrl[8]; /* setup_packet (Ctrl) */ + /* basic urb parameter */ + uint32_t pipe; + uint16_t transfer_flags; +#define USBIF_SHORT_NOT_OK 0x0001 + uint16_t buffer_length; + union { + uint8_t ctrl[8]; /* setup_packet (Ctrl) */ - struct { - uint16_t interval; /* maximum (1024*8) in usb core */ - uint16_t start_frame; /* start frame */ - uint16_t number_of_packets; /* number of ISO packet */ - uint16_t nr_frame_desc_segs; /* number of iso_frame_desc segments */ - } isoc; + struct { + uint16_t interval; /* maximum (1024*8) in usb core */ + uint16_t start_frame; /* start frame */ + uint16_t number_of_packets; /* number of ISO packet */ + uint16_t nr_frame_desc_segs; /* number of iso_frame_desc segments */ + } isoc; - struct { - uint16_t interval; /* maximum (1024*8) in usb core */ - uint16_t pad[3]; - } intr; + struct { + uint16_t interval; /* maximum (1024*8) in usb core */ + uint16_t pad[3]; + } intr; - struct { - uint16_t unlink_id; /* unlink request id */ - uint16_t pad[3]; - } unlink; + struct { + uint16_t unlink_id; /* unlink request id */ + uint16_t pad[3]; + } unlink; - } u; + } u; - /* urb data segments */ - struct usbif_request_segment seg[USBIF_MAX_SEGMENTS_PER_REQUEST]; + /* urb data segments */ + struct usbif_request_segment seg[USBIF_MAX_SEGMENTS_PER_REQUEST]; }; typedef struct usbif_urb_request usbif_urb_request_t; struct usbif_urb_response { - uint16_t id; /* request id */ - uint16_t start_frame; /* start frame (ISO) */ - int32_t status; /* status (non-ISO) */ -#define USBIF_STATUS_OK 0 -#define USBIF_STATUS_NODEV (-19) -#define USBIF_STATUS_INVAL (-22) -#define USBIF_STATUS_STALL (-32) -#define USBIF_STATUS_IOERROR (-71) -#define USBIF_STATUS_BABBLE (-75) -#define USBIF_STATUS_SHUTDOWN (-108) - int32_t actual_length; /* actual transfer length */ - int32_t error_count; /* number of ISO errors */ + uint16_t id; /* request id */ + uint16_t start_frame; /* start frame (ISO) */ + int32_t status; /* status (non-ISO) */ +#define USBIF_STATUS_OK 0 +#define USBIF_STATUS_NODEV (-19) +#define USBIF_STATUS_INVAL (-22) +#define USBIF_STATUS_STALL (-32) +#define USBIF_STATUS_IOERROR (-71) +#define USBIF_STATUS_BABBLE (-75) +#define USBIF_STATUS_SHUTDOWN (-108) + int32_t actual_length; /* actual transfer length */ + int32_t error_count; /* number of ISO errors */ }; typedef struct usbif_urb_response usbif_urb_response_t; @@ -404,18 +404,18 @@ DEFINE_RING_TYPES(usbif_urb, struct usbif_urb_request, struct usbif_urb_response * RING for notifying connect/disconnect events to frontend */ struct usbif_conn_request { - uint16_t id; + uint16_t id; }; typedef struct usbif_conn_request usbif_conn_request_t; struct usbif_conn_response { - uint16_t id; /* request id */ - uint8_t portnum; /* port number */ - uint8_t speed; /* usb_device_speed */ -#define USBIF_SPEED_NONE 0 -#define USBIF_SPEED_LOW 1 -#define USBIF_SPEED_FULL 2 -#define USBIF_SPEED_HIGH 3 + uint16_t id; /* request id */ + uint8_t portnum; /* port number */ + uint8_t speed; /* usb_device_speed */ +#define USBIF_SPEED_NONE 0 +#define USBIF_SPEED_LOW 1 +#define USBIF_SPEED_FULL 2 +#define USBIF_SPEED_HIGH 3 }; typedef struct usbif_conn_response usbif_conn_response_t; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:56:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:56:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202437.357358 (Exim 4.92) (envelope-from ) id 1mXpbn-0006Jb-42; Tue, 05 Oct 2021 18:56:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202437.357358; Tue, 05 Oct 2021 18:56:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbn-0006JT-0m; Tue, 05 Oct 2021 18:56:11 +0000 Received: by outflank-mailman (input) for mailman id 202437; Tue, 05 Oct 2021 18:56:10 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbm-0006JJ-B0 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:10 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbm-0002Cu-AH for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:10 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpbm-0001R5-9Z for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:10 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wWLou+GZkznlVNUQb5RcL2GMJ9iukVC7Rmu5OiG7yNs=; b=ZsTFDqAMfD8qgX3XhEHERO9wyi yc1nQADczL4jLuc3BSN66LxeAmgxXhP2ANKVnezLqSRJevuGjQAnUBDOLOMBkETkXQJzHhxxTrfHG gHKa4Wv0TLu8VKSnopon4ou9DSuv3ccPfqd63oMVafsVW7+qTAAcElHtg8jMRrOh8xG0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/efi: Introduce xen,uefi-cfg-load DT property Message-Id: Date: Tue, 05 Oct 2021 18:56:10 +0000 commit 60649d443dc395243e74d2b3e05594ac0c43cfe3 Author: Luca Fancellu AuthorDate: Thu Sep 30 15:28:44 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 1 16:26:04 2021 -0700 arm/efi: Introduce xen,uefi-cfg-load DT property Introduce the xen,uefi-cfg-load DT property of /chosen node for ARM whose presence decide whether to force the load of the UEFI Xen configuration file. The logic is that if any multiboot,module is found in the DT, then the xen,uefi-cfg-load property is used to see if the UEFI Xen configuration file is needed. Modify a comment in efi_arch_use_config_file, removing the part that states "dom0 required" because it's not true anymore with this commit. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- docs/misc/arm/device-tree/booting.txt | 8 ++++++++ docs/misc/efi.pandoc | 2 ++ xen/arch/arm/efi/efi-boot.h | 28 +++++++++++++++++++++++----- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 44cd9e1a9a..352b0ec43a 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -121,6 +121,14 @@ A Xen-aware bootloader would set xen,xen-bootargs for Xen, xen,dom0-bootargs for Dom0 and bootargs for native Linux. +UEFI boot and DT +================ + +When Xen is booted using UEFI, it doesn't read the configuration file if any +multiboot module is specified. To force Xen to load the configuration file, the +boolean property xen,uefi-cfg-load must be declared in the /chosen node. + + Creating Multiple Domains directly from Xen =========================================== diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index ac3cd58cae..ed85351541 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -14,6 +14,8 @@ loaded the modules and describes them in the device tree provided to Xen. If a bootloader provides a device tree containing modules then any configuration files are ignored, and the bootloader is responsible for populating all relevant device tree nodes. +The property "xen,uefi-cfg-load" can be specified in the /chosen node to force +Xen to load the configuration file even if multiboot modules are found. Once built, `make install-xen` will place the resulting binary directly into the EFI boot partition, provided `EFI_VENDOR` is set in the environment (and diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index cf9c37153f..a3e46453d4 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -581,22 +581,40 @@ static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) static bool __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) { + bool load_cfg_file = true; /* * For arm, we may get a device tree from GRUB (or other bootloader) * that contains modules that have already been loaded into memory. In - * this case, we do not use a configuration file, and rely on the - * bootloader to have loaded all required modules and appropriate - * options. + * this case, we search for the property xen,uefi-cfg-load in the /chosen + * node to decide whether to skip the UEFI Xen configuration file or not. */ fdt = lookup_fdt_config_table(SystemTable); dtbfile.ptr = fdt; dtbfile.need_to_free = false; /* Config table memory can't be freed. */ - if ( !fdt || fdt_node_offset_by_compatible(fdt, 0, "multiboot,module") < 0 ) + + if ( fdt_node_offset_by_compatible(fdt, 0, "multiboot,module") > 0 ) + { + /* Locate chosen node */ + int node = fdt_subnode_offset(fdt, 0, "chosen"); + const void *cfg_load_prop; + int cfg_load_len; + + if ( node > 0 ) + { + /* Check if xen,uefi-cfg-load property exists */ + cfg_load_prop = fdt_getprop(fdt, node, "xen,uefi-cfg-load", + &cfg_load_len); + if ( !cfg_load_prop ) + load_cfg_file = false; + } + } + + if ( !fdt || load_cfg_file ) { /* * We either have no FDT, or one without modules, so we must have a - * Xen EFI configuration file to specify modules. (dom0 required) + * Xen EFI configuration file to specify modules. */ return true; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:56:21 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:56:21 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202438.357362 (Exim 4.92) (envelope-from ) id 1mXpbx-0006My-6X; Tue, 05 Oct 2021 18:56:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202438.357362; Tue, 05 Oct 2021 18:56:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbx-0006Mq-3Z; Tue, 05 Oct 2021 18:56:21 +0000 Received: by outflank-mailman (input) for mailman id 202438; Tue, 05 Oct 2021 18:56:20 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbw-0006Mh-EI for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:20 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpbw-0002D6-Da for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:20 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpbw-0001TK-Ct for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:20 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=N2/EgRQ0eArsuuw2M7x5AbnN79FSJ0k82ru1gaXJWYw=; b=cc5cubsbVOhZmEzKazKa8JNq93 182jtqomFdaNYuQPTsqhj2R4RGmnol1mEzyxFhJ6w4RMXpoNBRBndxF89Dj0Q289jP8KW1X0uyQ7l D8Z5xVy4lXcZyuZp5trC/FzEyPSby0kzRJbzk2mTjA69zZ62udDa5+La4hpyf/d35ojg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add handling of extended regions for Dom0 Message-Id: Date: Tue, 05 Oct 2021 18:56:20 +0000 commit b6fe410936e30b2089cc8c6d54d786e535efafa3 Author: Oleksandr Tyshchenko AuthorDate: Thu Sep 30 01:52:06 2021 +0300 Commit: Stefano Stabellini CommitDate: Fri Oct 1 17:29:22 2021 -0700 xen/arm: Add handling of extended regions for Dom0 The extended region (safe range) is a region of guest physical address space which is unused and could be safely used to create grant/foreign mappings instead of wasting real RAM pages from the domain memory for establishing these mappings. The extended regions are chosen at the domain creation time and advertised to it via "reg" property under hypervisor node in the guest device-tree. As region 0 is reserved for grant table space (always present), the indexes for extended regions are 1...N. If extended regions could not be allocated for some reason, Xen doesn't fail and behaves as usual, so only inserts region 0. Please note the following limitations: - The extended region feature is only supported for 64-bit domain currently. - The ACPI case is not covered. *** As Dom0 is direct mapped domain on Arm (e.g. MFN == GFN) the algorithm to choose extended regions for it is different in comparison with the algorithm for non-direct mapped DomU. What is more, that extended regions should be chosen differently whether IOMMU is enabled or not. Provide RAM not assigned to Dom0 if IOMMU is disabled or memory holes found in host device-tree if otherwise. Make sure that extended regions are 2MB-aligned and located within maximum possible addressable physical memory range. The minimum size of extended region is 64MB. The maximum number of extended regions is 128, which is an artificial limit to minimize code changes (we reuse struct meminfo to describe extended regions, so there are an array field for 128 elements). It worth mentioning that unallocated memory solution (when the IOMMU is disabled) will work safely until Dom0 is able to allocate memory outside of the original range. Also introduce command line option to be able to globally enable or disable support for extended regions for Dom0 (enabled by default). Suggested-by: Julien Grall Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- docs/misc/xen-command-line.pandoc | 11 ++ xen/arch/arm/domain_build.c | 286 +++++++++++++++++++++++++++++++++++++- 2 files changed, 294 insertions(+), 3 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 177e656f12..5cae4adc58 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1081,6 +1081,17 @@ hardware domain is architecture dependent. Note that specifying zero as domU value means zero, while for dom0 it means to use the default. +### ext_regions (Arm) +> `= ` + +> Default : `true` + +Flag to enable or disable support for extended regions for Dom0. + +Extended regions are ranges of unused address space exposed to Dom0 as +"safe to use" for special memory mappings. Disable if your board device +tree is incomplete. + ### flask > `= permissive | enforcing | late | disabled` diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d233d634c1..c5afbe2e05 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -34,6 +34,10 @@ static unsigned int __initdata opt_dom0_max_vcpus; integer_param("dom0_max_vcpus", opt_dom0_max_vcpus); +/* If true, the extended regions support is enabled for dom0 */ +static bool __initdata opt_ext_regions = true; +boolean_param("ext_regions", opt_ext_regions); + static u64 __initdata dom0_mem; static bool __initdata dom0_mem_set; @@ -886,6 +890,232 @@ static int __init make_memory_node(const struct domain *d, return res; } +static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) +{ + struct meminfo *ext_regions = data; + paddr_t start, size; + + if ( ext_regions->nr_banks >= ARRAY_SIZE(ext_regions->bank) ) + return 0; + + /* Both start and size of the extended region should be 2MB aligned */ + start = (s + SZ_2M - 1) & ~(SZ_2M - 1); + if ( start > e ) + return 0; + + /* + * e is actually "end-1" because it is called by rangeset functions + * which are inclusive of the last address. + */ + e += 1; + size = (e - start) & ~(SZ_2M - 1); + if ( size < MB(64) ) + return 0; + + ext_regions->bank[ext_regions->nr_banks].start = start; + ext_regions->bank[ext_regions->nr_banks].size = size; + ext_regions->nr_banks++; + + return 0; +} + +static int __init find_unallocated_memory(const struct kernel_info *kinfo, + struct meminfo *ext_regions) +{ + const struct meminfo *assign_mem = &kinfo->mem; + struct rangeset *unalloc_mem; + paddr_t start, end; + unsigned int i; + int res; + + dt_dprintk("Find unallocated memory for extended regions\n"); + + unalloc_mem = rangeset_new(NULL, NULL, 0); + if ( !unalloc_mem ) + return -ENOMEM; + + /* Start with all available RAM */ + for ( i = 0; i < bootinfo.mem.nr_banks; i++ ) + { + start = bootinfo.mem.bank[i].start; + end = bootinfo.mem.bank[i].start + bootinfo.mem.bank[i].size; + res = rangeset_add_range(unalloc_mem, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + + /* Remove RAM assigned to Dom0 */ + for ( i = 0; i < assign_mem->nr_banks; i++ ) + { + start = assign_mem->bank[i].start; + end = assign_mem->bank[i].start + assign_mem->bank[i].size; + res = rangeset_remove_range(unalloc_mem, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + + /* Remove reserved-memory regions */ + for ( i = 0; i < bootinfo.reserved_mem.nr_banks; i++ ) + { + start = bootinfo.reserved_mem.bank[i].start; + end = bootinfo.reserved_mem.bank[i].start + + bootinfo.reserved_mem.bank[i].size; + res = rangeset_remove_range(unalloc_mem, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + + /* Remove grant table region */ + start = kinfo->gnttab_start; + end = kinfo->gnttab_start + kinfo->gnttab_size; + res = rangeset_remove_range(unalloc_mem, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + + start = 0; + end = (1ULL << p2m_ipa_bits) - 1; + res = rangeset_report_ranges(unalloc_mem, start, end, + add_ext_regions, ext_regions); + if ( res ) + ext_regions->nr_banks = 0; + else if ( !ext_regions->nr_banks ) + res = -ENOENT; + +out: + rangeset_destroy(unalloc_mem); + + return res; +} + +static int __init find_memory_holes(const struct kernel_info *kinfo, + struct meminfo *ext_regions) +{ + struct dt_device_node *np; + struct rangeset *mem_holes; + paddr_t start, end; + unsigned int i; + int res; + + dt_dprintk("Find memory holes for extended regions\n"); + + mem_holes = rangeset_new(NULL, NULL, 0); + if ( !mem_holes ) + return -ENOMEM; + + /* Start with maximum possible addressable physical memory range */ + start = 0; + end = (1ULL << p2m_ipa_bits) - 1; + res = rangeset_add_range(mem_holes, start, end); + if ( res ) + { + printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + + /* + * Remove regions described by "reg" and "ranges" properties where + * the memory is addressable (MMIO, RAM, PCI BAR, etc). + */ + dt_for_each_device_node( dt_host, np ) + { + unsigned int naddr; + u64 addr, size; + + naddr = dt_number_of_address(np); + + for ( i = 0; i < naddr; i++ ) + { + res = dt_device_get_address(np, i, &addr, &size); + if ( res ) + { + printk(XENLOG_ERR "Unable to retrieve address %u for %s\n", + i, dt_node_full_name(np)); + goto out; + } + + start = addr & PAGE_MASK; + end = PAGE_ALIGN(addr + size); + res = rangeset_remove_range(mem_holes, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + + if ( dt_device_type_is_equal(np, "pci" ) ) + { + unsigned int range_size, nr_ranges; + int na, ns, pna; + const __be32 *ranges; + u32 len; + + /* + * Looking for non-empty ranges property which in this context + * describes the PCI host bridge aperture. + */ + ranges = dt_get_property(np, "ranges", &len); + if ( !ranges || !len ) + continue; + + pna = dt_n_addr_cells(np); + na = dt_child_n_addr_cells(np); + ns = dt_child_n_size_cells(np); + range_size = pna + na + ns; + nr_ranges = len / sizeof(__be32) / range_size; + + for ( i = 0; i < nr_ranges; i++, ranges += range_size ) + { + /* Skip the child address and get the parent (CPU) address */ + addr = dt_read_number(ranges + na, pna); + size = dt_read_number(ranges + na + pna, ns); + + start = addr & PAGE_MASK; + end = PAGE_ALIGN(addr + size); + res = rangeset_remove_range(mem_holes, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + start, end); + goto out; + } + } + } + } + + start = 0; + end = (1ULL << p2m_ipa_bits) - 1; + res = rangeset_report_ranges(mem_holes, start, end, + add_ext_regions, ext_regions); + if ( res ) + ext_regions->nr_banks = 0; + else if ( !ext_regions->nr_banks ) + res = -ENOENT; + +out: + rangeset_destroy(mem_holes); + + return res; +} + static int __init make_hypervisor_node(struct domain *d, const struct kernel_info *kinfo, int addrcells, int sizecells) @@ -893,11 +1123,12 @@ static int __init make_hypervisor_node(struct domain *d, const char compat[] = "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" "xen,xen"; - __be32 reg[4]; + __be32 *reg, *cells; gic_interrupt_t intr; - __be32 *cells; int res; void *fdt = kinfo->fdt; + struct meminfo *ext_regions = NULL; + unsigned int i, nr_ext_regions; dt_dprintk("Create hypervisor node\n"); @@ -919,12 +1150,61 @@ static int __init make_hypervisor_node(struct domain *d, if ( res ) return res; + if ( !opt_ext_regions ) + { + printk(XENLOG_DEBUG "The extended regions support is disabled\n"); + nr_ext_regions = 0; + } + else if ( is_32bit_domain(d) ) + { + printk(XENLOG_DEBUG "The extended regions are only supported for 64-bit guest currently\n"); + nr_ext_regions = 0; + } + else + { + ext_regions = xzalloc(struct meminfo); + if ( !ext_regions ) + return -ENOMEM; + + if ( !is_iommu_enabled(d) ) + res = find_unallocated_memory(kinfo, ext_regions); + else + res = find_memory_holes(kinfo, ext_regions); + + if ( res ) + printk(XENLOG_WARNING "Failed to allocate extended regions\n"); + nr_ext_regions = ext_regions->nr_banks; + } + + reg = xzalloc_array(__be32, (nr_ext_regions + 1) * (addrcells + sizecells)); + if ( !reg ) + { + xfree(ext_regions); + return -ENOMEM; + } + /* reg 0 is grant table space */ cells = ®[0]; dt_child_set_range(&cells, addrcells, sizecells, kinfo->gnttab_start, kinfo->gnttab_size); + /* reg 1...N are extended regions */ + for ( i = 0; i < nr_ext_regions; i++ ) + { + u64 start = ext_regions->bank[i].start; + u64 size = ext_regions->bank[i].size; + + dt_dprintk("Extended region %d: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + dt_child_set_range(&cells, addrcells, sizecells, start, size); + } + res = fdt_property(fdt, "reg", reg, - dt_cells_to_size(addrcells + sizecells)); + dt_cells_to_size(addrcells + sizecells) * + (nr_ext_regions + 1)); + xfree(ext_regions); + xfree(reg); + if ( res ) return res; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:56:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202439.357365 (Exim 4.92) (envelope-from ) id 1mXpcA-0006Pm-8D; Tue, 05 Oct 2021 18:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202439.357365; Tue, 05 Oct 2021 18:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpcA-0006Pe-5I; Tue, 05 Oct 2021 18:56:34 +0000 Received: by outflank-mailman (input) for mailman id 202439; Tue, 05 Oct 2021 18:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpc9-0006PW-Fk for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpc9-0002DQ-F3 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpc9-0001cr-EJ for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18: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=w2vAa+7PQH8X/8drgHjw5uuYj4FdIrdFFVGBp3Q120A=; b=l5MrO52/D6Is3Ckox9lWpNZiyr u16TtQUJRP1T0alfRaC3ewTZnlRPjaOs+ov+D6F2mvbduwqxLlokedNWnrSjhaNhdpLBQ2xcqxhi3 yfCpSy0cY3h4nIuESi2CGpZHr9rU9UKOePBJcKm6J/dCDAcqpV0fEeyxclTnxfQfSvcc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] VT-d: fix deassign of device with RMRR Message-Id: Date: Tue, 05 Oct 2021 18:56:33 +0000 commit 3b98d9f35a9edd2502ff9466341132baa6664cc3 Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:49:03 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov (cherry picked from commit 24ebe875a77833696bbe5c9372e9e1590a7e7101) --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 3dac8ad79f..affdf88b7e 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2387,7 +2387,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:56:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:56:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202440.357371 (Exim 4.92) (envelope-from ) id 1mXpcL-0006S6-AB; Tue, 05 Oct 2021 18:56:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202440.357371; Tue, 05 Oct 2021 18:56:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpcL-0006Ry-6n; Tue, 05 Oct 2021 18:56:45 +0000 Received: by outflank-mailman (input) for mailman id 202440; Tue, 05 Oct 2021 18:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpcJ-0006Rp-OI for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpcJ-0002Db-Ne for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpcJ-0001eQ-Mq for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e5+JU7WSiiE484F6yAqS2kwa0ku37cIdqZuO+WOHE+I=; b=YVMyEfWf/d7XjHYwXElcI6/3Ta U0JIhGZ9RNR/5FSTTh+M4QQBGpbIb9kY/psjungwSFey5+H+LCrLWLy1GJT8xCyykeiILzTvNAVIl 1QwDVdsysnJJPsvmj09kmEGXMtjWdsvG/MtgTd8MLFUHxaKu72piN2DiC0HQpYRVGWhU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] VT-d: fix deassign of device with RMRR Message-Id: Date: Tue, 05 Oct 2021 18:56:43 +0000 commit ba45e99aa4da5dae6f42819ceb9372764fea410d Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:49:07 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov (cherry picked from commit 24ebe875a77833696bbe5c9372e9e1590a7e7101) --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index ab3c5c1845..4f6bb996d0 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2408,7 +2408,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:56:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:56:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202441.357374 (Exim 4.92) (envelope-from ) id 1mXpcV-0006VD-BJ; Tue, 05 Oct 2021 18:56:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202441.357374; Tue, 05 Oct 2021 18:56:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpcV-0006V5-8E; Tue, 05 Oct 2021 18:56:55 +0000 Received: by outflank-mailman (input) for mailman id 202441; Tue, 05 Oct 2021 18:56:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpcU-0006Uv-1c for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpcU-0002Dn-0r for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpcU-0001fJ-07 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:56:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5CwCna+DKNQI16emL4low/l1rUHRqVTOwVstiIOhUN8=; b=3+tY55SFOOw6S6hk8oe8IeP8Gr QiVDwEaS/htp/Fg1FDuZaz/kYo9+5XEcufmljWV7bdIJIIEWcLnbM35Anse1sS1P/IptuXA1ioM5q oCA7Tk9q1owuQipxDke1clGv79DG4F2EIq1FHsbVqAO1TWZOGtRIEOlLLOHJx8/+fbNw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.13] VT-d: fix deassign of device with RMRR Message-Id: Date: Tue, 05 Oct 2021 18:56:54 +0000 commit b4bb02d5999a56c93f0733b589b717e7cece9c09 Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:49:12 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov (cherry picked from commit 24ebe875a77833696bbe5c9372e9e1590a7e7101) --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 98787ce3a8..af8b9ca0e4 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2393,7 +2393,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 18:57:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 18:57:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202442.357378 (Exim 4.92) (envelope-from ) id 1mXpcf-0006ZU-Cj; Tue, 05 Oct 2021 18:57:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202442.357378; Tue, 05 Oct 2021 18:57:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpcf-0006ZM-9k; Tue, 05 Oct 2021 18:57:05 +0000 Received: by outflank-mailman (input) for mailman id 202442; Tue, 05 Oct 2021 18:57:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpce-0006ZA-9e for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:57:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpce-0002EB-8y for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:57:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpce-0001gX-8C for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 18:57:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XAlq57DNVWNaqQt5XFDmIviHUvKJtblUnB58opg57gE=; b=JlhrCOFLoyYkTWI/aU/STacxRW B3IrwTzJh08NVSUytDaJjYGxVCmZU/CJxPTRsSt8knpg/u+frqDoi2tnsB3mFtw46TcGpZDwjhu84 e0fugmuQ0jRupMg+BswvNl1Wg+xnqL2CwCnPKxN6Qe5WmvkNguBGoGkziiRBZA8QHtbU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.12] VT-d: fix deassign of device with RMRR Message-Id: Date: Tue, 05 Oct 2021 18:57:04 +0000 commit 95172a6347111247287ca6d7966aff69aa379965 Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:49:16 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov (cherry picked from commit 24ebe875a77833696bbe5c9372e9e1590a7e7101) --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index ef33111fd0..d8393d31d8 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2353,7 +2353,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue Oct 05 19:00:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Oct 2021 19:00:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202443.357382 (Exim 4.92) (envelope-from ) id 1mXpfa-0007T7-ME; Tue, 05 Oct 2021 19:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202443.357382; Tue, 05 Oct 2021 19:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpfa-0007Sz-JK; Tue, 05 Oct 2021 19:00:06 +0000 Received: by outflank-mailman (input) for mailman id 202443; Tue, 05 Oct 2021 19:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpfZ-0007NK-9d for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 19:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mXpfZ-0002K1-7I for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 19:00:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mXpfZ-0001zE-61 for xen-changelog@lists.xenproject.org; Tue, 05 Oct 2021 19:00:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lyiotrHRF5I0/SQHa3wAbRoanT2yGRtWK3iE7rFc4U8=; b=sDAmSupHXQAeuia3Gm+PfM5gWE mSn/R3LDQj17CGDDnqKa7C+likOLPPzSa/CmFAeB2Cvk7gmVdK0W7W3vmbIRJDWe4lEkFuPEE94L6 U+EFeZgVclTR6WcIw5uptiss99KE8n+VNhNWip9VUp+pbae136a5UBoRUWzxLwmAsxBk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: fix deassign of device with RMRR Message-Id: Date: Tue, 05 Oct 2021 19:00:05 +0000 commit 192aaf7e146c0b41dbdd35ccdb13eb33ced13633 Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:56:16 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 611c22fd52..0519dfc9e7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2409,7 +2409,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 06 13:22:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Oct 2021 13:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.202938.357956 (Exim 4.92) (envelope-from ) id 1mY6ry-0002rC-KC; Wed, 06 Oct 2021 13:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 202938.357956; Wed, 06 Oct 2021 13: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 1mY6ry-0002r4-HH; Wed, 06 Oct 2021 13:22:02 +0000 Received: by outflank-mailman (input) for mailman id 202938; Wed, 06 Oct 2021 13:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mY6rx-0002qw-Ot for xen-changelog@lists.xenproject.org; Wed, 06 Oct 2021 13:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mY6rx-0003zy-Kw for xen-changelog@lists.xenproject.org; Wed, 06 Oct 2021 13:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mY6rx-00024b-Ju for xen-changelog@lists.xenproject.org; Wed, 06 Oct 2021 13: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=lnlHQypvbIRXFjgtfnsL8VZ3uGq+s+4YH/5E01MjVqw=; b=pHXJeDdLcXJ2MRPmORKTwaeb1d d7RIBGQPnPvx5pYXWWTQlr1tSeUoSC6hdIEYZm2T2gmdbwkpvX3nmTfWmh0YE/3o/j8xrut19pa9I WLEX6fmYqDwoWr34Ddvmozk4KjMpFRlDfSY95sLc89X+iO7E6c/ZRPLFQ2+5AoBZbYFg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.12] VT-d: fix deassign of device with RMRR Message-Id: Date: Wed, 06 Oct 2021 13:22:01 +0000 commit 95172a6347111247287ca6d7966aff69aa379965 Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:49:16 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov (cherry picked from commit 24ebe875a77833696bbe5c9372e9e1590a7e7101) --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index ef33111fd0..d8393d31d8 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2353,7 +2353,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed Oct 06 21:55:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Oct 2021 21:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203182.358245 (Exim 4.92) (envelope-from ) id 1mYEsQ-0006Gl-RT; Wed, 06 Oct 2021 21:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203182.358245; Wed, 06 Oct 2021 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 1mYEsQ-0006Gd-OY; Wed, 06 Oct 2021 21:55:02 +0000 Received: by outflank-mailman (input) for mailman id 203182; Wed, 06 Oct 2021 21:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYEsP-0006GX-JL for xen-changelog@lists.xenproject.org; Wed, 06 Oct 2021 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 1mYEsP-0004z5-Gt for xen-changelog@lists.xenproject.org; Wed, 06 Oct 2021 21:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYEsP-0003hA-Fo for xen-changelog@lists.xenproject.org; Wed, 06 Oct 2021 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=0doRmLPTT4MZrtAPv1SM1M+Tqmzf4888jq/GrMAhjHE=; b=z9AGJBD3bdmt9ChJF7JUKE9OHp reWerj09X83/VEaW4wWcW3q8T1UzgXDsVuMM6erebE26H55q6HfJUMbn2HBgKqolkqOhg3b4nxbg9 A3s/m0Rqustxr2Dl7enq05l3B5VD1qPdb6F+dxMePXhr/Or2qhlWpr090s3lWogxDWyw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] VT-d: fix deassign of device with RMRR Message-Id: Date: Wed, 06 Oct 2021 21:55:01 +0000 commit ba45e99aa4da5dae6f42819ceb9372764fea410d Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:49:07 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov (cherry picked from commit 24ebe875a77833696bbe5c9372e9e1590a7e7101) --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index ab3c5c1845..4f6bb996d0 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2408,7 +2408,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 03:11:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 03:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203283.358371 (Exim 4.92) (envelope-from ) id 1mYJoE-0006Wf-MG; Thu, 07 Oct 2021 03:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203283.358371; Thu, 07 Oct 2021 03: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 1mYJoE-0006WW-JA; Thu, 07 Oct 2021 03:11:02 +0000 Received: by outflank-mailman (input) for mailman id 203283; Thu, 07 Oct 2021 03:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYJoD-0006WQ-LG for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 03:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYJoD-0000ad-KH for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 03:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYJoD-0001nm-Iv for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 03: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=6XCFOPjdyD/Iv0gp3EUiIyiNI/sppj7zVM5M1uIH19g=; b=KVBb5ZMX7XemIlPE7HCeDv4OMr zCC/yz7QDIpQth3T0zYWQmkUSrshAz7S1Len562Q7USIhG51ddCycVvOBmQ7aCrLlCKQz9oXcAS2i s5FnpcPHQh8suKXWxXJ8h+onaUEGU+RWWhmIG3QZxeqaAdD/IIB5k5l6qBf9+Vkk2QdU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] VT-d: fix deassign of device with RMRR Message-Id: Date: Thu, 07 Oct 2021 03:11:01 +0000 commit 3b98d9f35a9edd2502ff9466341132baa6664cc3 Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:49:03 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov (cherry picked from commit 24ebe875a77833696bbe5c9372e9e1590a7e7101) --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 3dac8ad79f..affdf88b7e 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2387,7 +2387,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 08:11:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 08:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203395.358502 (Exim 4.92) (envelope-from ) id 1mYOUZ-0007fK-16; Thu, 07 Oct 2021 08:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203395.358502; Thu, 07 Oct 2021 08:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUY-0007fC-UA; Thu, 07 Oct 2021 08:11:02 +0000 Received: by outflank-mailman (input) for mailman id 203395; Thu, 07 Oct 2021 08:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUX-0007f3-Nd for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUX-0006fC-Mq for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYOUX-0000KM-Li for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Lqi3va1Nsdtx7zryrVQwwEuECieZq89UEg05bUeTXy0=; b=QbpxqK3SJWdCH2/ETjnsddQN33 iQ/Mea/Mg9ieXznD3xAxOv1huuC+sHYQIC9bEN96u+TJPMIWp+K2FfTGNPb2JA+QTn9HT7I4UN6d+ S0cuWGWWoJ1VHwcHdlSKKqeLIIcJiIDKNcDHmkCmjsLG9QhtH7+rPcvEFJJEii7mMIeg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pci: gate APEI support on ARM Message-Id: Date: Thu, 07 Oct 2021 08:11:01 +0000 commit 4b88b4bf21afedb5408860430e1d943aa386e0fb Author: Rahul Singh AuthorDate: Mon Oct 4 12:51:56 2021 +0100 Commit: Stefano Stabellini CommitDate: Mon Oct 4 17:39:59 2021 -0700 xen/pci: gate APEI support on ARM APEI not supported on ARM yet move the code under CONFIG_X86 flag to gate the code for ARM. This patch is the preparatory work to enable HAS_PCI on ARM to avoid compilation error on ARM. prelink.o: In function `pcie_aer_get_firmware_first’: drivers/passthrough/pci.c:1251: undefined reference to `apei_hest_parse' Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini Acked-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/drivers/passthrough/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 5456ca3a63..e1b735d9e8 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -1149,7 +1149,8 @@ void __hwdom_init setup_hwdom_pci_devices( pcidevs_unlock(); } -#ifdef CONFIG_ACPI +/* APEI not supported on ARM yet. */ +#if defined(CONFIG_ACPI) && defined(CONFIG_X86) #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 08:11:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 08:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203396.358507 (Exim 4.92) (envelope-from ) id 1mYOUj-0007hJ-37; Thu, 07 Oct 2021 08:11:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203396.358507; Thu, 07 Oct 2021 08:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUi-0007hB-Vj; Thu, 07 Oct 2021 08:11:12 +0000 Received: by outflank-mailman (input) for mailman id 203396; Thu, 07 Oct 2021 08:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUh-0007gw-RE for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUh-0006fZ-QP for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYOUh-0000LC-PD for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lC7QVZeXx1/5qHEK1+kUjN4DJQQ82UZlkGlmcM8f7aA=; b=KwKCtBPvxREXm4OxWgGpN9tFf8 DvvBEFobNK7IIFiQVC0GB3kp6rZFRzwRUE9uRHdXCdsz4R3YGHA4EyWjWZAPia6UX5vxResN/9aL6 hg6t1ScAZVMOI5eRZ3g+Cn2JOBH0Hyd8CXiTBv/7sHVMwA5OyyvJ6sf+lvRAXe7m+/yM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pci: Include asm/pci.h after pci_sbdf_t in xen/pci.h Message-Id: Date: Thu, 07 Oct 2021 08:11:11 +0000 commit 58ce57a11a28f0202d9ab12fdce995b7934de8d1 Author: Rahul Singh AuthorDate: Mon Oct 4 12:51:59 2021 +0100 Commit: Stefano Stabellini CommitDate: Mon Oct 4 17:40:25 2021 -0700 xen/pci: Include asm/pci.h after pci_sbdf_t in xen/pci.h Prototypes declared in asm/pci.h that take argument of type pci_sbdf_t are included in xen/pci.h before defining pci_sbdf_t. Include asm/pci.h after pci_sbdf_t in xen/pci.h to fix the issue. Signed-off-by: Rahul Singh Acked-by: Jan Beulich --- xen/include/xen/pci.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 8e3d4d9454..70ac25345c 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -15,7 +15,6 @@ #include #include #include -#include /* * The PCI interface treats multi-function devices as independent @@ -62,6 +61,8 @@ typedef union { }; } pci_sbdf_t; +#include + struct pci_dev_info { /* * VF's 'is_extfn' field is used to indicate whether its PF is an extended -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 08:11:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 08:11:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203397.358510 (Exim 4.92) (envelope-from ) id 1mYOUt-0007l8-4G; Thu, 07 Oct 2021 08:11:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203397.358510; Thu, 07 Oct 2021 08:11:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUt-0007l0-13; Thu, 07 Oct 2021 08:11:23 +0000 Received: by outflank-mailman (input) for mailman id 203397; Thu, 07 Oct 2021 08:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUr-0007kn-Ug for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOUr-0006fl-Tx for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYOUr-0000Nb-Sh for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xqb6G+wo9XSU9RiMSDSK+qrdUk8UarjPTMRCQvmqHRo=; b=g4c1wlo3R7ay1f3T25EetkTcIe RohjgAeYmPvq91xGP8uOuZTb7Q3rmQ3EmgtlEp4atTO6kCCu4u+aBBUsbGT6TzoEqfFCSK7DJABL3 WY1n8BZwLB+FUF8qVNZR5rgeQ6F1xNwtdXg3gNaxD40sXx6JMzkfPagWX+fUa2ifBIog=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add support for PCI init to initialize the PCI driver. Message-Id: Date: Thu, 07 Oct 2021 08:11:21 +0000 commit efbd25c4f2133e00ed2f32215f458ea28035b7fb Author: Rahul Singh AuthorDate: Mon Oct 4 12:52:00 2021 +0100 Commit: Stefano Stabellini CommitDate: Mon Oct 4 17:46:30 2021 -0700 xen/arm: Add support for PCI init to initialize the PCI driver. pci_init(..) will be called during xen startup to initialize and probe the PCI host-bridge driver. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/arch/arm/pci/pci.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/device.h | 1 + 2 files changed, 52 insertions(+) diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index a7a7bc3213..e359bab9ea 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -12,6 +12,10 @@ * along with this program. If not, see . */ +#include +#include +#include +#include #include /* @@ -22,6 +26,53 @@ int arch_pci_clean_pirqs(struct domain *d) return 0; } +static int __init dt_pci_init(void) +{ + struct dt_device_node *np; + int rc; + + dt_for_each_device_node(dt_host, np) + { + rc = device_init(np, DEVICE_PCI, NULL); + /* + * Ignore the following error codes: + * - EBADF: Indicate the current device is not a pci device. + * - ENODEV: The pci device is not present or cannot be used by + * Xen. + */ + if( !rc || rc == -EBADF || rc == -ENODEV ) + continue; + + return rc; + } + + return 0; +} + +#ifdef CONFIG_ACPI +static int __init acpi_pci_init(void) +{ + printk(XENLOG_ERR "ACPI pci init not supported \n"); + return -EOPNOTSUPP; +} +#else +static int __init acpi_pci_init(void) +{ + return -EINVAL; +} +#endif + +static int __init pci_init(void) +{ + pci_segments_init(); + + if ( acpi_disabled ) + return dt_pci_init(); + else + return acpi_pci_init(); +} +__initcall(pci_init); + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index ee7cff2d44..5ecd5e7bd1 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -34,6 +34,7 @@ enum device_class DEVICE_SERIAL, DEVICE_IOMMU, DEVICE_GIC, + DEVICE_PCI, /* Use for error */ DEVICE_UNKNOWN, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 08:11:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 08:11:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203398.358514 (Exim 4.92) (envelope-from ) id 1mYOV3-0007oI-5b; Thu, 07 Oct 2021 08:11:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203398.358514; Thu, 07 Oct 2021 08:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOV3-0007oA-2Y; Thu, 07 Oct 2021 08:11:33 +0000 Received: by outflank-mailman (input) for mailman id 203398; Thu, 07 Oct 2021 08:11:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOV2-0007ny-1h for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYOV2-0006fy-0q for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYOV1-0000OI-W8 for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 08:11:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=N9P0Wgw9dbXQpuqA+tPA0QbI1ENcoRNwSP1AF2O3rqI=; b=iUjjMKjWvtysXs44Y7osOHaVnE 0ZThn9C54vTLk0QBcpHnrnPyud/1dVOjPqzfbmr+6DeiwHSCqu5Zi/cll6WXAmSyUD7yj9rU/BiYI +g+/A0DiR1XNJYh5XYEtvKJVzhTshemlrJbimKMDkNRIweKAtAR/HRxqUotELulY2QK8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Fix dev_is_dt macro definition Message-Id: Date: Thu, 07 Oct 2021 08:11:31 +0000 commit d6bdad32cbb5dfbc68fac32078cc5882071c4f1d Author: Oleksandr Andrushchenko AuthorDate: Mon Oct 4 17:11:41 2021 +0300 Commit: Stefano Stabellini CommitDate: Mon Oct 4 17:53:56 2021 -0700 xen/arm: Fix dev_is_dt macro definition This macro is not currently used, but still has an error in it: a missing parenthesis. Fix this, so the macro is properly defined. Fixes: 6c5d3075d97e ("xen/arm: Introduce a generic way to describe device") Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Stefano Stabellini Reviewed-by: Michal Orzel --- xen/include/asm-arm/device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 5ecd5e7bd1..ebe84ea853 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -27,7 +27,7 @@ typedef struct device device_t; /* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */ #define dev_is_pci(dev) ((void)(dev), 0) -#define dev_is_dt(dev) ((dev->type == DEV_DT) +#define dev_is_dt(dev) ((dev)->type == DEV_DT) enum device_class { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 16:00:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 16:00:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203836.358975 (Exim 4.92) (envelope-from ) id 1mYVoU-0000TK-3w; Thu, 07 Oct 2021 16:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203836.358975; Thu, 07 Oct 2021 16:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYVoU-0000St-0q; Thu, 07 Oct 2021 16:00:06 +0000 Received: by outflank-mailman (input) for mailman id 203836; Thu, 07 Oct 2021 16:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYVoT-0000L7-22 for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 16:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYVoS-0007Pn-TP for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 16:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYVoS-0001Rp-Rm for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 16:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UbTw1X4oQa3eEcLssjmNxJl1FyvS/Zlre2tRVwD7WV8=; b=sws0hc8DfOiaCd6ei8rzpn9wYm s3byZHzC01dsow1P8m4w0vcdsgMeSIULpyqFEUnSD7/u+wPQPc+SuwOdGZsikinO18lNR+98rC93J dMYvxwL9xq4D/CKCAGPdZWD1kJX2Gt69ALVFwzfQ8uVEDyR354OesrST0PsnW9tm2kiU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: convert binfile use to if_changed Message-Id: Date: Thu, 07 Oct 2021 16:00:04 +0000 commit 74c48d4738740d9f59d5c5a31fd373f802c09510 Author: Anthony PERARD AuthorDate: Thu Oct 7 17:55:27 2021 +0200 Commit: Jan Beulich CommitDate: Thu Oct 7 17:55:27 2021 +0200 build: convert binfile use to if_changed This will allow to detect command line changes and allow to regenerate the file in that case. Signed-off-by: Anthony PERARD Acked-by: Jan Beulich --- xen/Rules.mk | 5 +++++ xen/common/Makefile | 5 +++-- xen/xsm/flask/Makefile | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index b7827a56a5..8b8f9d347f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -57,6 +57,11 @@ cmd_ar = rm -f $@; $(AR) cr $@ $(real-prereqs) quiet_cmd_objcopy = OBJCOPY $@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $< $@ +# binfile +# use e.g. $(call if_changed,binfile,binary-file varname) +quiet_cmd_binfile = BINFILE $@ +cmd_binfile = $(SHELL) $(BASEDIR)/tools/binfile $(BINFILE_FLAGS) $@ $(2) + define gendep ifneq ($(1),$(subst /,:,$(1))) DEPS += $(dir $(1)).$(notdir $(1)).d diff --git a/xen/common/Makefile b/xen/common/Makefile index 54de70d422..141d7d40d3 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -80,8 +80,9 @@ config.gz: $(CONF_FILE) config_data.o: config.gz -config_data.S: $(BASEDIR)/tools/binfile - $(SHELL) $(BASEDIR)/tools/binfile $@ config.gz xen_config_data +config_data.S: $(BASEDIR)/tools/binfile FORCE + $(call if_changed,binfile,config.gz xen_config_data) +targets += config_data.S clean:: rm -f config_data.S config.gz 2>/dev/null diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index af95697ed9..11c530dcf4 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -35,8 +35,10 @@ $(subst include/,%/,$(AV_H_FILES)): $(AV_H_DEPEND) $(mkaccess) FORCE obj-bin-$(CONFIG_XSM_FLASK_POLICY) += flask-policy.o flask-policy.o: policy.bin -flask-policy.S: $(BASEDIR)/tools/binfile - $(SHELL) $(BASEDIR)/tools/binfile -i $@ policy.bin xsm_flask_init_policy +flask-policy.S: BINFILE_FLAGS := -i +flask-policy.S: $(BASEDIR)/tools/binfile FORCE + $(call if_changed,binfile,policy.bin xsm_flask_init_policy) +targets += flask-policy.S FLASK_BUILD_DIR := $(CURDIR) POLICY_SRC := $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 16:00:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 16:00:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203837.358980 (Exim 4.92) (envelope-from ) id 1mYVoe-0000VZ-61; Thu, 07 Oct 2021 16:00:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203837.358980; Thu, 07 Oct 2021 16:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYVoe-0000VP-2P; Thu, 07 Oct 2021 16:00:16 +0000 Received: by outflank-mailman (input) for mailman id 203837; Thu, 07 Oct 2021 16:00:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYVod-0000VH-1Q for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 16:00:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYVod-0007Ur-0d for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 16:00:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYVoc-0001Sy-Vo for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 16:00:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=c+YMvq+ihh/JQI75bXnMGtZB0M06K9TLkz5GeoGOAj0=; b=EzB/qoVqCZ+UPqdf9P1DlQsWQT VJd82yqKQt8XwRcVeolBAPnW3dpr9dEADq6ludOMt5BtTb9fpmVkxn18mse3HJpnRS+E0JRDpPLnV aIcvCRpwmcCJppJZdKxgeEOS4Vb2iNrQ7RCDHWg4DuHwEFRQTkluqM/DgPO9FPxa5N5g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build/riscv: tell the build system about riscv64/head.S Message-Id: Date: Thu, 07 Oct 2021 16:00:14 +0000 commit 2a04f396a34c5a43b9a09d72e8c4f49c64066cce Author: Anthony PERARD AuthorDate: Thu Oct 7 17:57:10 2021 +0200 Commit: Jan Beulich CommitDate: Thu Oct 7 17:57:10 2021 +0200 build/riscv: tell the build system about riscv64/head.S This allows to `make arch/riscv/riscv64/head.o`. Example of rune on a fresh copy of the repository: make XEN_TARGET_ARCH=riscv64 CROSS_COMPILE=riscv64-linux-gnu- KBUILD_DEFCONFIG=tiny64_defconfig arch/riscv/riscv64/head.o Signed-off-by: Anthony PERARD Acked-by: Bob Eshleman Reviewed-by: Alistair Francis Acked-by: Connor Davis --- xen/arch/riscv/riscv64/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/riscv/riscv64/Makefile b/xen/arch/riscv/riscv64/Makefile new file mode 100644 index 0000000000..15a4a65f66 --- /dev/null +++ b/xen/arch/riscv/riscv64/Makefile @@ -0,0 +1 @@ +extra-y += head.o -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 19:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 19:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203940.359102 (Exim 4.92) (envelope-from ) id 1mYZTt-0002bA-RR; Thu, 07 Oct 2021 19:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203940.359102; Thu, 07 Oct 2021 19:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZTt-0002aY-KJ; Thu, 07 Oct 2021 19:55:05 +0000 Received: by outflank-mailman (input) for mailman id 203940; Thu, 07 Oct 2021 19:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZTs-0002Yv-No for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZTs-00033a-LE for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYZTs-0005nQ-K6 for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jWxDP/EMSnen828fCz3R1zOEF7yTrqvy2WlefEDHawI=; b=aGx7NzQrJU5X4/+PkZKu4/ThTR A6ukj6X9uTDMfFphmKYo0t6svkSSru1jYcyD5VfvlxZi8ge4SN7lsas725XZKwGp/mon45rXf0VOt 1vwYiY3NoCeOH+ypOyTsh1t6Q60b6jheEY/b9uqX9SDiKKQcgWyv1l97oQ0uZl49Nepc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add PHYSDEVOP_pci_device_(*add/remove) support for ARM Message-Id: Date: Thu, 07 Oct 2021 19:55:04 +0000 commit f9187cf17597907fb6ce4ca65463d6232ef3b36c Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:28 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:29:51 2021 -0700 xen/arm: Add PHYSDEVOP_pci_device_(*add/remove) support for ARM Hardware domain is in charge of doing the PCI enumeration and will discover the PCI devices and then will communicate to XEN via hyper call PHYSDEVOP_pci_device_add(..) to add the PCI devices in XEN. Also implement PHYSDEVOP_pci_device_remove(..) to remove the PCI device. As most of the code for PHYSDEVOP_pci_device_* is the same between x86 and ARM, move the code to a common file to avoid duplication. There are other PHYSDEVOP_pci_device_* operations to add PCI devices. Currently implemented PHYSDEVOP_pci_device_remove(..) and PHYSDEVOP_pci_device_add(..) only as those are minimum required to support PCI passthrough on ARM. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/arm/physdev.c | 6 +++- xen/arch/x86/physdev.c | 52 ++-------------------------- xen/arch/x86/x86_64/physdev.c | 2 +- xen/drivers/pci/Makefile | 1 + xen/drivers/pci/physdev.c | 80 +++++++++++++++++++++++++++++++++++++++++++ xen/include/public/arch-arm.h | 4 ++- xen/include/xen/hypercall.h | 4 +++ 7 files changed, 96 insertions(+), 53 deletions(-) diff --git a/xen/arch/arm/physdev.c b/xen/arch/arm/physdev.c index e91355fe22..f9aa274dda 100644 --- a/xen/arch/arm/physdev.c +++ b/xen/arch/arm/physdev.c @@ -8,13 +8,17 @@ #include #include #include -#include +#include int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { +#ifdef CONFIG_HAS_PCI + return pci_physdev_op(cmd, arg); +#else gdprintk(XENLOG_DEBUG, "PHYSDEVOP cmd=%d: not implemented\n", cmd); return -ENOSYS; +#endif } /* diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 23465bcd00..ea38be8b79 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -480,54 +480,6 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } - case PHYSDEVOP_pci_device_add: { - struct physdev_pci_device_add add; - struct pci_dev_info pdev_info; - nodeid_t node; - - ret = -EFAULT; - if ( copy_from_guest(&add, arg, 1) != 0 ) - break; - - pdev_info.is_extfn = !!(add.flags & XEN_PCI_DEV_EXTFN); - if ( add.flags & XEN_PCI_DEV_VIRTFN ) - { - pdev_info.is_virtfn = 1; - pdev_info.physfn.bus = add.physfn.bus; - pdev_info.physfn.devfn = add.physfn.devfn; - } - else - pdev_info.is_virtfn = 0; - - if ( add.flags & XEN_PCI_DEV_PXM ) - { - uint32_t pxm; - size_t optarr_off = offsetof(struct physdev_pci_device_add, optarr) / - sizeof(add.optarr[0]); - - if ( copy_from_guest_offset(&pxm, arg, optarr_off, 1) ) - break; - - node = pxm_to_node(pxm); - } - else - node = NUMA_NO_NODE; - - ret = pci_add_device(add.seg, add.bus, add.devfn, &pdev_info, node); - break; - } - - case PHYSDEVOP_pci_device_remove: { - struct physdev_pci_device dev; - - ret = -EFAULT; - if ( copy_from_guest(&dev, arg, 1) != 0 ) - break; - - ret = pci_remove_device(dev.seg, dev.bus, dev.devfn); - break; - } - case PHYSDEVOP_prepare_msix: case PHYSDEVOP_release_msix: { struct physdev_pci_device dev; @@ -663,7 +615,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } default: - ret = -ENOSYS; + ret = pci_physdev_op(cmd, arg); break; } diff --git a/xen/arch/x86/x86_64/physdev.c b/xen/arch/x86/x86_64/physdev.c index 0a50cbd4d8..e3cbd5ebcb 100644 --- a/xen/arch/x86/x86_64/physdev.c +++ b/xen/arch/x86/x86_64/physdev.c @@ -9,7 +9,7 @@ EMIT_FILE; #include #include #include -#include +#include #define do_physdev_op compat_physdev_op diff --git a/xen/drivers/pci/Makefile b/xen/drivers/pci/Makefile index a98035df4c..972c923db0 100644 --- a/xen/drivers/pci/Makefile +++ b/xen/drivers/pci/Makefile @@ -1 +1,2 @@ obj-y += pci.o +obj-y += physdev.o diff --git a/xen/drivers/pci/physdev.c b/xen/drivers/pci/physdev.c new file mode 100644 index 0000000000..4f3e1a96c0 --- /dev/null +++ b/xen/drivers/pci/physdev.c @@ -0,0 +1,80 @@ + +#include +#include +#include + +#ifndef COMPAT +typedef long ret_t; +#endif + +ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + ret_t ret; + + switch ( cmd ) + { + case PHYSDEVOP_pci_device_add: { + struct physdev_pci_device_add add; + struct pci_dev_info pdev_info; + nodeid_t node = NUMA_NO_NODE; + + ret = -EFAULT; + if ( copy_from_guest(&add, arg, 1) != 0 ) + break; + + pdev_info.is_extfn = (add.flags & XEN_PCI_DEV_EXTFN); + if ( add.flags & XEN_PCI_DEV_VIRTFN ) + { + pdev_info.is_virtfn = true; + pdev_info.physfn.bus = add.physfn.bus; + pdev_info.physfn.devfn = add.physfn.devfn; + } + else + pdev_info.is_virtfn = false; + +#ifdef CONFIG_NUMA + if ( add.flags & XEN_PCI_DEV_PXM ) + { + uint32_t pxm; + size_t optarr_off = offsetof(struct physdev_pci_device_add, optarr) / + sizeof(add.optarr[0]); + + if ( copy_from_guest_offset(&pxm, arg, optarr_off, 1) ) + break; + + node = pxm_to_node(pxm); + } +#endif + + ret = pci_add_device(add.seg, add.bus, add.devfn, &pdev_info, node); + break; + } + + case PHYSDEVOP_pci_device_remove: { + struct physdev_pci_device dev; + + ret = -EFAULT; + if ( copy_from_guest(&dev, arg, 1) != 0 ) + break; + + ret = pci_remove_device(dev.seg, dev.bus, dev.devfn); + break; + } + + default: + ret = -ENOSYS; + break; + } + + return ret; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 6b5a5f818a..d46c61fca9 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -107,7 +107,9 @@ * All generic sub-operations * * HYPERVISOR_physdev_op - * No sub-operations are currenty supported + * Exactly these sub-operations are supported: + * PHYSDEVOP_pci_device_add + * PHYSDEVOP_pci_device_remove * * HYPERVISOR_sysctl * All generic sub-operations, with the exception of: diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 3771487a30..07b10ec230 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -45,6 +45,10 @@ extern long do_platform_op( XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op); +extern long +pci_physdev_op( + int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); + /* * To allow safe resume of do_memory_op() after preemption, we need to know * at what point in the page list to resume. For this purpose I steal the -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 19:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 19:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203941.359111 (Exim 4.92) (envelope-from ) id 1mYZU4-0002v3-0L; Thu, 07 Oct 2021 19:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203941.359111; Thu, 07 Oct 2021 19:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZU3-0002ut-Sq; Thu, 07 Oct 2021 19:55:15 +0000 Received: by outflank-mailman (input) for mailman id 203941; Thu, 07 Oct 2021 19:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZU2-0002u9-PZ for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZU2-00033p-Ol for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYZU2-0005o8-Ni for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bPPL1eHRg4KPdQslrflpZDbrFwQ9mqn7Tx00+enU6Ms=; b=sLasi4G7yyZwmL47VYHL3J/Ls+ nvwukM8p7zORwnm1fa/wA8roOc8iZa+uXqqvzvngvNaKWlz7WwFKl/N6+x59qArYWaO036jaenh1M TOunXfTYrcbriVrK2ezRidJYOx/Io/n80KP+549EKxvKTiOFQkvQLKWpBzA6HjiNd3+Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add cmdline boot option "pci-passthrough = " Message-Id: Date: Thu, 07 Oct 2021 19:55:14 +0000 commit 15517ed61f55be6039aedcc99720ee07c772ed44 Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:29 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/arm: Add cmdline boot option "pci-passthrough = " Add cmdline boot option "pci-passthrough = = " to enable or disable the PCI passthrough support on ARM. Signed-off-by: Rahul Singh [stefano: one bool_t/bool correction] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 7 +++++++ xen/arch/arm/pci/pci.c | 12 ++++++++++++ xen/drivers/pci/physdev.c | 6 ++++++ xen/include/asm-arm/pci.h | 11 +++++++++++ xen/include/asm-x86/pci.h | 6 ++++++ 5 files changed, 42 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 5cae4adc58..b1f7978aa4 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1819,6 +1819,13 @@ All numbers specified must be hexadecimal ones. This option can be specified more than once (up to 8 times at present). +### pci-passthrough (arm) +> `= ` + +> Default: `false` + +Flag to enable or disable support for PCI passthrough + ### pcid (x86) > `= | xpti=` diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index e359bab9ea..73540045d1 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -16,6 +16,7 @@ #include #include #include +#include #include /* @@ -62,8 +63,19 @@ static int __init acpi_pci_init(void) } #endif +/* By default pci passthrough is disabled. */ +bool __read_mostly pci_passthrough_enabled; +boolean_param("pci-passthrough", pci_passthrough_enabled); + static int __init pci_init(void) { + /* + * Enable PCI passthrough when has been enabled explicitly + * (pci-passthrough=on). + */ + if ( !pci_passthrough_enabled ) + return 0; + pci_segments_init(); if ( acpi_disabled ) diff --git a/xen/drivers/pci/physdev.c b/xen/drivers/pci/physdev.c index 4f3e1a96c0..42db3e6d13 100644 --- a/xen/drivers/pci/physdev.c +++ b/xen/drivers/pci/physdev.c @@ -18,6 +18,9 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct pci_dev_info pdev_info; nodeid_t node = NUMA_NO_NODE; + if ( !is_pci_passthrough_enabled() ) + return -EOPNOTSUPP; + ret = -EFAULT; if ( copy_from_guest(&add, arg, 1) != 0 ) break; @@ -53,6 +56,9 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_pci_device_remove: { struct physdev_pci_device dev; + if ( !is_pci_passthrough_enabled() ) + return -EOPNOTSUPP; + ret = -EFAULT; if ( copy_from_guest(&dev, arg, 1) != 0 ) break; diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index 7dd9eb3dba..fb68d63ffe 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -19,14 +19,25 @@ #define pci_to_dev(pcidev) (&(pcidev)->arch.dev) +extern bool pci_passthrough_enabled; + /* Arch pci dev struct */ struct arch_pci_dev { struct device dev; }; +static always_inline bool is_pci_passthrough_enabled(void) +{ + return pci_passthrough_enabled; +} #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; +static always_inline bool is_pci_passthrough_enabled(void) +{ + return false; +} + #endif /*!CONFIG_HAS_PCI*/ #endif /* __ARM_PCI_H__ */ diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index cc05045e9c..e076951032 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -32,4 +32,10 @@ bool_t pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg, extern int pci_mmcfg_config_num; extern struct acpi_mcfg_allocation *pci_mmcfg_config; +/* Unlike ARM, PCI passthrough is always enabled for x86. */ +static always_inline bool is_pci_passthrough_enabled(void) +{ + return true; +} + #endif /* __X86_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 19:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 19:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203943.359116 (Exim 4.92) (envelope-from ) id 1mYZUE-00037L-2s; Thu, 07 Oct 2021 19:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203943.359116; Thu, 07 Oct 2021 19:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUD-000379-UM; Thu, 07 Oct 2021 19:55:25 +0000 Received: by outflank-mailman (input) for mailman id 203943; Thu, 07 Oct 2021 19:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUC-00035b-T1 for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUC-00034B-SG for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYZUC-0005om-RH for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Kdh8a8wN/Cf5T/fZTX0CRAy98TQ/oT9WLOnzlEu7Obg=; b=Dnn2pQuzjovBDgwVEusPLgUTrJ OjvdrlNF6CIalvrh5669b6QpmLousQPcdi5sFPCrwLe+TUbnsB4fFcEl+RcJPsMFEDZllttIJP+nQ UcBvAWcIczMzTaFPgeAvqYY/fdde/gatcdKV5JTFN2eHX93+xWw0JVaP+PVbG7u3+Ki4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: PCI host bridge discovery within XEN on ARM Message-Id: Date: Thu, 07 Oct 2021 19:55:24 +0000 commit 6ec9176d94ae64f9eeb0d1805d2fd97298496330 Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:30 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/arm: PCI host bridge discovery within XEN on ARM XEN during boot will read the PCI device tree node “reg” property and will map the PCI config space to the XEN memory. As of now only "pci-host-ecam-generic" compatible board is supported. "linux,pci-domain" device tree property assigns a fixed PCI domain number to a host bridge, otherwise an unstable (across boots) unique number will be assigned by Linux. XEN access the PCI devices based on Segment:Bus:Device:Function. A Segment number in the XEN is same as a domain number in Linux. Segment number and domain number has to be in sync to access the correct PCI devices. XEN will read the “linux,pci-domain” property from the device tree node and configure the host bridge segment number accordingly. If this property is not available XEN will allocate the unique segment number to the host bridge. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini --- xen/arch/arm/pci/Makefile | 4 + xen/arch/arm/pci/ecam.c | 61 +++++++++ xen/arch/arm/pci/pci-access.c | 83 ++++++++++++ xen/arch/arm/pci/pci-host-common.c | 247 ++++++++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-host-generic.c | 48 +++++++ xen/include/asm-arm/pci.h | 56 ++++++++ 6 files changed, 499 insertions(+) diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile index a98035df4c..6f32fbbe67 100644 --- a/xen/arch/arm/pci/Makefile +++ b/xen/arch/arm/pci/Makefile @@ -1 +1,5 @@ obj-y += pci.o +obj-y += pci-access.o +obj-y += pci-host-generic.o +obj-y += pci-host-common.o +obj-y += ecam.o diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c new file mode 100644 index 0000000000..602d00799c --- /dev/null +++ b/xen/arch/arm/pci/ecam.c @@ -0,0 +1,61 @@ +/* + * Based on Linux drivers/pci/ecam.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 + +/* + * Function to implement the pci_ops->map_bus method. + */ +void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf, uint32_t where) +{ + const struct pci_config_window *cfg = bridge->cfg; + struct pci_ecam_ops *ops = + container_of(bridge->ops, struct pci_ecam_ops, pci_ops); + unsigned int devfn_shift = ops->bus_shift - 8; + void __iomem *base; + + unsigned int busn = PCI_BUS(sbdf.bdf); + + if ( busn < cfg->busn_start || busn > cfg->busn_end ) + return NULL; + + busn -= cfg->busn_start; + base = cfg->win + (busn << ops->bus_shift); + + return base + (PCI_DEVFN2(sbdf.bdf) << devfn_shift) + where; +} + +/* ECAM ops */ +const struct pci_ecam_ops pci_generic_ecam_ops = { + .bus_shift = 20, + .pci_ops = { + .map_bus = pci_ecam_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, + } +}; + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/pci/pci-access.c b/xen/arch/arm/pci/pci-access.c new file mode 100644 index 0000000000..3cd14a4b87 --- /dev/null +++ b/xen/arch/arm/pci/pci-access.c @@ -0,0 +1,83 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 + +#define INVALID_VALUE (~0U) + +int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value) +{ + void __iomem *addr = bridge->ops->map_bus(bridge, sbdf, reg); + + if ( !addr ) + { + *value = INVALID_VALUE; + return -ENODEV; + } + + switch ( len ) + { + case 1: + *value = readb(addr); + break; + case 2: + *value = readw(addr); + break; + case 4: + *value = readl(addr); + break; + default: + ASSERT_UNREACHABLE(); + } + + return 0; +} + +int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value) +{ + void __iomem *addr = bridge->ops->map_bus(bridge, sbdf, reg); + + if ( !addr ) + return -ENODEV; + + switch ( len ) + { + case 1: + writeb(value, addr); + break; + case 2: + writew(value, addr); + break; + case 4: + writel(value, addr); + break; + default: + ASSERT_UNREACHABLE(); + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c new file mode 100644 index 0000000000..a08e06cea1 --- /dev/null +++ b/xen/arch/arm/pci/pci-host-common.c @@ -0,0 +1,247 @@ +/* + * Based on Linux drivers/pci/ecam.c + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 +#include +#include + +/* + * List for all the pci host bridges. + */ + +static LIST_HEAD(pci_host_bridges); + +static atomic_t domain_nr = ATOMIC_INIT(-1); + +static inline void __iomem *pci_remap_cfgspace(paddr_t start, size_t len) +{ + return ioremap_nocache(start, len); +} + +static void pci_ecam_free(struct pci_config_window *cfg) +{ + if ( cfg->win ) + iounmap(cfg->win); + + xfree(cfg); +} + +static struct pci_config_window * __init +gen_pci_init(struct dt_device_node *dev, const struct pci_ecam_ops *ops) +{ + int err, cfg_reg_idx; + u32 bus_range[2]; + paddr_t addr, size; + struct pci_config_window *cfg; + + cfg = xzalloc(struct pci_config_window); + if ( !cfg ) + return NULL; + + err = dt_property_read_u32_array(dev, "bus-range", bus_range, + ARRAY_SIZE(bus_range)); + if ( err ) { + cfg->busn_start = 0; + cfg->busn_end = 0xff; + printk(XENLOG_INFO "%s: No bus range found for pci controller\n", + dt_node_full_name(dev)); + } else { + cfg->busn_start = bus_range[0]; + cfg->busn_end = bus_range[1]; + if ( cfg->busn_end > cfg->busn_start + 0xff ) + cfg->busn_end = cfg->busn_start + 0xff; + } + + if ( ops->cfg_reg_index ) + { + cfg_reg_idx = ops->cfg_reg_index(dev); + if ( cfg_reg_idx < 0 ) + goto err_exit; + } + else + cfg_reg_idx = 0; + + /* Parse our PCI ecam register address */ + err = dt_device_get_address(dev, cfg_reg_idx, &addr, &size); + if ( err ) + goto err_exit; + + cfg->phys_addr = addr; + cfg->size = size; + + /* + * On 64-bit systems, we do a single ioremap for the whole config space + * since we have enough virtual address range available. On 32-bit, we + * ioremap the config space for each bus individually. + * As of now only 64-bit is supported 32-bit is not supported. + * + * TODO: For 32-bit implement the ioremap/iounmap of config space + * dynamically for each read/write call. + */ + cfg->win = pci_remap_cfgspace(cfg->phys_addr, cfg->size); + if ( !cfg->win ) + { + printk(XENLOG_ERR "ECAM ioremap failed\n"); + goto err_exit; + } + printk("ECAM at [mem 0x%"PRIpaddr"-0x%"PRIpaddr"] for [bus %x-%x] \n", + cfg->phys_addr, cfg->phys_addr + cfg->size - 1, + cfg->busn_start, cfg->busn_end); + + if ( ops->init ) + { + err = ops->init(cfg); + if ( err ) + goto err_exit; + } + + return cfg; + +err_exit: + pci_ecam_free(cfg); + + return NULL; +} + +struct pci_host_bridge *pci_alloc_host_bridge(void) +{ + struct pci_host_bridge *bridge = xzalloc(struct pci_host_bridge); + + if ( !bridge ) + return NULL; + + INIT_LIST_HEAD(&bridge->node); + + return bridge; +} + +void pci_add_host_bridge(struct pci_host_bridge *bridge) +{ + list_add_tail(&bridge->node, &pci_host_bridges); +} + +static int pci_get_new_domain_nr(void) +{ + return atomic_inc_return(&domain_nr); +} + +static int pci_bus_find_domain_nr(struct dt_device_node *dev) +{ + static int use_dt_domains = -1; + int domain; + + domain = dt_get_pci_domain_nr(dev); + + /* + * Check DT domain and use_dt_domains values. + * + * If DT domain property is valid (domain >= 0) and + * use_dt_domains != 0, the DT assignment is valid since this means + * we have not previously allocated a domain number by using + * pci_get_new_domain_nr(); we should also update use_dt_domains to + * 1, to indicate that we have just assigned a domain number from + * DT. + * + * If DT domain property value is not valid (ie domain < 0), and we + * have not previously assigned a domain number from DT + * (use_dt_domains != 1) we should assign a domain number by + * using the: + * + * pci_get_new_domain_nr() + * + * API and update the use_dt_domains value to keep track of method we + * are using to assign domain numbers (use_dt_domains = 0). + * + * All other combinations imply we have a platform that is trying + * to mix domain numbers obtained from DT and pci_get_new_domain_nr(), + * which is a recipe for domain mishandling and it is prevented by + * invalidating the domain value (domain = -1) and printing a + * corresponding error. + */ + if ( domain >= 0 && use_dt_domains ) + { + use_dt_domains = 1; + } + else if ( domain < 0 && use_dt_domains != 1 ) + { + use_dt_domains = 0; + domain = pci_get_new_domain_nr(); + } + else + { + domain = -1; + } + + return domain; +} + +int pci_host_common_probe(struct dt_device_node *dev, const void *data) +{ + struct pci_host_bridge *bridge; + struct pci_config_window *cfg; + struct pci_ecam_ops *ops; + int err; + + if ( dt_device_for_passthrough(dev) ) + return 0; + + ops = (struct pci_ecam_ops *) data; + + bridge = pci_alloc_host_bridge(); + if ( !bridge ) + return -ENOMEM; + + /* Parse and map our Configuration Space windows */ + cfg = gen_pci_init(dev, ops); + if ( !cfg ) + { + err = -ENOMEM; + goto err_exit; + } + + bridge->dt_node = dev; + bridge->cfg = cfg; + bridge->ops = &ops->pci_ops; + + bridge->segment = pci_bus_find_domain_nr(dev); + if ( bridge->segment < 0 ) + { + printk(XENLOG_ERR "Inconsistent \"linux,pci-domain\" property in DT\n"); + BUG(); + } + pci_add_host_bridge(bridge); + + return 0; + +err_exit: + xfree(bridge); + + return err; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c new file mode 100644 index 0000000000..33457fbe96 --- /dev/null +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -0,0 +1,48 @@ +/* + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 +#include + +static const struct dt_device_match __initconstrel gen_pci_dt_match[] = +{ + { .compatible = "pci-host-ecam-generic" }, + { }, +}; + +static int __init pci_host_generic_probe(struct dt_device_node *dev, + const void *data) +{ + return pci_host_common_probe(dev, &pci_generic_ecam_ops); +} + +DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI) +.dt_match = gen_pci_dt_match, +.init = pci_host_generic_probe, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index fb68d63ffe..e57b74f4d8 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -26,6 +26,62 @@ struct arch_pci_dev { struct device dev; }; +/* + * struct to hold the mappings of a config space window. This + * is expected to be used as sysdata for PCI controllers that + * use ECAM. + */ +struct pci_config_window { + paddr_t phys_addr; + paddr_t size; + uint8_t busn_start; + uint8_t busn_end; + void __iomem *win; +}; + +/* + * struct to hold pci host bridge information + * for a PCI controller. + */ +struct pci_host_bridge { + struct dt_device_node *dt_node; /* Pointer to the associated DT node */ + struct list_head node; /* Node in list of host bridges */ + uint16_t segment; /* Segment number */ + struct pci_config_window* cfg; /* Pointer to the bridge config window */ + struct pci_ops *ops; +}; + +struct pci_ops { + void __iomem *(*map_bus)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t offset); + int (*read)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value); + int (*write)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value); +}; + +/* + * struct to hold pci ops and bus shift of the config window + * for a PCI controller. + */ +struct pci_ecam_ops { + unsigned int bus_shift; + struct pci_ops pci_ops; + int (*cfg_reg_index)(struct dt_device_node *dev); + int (*init)(struct pci_config_window *); +}; + +/* Default ECAM ops */ +extern const struct pci_ecam_ops pci_generic_ecam_ops; + +int pci_host_common_probe(struct dt_device_node *dev, const void *data); +int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value); +int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value); +void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf, uint32_t where); + static always_inline bool is_pci_passthrough_enabled(void) { return pci_passthrough_enabled; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 19:55:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 19:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203948.359117 (Exim 4.92) (envelope-from ) id 1mYZUO-0003GG-4i; Thu, 07 Oct 2021 19:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203948.359117; Thu, 07 Oct 2021 19:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUO-0003G8-1X; Thu, 07 Oct 2021 19:55:36 +0000 Received: by outflank-mailman (input) for mailman id 203948; Thu, 07 Oct 2021 19:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUM-0003FY-Vj for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUM-00034L-V6 for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYZUM-0005pV-UQ for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=F+YDkzFj+q8QAvdSLiahWw67iu27J4Dq80mbYTVdVwE=; b=oXC0oWm59H6mxG2yV4GCn84ruB YqZ20Y9a8C4rI7u7hhJVn/ozCnfMCxFzE4CBsjbtTxuCFNLzYneG6M0OPTOJHWuApLcO607c1yN7H TQucpbk5QOb5wz+MF0ZU49dOG9ny/BbPlZ6LDZSPafPLE9X6JL1nYOI4/8aRTlOJ5CnY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add support for Xilinx ZynqMP PCI host controller Message-Id: Date: Thu, 07 Oct 2021 19:55:34 +0000 commit 1da6a07be751cd316b39d319c19e3862392ca6ef Author: Oleksandr Andrushchenko AuthorDate: Wed Oct 6 18:40:31 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/arm: Add support for Xilinx ZynqMP PCI host controller Add support for Xilinx ZynqMP PCI host controller to map the PCI config space to the XEN memory. Patch helps to understand how the generic infrastructure for PCI host-bridge discovery will be used for future references. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/pci/Makefile | 1 + xen/arch/arm/pci/pci-host-zynqmp.c | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile index 6f32fbbe67..1d045ade01 100644 --- a/xen/arch/arm/pci/Makefile +++ b/xen/arch/arm/pci/Makefile @@ -3,3 +3,4 @@ obj-y += pci-access.o obj-y += pci-host-generic.o obj-y += pci-host-common.o obj-y += ecam.o +obj-y += pci-host-zynqmp.o diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c new file mode 100644 index 0000000000..61a9807d3d --- /dev/null +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -0,0 +1,65 @@ +/* + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * Based on xen/arch/arm/pci/pci-host-generic.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 +#include + +static int __init nwl_cfg_reg_index(struct dt_device_node *np) +{ + return dt_property_match_string(np, "reg-names", "cfg"); +} + +/* ECAM ops */ +const struct pci_ecam_ops nwl_pcie_ops = { + .bus_shift = 20, + .cfg_reg_index = nwl_cfg_reg_index, + .pci_ops = { + .map_bus = pci_ecam_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, + } +}; + +static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] = +{ + { .compatible = "xlnx,nwl-pcie-2.11" }, + { }, +}; + +static int __init pci_host_generic_probe(struct dt_device_node *dev, + const void *data) +{ + return pci_host_common_probe(dev, &nwl_pcie_ops); +} + +DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI) +.dt_match = nwl_pcie_dt_match, +.init = pci_host_generic_probe, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 19:55:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 19:55:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203950.359121 (Exim 4.92) (envelope-from ) id 1mYZUZ-0003N9-6E; Thu, 07 Oct 2021 19:55:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203950.359121; Thu, 07 Oct 2021 19:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUZ-0003N2-39; Thu, 07 Oct 2021 19:55:47 +0000 Received: by outflank-mailman (input) for mailman id 203950; Thu, 07 Oct 2021 19:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUX-0003Kq-2Y for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUX-00034v-1r for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYZUX-0005qK-18 for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1KE9dwcGNwAW4NUkgAubHZfUoEFAUX4GBxfe0mhN3hE=; b=0/1c8IsL/zsJsNvL86YSQo6IKg kf/rIkGZu2OuAAcRzDM6VmXcaNZveHXqEp45JoAjg9ZX7imA9o3uUqKpwIlLVLoRzGKzEjqzUxK1t H76jsi0xiZ8Ws9Xua9ejF3LEYmC6ZdP17zdiF5SiWkkF8T15MrcqkF2sZ7nE+ynVa9gI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Implement pci access functions Message-Id: Date: Thu, 07 Oct 2021 19:55:45 +0000 commit a095542b6843dd87bb62585fb92f2318d83cff09 Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:32 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/arm: Implement pci access functions Implement generic pci access functions to read/write the configuration space. Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/pci/pci-access.c | 57 ++++++++++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-host-common.c | 19 +++++++++++++ xen/include/asm-arm/pci.h | 1 + 3 files changed, 77 insertions(+) diff --git a/xen/arch/arm/pci/pci-access.c b/xen/arch/arm/pci/pci-access.c index 3cd14a4b87..9f9aac43d7 100644 --- a/xen/arch/arm/pci/pci-access.c +++ b/xen/arch/arm/pci/pci-access.c @@ -16,6 +16,7 @@ #include #define INVALID_VALUE (~0U) +#define PCI_ERR_VALUE(len) GENMASK(0, len * 8) int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value) @@ -72,6 +73,62 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, return 0; } +static uint32_t pci_config_read(pci_sbdf_t sbdf, unsigned int reg, + unsigned int len) +{ + uint32_t val = PCI_ERR_VALUE(len); + struct pci_host_bridge *bridge = pci_find_host_bridge(sbdf.seg, sbdf.bus); + + if ( unlikely(!bridge) ) + return val; + + if ( unlikely(!bridge->ops->read) ) + return val; + + bridge->ops->read(bridge, sbdf, reg, len, &val); + + return val; +} + +static void pci_config_write(pci_sbdf_t sbdf, unsigned int reg, + unsigned int len, uint32_t val) +{ + struct pci_host_bridge *bridge = pci_find_host_bridge(sbdf.seg, sbdf.bus); + + if ( unlikely(!bridge) ) + return; + + if ( unlikely(!bridge->ops->write) ) + return; + + bridge->ops->write(bridge, sbdf, reg, len, val); +} + +/* + * Wrappers for all PCI configuration access functions. + */ + +#define PCI_OP_WRITE(size, type) \ + void pci_conf_write##size(pci_sbdf_t sbdf, \ + unsigned int reg, type val) \ +{ \ + pci_config_write(sbdf, reg, size / 8, val); \ +} + +#define PCI_OP_READ(size, type) \ + type pci_conf_read##size(pci_sbdf_t sbdf, \ + unsigned int reg) \ +{ \ + return pci_config_read(sbdf, reg, size / 8); \ +} + +PCI_OP_READ(8, uint8_t) +PCI_OP_READ(16, uint16_t) +PCI_OP_READ(32, uint32_t) +PCI_OP_WRITE(8, uint8_t) +PCI_OP_WRITE(16, uint16_t) +PCI_OP_WRITE(32, uint32_t) + /* * Local variables: * mode: C diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index a08e06cea1..c5941b10e9 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -236,6 +236,25 @@ err_exit: return err; } +/* + * This function will lookup an hostbridge based on the segment and bus + * number. + */ +struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus) +{ + struct pci_host_bridge *bridge; + + list_for_each_entry( bridge, &pci_host_bridges, node ) + { + if ( bridge->segment != segment ) + continue; + if ( (bus < bridge->cfg->busn_start) || (bus > bridge->cfg->busn_end) ) + continue; + return bridge; + } + + return NULL; +} /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index e57b74f4d8..f5a5f15e3b 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -81,6 +81,7 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t value); void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where); +struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); static always_inline bool is_pci_passthrough_enabled(void) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 19:55:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 19:55:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203952.359125 (Exim 4.92) (envelope-from ) id 1mYZUj-0003Q2-7i; Thu, 07 Oct 2021 19:55:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203952.359125; Thu, 07 Oct 2021 19:55:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUj-0003Pu-4n; Thu, 07 Oct 2021 19:55:57 +0000 Received: by outflank-mailman (input) for mailman id 203952; Thu, 07 Oct 2021 19:55:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUh-0003Pb-6U for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZUh-000356-5L for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYZUh-0005rJ-4K for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 19:55:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VLBu1uey6N+h+sdtLF0iuIqNVkC4o0stPHHGxncJvWY=; b=jpD+pPuCoeNc6Me3TPDGikhYFc vl7Fo8CfjEHd7mGuS1BCYJx3LcqoIvLAfNQL+/oMo9nvYPYTrXfQlGUNAzxdUXxTWQv7BqDFu3FEO Q34OG47Dprk4RZGa6q6rq/rqNpd1aRI7ziY+KZZJh1xdTR0kgP4MZjXNh/CTLqOhjXiQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag Message-Id: Date: Thu, 07 Oct 2021 19:55:55 +0000 commit 2075b410ee8087662c880213c3aca196fb7ade22 Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:33 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag Introduce XEN_DOMCTL_CDF_vpci flag to enable VPCI support in XEN. Reject the use of this new flag for x86 as VPCI is not supported for DOMU guests for x86. Signed-off-by: Rahul Singh [stefano: drop _XEN_DOMCTL_CDF_vpci] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Acked-by: Christian Lindig Acked-by: Jan Beulich --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + xen/arch/arm/domain.c | 4 ++-- xen/arch/x86/domain.c | 6 ++++++ xen/common/domain.c | 2 +- xen/include/public/domctl.h | 3 ++- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index a5588c643f..7ed1c00e47 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -69,6 +69,7 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU | CDF_NESTED_VIRT + | CDF_VPCI type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 6e94940a8a..391d4abdf8 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -62,6 +62,7 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU | CDF_NESTED_VIRT + | CDF_VPCI type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 19c756ac3d..36138c1b2e 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -622,8 +622,8 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) { unsigned int max_vcpus; - /* HVM and HAP must be set. IOMMU may or may not be */ - if ( (config->flags & ~XEN_DOMCTL_CDF_iommu) != + /* HVM and HAP must be set. IOMMU and VPCI may or may not be */ + if ( (config->flags & ~XEN_DOMCTL_CDF_iommu & ~XEN_DOMCTL_CDF_vpci) != (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap) ) { dprintk(XENLOG_INFO, "Unsupported configuration %#x\n", diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ef1812dc14..79c2aa4636 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -662,6 +662,12 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( config->flags & XEN_DOMCTL_CDF_vpci ) + { + dprintk(XENLOG_INFO, "vPCI cannot be enabled yet\n"); + return -EINVAL; + } + if ( config->vmtrace_size ) { unsigned int size = config->vmtrace_size; diff --git a/xen/common/domain.c b/xen/common/domain.c index 6ee5d033b0..40d67ec342 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -483,7 +483,7 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) ~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu | - XEN_DOMCTL_CDF_nested_virt) ) + XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci) ) { dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags); return -EINVAL; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 96696e3842..4cb3f662c2 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -70,9 +70,10 @@ struct xen_domctl_createdomain { #define XEN_DOMCTL_CDF_iommu (1U<<_XEN_DOMCTL_CDF_iommu) #define _XEN_DOMCTL_CDF_nested_virt 6 #define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt) +#define XEN_DOMCTL_CDF_vpci (1U << 7) /* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ -#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_nested_virt +#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpci uint32_t flags; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 07 20:11:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Oct 2021 20:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.203964.359141 (Exim 4.92) (envelope-from ) id 1mYZjN-0005xh-L4; Thu, 07 Oct 2021 20:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 203964.359141; Thu, 07 Oct 2021 20:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZjN-0005xa-Hz; Thu, 07 Oct 2021 20:11:05 +0000 Received: by outflank-mailman (input) for mailman id 203964; Thu, 07 Oct 2021 20:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZjM-0005xU-Ad for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 20:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYZjM-0003RV-5d for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 20:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYZjM-0007Dw-4Y for xen-changelog@lists.xenproject.org; Thu, 07 Oct 2021 20:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jXcNDD7xtGTKwSkpVwg8ntavgD5VlGb3QB5nQe5jUx0=; b=zMob7mQCyacgFaQEWa+1xsxKm1 kxWzp/nx6U/qL/Mcw/I8suMNyAIjPXzv33PJvWoW2sKnbQN0ylozY+806UkMIF9+hu3MUC5sYjvSz aiL1qj5QKQPY0rgPyF4l2WDYk0DNMCdvfBKYDaLCTpwJ4VrPNUvid3sRMwA0ox0/9fQQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Updates for extended regions support Message-Id: Date: Thu, 07 Oct 2021 20:11:04 +0000 commit 1d345539c0e3654025fc00187bf633fda6ea9a43 Author: Oleksandr Tyshchenko AuthorDate: Wed Oct 6 14:22:26 2021 +0300 Commit: Stefano Stabellini CommitDate: Thu Oct 7 13:02:53 2021 -0700 xen/arm: Updates for extended regions support This is a follow-up of "b6fe410 xen/arm: Add handling of extended regions for Dom0" Add various in-code comments, update Xen hypervisor device tree bindings text, change the log level for some prints and clarify format specifier, reuse dt_for_each_range() to avoid open-coding in find_memory_holes(). Signed-off-by: Oleksandr Tyshchenko [stefano: fix typos] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/guest.txt | 12 ++-- xen/arch/arm/domain_build.c | 108 ++++++++++++++++++++++-------------- 2 files changed, 73 insertions(+), 47 deletions(-) diff --git a/docs/misc/arm/device-tree/guest.txt b/docs/misc/arm/device-tree/guest.txt index 418f1e9f4e..c1157518d5 100644 --- a/docs/misc/arm/device-tree/guest.txt +++ b/docs/misc/arm/device-tree/guest.txt @@ -7,10 +7,14 @@ the following properties: compatible = "xen,xen-", "xen,xen"; where is the version of the Xen ABI of the platform. -- reg: specifies the base physical address and size of a region in - memory where the grant table should be mapped to, using an - HYPERVISOR_memory_op hypercall. The memory region is large enough to map - the whole grant table (it is larger or equal to gnttab_max_grant_frames()). +- reg: specifies the base physical address and size of the regions in memory + where the special resources should be mapped to, using an HYPERVISOR_memory_op + hypercall. + Region 0 is reserved for mapping grant table, it must be always present. + The memory region is large enough to map the whole grant table (it is larger + or equal to gnttab_max_grant_frames()). + Regions 1...N are extended regions (unused address space) for mapping foreign + GFNs and grants, they might be absent if there is nothing to expose. This property is unnecessary when booting Dom0 using ACPI. - interrupts: the interrupt used by Xen to inject event notifications. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c5afbe2e05..4c28f1e4e2 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -898,7 +898,10 @@ static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) if ( ext_regions->nr_banks >= ARRAY_SIZE(ext_regions->bank) ) return 0; - /* Both start and size of the extended region should be 2MB aligned */ + /* + * Both start and size of the extended region should be 2MB aligned to + * potentially allow superpage mapping. + */ start = (s + SZ_2M - 1) & ~(SZ_2M - 1); if ( start > e ) return 0; @@ -909,6 +912,12 @@ static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) */ e += 1; size = (e - start) & ~(SZ_2M - 1); + + /* + * Reasonable size. Not too little to pick up small ranges which are + * not quite useful but increase bookkeeping and not too large + * to skip a large proportion of unused address space. + */ if ( size < MB(64) ) return 0; @@ -919,6 +928,14 @@ static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) return 0; } +/* + * Find unused regions of Host address space which can be exposed to Dom0 + * as extended regions for the special memory mappings. In order to calculate + * regions we exclude every region assigned to Dom0 from the Host RAM: + * - domain RAM + * - reserved-memory + * - grant table space + */ static int __init find_unallocated_memory(const struct kernel_info *kinfo, struct meminfo *ext_regions) { @@ -942,7 +959,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, res = rangeset_add_range(unalloc_mem, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to add: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -956,7 +973,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, res = rangeset_remove_range(unalloc_mem, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -971,7 +988,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, res = rangeset_remove_range(unalloc_mem, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -983,7 +1000,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, res = rangeset_remove_range(unalloc_mem, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -1003,6 +1020,35 @@ out: return res; } +static int __init handle_pci_range(const struct dt_device_node *dev, + u64 addr, u64 len, void *data) +{ + struct rangeset *mem_holes = data; + paddr_t start, end; + int res; + + start = addr & PAGE_MASK; + end = PAGE_ALIGN(addr + len); + res = rangeset_remove_range(mem_holes, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", + start, end); + return res; + } + + return 0; +} + +/* + * Find the holes in the Host DT which can be exposed to Dom0 as extended + * regions for the special memory mappings. In order to calculate regions + * we exclude every addressable memory region described by "reg" and "ranges" + * properties from the maximum possible addressable physical memory range: + * - MMIO + * - Host RAM + * - PCI aperture + */ static int __init find_memory_holes(const struct kernel_info *kinfo, struct meminfo *ext_regions) { @@ -1024,7 +1070,7 @@ static int __init find_memory_holes(const struct kernel_info *kinfo, res = rangeset_add_range(mem_holes, start, end); if ( res ) { - printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to add: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -1055,49 +1101,25 @@ static int __init find_memory_holes(const struct kernel_info *kinfo, res = rangeset_remove_range(mem_holes, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } } - if ( dt_device_type_is_equal(np, "pci" ) ) + if ( dt_device_type_is_equal(np, "pci") ) { - unsigned int range_size, nr_ranges; - int na, ns, pna; - const __be32 *ranges; - u32 len; - /* - * Looking for non-empty ranges property which in this context - * describes the PCI host bridge aperture. + * The ranges property in this context describes the PCI host + * bridge aperture. It shall be absent if no addresses are mapped + * through the bridge. */ - ranges = dt_get_property(np, "ranges", &len); - if ( !ranges || !len ) + if ( !dt_get_property(np, "ranges", NULL) ) continue; - pna = dt_n_addr_cells(np); - na = dt_child_n_addr_cells(np); - ns = dt_child_n_size_cells(np); - range_size = pna + na + ns; - nr_ranges = len / sizeof(__be32) / range_size; - - for ( i = 0; i < nr_ranges; i++, ranges += range_size ) - { - /* Skip the child address and get the parent (CPU) address */ - addr = dt_read_number(ranges + na, pna); - size = dt_read_number(ranges + na + pna, ns); - - start = addr & PAGE_MASK; - end = PAGE_ALIGN(addr + size); - res = rangeset_remove_range(mem_holes, start, end - 1); - if ( res ) - { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", - start, end); - goto out; - } - } + res = dt_for_each_range(np, &handle_pci_range, mem_holes); + if ( res ) + goto out; } } @@ -1152,12 +1174,12 @@ static int __init make_hypervisor_node(struct domain *d, if ( !opt_ext_regions ) { - printk(XENLOG_DEBUG "The extended regions support is disabled\n"); + printk(XENLOG_INFO "The extended regions support is disabled\n"); nr_ext_regions = 0; } else if ( is_32bit_domain(d) ) { - printk(XENLOG_DEBUG "The extended regions are only supported for 64-bit guest currently\n"); + printk(XENLOG_WARNING "The extended regions are only supported for 64-bit guest currently\n"); nr_ext_regions = 0; } else @@ -1193,8 +1215,8 @@ static int __init make_hypervisor_node(struct domain *d, u64 start = ext_regions->bank[i].start; u64 size = ext_regions->bank[i].size; - dt_dprintk("Extended region %d: %#"PRIx64"->%#"PRIx64"\n", - i, start, start + size); + printk("Extended region %d: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); dt_child_set_range(&cells, addrcells, sizecells, start, size); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 00:33:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 00:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204235.359406 (Exim 4.92) (envelope-from ) id 1mYdos-0002iq-4X; Fri, 08 Oct 2021 00:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204235.359406; Fri, 08 Oct 2021 00:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYdos-0002ii-1Q; Fri, 08 Oct 2021 00:33:02 +0000 Received: by outflank-mailman (input) for mailman id 204235; Fri, 08 Oct 2021 00:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYdor-0002ic-HM for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 00:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYdor-0008Qg-Dh for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 00:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYdor-0005LJ-Cc for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 00:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=91rY4FBNp3eVACEjw17jNt9oJJBkn8E5QKkxMlJ1+so=; b=Zb+7T8pcbCJmQy/6X5xGRh8tMm Rgj+Gm+M8SbKm9wuIUd+TBP9/mUpFN0JF6ZvM9bOQiECNDFGaOZaI0JnrRKPKE2J6VXaulvaqxGaT Yg8DlfyiPXzVsWDaZkI8uvcnOBqjM5V6SAqQq/fEC5VgB/PUc3AacqXt2zZTkowD/lYU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.13] VT-d: fix deassign of device with RMRR Message-Id: Date: Fri, 08 Oct 2021 00:33:01 +0000 commit b4bb02d5999a56c93f0733b589b717e7cece9c09 Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:49:12 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov (cherry picked from commit 24ebe875a77833696bbe5c9372e9e1590a7e7101) --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 98787ce3a8..af8b9ca0e4 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2393,7 +2393,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 09:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 09:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204603.359764 (Exim 4.92) (envelope-from ) id 1mYmFU-0003BW-6X; Fri, 08 Oct 2021 09:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204603.359764; Fri, 08 Oct 2021 09:33:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYmFU-0003BP-3G; Fri, 08 Oct 2021 09:33:04 +0000 Received: by outflank-mailman (input) for mailman id 204603; Fri, 08 Oct 2021 09:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYmFS-0003BH-CD for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 09:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYmFS-0008Qr-92 for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 09:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYmFS-0003WO-82 for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 09:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VUCvcBDvCpxdQ6U0PbM9tDt7rbXju4CfwvUvD0te29o=; b=AaAB6/AtSho8EYNHDhCpL7wt4l a2PCbQXYQVv8gewLbyTmkzvwfOpK7hSM2ll0AP9L90roApjcfqYyK0EmeaSE3A0rruGMsV8QS8C4c 1xK89eBMegKqwrYR1yTV2g4PswrCZGLPlynOh+dtHIv35aD72McN1gmsq/g7pqhyW0/k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: fix deassign of device with RMRR Message-Id: Date: Fri, 08 Oct 2021 09:33:02 +0000 commit 192aaf7e146c0b41dbdd35ccdb13eb33ced13633 Author: Jan Beulich AuthorDate: Fri Oct 1 15:05:42 2021 +0200 Commit: Andrew Cooper CommitDate: Tue Oct 5 19:56:16 2021 +0100 VT-d: fix deassign of device with RMRR Ignoring a specific error code here was not meant to short circuit deassign to _just_ the unmapping of RMRRs. This bug was previously hidden by the bogus (potentially indefinite) looping in pci_release_devices(), until f591755823a7 ("IOMMU/PCI: don't let domain cleanup continue when device de-assignment failed") fixed that loop. This is CVE-2021-28702 / XSA-386. Fixes: 8b99f4400b69 ("VT-d: fix RMRR related error handling") Reported-by: Ivan Kardykov Signed-off-by: Jan Beulich Tested-by: Ivan Kardykov --- xen/drivers/passthrough/vtd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 611c22fd52..0519dfc9e7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2409,7 +2409,7 @@ static int reassign_device_ownership( ret = iommu_identity_mapping(source, p2m_access_x, rmrr->base_address, rmrr->end_address, 0); - if ( ret != -ENOENT ) + if ( ret && ret != -ENOENT ) return ret; } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 17:55:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 17:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204846.360028 (Exim 4.92) (envelope-from ) id 1mYu5K-0003em-P7; Fri, 08 Oct 2021 17:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204846.360028; Fri, 08 Oct 2021 17:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYu5K-0003ee-MC; Fri, 08 Oct 2021 17:55:06 +0000 Received: by outflank-mailman (input) for mailman id 204846; Fri, 08 Oct 2021 17:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYu5I-0003eY-Qg for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 17:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYu5I-0000oU-O3 for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 17:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYu5I-0000is-Mn for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 17:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/wzD0azeKvYOFAyadu+Nl+V2NEIRd5XsPcaM2Diulkk=; b=69AlEYuKmjezpFpvYx2USndvxa AsQBkpi9YBOHVMPx9H8nUt5U1w/0ALKfkN/3SZJY/7+olwMFHvAFY8qtbh5+C3/uTHSPQcPfOAd5R Ju969I+8H4ldLZmEC2T4fdl1nhxYl7v1d4V2k7fSSkztYrMj0ow8ML0aKzWIckCjCS2I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/spec-ctrl: Build with BRANCH_HARDEN lfences by default Message-Id: Date: Fri, 08 Oct 2021 17:55:04 +0000 commit b11380f6cd58ce40422473262b2b4c2b210447a1 Author: Andrew Cooper AuthorDate: Mon Oct 4 21:39:03 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Oct 8 18:52:22 2021 +0100 x86/spec-ctrl: Build with BRANCH_HARDEN lfences by default Branch Harden is enabled by default at compile and boot time. Invert the logic to compile with lfence by default and nop out in the non-default case. This has several advantages. It removes 3829 patch points (in the random build of Xen I have to hand) by default on boot, 70% (!) of the .altinstr_replacement section. For builds of Xen with a non-nops capable tool chain, the code after `spec-ctrl=no-branch-harden` is better because Xen can write long nops. Most importantly however, it means the disassembly actually matches what runs in the common case, with the ability to distinguish the lfences from other uses of nops. Finally, make opt_branch_harden local to spec_ctrl.c and __initdata. It has never been used externally, even at it's introduction in c/s 3860d5534df4 "spec: add l1tf-barrier". Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/spec_ctrl.c | 7 ++++--- xen/include/asm-x86/cpufeatures.h | 2 +- xen/include/asm-x86/nospec.h | 2 +- xen/include/asm-x86/spec_ctrl.h | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 16d2a1d172..a5569c7f2b 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -52,7 +52,7 @@ bool __read_mostly opt_ibpb = true; bool __read_mostly opt_ssbd = false; int8_t __read_mostly opt_eager_fpu = -1; int8_t __read_mostly opt_l1d_flush = -1; -bool __read_mostly opt_branch_harden = true; +static bool __initdata opt_branch_harden = true; bool __initdata bsp_delay_spec_ctrl; uint8_t __read_mostly default_xen_spec_ctrl; @@ -1121,8 +1121,9 @@ void __init init_speculation_mitigations(void) else if ( opt_l1d_flush == -1 ) opt_l1d_flush = cpu_has_bug_l1tf && !(caps & ARCH_CAPS_SKIP_L1DFL); - if ( opt_branch_harden ) - setup_force_cpu_cap(X86_FEATURE_SC_BRANCH_HARDEN); + /* We compile lfence's in by default, and nop them out if requested. */ + if ( !opt_branch_harden ) + setup_force_cpu_cap(X86_FEATURE_SC_NO_BRANCH_HARDEN); /* * We do not disable HT by default on affected hardware. diff --git a/xen/include/asm-x86/cpufeatures.h b/xen/include/asm-x86/cpufeatures.h index 72beb7babc..b10154fc44 100644 --- a/xen/include/asm-x86/cpufeatures.h +++ b/xen/include/asm-x86/cpufeatures.h @@ -27,7 +27,7 @@ XEN_CPUFEATURE(XEN_SMAP, X86_SYNTH(11)) /* SMAP gets used by Xen itself /* Bit 12 - unused. */ XEN_CPUFEATURE(IND_THUNK_LFENCE, X86_SYNTH(13)) /* Use IND_THUNK_LFENCE */ XEN_CPUFEATURE(IND_THUNK_JMP, X86_SYNTH(14)) /* Use IND_THUNK_JMP */ -XEN_CPUFEATURE(SC_BRANCH_HARDEN, X86_SYNTH(15)) /* Conditional Branch Hardening */ +XEN_CPUFEATURE(SC_NO_BRANCH_HARDEN, X86_SYNTH(15)) /* (Disable) Conditional branch hardening */ XEN_CPUFEATURE(SC_MSR_PV, X86_SYNTH(16)) /* MSR_SPEC_CTRL used by Xen for PV */ XEN_CPUFEATURE(SC_MSR_HVM, X86_SYNTH(17)) /* MSR_SPEC_CTRL used by Xen for HVM */ XEN_CPUFEATURE(SC_RSB_PV, X86_SYNTH(18)) /* RSB overwrite needed for PV */ diff --git a/xen/include/asm-x86/nospec.h b/xen/include/asm-x86/nospec.h index f6eb84eee5..5312ae4c6f 100644 --- a/xen/include/asm-x86/nospec.h +++ b/xen/include/asm-x86/nospec.h @@ -10,7 +10,7 @@ static always_inline bool barrier_nospec_true(void) { #ifdef CONFIG_SPECULATIVE_HARDEN_BRANCH - alternative("", "lfence", X86_FEATURE_SC_BRANCH_HARDEN); + alternative("lfence", "", X86_FEATURE_SC_NO_BRANCH_HARDEN); #endif return true; } diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h index e671b6fd8d..a803d16f90 100644 --- a/xen/include/asm-x86/spec_ctrl.h +++ b/xen/include/asm-x86/spec_ctrl.h @@ -37,7 +37,6 @@ extern bool opt_ibpb; extern bool opt_ssbd; extern int8_t opt_eager_fpu; extern int8_t opt_l1d_flush; -extern bool opt_branch_harden; extern bool bsp_delay_spec_ctrl; extern uint8_t default_xen_spec_ctrl; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:00:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:00:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204927.360123 (Exim 4.92) (envelope-from ) id 1mYyqV-0002aj-GU; Fri, 08 Oct 2021 23:00:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204927.360123; Fri, 08 Oct 2021 23:00:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqV-0002ac-DU; Fri, 08 Oct 2021 23:00:07 +0000 Received: by outflank-mailman (input) for mailman id 204927; Fri, 08 Oct 2021 23:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqT-0002TP-Hl for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqT-000645-Ee for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYyqT-0003WK-DL for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bQwjWSKpE1M1BPAexgQclwhGUl3SeIP0OlEE4vG+Ns4=; b=kQ1H1hX+YVHtksj5JzeWdtP134 Xc7xD9E4f3em6BtltI9/xTacBrZuIrdcTTvLW/svY+gWgLkgsDJ+0vNqKQKyul+B+zwsYQ9sd7FFm MGpbBe9w5dGBmvnwbKP6wBXMLc8u9F4CmVFuf+yceUY7zp1nfgoPEHIsOWXF73PktXzk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add new device type for PCI Message-Id: Date: Fri, 08 Oct 2021 23:00:05 +0000 commit 305f19306b4f16448a53ceebe6e6aa19513738ed Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 15:38:17 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:38:17 2021 -0700 xen/arm: Add new device type for PCI Add new device type (DEV_PCI) to distinguish PCI devices from platform DT devices, so some drivers, like IOMMU, can handle PCI devices differently. Also add a helper which is when given a struct device returns the corresponding struct pci_dev which this device is a part of. Because of the header cross-dependencies, e.g. we need both struct pci_dev and struct arch_pci_dev at the same time, this cannot be done with an inline. Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/pci.c | 7 +++++++ xen/include/asm-arm/device.h | 4 ++-- xen/include/asm-arm/pci.h | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index 73540045d1..138da19284 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -27,6 +27,13 @@ int arch_pci_clean_pirqs(struct domain *d) return 0; } +struct pci_dev *dev_to_pci(struct device *dev) +{ + ASSERT(dev->type == DEV_PCI); + + return container_of(dev, struct pci_dev, arch.dev); +} + static int __init dt_pci_init(void) { struct dt_device_node *np; diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index ebe84ea853..7bf0405603 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -4,6 +4,7 @@ enum device_type { DEV_DT, + DEV_PCI, }; struct dev_archdata { @@ -25,8 +26,7 @@ typedef struct device device_t; #include -/* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */ -#define dev_is_pci(dev) ((void)(dev), 0) +#define dev_is_pci(dev) ((dev)->type == DEV_PCI) #define dev_is_dt(dev) ((dev)->type == DEV_DT) enum device_class diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index f5a5f15e3b..8551704de3 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -26,6 +26,13 @@ struct arch_pci_dev { struct device dev; }; +/* + * Because of the header cross-dependencies, e.g. we need both + * struct pci_dev and struct arch_pci_dev at the same time, this cannot be + * done with an inline here. Macro can be implemented, but looks scary. + */ +struct pci_dev *dev_to_pci(struct device *dev); + /* * struct to hold the mappings of a config space window. This * is expected to be used as sysdata for PCI controllers that -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:00:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:00:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204929.360140 (Exim 4.92) (envelope-from ) id 1mYyqf-0002tG-RY; Fri, 08 Oct 2021 23:00:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204929.360140; Fri, 08 Oct 2021 23:00:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqf-0002t2-NA; Fri, 08 Oct 2021 23:00:17 +0000 Received: by outflank-mailman (input) for mailman id 204929; Fri, 08 Oct 2021 23:00:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqd-0002ca-JK for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqd-000649-I3 for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYyqd-0003YF-Gx for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ARGRSf/fml9BQIkFgPRoKlr4vAWcNxhfM1+z3FJakaI=; b=zWk4Ay6BLr3CCQUS92K7ZQjmV6 luHMIEgbHnbqICpJXjJrDoRrYwbKvfhw0EB/j3y7WqLgGLq0giFK2pOPrUgswB9CMa282UqMnH5iq YVP+5f7306TzVaegrQvQlUQQkOjgpiKnkQxS4I9cU9iwMhu/RSng+AJNMOVzLnlnn+1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Introduce pci_find_host_bridge_node helper Message-Id: Date: Fri, 08 Oct 2021 23:00:15 +0000 commit 8858dfac1d83acd1b28643c616318631e3a4134d Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 15:43:26 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:43:26 2021 -0700 xen/arm: Introduce pci_find_host_bridge_node helper Get host bridge node given a PCI device attached to it. This helper will be re-used for adding PCI devices by the subsequent patches. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/pci-host-common.c | 16 ++++++++++++++++ xen/include/asm-arm/pci.h | 1 + 2 files changed, 17 insertions(+) diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index c5941b10e9..af208e7298 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -236,6 +236,22 @@ err_exit: return err; } +/* + * Get host bridge node given a device attached to it. + */ +struct dt_device_node *pci_find_host_bridge_node(struct device *dev) +{ + struct pci_host_bridge *bridge; + struct pci_dev *pdev = dev_to_pci(dev); + + bridge = pci_find_host_bridge(pdev->seg, pdev->bus); + if ( unlikely(!bridge) ) + { + printk(XENLOG_ERR "Unable to find PCI bridge for %pp\n", &pdev->sbdf); + return NULL; + } + return bridge->dt_node; +} /* * This function will lookup an hostbridge based on the segment and bus * number. diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index 8551704de3..ed76508002 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -89,6 +89,7 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where); struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); +struct dt_device_node *pci_find_host_bridge_node(struct device *dev); static always_inline bool is_pci_passthrough_enabled(void) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:00:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:00:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204931.360144 (Exim 4.92) (envelope-from ) id 1mYyqp-00030v-Sb; Fri, 08 Oct 2021 23:00:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204931.360144; Fri, 08 Oct 2021 23:00:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqp-00030g-Ox; Fri, 08 Oct 2021 23:00:27 +0000 Received: by outflank-mailman (input) for mailman id 204931; Fri, 08 Oct 2021 23:00:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqn-0002zA-Ma for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqn-00064Y-Ll for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYyqn-0003Zh-Kg for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EZ8u7WzH1zQkIRgs6XgjScElvfjX1vVrXhTQBdapaYc=; b=ld/4iGnkbxHJC2vlHheLBcB/AE 1TpNaMhBl99dNK4PyvLJZcqPf7FE9Q75q3hENlgrR4JY7Un7ADIH4u2CF0V9PbJWMj+S7QpOu3Q4X xWiDmQWbrmmXMC+tT7KwWvS3qRbbOJPCD2Aon8c1qKiqt4a+QPOrvu1CmotyCVRNsU8Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/device-tree: Make dt_find_node_by_phandle global Message-Id: Date: Fri, 08 Oct 2021 23:00:25 +0000 commit 86e84e59bd77b69de5736ee00a679fba5ce9df5c Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 08:55:28 2021 +0300 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:45:44 2021 -0700 xen/device-tree: Make dt_find_node_by_phandle global Make dt_find_node_by_phandle globally visible, so it can be re-used by other frameworks. Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/common/device_tree.c | 2 +- xen/include/xen/device_tree.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index ea93da1725..4aae281e89 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1047,7 +1047,7 @@ int dt_for_each_range(const struct dt_device_node *dev, * * Returns a node pointer. */ -static struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle) +struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle) { struct dt_device_node *np; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 2297c59ce6..fd6cd00b43 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -849,6 +849,8 @@ int dt_count_phandle_with_args(const struct dt_device_node *np, */ int dt_get_pci_domain_nr(struct dt_device_node *node); +struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle); + #ifdef CONFIG_DEVICE_TREE_DEBUG #define dt_dprintk(fmt, args...) \ printk(XENLOG_DEBUG fmt, ## args) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:00:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:00:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204936.360146 (Exim 4.92) (envelope-from ) id 1mYyqy-0003D4-TG; Fri, 08 Oct 2021 23:00:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204936.360146; Fri, 08 Oct 2021 23:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqy-0003Cw-QL; Fri, 08 Oct 2021 23:00:36 +0000 Received: by outflank-mailman (input) for mailman id 204936; Fri, 08 Oct 2021 23:00:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqx-0003BZ-QX for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyqx-00064i-Po for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYyqx-0003bM-O8 for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VEmE/+HDftwh/7HYC1JQonhR/UBUyJ+TBIfaDcOb/n8=; b=MYWvefR7aq57bWr0snmQBVSnbk NCpoyXqAXudh+glTEIZBjpIcYt4jYgZBzHleQ8bCuEjznmG9g2bB4EFKi+WEUGFu4jm7JXtDH0dak nDykQxCsg5E4ENMfPJc57TPIAgsqOdnRiGVL6EKahQVwHYijEviB/RCRTcJ3ubfUw8K4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Mark device as PCI while creating one Message-Id: Date: Fri, 08 Oct 2021 23:00:35 +0000 commit e17abb28e80043346752f1e2b59ed34806c2144d Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 15:48:31 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:48:31 2021 -0700 xen/arm: Mark device as PCI while creating one While adding a PCI device mark it as such, so other frameworks can distinguish it from DT devices. For that introduce an architecture defined helper which may perform additional initialization of the newly created PCI device. Signed-off-by: Oleksandr Andrushchenko [applicable parts] Acked-by: Jan Beulich Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/pci.c | 5 +++++ xen/drivers/passthrough/pci.c | 2 ++ xen/include/asm-arm/pci.h | 7 +++++++ xen/include/asm-x86/pci.h | 2 ++ 4 files changed, 16 insertions(+) diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index 138da19284..082c14e127 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -34,6 +34,11 @@ struct pci_dev *dev_to_pci(struct device *dev) return container_of(dev, struct pci_dev, arch.dev); } +void arch_pci_init_pdev(struct pci_dev *pdev) +{ + pci_to_dev(pdev)->type = DEV_PCI; +} + static int __init dt_pci_init(void) { struct dt_device_node *np; diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index e1b735d9e8..3aa8c3175f 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -329,6 +329,8 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) *((u8*) &pdev->devfn) = devfn; pdev->domain = NULL; + arch_pci_init_pdev(pdev); + rc = pdev_msi_init(pdev); if ( rc ) { diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index ed76508002..00ccc3161b 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -95,6 +95,9 @@ static always_inline bool is_pci_passthrough_enabled(void) { return pci_passthrough_enabled; } + +void arch_pci_init_pdev(struct pci_dev *pdev); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; @@ -104,5 +107,9 @@ static always_inline bool is_pci_passthrough_enabled(void) return false; } +struct pci_dev; + +static inline void arch_pci_init_pdev(struct pci_dev *pdev) {} + #endif /*!CONFIG_HAS_PCI*/ #endif /* __ARM_PCI_H__ */ diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index e076951032..edd7c3e71a 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -38,4 +38,6 @@ static always_inline bool is_pci_passthrough_enabled(void) return true; } +static inline void arch_pci_init_pdev(struct pci_dev *pdev) {} + #endif /* __X86_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:00:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:00:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204938.360149 (Exim 4.92) (envelope-from ) id 1mYyr8-0003JJ-Uv; Fri, 08 Oct 2021 23:00:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204938.360149; Fri, 08 Oct 2021 23:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyr8-0003JB-Rv; Fri, 08 Oct 2021 23:00:46 +0000 Received: by outflank-mailman (input) for mailman id 204938; Fri, 08 Oct 2021 23:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyr7-0003Iy-Tc for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYyr7-00064u-Su for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYyr7-0003dN-Rv for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:00:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bBtVdtaUGeZwbPfS7sOcfo78V03pdzR4BK/c/K3qUjc=; b=AZca+LR32szCUOylwYRFTRwZhn A/Vw29CWQxbYjabbDHNAcnNDuma90ntQvlv/7cfcYLaUWiTF1HSN6SugI1Uzu6DDZT9lje73v1ZZr SVlm4PXaADxQxPLPa2el5QafUo2m4ZK7K36OqtlVocHAA0KM5mNV4GWzdaaLPikgag6Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domain: Call pci_release_devices() when releasing domain resources Message-Id: Date: Fri, 08 Oct 2021 23:00:45 +0000 commit d4c9845e52cbb3cd62172809f62ee51dbb3ca7de Author: Oleksandr Tyshchenko AuthorDate: Fri Oct 8 08:55:30 2021 +0300 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:50:55 2021 -0700 xen/domain: Call pci_release_devices() when releasing domain resources This is the very same that we already do for DT devices. Moreover, x86 already calls pci_release_devices(). Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/domain.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 36138c1b2e..aae4472479 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -981,7 +981,8 @@ static int relinquish_memory(struct domain *d, struct page_list_head *list) * function which may return -ERESTART. */ enum { - PROG_tee = 1, + PROG_pci = 1, + PROG_tee, PROG_xen, PROG_page, PROG_mapping, @@ -1018,6 +1019,12 @@ int domain_relinquish_resources(struct domain *d) #ifdef CONFIG_IOREQ_SERVER ioreq_server_destroy_all(d); #endif +#ifdef CONFIG_HAS_PCI + PROGRESS(pci): + ret = pci_release_devices(d); + if ( ret ) + return ret; +#endif PROGRESS(tee): ret = tee_relinquish_resources(d); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:11:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204941.360154 (Exim 4.92) (envelope-from ) id 1mYz18-0004IX-Ly; Fri, 08 Oct 2021 23:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204941.360154; Fri, 08 Oct 2021 23:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYz18-0004IP-IW; Fri, 08 Oct 2021 23:11:06 +0000 Received: by outflank-mailman (input) for mailman id 204941; Fri, 08 Oct 2021 23:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYz16-0004IJ-Mz for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYz16-0006Fa-KS for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYz16-0004lZ-JN for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+dXJhJAkAhhnz4QqkJHBAmbFGcn90nfGz4ZrtEA/Xjw=; b=mEtXOx+zwr9z5NRsoS54Xa1cIb 6V7KDxBFcYNVH828tP2Q/C9ZUEj6fmN+cKMULCuDzDNMF94b/Dhk+fUjyUr8lwv3Fm53RHwavmA8J sibGT1lvlICnTIzN4iYQqdebY4YIwbWqjKmueQy1DKAVJHhEHx4kz2ORiF2uIJJrgS7g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: optee: fix possible memory leaks Message-Id: Date: Fri, 08 Oct 2021 23:11:04 +0000 commit 664cc3c3d381e4f9a61dcb68cbd7a6a00070370e Author: Volodymyr Babchuk AuthorDate: Thu Oct 7 23:25:02 2021 +0000 Commit: Stefano Stabellini CommitDate: Fri Oct 8 16:02:13 2021 -0700 xen/arm: optee: fix possible memory leaks translate_noncontig() allocates domheap page for translated list before calling to allocate_optee_shm_buf(), which can fail for number of reason. Anyways, after fail we need to free the allocated page(s). Another leak is possible if the same translate_noncontig() function fails to get domain page. In this case it should free allocated optee_shm_buf prior exit. This will also free allocated domheap page. Signed-off-by: Volodymyr Babchuk Acked-by: Stefano Stabellini --- xen/arch/arm/tee/optee.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index 6df0d44eb9..131d2f9a8a 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -781,7 +781,10 @@ static int translate_noncontig(struct optee_domain *ctx, optee_shm_buf = allocate_optee_shm_buf(ctx, param->u.tmem.shm_ref, pg_count, xen_pgs, order); if ( IS_ERR(optee_shm_buf) ) + { + free_domheap_pages(xen_pgs, order); return PTR_ERR(optee_shm_buf); + } gfn = gaddr_to_gfn(param->u.tmem.buf_ptr & ~(OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1)); @@ -807,7 +810,7 @@ static int translate_noncontig(struct optee_domain *ctx, { guest_pg = get_domain_ram_page(gfn); if ( !guest_pg ) - return -EINVAL; + goto free_shm_buf; guest_data = __map_domain_page(guest_pg); xen_data = __map_domain_page(xen_pgs); @@ -854,6 +857,7 @@ err_unmap: unmap_domain_page(guest_data); unmap_domain_page(xen_data); put_page(guest_pg); +free_shm_buf: free_optee_shm_buf(ctx, optee_shm_buf->cookie); return -EINVAL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:44:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:44:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204944.360158 (Exim 4.92) (envelope-from ) id 1mYzX1-00071v-5H; Fri, 08 Oct 2021 23:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204944.360158; Fri, 08 Oct 2021 23:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzX1-00071n-25; Fri, 08 Oct 2021 23:44:03 +0000 Received: by outflank-mailman (input) for mailman id 204944; Fri, 08 Oct 2021 23:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzX0-00071h-81 for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzX0-0006mC-5Y for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzX0-0008I6-4R for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23: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=KYJxJXErGjFjIcUZjPaoD4qaz1NPkcO7Mbm3ygGCwkA=; b=4sHvoAQwLtABNP1fqP9ulouh+z 8b8No8K7/poffHBCbLWVVpIci2zqxrkcKSgHXeOkjEqKTHYYXtqLajmO80yCbnuWGlkRuLYUlfD6G hFBiON85lT0PLDY9I8jQxZPB9JKNQ7kfcXTHTm8SC79u62iZNIdBeiMTohEiw3YkDW34=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: convert binfile use to if_changed Message-Id: Date: Fri, 08 Oct 2021 23:44:02 +0000 commit 74c48d4738740d9f59d5c5a31fd373f802c09510 Author: Anthony PERARD AuthorDate: Thu Oct 7 17:55:27 2021 +0200 Commit: Jan Beulich CommitDate: Thu Oct 7 17:55:27 2021 +0200 build: convert binfile use to if_changed This will allow to detect command line changes and allow to regenerate the file in that case. Signed-off-by: Anthony PERARD Acked-by: Jan Beulich --- xen/Rules.mk | 5 +++++ xen/common/Makefile | 5 +++-- xen/xsm/flask/Makefile | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index b7827a56a5..8b8f9d347f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -57,6 +57,11 @@ cmd_ar = rm -f $@; $(AR) cr $@ $(real-prereqs) quiet_cmd_objcopy = OBJCOPY $@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $< $@ +# binfile +# use e.g. $(call if_changed,binfile,binary-file varname) +quiet_cmd_binfile = BINFILE $@ +cmd_binfile = $(SHELL) $(BASEDIR)/tools/binfile $(BINFILE_FLAGS) $@ $(2) + define gendep ifneq ($(1),$(subst /,:,$(1))) DEPS += $(dir $(1)).$(notdir $(1)).d diff --git a/xen/common/Makefile b/xen/common/Makefile index 54de70d422..141d7d40d3 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -80,8 +80,9 @@ config.gz: $(CONF_FILE) config_data.o: config.gz -config_data.S: $(BASEDIR)/tools/binfile - $(SHELL) $(BASEDIR)/tools/binfile $@ config.gz xen_config_data +config_data.S: $(BASEDIR)/tools/binfile FORCE + $(call if_changed,binfile,config.gz xen_config_data) +targets += config_data.S clean:: rm -f config_data.S config.gz 2>/dev/null diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index af95697ed9..11c530dcf4 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -35,8 +35,10 @@ $(subst include/,%/,$(AV_H_FILES)): $(AV_H_DEPEND) $(mkaccess) FORCE obj-bin-$(CONFIG_XSM_FLASK_POLICY) += flask-policy.o flask-policy.o: policy.bin -flask-policy.S: $(BASEDIR)/tools/binfile - $(SHELL) $(BASEDIR)/tools/binfile -i $@ policy.bin xsm_flask_init_policy +flask-policy.S: BINFILE_FLAGS := -i +flask-policy.S: $(BASEDIR)/tools/binfile FORCE + $(call if_changed,binfile,policy.bin xsm_flask_init_policy) +targets += flask-policy.S FLASK_BUILD_DIR := $(CURDIR) POLICY_SRC := $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204945.360163 (Exim 4.92) (envelope-from ) id 1mYzXB-000748-6u; Fri, 08 Oct 2021 23:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204945.360163; Fri, 08 Oct 2021 23: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 1mYzXB-000740-3e; Fri, 08 Oct 2021 23:44:13 +0000 Received: by outflank-mailman (input) for mailman id 204945; Fri, 08 Oct 2021 23:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXA-00073u-9i for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXA-0006mN-8s for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzXA-0008Iv-7q for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23: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=4xLwPeoSuUveg/fRcYtBHLjuRd8AkHUTkztm/TILZsc=; b=QkvGjWdIgi/5xriBEsEVlUUgr+ fvEswn/IhvC8aSXAof1MH8/UtbSRgf6NdTS+Tiro9MmJ7sT96sc8KgSk6pzvxsHXgEuNpOcHJuzja 0Ae0AldoH/sV1kN1w5ZBOaTnB4IHgyCG0GU2ax1bSMChGQuHV/r9Mjn1uKeO39of2tX4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build/riscv: tell the build system about riscv64/head.S Message-Id: Date: Fri, 08 Oct 2021 23:44:12 +0000 commit 2a04f396a34c5a43b9a09d72e8c4f49c64066cce Author: Anthony PERARD AuthorDate: Thu Oct 7 17:57:10 2021 +0200 Commit: Jan Beulich CommitDate: Thu Oct 7 17:57:10 2021 +0200 build/riscv: tell the build system about riscv64/head.S This allows to `make arch/riscv/riscv64/head.o`. Example of rune on a fresh copy of the repository: make XEN_TARGET_ARCH=riscv64 CROSS_COMPILE=riscv64-linux-gnu- KBUILD_DEFCONFIG=tiny64_defconfig arch/riscv/riscv64/head.o Signed-off-by: Anthony PERARD Acked-by: Bob Eshleman Reviewed-by: Alistair Francis Acked-by: Connor Davis --- xen/arch/riscv/riscv64/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/riscv/riscv64/Makefile b/xen/arch/riscv/riscv64/Makefile new file mode 100644 index 0000000000..15a4a65f66 --- /dev/null +++ b/xen/arch/riscv/riscv64/Makefile @@ -0,0 +1 @@ +extra-y += head.o -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:44:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204946.360166 (Exim 4.92) (envelope-from ) id 1mYzXL-00077N-8C; Fri, 08 Oct 2021 23:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204946.360166; Fri, 08 Oct 2021 23:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXL-00077F-5A; Fri, 08 Oct 2021 23:44:23 +0000 Received: by outflank-mailman (input) for mailman id 204946; Fri, 08 Oct 2021 23:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXK-000772-DE for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXK-0006mX-CQ for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzXK-0008K9-BJ for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23: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=lFeZhXAnSgpErOyH1Z6iPdhbf0DjOo+df+q0YIztuqw=; b=rAWbFsEGc6PEQBrT5pwIQg7F81 vM0CcnEYcS8XGZKzzN+yciDYWDggwRR3zFRuml8Kku/A/m4rkKalUUsa0JutH5JCAdIkkq6E+bbXT wxrU6GwLEaXJ+/VUMCp383NuCd9JESVLoKaoMbLPcj9YOpMeT++vS1t8FIeY9bu+MQh0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add PHYSDEVOP_pci_device_(*add/remove) support for ARM Message-Id: Date: Fri, 08 Oct 2021 23:44:22 +0000 commit f9187cf17597907fb6ce4ca65463d6232ef3b36c Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:28 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:29:51 2021 -0700 xen/arm: Add PHYSDEVOP_pci_device_(*add/remove) support for ARM Hardware domain is in charge of doing the PCI enumeration and will discover the PCI devices and then will communicate to XEN via hyper call PHYSDEVOP_pci_device_add(..) to add the PCI devices in XEN. Also implement PHYSDEVOP_pci_device_remove(..) to remove the PCI device. As most of the code for PHYSDEVOP_pci_device_* is the same between x86 and ARM, move the code to a common file to avoid duplication. There are other PHYSDEVOP_pci_device_* operations to add PCI devices. Currently implemented PHYSDEVOP_pci_device_remove(..) and PHYSDEVOP_pci_device_add(..) only as those are minimum required to support PCI passthrough on ARM. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/arch/arm/physdev.c | 6 +++- xen/arch/x86/physdev.c | 52 ++-------------------------- xen/arch/x86/x86_64/physdev.c | 2 +- xen/drivers/pci/Makefile | 1 + xen/drivers/pci/physdev.c | 80 +++++++++++++++++++++++++++++++++++++++++++ xen/include/public/arch-arm.h | 4 ++- xen/include/xen/hypercall.h | 4 +++ 7 files changed, 96 insertions(+), 53 deletions(-) diff --git a/xen/arch/arm/physdev.c b/xen/arch/arm/physdev.c index e91355fe22..f9aa274dda 100644 --- a/xen/arch/arm/physdev.c +++ b/xen/arch/arm/physdev.c @@ -8,13 +8,17 @@ #include #include #include -#include +#include int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { +#ifdef CONFIG_HAS_PCI + return pci_physdev_op(cmd, arg); +#else gdprintk(XENLOG_DEBUG, "PHYSDEVOP cmd=%d: not implemented\n", cmd); return -ENOSYS; +#endif } /* diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 23465bcd00..ea38be8b79 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include @@ -480,54 +480,6 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } - case PHYSDEVOP_pci_device_add: { - struct physdev_pci_device_add add; - struct pci_dev_info pdev_info; - nodeid_t node; - - ret = -EFAULT; - if ( copy_from_guest(&add, arg, 1) != 0 ) - break; - - pdev_info.is_extfn = !!(add.flags & XEN_PCI_DEV_EXTFN); - if ( add.flags & XEN_PCI_DEV_VIRTFN ) - { - pdev_info.is_virtfn = 1; - pdev_info.physfn.bus = add.physfn.bus; - pdev_info.physfn.devfn = add.physfn.devfn; - } - else - pdev_info.is_virtfn = 0; - - if ( add.flags & XEN_PCI_DEV_PXM ) - { - uint32_t pxm; - size_t optarr_off = offsetof(struct physdev_pci_device_add, optarr) / - sizeof(add.optarr[0]); - - if ( copy_from_guest_offset(&pxm, arg, optarr_off, 1) ) - break; - - node = pxm_to_node(pxm); - } - else - node = NUMA_NO_NODE; - - ret = pci_add_device(add.seg, add.bus, add.devfn, &pdev_info, node); - break; - } - - case PHYSDEVOP_pci_device_remove: { - struct physdev_pci_device dev; - - ret = -EFAULT; - if ( copy_from_guest(&dev, arg, 1) != 0 ) - break; - - ret = pci_remove_device(dev.seg, dev.bus, dev.devfn); - break; - } - case PHYSDEVOP_prepare_msix: case PHYSDEVOP_release_msix: { struct physdev_pci_device dev; @@ -663,7 +615,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } default: - ret = -ENOSYS; + ret = pci_physdev_op(cmd, arg); break; } diff --git a/xen/arch/x86/x86_64/physdev.c b/xen/arch/x86/x86_64/physdev.c index 0a50cbd4d8..e3cbd5ebcb 100644 --- a/xen/arch/x86/x86_64/physdev.c +++ b/xen/arch/x86/x86_64/physdev.c @@ -9,7 +9,7 @@ EMIT_FILE; #include #include #include -#include +#include #define do_physdev_op compat_physdev_op diff --git a/xen/drivers/pci/Makefile b/xen/drivers/pci/Makefile index a98035df4c..972c923db0 100644 --- a/xen/drivers/pci/Makefile +++ b/xen/drivers/pci/Makefile @@ -1 +1,2 @@ obj-y += pci.o +obj-y += physdev.o diff --git a/xen/drivers/pci/physdev.c b/xen/drivers/pci/physdev.c new file mode 100644 index 0000000000..4f3e1a96c0 --- /dev/null +++ b/xen/drivers/pci/physdev.c @@ -0,0 +1,80 @@ + +#include +#include +#include + +#ifndef COMPAT +typedef long ret_t; +#endif + +ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + ret_t ret; + + switch ( cmd ) + { + case PHYSDEVOP_pci_device_add: { + struct physdev_pci_device_add add; + struct pci_dev_info pdev_info; + nodeid_t node = NUMA_NO_NODE; + + ret = -EFAULT; + if ( copy_from_guest(&add, arg, 1) != 0 ) + break; + + pdev_info.is_extfn = (add.flags & XEN_PCI_DEV_EXTFN); + if ( add.flags & XEN_PCI_DEV_VIRTFN ) + { + pdev_info.is_virtfn = true; + pdev_info.physfn.bus = add.physfn.bus; + pdev_info.physfn.devfn = add.physfn.devfn; + } + else + pdev_info.is_virtfn = false; + +#ifdef CONFIG_NUMA + if ( add.flags & XEN_PCI_DEV_PXM ) + { + uint32_t pxm; + size_t optarr_off = offsetof(struct physdev_pci_device_add, optarr) / + sizeof(add.optarr[0]); + + if ( copy_from_guest_offset(&pxm, arg, optarr_off, 1) ) + break; + + node = pxm_to_node(pxm); + } +#endif + + ret = pci_add_device(add.seg, add.bus, add.devfn, &pdev_info, node); + break; + } + + case PHYSDEVOP_pci_device_remove: { + struct physdev_pci_device dev; + + ret = -EFAULT; + if ( copy_from_guest(&dev, arg, 1) != 0 ) + break; + + ret = pci_remove_device(dev.seg, dev.bus, dev.devfn); + break; + } + + default: + ret = -ENOSYS; + break; + } + + return ret; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 6b5a5f818a..d46c61fca9 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -107,7 +107,9 @@ * All generic sub-operations * * HYPERVISOR_physdev_op - * No sub-operations are currenty supported + * Exactly these sub-operations are supported: + * PHYSDEVOP_pci_device_add + * PHYSDEVOP_pci_device_remove * * HYPERVISOR_sysctl * All generic sub-operations, with the exception of: diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 3771487a30..07b10ec230 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -45,6 +45,10 @@ extern long do_platform_op( XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op); +extern long +pci_physdev_op( + int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); + /* * To allow safe resume of do_memory_op() after preemption, we need to know * at what point in the page list to resume. For this purpose I steal the -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:44:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204947.360170 (Exim 4.92) (envelope-from ) id 1mYzXV-0007A9-9v; Fri, 08 Oct 2021 23:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204947.360170; Fri, 08 Oct 2021 23: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 1mYzXV-0007A1-6f; Fri, 08 Oct 2021 23:44:33 +0000 Received: by outflank-mailman (input) for mailman id 204947; Fri, 08 Oct 2021 23:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXU-00079q-KT for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXU-0006ml-Jk for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzXU-0008LQ-GI for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23: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=Fg8+mwzQ5+eu5fQ8EAldCNiqimhS2zratU1fLLPrIcE=; b=Br5yqtEf/VBeXWDympsDiF5JI8 f5ZjY10eTB/CuagbsCQI4Mw1vFRovl7KV6t19TTC3agWbOq0RTjj+VLA3XR3C2pk08RiJuiVbHEBR KQFfo3k0iwWUavST0JgDyYHfJqFJOPxXVxQ6KeR4malux0Ahw3iuEGBVmt+Mm2QXXC7M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add cmdline boot option "pci-passthrough = " Message-Id: Date: Fri, 08 Oct 2021 23:44:32 +0000 commit 15517ed61f55be6039aedcc99720ee07c772ed44 Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:29 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/arm: Add cmdline boot option "pci-passthrough = " Add cmdline boot option "pci-passthrough = = " to enable or disable the PCI passthrough support on ARM. Signed-off-by: Rahul Singh [stefano: one bool_t/bool correction] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 7 +++++++ xen/arch/arm/pci/pci.c | 12 ++++++++++++ xen/drivers/pci/physdev.c | 6 ++++++ xen/include/asm-arm/pci.h | 11 +++++++++++ xen/include/asm-x86/pci.h | 6 ++++++ 5 files changed, 42 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 5cae4adc58..b1f7978aa4 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1819,6 +1819,13 @@ All numbers specified must be hexadecimal ones. This option can be specified more than once (up to 8 times at present). +### pci-passthrough (arm) +> `= ` + +> Default: `false` + +Flag to enable or disable support for PCI passthrough + ### pcid (x86) > `= | xpti=` diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index e359bab9ea..73540045d1 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -16,6 +16,7 @@ #include #include #include +#include #include /* @@ -62,8 +63,19 @@ static int __init acpi_pci_init(void) } #endif +/* By default pci passthrough is disabled. */ +bool __read_mostly pci_passthrough_enabled; +boolean_param("pci-passthrough", pci_passthrough_enabled); + static int __init pci_init(void) { + /* + * Enable PCI passthrough when has been enabled explicitly + * (pci-passthrough=on). + */ + if ( !pci_passthrough_enabled ) + return 0; + pci_segments_init(); if ( acpi_disabled ) diff --git a/xen/drivers/pci/physdev.c b/xen/drivers/pci/physdev.c index 4f3e1a96c0..42db3e6d13 100644 --- a/xen/drivers/pci/physdev.c +++ b/xen/drivers/pci/physdev.c @@ -18,6 +18,9 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct pci_dev_info pdev_info; nodeid_t node = NUMA_NO_NODE; + if ( !is_pci_passthrough_enabled() ) + return -EOPNOTSUPP; + ret = -EFAULT; if ( copy_from_guest(&add, arg, 1) != 0 ) break; @@ -53,6 +56,9 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case PHYSDEVOP_pci_device_remove: { struct physdev_pci_device dev; + if ( !is_pci_passthrough_enabled() ) + return -EOPNOTSUPP; + ret = -EFAULT; if ( copy_from_guest(&dev, arg, 1) != 0 ) break; diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index 7dd9eb3dba..fb68d63ffe 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -19,14 +19,25 @@ #define pci_to_dev(pcidev) (&(pcidev)->arch.dev) +extern bool pci_passthrough_enabled; + /* Arch pci dev struct */ struct arch_pci_dev { struct device dev; }; +static always_inline bool is_pci_passthrough_enabled(void) +{ + return pci_passthrough_enabled; +} #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; +static always_inline bool is_pci_passthrough_enabled(void) +{ + return false; +} + #endif /*!CONFIG_HAS_PCI*/ #endif /* __ARM_PCI_H__ */ diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index cc05045e9c..e076951032 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -32,4 +32,10 @@ bool_t pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg, extern int pci_mmcfg_config_num; extern struct acpi_mcfg_allocation *pci_mmcfg_config; +/* Unlike ARM, PCI passthrough is always enabled for x86. */ +static always_inline bool is_pci_passthrough_enabled(void) +{ + return true; +} + #endif /* __X86_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:44:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:44:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204948.360174 (Exim 4.92) (envelope-from ) id 1mYzXg-0007DN-BL; Fri, 08 Oct 2021 23:44:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204948.360174; Fri, 08 Oct 2021 23:44:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXg-0007DF-8N; Fri, 08 Oct 2021 23:44:44 +0000 Received: by outflank-mailman (input) for mailman id 204948; Fri, 08 Oct 2021 23:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXe-0007Cy-QR for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXe-0006n0-Pf for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzXe-0008Mb-Oh for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23: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=2Lo1piYpB4yyzsnymrscQZRNJTAGehXYEQE24GZU4uE=; b=wgiGFJoU5P0/rkS8QzNxiL4pWg 5C+Y+G2eeM4HfhcmJyHxP32Clwoaury3vk4HG87KJ5Tf48RK7qy7MWQfc0zn8IXkf+ZAjE6IePQYF aJ3QCKboIbwX5iqrlawtR4vUw0oiAZUZ3KIml41XNyYwPdMb79YTa4Xj5n0SDLLJWizw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: PCI host bridge discovery within XEN on ARM Message-Id: Date: Fri, 08 Oct 2021 23:44:42 +0000 commit 6ec9176d94ae64f9eeb0d1805d2fd97298496330 Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:30 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/arm: PCI host bridge discovery within XEN on ARM XEN during boot will read the PCI device tree node “reg” property and will map the PCI config space to the XEN memory. As of now only "pci-host-ecam-generic" compatible board is supported. "linux,pci-domain" device tree property assigns a fixed PCI domain number to a host bridge, otherwise an unstable (across boots) unique number will be assigned by Linux. XEN access the PCI devices based on Segment:Bus:Device:Function. A Segment number in the XEN is same as a domain number in Linux. Segment number and domain number has to be in sync to access the correct PCI devices. XEN will read the “linux,pci-domain” property from the device tree node and configure the host bridge segment number accordingly. If this property is not available XEN will allocate the unique segment number to the host bridge. Signed-off-by: Rahul Singh Reviewed-by: Stefano Stabellini --- xen/arch/arm/pci/Makefile | 4 + xen/arch/arm/pci/ecam.c | 61 +++++++++ xen/arch/arm/pci/pci-access.c | 83 ++++++++++++ xen/arch/arm/pci/pci-host-common.c | 247 ++++++++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-host-generic.c | 48 +++++++ xen/include/asm-arm/pci.h | 56 ++++++++ 6 files changed, 499 insertions(+) diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile index a98035df4c..6f32fbbe67 100644 --- a/xen/arch/arm/pci/Makefile +++ b/xen/arch/arm/pci/Makefile @@ -1 +1,5 @@ obj-y += pci.o +obj-y += pci-access.o +obj-y += pci-host-generic.o +obj-y += pci-host-common.o +obj-y += ecam.o diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c new file mode 100644 index 0000000000..602d00799c --- /dev/null +++ b/xen/arch/arm/pci/ecam.c @@ -0,0 +1,61 @@ +/* + * Based on Linux drivers/pci/ecam.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 + +/* + * Function to implement the pci_ops->map_bus method. + */ +void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf, uint32_t where) +{ + const struct pci_config_window *cfg = bridge->cfg; + struct pci_ecam_ops *ops = + container_of(bridge->ops, struct pci_ecam_ops, pci_ops); + unsigned int devfn_shift = ops->bus_shift - 8; + void __iomem *base; + + unsigned int busn = PCI_BUS(sbdf.bdf); + + if ( busn < cfg->busn_start || busn > cfg->busn_end ) + return NULL; + + busn -= cfg->busn_start; + base = cfg->win + (busn << ops->bus_shift); + + return base + (PCI_DEVFN2(sbdf.bdf) << devfn_shift) + where; +} + +/* ECAM ops */ +const struct pci_ecam_ops pci_generic_ecam_ops = { + .bus_shift = 20, + .pci_ops = { + .map_bus = pci_ecam_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, + } +}; + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/pci/pci-access.c b/xen/arch/arm/pci/pci-access.c new file mode 100644 index 0000000000..3cd14a4b87 --- /dev/null +++ b/xen/arch/arm/pci/pci-access.c @@ -0,0 +1,83 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 + +#define INVALID_VALUE (~0U) + +int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value) +{ + void __iomem *addr = bridge->ops->map_bus(bridge, sbdf, reg); + + if ( !addr ) + { + *value = INVALID_VALUE; + return -ENODEV; + } + + switch ( len ) + { + case 1: + *value = readb(addr); + break; + case 2: + *value = readw(addr); + break; + case 4: + *value = readl(addr); + break; + default: + ASSERT_UNREACHABLE(); + } + + return 0; +} + +int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value) +{ + void __iomem *addr = bridge->ops->map_bus(bridge, sbdf, reg); + + if ( !addr ) + return -ENODEV; + + switch ( len ) + { + case 1: + writeb(value, addr); + break; + case 2: + writew(value, addr); + break; + case 4: + writel(value, addr); + break; + default: + ASSERT_UNREACHABLE(); + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c new file mode 100644 index 0000000000..a08e06cea1 --- /dev/null +++ b/xen/arch/arm/pci/pci-host-common.c @@ -0,0 +1,247 @@ +/* + * Based on Linux drivers/pci/ecam.c + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 +#include +#include + +/* + * List for all the pci host bridges. + */ + +static LIST_HEAD(pci_host_bridges); + +static atomic_t domain_nr = ATOMIC_INIT(-1); + +static inline void __iomem *pci_remap_cfgspace(paddr_t start, size_t len) +{ + return ioremap_nocache(start, len); +} + +static void pci_ecam_free(struct pci_config_window *cfg) +{ + if ( cfg->win ) + iounmap(cfg->win); + + xfree(cfg); +} + +static struct pci_config_window * __init +gen_pci_init(struct dt_device_node *dev, const struct pci_ecam_ops *ops) +{ + int err, cfg_reg_idx; + u32 bus_range[2]; + paddr_t addr, size; + struct pci_config_window *cfg; + + cfg = xzalloc(struct pci_config_window); + if ( !cfg ) + return NULL; + + err = dt_property_read_u32_array(dev, "bus-range", bus_range, + ARRAY_SIZE(bus_range)); + if ( err ) { + cfg->busn_start = 0; + cfg->busn_end = 0xff; + printk(XENLOG_INFO "%s: No bus range found for pci controller\n", + dt_node_full_name(dev)); + } else { + cfg->busn_start = bus_range[0]; + cfg->busn_end = bus_range[1]; + if ( cfg->busn_end > cfg->busn_start + 0xff ) + cfg->busn_end = cfg->busn_start + 0xff; + } + + if ( ops->cfg_reg_index ) + { + cfg_reg_idx = ops->cfg_reg_index(dev); + if ( cfg_reg_idx < 0 ) + goto err_exit; + } + else + cfg_reg_idx = 0; + + /* Parse our PCI ecam register address */ + err = dt_device_get_address(dev, cfg_reg_idx, &addr, &size); + if ( err ) + goto err_exit; + + cfg->phys_addr = addr; + cfg->size = size; + + /* + * On 64-bit systems, we do a single ioremap for the whole config space + * since we have enough virtual address range available. On 32-bit, we + * ioremap the config space for each bus individually. + * As of now only 64-bit is supported 32-bit is not supported. + * + * TODO: For 32-bit implement the ioremap/iounmap of config space + * dynamically for each read/write call. + */ + cfg->win = pci_remap_cfgspace(cfg->phys_addr, cfg->size); + if ( !cfg->win ) + { + printk(XENLOG_ERR "ECAM ioremap failed\n"); + goto err_exit; + } + printk("ECAM at [mem 0x%"PRIpaddr"-0x%"PRIpaddr"] for [bus %x-%x] \n", + cfg->phys_addr, cfg->phys_addr + cfg->size - 1, + cfg->busn_start, cfg->busn_end); + + if ( ops->init ) + { + err = ops->init(cfg); + if ( err ) + goto err_exit; + } + + return cfg; + +err_exit: + pci_ecam_free(cfg); + + return NULL; +} + +struct pci_host_bridge *pci_alloc_host_bridge(void) +{ + struct pci_host_bridge *bridge = xzalloc(struct pci_host_bridge); + + if ( !bridge ) + return NULL; + + INIT_LIST_HEAD(&bridge->node); + + return bridge; +} + +void pci_add_host_bridge(struct pci_host_bridge *bridge) +{ + list_add_tail(&bridge->node, &pci_host_bridges); +} + +static int pci_get_new_domain_nr(void) +{ + return atomic_inc_return(&domain_nr); +} + +static int pci_bus_find_domain_nr(struct dt_device_node *dev) +{ + static int use_dt_domains = -1; + int domain; + + domain = dt_get_pci_domain_nr(dev); + + /* + * Check DT domain and use_dt_domains values. + * + * If DT domain property is valid (domain >= 0) and + * use_dt_domains != 0, the DT assignment is valid since this means + * we have not previously allocated a domain number by using + * pci_get_new_domain_nr(); we should also update use_dt_domains to + * 1, to indicate that we have just assigned a domain number from + * DT. + * + * If DT domain property value is not valid (ie domain < 0), and we + * have not previously assigned a domain number from DT + * (use_dt_domains != 1) we should assign a domain number by + * using the: + * + * pci_get_new_domain_nr() + * + * API and update the use_dt_domains value to keep track of method we + * are using to assign domain numbers (use_dt_domains = 0). + * + * All other combinations imply we have a platform that is trying + * to mix domain numbers obtained from DT and pci_get_new_domain_nr(), + * which is a recipe for domain mishandling and it is prevented by + * invalidating the domain value (domain = -1) and printing a + * corresponding error. + */ + if ( domain >= 0 && use_dt_domains ) + { + use_dt_domains = 1; + } + else if ( domain < 0 && use_dt_domains != 1 ) + { + use_dt_domains = 0; + domain = pci_get_new_domain_nr(); + } + else + { + domain = -1; + } + + return domain; +} + +int pci_host_common_probe(struct dt_device_node *dev, const void *data) +{ + struct pci_host_bridge *bridge; + struct pci_config_window *cfg; + struct pci_ecam_ops *ops; + int err; + + if ( dt_device_for_passthrough(dev) ) + return 0; + + ops = (struct pci_ecam_ops *) data; + + bridge = pci_alloc_host_bridge(); + if ( !bridge ) + return -ENOMEM; + + /* Parse and map our Configuration Space windows */ + cfg = gen_pci_init(dev, ops); + if ( !cfg ) + { + err = -ENOMEM; + goto err_exit; + } + + bridge->dt_node = dev; + bridge->cfg = cfg; + bridge->ops = &ops->pci_ops; + + bridge->segment = pci_bus_find_domain_nr(dev); + if ( bridge->segment < 0 ) + { + printk(XENLOG_ERR "Inconsistent \"linux,pci-domain\" property in DT\n"); + BUG(); + } + pci_add_host_bridge(bridge); + + return 0; + +err_exit: + xfree(bridge); + + return err; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c new file mode 100644 index 0000000000..33457fbe96 --- /dev/null +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -0,0 +1,48 @@ +/* + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 +#include + +static const struct dt_device_match __initconstrel gen_pci_dt_match[] = +{ + { .compatible = "pci-host-ecam-generic" }, + { }, +}; + +static int __init pci_host_generic_probe(struct dt_device_node *dev, + const void *data) +{ + return pci_host_common_probe(dev, &pci_generic_ecam_ops); +} + +DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI) +.dt_match = gen_pci_dt_match, +.init = pci_host_generic_probe, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index fb68d63ffe..e57b74f4d8 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -26,6 +26,62 @@ struct arch_pci_dev { struct device dev; }; +/* + * struct to hold the mappings of a config space window. This + * is expected to be used as sysdata for PCI controllers that + * use ECAM. + */ +struct pci_config_window { + paddr_t phys_addr; + paddr_t size; + uint8_t busn_start; + uint8_t busn_end; + void __iomem *win; +}; + +/* + * struct to hold pci host bridge information + * for a PCI controller. + */ +struct pci_host_bridge { + struct dt_device_node *dt_node; /* Pointer to the associated DT node */ + struct list_head node; /* Node in list of host bridges */ + uint16_t segment; /* Segment number */ + struct pci_config_window* cfg; /* Pointer to the bridge config window */ + struct pci_ops *ops; +}; + +struct pci_ops { + void __iomem *(*map_bus)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t offset); + int (*read)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value); + int (*write)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value); +}; + +/* + * struct to hold pci ops and bus shift of the config window + * for a PCI controller. + */ +struct pci_ecam_ops { + unsigned int bus_shift; + struct pci_ops pci_ops; + int (*cfg_reg_index)(struct dt_device_node *dev); + int (*init)(struct pci_config_window *); +}; + +/* Default ECAM ops */ +extern const struct pci_ecam_ops pci_generic_ecam_ops; + +int pci_host_common_probe(struct dt_device_node *dev, const void *data); +int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t *value); +int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, + uint32_t reg, uint32_t len, uint32_t value); +void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, + pci_sbdf_t sbdf, uint32_t where); + static always_inline bool is_pci_passthrough_enabled(void) { return pci_passthrough_enabled; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:44:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:44:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204949.360178 (Exim 4.92) (envelope-from ) id 1mYzXq-0007HH-EL; Fri, 08 Oct 2021 23:44:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204949.360178; Fri, 08 Oct 2021 23:44:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXq-0007H9-BM; Fri, 08 Oct 2021 23:44:54 +0000 Received: by outflank-mailman (input) for mailman id 204949; Fri, 08 Oct 2021 23:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXo-0007Gx-TO for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXo-0006nF-Sf for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzXo-0008Np-Rq for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23: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=JXNo7C2ZQZTO7gMEIwA4YQHozKh9vsHmROC/L26uUJ8=; b=X3sdcyNmQu+oMa0W3t6QKA6atF 8HEhW6Ny2YCYf89hnxZb+z+toHz6K0yQGOb8IwXYmJNL45Jyl04IGl3tTkeal5rpmz/nyos6gRDfn 4nK1nT639uADX4jdD0n5852SWAeyNzZSEtak3tjUNOxv5sJld3urUclVNjcw9zbaWvsU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add support for Xilinx ZynqMP PCI host controller Message-Id: Date: Fri, 08 Oct 2021 23:44:52 +0000 commit 1da6a07be751cd316b39d319c19e3862392ca6ef Author: Oleksandr Andrushchenko AuthorDate: Wed Oct 6 18:40:31 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/arm: Add support for Xilinx ZynqMP PCI host controller Add support for Xilinx ZynqMP PCI host controller to map the PCI config space to the XEN memory. Patch helps to understand how the generic infrastructure for PCI host-bridge discovery will be used for future references. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/pci/Makefile | 1 + xen/arch/arm/pci/pci-host-zynqmp.c | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile index 6f32fbbe67..1d045ade01 100644 --- a/xen/arch/arm/pci/Makefile +++ b/xen/arch/arm/pci/Makefile @@ -3,3 +3,4 @@ obj-y += pci-access.o obj-y += pci-host-generic.o obj-y += pci-host-common.o obj-y += ecam.o +obj-y += pci-host-zynqmp.o diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c new file mode 100644 index 0000000000..61a9807d3d --- /dev/null +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -0,0 +1,65 @@ +/* + * Based on Linux drivers/pci/controller/pci-host-common.c + * Based on Linux drivers/pci/controller/pci-host-generic.c + * Based on xen/arch/arm/pci/pci-host-generic.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 +#include + +static int __init nwl_cfg_reg_index(struct dt_device_node *np) +{ + return dt_property_match_string(np, "reg-names", "cfg"); +} + +/* ECAM ops */ +const struct pci_ecam_ops nwl_pcie_ops = { + .bus_shift = 20, + .cfg_reg_index = nwl_cfg_reg_index, + .pci_ops = { + .map_bus = pci_ecam_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, + } +}; + +static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] = +{ + { .compatible = "xlnx,nwl-pcie-2.11" }, + { }, +}; + +static int __init pci_host_generic_probe(struct dt_device_node *dev, + const void *data) +{ + return pci_host_common_probe(dev, &nwl_pcie_ops); +} + +DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI) +.dt_match = nwl_pcie_dt_match, +.init = pci_host_generic_probe, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:45:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204950.360182 (Exim 4.92) (envelope-from ) id 1mYzY0-0007KD-G0; Fri, 08 Oct 2021 23:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204950.360182; Fri, 08 Oct 2021 23:45:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzY0-0007K5-Cs; Fri, 08 Oct 2021 23:45:04 +0000 Received: by outflank-mailman (input) for mailman id 204950; Fri, 08 Oct 2021 23:45:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXz-0007Jv-0B for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:45:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzXy-0006o6-Vf for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzXy-0008PH-Us for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23: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=+4MDxGCHi5HcG0/ySpr1noJ9z2HuNL513PVGfFb3KX4=; b=VpPa/HZfXnI8x2lH2npcJkuqDM 3VXAe75fcZ8PZxwMXkmBHEO8dMDk71jb7ig49578M7QC2Yk6R73UtBUyIybX2S0ivePKh6DuDSent GjM3MawNIgj4dYbQHIO9T4zWWB11KRuj1Tnt2//ebqIuyeC5M7oMzU41Yudaq+2WEO2U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Implement pci access functions Message-Id: Date: Fri, 08 Oct 2021 23:45:02 +0000 commit a095542b6843dd87bb62585fb92f2318d83cff09 Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:32 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/arm: Implement pci access functions Implement generic pci access functions to read/write the configuration space. Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/pci/pci-access.c | 57 ++++++++++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-host-common.c | 19 +++++++++++++ xen/include/asm-arm/pci.h | 1 + 3 files changed, 77 insertions(+) diff --git a/xen/arch/arm/pci/pci-access.c b/xen/arch/arm/pci/pci-access.c index 3cd14a4b87..9f9aac43d7 100644 --- a/xen/arch/arm/pci/pci-access.c +++ b/xen/arch/arm/pci/pci-access.c @@ -16,6 +16,7 @@ #include #define INVALID_VALUE (~0U) +#define PCI_ERR_VALUE(len) GENMASK(0, len * 8) int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value) @@ -72,6 +73,62 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, return 0; } +static uint32_t pci_config_read(pci_sbdf_t sbdf, unsigned int reg, + unsigned int len) +{ + uint32_t val = PCI_ERR_VALUE(len); + struct pci_host_bridge *bridge = pci_find_host_bridge(sbdf.seg, sbdf.bus); + + if ( unlikely(!bridge) ) + return val; + + if ( unlikely(!bridge->ops->read) ) + return val; + + bridge->ops->read(bridge, sbdf, reg, len, &val); + + return val; +} + +static void pci_config_write(pci_sbdf_t sbdf, unsigned int reg, + unsigned int len, uint32_t val) +{ + struct pci_host_bridge *bridge = pci_find_host_bridge(sbdf.seg, sbdf.bus); + + if ( unlikely(!bridge) ) + return; + + if ( unlikely(!bridge->ops->write) ) + return; + + bridge->ops->write(bridge, sbdf, reg, len, val); +} + +/* + * Wrappers for all PCI configuration access functions. + */ + +#define PCI_OP_WRITE(size, type) \ + void pci_conf_write##size(pci_sbdf_t sbdf, \ + unsigned int reg, type val) \ +{ \ + pci_config_write(sbdf, reg, size / 8, val); \ +} + +#define PCI_OP_READ(size, type) \ + type pci_conf_read##size(pci_sbdf_t sbdf, \ + unsigned int reg) \ +{ \ + return pci_config_read(sbdf, reg, size / 8); \ +} + +PCI_OP_READ(8, uint8_t) +PCI_OP_READ(16, uint16_t) +PCI_OP_READ(32, uint32_t) +PCI_OP_WRITE(8, uint8_t) +PCI_OP_WRITE(16, uint16_t) +PCI_OP_WRITE(32, uint32_t) + /* * Local variables: * mode: C diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index a08e06cea1..c5941b10e9 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -236,6 +236,25 @@ err_exit: return err; } +/* + * This function will lookup an hostbridge based on the segment and bus + * number. + */ +struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus) +{ + struct pci_host_bridge *bridge; + + list_for_each_entry( bridge, &pci_host_bridges, node ) + { + if ( bridge->segment != segment ) + continue; + if ( (bus < bridge->cfg->busn_start) || (bus > bridge->cfg->busn_end) ) + continue; + return bridge; + } + + return NULL; +} /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index e57b74f4d8..f5a5f15e3b 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -81,6 +81,7 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t value); void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where); +struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); static always_inline bool is_pci_passthrough_enabled(void) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:45:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204951.360186 (Exim 4.92) (envelope-from ) id 1mYzYA-0007Mr-HI; Fri, 08 Oct 2021 23:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204951.360186; Fri, 08 Oct 2021 23:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzYA-0007Mj-ER; Fri, 08 Oct 2021 23:45:14 +0000 Received: by outflank-mailman (input) for mailman id 204951; Fri, 08 Oct 2021 23:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzY9-0007MY-3a for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:45:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzY9-0006oG-2q for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:45:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzY9-0008QA-28 for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:45:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TQNn8vecpV5dHmqPLRrairenmXk1KEP0KVzQPyBsmQw=; b=Xt0dQ2qvlieTPxRsWvWvJSAt4o PpXg+jpRcvW2ya+eMdYwtSPThL2DzvAD/8VI0wCgj3xZ+PzyKXS5r11CmhTZmyN+In6gmxGfBDSO7 mtgyDf19CCHM3Sq8vRKV5O+redHOrQPGTJ7uiXXq/97kn8G4ukKY3VJgxJ5eBp8gmHsE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag Message-Id: Date: Fri, 08 Oct 2021 23:45:13 +0000 commit 2075b410ee8087662c880213c3aca196fb7ade22 Author: Rahul Singh AuthorDate: Wed Oct 6 18:40:33 2021 +0100 Commit: Stefano Stabellini CommitDate: Thu Oct 7 12:47:25 2021 -0700 xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag Introduce XEN_DOMCTL_CDF_vpci flag to enable VPCI support in XEN. Reject the use of this new flag for x86 as VPCI is not supported for DOMU guests for x86. Signed-off-by: Rahul Singh [stefano: drop _XEN_DOMCTL_CDF_vpci] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Acked-by: Christian Lindig Acked-by: Jan Beulich --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + xen/arch/arm/domain.c | 4 ++-- xen/arch/x86/domain.c | 6 ++++++ xen/common/domain.c | 2 +- xen/include/public/domctl.h | 3 ++- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index a5588c643f..7ed1c00e47 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -69,6 +69,7 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU | CDF_NESTED_VIRT + | CDF_VPCI type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 6e94940a8a..391d4abdf8 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -62,6 +62,7 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU | CDF_NESTED_VIRT + | CDF_VPCI type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 19c756ac3d..36138c1b2e 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -622,8 +622,8 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) { unsigned int max_vcpus; - /* HVM and HAP must be set. IOMMU may or may not be */ - if ( (config->flags & ~XEN_DOMCTL_CDF_iommu) != + /* HVM and HAP must be set. IOMMU and VPCI may or may not be */ + if ( (config->flags & ~XEN_DOMCTL_CDF_iommu & ~XEN_DOMCTL_CDF_vpci) != (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap) ) { dprintk(XENLOG_INFO, "Unsupported configuration %#x\n", diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ef1812dc14..79c2aa4636 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -662,6 +662,12 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( config->flags & XEN_DOMCTL_CDF_vpci ) + { + dprintk(XENLOG_INFO, "vPCI cannot be enabled yet\n"); + return -EINVAL; + } + if ( config->vmtrace_size ) { unsigned int size = config->vmtrace_size; diff --git a/xen/common/domain.c b/xen/common/domain.c index 6ee5d033b0..40d67ec342 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -483,7 +483,7 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) ~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu | - XEN_DOMCTL_CDF_nested_virt) ) + XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci) ) { dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags); return -EINVAL; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 96696e3842..4cb3f662c2 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -70,9 +70,10 @@ struct xen_domctl_createdomain { #define XEN_DOMCTL_CDF_iommu (1U<<_XEN_DOMCTL_CDF_iommu) #define _XEN_DOMCTL_CDF_nested_virt 6 #define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt) +#define XEN_DOMCTL_CDF_vpci (1U << 7) /* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ -#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_nested_virt +#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpci uint32_t flags; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 08 23:45:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Oct 2021 23:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.204952.360192 (Exim 4.92) (envelope-from ) id 1mYzYK-0007PH-JW; Fri, 08 Oct 2021 23:45:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 204952.360192; Fri, 08 Oct 2021 23:45:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzYK-0007P9-Fu; Fri, 08 Oct 2021 23:45:24 +0000 Received: by outflank-mailman (input) for mailman id 204952; Fri, 08 Oct 2021 23:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzYJ-0007Oz-71 for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:45:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mYzYJ-0006oV-6J for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mYzYJ-0008Qy-5Q for xen-changelog@lists.xenproject.org; Fri, 08 Oct 2021 23:45:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LQlNkEpeNQLOeCddpIUoUAPLGnLLKes4NJ4/V6wIwgY=; b=Ed3SP7RcCzULqDVZKbjYIMGxwL DKlrZMeDpjKtLQEYnSyMuenL+dGDjg7TrUfEkJqrP8E6OmO4T13Nz05zhqjldUBuqlDikEDfOd7oE oUZbFYVhJO2tDQu2yHsaeAuXPeuzWqdBMhgScwWjK+E97zfVF+i/ByTZP30NSvSXathw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Updates for extended regions support Message-Id: Date: Fri, 08 Oct 2021 23:45:23 +0000 commit 1d345539c0e3654025fc00187bf633fda6ea9a43 Author: Oleksandr Tyshchenko AuthorDate: Wed Oct 6 14:22:26 2021 +0300 Commit: Stefano Stabellini CommitDate: Thu Oct 7 13:02:53 2021 -0700 xen/arm: Updates for extended regions support This is a follow-up of "b6fe410 xen/arm: Add handling of extended regions for Dom0" Add various in-code comments, update Xen hypervisor device tree bindings text, change the log level for some prints and clarify format specifier, reuse dt_for_each_range() to avoid open-coding in find_memory_holes(). Signed-off-by: Oleksandr Tyshchenko [stefano: fix typos] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- docs/misc/arm/device-tree/guest.txt | 12 ++-- xen/arch/arm/domain_build.c | 108 ++++++++++++++++++++++-------------- 2 files changed, 73 insertions(+), 47 deletions(-) diff --git a/docs/misc/arm/device-tree/guest.txt b/docs/misc/arm/device-tree/guest.txt index 418f1e9f4e..c1157518d5 100644 --- a/docs/misc/arm/device-tree/guest.txt +++ b/docs/misc/arm/device-tree/guest.txt @@ -7,10 +7,14 @@ the following properties: compatible = "xen,xen-", "xen,xen"; where is the version of the Xen ABI of the platform. -- reg: specifies the base physical address and size of a region in - memory where the grant table should be mapped to, using an - HYPERVISOR_memory_op hypercall. The memory region is large enough to map - the whole grant table (it is larger or equal to gnttab_max_grant_frames()). +- reg: specifies the base physical address and size of the regions in memory + where the special resources should be mapped to, using an HYPERVISOR_memory_op + hypercall. + Region 0 is reserved for mapping grant table, it must be always present. + The memory region is large enough to map the whole grant table (it is larger + or equal to gnttab_max_grant_frames()). + Regions 1...N are extended regions (unused address space) for mapping foreign + GFNs and grants, they might be absent if there is nothing to expose. This property is unnecessary when booting Dom0 using ACPI. - interrupts: the interrupt used by Xen to inject event notifications. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c5afbe2e05..4c28f1e4e2 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -898,7 +898,10 @@ static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) if ( ext_regions->nr_banks >= ARRAY_SIZE(ext_regions->bank) ) return 0; - /* Both start and size of the extended region should be 2MB aligned */ + /* + * Both start and size of the extended region should be 2MB aligned to + * potentially allow superpage mapping. + */ start = (s + SZ_2M - 1) & ~(SZ_2M - 1); if ( start > e ) return 0; @@ -909,6 +912,12 @@ static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) */ e += 1; size = (e - start) & ~(SZ_2M - 1); + + /* + * Reasonable size. Not too little to pick up small ranges which are + * not quite useful but increase bookkeeping and not too large + * to skip a large proportion of unused address space. + */ if ( size < MB(64) ) return 0; @@ -919,6 +928,14 @@ static int __init add_ext_regions(unsigned long s, unsigned long e, void *data) return 0; } +/* + * Find unused regions of Host address space which can be exposed to Dom0 + * as extended regions for the special memory mappings. In order to calculate + * regions we exclude every region assigned to Dom0 from the Host RAM: + * - domain RAM + * - reserved-memory + * - grant table space + */ static int __init find_unallocated_memory(const struct kernel_info *kinfo, struct meminfo *ext_regions) { @@ -942,7 +959,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, res = rangeset_add_range(unalloc_mem, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to add: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -956,7 +973,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, res = rangeset_remove_range(unalloc_mem, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -971,7 +988,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, res = rangeset_remove_range(unalloc_mem, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -983,7 +1000,7 @@ static int __init find_unallocated_memory(const struct kernel_info *kinfo, res = rangeset_remove_range(unalloc_mem, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -1003,6 +1020,35 @@ out: return res; } +static int __init handle_pci_range(const struct dt_device_node *dev, + u64 addr, u64 len, void *data) +{ + struct rangeset *mem_holes = data; + paddr_t start, end; + int res; + + start = addr & PAGE_MASK; + end = PAGE_ALIGN(addr + len); + res = rangeset_remove_range(mem_holes, start, end - 1); + if ( res ) + { + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", + start, end); + return res; + } + + return 0; +} + +/* + * Find the holes in the Host DT which can be exposed to Dom0 as extended + * regions for the special memory mappings. In order to calculate regions + * we exclude every addressable memory region described by "reg" and "ranges" + * properties from the maximum possible addressable physical memory range: + * - MMIO + * - Host RAM + * - PCI aperture + */ static int __init find_memory_holes(const struct kernel_info *kinfo, struct meminfo *ext_regions) { @@ -1024,7 +1070,7 @@ static int __init find_memory_holes(const struct kernel_info *kinfo, res = rangeset_add_range(mem_holes, start, end); if ( res ) { - printk(XENLOG_ERR "Failed to add: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to add: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } @@ -1055,49 +1101,25 @@ static int __init find_memory_holes(const struct kernel_info *kinfo, res = rangeset_remove_range(mem_holes, start, end - 1); if ( res ) { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", + printk(XENLOG_ERR "Failed to remove: %#"PRIpaddr"->%#"PRIpaddr"\n", start, end); goto out; } } - if ( dt_device_type_is_equal(np, "pci" ) ) + if ( dt_device_type_is_equal(np, "pci") ) { - unsigned int range_size, nr_ranges; - int na, ns, pna; - const __be32 *ranges; - u32 len; - /* - * Looking for non-empty ranges property which in this context - * describes the PCI host bridge aperture. + * The ranges property in this context describes the PCI host + * bridge aperture. It shall be absent if no addresses are mapped + * through the bridge. */ - ranges = dt_get_property(np, "ranges", &len); - if ( !ranges || !len ) + if ( !dt_get_property(np, "ranges", NULL) ) continue; - pna = dt_n_addr_cells(np); - na = dt_child_n_addr_cells(np); - ns = dt_child_n_size_cells(np); - range_size = pna + na + ns; - nr_ranges = len / sizeof(__be32) / range_size; - - for ( i = 0; i < nr_ranges; i++, ranges += range_size ) - { - /* Skip the child address and get the parent (CPU) address */ - addr = dt_read_number(ranges + na, pna); - size = dt_read_number(ranges + na + pna, ns); - - start = addr & PAGE_MASK; - end = PAGE_ALIGN(addr + size); - res = rangeset_remove_range(mem_holes, start, end - 1); - if ( res ) - { - printk(XENLOG_ERR "Failed to remove: %#"PRIx64"->%#"PRIx64"\n", - start, end); - goto out; - } - } + res = dt_for_each_range(np, &handle_pci_range, mem_holes); + if ( res ) + goto out; } } @@ -1152,12 +1174,12 @@ static int __init make_hypervisor_node(struct domain *d, if ( !opt_ext_regions ) { - printk(XENLOG_DEBUG "The extended regions support is disabled\n"); + printk(XENLOG_INFO "The extended regions support is disabled\n"); nr_ext_regions = 0; } else if ( is_32bit_domain(d) ) { - printk(XENLOG_DEBUG "The extended regions are only supported for 64-bit guest currently\n"); + printk(XENLOG_WARNING "The extended regions are only supported for 64-bit guest currently\n"); nr_ext_regions = 0; } else @@ -1193,8 +1215,8 @@ static int __init make_hypervisor_node(struct domain *d, u64 start = ext_regions->bank[i].start; u64 size = ext_regions->bank[i].size; - dt_dprintk("Extended region %d: %#"PRIx64"->%#"PRIx64"\n", - i, start, start + size); + printk("Extended region %d: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); dt_child_set_range(&cells, addrcells, sizecells, start, size); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Oct 09 15:44:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 Oct 2021 15:44:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205187.360437 (Exim 4.92) (envelope-from ) id 1mZEW3-0003wj-3R; Sat, 09 Oct 2021 15:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205187.360437; Sat, 09 Oct 2021 15:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZEW3-0003wb-0M; Sat, 09 Oct 2021 15:44:03 +0000 Received: by outflank-mailman (input) for mailman id 205187; Sat, 09 Oct 2021 15:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZEW1-0003wV-Nx for xen-changelog@lists.xenproject.org; Sat, 09 Oct 2021 15:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZEW1-00068L-N5 for xen-changelog@lists.xenproject.org; Sat, 09 Oct 2021 15:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZEW1-0005BC-M5 for xen-changelog@lists.xenproject.org; Sat, 09 Oct 2021 15:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ezOEyBy7yAZme2LSwoyRIBeWbeYuzIaKnSKyU3iEHKE=; b=rR2QiFacxMXNbS8IZeshGJx09t 1+3WbAFygRgvvrmlX4QMig6jFJ/B0p4HgBEt3AWirCfUwRDIa6C1t+A9u6uShC8Wc+hIiqDVlQeEj sSwxJBxZz4SxACgFzRI/ddJhsrwHHi5qyUi4oRBe0kb20TTksVn9bn/V1igfGGi8h9ro=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Build with BRANCH_HARDEN lfences by default Message-Id: Date: Sat, 09 Oct 2021 15:44:01 +0000 commit b11380f6cd58ce40422473262b2b4c2b210447a1 Author: Andrew Cooper AuthorDate: Mon Oct 4 21:39:03 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Oct 8 18:52:22 2021 +0100 x86/spec-ctrl: Build with BRANCH_HARDEN lfences by default Branch Harden is enabled by default at compile and boot time. Invert the logic to compile with lfence by default and nop out in the non-default case. This has several advantages. It removes 3829 patch points (in the random build of Xen I have to hand) by default on boot, 70% (!) of the .altinstr_replacement section. For builds of Xen with a non-nops capable tool chain, the code after `spec-ctrl=no-branch-harden` is better because Xen can write long nops. Most importantly however, it means the disassembly actually matches what runs in the common case, with the ability to distinguish the lfences from other uses of nops. Finally, make opt_branch_harden local to spec_ctrl.c and __initdata. It has never been used externally, even at it's introduction in c/s 3860d5534df4 "spec: add l1tf-barrier". Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/spec_ctrl.c | 7 ++++--- xen/include/asm-x86/cpufeatures.h | 2 +- xen/include/asm-x86/nospec.h | 2 +- xen/include/asm-x86/spec_ctrl.h | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 16d2a1d172..a5569c7f2b 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -52,7 +52,7 @@ bool __read_mostly opt_ibpb = true; bool __read_mostly opt_ssbd = false; int8_t __read_mostly opt_eager_fpu = -1; int8_t __read_mostly opt_l1d_flush = -1; -bool __read_mostly opt_branch_harden = true; +static bool __initdata opt_branch_harden = true; bool __initdata bsp_delay_spec_ctrl; uint8_t __read_mostly default_xen_spec_ctrl; @@ -1121,8 +1121,9 @@ void __init init_speculation_mitigations(void) else if ( opt_l1d_flush == -1 ) opt_l1d_flush = cpu_has_bug_l1tf && !(caps & ARCH_CAPS_SKIP_L1DFL); - if ( opt_branch_harden ) - setup_force_cpu_cap(X86_FEATURE_SC_BRANCH_HARDEN); + /* We compile lfence's in by default, and nop them out if requested. */ + if ( !opt_branch_harden ) + setup_force_cpu_cap(X86_FEATURE_SC_NO_BRANCH_HARDEN); /* * We do not disable HT by default on affected hardware. diff --git a/xen/include/asm-x86/cpufeatures.h b/xen/include/asm-x86/cpufeatures.h index 72beb7babc..b10154fc44 100644 --- a/xen/include/asm-x86/cpufeatures.h +++ b/xen/include/asm-x86/cpufeatures.h @@ -27,7 +27,7 @@ XEN_CPUFEATURE(XEN_SMAP, X86_SYNTH(11)) /* SMAP gets used by Xen itself /* Bit 12 - unused. */ XEN_CPUFEATURE(IND_THUNK_LFENCE, X86_SYNTH(13)) /* Use IND_THUNK_LFENCE */ XEN_CPUFEATURE(IND_THUNK_JMP, X86_SYNTH(14)) /* Use IND_THUNK_JMP */ -XEN_CPUFEATURE(SC_BRANCH_HARDEN, X86_SYNTH(15)) /* Conditional Branch Hardening */ +XEN_CPUFEATURE(SC_NO_BRANCH_HARDEN, X86_SYNTH(15)) /* (Disable) Conditional branch hardening */ XEN_CPUFEATURE(SC_MSR_PV, X86_SYNTH(16)) /* MSR_SPEC_CTRL used by Xen for PV */ XEN_CPUFEATURE(SC_MSR_HVM, X86_SYNTH(17)) /* MSR_SPEC_CTRL used by Xen for HVM */ XEN_CPUFEATURE(SC_RSB_PV, X86_SYNTH(18)) /* RSB overwrite needed for PV */ diff --git a/xen/include/asm-x86/nospec.h b/xen/include/asm-x86/nospec.h index f6eb84eee5..5312ae4c6f 100644 --- a/xen/include/asm-x86/nospec.h +++ b/xen/include/asm-x86/nospec.h @@ -10,7 +10,7 @@ static always_inline bool barrier_nospec_true(void) { #ifdef CONFIG_SPECULATIVE_HARDEN_BRANCH - alternative("", "lfence", X86_FEATURE_SC_BRANCH_HARDEN); + alternative("lfence", "", X86_FEATURE_SC_NO_BRANCH_HARDEN); #endif return true; } diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h index e671b6fd8d..a803d16f90 100644 --- a/xen/include/asm-x86/spec_ctrl.h +++ b/xen/include/asm-x86/spec_ctrl.h @@ -37,7 +37,6 @@ extern bool opt_ibpb; extern bool opt_ssbd; extern int8_t opt_eager_fpu; extern int8_t opt_l1d_flush; -extern bool opt_branch_harden; extern bool bsp_delay_spec_ctrl; extern uint8_t default_xen_spec_ctrl; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 10 06:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Oct 2021 06:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205249.360498 (Exim 4.92) (envelope-from ) id 1mZSZ1-00030v-AZ; Sun, 10 Oct 2021 06:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205249.360498; Sun, 10 Oct 2021 06:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZ1-00030m-6i; Sun, 10 Oct 2021 06:44:03 +0000 Received: by outflank-mailman (input) for mailman id 205249; Sun, 10 Oct 2021 06:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSYz-00030g-Sf for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSYz-0005Oc-Qc for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZSYz-0003I2-PV for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1UDtXc/X4L/H1Fy4wJz4YceHXLby2kjIL3buO5hCuPY=; b=zR2NqZJx/JHFPOwWsy/HRYCK9I 58j6DxbFTrdLIx5dVyW0NhNlFp0WPvLRjmeFe1M3fBxGHhNciKWkVElBPZLofKY8Uujc059Se8qcF RsatahgYmH4cQjHXJ5XN+oKuJQ8j0SIr2Ave0d+3PEbe7Xpcq5lYM+Z1cc7tkAfqqaBc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add new device type for PCI Message-Id: Date: Sun, 10 Oct 2021 06:44:01 +0000 commit 305f19306b4f16448a53ceebe6e6aa19513738ed Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 15:38:17 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:38:17 2021 -0700 xen/arm: Add new device type for PCI Add new device type (DEV_PCI) to distinguish PCI devices from platform DT devices, so some drivers, like IOMMU, can handle PCI devices differently. Also add a helper which is when given a struct device returns the corresponding struct pci_dev which this device is a part of. Because of the header cross-dependencies, e.g. we need both struct pci_dev and struct arch_pci_dev at the same time, this cannot be done with an inline. Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/pci.c | 7 +++++++ xen/include/asm-arm/device.h | 4 ++-- xen/include/asm-arm/pci.h | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index 73540045d1..138da19284 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -27,6 +27,13 @@ int arch_pci_clean_pirqs(struct domain *d) return 0; } +struct pci_dev *dev_to_pci(struct device *dev) +{ + ASSERT(dev->type == DEV_PCI); + + return container_of(dev, struct pci_dev, arch.dev); +} + static int __init dt_pci_init(void) { struct dt_device_node *np; diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index ebe84ea853..7bf0405603 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -4,6 +4,7 @@ enum device_type { DEV_DT, + DEV_PCI, }; struct dev_archdata { @@ -25,8 +26,7 @@ typedef struct device device_t; #include -/* TODO: Correctly implement dev_is_pci when PCI is supported on ARM */ -#define dev_is_pci(dev) ((void)(dev), 0) +#define dev_is_pci(dev) ((dev)->type == DEV_PCI) #define dev_is_dt(dev) ((dev)->type == DEV_DT) enum device_class diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index f5a5f15e3b..8551704de3 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -26,6 +26,13 @@ struct arch_pci_dev { struct device dev; }; +/* + * Because of the header cross-dependencies, e.g. we need both + * struct pci_dev and struct arch_pci_dev at the same time, this cannot be + * done with an inline here. Macro can be implemented, but looks scary. + */ +struct pci_dev *dev_to_pci(struct device *dev); + /* * struct to hold the mappings of a config space window. This * is expected to be used as sysdata for PCI controllers that -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 10 06:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Oct 2021 06:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205250.360501 (Exim 4.92) (envelope-from ) id 1mZSZB-00032q-B9; Sun, 10 Oct 2021 06:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205250.360501; Sun, 10 Oct 2021 06:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZB-00032i-8M; Sun, 10 Oct 2021 06:44:13 +0000 Received: by outflank-mailman (input) for mailman id 205250; Sun, 10 Oct 2021 06:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZ9-00032Z-V9 for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZ9-0005Oj-UM for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZSZ9-0003Iy-TD for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tkYgRAy0lsYSrJhgP6AT5EKBw8X9VVWT+LatDvKP9Qs=; b=uUoZz3En3CBdRIKcN/zofc+asW 91uphb58PZiZFmFkpezZmC4prawBCPb3EYuDt+G+2jYAZDa7PoyaaQ5hsohEVK4bx4xkirzefo23R QrnohZLlDvko64ROf7cmGk+oxeq366vuKdcxPOPnpXplgVPZsYWbqzHAtKthATYak4tc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Introduce pci_find_host_bridge_node helper Message-Id: Date: Sun, 10 Oct 2021 06:44:11 +0000 commit 8858dfac1d83acd1b28643c616318631e3a4134d Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 15:43:26 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:43:26 2021 -0700 xen/arm: Introduce pci_find_host_bridge_node helper Get host bridge node given a PCI device attached to it. This helper will be re-used for adding PCI devices by the subsequent patches. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/pci-host-common.c | 16 ++++++++++++++++ xen/include/asm-arm/pci.h | 1 + 2 files changed, 17 insertions(+) diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index c5941b10e9..af208e7298 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -236,6 +236,22 @@ err_exit: return err; } +/* + * Get host bridge node given a device attached to it. + */ +struct dt_device_node *pci_find_host_bridge_node(struct device *dev) +{ + struct pci_host_bridge *bridge; + struct pci_dev *pdev = dev_to_pci(dev); + + bridge = pci_find_host_bridge(pdev->seg, pdev->bus); + if ( unlikely(!bridge) ) + { + printk(XENLOG_ERR "Unable to find PCI bridge for %pp\n", &pdev->sbdf); + return NULL; + } + return bridge->dt_node; +} /* * This function will lookup an hostbridge based on the segment and bus * number. diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index 8551704de3..ed76508002 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -89,6 +89,7 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where); struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); +struct dt_device_node *pci_find_host_bridge_node(struct device *dev); static always_inline bool is_pci_passthrough_enabled(void) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 10 06:44:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Oct 2021 06:44:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205251.360507 (Exim 4.92) (envelope-from ) id 1mZSZL-00035f-DY; Sun, 10 Oct 2021 06:44:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205251.360507; Sun, 10 Oct 2021 06: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 1mZSZL-00035X-A0; Sun, 10 Oct 2021 06:44:23 +0000 Received: by outflank-mailman (input) for mailman id 205251; Sun, 10 Oct 2021 06:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZK-00035I-2R for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZK-0005PD-1b for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZSZK-0003Jr-0j for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06: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=FiGTex2TekkRPfsAhPTponkVO0F6FcBIRL1YjDiLTwg=; b=m+qGUSSud+UreLZls3qHdN5JYM d2tEmLDrIccEaOj67IEiUQI5a7opku7qUmRgnyIoHxMQEEXAQMJbam711bnxzBuosAuv0FpMLl9Rr bfM0mBhbGgEmbVxbh6Ky1GYh8X/nwHlTnBj9zS4gryIJWVoXAzgt7YkMOTT49r2EUcko=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/device-tree: Make dt_find_node_by_phandle global Message-Id: Date: Sun, 10 Oct 2021 06:44:22 +0000 commit 86e84e59bd77b69de5736ee00a679fba5ce9df5c Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 08:55:28 2021 +0300 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:45:44 2021 -0700 xen/device-tree: Make dt_find_node_by_phandle global Make dt_find_node_by_phandle globally visible, so it can be re-used by other frameworks. Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/common/device_tree.c | 2 +- xen/include/xen/device_tree.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index ea93da1725..4aae281e89 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1047,7 +1047,7 @@ int dt_for_each_range(const struct dt_device_node *dev, * * Returns a node pointer. */ -static struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle) +struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle) { struct dt_device_node *np; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 2297c59ce6..fd6cd00b43 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -849,6 +849,8 @@ int dt_count_phandle_with_args(const struct dt_device_node *np, */ int dt_get_pci_domain_nr(struct dt_device_node *node); +struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle); + #ifdef CONFIG_DEVICE_TREE_DEBUG #define dt_dprintk(fmt, args...) \ printk(XENLOG_DEBUG fmt, ## args) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 10 06:44:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Oct 2021 06:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205252.360510 (Exim 4.92) (envelope-from ) id 1mZSZV-00038r-Ek; Sun, 10 Oct 2021 06:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205252.360510; Sun, 10 Oct 2021 06: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 1mZSZV-00038i-Ba; Sun, 10 Oct 2021 06:44:33 +0000 Received: by outflank-mailman (input) for mailman id 205252; Sun, 10 Oct 2021 06:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZU-00038R-5n for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZU-0005PR-51 for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZSZU-0003Kc-42 for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06: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=MFd/aJjqFjrnbYE6JVEcBk2bXEGFsUS4yVNU3x0mlbQ=; b=XhUhFiTwED+tmJ8xhARM0smzjE jXfBT1d/VQ+1FfadrRKxK7knsmUtDkrUGmL3XoKaFginSTH4GvX8RyCzeqIhtnDIvLFEaXwFOYTd1 SsN+G1R9VqgXU7psRQDZ7/uCLZqJCTnr1Zvg8Cf8hhD7dahrFFENE7nJPXjyqEypHUXw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Mark device as PCI while creating one Message-Id: Date: Sun, 10 Oct 2021 06:44:32 +0000 commit e17abb28e80043346752f1e2b59ed34806c2144d Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 15:48:31 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:48:31 2021 -0700 xen/arm: Mark device as PCI while creating one While adding a PCI device mark it as such, so other frameworks can distinguish it from DT devices. For that introduce an architecture defined helper which may perform additional initialization of the newly created PCI device. Signed-off-by: Oleksandr Andrushchenko [applicable parts] Acked-by: Jan Beulich Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/pci.c | 5 +++++ xen/drivers/passthrough/pci.c | 2 ++ xen/include/asm-arm/pci.h | 7 +++++++ xen/include/asm-x86/pci.h | 2 ++ 4 files changed, 16 insertions(+) diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index 138da19284..082c14e127 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -34,6 +34,11 @@ struct pci_dev *dev_to_pci(struct device *dev) return container_of(dev, struct pci_dev, arch.dev); } +void arch_pci_init_pdev(struct pci_dev *pdev) +{ + pci_to_dev(pdev)->type = DEV_PCI; +} + static int __init dt_pci_init(void) { struct dt_device_node *np; diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index e1b735d9e8..3aa8c3175f 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -329,6 +329,8 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) *((u8*) &pdev->devfn) = devfn; pdev->domain = NULL; + arch_pci_init_pdev(pdev); + rc = pdev_msi_init(pdev); if ( rc ) { diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index ed76508002..00ccc3161b 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -95,6 +95,9 @@ static always_inline bool is_pci_passthrough_enabled(void) { return pci_passthrough_enabled; } + +void arch_pci_init_pdev(struct pci_dev *pdev); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; @@ -104,5 +107,9 @@ static always_inline bool is_pci_passthrough_enabled(void) return false; } +struct pci_dev; + +static inline void arch_pci_init_pdev(struct pci_dev *pdev) {} + #endif /*!CONFIG_HAS_PCI*/ #endif /* __ARM_PCI_H__ */ diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index e076951032..edd7c3e71a 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -38,4 +38,6 @@ static always_inline bool is_pci_passthrough_enabled(void) return true; } +static inline void arch_pci_init_pdev(struct pci_dev *pdev) {} + #endif /* __X86_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 10 06:44:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Oct 2021 06:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205253.360514 (Exim 4.92) (envelope-from ) id 1mZSZf-0003CA-Fz; Sun, 10 Oct 2021 06:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205253.360514; Sun, 10 Oct 2021 06: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 1mZSZf-0003C2-D5; Sun, 10 Oct 2021 06:44:43 +0000 Received: by outflank-mailman (input) for mailman id 205253; Sun, 10 Oct 2021 06:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZe-0003Bl-92 for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZe-0005Pj-8K for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZSZe-0003Le-7O for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06: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=xEWPskEwwGruL/1bXI7O/IeyTHJeInIOQhyiE1YlNnw=; b=upBcuN9BurEin4fhvvOsaoZhYg NbqecGolQW1WN3lCi+qFXSUAM0xQt1F8vl0/X8HRVfCKBYE3R30krNECP8r7OnFNihrTaDVoPxNsn 3IUsh30POZmg81hiIp28YsXK+8kyp9rywfOVsuK6yyPXIzEUX61+k+3iQcchiA8G/9Vo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/domain: Call pci_release_devices() when releasing domain resources Message-Id: Date: Sun, 10 Oct 2021 06:44:42 +0000 commit d4c9845e52cbb3cd62172809f62ee51dbb3ca7de Author: Oleksandr Tyshchenko AuthorDate: Fri Oct 8 08:55:30 2021 +0300 Commit: Stefano Stabellini CommitDate: Fri Oct 8 15:50:55 2021 -0700 xen/domain: Call pci_release_devices() when releasing domain resources This is the very same that we already do for DT devices. Moreover, x86 already calls pci_release_devices(). Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/domain.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 36138c1b2e..aae4472479 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -981,7 +981,8 @@ static int relinquish_memory(struct domain *d, struct page_list_head *list) * function which may return -ERESTART. */ enum { - PROG_tee = 1, + PROG_pci = 1, + PROG_tee, PROG_xen, PROG_page, PROG_mapping, @@ -1018,6 +1019,12 @@ int domain_relinquish_resources(struct domain *d) #ifdef CONFIG_IOREQ_SERVER ioreq_server_destroy_all(d); #endif +#ifdef CONFIG_HAS_PCI + PROGRESS(pci): + ret = pci_release_devices(d); + if ( ret ) + return ret; +#endif PROGRESS(tee): ret = tee_relinquish_resources(d); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 10 06:44:53 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 Oct 2021 06:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205254.360519 (Exim 4.92) (envelope-from ) id 1mZSZp-0003Ev-Hu; Sun, 10 Oct 2021 06:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205254.360519; Sun, 10 Oct 2021 06: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 1mZSZp-0003En-Eb; Sun, 10 Oct 2021 06:44:53 +0000 Received: by outflank-mailman (input) for mailman id 205254; Sun, 10 Oct 2021 06:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZo-0003Ed-CC for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZSZo-0005Ps-BV for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZSZo-0003Mi-Ah for xen-changelog@lists.xenproject.org; Sun, 10 Oct 2021 06: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=d8+sUim8xoedaNese0q8q7LeLk14jhuln09WKf2Ajo4=; b=sY0Ju/aV8FERtq63visUEhLVsi Wdxru2+gz+C4tmKVXmGyGOs8kyKAo5hj8DHKR1+YIQ0FpEf0GUJAOXnjygS2tBCqZ53OjNGUY6xWd JkyMJTX/hLlvydSIA1hBjfgm864BhBQp5zUWkfByhhx8F4k6VZVPiHXuIh4C4hY0uFns=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: optee: fix possible memory leaks Message-Id: Date: Sun, 10 Oct 2021 06:44:52 +0000 commit 664cc3c3d381e4f9a61dcb68cbd7a6a00070370e Author: Volodymyr Babchuk AuthorDate: Thu Oct 7 23:25:02 2021 +0000 Commit: Stefano Stabellini CommitDate: Fri Oct 8 16:02:13 2021 -0700 xen/arm: optee: fix possible memory leaks translate_noncontig() allocates domheap page for translated list before calling to allocate_optee_shm_buf(), which can fail for number of reason. Anyways, after fail we need to free the allocated page(s). Another leak is possible if the same translate_noncontig() function fails to get domain page. In this case it should free allocated optee_shm_buf prior exit. This will also free allocated domheap page. Signed-off-by: Volodymyr Babchuk Acked-by: Stefano Stabellini --- xen/arch/arm/tee/optee.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index 6df0d44eb9..131d2f9a8a 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -781,7 +781,10 @@ static int translate_noncontig(struct optee_domain *ctx, optee_shm_buf = allocate_optee_shm_buf(ctx, param->u.tmem.shm_ref, pg_count, xen_pgs, order); if ( IS_ERR(optee_shm_buf) ) + { + free_domheap_pages(xen_pgs, order); return PTR_ERR(optee_shm_buf); + } gfn = gaddr_to_gfn(param->u.tmem.buf_ptr & ~(OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1)); @@ -807,7 +810,7 @@ static int translate_noncontig(struct optee_domain *ctx, { guest_pg = get_domain_ram_page(gfn); if ( !guest_pg ) - return -EINVAL; + goto free_shm_buf; guest_data = __map_domain_page(guest_pg); xen_data = __map_domain_page(xen_pgs); @@ -854,6 +857,7 @@ err_unmap: unmap_domain_page(guest_data); unmap_domain_page(xen_data); put_page(guest_pg); +free_shm_buf: free_optee_shm_buf(ctx, optee_shm_buf->cookie); return -EINVAL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Oct 11 09:11:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Oct 2021 09:11:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205563.360899 (Exim 4.92) (envelope-from ) id 1mZrKr-0006cN-Le; Mon, 11 Oct 2021 09:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205563.360899; Mon, 11 Oct 2021 09:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrKr-0006cF-Im; Mon, 11 Oct 2021 09:11:05 +0000 Received: by outflank-mailman (input) for mailman id 205563; Mon, 11 Oct 2021 09:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrKq-0006c9-9R for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrKq-0001Mm-8g for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZrKq-0005kG-7c for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oUTugXoXlim3t9CJJ/BE0SESUSxhWX3n6xc6NU4H5ZM=; b=O+kDGeaU7ei7hFW9M9dtR3P1F8 xBJQcAL2IvFuClvieHxPVwUiry+0K1JJDiIGsTenSRWibkfZvCaFG1chotzTT9gFabq1EafEkt6ql 1JKlTo28MKq54IggBLBaCwXEdkIKPv2UTuvi6KJXazLamqG12b6SigV2V6r7RoTH2Two=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion Message-Id: Date: Mon, 11 Oct 2021 09:11:04 +0000 commit 24b0ce9a5da2e648cde818055a085bcbcf24ecb0 Author: Jan Beulich AuthorDate: Mon Oct 11 10:58:17 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 11 10:58:17 2021 +0200 x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion The xen-syms and xen.efi linking steps are serialized only when the intermediate note.o file is necessary. Otherwise both may run in parallel. This in turn means that the compiler / linker invocations to create efi/check.o / efi/check.efi may also happen twice in parallel. Obviously it's a bad idea to have multiple producers of the same output race with one another - every once in a while one may e.g. observe objdump: efi/check.efi: file format not recognized We don't need this EFI related checking to occur when producing the intermediate symbol and relocation table objects, and we have an easy way of suppressing it: Simply pass in "efi-y=", overriding the assignments done in the Makefile and thus forcing the tool chain checks to be bypassed. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 82dd4e18bd..69b6cfaded 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -181,13 +181,13 @@ $(TARGET)-syms: prelink.o xen.lds $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort \ >$(@D)/.$(@F).0.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \ >$(@D)/.$(@F).1.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ @@ -248,14 +248,14 @@ endif $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Oct 11 09:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Oct 2021 09:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205564.360904 (Exim 4.92) (envelope-from ) id 1mZrL1-0006dx-N7; Mon, 11 Oct 2021 09:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205564.360904; Mon, 11 Oct 2021 09:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrL1-0006dp-KF; Mon, 11 Oct 2021 09:11:15 +0000 Received: by outflank-mailman (input) for mailman id 205564; Mon, 11 Oct 2021 09:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrL0-0006df-Cn for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrL0-0001Mq-C0 for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZrL0-0005lG-At for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Fx19PgYSJccv5PSfF3xDGpNf4gwPjvqDcJqPZ8Bm+Ps=; b=JqAAbzwAeEHmqpbIXpth6YcmxC tUBe15zGGqtQnOU8HP5ZCcfwvH4v4ryrffd0WfrN0yQQJnyDDVMvTTFSPNJ7TKZx2/uS64e0YX/nR Y9JOixiH6kqQNB8YEFFwby3bTIAlNBR6wM/fu1OXzjDb6dgPILPKF8TRgZ0q8IAYuBKg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: fix xsm_op for 32-bit guests Message-Id: Date: Mon, 11 Oct 2021 09:11:14 +0000 commit b6b672e8a925ff4b71a1a67bc7d213ef445af74f Author: Jan Beulich AuthorDate: Mon Oct 11 10:58:44 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 11 10:58:44 2021 +0200 x86/HVM: fix xsm_op for 32-bit guests Like for PV, 32-bit guests need to invoke the compat handler, not the native one. Fixes: db984809d61b ("hvm: wire up domctl and xsm hypercalls") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hypercall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 261d8ee8a4..122abf80de 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -138,7 +138,7 @@ static const struct { HYPERCALL(event_channel_op), COMPAT_CALL(sched_op), COMPAT_CALL(set_timer_op), - HYPERCALL(xsm_op), + COMPAT_CALL(xsm_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), HYPERCALL(domctl), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Oct 11 09:11:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Oct 2021 09:11:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205565.360908 (Exim 4.92) (envelope-from ) id 1mZrLB-0006g7-Ok; Mon, 11 Oct 2021 09:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205565.360908; Mon, 11 Oct 2021 09:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrLB-0006fx-Le; Mon, 11 Oct 2021 09:11:25 +0000 Received: by outflank-mailman (input) for mailman id 205565; Mon, 11 Oct 2021 09:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrLA-0006fl-Kc for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZrLA-0001NJ-FE for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZrLA-0005lz-E9 for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 09:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RBqX1jTAGJ4ZXi7ly6huWzE3yE75Rq8GohakjYS9I/I=; b=l/FKurgqoElqvEHoifqL3uB5Mq XexHMKjXJBjeF9VbfgLeCG7CZUsajAfmcEkGhOOIHWZHJwhg0rwQD7S9A+HBEM1FXWLF5ZoRgmn1a n9twe81RuuaZAkUVqzig1bfY0s9aDM5vNx0MF/rJhFOiLyFOxbF0YSEdT6kwIjuCR/yU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs: add references to Argo Linux driver sources and information Message-Id: Date: Mon, 11 Oct 2021 09:11:24 +0000 commit 2fac4e3ea3bb301f87426e24b9dfd765c22c9cf9 Author: Christopher Clark AuthorDate: Mon Oct 11 10:59:55 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 11 10:59:55 2021 +0200 docs: add references to Argo Linux driver sources and information Add a section to the Argo design document to supply guidance on how to enable Argo in Xen and where to obtain source code and documentation for Argo device drivers for guest OSes, primarily from OpenXT. Signed-off-by: Christopher Clark Reviewed-by: Bertrand Marquis --- docs/designs/argo.pandoc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/docs/designs/argo.pandoc b/docs/designs/argo.pandoc index 2ce253b654..e18aacea7c 100644 --- a/docs/designs/argo.pandoc +++ b/docs/designs/argo.pandoc @@ -439,6 +439,51 @@ that teardown of any domain will not interfere with any Argo hypercall operation. It enables introducing granular locking without complex or error-prone lock acquisition logic. +# Related Material + +## Enabling Argo in Xen + +To enable Argo in a build of the Xen hypervisor, please ensure that +CONFIG_ARGO is enabled in the Xen hypervisor build configuration file. + +To make Argo available for use at runtime on a Xen system, please see the +Argo settings in the Xen command line documentation. + +## Linux Argo drivers + +A Linux kernel device driver for Argo and corresponding Linux userspace +software, libargo, that utilizes it for interdomain communication between +application level software is available and maintained by the OpenXT Project, +at: + +https://github.com/OpenXT/linux-xen-argo + +The repository contains the primary Linux kernel Argo driver, which is derived +from the original XenClient v4v driver. The document at the following link +describes planning and design notes from OpenXT community discussion for +improvements to the driver: + +https://openxt.atlassian.net/wiki/spaces/DC/pages/775389197/New+Linux+Driver+for+Argo + +An alternative Linux Argo driver is also available in the same repository, +implemented to explore a different approach for Linux to use the Argo +primitives under the Vsock address family to allow socket communication between +Xen domains. + +## v4v drivers + +A Windows driver for v4v has previously been used in XenClient and OpenXT +which could be ported to Argo. It may require update for compatibility with +recent versions of Windows software. + +https://github.com/OpenXT/xc-windows/tree/master/xenv4v + +The Linux, Windows and OSX guest tools for the Open Source HP uxen hypervisor +contain drivers for v4v which are relevant as code bases of interest for +porting or developing new guest OS drivers for Argo. + +https://github.com/uxen-virt/uxen/tree/ascara/vm-support + # Future Work - Performance measurement and optimization -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Oct 11 11:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 Oct 2021 11:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.205785.361179 (Exim 4.92) (envelope-from ) id 1mZtCz-0006q6-Qb; Mon, 11 Oct 2021 11:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 205785.361179; Mon, 11 Oct 2021 11:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZtCz-0006py-Ni; Mon, 11 Oct 2021 11:11:05 +0000 Received: by outflank-mailman (input) for mailman id 205785; Mon, 11 Oct 2021 11:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZtCy-0006pq-7c for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 11:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mZtCy-0003Yh-67 for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 11:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mZtCy-0003aV-53 for xen-changelog@lists.xenproject.org; Mon, 11 Oct 2021 11:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wRLf6tpIs5Gy3q5Nsp21lTn/ubRgXG1tKG8moxRpqgc=; b=ThebX7wnzPAChs7E+CmTojBmST FzbonQ64/3YuOc7WAbQR+1KPnfC0KvT3DczS8kecYI6hlBPHgNvsVHx1NnG5xrb8+LjlJmZK9Vu3V v1Yu0GiWyeJW9iOYhuV4nkm0GV4/lpLM8LzWwilt/zATmlvU21bvUWtEg288s1K5WjZg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/console: use xenforeigmemory to map console ring Message-Id: Date: Mon, 11 Oct 2021 11:11:04 +0000 commit e8b42a4e8810844ccffd2eab072921b1e4e2ed79 Author: Roger Pau Monne AuthorDate: Wed Sep 22 10:21:18 2021 +0200 Commit: Ian Jackson CommitDate: Mon Oct 11 12:05:38 2021 +0100 tools/console: use xenforeigmemory to map console ring This patch replaces the usage of xc_map_foreign_range with xenforeignmemory_map from the stable xenforeignmemory library. Note there are still other uses of libxc functions which prevents removing the dependency. No functional change intended. Signed-off-by: Roger Pau Monné Reviewed-by: Ian Jackson --- tools/console/Makefile | 4 ++-- tools/console/daemon/io.c | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tools/console/Makefile b/tools/console/Makefile index 84796eac8f..3f4cddab03 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -29,9 +29,9 @@ clean: distclean: clean daemon/main.o: daemon/_paths.h -daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CONSOLE_CFLAGS-y) +daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CFLAGS_libxenforeignmemory) $(CONSOLE_CFLAGS-y) xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) - $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenforeignmemory) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) client/main.o: client/_paths.h xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 200b575d76..682c1f4008 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -22,6 +22,7 @@ #include "utils.h" #include "io.h" #include +#include #include #include #include @@ -73,6 +74,7 @@ static int log_time_guest_needts = 1; static int log_hv_fd = -1; static xengnttab_handle *xgt_handle = NULL; +static xenforeignmemory_handle *xfm_handle; static struct pollfd *fds; static unsigned int current_array_size; @@ -675,7 +677,7 @@ static void console_unmap_interface(struct console *con) if (xgt_handle && con->ring_ref == -1) xengnttab_unmap(xgt_handle, con->interface, 1); else - munmap(con->interface, XC_PAGE_SIZE); + xenforeignmemory_unmap(xfm_handle, con->interface, 1); con->interface = NULL; con->ring_ref = -1; } @@ -722,11 +724,12 @@ static int console_create_ring(struct console *con) con->ring_ref = -1; } if (!con->interface) { + xen_pfn_t pfn = ring_ref; + /* Fall back to xc_map_foreign_range */ - con->interface = xc_map_foreign_range( - xc, dom->domid, XC_PAGE_SIZE, - PROT_READ|PROT_WRITE, - (unsigned long)ring_ref); + con->interface = xenforeignmemory_map( + xfm_handle, dom->domid, PROT_READ|PROT_WRITE, 1, + &pfn, NULL); if (con->interface == NULL) { err = EINVAL; goto out; @@ -1341,6 +1344,14 @@ void handle_io(void) errno, strerror(errno)); } + xfm_handle = xenforeignmemory_open(NULL, 0); + if (xfm_handle == NULL) { + dolog(LOG_ERR, + "Failed to open xen foreign memory handle: %d (%s)", + errno, strerror(errno)); + goto out; + } + enum_domains(); for (;;) { @@ -1462,6 +1473,10 @@ void handle_io(void) xengnttab_close(xgt_handle); xgt_handle = NULL; } + if (xfm_handle != NULL) { + xenforeignmemory_close(xfm_handle); + xfm_handle = NULL; + } log_hv_evtchn = -1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 01:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 01:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.206639.362246 (Exim 4.92) (envelope-from ) id 1ma6Jq-0006pT-NC; Tue, 12 Oct 2021 01:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 206639.362246; Tue, 12 Oct 2021 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 1ma6Jq-0006pL-KE; Tue, 12 Oct 2021 01:11:02 +0000 Received: by outflank-mailman (input) for mailman id 206639; Tue, 12 Oct 2021 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 1ma6Jp-0006oz-J2 for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 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 1ma6Jp-00040X-IF for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ma6Jp-00055P-H9 for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 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=WAAUGa+o1BGXnBn8YWyHx25TFoWOW/gOCVqMEKA58yQ=; b=o2DqS3Q84IaBNsx2dzPBFNLwS7 hg6fT9lVqBTepEa3ZOzStZtoiotfLCoJQfdGu48PgeqNzvPImoLQbQuLQJx/NDS/IBM7yZRCKIoie q1S6OnwYZpC/4P/scch6wMYLrH4AC63xeBnMRCCJarqw1vYOWO2ctxsNBGDaIO/rcwW8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion Message-Id: Date: Tue, 12 Oct 2021 01:11:01 +0000 commit 24b0ce9a5da2e648cde818055a085bcbcf24ecb0 Author: Jan Beulich AuthorDate: Mon Oct 11 10:58:17 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 11 10:58:17 2021 +0200 x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion The xen-syms and xen.efi linking steps are serialized only when the intermediate note.o file is necessary. Otherwise both may run in parallel. This in turn means that the compiler / linker invocations to create efi/check.o / efi/check.efi may also happen twice in parallel. Obviously it's a bad idea to have multiple producers of the same output race with one another - every once in a while one may e.g. observe objdump: efi/check.efi: file format not recognized We don't need this EFI related checking to occur when producing the intermediate symbol and relocation table objects, and we have an easy way of suppressing it: Simply pass in "efi-y=", overriding the assignments done in the Makefile and thus forcing the tool chain checks to be bypassed. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 82dd4e18bd..69b6cfaded 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -181,13 +181,13 @@ $(TARGET)-syms: prelink.o xen.lds $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort \ >$(@D)/.$(@F).0.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \ >$(@D)/.$(@F).1.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ @@ -248,14 +248,14 @@ endif $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 01:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 01:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.206642.362250 (Exim 4.92) (envelope-from ) id 1ma6K0-0006wX-Oj; Tue, 12 Oct 2021 01:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 206642.362250; Tue, 12 Oct 2021 01:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6K0-0006wP-Ls; Tue, 12 Oct 2021 01:11:12 +0000 Received: by outflank-mailman (input) for mailman id 206642; Tue, 12 Oct 2021 01:11:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6Jz-0006vt-MJ for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:11:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6Jz-000429-LT for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:11:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ma6Jz-000568-KS for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:11:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5/qoPT/QkqqWrpAyWLNG/q5ivaiCL1GOh9PBSPBGQm0=; b=0UE501Ks3F5JhnWcNchpy+/cfL mWt2jMCL4m4YcLG0qYvSJSelpK/Psp+Byi6tvk5gfdSsNO5iYLfv1U3pkmP1VthkYzf0PZY8buMs4 TaUb/TDhh/7eMGyJK9S3ebdOdhMcScJkzEWdCYlwfHkzIr05btfjzKZimDVgc2wXmuWY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: fix xsm_op for 32-bit guests Message-Id: Date: Tue, 12 Oct 2021 01:11:11 +0000 commit b6b672e8a925ff4b71a1a67bc7d213ef445af74f Author: Jan Beulich AuthorDate: Mon Oct 11 10:58:44 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 11 10:58:44 2021 +0200 x86/HVM: fix xsm_op for 32-bit guests Like for PV, 32-bit guests need to invoke the compat handler, not the native one. Fixes: db984809d61b ("hvm: wire up domctl and xsm hypercalls") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hypercall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 261d8ee8a4..122abf80de 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -138,7 +138,7 @@ static const struct { HYPERCALL(event_channel_op), COMPAT_CALL(sched_op), COMPAT_CALL(set_timer_op), - HYPERCALL(xsm_op), + COMPAT_CALL(xsm_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), HYPERCALL(domctl), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 01:11:22 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 01:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.206645.362254 (Exim 4.92) (envelope-from ) id 1ma6KA-00076Y-QJ; Tue, 12 Oct 2021 01:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 206645.362254; Tue, 12 Oct 2021 01:11:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6KA-00076Q-NH; Tue, 12 Oct 2021 01:11:22 +0000 Received: by outflank-mailman (input) for mailman id 206645; Tue, 12 Oct 2021 01:11:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6K9-000763-PX for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:11:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6K9-00042R-Oh for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:11:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ma6K9-000573-Ni for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:11:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CMGpc8HqrNjz3eWy0zNJzChCso8/47stxUYmqp+WgVY=; b=NRHi9GN0FIHUs+pum2bSmMrQp8 xelz0uixeD775Pm3vln93qDuYPvvv1dRyooz6xeo7GGUpYo0/z+ph4ZNUkR46SE5AlTv1X5Gh4QRB fGVTupxLMPISiwT0JUjHG1sCEYXalfMgmxwpPby7ayc0MGpzjJvCz0NlTfM3MMmjIyno=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: add references to Argo Linux driver sources and information Message-Id: Date: Tue, 12 Oct 2021 01:11:21 +0000 commit 2fac4e3ea3bb301f87426e24b9dfd765c22c9cf9 Author: Christopher Clark AuthorDate: Mon Oct 11 10:59:55 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 11 10:59:55 2021 +0200 docs: add references to Argo Linux driver sources and information Add a section to the Argo design document to supply guidance on how to enable Argo in Xen and where to obtain source code and documentation for Argo device drivers for guest OSes, primarily from OpenXT. Signed-off-by: Christopher Clark Reviewed-by: Bertrand Marquis --- docs/designs/argo.pandoc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/docs/designs/argo.pandoc b/docs/designs/argo.pandoc index 2ce253b654..e18aacea7c 100644 --- a/docs/designs/argo.pandoc +++ b/docs/designs/argo.pandoc @@ -439,6 +439,51 @@ that teardown of any domain will not interfere with any Argo hypercall operation. It enables introducing granular locking without complex or error-prone lock acquisition logic. +# Related Material + +## Enabling Argo in Xen + +To enable Argo in a build of the Xen hypervisor, please ensure that +CONFIG_ARGO is enabled in the Xen hypervisor build configuration file. + +To make Argo available for use at runtime on a Xen system, please see the +Argo settings in the Xen command line documentation. + +## Linux Argo drivers + +A Linux kernel device driver for Argo and corresponding Linux userspace +software, libargo, that utilizes it for interdomain communication between +application level software is available and maintained by the OpenXT Project, +at: + +https://github.com/OpenXT/linux-xen-argo + +The repository contains the primary Linux kernel Argo driver, which is derived +from the original XenClient v4v driver. The document at the following link +describes planning and design notes from OpenXT community discussion for +improvements to the driver: + +https://openxt.atlassian.net/wiki/spaces/DC/pages/775389197/New+Linux+Driver+for+Argo + +An alternative Linux Argo driver is also available in the same repository, +implemented to explore a different approach for Linux to use the Argo +primitives under the Vsock address family to allow socket communication between +Xen domains. + +## v4v drivers + +A Windows driver for v4v has previously been used in XenClient and OpenXT +which could be ported to Argo. It may require update for compatibility with +recent versions of Windows software. + +https://github.com/OpenXT/xc-windows/tree/master/xenv4v + +The Linux, Windows and OSX guest tools for the Open Source HP uxen hypervisor +contain drivers for v4v which are relevant as code bases of interest for +porting or developing new guest OS drivers for Argo. + +https://github.com/uxen-virt/uxen/tree/ascara/vm-support + # Future Work - Performance measurement and optimization -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 01:33:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 01:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.206669.362291 (Exim 4.92) (envelope-from ) id 1ma6fB-0002IY-7u; Tue, 12 Oct 2021 01:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 206669.362291; Tue, 12 Oct 2021 01:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fB-0002IQ-4S; Tue, 12 Oct 2021 01:33:05 +0000 Received: by outflank-mailman (input) for mailman id 206669; Tue, 12 Oct 2021 01:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fA-0002II-Dj for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fA-0004O2-C2 for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ma6fA-0007Px-B1 for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WXEHrA8ZJkk1SF/+5rMBOA1y8OTg/f/zwqB3dEKysFg=; b=gFV+33XK+59RswVn0ahm7GDVN/ hyMW/u0x/WKKQb14UtFxLdk/nPl/KfAjL4SpROQ72MR5pxYJe8yITvDT8vqisP0B0vBjOrg7OOdY5 hNUPm0V81tHQZCtX543XL5e1fuA6lChx40wNADhQnBIoulECGhYZcGrKWhDvyCkHvQqo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Transitional change to build HAS_VPCI on ARM. Message-Id: Date: Tue, 12 Oct 2021 01:33:04 +0000 commit f38c8591351e29f70bdfeb7c5d360dea76fbe0a2 Author: Rahul Singh AuthorDate: Mon Oct 11 13:16:57 2021 -0700 Commit: Stefano Stabellini CommitDate: Mon Oct 11 13:16:57 2021 -0700 xen/arm: Transitional change to build HAS_VPCI on ARM. This patch will be reverted once we add support for VPCI MSI/MSIX support on ARM. Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/Makefile | 3 ++- xen/drivers/vpci/header.c | 2 ++ xen/include/asm-arm/pci.h | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/drivers/vpci/Makefile b/xen/drivers/vpci/Makefile index 55d1bdfda0..1a1413b93e 100644 --- a/xen/drivers/vpci/Makefile +++ b/xen/drivers/vpci/Makefile @@ -1 +1,2 @@ -obj-y += vpci.o header.o msi.o msix.o +obj-y += vpci.o header.o +obj-$(CONFIG_HAS_PCI_MSI) += msi.o msix.o diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ba9a036202..f8cd55e7c0 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -96,8 +96,10 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, * FIXME: punching holes after the p2m has been set up might be racy for * DomU usage, needs to be revisited. */ +#ifdef CONFIG_HAS_PCI_MSI if ( map && !rom_only && vpci_make_msix_hole(pdev) ) return; +#endif for ( i = 0; i < ARRAY_SIZE(header->bars); i++ ) { diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index 00ccc3161b..aa0762ff15 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -26,6 +26,14 @@ struct arch_pci_dev { struct device dev; }; +/* Arch-specific MSI data for vPCI. */ +struct vpci_arch_msi { +}; + +/* Arch-specific MSI-X entry data for vPCI. */ +struct vpci_arch_msix_entry { +}; + /* * Because of the header cross-dependencies, e.g. we need both * struct pci_dev and struct arch_pci_dev at the same time, this cannot be -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 01:33:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 01:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.206670.362297 (Exim 4.92) (envelope-from ) id 1ma6fL-0002ML-BE; Tue, 12 Oct 2021 01:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 206670.362297; Tue, 12 Oct 2021 01:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fL-0002MD-64; Tue, 12 Oct 2021 01:33:15 +0000 Received: by outflank-mailman (input) for mailman id 206670; Tue, 12 Oct 2021 01:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fK-0002Lt-G2 for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fK-0004OJ-FH for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ma6fK-0007RP-EE for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qtjVRjyS+qmrQ68p4/NRLTLzsKx+plcCHmQwDMj2+1k=; b=tSrD06BGp5tK3Qn4Q3IAoCoxr2 1154+yyt9tfuEFREeBk8pD7lXt2Enoo3ji2QHg8ZKusvO3OTD6lnxV6mc5vFrUVfYJIDvqt1WKeX2 X+BvKo3bFeboiMGYTew0X19daY9KNywMlKyJG+vNqmZpucLNAJykd6brGQRc93Mn+3V0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/efi: Fix null pointer dereference Message-Id: Date: Tue, 12 Oct 2021 01:33:14 +0000 commit 4817dbf1c808064ee15416dba1db30cb793dfa98 Author: Luca Fancellu AuthorDate: Mon Oct 11 08:56:38 2021 +0100 Commit: Stefano Stabellini CommitDate: Mon Oct 11 13:19:35 2021 -0700 arm/efi: Fix null pointer dereference Fix for commit 60649d443dc395243e74d2b3e05594ac0c43cfe3 that introduces a null pointer dereference when the fdt_node_offset_by_compatible is called with "fdt" argument null. Reported-by: Julien Grall Fixes: 60649d443d ("arm/efi: Introduce xen,uefi-cfg-load DT property") Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/efi/efi-boot.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index a3e46453d4..e63dafac26 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -593,7 +593,8 @@ static bool __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) dtbfile.ptr = fdt; dtbfile.need_to_free = false; /* Config table memory can't be freed. */ - if ( fdt_node_offset_by_compatible(fdt, 0, "multiboot,module") > 0 ) + if ( fdt && + (fdt_node_offset_by_compatible(fdt, 0, "multiboot,module") > 0) ) { /* Locate chosen node */ int node = fdt_subnode_offset(fdt, 0, "chosen"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 01:33:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 01:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.206673.362299 (Exim 4.92) (envelope-from ) id 1ma6fV-0002Qv-BG; Tue, 12 Oct 2021 01:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 206673.362299; Tue, 12 Oct 2021 01:33:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fV-0002Qn-7n; Tue, 12 Oct 2021 01:33:25 +0000 Received: by outflank-mailman (input) for mailman id 206673; Tue, 12 Oct 2021 01:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fU-0002QU-Kz for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fU-0004OY-KC for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ma6fU-0007Sc-HO for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GH7YULck2c41l9tf577+aQhYH8/JGmwx67/PTzcOVBA=; b=vY9m2Xk+lgNqbkjUUajuTzyejL VDmBGhkJwp4Qr90wiP7PcTI9PgXB22RlaffbdKWSkOYK7AxRV+rT8jwyLvbSQaQO+TIQSN944eDFK ZQ1nxStPkQpo+UcjisuO+dSVPfvMS5FyXR5E+4ItcECujvuVTNDIwkr0qI96MmnuNKlQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: Allow removing PCI devices for all types of domains Message-Id: Date: Tue, 12 Oct 2021 01:33:24 +0000 commit bc2bdd4af4cbccaa332ea01583bb4ac691c3532d Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 08:55:31 2021 +0300 Commit: Stefano Stabellini CommitDate: Mon Oct 11 13:27:04 2021 -0700 libxl: Allow removing PCI devices for all types of domains The PCI device remove path may now be used by PVH on ARM, so the assert is no longer valid. Signed-off-by: Oleksandr Andrushchenko Acked-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh Acked-by: Anthony PERARD --- tools/libs/light/libxl_pci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 1a1c263080..59f3686fc8 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1947,8 +1947,6 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) goto out_fail; } } else { - assert(type == LIBXL_DOMAIN_TYPE_PV); - char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain, pci->bus, pci->dev, pci->func); FILE *f = fopen(sysfs_path, "r"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 01:33:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 01:33:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.206674.362302 (Exim 4.92) (envelope-from ) id 1ma6ff-0002Ug-E9; Tue, 12 Oct 2021 01:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 206674.362302; Tue, 12 Oct 2021 01:33:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6ff-0002UQ-9m; Tue, 12 Oct 2021 01:33:35 +0000 Received: by outflank-mailman (input) for mailman id 206674; Tue, 12 Oct 2021 01:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fe-0002U5-O2 for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ma6fe-0004P9-NJ for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1ma6fe-0007TU-ML for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 01:33:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0GthPebMIhEDAOElYldz9inQm+Bh6KVJRlNBZWVezQE=; b=LcZR6XOEiEw0ebgrf8uoMs8oMi lMsV9Q9Vsf3uvlFq0WSlBUGenaC84mB7b+KmuLNSHK5WH9tGaDvLHYG1AK9D41+AuhP+jgjmetPho EmiTYfMgx/S/w+d3B1oQAnXWc2WyhgJ+SyYcDwF9hWyWCb/d15uGnoUbxdfroVLnJRO4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: Only map legacy PCI IRQs if they are supported Message-Id: Date: Tue, 12 Oct 2021 01:33:34 +0000 commit e26f810a6f9295afe30ea08195715ddd96e2a123 Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 08:55:32 2021 +0300 Commit: Stefano Stabellini CommitDate: Mon Oct 11 13:29:13 2021 -0700 libxl: Only map legacy PCI IRQs if they are supported Arm's PCI passthrough implementation doesn't support legacy interrupts, but MSI/MSI-X. This can be the case for other platforms too. For that reason introduce a new CONFIG_PCI_SUPP_LEGACY_IRQ and add it to the CFLAGS and compile the relevant code in the toolstack only if applicable. Signed-off-by: Oleksandr Andrushchenko [stefano: minor change to Makefile] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh Acked-by: Anthony PERARD --- tools/libs/light/Makefile | 2 ++ tools/libs/light/libxl_pci.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 7d8c51d492..194bc5f268 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -46,6 +46,8 @@ CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral CFLAGS += -I. +CFLAGS-$(CONFIG_X86) += -DCONFIG_PCI_SUPP_LEGACY_IRQ + SRCS-$(CONFIG_X86) += libxl_cpuid.c SRCS-$(CONFIG_X86) += libxl_x86.c SRCS-$(CONFIG_X86) += libxl_psr.c diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 59f3686fc8..4c2d7aeefb 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1364,6 +1364,15 @@ static void pci_add_timeout(libxl__egc *egc, libxl__ev_time *ev, pci_add_dm_done(egc, pas, rc); } +static bool pci_supp_legacy_irq(void) +{ +#ifdef CONFIG_PCI_SUPP_LEGACY_IRQ + return true; +#else + return false; +#endif +} + static void pci_add_dm_done(libxl__egc *egc, pci_add_state *pas, int rc) @@ -1434,6 +1443,8 @@ static void pci_add_dm_done(libxl__egc *egc, } } fclose(f); + if (!pci_supp_legacy_irq()) + goto out_no_irq; sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, pci->bus, pci->dev, pci->func); f = fopen(sysfs_path, "r"); @@ -1983,6 +1994,8 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) } fclose(f); skip1: + if (!pci_supp_legacy_irq()) + goto skip_irq; sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, pci->bus, pci->dev, pci->func); f = fopen(sysfs_path, "r"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 10:00:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 10:00:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207031.362741 (Exim 4.92) (envelope-from ) id 1maEZq-00055E-Hp; Tue, 12 Oct 2021 10:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207031.362741; Tue, 12 Oct 2021 10:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEZq-000556-Ex; Tue, 12 Oct 2021 10:00:06 +0000 Received: by outflank-mailman (input) for mailman id 207031; Tue, 12 Oct 2021 10:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEZp-0004ww-0P for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEZo-0006Qp-Th for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maEZo-0005he-Rx for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=U7Fd3gqmDcmDgn8aPvSLUmbZA2BcbbXK7zY231lzSH0=; b=vQ98nZIsDAlV+YwZ0ItlqW6fx6 GQmlG+8boXcHkEXYJ6LoGea/dtBC5V7a8Lo9oHXsyL/I05Hric3Xx5XSZ7W5VJGYXkD8ddfOKlWCn qYNONUl458Iu0byUeA6bfGSGGRtdKSMsVsoeBQmmU8NsSCLpSBsle/v+HbLCv+yEQPYM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mm: avoid building multiple .o from a single .c file Message-Id: Date: Tue, 12 Oct 2021 10:00:04 +0000 commit 71cf7634fa11038fd9a2aa471a1dc7714bb93e79 Author: Anthony PERARD AuthorDate: Tue Oct 12 11:48:46 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:48:46 2021 +0200 x86/mm: avoid building multiple .o from a single .c file This replace the use of a single .c file use for multiple .o file by creating multiple .c file including the first one. There's quite a few issues with trying to build more than one object file from a single source file: there's is a duplication of the make rules to generate those targets; there is an additional ".file" symbol added in order to differentiate between the object files; and the tools/symbols have an heuristic to try to pick up the right ".file". This patch adds new .c source file which avoid the need to add a second ".file" symbol and thus avoid the need to deal with those issues. Also remove __OBJECT_FILE__ from $(CC) command line as it isn't used anywhere anymore. And remove the macro "build-intermediate" since the generic rules for single targets can be used. And rename the objects in mm/hap/ to remove the extra "level". Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- xen/Makefile | 11 ----------- xen/Rules.mk | 2 +- xen/arch/x86/mm/Makefile | 9 --------- xen/arch/x86/mm/guest_walk.c | 3 --- xen/arch/x86/mm/guest_walk_2.c | 2 ++ xen/arch/x86/mm/guest_walk_3.c | 2 ++ xen/arch/x86/mm/guest_walk_4.c | 2 ++ xen/arch/x86/mm/hap/Makefile | 15 +++------------ xen/arch/x86/mm/hap/guest_walk.c | 3 --- xen/arch/x86/mm/hap/guest_walk_2.c | 2 ++ xen/arch/x86/mm/hap/guest_walk_3.c | 2 ++ xen/arch/x86/mm/hap/guest_walk_4.c | 2 ++ xen/arch/x86/mm/shadow/Makefile | 9 --------- xen/arch/x86/mm/shadow/guest_2.c | 2 ++ xen/arch/x86/mm/shadow/guest_3.c | 2 ++ xen/arch/x86/mm/shadow/guest_4.c | 2 ++ xen/arch/x86/mm/shadow/multi.c | 3 --- xen/tools/symbols.c | 18 ++---------------- 18 files changed, 24 insertions(+), 67 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 7c2ffce0fc..5d01101662 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -518,17 +518,6 @@ _MAP: %/: FORCE $(MAKE) -f $(BASEDIR)/Rules.mk -C $* built_in.o built_in_bin.o -build-intermediate = $(eval $(call build-intermediate-closure,$(1))) -define build-intermediate-closure -$(1): FORCE - $(MAKE) -f $(BASEDIR)/Rules.mk -C $$(@D) $$(@F) -endef - -$(foreach base,arch/x86/mm/guest_walk_% \ - arch/x86/mm/hap/guest_walk_%level \ - arch/x86/mm/shadow/guest_%, \ - $(foreach ext,o i s,$(call build-intermediate,$(base).$(ext)))) - .PHONY: cloc cloc: $(eval tmpfile := $(shell mktemp)) diff --git a/xen/Rules.mk b/xen/Rules.mk index 8b8f9d347f..5e0699e58b 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -122,7 +122,7 @@ cpp_flags = $(filter-out -Wa$(comma)% -flto,$(1)) # Calculation of flags, first the generic flags, then the arch specific flags, # and last the flags modified for a target or a directory. -c_flags = -MMD -MP -MF $(@D)/.$(@F).d $(XEN_CFLAGS) '-D__OBJECT_FILE__="$@"' +c_flags = -MMD -MP -MF $(@D)/.$(@F).d $(XEN_CFLAGS) a_flags = -MMD -MP -MF $(@D)/.$(@F).d $(XEN_AFLAGS) include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile index 2818c066f7..6b7882d992 100644 --- a/xen/arch/x86/mm/Makefile +++ b/xen/arch/x86/mm/Makefile @@ -10,12 +10,3 @@ obj-$(CONFIG_MEM_SHARING) += mem_sharing.o obj-y += p2m.o obj-$(CONFIG_HVM) += p2m-ept.o p2m-pod.o p2m-pt.o obj-y += paging.o - -guest_walk_%.o: guest_walk.c Makefile - $(CC) $(c_flags) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_walk_%.i: guest_walk.c Makefile - $(CPP) $(call cpp_flags,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_walk_%.s: guest_walk.c Makefile - $(CC) $(filter-out -Wa$(comma)%,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -S $< -o $@ diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index 30d83cf1e0..b9f607272c 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -21,9 +21,6 @@ * along with this program; If not, see . */ -/* Allow uniquely identifying static symbols in the 3 generated objects. */ -asm(".file \"" __OBJECT_FILE__ "\""); - #include #include #include diff --git a/xen/arch/x86/mm/guest_walk_2.c b/xen/arch/x86/mm/guest_walk_2.c new file mode 100644 index 0000000000..defcd59bc2 --- /dev/null +++ b/xen/arch/x86/mm/guest_walk_2.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 2 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/guest_walk_3.c b/xen/arch/x86/mm/guest_walk_3.c new file mode 100644 index 0000000000..1c9eca3774 --- /dev/null +++ b/xen/arch/x86/mm/guest_walk_3.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 3 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/guest_walk_4.c b/xen/arch/x86/mm/guest_walk_4.c new file mode 100644 index 0000000000..aa3900338a --- /dev/null +++ b/xen/arch/x86/mm/guest_walk_4.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 4 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/hap/Makefile b/xen/arch/x86/mm/hap/Makefile index c6d296b517..8ef54b1faa 100644 --- a/xen/arch/x86/mm/hap/Makefile +++ b/xen/arch/x86/mm/hap/Makefile @@ -1,15 +1,6 @@ obj-y += hap.o -obj-y += guest_walk_2level.o -obj-y += guest_walk_3level.o -obj-y += guest_walk_4level.o +obj-y += guest_walk_2.o +obj-y += guest_walk_3.o +obj-y += guest_walk_4.o obj-y += nested_hap.o obj-y += nested_ept.o - -guest_walk_%level.o: guest_walk.c Makefile - $(CC) $(c_flags) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_walk_%level.i: guest_walk.c Makefile - $(CPP) $(call cpp_flags,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_walk_%level.s: guest_walk.c Makefile - $(CC) $(filter-out -Wa$(comma)%,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -S $< -o $@ diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c index f59ebc84a2..832a805847 100644 --- a/xen/arch/x86/mm/hap/guest_walk.c +++ b/xen/arch/x86/mm/hap/guest_walk.c @@ -18,9 +18,6 @@ * this program; If not, see . */ -/* Allow uniquely identifying static symbols in the 3 generated objects. */ -asm(".file \"" __OBJECT_FILE__ "\""); - #include #include #include diff --git a/xen/arch/x86/mm/hap/guest_walk_2.c b/xen/arch/x86/mm/hap/guest_walk_2.c new file mode 100644 index 0000000000..defcd59bc2 --- /dev/null +++ b/xen/arch/x86/mm/hap/guest_walk_2.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 2 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/hap/guest_walk_3.c b/xen/arch/x86/mm/hap/guest_walk_3.c new file mode 100644 index 0000000000..1c9eca3774 --- /dev/null +++ b/xen/arch/x86/mm/hap/guest_walk_3.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 3 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/hap/guest_walk_4.c b/xen/arch/x86/mm/hap/guest_walk_4.c new file mode 100644 index 0000000000..aa3900338a --- /dev/null +++ b/xen/arch/x86/mm/hap/guest_walk_4.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 4 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/shadow/Makefile b/xen/arch/x86/mm/shadow/Makefile index fd64b4dda9..b4a1620b69 100644 --- a/xen/arch/x86/mm/shadow/Makefile +++ b/xen/arch/x86/mm/shadow/Makefile @@ -5,12 +5,3 @@ obj-$(CONFIG_PV) += pv.o guest_4.o else obj-y += none.o endif - -guest_%.o: multi.c Makefile - $(CC) $(c_flags) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_%.i: multi.c Makefile - $(CPP) $(call cpp_flags,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_%.s: multi.c Makefile - $(CC) $(filter-out -Wa$(comma)%,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -S $< -o $@ diff --git a/xen/arch/x86/mm/shadow/guest_2.c b/xen/arch/x86/mm/shadow/guest_2.c new file mode 100644 index 0000000000..288b229982 --- /dev/null +++ b/xen/arch/x86/mm/shadow/guest_2.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 2 +#include "multi.c" diff --git a/xen/arch/x86/mm/shadow/guest_3.c b/xen/arch/x86/mm/shadow/guest_3.c new file mode 100644 index 0000000000..04e17b0b8a --- /dev/null +++ b/xen/arch/x86/mm/shadow/guest_3.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 3 +#include "multi.c" diff --git a/xen/arch/x86/mm/shadow/guest_4.c b/xen/arch/x86/mm/shadow/guest_4.c new file mode 100644 index 0000000000..c0c5d3cb11 --- /dev/null +++ b/xen/arch/x86/mm/shadow/guest_4.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 4 +#include "multi.c" diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 15265fc81d..a2fa7b87d8 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -20,9 +20,6 @@ * along with this program; If not, see . */ -/* Allow uniquely identifying static symbols in the 3 generated objects. */ -asm(".file \"" __OBJECT_FILE__ "\""); - #include #include #include diff --git a/xen/tools/symbols.c b/xen/tools/symbols.c index 0b12452616..710e9785d3 100644 --- a/xen/tools/symbols.c +++ b/xen/tools/symbols.c @@ -84,7 +84,6 @@ static int read_symbol(FILE *in, struct sym_entry *s) { char str[500], type[20] = ""; char *sym, stype; - static enum { symbol, single_source, multi_source } last; static char *filename; int rc = -1; @@ -118,24 +117,11 @@ static int read_symbol(FILE *in, struct sym_entry *s) */ input_format == fmt_sysv && !*type && stype == '?' && sym && sym[1] && strchr("cSsoh", sym[1]) && !sym[2])) { - /* - * gas prior to binutils commit fbdf9406b0 (expected to appear - * in 2.27) outputs symbol table entries resulting from .file - * in reverse order. If we get two consecutive file symbols, - * prefer the first one if that names an object file or has a - * directory component (to cover multiply compiled files). - */ - bool multi = strchr(str, '/') || (sym && sym[1] == 'o'); - - if (multi || last != multi_source) { - free(filename); - filename = *str ? strdup(str) : NULL; - } - last = multi ? multi_source : single_source; + free(filename); + filename = *str ? strdup(str) : NULL; goto skip_tail; } - last = symbol; rc = -1; sym = str; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 10:00:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 10:00:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207032.362746 (Exim 4.92) (envelope-from ) id 1maEa0-00058N-JV; Tue, 12 Oct 2021 10:00:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207032.362746; Tue, 12 Oct 2021 10:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEa0-00058F-GR; Tue, 12 Oct 2021 10:00:16 +0000 Received: by outflank-mailman (input) for mailman id 207032; Tue, 12 Oct 2021 10:00:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEZz-000587-1I for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEZz-0006Qz-0W for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maEZy-0005jV-Vn for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HwALAszATasWuHxMTcm+R+KRDIumyApvxEAJ4gVUxSA=; b=eO7/fb/RZGe+KWCGFi+CQU2kOx BjykZJFh8DBKfR1/2+dzVqMY20X+wNpqwzo5YevpyGjO4aKeUJokE8OChenekiW1ijVGKAX3M28qE 0lzY9RWhMbHi7M/ZYuZmz9TZSjSYxP6LgcLA4HfMM6sVbQNkknOAONOtjUha8VPg/mIs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build,arm: move LDFLAGS change to arch.mk Message-Id: Date: Tue, 12 Oct 2021 10:00:14 +0000 commit aa44f3c0a697cc387f79958d73e21594a9059cf6 Author: Anthony PERARD AuthorDate: Tue Oct 12 11:50:47 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:50:47 2021 +0200 build,arm: move LDFLAGS change to arch.mk Changes to XEN_LDFLAGS may or may not apply to targets in for example "common/" depending on whether one runs `make` or `make common/`. But arch.mk is loaded before doing any build, so changes to LDFLAGS there mean that the value of XEN_LDFLAGS won't depends on the initial target. Signed-off-by: Anthony PERARD Acked-by: Julien Grall --- xen/arch/arm/Makefile | 8 -------- xen/arch/arm/arch.mk | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 44d7cc81fa..7dd3ee981a 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -103,14 +103,6 @@ prelink.o: $(ALL_OBJS) $(ALL_LIBS) FORCE $(call if_changed,ld) endif -ifeq ($(CONFIG_ARM64_ERRATUM_843419),y) - ifeq ($(call ld-option, --fix-cortex-a53-843419),n) - $(warning ld does not support --fix-cortex-a53-843419; xen may be susceptible to erratum) - else - XEN_LDFLAGS += --fix-cortex-a53-843419 - endif -endif - targets += prelink.o $(TARGET)-syms: prelink.o xen.lds diff --git a/xen/arch/arm/arch.mk b/xen/arch/arm/arch.mk index 11caec86ba..6a29820594 100644 --- a/xen/arch/arm/arch.mk +++ b/xen/arch/arm/arch.mk @@ -17,3 +17,11 @@ $(call cc-option-add,CFLAGS-$(CONFIG_ARM_64),CC,-mno-outline-atomics) ifneq ($(filter command line environment,$(origin CONFIG_EARLY_PRINTK)),) $(error You must use 'make menuconfig' to enable/disable early printk now) endif + +ifeq ($(CONFIG_ARM64_ERRATUM_843419),y) + ifeq ($(call ld-option, --fix-cortex-a53-843419),n) + $(warning ld does not support --fix-cortex-a53-843419; xen may be susceptible to erratum) + else + LDFLAGS += --fix-cortex-a53-843419 + endif +endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 10:00:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 10:00:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207033.362750 (Exim 4.92) (envelope-from ) id 1maEaA-0005BH-LD; Tue, 12 Oct 2021 10:00:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207033.362750; Tue, 12 Oct 2021 10:00:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEaA-0005B5-Hu; Tue, 12 Oct 2021 10:00:26 +0000 Received: by outflank-mailman (input) for mailman id 207033; Tue, 12 Oct 2021 10:00:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEa9-0005AY-4F for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEa9-0006RH-3S for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maEa9-0005l5-2X for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1aKtOUJ2n8JMhIPCcROSdnGQWtu7fg9yrNF3fbIb6K4=; b=Vx0YPDfNl0mptQnf2/dknBgC50 7OVRXVwooEA/bpZ+EAt7g2M8u9CFcjiBusN61ryO+Vt9z195c1+2MwCsgvisyfg7nB3EfjF7fKErO Gkedi/Eq41FF2BgkUqpWrweugwjK9GXWFJPmTGWp5Crm4S37/v0/x8ijy3dwWM+5jaTg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: avoid building arm/arm/*/head.o twice Message-Id: Date: Tue, 12 Oct 2021 10:00:25 +0000 commit e5ba9f79ef4517321e80e0eb6e4aafc3a978e689 Author: Anthony PERARD AuthorDate: Tue Oct 12 11:53:47 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:53:47 2021 +0200 build: avoid building arm/arm/*/head.o twice head.o is been built twice, once because it is in $(ALL_OBJS) and a second time because it is in $(extra-y) and thus it is rebuilt when building "arch/arm/built_in.o". Fix this by adding a dependency of "head.o" on the directory "arch/arm/". Also, we should avoid building object that are in subdirectories, so move the declaration in there. This doesn't change anything as "arch/arm/built_in.o" depends on "arch/arm/$subarch/built_in.o" which depends on $(extra-y), so we still need to depend on "arch/arm/built_in.o". Signed-off-by: Anthony PERARD Acked-by: Julien Grall --- xen/arch/arm/Makefile | 7 ++++++- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm64/Makefile | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7dd3ee981a..64518848b2 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -65,7 +65,6 @@ obj-$(CONFIG_SBSA_VUART_CONSOLE) += vpl011.o obj-y += vsmc.o obj-y += vpsci.o obj-y += vuart.o -extra-y += $(TARGET_SUBARCH)/head.o #obj-bin-y += ....o @@ -75,6 +74,12 @@ endif ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS) +# head.o is built by descending into the sub-directory, depends on the part of +# $(ALL_OBJS) that will eventually recurse into $(TARGET_SUBARCH)/ and build +# head.o +$(TARGET_SUBARCH)/head.o: $(BASEDIR)/arch/arm/built_in.o +$(TARGET_SUBARCH)/head.o: ; + ifdef CONFIG_LIVEPATCH all_symbols = --all-symbols ifdef CONFIG_FAST_SYMBOL_LOOKUP diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 96105d2383..3040eabce3 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -11,3 +11,4 @@ obj-y += smpboot.o obj-y += traps.o obj-y += vfp.o +extra-y += head.o diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 701d66883d..baa87655fa 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -14,3 +14,5 @@ obj-y += smpboot.o obj-y += traps.o obj-y += vfp.o obj-y += vsysreg.o + +extra-y += head.o -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 10:00:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 10:00:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207034.362754 (Exim 4.92) (envelope-from ) id 1maEaK-0005EF-Mf; Tue, 12 Oct 2021 10:00:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207034.362754; Tue, 12 Oct 2021 10:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEaK-0005E7-JO; Tue, 12 Oct 2021 10:00:36 +0000 Received: by outflank-mailman (input) for mailman id 207034; Tue, 12 Oct 2021 10:00:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEaJ-0005Dw-7B for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEaJ-0006Rl-6T for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maEaJ-0005mT-5a for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RK0Ng4acvXDWUlyNRZ7l7d6C1QJ+rkvudmVVf/Vozw0=; b=IUI0vlbs5qWaA0ZrRSunj5YYAu tO/Ntkjlb0thoBCkc4mFL4kBp/TQJMj9saEOQTdiupXHV5hfMhya9FRb+09CZkGs+24LJUm99h42p i+yUbhafGILZyu5V2xmw5JYgT+Ynbcj8hPHA4s/hhYleyXLHTnryR6lC+Uwc+prBAsS0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Message-Id: Date: Tue, 12 Oct 2021 10:00:35 +0000 commit 036432e8b27e1ef21e0f0204ba9b0e3972a031c2 Author: Jan Beulich AuthorDate: Tue Oct 12 11:54:34 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:54:34 2021 +0200 AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Hidden devices are associated with DomXEN but usable by the hardware domain. Hence they need flushing as well when all devices are to have flushes invoked. While there drop a redundant ATS-enabled check and constify the first parameter of the involved function. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index 4db8e1651f..a73830386b 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -308,14 +308,11 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, flush_command_buffer(iommu, iommu_dev_iotlb_timeout); } -static void amd_iommu_flush_all_iotlbs(struct domain *d, daddr_t daddr, +static void amd_iommu_flush_all_iotlbs(const struct domain *d, daddr_t daddr, unsigned int order) { struct pci_dev *pdev; - if ( !ats_enabled ) - return; - for_each_pdev( d, pdev ) { u8 devfn = pdev->devfn; @@ -343,7 +340,16 @@ static void _amd_iommu_flush_pages(struct domain *d, } if ( ats_enabled ) + { amd_iommu_flush_all_iotlbs(d, daddr, order); + + /* + * Hidden devices are associated with DomXEN but usable by the + * hardware domain. Hence they need dealing with here as well. + */ + if ( is_hardware_domain(d) ) + amd_iommu_flush_all_iotlbs(dom_xen, daddr, order); + } } void amd_iommu_flush_all_pages(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 10:00:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 10:00:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207035.362759 (Exim 4.92) (envelope-from ) id 1maEaU-0005HT-O9; Tue, 12 Oct 2021 10:00:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207035.362759; Tue, 12 Oct 2021 10:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEaU-0005HJ-Kp; Tue, 12 Oct 2021 10:00:46 +0000 Received: by outflank-mailman (input) for mailman id 207035; Tue, 12 Oct 2021 10:00:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEaT-0005H9-AF for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEaT-0006Rv-9V for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maEaT-0005nt-8X for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1w4RUrraMfiiaJgAaN1J/ZR5nLbCi7FoBqeBQ3YzOPg=; b=kjg+b5ZteP8lze/6ElnFhbPZwV njor6B+eFwPgd6kC7ZZSsI6KGsBRoLkEtg87ZKjUCp28Fp2qZcqtDndfI3RfMtMOjMCmNrB0xqqbW Cz5LYcz2TEPgX5IcJ3S30QC/f6jA6bnrlFlp43qBfRfm6Q4AIIyisE4IXbnmp1eGpB9o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PV32: fix physdev_op_compat handling Message-Id: Date: Tue, 12 Oct 2021 10:00:45 +0000 commit 834cb8761051f7d87816785c0d99fe9bd5f0ce30 Author: Jan Beulich AuthorDate: Tue Oct 12 11:55:42 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:55:42 2021 +0200 x86/PV32: fix physdev_op_compat handling The conversion of the original code failed to recognize that the 32-bit compat variant of this (sorry, two different meanings of "compat" here) needs to continue to invoke the compat handler, not the native one. Arrange for this by adding yet another #define. Affected functions (having existed prior to the introduction of the new hypercall) are PHYSDEVOP_set_iobitmap and PHYSDEVOP_apic_{read,write}. For all others the operand struct layout doesn't differ. Fixes: 1252e2823117 ("x86/pv: Export pv_hypercall_table[] rather than working around it in several ways") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_64/compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c index 0e4c71f2aa..fcbc1cc0d7 100644 --- a/xen/arch/x86/x86_64/compat.c +++ b/xen/arch/x86/x86_64/compat.c @@ -12,6 +12,7 @@ EMIT_FILE; #define physdev_op_t physdev_op_compat_t #define do_physdev_op compat_physdev_op #define do_physdev_op_compat(x) compat_physdev_op_compat(_##x) +#define native compat #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 10:00:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 10:00:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207036.362762 (Exim 4.92) (envelope-from ) id 1maEae-0005KI-PS; Tue, 12 Oct 2021 10:00:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207036.362762; Tue, 12 Oct 2021 10:00:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEae-0005KA-MN; Tue, 12 Oct 2021 10:00:56 +0000 Received: by outflank-mailman (input) for mailman id 207036; Tue, 12 Oct 2021 10:00:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEad-0005Jj-DV for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEad-0006S6-Ct for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maEad-0005pd-Bq for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:00:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zzZOByXCOia4JW97NH4MNYuQ6xXEVJ3sQS4z2jB2lac=; b=dOGDnG2IK61XEX9xm8+fIV+xxZ k4RVHtBeYBoZVLKFNVgfixXFPzDHGgRkxIgp7WAqgO34rwQGgWhNXEAGFLoVhQeVKZaCM473CcC6f l617fVflITHdU0KSNJfk85m+26mXsqIOk4+5BLQFEl/FnXNmTQhBPfdt2O2f+dORn7Wg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: generalize and correct "iommu=no-igfx" handling Message-Id: Date: Tue, 12 Oct 2021 10:00:55 +0000 commit 2d7f191b392e3efaf4f6e18e14b0b3c43a9e268b Author: Jan Beulich AuthorDate: Tue Oct 12 11:56:21 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:56:21 2021 +0200 VT-d: generalize and correct "iommu=no-igfx" handling Linux'es supposedly equivalent "intel_iommu=igfx_off" deals with any graphics devices (not just Intel ones) while at the same time limiting the effect to IOMMUs covering only graphics devices. Keying the decision to leave translation disabled for an IOMMU to merely a magic SBDF tuple was wrong in the first place - systems may very well have non-graphics devices at 0000:00:02.0 (ordinary root ports commonly live there, for example). Any use of igd_drhd_address (and hence is_igd_drhd()) needs further qualification. Introduce a new "graphics only" field in struct acpi_drhd_unit and set it according to device scope parsing outcome. Replace the bad use of is_igd_drhd() in iommu_enable_translation() by use of this new field. While adding the new field also convert the adjacent include_all one to "bool". Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Release-Acked-by: Ian Jackson --- docs/misc/xen-command-line.pandoc | 4 ++-- xen/drivers/passthrough/vtd/dmar.c | 20 +++++++++++++++++++- xen/drivers/passthrough/vtd/dmar.h | 3 ++- xen/drivers/passthrough/vtd/iommu.c | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index b1f7978aa4..f7797ea233 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1494,8 +1494,8 @@ The following options are specific to Intel VT-d hardware: version 6 and greater as Registered-Based Invalidation isn't supported by them. -* The `igfx` boolean is active by default, and controls whether the IOMMU in - front of an Intel Graphics Device is enabled or not. +* The `igfx` boolean is active by default, and controls whether IOMMUs in + front of solely graphics devices get enabled or not. It is intended as a debugging mechanism for graphics issues, and to be similar to Linux's `intel_iommu=igfx_off` option. If specifying `no-igfx` diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 36d909b06d..d5ee367599 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -315,6 +315,7 @@ static int __init acpi_parse_dev_scope( struct acpi_drhd_unit *drhd = type == DMAR_TYPE ? container_of(scope, struct acpi_drhd_unit, scope) : NULL; int depth, cnt, didx = 0, ret; + bool gfx_only = false; if ( (cnt = scope_device_count(start, end)) < 0 ) return cnt; @@ -324,6 +325,8 @@ static int __init acpi_parse_dev_scope( scope->devices = xzalloc_array(u16, cnt); if ( !scope->devices ) return -ENOMEM; + + gfx_only = drhd && !drhd->include_all; } scope->devices_cnt = cnt; @@ -354,6 +357,7 @@ static int __init acpi_parse_dev_scope( acpi_scope->bus, sec_bus, sub_bus); dmar_scope_add_buses(scope, sec_bus, sub_bus); + gfx_only = false; break; case ACPI_DMAR_SCOPE_TYPE_HPET: @@ -374,6 +378,8 @@ static int __init acpi_parse_dev_scope( acpi_hpet_unit->dev = path->dev; acpi_hpet_unit->func = path->fn; list_add(&acpi_hpet_unit->list, &drhd->hpet_list); + + gfx_only = false; } break; @@ -388,6 +394,12 @@ static int __init acpi_parse_dev_scope( if ( (seg == 0) && (bus == 0) && (path->dev == 2) && (path->fn == 0) ) igd_drhd_address = drhd->address; + + if ( gfx_only && + pci_conf_read8(PCI_SBDF(seg, bus, path->dev, path->fn), + PCI_CLASS_DEVICE + 1) != 0x03 + /* PCI_BASE_CLASS_DISPLAY */ ) + gfx_only = false; } break; @@ -408,6 +420,8 @@ static int __init acpi_parse_dev_scope( acpi_ioapic_unit->ioapic.bdf.dev = path->dev; acpi_ioapic_unit->ioapic.bdf.func = path->fn; list_add(&acpi_ioapic_unit->list, &drhd->ioapic_list); + + gfx_only = false; } break; @@ -417,11 +431,15 @@ static int __init acpi_parse_dev_scope( printk(XENLOG_WARNING VTDPREFIX "Unknown scope type %#x\n", acpi_scope->entry_type); start += acpi_scope->length; + gfx_only = false; continue; } scope->devices[didx++] = PCI_BDF(bus, path->dev, path->fn); start += acpi_scope->length; - } + } + + if ( drhd && gfx_only ) + drhd->gfx_only = true; ret = 0; diff --git a/xen/drivers/passthrough/vtd/dmar.h b/xen/drivers/passthrough/vtd/dmar.h index a44820a5e7..a1f2353a51 100644 --- a/xen/drivers/passthrough/vtd/dmar.h +++ b/xen/drivers/passthrough/vtd/dmar.h @@ -62,7 +62,8 @@ struct acpi_drhd_unit { struct list_head list; u64 address; /* register base address of the unit */ u16 segment; - u8 include_all:1; + bool include_all:1; + bool gfx_only:1; struct vtd_iommu *iommu; struct list_head ioapic_list; struct list_head hpet_list; diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 0519dfc9e7..137aea2c92 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -751,7 +751,7 @@ static void iommu_enable_translation(struct acpi_drhd_unit *drhd) unsigned long flags; struct vtd_iommu *iommu = drhd->iommu; - if ( is_igd_drhd(drhd) ) + if ( drhd->gfx_only ) { if ( !iommu_igfx ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 10:01:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 10:01:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207037.362766 (Exim 4.92) (envelope-from ) id 1maEao-0005Nn-SK; Tue, 12 Oct 2021 10:01:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207037.362766; Tue, 12 Oct 2021 10:01:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEao-0005Nf-PQ; Tue, 12 Oct 2021 10:01:06 +0000 Received: by outflank-mailman (input) for mailman id 207037; Tue, 12 Oct 2021 10:01:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEan-0005NT-Gd for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:01:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maEan-0006SU-Fu for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:01:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maEan-0005rh-F4 for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 10:01:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=l4VFQo2kYc6TwHYhbE6+wfvJN/GeMOgwpbOLQgmTL9I=; b=u9RUzK/canO3cdvENxJki7D2A+ X2MSegYE6Y0sIXwtlcqt1FHIq1eizqbeaVXTYIKS0D5ZZs2v6ybPKEaOJp9eQWaP+QM3sd07LDxKV hX9G+hduMxBAwb2UNioaRXjedPl9kXe4r8Fk7Q6aAJsJSPenofCcOmzCU4+Ccd8dAczA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: Tylersburg isoch DMAR unit with no TLB space Message-Id: Date: Tue, 12 Oct 2021 10:01:05 +0000 commit d3b05f9b16d6ba9c550c3a35ac11ed292bf87f68 Author: Jan Beulich AuthorDate: Tue Oct 12 11:57:08 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:57:08 2021 +0200 VT-d: Tylersburg isoch DMAR unit with no TLB space BIOSes, when enabling the dedicated DMAR unit for the sound device, need to also set a non-zero number of TLB entries in a respective system management register (VTISOCHCTRL). At least one BIOS is known to fail to do so, causing the VT-d engine to deadlock when used. Vaguely based on Linux'es e0fc7e0b4b5e ("intel-iommu: Yet another BIOS workaround: Isoch DMAR unit with no TLB space"). To limit message string redundancy, fold parts with the IGD quirk logic. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Release-Acked-by: Ian Jackson --- xen/drivers/passthrough/vtd/extern.h | 1 + xen/drivers/passthrough/vtd/iommu.c | 26 ++++++++++++--- xen/drivers/passthrough/vtd/quirks.c | 63 ++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index 156177bb3f..6fb00a25c3 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -100,6 +100,7 @@ int msi_msg_write_remap_rte(struct msi_desc *, struct msi_msg *); int intel_setup_hpet_msi(struct msi_desc *); int is_igd_vt_enabled_quirk(void); +bool is_azalia_tlb_enabled(const struct acpi_drhd_unit *); void platform_quirks_init(void); void vtd_ops_preamble_quirk(struct vtd_iommu *iommu); void vtd_ops_postamble_quirk(struct vtd_iommu *iommu); diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 137aea2c92..0e7e111286 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -750,27 +750,43 @@ static void iommu_enable_translation(struct acpi_drhd_unit *drhd) u32 sts; unsigned long flags; struct vtd_iommu *iommu = drhd->iommu; + static const char crash_fmt[] = "%s; crash Xen for security purpose\n"; if ( drhd->gfx_only ) { + static const char disable_fmt[] = XENLOG_WARNING VTDPREFIX + " %s; disabling IGD VT-d engine\n"; + if ( !iommu_igfx ) { - printk(XENLOG_INFO VTDPREFIX - "Passed iommu=no-igfx option. Disabling IGD VT-d engine.\n"); + printk(disable_fmt, "passed iommu=no-igfx option"); return; } if ( !is_igd_vt_enabled_quirk() ) { + static const char msg[] = "firmware did not enable IGD for VT properly"; + if ( force_iommu ) - panic("BIOS did not enable IGD for VT properly, crash Xen for security purpose\n"); + panic(crash_fmt, msg); - printk(XENLOG_WARNING VTDPREFIX - "BIOS did not enable IGD for VT properly. Disabling IGD VT-d engine.\n"); + printk(disable_fmt, msg); return; } } + if ( !is_azalia_tlb_enabled(drhd) ) + { + static const char msg[] = "firmware did not enable TLB for sound device"; + + if ( force_iommu ) + panic(crash_fmt, msg); + + printk(XENLOG_WARNING VTDPREFIX " %s; disabling ISOCH VT-d engine\n", + msg); + return; + } + /* apply platform specific errata workarounds */ vtd_ops_preamble_quirk(iommu); diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 2ad76a0ae7..52b47dd893 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -100,6 +100,69 @@ static void __init cantiga_b3_errata_init(void) is_cantiga_b3 = 1; } +/* + * QUIRK to work around certain BIOSes enabling the ISOCH DMAR unit for the + * Azalia sound device, but not giving it any TLB entries, causing it to + * deadlock. + */ +bool is_azalia_tlb_enabled(const struct acpi_drhd_unit *drhd) +{ + pci_sbdf_t sbdf; + unsigned int vtisochctrl; + + /* Only dedicated units are of interest. */ + if ( drhd->include_all || drhd->scope.devices_cnt != 1 ) + return true; + + /* Check for the specific device. */ + sbdf = PCI_SBDF2(drhd->segment, drhd->scope.devices[0]); + if ( pci_conf_read16(sbdf, PCI_VENDOR_ID) != PCI_VENDOR_ID_INTEL || + pci_conf_read16(sbdf, PCI_DEVICE_ID) != 0x3a3e ) + return true; + + /* Check for the corresponding System Management Registers device. */ + sbdf = PCI_SBDF(drhd->segment, 0, 0x14, 0); + if ( pci_conf_read16(sbdf, PCI_VENDOR_ID) != PCI_VENDOR_ID_INTEL || + pci_conf_read16(sbdf, PCI_DEVICE_ID) != 0x342e ) + return true; + + vtisochctrl = pci_conf_read32(sbdf, 0x188); + if ( vtisochctrl == 0xffffffff ) + { + printk(XENLOG_WARNING VTDPREFIX + " Cannot access VTISOCHCTRL at this time\n"); + return true; + } + + /* + * If Azalia DMA is routed to the non-isoch DMAR unit, that's fine in + * principle, but not consistent with the ACPI tables. + */ + if ( vtisochctrl & 1 ) + { + printk(XENLOG_WARNING VTDPREFIX + " Inconsistency between chipset registers and ACPI tables\n"); + return true; + } + + /* Drop all bits other than the number of TLB entries. */ + vtisochctrl &= 0x1c; + + /* If we have at least the recommended number of TLB entries, fine. */ + if ( vtisochctrl >= 16 ) + return true; + + /* Zero TLB entries? */ + if ( !vtisochctrl ) + return false; + + printk(XENLOG_WARNING VTDPREFIX + " Recommended TLB entries for ISOCH unit is 16; firmware set %u\n", + vtisochctrl); + + return true; +} + /* check for Sandybridge IGD device ID's */ static void __init snb_errata_init(void) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 13:44:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 13:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207241.363009 (Exim 4.92) (envelope-from ) id 1maI4b-0003ZJ-Bw; Tue, 12 Oct 2021 13:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207241.363009; Tue, 12 Oct 2021 13:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maI4b-0003ZB-96; Tue, 12 Oct 2021 13:44:05 +0000 Received: by outflank-mailman (input) for mailman id 207241; Tue, 12 Oct 2021 13:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maI4a-0003Z5-Iz for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 13:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maI4a-0001tj-HQ for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 13:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maI4a-00034S-GU for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 13:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=A5SdKdz6OQhCr//mW22dSmO85BeUM0yGWr9bOYAhk7c=; b=KCBTIC0hMeHcbzD3pQI7vA2Pk6 uVCO/NLJLbRf7XdvwbUGKFWnEjghD3i9X/6pGdNz9mhfAG44T+/vyRzyEXo2QxcK3RkUgwiTag7f3 Om7x+scLBEZNmGzoaSwu6cWDNun6s6P6nHKph3z+IteHHyU6H8jp8EK00NFoMlgqg/rA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xl: fix autoballoon regex Message-Id: Date: Tue, 12 Oct 2021 13:44:04 +0000 commit 2faeb4213d9b412836fe80e5685bfcccc51feb92 Author: Dmitry Isaykin AuthorDate: Fri Oct 1 15:24:16 2021 +0300 Commit: Ian Jackson CommitDate: Tue Oct 12 14:40:14 2021 +0100 tools/xl: fix autoballoon regex This regex is used for auto-balloon mode detection based on Xen command line. The case of specifying a negative size was handled incorrectly. >From misc/xen-command-line documentation: dom0_mem (x86) = List of ( min: | max: | ) If a size is positive, it represents an absolute value. If a size is negative, it is subtracted from the total available memory. Also add support for [tT] granularity suffix. Also add support for memory fractions (i.e. '50%' or '1G+25%'). Signed-off-by: Dmitry Isaykin Reviewed-by: Anthony PERARD --- tools/xl/xl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/xl/xl.c b/tools/xl/xl.c index 4107d10fd4..f422f9fed5 100644 --- a/tools/xl/xl.c +++ b/tools/xl/xl.c @@ -80,14 +80,20 @@ static int auto_autoballoon(void) if (!info) return 1; /* default to on */ +#define SIZE_PATTERN "-?[0-9]+[bBkKmMgGtT]?" + ret = regcomp(®ex, - "(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )", + "(^| )dom0_mem=((|min:|max:)(" SIZE_PATTERN "|(" SIZE_PATTERN "\\+)?[0-9]{1,2}%),?)+($| )", REG_NOSUB | REG_EXTENDED); + +#undef SIZE_PATTERN + if (ret) return 1; ret = regexec(®ex, info->commandline, 0, NULL, 0); regfree(®ex); + return ret == REG_NOMATCH; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 15:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 15:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207465.363309 (Exim 4.92) (envelope-from ) id 1maJwg-0004eR-TN; Tue, 12 Oct 2021 15:44:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207465.363309; Tue, 12 Oct 2021 15:44:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maJwg-0004eJ-QJ; Tue, 12 Oct 2021 15:44:02 +0000 Received: by outflank-mailman (input) for mailman id 207465; Tue, 12 Oct 2021 15:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maJwg-0004eD-04 for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 15:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maJwf-0004DI-VK for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 15:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maJwf-0006K9-UJ for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 15:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cxhM3+E1iDaiZYjJHfcwoyTmZqDW+hMg17mqNZXxYl0=; b=DYTXqU51Yj6QaQDlIIF4MMJBX1 Lp4XIpF41klcQbbPTUojGlICOmKV4PQzro1rUSmEWXRiaHoU1vArl596FphYLTQtF+/3IUb/+8nr2 TGuFHr81KQaKFu68uk1ebYaCQQILDW5fzpc9oib/icYIwuCe6xauPoExhc55L4476I8k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/console: use xenforeigmemory to map console ring Message-Id: Date: Tue, 12 Oct 2021 15:44:01 +0000 commit e8b42a4e8810844ccffd2eab072921b1e4e2ed79 Author: Roger Pau Monne AuthorDate: Wed Sep 22 10:21:18 2021 +0200 Commit: Ian Jackson CommitDate: Mon Oct 11 12:05:38 2021 +0100 tools/console: use xenforeigmemory to map console ring This patch replaces the usage of xc_map_foreign_range with xenforeignmemory_map from the stable xenforeignmemory library. Note there are still other uses of libxc functions which prevents removing the dependency. No functional change intended. Signed-off-by: Roger Pau Monné Reviewed-by: Ian Jackson --- tools/console/Makefile | 4 ++-- tools/console/daemon/io.c | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tools/console/Makefile b/tools/console/Makefile index 84796eac8f..3f4cddab03 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -29,9 +29,9 @@ clean: distclean: clean daemon/main.o: daemon/_paths.h -daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CONSOLE_CFLAGS-y) +daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CFLAGS_libxenforeignmemory) $(CONSOLE_CFLAGS-y) xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) - $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenforeignmemory) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) client/main.o: client/_paths.h xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 200b575d76..682c1f4008 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -22,6 +22,7 @@ #include "utils.h" #include "io.h" #include +#include #include #include #include @@ -73,6 +74,7 @@ static int log_time_guest_needts = 1; static int log_hv_fd = -1; static xengnttab_handle *xgt_handle = NULL; +static xenforeignmemory_handle *xfm_handle; static struct pollfd *fds; static unsigned int current_array_size; @@ -675,7 +677,7 @@ static void console_unmap_interface(struct console *con) if (xgt_handle && con->ring_ref == -1) xengnttab_unmap(xgt_handle, con->interface, 1); else - munmap(con->interface, XC_PAGE_SIZE); + xenforeignmemory_unmap(xfm_handle, con->interface, 1); con->interface = NULL; con->ring_ref = -1; } @@ -722,11 +724,12 @@ static int console_create_ring(struct console *con) con->ring_ref = -1; } if (!con->interface) { + xen_pfn_t pfn = ring_ref; + /* Fall back to xc_map_foreign_range */ - con->interface = xc_map_foreign_range( - xc, dom->domid, XC_PAGE_SIZE, - PROT_READ|PROT_WRITE, - (unsigned long)ring_ref); + con->interface = xenforeignmemory_map( + xfm_handle, dom->domid, PROT_READ|PROT_WRITE, 1, + &pfn, NULL); if (con->interface == NULL) { err = EINVAL; goto out; @@ -1341,6 +1344,14 @@ void handle_io(void) errno, strerror(errno)); } + xfm_handle = xenforeignmemory_open(NULL, 0); + if (xfm_handle == NULL) { + dolog(LOG_ERR, + "Failed to open xen foreign memory handle: %d (%s)", + errno, strerror(errno)); + goto out; + } + enum_domains(); for (;;) { @@ -1462,6 +1473,10 @@ void handle_io(void) xengnttab_close(xgt_handle); xgt_handle = NULL; } + if (xfm_handle != NULL) { + xenforeignmemory_close(xfm_handle); + xfm_handle = NULL; + } log_hv_evtchn = -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 12 16:11:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Oct 2021 16:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207510.363368 (Exim 4.92) (envelope-from ) id 1maKMs-0002PJ-3B; Tue, 12 Oct 2021 16:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207510.363368; Tue, 12 Oct 2021 16:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maKMs-0002PB-0E; Tue, 12 Oct 2021 16:11:06 +0000 Received: by outflank-mailman (input) for mailman id 207510; Tue, 12 Oct 2021 16:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maKMq-0002Op-Ay for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 16:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maKMq-0005Ea-7w for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 16:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maKMq-0000nT-6q for xen-changelog@lists.xenproject.org; Tue, 12 Oct 2021 16:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TsZam5gO+3RwjZYXjhCjc9AaWtys9lrokwbBWeeQPfA=; b=SqeA6PVhU0O1K7yp6OWnqZZBBr UxwBfJC3B/72CV65JP10UDnVePnFC+aglhjhHvRYb1tQ+51IUSMfg5j1iWXBnudVHdd57FwBDHn1i E78iQ0Xf1xqE7DogIjUplVMNWSSMUqM0m1nAwhEE6miYi+vY79zsbf817v2xMvhgRKko=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/pv: Split pv_hypercall() in two Message-Id: Date: Tue, 12 Oct 2021 16:11:04 +0000 commit eb7518b89be6df874ec9b2bafadeaaa7c874ea6b Author: Andrew Cooper AuthorDate: Mon Oct 4 19:11:45 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Oct 12 16:56:11 2021 +0100 x86/pv: Split pv_hypercall() in two The is_pv_32bit_vcpu() conditionals hide four lfences, with two taken on any individual path through the function. There is very little code common between compat and native, and context-dependent conditionals predict very badly for a period of time after context switch. Move do_entry_int82() from pv/traps.c into pv/hypercall.c, allowing _pv_hypercall() to be static and forced inline. The delta is: add/remove: 0/0 grow/shrink: 1/1 up/down: 300/-282 (18) Function old new delta do_entry_int82 50 350 +300 pv_hypercall 579 297 -282 which is tiny, but the perf implications are large: Guest | Naples | Milan | SKX | CFL-R | ------+--------+--------+--------+--------+ pv64 | 17.4% | 15.5% | 2.6% | 4.5% | pv32 | 1.9% | 10.9% | 1.4% | 2.5% | These are percentage improvements in raw TSC detlas for a xen_version hypercall, with obvious outliers excluded. Therefore, it is an idealised best case improvement. The pv64 path uses `syscall`, while the pv32 path uses `int $0x82` so necessarily has higher overhead. Therefore, dropping the lfences is less over an overall improvement. I don't know why the Naples pv32 improvement is so small, but I've double checked the numbers and they're consistent. There's presumably something we're doing which is a large overhead in the pipeline. On the Intel side, both systems are writing to MSR_SPEC_CTRL on entry/exit (SKX using the retrofitted microcode implementation, CFL-R using the hardware implementation), while SKX is suffering further from XPTI for Meltdown protection. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/pv/hypercall.c | 24 +++++++++++++++++++----- xen/arch/x86/pv/traps.c | 11 ----------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 9765e674cf..3579ba905c 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -109,15 +110,15 @@ const pv_hypercall_table_t pv_hypercall_table[] = { #undef COMPAT_CALL #undef HYPERCALL -void pv_hypercall(struct cpu_user_regs *regs) +/* Forced inline to cause 'compat' to be evaluated at compile time. */ +static void always_inline +_pv_hypercall(struct cpu_user_regs *regs, bool compat) { struct vcpu *curr = current; - unsigned long eax; + unsigned long eax = compat ? regs->eax : regs->rax; ASSERT(guest_kernel_mode(curr, regs)); - eax = is_pv_32bit_vcpu(curr) ? regs->eax : regs->rax; - BUILD_BUG_ON(ARRAY_SIZE(pv_hypercall_table) > ARRAY_SIZE(hypercall_args_table)); @@ -137,7 +138,7 @@ void pv_hypercall(struct cpu_user_regs *regs) curr->hcall_preempted = false; - if ( !is_pv_32bit_vcpu(curr) ) + if ( !compat ) { unsigned long rdi = regs->rdi; unsigned long rsi = regs->rsi; @@ -348,8 +349,21 @@ void pv_ring1_init_hypercall_page(void *p) *(u8 *)(p+ 7) = 0xc3; /* ret */ } } + +void do_entry_int82(struct cpu_user_regs *regs) +{ + if ( unlikely(untrusted_msi) ) + check_for_unexpected_msi((uint8_t)regs->entry_vector); + + _pv_hypercall(regs, true /* compat */); +} #endif +void pv_hypercall(struct cpu_user_regs *regs) +{ + _pv_hypercall(regs, false /* native */); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 764773c021..1e05a9f1cd 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -24,22 +24,11 @@ #include #include -#include #include #include #include #include -#ifdef CONFIG_PV32 -void do_entry_int82(struct cpu_user_regs *regs) -{ - if ( unlikely(untrusted_msi) ) - check_for_unexpected_msi((uint8_t)regs->entry_vector); - - pv_hypercall(regs); -} -#endif - void pv_inject_event(const struct x86_event *event) { struct vcpu *curr = current; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 00:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 00:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207820.363754 (Exim 4.92) (envelope-from ) id 1maSXy-0000o1-Q0; Wed, 13 Oct 2021 00:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207820.363754; Wed, 13 Oct 2021 00:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSXy-0000nw-N5; Wed, 13 Oct 2021 00:55:06 +0000 Received: by outflank-mailman (input) for mailman id 207820; Wed, 13 Oct 2021 00:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSXx-0000nO-Mb for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSXx-0006LM-LY for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maSXx-0005mU-KS for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=r1S4DkpEjWKQC+0x1qHT+csuIhlAVE8MJImx+d7r3ak=; b=Ss0TZepGnbHZFjebmgxFsMYu+5 B95r7PsPz+BuvXG3BgbxMbmav9fe7lxQkF9HRjTH2TxxnnZwQ7M3LLtpbHT3PsQRTczz0Enw4tvXc iLZMJvsMSkrjePxRo+HGOrT1w1qPJCkIPDb38ElQp+ntW/knFnxgJEnKA2GRfQFEv3NI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/efi: Use dom0less configuration when using EFI boot Message-Id: Date: Wed, 13 Oct 2021 00:55:05 +0000 commit a1743fc3a9fe9b68c265c45264dddf214fd9b882 Author: Luca Fancellu AuthorDate: Mon Oct 11 19:15:27 2021 +0100 Commit: Stefano Stabellini CommitDate: Tue Oct 12 13:06:46 2021 -0700 arm/efi: Use dom0less configuration when using EFI boot This patch introduces the support for dom0less configuration when using UEFI boot on ARM, it permits the EFI boot to continue if no dom0 kernel is specified but at least one domU is found. Introduce the new property "xen,uefi-binary" for device tree boot module nodes that are subnode of "xen,domain" compatible nodes. The property holds a string containing the file name of the binary that shall be loaded by the uefi loader from the filesystem. Introduce a new call efi_check_dt_boot(...) called during EFI boot that checks for module to be loaded using device tree. Architectures that don't support device tree don't have to provide this function. Update efi documentation about how to start a dom0less setup using UEFI Signed-off-by: Luca Fancellu [stefano: drop inline from efi_check_dt_boot] Signed-off-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- docs/misc/arm/device-tree/booting.txt | 21 +++ docs/misc/efi.pandoc | 203 +++++++++++++++++++++++ xen/arch/arm/efi/efi-boot.h | 299 +++++++++++++++++++++++++++++++++- xen/common/efi/boot.c | 39 +++-- 4 files changed, 550 insertions(+), 12 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 352b0ec43a..7258e7e1ec 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -190,6 +190,13 @@ The kernel sub-node has the following properties: Command line parameters for the guest kernel. +- xen,uefi-binary (UEFI boot only) + + String property that specifies the file name to be loaded by the UEFI boot + for this module. If this is specified, there is no need to specify the reg + property because it will be created by the UEFI stub on boot. + This option is needed only when UEFI boot is used. + The ramdisk sub-node has the following properties: - compatible @@ -201,6 +208,13 @@ The ramdisk sub-node has the following properties: Specifies the physical address of the ramdisk in RAM and its length. +- xen,uefi-binary (UEFI boot only) + + String property that specifies the file name to be loaded by the UEFI boot + for this module. If this is specified, there is no need to specify the reg + property because it will be created by the UEFI stub on boot. + This option is needed only when UEFI boot is used. + Example ======= @@ -265,6 +279,13 @@ The dtb sub-node should have the following properties: Specifies the physical address of the device tree binary fragment RAM and its length. +- xen,uefi-binary (UEFI boot only) + + String property that specifies the file name to be loaded by the UEFI boot + for this module. If this is specified, there is no need to specify the reg + property because it will be created by the UEFI stub on boot. + This option is needed only when UEFI boot is used. + As an example: module@0xc000000 { diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index ed85351541..876cd55005 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -167,3 +167,206 @@ sbsign \ --output xen.signed.efi \ xen.unified.efi ``` + +## UEFI boot and dom0less on ARM + +Dom0less feature is supported by ARM and it is possible to use it when Xen is +started as an EFI application. +The way to specify the domU domains is by Device Tree as specified in the +[dom0less](dom0less.html) documentation page under the "Device Tree +configuration" section, but instead of declaring the reg property in the boot +module, the user must specify the "xen,uefi-binary" property containing the name +of the binary file that has to be loaded in memory. +The UEFI stub will load the binary in memory and it will add the reg property +accordingly. + +An example here: + +domU1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "xen,domain"; + memory = <0 0x20000>; + cpus = <1>; + vpl011; + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "vmlinuz-3.0.31-0.4-xen"; + bootargs = "console=ttyAMA0"; + }; + module@2 { + compatible = "multiboot,ramdisk", "multiboot,module"; + xen,uefi-binary = "initrd-3.0.31-0.4-xen"; + }; + module@3 { + compatible = "multiboot,ramdisk", "multiboot,module"; + xen,uefi-binary = "passthrough.dtb"; + }; +}; + +## How to boot different Xen setup using UEFI + +These are the different ways to boot a Xen system from UEFI: + + - Boot Xen and Dom0 (minimum required) + - Boot Xen and DomU(s) (true dom0less, only on ARM) + - Boot Xen, Dom0 and DomU(s) (only on ARM) + +### Boot Xen and Dom0 + +This configuration can be started using the Xen configuration file in the +example above. + +### Boot Xen and DomU(s) + +This configuration needs the domU domain(s) specified in the /chosen node, +examples of how to do that are provided by the documentation about dom0less +and the example above shows how to use the "xen,uefi-binary" property to use the +UEFI stub for module loading. +When adding DomU modules to device tree, also add the property +xen,uefi-cfg-load under chosen for Xen to load the Xen config file. +Otherwise, Xen will skip the config file and rely on device tree alone. + +Example 1 of how to boot a true dom0less configuration: + +Xen configuration file: skipped. + +Device tree: + +``` +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,xen-bootargs = "" + + domU1 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0xc0000>; + vpl011; + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu1.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; + domU2 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0x100000>; + vpl011; + + module@2 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu2.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; +}; +``` + +Example 2 of how to boot a true dom0less configuration: + +Xen configuration file: + +``` +[global] +default=xen + +[xen] +options= +dtb= +``` + +Device tree: + +``` +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,uefi-cfg-load; + + domU1 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0xc0000>; + vpl011; + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu1.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; + domU2 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0x100000>; + vpl011; + + module@2 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu2.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; +}; +``` + +### Boot Xen, Dom0 and DomU(s) + +This configuration is a mix of the two configuration above, to boot this one +the configuration file must be processed so the /chosen node must have the +"xen,uefi-cfg-load" property. + +Here an example: + +Xen configuration file: + +``` +[global] +default=xen + +[xen] +options= +kernel=vmlinuz-3.0.31-0.4-xen [domain 0 command line options] +ramdisk=initrd-3.0.31-0.4-xen +dtb= +``` + +Device tree: + +``` +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,uefi-cfg-load; + + domU1 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0xc0000>; + vpl011; + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu1.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; +}; +``` + + diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index e63dafac26..0d86043567 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -8,9 +8,49 @@ #include #include +typedef struct { + char *name; + unsigned int name_len; + EFI_PHYSICAL_ADDRESS addr; + UINTN size; +} module_name; + +/* + * Binaries will be translated into bootmodules, the maximum number for them is + * MAX_MODULES where we should remove a unit for Xen and one for Xen DTB + */ +#define MAX_UEFI_MODULES (MAX_MODULES - 2) +static struct file __initdata module_binary; +static module_name __initdata modules[MAX_UEFI_MODULES]; +static unsigned int __initdata modules_available = MAX_UEFI_MODULES; +static unsigned int __initdata modules_idx; + +#define ERROR_BINARY_FILE_NOT_FOUND (-1) +#define ERROR_ALLOC_MODULE_NO_SPACE (-1) +#define ERROR_ALLOC_MODULE_NAME (-2) +#define ERROR_MISSING_DT_PROPERTY (-3) +#define ERROR_RENAME_MODULE_NAME (-4) +#define ERROR_SET_REG_PROPERTY (-5) +#define ERROR_CHECK_MODULE_COMPAT (-6) +#define ERROR_DT_MODULE_DOMU (-1) +#define ERROR_DT_CHOSEN_NODE (-2) + void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); void __flush_dcache_area(const void *vaddr, unsigned long size); +static int get_module_file_index(const char *name, unsigned int name_len); +static void PrintMessage(const CHAR16 *s); +static int allocate_module_file(EFI_FILE_HANDLE dir_handle, + const char *name, + unsigned int name_len); +static int handle_module_node(EFI_FILE_HANDLE dir_handle, + int module_node_offset, + int reg_addr_cells, + int reg_size_cells); +static int handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, + int domain_node); +static int efi_check_dt_boot(EFI_FILE_HANDLE dir_handle); + #define DEVICE_TREE_GUID \ {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} @@ -552,8 +592,254 @@ static void __init efi_arch_handle_module(const struct file *file, kernel.size) < 0 ) blexit(L"Unable to set reg property."); } - else + else if ( file != &module_binary ) + /* + * If file is not a dom0 module file and it's not a domU module, + * stop here. + */ blexit(L"Unknown module type"); + + /* + * modules_available is decremented here because for each dom0 file added + * from the configuration file, there will be an additional bootmodule, + * so the number of available slots will be decremented because there is a + * maximum amount of bootmodules that can be loaded. + */ + modules_available--; +} + +/* + * This function checks for a binary previously loaded with a give name, it + * returns the index of the file in the modules array or a negative number if no + * file with that name is found. + */ +static int __init get_module_file_index(const char *name, + unsigned int name_len) +{ + unsigned int i; + int ret = ERROR_BINARY_FILE_NOT_FOUND; + + for ( i = 0; i < modules_idx; i++ ) + { + module_name *mod = &modules[i]; + if ( (mod->name_len == name_len) && + (strncmp(mod->name, name, name_len) == 0) ) + { + ret = i; + break; + } + } + return ret; +} + +static void __init PrintMessage(const CHAR16 *s) +{ + PrintStr(s); + PrintStr(newline); +} + +/* + * This function allocates a binary and keeps track of its name, it returns the + * index of the file in the modules array or a negative number on error. + */ +static int __init allocate_module_file(EFI_FILE_HANDLE dir_handle, + const char *name, + unsigned int name_len) +{ + module_name *file_name; + union string module_name; + int ret; + + /* + * Check if there is any space left for a module, the variable + * modules_available is updated each time we use read_file(...) + * successfully. + */ + if ( !modules_available ) + { + PrintMessage(L"No space left for modules"); + return ERROR_ALLOC_MODULE_NO_SPACE; + } + + module_name.cs = name; + ret = modules_idx; + + /* Save at this index the name of this binary */ + file_name = &modules[ret]; + + if ( efi_bs->AllocatePool(EfiLoaderData, (name_len + 1) * sizeof(char), + (void**)&file_name->name) != EFI_SUCCESS ) + { + PrintMessage(L"Error allocating memory for module binary name"); + return ERROR_ALLOC_MODULE_NAME; + } + + /* Save name and length of the binary in the data structure */ + strlcpy(file_name->name, name, name_len + 1); + file_name->name_len = name_len; + + /* Load the binary in memory */ + read_file(dir_handle, s2w(&module_name), &module_binary, NULL); + + /* Save address and size */ + file_name->addr = module_binary.addr; + file_name->size = module_binary.size; + + /* s2w(...) allocates some memory, free it */ + efi_bs->FreePool(module_name.w); + + modules_idx++; + + return ret; +} + +/* + * This function checks for the presence of the xen,uefi-binary property in the + * module, if found it loads the binary as module and sets the right address + * for the reg property into the module DT node. + */ +static int __init handle_module_node(EFI_FILE_HANDLE dir_handle, + int module_node_offset, + int reg_addr_cells, + int reg_size_cells) +{ + const void *uefi_name_prop; + char mod_string[24]; /* Placeholder for module@ + a 64-bit number + \0 */ + int uefi_name_len, file_idx, module_compat; + module_name *file; + + /* Check if the node is a multiboot,module otherwise return */ + module_compat = fdt_node_check_compatible(fdt, module_node_offset, + "multiboot,module"); + if ( module_compat < 0 ) + /* Error while checking the compatible string */ + return ERROR_CHECK_MODULE_COMPAT; + + if ( module_compat != 0 ) + /* Module is not a multiboot,module */ + return 0; + + /* Read xen,uefi-binary property to get the file name. */ + uefi_name_prop = fdt_getprop(fdt, module_node_offset, "xen,uefi-binary", + &uefi_name_len); + + if ( !uefi_name_prop ) + /* Property not found */ + return 0; + + file_idx = get_module_file_index(uefi_name_prop, uefi_name_len); + if ( file_idx < 0 ) + { + file_idx = allocate_module_file(dir_handle, uefi_name_prop, + uefi_name_len); + if ( file_idx < 0 ) + return file_idx; + } + + file = &modules[file_idx]; + + snprintf(mod_string, sizeof(mod_string), "module@%"PRIx64, file->addr); + + /* Rename the module to be module@{address} */ + if ( fdt_set_name(fdt, module_node_offset, mod_string) < 0 ) + { + PrintMessage(L"Unable to modify module node name."); + return ERROR_RENAME_MODULE_NAME; + } + + if ( fdt_set_reg(fdt, module_node_offset, reg_addr_cells, reg_size_cells, + file->addr, file->size) < 0 ) + { + PrintMessage(L"Unable to set module reg property."); + return ERROR_SET_REG_PROPERTY; + } + + return 0; +} + +/* + * This function checks for boot modules under the domU guest domain node + * in the DT. + * Returns 0 on success, negative number on error. + */ +static int __init handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, + int domain_node) +{ + int module_node, addr_cells, size_cells, len; + const struct fdt_property *prop; + + /* Get #address-cells and #size-cells from domain node */ + prop = fdt_get_property(fdt, domain_node, "#address-cells", &len); + if ( !prop ) + { + PrintMessage(L"#address-cells not found in domain node."); + return ERROR_MISSING_DT_PROPERTY; + } + + addr_cells = fdt32_to_cpu(*((uint32_t *)prop->data)); + + prop = fdt_get_property(fdt, domain_node, "#size-cells", &len); + if ( !prop ) + { + PrintMessage(L"#size-cells not found in domain node."); + return ERROR_MISSING_DT_PROPERTY; + } + + size_cells = fdt32_to_cpu(*((uint32_t *)prop->data)); + + /* Check for nodes compatible with multiboot,module inside this node */ + for ( module_node = fdt_first_subnode(fdt, domain_node); + module_node > 0; + module_node = fdt_next_subnode(fdt, module_node) ) + { + int ret = handle_module_node(dir_handle, module_node, addr_cells, + size_cells); + if ( ret < 0 ) + return ret; + } + + return 0; +} + +/* + * This function checks for xen domain nodes under the /chosen node for possible + * domU guests to be loaded. + * Returns the number of modules loaded or a negative number for error. + */ +static int __init efi_check_dt_boot(EFI_FILE_HANDLE dir_handle) +{ + int chosen, node, addr_len, size_len; + unsigned int i = 0; + + /* Check for the chosen node in the current DTB */ + chosen = setup_chosen_node(fdt, &addr_len, &size_len); + if ( chosen < 0 ) + { + PrintMessage(L"Unable to setup chosen node"); + return ERROR_DT_CHOSEN_NODE; + } + + /* Check for nodes compatible with xen,domain under the chosen node */ + for ( node = fdt_first_subnode(fdt, chosen); + node > 0; + node = fdt_next_subnode(fdt, node) ) + { + if ( !fdt_node_check_compatible(fdt, node, "xen,domain") ) + { + /* Found a node with compatible xen,domain; handle this node. */ + if ( handle_dom0less_domain_node(dir_handle, node) < 0 ) + return ERROR_DT_MODULE_DOMU; + } + } + + /* Free boot modules file names if any */ + for ( ; i < modules_idx; i++ ) + { + /* Free boot modules binary names */ + efi_bs->FreePool(modules[i].name); + } + + return modules_idx; } static void __init efi_arch_cpu(void) @@ -562,8 +848,19 @@ static void __init efi_arch_cpu(void) static void __init efi_arch_blexit(void) { + unsigned int i = 0; + if ( dtbfile.need_to_free ) efi_bs->FreePages(dtbfile.addr, PFN_UP(dtbfile.size)); + /* Free boot modules file names if any */ + for ( ; i < modules_idx; i++ ) + { + /* Free boot modules binary names */ + efi_bs->FreePool(modules[i].name); + /* Free modules binaries */ + efi_bs->FreePages(modules[i].addr, + PFN_UP(modules[i].size)); + } if ( memmap ) efi_bs->FreePool(memmap); } diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 758f9d74d2..c9fdb5a3db 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -166,6 +166,13 @@ static void __init PrintErr(const CHAR16 *s) StdErr->OutputString(StdErr, (CHAR16 *)s ); } +#ifndef CONFIG_HAS_DEVICE_TREE +static int __init efi_check_dt_boot(EFI_FILE_HANDLE dir_handle) +{ + return 0; +} +#endif + /* * Include architecture specific implementation here, which references the * static globals defined above. @@ -1136,6 +1143,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) bool base_video = false; const char *option_str; bool use_cfg_file; + int dt_modules_found; + EFI_FILE_HANDLE dir_handle; __set_bit(EFI_BOOT, &efi_flags); __set_bit(EFI_LOADER, &efi_flags); @@ -1216,9 +1225,11 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_relocate_image(0); + /* Get the file system interface. */ + dir_handle = get_parent_handle(loaded_image, &file_name); + if ( use_cfg_file ) { - EFI_FILE_HANDLE dir_handle; UINTN depth, cols, rows, size; size = cols = rows = depth = 0; @@ -1229,9 +1240,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) gop = efi_get_gop(); - /* Get the file system interface. */ - dir_handle = get_parent_handle(loaded_image, &file_name); - /* Read and parse the config file. */ if ( read_section(loaded_image, L"config", &cfg, NULL) ) PrintStr(L"Using builtin config file\r\n"); @@ -1285,14 +1293,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_bs->FreePool(name.w); } - if ( !name.s ) - blexit(L"No Dom0 kernel image specified."); - efi_arch_cfg_file_early(loaded_image, dir_handle, section.s); - option_str = split_string(name.s); + option_str = name.s ? split_string(name.s) : NULL; - if ( !read_section(loaded_image, L"kernel", &kernel, option_str) ) + if ( !read_section(loaded_image, L"kernel", &kernel, option_str) && + name.s ) { read_file(dir_handle, s2w(&name), &kernel, option_str); efi_bs->FreePool(name.w); @@ -1361,12 +1367,23 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); cfg.addr = 0; - dir_handle->Close(dir_handle); - if ( gop && !base_video ) gop_mode = efi_find_gop_mode(gop, cols, rows, depth); } + /* Get the number of boot modules specified on the DT or an error (<0) */ + dt_modules_found = efi_check_dt_boot(dir_handle); + + dir_handle->Close(dir_handle); + + if ( dt_modules_found < 0 ) + /* efi_check_dt_boot throws some error */ + blexit(L"Error processing boot modules on DT."); + + /* Check if at least one of Dom0 or DomU(s) is specified */ + if ( !dt_modules_found && !kernel.ptr ) + blexit(L"No initial domain kernel specified."); + efi_arch_edd(); /* XXX Collect EDID info. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 00:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 00:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207823.363759 (Exim 4.92) (envelope-from ) id 1maSY8-00011c-Tr; Wed, 13 Oct 2021 00:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207823.363759; Wed, 13 Oct 2021 00:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSY8-00011U-QT; Wed, 13 Oct 2021 00:55:16 +0000 Received: by outflank-mailman (input) for mailman id 207823; Wed, 13 Oct 2021 00:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSY7-000112-S3 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSY7-0006LX-Qu for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maSY7-0005nS-Ob for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=C4vS446KESnMoXY3RCfkEMfwpR1vM7eatVmI+4t+hYw=; b=gQddIaG5JSpt3ttf9nsmifRrCy CN8+A/h0N4p6NjnqKgfkOqZLhX9Mvq+Hd0zCj1pqmgK6w+dKoNx4UpIJ7TDGxATBfh8ZDeNv2cdaL YtBTmfYiJzQVcob2N/N9kQ7kqPa8eFQxE094IxSgs+3klgDLm+uPMqveotz3Z5FT6R5M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen+tools: Introduce XEN_SYSCTL_PHYSCAP_vpmu Message-Id: Date: Wed, 13 Oct 2021 00:55:15 +0000 commit 3b38b1d96408cf4ee9eb78801e277f5a048e07b0 Author: Michal Orzel AuthorDate: Tue Oct 12 10:13:21 2021 +0200 Commit: Stefano Stabellini CommitDate: Tue Oct 12 14:50:45 2021 -0700 xen+tools: Introduce XEN_SYSCTL_PHYSCAP_vpmu Introduce flag XEN_SYSCTL_PHYSCAP_vpmu which indicates whether the platform supports vPMU functionality. Modify Xen and tools accordingly. Take the opportunity and fix XEN_SYSCTL_PHYSCAP_vmtrace definition in sysctl.h which wrongly use (1 << 6) instead of (1u << 6). Signed-off-by: Michal Orzel Reviewed-by: Bertrand Marquis Acked-by: Nick Rosbrook Reviewed-by: Stefano Stabellini Acked-by: Ian Jackson Acked-by: Christian Lindig --- tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 6 ++++++ tools/libs/light/libxl.c | 1 + tools/libs/light/libxl_types.idl | 1 + tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/xl/xl_info.c | 5 +++-- xen/common/domain.c | 2 ++ xen/common/sysctl.c | 3 +++ xen/include/public/sysctl.h | 6 ++++-- xen/include/xen/domain.h | 2 ++ 12 files changed, 27 insertions(+), 4 deletions(-) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index bfc1e7f312..c8669837d8 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -3360,6 +3360,7 @@ x.CapHap = bool(xc.cap_hap) x.CapShadow = bool(xc.cap_shadow) x.CapIommuHapPtShare = bool(xc.cap_iommu_hap_pt_share) x.CapVmtrace = bool(xc.cap_vmtrace) +x.CapVpmu = bool(xc.cap_vpmu) return nil} @@ -3391,6 +3392,7 @@ xc.cap_hap = C.bool(x.CapHap) xc.cap_shadow = C.bool(x.CapShadow) xc.cap_iommu_hap_pt_share = C.bool(x.CapIommuHapPtShare) xc.cap_vmtrace = C.bool(x.CapVmtrace) +xc.cap_vpmu = C.bool(x.CapVpmu) return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 09a3bb67e2..45f2cba3d2 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -1008,6 +1008,7 @@ CapHap bool CapShadow bool CapIommuHapPtShare bool CapVmtrace bool +CapVpmu bool } type Connectorinfo struct { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index b9ba16d698..ec5e3badae 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -502,6 +502,12 @@ */ #define LIBXL_HAVE_X86_MSR_RELAXED 1 +/* + * LIBXL_HAVE_PHYSINFO_CAP_VPMU indicates that libxl_physinfo has a cap_vpmu + * field, which indicates the availability of vPMU functionality. + */ +#define LIBXL_HAVE_PHYSINFO_CAP_VPMU 1 + /* * libxl ABI compatibility * diff --git a/tools/libs/light/libxl.c b/tools/libs/light/libxl.c index 204eb0be2d..a032723fde 100644 --- a/tools/libs/light/libxl.c +++ b/tools/libs/light/libxl.c @@ -404,6 +404,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo) !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share); physinfo->cap_vmtrace = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_vmtrace); + physinfo->cap_vpmu = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_vpmu); GC_FREE; return 0; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 3f9fff653a..993e83acca 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -1061,6 +1061,7 @@ libxl_physinfo = Struct("physinfo", [ ("cap_shadow", bool), ("cap_iommu_hap_pt_share", bool), ("cap_vmtrace", bool), + ("cap_vpmu", bool), ], dir=DIR_OUT) libxl_connectorinfo = Struct("connectorinfo", [ diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 7ed1c00e47..7a4030a192 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -122,6 +122,7 @@ type physinfo_cap_flag = | CAP_Shadow | CAP_IOMMU_HAP_PT_SHARE | CAP_Vmtrace + | CAP_Vpmu type physinfo = { diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 391d4abdf8..6900513e7f 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -107,6 +107,7 @@ type physinfo_cap_flag = | CAP_Shadow | CAP_IOMMU_HAP_PT_SHARE | CAP_Vmtrace + | CAP_Vpmu type physinfo = { threads_per_core : int; diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index 8383e4a6df..2c86b317b7 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -210,7 +210,7 @@ static void output_physinfo(void) info.hw_cap[4], info.hw_cap[5], info.hw_cap[6], info.hw_cap[7] ); - maybe_printf("virt_caps :%s%s%s%s%s%s%s%s\n", + maybe_printf("virt_caps :%s%s%s%s%s%s%s%s%s\n", info.cap_pv ? " pv" : "", info.cap_hvm ? " hvm" : "", info.cap_hvm && info.cap_hvm_directio ? " hvm_directio" : "", @@ -218,7 +218,8 @@ static void output_physinfo(void) info.cap_hap ? " hap" : "", info.cap_shadow ? " shadow" : "", info.cap_iommu_hap_pt_share ? " iommu_hap_pt_share" : "", - info.cap_vmtrace ? " vmtrace" : "" + info.cap_vmtrace ? " vmtrace" : "", + info.cap_vpmu ? " vpmu" : "" ); vinfo = libxl_get_version_info(ctx); diff --git a/xen/common/domain.c b/xen/common/domain.c index 40d67ec342..262b6c0c3c 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -84,6 +84,8 @@ vcpu_info_t dummy_vcpu_info; bool __read_mostly vmtrace_available; +bool __read_mostly vpmu_is_available; + static void __domain_finalise_shutdown(struct domain *d) { struct vcpu *v; diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 3558641cd9..6e7189bb3c 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -280,6 +280,9 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) if ( vmtrace_available ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_vmtrace; + if ( vpmu_is_available ) + pi->capabilities |= XEN_SYSCTL_PHYSCAP_vpmu; + if ( copy_to_guest(u_sysctl, op, 1) ) ret = -EFAULT; } diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 039ccf885c..fead0e5b53 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -100,10 +100,12 @@ struct xen_sysctl_tbuf_op { #define _XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share 5 #define XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share \ (1u << _XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share) -#define XEN_SYSCTL_PHYSCAP_vmtrace (1 << 6) +#define XEN_SYSCTL_PHYSCAP_vmtrace (1u << 6) +/* The platform supports vPMU. */ +#define XEN_SYSCTL_PHYSCAP_vpmu (1u << 7) /* Max XEN_SYSCTL_PHYSCAP_* constant. Used for ABI checking. */ -#define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_vmtrace +#define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_vpmu struct xen_sysctl_physinfo { uint32_t threads_per_core; diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 1708c36964..160c8dbdab 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -133,4 +133,6 @@ static inline void vnuma_destroy(struct vnuma_info *vnuma) { ASSERT(!vnuma); } extern bool vmtrace_available; +extern bool vpmu_is_available; + #endif /* __XEN_DOMAIN_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 00:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 00:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207825.363763 (Exim 4.92) (envelope-from ) id 1maSYI-0001AU-VF; Wed, 13 Oct 2021 00:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207825.363763; Wed, 13 Oct 2021 00:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSYI-0001AM-S9; Wed, 13 Oct 2021 00:55:26 +0000 Received: by outflank-mailman (input) for mailman id 207825; Wed, 13 Oct 2021 00:55:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSYH-00018m-Ui for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maSYH-0006Ln-Tx for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maSYH-0005oK-Sy for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 00:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jz7hhjsRZGyKRUqWpKbRkiY14d4Z1asMsi/+S9rvfuw=; b=f0N/QYAWF12hDmvj7U4RsYap0Q tLI8OmKEGLf49VRLpUWPq2pbVYwMQBPsQoJAe1sIQJ12l8cLFgHcd1nagTSER5NuDb50CHa7Q1iIa bIRcfXfoqa7Tm2ecSFgjBm6K+vjyUK0sNxFgd37cFfcSMNF0P52cnshK4Ism7uugupUQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Check for PMU platform support Message-Id: Date: Wed, 13 Oct 2021 00:55:25 +0000 commit f9294486926c865a3ef11cacd7cb6b26cce6f4a4 Author: Michal Orzel AuthorDate: Tue Oct 12 10:13:22 2021 +0200 Commit: Stefano Stabellini CommitDate: Tue Oct 12 15:25:52 2021 -0700 xen/arm: Check for PMU platform support ID_AA64DFR0_EL1/ID_DFR0_EL1 registers provide information about PMU support. Replace structure dbg64/dbg32 with a union and fill in all the register fields according to document: ARM Architecture Registers(DDI 0595, 2021-06). Add macros boot_dbg_feature64/boot_dbg_feature32 to check for a debug feature. Add macro cpu_has_pmu to check for PMU support. Any value higher than 0 and less than 15 means that PMU is supported (we do not care about its version for now). Signed-off-by: Michal Orzel [stefano: add in-code comment] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/include/asm-arm/cpufeature.h | 59 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 5ca09b0bff..8a5afbaf0b 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -4,6 +4,7 @@ #ifdef CONFIG_ARM_64 #define cpu_feature64(c, feat) ((c)->pfr64.feat) #define boot_cpu_feature64(feat) (system_cpuinfo.pfr64.feat) +#define boot_dbg_feature64(feat) (system_cpuinfo.dbg64.feat) #define cpu_feature64_has_el0_32(c) (cpu_feature64(c, el0) == 2) @@ -22,6 +23,7 @@ #define cpu_feature32(c, feat) ((c)->pfr32.feat) #define boot_cpu_feature32(feat) (system_cpuinfo.pfr32.feat) +#define boot_dbg_feature32(feat) (system_cpuinfo.dbg32.feat) #define cpu_has_arm (boot_cpu_feature32(arm) == 1) #define cpu_has_thumb (boot_cpu_feature32(thumb) >= 1) @@ -32,8 +34,20 @@ #ifdef CONFIG_ARM_32 #define cpu_has_gentimer (boot_cpu_feature32(gentimer) == 1) +/* + * On Armv7, the value 0 is used to indicate that PMUv2 is not + * supported. IOW this doesn't tell us whether the PMU is not supported + * (a processor may implement PMUv1). + * + * For convenience, we treat 0 as not supported which matches the + * meaning on Armv8 + */ +#define cpu_has_pmu ((boot_dbg_feature32(perfmon) >= 1) && \ + (boot_dbg_feature32(perfmon) < 15)) #else #define cpu_has_gentimer (1) +#define cpu_has_pmu ((boot_dbg_feature64(pmu_ver) >= 1) && \ + (boot_dbg_feature64(pmu_ver) < 15)) #endif #define cpu_has_security (boot_cpu_feature32(security) > 0) @@ -181,8 +195,28 @@ struct cpuinfo_arm { }; } pfr64; - struct { + union { register_t bits[2]; + struct { + /* DFR0 */ + unsigned long debug_ver:4; + unsigned long trace_ver:4; + unsigned long pmu_ver:4; + unsigned long brps:4; + unsigned long __res0:4; + unsigned long wrps:4; + unsigned long __res1:4; + unsigned long ctx_cmps:4; + unsigned long pms_ver:4; + unsigned long double_lock:4; + unsigned long trace_filt:4; + unsigned long __res2:4; + unsigned long mtpmu:4; + unsigned long __res3:12; + + /* DFR1 */ + unsigned long __res4:64; + }; } dbg64; struct { @@ -321,8 +355,29 @@ struct cpuinfo_arm { }; } pfr32; - struct { + union { register_t bits[2]; + struct { + /* DFR0 */ + unsigned long copdbg:4; + unsigned long copsdbg:4; + unsigned long mmapdbg:4; + unsigned long coptrc:4; + unsigned long mmaptrc:4; + unsigned long mprofdbg:4; + unsigned long perfmon:4; + unsigned long tracefilt:4; +#ifdef CONFIG_ARM_64 + unsigned long __res0:32; +#endif + + /* DFR1 */ + unsigned long mtpmu:4; + unsigned long __res1:28; +#ifdef CONFIG_ARM_64 + unsigned long __res2:32; +#endif + }; } dbg32; struct { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:55:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207930.363889 (Exim 4.92) (envelope-from ) id 1maYAJ-0007g2-3K; Wed, 13 Oct 2021 06:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207930.363889; Wed, 13 Oct 2021 06:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAJ-0007fu-0V; Wed, 13 Oct 2021 06:55:03 +0000 Received: by outflank-mailman (input) for mailman id 207930; Wed, 13 Oct 2021 06:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAI-0007fo-28 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAH-0006SR-Ow for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYAH-0007FI-Nj for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Bb6hA+SvYoYG6mIkvePEredYZnVO0lEzOmpp1Ic1vfQ=; b=Wvd4irhkDwwua03WcaMNKty/rJ Fu+FnTcpfdi6oVG+MQWWvoq0gV/AS/QrlO5YmqQB8e68X8fwjgWtqwRZq/bkVAuFtDBNiHudac1OY 7mFL+qCzNs9R5D+u9bBJLzh3LihL+DfHsZQYAT5+n/egoCi2qPOt1Af5GTYVVVR+X8Hs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Transitional change to build HAS_VPCI on ARM. Message-Id: Date: Wed, 13 Oct 2021 06:55:01 +0000 commit f38c8591351e29f70bdfeb7c5d360dea76fbe0a2 Author: Rahul Singh AuthorDate: Mon Oct 11 13:16:57 2021 -0700 Commit: Stefano Stabellini CommitDate: Mon Oct 11 13:16:57 2021 -0700 xen/arm: Transitional change to build HAS_VPCI on ARM. This patch will be reverted once we add support for VPCI MSI/MSIX support on ARM. Signed-off-by: Rahul Singh Acked-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Reviewed-by: Roger Pau Monné --- xen/drivers/vpci/Makefile | 3 ++- xen/drivers/vpci/header.c | 2 ++ xen/include/asm-arm/pci.h | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/drivers/vpci/Makefile b/xen/drivers/vpci/Makefile index 55d1bdfda0..1a1413b93e 100644 --- a/xen/drivers/vpci/Makefile +++ b/xen/drivers/vpci/Makefile @@ -1 +1,2 @@ -obj-y += vpci.o header.o msi.o msix.o +obj-y += vpci.o header.o +obj-$(CONFIG_HAS_PCI_MSI) += msi.o msix.o diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index ba9a036202..f8cd55e7c0 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -96,8 +96,10 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, * FIXME: punching holes after the p2m has been set up might be racy for * DomU usage, needs to be revisited. */ +#ifdef CONFIG_HAS_PCI_MSI if ( map && !rom_only && vpci_make_msix_hole(pdev) ) return; +#endif for ( i = 0; i < ARRAY_SIZE(header->bars); i++ ) { diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index 00ccc3161b..aa0762ff15 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -26,6 +26,14 @@ struct arch_pci_dev { struct device dev; }; +/* Arch-specific MSI data for vPCI. */ +struct vpci_arch_msi { +}; + +/* Arch-specific MSI-X entry data for vPCI. */ +struct vpci_arch_msix_entry { +}; + /* * Because of the header cross-dependencies, e.g. we need both * struct pci_dev and struct arch_pci_dev at the same time, this cannot be -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:55:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207931.363893 (Exim 4.92) (envelope-from ) id 1maYAT-0007jR-4l; Wed, 13 Oct 2021 06:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207931.363893; Wed, 13 Oct 2021 06: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 1maYAT-0007jJ-1z; Wed, 13 Oct 2021 06:55:13 +0000 Received: by outflank-mailman (input) for mailman id 207931; Wed, 13 Oct 2021 06:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAR-0007jD-T7 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAR-0006Sb-SH for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYAR-0007GN-R7 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06: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=W8xkH45AIQ27dHs2T5GFadVFoYndFOhySBNIzNZ+yTE=; b=D8E2ToVg5KCB0XPFrBXpCSFSBX 3y/bB4LF4tHFL1WbZgCa7whLVm79JECZHI2UH058qvc9e49MuUT0DsaxcGQy9d5es8Dwp3mVkCwdH 1chcQZCMCr/SEEjANmI8XyOkMPnbcVBhhvUthTT8BwKlUjF77IO8SPNDvwj91OOqGhQ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/efi: Fix null pointer dereference Message-Id: Date: Wed, 13 Oct 2021 06:55:11 +0000 commit 4817dbf1c808064ee15416dba1db30cb793dfa98 Author: Luca Fancellu AuthorDate: Mon Oct 11 08:56:38 2021 +0100 Commit: Stefano Stabellini CommitDate: Mon Oct 11 13:19:35 2021 -0700 arm/efi: Fix null pointer dereference Fix for commit 60649d443dc395243e74d2b3e05594ac0c43cfe3 that introduces a null pointer dereference when the fdt_node_offset_by_compatible is called with "fdt" argument null. Reported-by: Julien Grall Fixes: 60649d443d ("arm/efi: Introduce xen,uefi-cfg-load DT property") Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/efi/efi-boot.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index a3e46453d4..e63dafac26 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -593,7 +593,8 @@ static bool __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) dtbfile.ptr = fdt; dtbfile.need_to_free = false; /* Config table memory can't be freed. */ - if ( fdt_node_offset_by_compatible(fdt, 0, "multiboot,module") > 0 ) + if ( fdt && + (fdt_node_offset_by_compatible(fdt, 0, "multiboot,module") > 0) ) { /* Locate chosen node */ int node = fdt_subnode_offset(fdt, 0, "chosen"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:55:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207932.363897 (Exim 4.92) (envelope-from ) id 1maYAd-0007mw-6G; Wed, 13 Oct 2021 06:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207932.363897; Wed, 13 Oct 2021 06: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 1maYAd-0007mo-3Q; Wed, 13 Oct 2021 06:55:23 +0000 Received: by outflank-mailman (input) for mailman id 207932; Wed, 13 Oct 2021 06:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAb-0007mW-W8 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAb-0006St-VU for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYAb-0007HL-UV for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=i+G6lWlKSO8GVQRuwx5MlE7+u0WfJwhkVm1W0X6AUOg=; b=ZPWPeUAOs+XADWpD4C0AnZC2MS oGw3lroLQWNsRuzcy164gV1kesCzFCX22HAGzcwUt8Xt4CMgv0Q+Z0BfYOCERUEFHTMXJgdE3spWG EBwGGmViaTdpxq1HGN5yMTMHUtmzaq5HSRgR6vHyJJFYAtUs+ELq5ShmygGKLfWN6kjo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: Allow removing PCI devices for all types of domains Message-Id: Date: Wed, 13 Oct 2021 06:55:21 +0000 commit bc2bdd4af4cbccaa332ea01583bb4ac691c3532d Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 08:55:31 2021 +0300 Commit: Stefano Stabellini CommitDate: Mon Oct 11 13:27:04 2021 -0700 libxl: Allow removing PCI devices for all types of domains The PCI device remove path may now be used by PVH on ARM, so the assert is no longer valid. Signed-off-by: Oleksandr Andrushchenko Acked-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh Acked-by: Anthony PERARD --- tools/libs/light/libxl_pci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 1a1c263080..59f3686fc8 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1947,8 +1947,6 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) goto out_fail; } } else { - assert(type == LIBXL_DOMAIN_TYPE_PV); - char *sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/resource", pci->domain, pci->bus, pci->dev, pci->func); FILE *f = fopen(sysfs_path, "r"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:55:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207933.363902 (Exim 4.92) (envelope-from ) id 1maYAn-0007pr-84; Wed, 13 Oct 2021 06:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207933.363902; Wed, 13 Oct 2021 06: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 1maYAn-0007pf-50; Wed, 13 Oct 2021 06:55:33 +0000 Received: by outflank-mailman (input) for mailman id 207933; Wed, 13 Oct 2021 06:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAm-0007pV-3O for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAm-0006T4-2g for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYAm-0007IL-1d for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06: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=aax/H/HGko8oTF6OPG3jj9LXJB5kLBNlVHkctWOHchQ=; b=tLkR5UYrMYQd0K95scKoQnSGgl yf679ZkGT8trvWVQpKmf9VVU/RXCKqeyQfJjiHNIH1BxS17m8nbFrI/D5ikm0IOXkorKXoU4KCMwT gwxlvatS55QhihHcaJtJl/D44UZt5HsSeFkF9IwGAv0+gB4GS1e/y34AHRQIHnC77gfo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: Only map legacy PCI IRQs if they are supported Message-Id: Date: Wed, 13 Oct 2021 06:55:32 +0000 commit e26f810a6f9295afe30ea08195715ddd96e2a123 Author: Oleksandr Andrushchenko AuthorDate: Fri Oct 8 08:55:32 2021 +0300 Commit: Stefano Stabellini CommitDate: Mon Oct 11 13:29:13 2021 -0700 libxl: Only map legacy PCI IRQs if they are supported Arm's PCI passthrough implementation doesn't support legacy interrupts, but MSI/MSI-X. This can be the case for other platforms too. For that reason introduce a new CONFIG_PCI_SUPP_LEGACY_IRQ and add it to the CFLAGS and compile the relevant code in the toolstack only if applicable. Signed-off-by: Oleksandr Andrushchenko [stefano: minor change to Makefile] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Reviewed-by: Rahul Singh Tested-by: Rahul Singh Acked-by: Anthony PERARD --- tools/libs/light/Makefile | 2 ++ tools/libs/light/libxl_pci.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 7d8c51d492..194bc5f268 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -46,6 +46,8 @@ CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral CFLAGS += -I. +CFLAGS-$(CONFIG_X86) += -DCONFIG_PCI_SUPP_LEGACY_IRQ + SRCS-$(CONFIG_X86) += libxl_cpuid.c SRCS-$(CONFIG_X86) += libxl_x86.c SRCS-$(CONFIG_X86) += libxl_psr.c diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 59f3686fc8..4c2d7aeefb 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1364,6 +1364,15 @@ static void pci_add_timeout(libxl__egc *egc, libxl__ev_time *ev, pci_add_dm_done(egc, pas, rc); } +static bool pci_supp_legacy_irq(void) +{ +#ifdef CONFIG_PCI_SUPP_LEGACY_IRQ + return true; +#else + return false; +#endif +} + static void pci_add_dm_done(libxl__egc *egc, pci_add_state *pas, int rc) @@ -1434,6 +1443,8 @@ static void pci_add_dm_done(libxl__egc *egc, } } fclose(f); + if (!pci_supp_legacy_irq()) + goto out_no_irq; sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, pci->bus, pci->dev, pci->func); f = fopen(sysfs_path, "r"); @@ -1983,6 +1994,8 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) } fclose(f); skip1: + if (!pci_supp_legacy_irq()) + goto skip_irq; sysfs_path = GCSPRINTF(SYSFS_PCI_DEV"/"PCI_BDF"/irq", pci->domain, pci->bus, pci->dev, pci->func); f = fopen(sysfs_path, "r"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:55:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207934.363905 (Exim 4.92) (envelope-from ) id 1maYAx-0007sp-Ag; Wed, 13 Oct 2021 06:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207934.363905; Wed, 13 Oct 2021 06: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 1maYAx-0007sh-7j; Wed, 13 Oct 2021 06:55:43 +0000 Received: by outflank-mailman (input) for mailman id 207934; Wed, 13 Oct 2021 06:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAw-0007sW-70 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYAw-0006TE-6I for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYAw-0007JJ-5K for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06: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=ATAQH6MRGXZt7KDH+KILJK+IfsFyGMMAKBayvw3cahY=; b=Myp1Nuv+zoO4StYatf6Uz9/xZC zoQZ/ml+6GHpwzGuARTUoHKFq3qHVATK6YCROfy6jYM0NvRCXwOCBqwvdGesSe+QgGbs2780ShF08 qa4o0mVAK4JmzjwHWBH97Xh44yUkdjvqPuh06IRzH0+4BzH9Puy0stJIsxwe9gf5VsZs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: avoid building multiple .o from a single .c file Message-Id: Date: Wed, 13 Oct 2021 06:55:42 +0000 commit 71cf7634fa11038fd9a2aa471a1dc7714bb93e79 Author: Anthony PERARD AuthorDate: Tue Oct 12 11:48:46 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:48:46 2021 +0200 x86/mm: avoid building multiple .o from a single .c file This replace the use of a single .c file use for multiple .o file by creating multiple .c file including the first one. There's quite a few issues with trying to build more than one object file from a single source file: there's is a duplication of the make rules to generate those targets; there is an additional ".file" symbol added in order to differentiate between the object files; and the tools/symbols have an heuristic to try to pick up the right ".file". This patch adds new .c source file which avoid the need to add a second ".file" symbol and thus avoid the need to deal with those issues. Also remove __OBJECT_FILE__ from $(CC) command line as it isn't used anywhere anymore. And remove the macro "build-intermediate" since the generic rules for single targets can be used. And rename the objects in mm/hap/ to remove the extra "level". Signed-off-by: Anthony PERARD Reviewed-by: Andrew Cooper --- xen/Makefile | 11 ----------- xen/Rules.mk | 2 +- xen/arch/x86/mm/Makefile | 9 --------- xen/arch/x86/mm/guest_walk.c | 3 --- xen/arch/x86/mm/guest_walk_2.c | 2 ++ xen/arch/x86/mm/guest_walk_3.c | 2 ++ xen/arch/x86/mm/guest_walk_4.c | 2 ++ xen/arch/x86/mm/hap/Makefile | 15 +++------------ xen/arch/x86/mm/hap/guest_walk.c | 3 --- xen/arch/x86/mm/hap/guest_walk_2.c | 2 ++ xen/arch/x86/mm/hap/guest_walk_3.c | 2 ++ xen/arch/x86/mm/hap/guest_walk_4.c | 2 ++ xen/arch/x86/mm/shadow/Makefile | 9 --------- xen/arch/x86/mm/shadow/guest_2.c | 2 ++ xen/arch/x86/mm/shadow/guest_3.c | 2 ++ xen/arch/x86/mm/shadow/guest_4.c | 2 ++ xen/arch/x86/mm/shadow/multi.c | 3 --- xen/tools/symbols.c | 18 ++---------------- 18 files changed, 24 insertions(+), 67 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 7c2ffce0fc..5d01101662 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -518,17 +518,6 @@ _MAP: %/: FORCE $(MAKE) -f $(BASEDIR)/Rules.mk -C $* built_in.o built_in_bin.o -build-intermediate = $(eval $(call build-intermediate-closure,$(1))) -define build-intermediate-closure -$(1): FORCE - $(MAKE) -f $(BASEDIR)/Rules.mk -C $$(@D) $$(@F) -endef - -$(foreach base,arch/x86/mm/guest_walk_% \ - arch/x86/mm/hap/guest_walk_%level \ - arch/x86/mm/shadow/guest_%, \ - $(foreach ext,o i s,$(call build-intermediate,$(base).$(ext)))) - .PHONY: cloc cloc: $(eval tmpfile := $(shell mktemp)) diff --git a/xen/Rules.mk b/xen/Rules.mk index 8b8f9d347f..5e0699e58b 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -122,7 +122,7 @@ cpp_flags = $(filter-out -Wa$(comma)% -flto,$(1)) # Calculation of flags, first the generic flags, then the arch specific flags, # and last the flags modified for a target or a directory. -c_flags = -MMD -MP -MF $(@D)/.$(@F).d $(XEN_CFLAGS) '-D__OBJECT_FILE__="$@"' +c_flags = -MMD -MP -MF $(@D)/.$(@F).d $(XEN_CFLAGS) a_flags = -MMD -MP -MF $(@D)/.$(@F).d $(XEN_AFLAGS) include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile index 2818c066f7..6b7882d992 100644 --- a/xen/arch/x86/mm/Makefile +++ b/xen/arch/x86/mm/Makefile @@ -10,12 +10,3 @@ obj-$(CONFIG_MEM_SHARING) += mem_sharing.o obj-y += p2m.o obj-$(CONFIG_HVM) += p2m-ept.o p2m-pod.o p2m-pt.o obj-y += paging.o - -guest_walk_%.o: guest_walk.c Makefile - $(CC) $(c_flags) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_walk_%.i: guest_walk.c Makefile - $(CPP) $(call cpp_flags,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_walk_%.s: guest_walk.c Makefile - $(CC) $(filter-out -Wa$(comma)%,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -S $< -o $@ diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index 30d83cf1e0..b9f607272c 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -21,9 +21,6 @@ * along with this program; If not, see . */ -/* Allow uniquely identifying static symbols in the 3 generated objects. */ -asm(".file \"" __OBJECT_FILE__ "\""); - #include #include #include diff --git a/xen/arch/x86/mm/guest_walk_2.c b/xen/arch/x86/mm/guest_walk_2.c new file mode 100644 index 0000000000..defcd59bc2 --- /dev/null +++ b/xen/arch/x86/mm/guest_walk_2.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 2 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/guest_walk_3.c b/xen/arch/x86/mm/guest_walk_3.c new file mode 100644 index 0000000000..1c9eca3774 --- /dev/null +++ b/xen/arch/x86/mm/guest_walk_3.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 3 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/guest_walk_4.c b/xen/arch/x86/mm/guest_walk_4.c new file mode 100644 index 0000000000..aa3900338a --- /dev/null +++ b/xen/arch/x86/mm/guest_walk_4.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 4 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/hap/Makefile b/xen/arch/x86/mm/hap/Makefile index c6d296b517..8ef54b1faa 100644 --- a/xen/arch/x86/mm/hap/Makefile +++ b/xen/arch/x86/mm/hap/Makefile @@ -1,15 +1,6 @@ obj-y += hap.o -obj-y += guest_walk_2level.o -obj-y += guest_walk_3level.o -obj-y += guest_walk_4level.o +obj-y += guest_walk_2.o +obj-y += guest_walk_3.o +obj-y += guest_walk_4.o obj-y += nested_hap.o obj-y += nested_ept.o - -guest_walk_%level.o: guest_walk.c Makefile - $(CC) $(c_flags) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_walk_%level.i: guest_walk.c Makefile - $(CPP) $(call cpp_flags,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_walk_%level.s: guest_walk.c Makefile - $(CC) $(filter-out -Wa$(comma)%,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -S $< -o $@ diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c index f59ebc84a2..832a805847 100644 --- a/xen/arch/x86/mm/hap/guest_walk.c +++ b/xen/arch/x86/mm/hap/guest_walk.c @@ -18,9 +18,6 @@ * this program; If not, see . */ -/* Allow uniquely identifying static symbols in the 3 generated objects. */ -asm(".file \"" __OBJECT_FILE__ "\""); - #include #include #include diff --git a/xen/arch/x86/mm/hap/guest_walk_2.c b/xen/arch/x86/mm/hap/guest_walk_2.c new file mode 100644 index 0000000000..defcd59bc2 --- /dev/null +++ b/xen/arch/x86/mm/hap/guest_walk_2.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 2 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/hap/guest_walk_3.c b/xen/arch/x86/mm/hap/guest_walk_3.c new file mode 100644 index 0000000000..1c9eca3774 --- /dev/null +++ b/xen/arch/x86/mm/hap/guest_walk_3.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 3 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/hap/guest_walk_4.c b/xen/arch/x86/mm/hap/guest_walk_4.c new file mode 100644 index 0000000000..aa3900338a --- /dev/null +++ b/xen/arch/x86/mm/hap/guest_walk_4.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 4 +#include "guest_walk.c" diff --git a/xen/arch/x86/mm/shadow/Makefile b/xen/arch/x86/mm/shadow/Makefile index fd64b4dda9..b4a1620b69 100644 --- a/xen/arch/x86/mm/shadow/Makefile +++ b/xen/arch/x86/mm/shadow/Makefile @@ -5,12 +5,3 @@ obj-$(CONFIG_PV) += pv.o guest_4.o else obj-y += none.o endif - -guest_%.o: multi.c Makefile - $(CC) $(c_flags) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_%.i: multi.c Makefile - $(CPP) $(call cpp_flags,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -c $< -o $@ - -guest_%.s: multi.c Makefile - $(CC) $(filter-out -Wa$(comma)%,$(c_flags)) -DGUEST_PAGING_LEVELS=$* -S $< -o $@ diff --git a/xen/arch/x86/mm/shadow/guest_2.c b/xen/arch/x86/mm/shadow/guest_2.c new file mode 100644 index 0000000000..288b229982 --- /dev/null +++ b/xen/arch/x86/mm/shadow/guest_2.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 2 +#include "multi.c" diff --git a/xen/arch/x86/mm/shadow/guest_3.c b/xen/arch/x86/mm/shadow/guest_3.c new file mode 100644 index 0000000000..04e17b0b8a --- /dev/null +++ b/xen/arch/x86/mm/shadow/guest_3.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 3 +#include "multi.c" diff --git a/xen/arch/x86/mm/shadow/guest_4.c b/xen/arch/x86/mm/shadow/guest_4.c new file mode 100644 index 0000000000..c0c5d3cb11 --- /dev/null +++ b/xen/arch/x86/mm/shadow/guest_4.c @@ -0,0 +1,2 @@ +#define GUEST_PAGING_LEVELS 4 +#include "multi.c" diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 15265fc81d..a2fa7b87d8 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -20,9 +20,6 @@ * along with this program; If not, see . */ -/* Allow uniquely identifying static symbols in the 3 generated objects. */ -asm(".file \"" __OBJECT_FILE__ "\""); - #include #include #include diff --git a/xen/tools/symbols.c b/xen/tools/symbols.c index 0b12452616..710e9785d3 100644 --- a/xen/tools/symbols.c +++ b/xen/tools/symbols.c @@ -84,7 +84,6 @@ static int read_symbol(FILE *in, struct sym_entry *s) { char str[500], type[20] = ""; char *sym, stype; - static enum { symbol, single_source, multi_source } last; static char *filename; int rc = -1; @@ -118,24 +117,11 @@ static int read_symbol(FILE *in, struct sym_entry *s) */ input_format == fmt_sysv && !*type && stype == '?' && sym && sym[1] && strchr("cSsoh", sym[1]) && !sym[2])) { - /* - * gas prior to binutils commit fbdf9406b0 (expected to appear - * in 2.27) outputs symbol table entries resulting from .file - * in reverse order. If we get two consecutive file symbols, - * prefer the first one if that names an object file or has a - * directory component (to cover multiply compiled files). - */ - bool multi = strchr(str, '/') || (sym && sym[1] == 'o'); - - if (multi || last != multi_source) { - free(filename); - filename = *str ? strdup(str) : NULL; - } - last = multi ? multi_source : single_source; + free(filename); + filename = *str ? strdup(str) : NULL; goto skip_tail; } - last = symbol; rc = -1; sym = str; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:55:53 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207935.363909 (Exim 4.92) (envelope-from ) id 1maYB7-0007vr-CJ; Wed, 13 Oct 2021 06:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207935.363909; Wed, 13 Oct 2021 06: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 1maYB7-0007vh-9G; Wed, 13 Oct 2021 06:55:53 +0000 Received: by outflank-mailman (input) for mailman id 207935; Wed, 13 Oct 2021 06:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYB6-0007vU-A8 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYB6-0006Tf-9R for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYB6-0007KP-8a for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06: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=UxCj/uKJ5t1C83JoO2o0TczJLy1zNn9zLjZlksNOLWE=; b=pRpgf3MVfRH3zdHZ7kXvUQTgCK iRMKav/1syWUPP91knk53iUX3OxaiLysaUwwhQe7EecwU9e9RahVF0VqmkjDJAsvL+Xci4PKe4sAG 1HoUBDEeksTevu6QcGx3DLa9wSsNI0pu6UZRrYPB3nAJbQkPP9XJBU0jgMejk09fLn2g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build,arm: move LDFLAGS change to arch.mk Message-Id: Date: Wed, 13 Oct 2021 06:55:52 +0000 commit aa44f3c0a697cc387f79958d73e21594a9059cf6 Author: Anthony PERARD AuthorDate: Tue Oct 12 11:50:47 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:50:47 2021 +0200 build,arm: move LDFLAGS change to arch.mk Changes to XEN_LDFLAGS may or may not apply to targets in for example "common/" depending on whether one runs `make` or `make common/`. But arch.mk is loaded before doing any build, so changes to LDFLAGS there mean that the value of XEN_LDFLAGS won't depends on the initial target. Signed-off-by: Anthony PERARD Acked-by: Julien Grall --- xen/arch/arm/Makefile | 8 -------- xen/arch/arm/arch.mk | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 44d7cc81fa..7dd3ee981a 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -103,14 +103,6 @@ prelink.o: $(ALL_OBJS) $(ALL_LIBS) FORCE $(call if_changed,ld) endif -ifeq ($(CONFIG_ARM64_ERRATUM_843419),y) - ifeq ($(call ld-option, --fix-cortex-a53-843419),n) - $(warning ld does not support --fix-cortex-a53-843419; xen may be susceptible to erratum) - else - XEN_LDFLAGS += --fix-cortex-a53-843419 - endif -endif - targets += prelink.o $(TARGET)-syms: prelink.o xen.lds diff --git a/xen/arch/arm/arch.mk b/xen/arch/arm/arch.mk index 11caec86ba..6a29820594 100644 --- a/xen/arch/arm/arch.mk +++ b/xen/arch/arm/arch.mk @@ -17,3 +17,11 @@ $(call cc-option-add,CFLAGS-$(CONFIG_ARM_64),CC,-mno-outline-atomics) ifneq ($(filter command line environment,$(origin CONFIG_EARLY_PRINTK)),) $(error You must use 'make menuconfig' to enable/disable early printk now) endif + +ifeq ($(CONFIG_ARM64_ERRATUM_843419),y) + ifeq ($(call ld-option, --fix-cortex-a53-843419),n) + $(warning ld does not support --fix-cortex-a53-843419; xen may be susceptible to erratum) + else + LDFLAGS += --fix-cortex-a53-843419 + endif +endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:56:03 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207936.363913 (Exim 4.92) (envelope-from ) id 1maYBH-0007yn-Dd; Wed, 13 Oct 2021 06:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207936.363913; Wed, 13 Oct 2021 06: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 1maYBH-0007yd-Ah; Wed, 13 Oct 2021 06:56:03 +0000 Received: by outflank-mailman (input) for mailman id 207936; Wed, 13 Oct 2021 06:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBG-0007yV-DP for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBG-0006U2-Cd for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYBG-0007Lc-Bm for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06: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=lumaPvsj0GBI+CTMjddCHZVoRfkrcTDDte5g3tfeFxw=; b=Dvf6QCntc6hBKfsYsEW7Si2STM Hy/XOSUKrN8897XM3/WMkKp9EWhTn/NX1nHmydMV8zrb0ToYy1C30dHTK1a4GUxICFyFY9Tv6x0JU Oi0AlFGCwB3OxHjbVQmj6SD0w1qAa5xcHZmKfrI7ngqH/WSJV5z+y6bSR41fu4u8ddXQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: avoid building arm/arm/*/head.o twice Message-Id: Date: Wed, 13 Oct 2021 06:56:02 +0000 commit e5ba9f79ef4517321e80e0eb6e4aafc3a978e689 Author: Anthony PERARD AuthorDate: Tue Oct 12 11:53:47 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:53:47 2021 +0200 build: avoid building arm/arm/*/head.o twice head.o is been built twice, once because it is in $(ALL_OBJS) and a second time because it is in $(extra-y) and thus it is rebuilt when building "arch/arm/built_in.o". Fix this by adding a dependency of "head.o" on the directory "arch/arm/". Also, we should avoid building object that are in subdirectories, so move the declaration in there. This doesn't change anything as "arch/arm/built_in.o" depends on "arch/arm/$subarch/built_in.o" which depends on $(extra-y), so we still need to depend on "arch/arm/built_in.o". Signed-off-by: Anthony PERARD Acked-by: Julien Grall --- xen/arch/arm/Makefile | 7 ++++++- xen/arch/arm/arm32/Makefile | 1 + xen/arch/arm/arm64/Makefile | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7dd3ee981a..64518848b2 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -65,7 +65,6 @@ obj-$(CONFIG_SBSA_VUART_CONSOLE) += vpl011.o obj-y += vsmc.o obj-y += vpsci.o obj-y += vuart.o -extra-y += $(TARGET_SUBARCH)/head.o #obj-bin-y += ....o @@ -75,6 +74,12 @@ endif ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS) +# head.o is built by descending into the sub-directory, depends on the part of +# $(ALL_OBJS) that will eventually recurse into $(TARGET_SUBARCH)/ and build +# head.o +$(TARGET_SUBARCH)/head.o: $(BASEDIR)/arch/arm/built_in.o +$(TARGET_SUBARCH)/head.o: ; + ifdef CONFIG_LIVEPATCH all_symbols = --all-symbols ifdef CONFIG_FAST_SYMBOL_LOOKUP diff --git a/xen/arch/arm/arm32/Makefile b/xen/arch/arm/arm32/Makefile index 96105d2383..3040eabce3 100644 --- a/xen/arch/arm/arm32/Makefile +++ b/xen/arch/arm/arm32/Makefile @@ -11,3 +11,4 @@ obj-y += smpboot.o obj-y += traps.o obj-y += vfp.o +extra-y += head.o diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 701d66883d..baa87655fa 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -14,3 +14,5 @@ obj-y += smpboot.o obj-y += traps.o obj-y += vfp.o obj-y += vsysreg.o + +extra-y += head.o -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:56:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:56:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207937.363917 (Exim 4.92) (envelope-from ) id 1maYBR-00081c-F7; Wed, 13 Oct 2021 06:56:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207937.363917; Wed, 13 Oct 2021 06:56:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBR-00081U-CE; Wed, 13 Oct 2021 06:56:13 +0000 Received: by outflank-mailman (input) for mailman id 207937; Wed, 13 Oct 2021 06:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBQ-00081N-GJ for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBQ-0006Vo-Fh for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYBQ-0007MY-Ek for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4Korpcaaob+jJSotFJ95RWHcTogAY+FC+CVMbirlKbc=; b=t0JUQIE5uV5nQiMOOjB0b+8xkk kCryyls7dNc9268dnGp2+mheKs5a2yFia+jDI6OyXLkFlxyR3e3iryT1wd1ATs+2ov8HLA2B6RwTw +ODgiExJG3HzO/7cnrkH7Tx6BEtJcNDIbUD9eAWPLuA3zTF2YEdYHAZ6WpKJUkeKryKs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Message-Id: Date: Wed, 13 Oct 2021 06:56:12 +0000 commit 036432e8b27e1ef21e0f0204ba9b0e3972a031c2 Author: Jan Beulich AuthorDate: Tue Oct 12 11:54:34 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:54:34 2021 +0200 AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Hidden devices are associated with DomXEN but usable by the hardware domain. Hence they need flushing as well when all devices are to have flushes invoked. While there drop a redundant ATS-enabled check and constify the first parameter of the involved function. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index 4db8e1651f..a73830386b 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -308,14 +308,11 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, flush_command_buffer(iommu, iommu_dev_iotlb_timeout); } -static void amd_iommu_flush_all_iotlbs(struct domain *d, daddr_t daddr, +static void amd_iommu_flush_all_iotlbs(const struct domain *d, daddr_t daddr, unsigned int order) { struct pci_dev *pdev; - if ( !ats_enabled ) - return; - for_each_pdev( d, pdev ) { u8 devfn = pdev->devfn; @@ -343,7 +340,16 @@ static void _amd_iommu_flush_pages(struct domain *d, } if ( ats_enabled ) + { amd_iommu_flush_all_iotlbs(d, daddr, order); + + /* + * Hidden devices are associated with DomXEN but usable by the + * hardware domain. Hence they need dealing with here as well. + */ + if ( is_hardware_domain(d) ) + amd_iommu_flush_all_iotlbs(dom_xen, daddr, order); + } } void amd_iommu_flush_all_pages(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:56:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:56:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207938.363921 (Exim 4.92) (envelope-from ) id 1maYBb-00084l-Gu; Wed, 13 Oct 2021 06:56:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207938.363921; Wed, 13 Oct 2021 06:56:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBb-00084d-Dp; Wed, 13 Oct 2021 06:56:23 +0000 Received: by outflank-mailman (input) for mailman id 207938; Wed, 13 Oct 2021 06:56:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBa-00084R-JW for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBa-0006Vz-Io for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYBa-0007Nd-Hx for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yuTWw+pHfn8WHsHmZOeoPr47xktTArz28JElv8Xt90A=; b=JAG3S60bNaqofgh5vBMq5Tqgnx 5skEIs4hiaX4NhkIlgT8gM5EnDcRA7FFlXJ2CoGjugNmti1BGZYN3ICfw6gXkvW9zCtANpW5ZT9vo CaPxcEJCcTP5+GhfK8pHbyhd3hyj/r2nv4IC/lIfTrY0gBPIes4cPvLN7WL/wqbftuWQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV32: fix physdev_op_compat handling Message-Id: Date: Wed, 13 Oct 2021 06:56:22 +0000 commit 834cb8761051f7d87816785c0d99fe9bd5f0ce30 Author: Jan Beulich AuthorDate: Tue Oct 12 11:55:42 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:55:42 2021 +0200 x86/PV32: fix physdev_op_compat handling The conversion of the original code failed to recognize that the 32-bit compat variant of this (sorry, two different meanings of "compat" here) needs to continue to invoke the compat handler, not the native one. Arrange for this by adding yet another #define. Affected functions (having existed prior to the introduction of the new hypercall) are PHYSDEVOP_set_iobitmap and PHYSDEVOP_apic_{read,write}. For all others the operand struct layout doesn't differ. Fixes: 1252e2823117 ("x86/pv: Export pv_hypercall_table[] rather than working around it in several ways") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_64/compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c index 0e4c71f2aa..fcbc1cc0d7 100644 --- a/xen/arch/x86/x86_64/compat.c +++ b/xen/arch/x86/x86_64/compat.c @@ -12,6 +12,7 @@ EMIT_FILE; #define physdev_op_t physdev_op_compat_t #define do_physdev_op compat_physdev_op #define do_physdev_op_compat(x) compat_physdev_op_compat(_##x) +#define native compat #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:56:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:56:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207939.363925 (Exim 4.92) (envelope-from ) id 1maYBl-00087Y-IZ; Wed, 13 Oct 2021 06:56:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207939.363925; Wed, 13 Oct 2021 06:56:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBl-00087Q-FX; Wed, 13 Oct 2021 06:56:33 +0000 Received: by outflank-mailman (input) for mailman id 207939; Wed, 13 Oct 2021 06:56:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBk-00087J-Mp for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBk-0006WA-ME for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYBk-0007Oh-LH for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eRtgZvhoW4lwIu6Qw+hXHRdB5y+6G44mDrZOkLnzR8Q=; b=fX5RUSaiX5ppYDohYgTifH0NPB Dsa8XRDUE99cx5sD/6Zt/d1P1fnFIFDmQuhA0Ec54gCTYcrTuKOdBON5sieI7i2IMGRHYyWEr502P n3WFPyjfldYD7hrhCKWZiYLDh6q1D+W3l0KUvCP1ko6gYRMi+pCOOdudZEJJz6EHaNDk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: generalize and correct "iommu=no-igfx" handling Message-Id: Date: Wed, 13 Oct 2021 06:56:32 +0000 commit 2d7f191b392e3efaf4f6e18e14b0b3c43a9e268b Author: Jan Beulich AuthorDate: Tue Oct 12 11:56:21 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:56:21 2021 +0200 VT-d: generalize and correct "iommu=no-igfx" handling Linux'es supposedly equivalent "intel_iommu=igfx_off" deals with any graphics devices (not just Intel ones) while at the same time limiting the effect to IOMMUs covering only graphics devices. Keying the decision to leave translation disabled for an IOMMU to merely a magic SBDF tuple was wrong in the first place - systems may very well have non-graphics devices at 0000:00:02.0 (ordinary root ports commonly live there, for example). Any use of igd_drhd_address (and hence is_igd_drhd()) needs further qualification. Introduce a new "graphics only" field in struct acpi_drhd_unit and set it according to device scope parsing outcome. Replace the bad use of is_igd_drhd() in iommu_enable_translation() by use of this new field. While adding the new field also convert the adjacent include_all one to "bool". Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Release-Acked-by: Ian Jackson --- docs/misc/xen-command-line.pandoc | 4 ++-- xen/drivers/passthrough/vtd/dmar.c | 20 +++++++++++++++++++- xen/drivers/passthrough/vtd/dmar.h | 3 ++- xen/drivers/passthrough/vtd/iommu.c | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index b1f7978aa4..f7797ea233 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1494,8 +1494,8 @@ The following options are specific to Intel VT-d hardware: version 6 and greater as Registered-Based Invalidation isn't supported by them. -* The `igfx` boolean is active by default, and controls whether the IOMMU in - front of an Intel Graphics Device is enabled or not. +* The `igfx` boolean is active by default, and controls whether IOMMUs in + front of solely graphics devices get enabled or not. It is intended as a debugging mechanism for graphics issues, and to be similar to Linux's `intel_iommu=igfx_off` option. If specifying `no-igfx` diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 36d909b06d..d5ee367599 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -315,6 +315,7 @@ static int __init acpi_parse_dev_scope( struct acpi_drhd_unit *drhd = type == DMAR_TYPE ? container_of(scope, struct acpi_drhd_unit, scope) : NULL; int depth, cnt, didx = 0, ret; + bool gfx_only = false; if ( (cnt = scope_device_count(start, end)) < 0 ) return cnt; @@ -324,6 +325,8 @@ static int __init acpi_parse_dev_scope( scope->devices = xzalloc_array(u16, cnt); if ( !scope->devices ) return -ENOMEM; + + gfx_only = drhd && !drhd->include_all; } scope->devices_cnt = cnt; @@ -354,6 +357,7 @@ static int __init acpi_parse_dev_scope( acpi_scope->bus, sec_bus, sub_bus); dmar_scope_add_buses(scope, sec_bus, sub_bus); + gfx_only = false; break; case ACPI_DMAR_SCOPE_TYPE_HPET: @@ -374,6 +378,8 @@ static int __init acpi_parse_dev_scope( acpi_hpet_unit->dev = path->dev; acpi_hpet_unit->func = path->fn; list_add(&acpi_hpet_unit->list, &drhd->hpet_list); + + gfx_only = false; } break; @@ -388,6 +394,12 @@ static int __init acpi_parse_dev_scope( if ( (seg == 0) && (bus == 0) && (path->dev == 2) && (path->fn == 0) ) igd_drhd_address = drhd->address; + + if ( gfx_only && + pci_conf_read8(PCI_SBDF(seg, bus, path->dev, path->fn), + PCI_CLASS_DEVICE + 1) != 0x03 + /* PCI_BASE_CLASS_DISPLAY */ ) + gfx_only = false; } break; @@ -408,6 +420,8 @@ static int __init acpi_parse_dev_scope( acpi_ioapic_unit->ioapic.bdf.dev = path->dev; acpi_ioapic_unit->ioapic.bdf.func = path->fn; list_add(&acpi_ioapic_unit->list, &drhd->ioapic_list); + + gfx_only = false; } break; @@ -417,11 +431,15 @@ static int __init acpi_parse_dev_scope( printk(XENLOG_WARNING VTDPREFIX "Unknown scope type %#x\n", acpi_scope->entry_type); start += acpi_scope->length; + gfx_only = false; continue; } scope->devices[didx++] = PCI_BDF(bus, path->dev, path->fn); start += acpi_scope->length; - } + } + + if ( drhd && gfx_only ) + drhd->gfx_only = true; ret = 0; diff --git a/xen/drivers/passthrough/vtd/dmar.h b/xen/drivers/passthrough/vtd/dmar.h index a44820a5e7..a1f2353a51 100644 --- a/xen/drivers/passthrough/vtd/dmar.h +++ b/xen/drivers/passthrough/vtd/dmar.h @@ -62,7 +62,8 @@ struct acpi_drhd_unit { struct list_head list; u64 address; /* register base address of the unit */ u16 segment; - u8 include_all:1; + bool include_all:1; + bool gfx_only:1; struct vtd_iommu *iommu; struct list_head ioapic_list; struct list_head hpet_list; diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 0519dfc9e7..137aea2c92 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -751,7 +751,7 @@ static void iommu_enable_translation(struct acpi_drhd_unit *drhd) unsigned long flags; struct vtd_iommu *iommu = drhd->iommu; - if ( is_igd_drhd(drhd) ) + if ( drhd->gfx_only ) { if ( !iommu_igfx ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 06:56:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 06:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.207940.363929 (Exim 4.92) (envelope-from ) id 1maYBw-0008At-Lg; Wed, 13 Oct 2021 06:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 207940.363929; Wed, 13 Oct 2021 06:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBw-0008Al-IT; Wed, 13 Oct 2021 06:56:44 +0000 Received: by outflank-mailman (input) for mailman id 207940; Wed, 13 Oct 2021 06:56:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBu-0008AZ-Q3 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maYBu-0006WL-PO for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maYBu-0007Pt-OQ for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 06:56:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QyhREDtoY+9cSNZF2ivG35mo0956uzeD8T2UNVzZrH4=; b=cQ/de21JRkjlTyubH98QtC24X5 pYSSQ93M/ITCv1qlHJ1YcZnlKh4i/luA4P7bquPwAZnXj7HHvCmC9ImKLPlC5j2pQw1feD7mdzWTG Rl1xzHVqekAiYCaxP0XDmmHP3dKBreVB2C04+Rjjg/dzezMVq2DhO3HdTueH6hvuiIPo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: Tylersburg isoch DMAR unit with no TLB space Message-Id: Date: Wed, 13 Oct 2021 06:56:42 +0000 commit d3b05f9b16d6ba9c550c3a35ac11ed292bf87f68 Author: Jan Beulich AuthorDate: Tue Oct 12 11:57:08 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 12 11:57:08 2021 +0200 VT-d: Tylersburg isoch DMAR unit with no TLB space BIOSes, when enabling the dedicated DMAR unit for the sound device, need to also set a non-zero number of TLB entries in a respective system management register (VTISOCHCTRL). At least one BIOS is known to fail to do so, causing the VT-d engine to deadlock when used. Vaguely based on Linux'es e0fc7e0b4b5e ("intel-iommu: Yet another BIOS workaround: Isoch DMAR unit with no TLB space"). To limit message string redundancy, fold parts with the IGD quirk logic. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian Release-Acked-by: Ian Jackson --- xen/drivers/passthrough/vtd/extern.h | 1 + xen/drivers/passthrough/vtd/iommu.c | 26 ++++++++++++--- xen/drivers/passthrough/vtd/quirks.c | 63 ++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index 156177bb3f..6fb00a25c3 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -100,6 +100,7 @@ int msi_msg_write_remap_rte(struct msi_desc *, struct msi_msg *); int intel_setup_hpet_msi(struct msi_desc *); int is_igd_vt_enabled_quirk(void); +bool is_azalia_tlb_enabled(const struct acpi_drhd_unit *); void platform_quirks_init(void); void vtd_ops_preamble_quirk(struct vtd_iommu *iommu); void vtd_ops_postamble_quirk(struct vtd_iommu *iommu); diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 137aea2c92..0e7e111286 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -750,27 +750,43 @@ static void iommu_enable_translation(struct acpi_drhd_unit *drhd) u32 sts; unsigned long flags; struct vtd_iommu *iommu = drhd->iommu; + static const char crash_fmt[] = "%s; crash Xen for security purpose\n"; if ( drhd->gfx_only ) { + static const char disable_fmt[] = XENLOG_WARNING VTDPREFIX + " %s; disabling IGD VT-d engine\n"; + if ( !iommu_igfx ) { - printk(XENLOG_INFO VTDPREFIX - "Passed iommu=no-igfx option. Disabling IGD VT-d engine.\n"); + printk(disable_fmt, "passed iommu=no-igfx option"); return; } if ( !is_igd_vt_enabled_quirk() ) { + static const char msg[] = "firmware did not enable IGD for VT properly"; + if ( force_iommu ) - panic("BIOS did not enable IGD for VT properly, crash Xen for security purpose\n"); + panic(crash_fmt, msg); - printk(XENLOG_WARNING VTDPREFIX - "BIOS did not enable IGD for VT properly. Disabling IGD VT-d engine.\n"); + printk(disable_fmt, msg); return; } } + if ( !is_azalia_tlb_enabled(drhd) ) + { + static const char msg[] = "firmware did not enable TLB for sound device"; + + if ( force_iommu ) + panic(crash_fmt, msg); + + printk(XENLOG_WARNING VTDPREFIX " %s; disabling ISOCH VT-d engine\n", + msg); + return; + } + /* apply platform specific errata workarounds */ vtd_ops_preamble_quirk(iommu); diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 2ad76a0ae7..52b47dd893 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -100,6 +100,69 @@ static void __init cantiga_b3_errata_init(void) is_cantiga_b3 = 1; } +/* + * QUIRK to work around certain BIOSes enabling the ISOCH DMAR unit for the + * Azalia sound device, but not giving it any TLB entries, causing it to + * deadlock. + */ +bool is_azalia_tlb_enabled(const struct acpi_drhd_unit *drhd) +{ + pci_sbdf_t sbdf; + unsigned int vtisochctrl; + + /* Only dedicated units are of interest. */ + if ( drhd->include_all || drhd->scope.devices_cnt != 1 ) + return true; + + /* Check for the specific device. */ + sbdf = PCI_SBDF2(drhd->segment, drhd->scope.devices[0]); + if ( pci_conf_read16(sbdf, PCI_VENDOR_ID) != PCI_VENDOR_ID_INTEL || + pci_conf_read16(sbdf, PCI_DEVICE_ID) != 0x3a3e ) + return true; + + /* Check for the corresponding System Management Registers device. */ + sbdf = PCI_SBDF(drhd->segment, 0, 0x14, 0); + if ( pci_conf_read16(sbdf, PCI_VENDOR_ID) != PCI_VENDOR_ID_INTEL || + pci_conf_read16(sbdf, PCI_DEVICE_ID) != 0x342e ) + return true; + + vtisochctrl = pci_conf_read32(sbdf, 0x188); + if ( vtisochctrl == 0xffffffff ) + { + printk(XENLOG_WARNING VTDPREFIX + " Cannot access VTISOCHCTRL at this time\n"); + return true; + } + + /* + * If Azalia DMA is routed to the non-isoch DMAR unit, that's fine in + * principle, but not consistent with the ACPI tables. + */ + if ( vtisochctrl & 1 ) + { + printk(XENLOG_WARNING VTDPREFIX + " Inconsistency between chipset registers and ACPI tables\n"); + return true; + } + + /* Drop all bits other than the number of TLB entries. */ + vtisochctrl &= 0x1c; + + /* If we have at least the recommended number of TLB entries, fine. */ + if ( vtisochctrl >= 16 ) + return true; + + /* Zero TLB entries? */ + if ( !vtisochctrl ) + return false; + + printk(XENLOG_WARNING VTDPREFIX + " Recommended TLB entries for ISOCH unit is 16; firmware set %u\n", + vtisochctrl); + + return true; +} + /* check for Sandybridge IGD device ID's */ static void __init snb_errata_init(void) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 14:11:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 14:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208542.364699 (Exim 4.92) (envelope-from ) id 1maeyH-0005fN-JD; Wed, 13 Oct 2021 14:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208542.364699; Wed, 13 Oct 2021 14:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maeyH-0005fF-GJ; Wed, 13 Oct 2021 14:11:05 +0000 Received: by outflank-mailman (input) for mailman id 208542; Wed, 13 Oct 2021 14:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maeyG-0005f9-IB for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 14:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maeyG-0006QR-HQ for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 14:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maeyG-0005Z2-Gm for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 14:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NcwIARfJiQBBOyLOG+pFHpssYYYYk9aa0AEPowpawPE=; b=KMXOXNQuS6hfSAmT4eDvNzCBy6 Oghyx+6uCvPtoCtGwqiNFz3oCvqwbs7DTsBKisnYF8wtlIHiT7ezwoK1sa0xUWOmUTQwO3gOf6QdB Z4riLWrv09TwQWNOagylo/kKzr6dOAk3OPK3vPqJpWYGkKUJqhzuDGxx374wcLzAVl0E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl: CODING_STYLE: Explicitly deprecate #ifdef Message-Id: Date: Wed, 13 Oct 2021 14:11:04 +0000 commit c8c6cd9eee9aa98c696607adb9d1e422da161110 Author: Ian Jackson AuthorDate: Tue Oct 12 15:50:28 2021 +0100 Commit: Ian Jackson CommitDate: Wed Oct 13 15:10:38 2021 +0100 libxl: CODING_STYLE: Explicitly deprecate #ifdef We don't use ifdefs in the main code. Actually document this. Signed-off-by: Ian Jackson Acked-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/light/CODING_STYLE | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/libs/light/CODING_STYLE b/tools/libs/light/CODING_STYLE index 3d572f6925..b1a6a45c74 100644 --- a/tools/libs/light/CODING_STYLE +++ b/tools/libs/light/CODING_STYLE @@ -121,6 +121,16 @@ permitted exceptions to the usual libxl code formatting rules. +ARCHITECTURE-SPECIFIC CODE, CONDITIONAL COMPILATION +--------------------------------------------------- + +Architecture-specific code should be isolated in libxl_.c, +with a function call interface, wherever possible. + +#ifdefs should be avoided, and in any case not interspersed through +the primary functional code. + + IDEMPOTENT DATA STRUCTURE CONSTRUCTION/DESTRUCTION -------------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 14:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 14:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208543.364703 (Exim 4.92) (envelope-from ) id 1maeyR-0005hT-Kp; Wed, 13 Oct 2021 14:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208543.364703; Wed, 13 Oct 2021 14:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maeyR-0005hL-Hq; Wed, 13 Oct 2021 14:11:15 +0000 Received: by outflank-mailman (input) for mailman id 208543; Wed, 13 Oct 2021 14:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maeyQ-0005h7-MH for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 14:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maeyQ-0006SB-LX for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 14:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maeyQ-0005ay-Ki for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 14:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=p+Veh9cbgLbmhjKqM+CIvNHlhoBzrn8oAlNO5SwkGyY=; b=Q9Ybuc3+E84LWaNKgn4jJLRFmu Kdo4cyDC6DueqlANK1yf7yol8TfZcM5OOFRcIM7Z+nMQFgGIG/MeI7QRCel18RPfHnEmHK66tv52U +qGcCrmITwID4PuOTZ+g+TmVaZKdI7LZWDL50lNaXP0Fo/Ur0wXf7tVuwZ9L1njFbHOc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: Expose the PMU to the guests Message-Id: Date: Wed, 13 Oct 2021 14:11:14 +0000 commit dbb948110a0e23a8081882a980038e9c0f6aab88 Author: Michal Orzel AuthorDate: Wed Oct 13 14:33:52 2021 +0200 Commit: Ian Jackson CommitDate: Wed Oct 13 15:10:38 2021 +0100 xen: Expose the PMU to the guests Add parameter vpmu to xl domain configuration syntax to enable the access to PMU registers by disabling the PMU traps(currently only for ARM). The current status is that the PMU registers are not virtualized and the physical registers are directly accessible when this parameter is enabled. There is no interrupt support and Xen will not save/restore the register values on context switches. According to Arm Arm, section D7.1: "The Performance Monitors Extension is common to AArch64 operation and AArch32 operation." That means we have an ensurance that if PMU is present in one exception state, it must also be present in the other. Please note that this feature is experimental. Signed-off-by: Michal Orzel Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis Acked-by: Anthony PERARD Acked-by: Ian Jackson --- SUPPORT.md | 14 +++++++++++--- docs/man/xl.cfg.5.pod.in | 17 +++++++++++++++++ tools/golang/xenlight/helpers.gen.go | 6 ++++++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 6 ++++++ tools/libs/light/libxl_create.c | 10 ++++++++++ tools/libs/light/libxl_types.idl | 2 ++ tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/xl/xl_parse.c | 2 ++ xen/arch/arm/domain.c | 13 ++++++++++--- xen/arch/arm/setup.c | 3 +++ xen/common/domain.c | 10 +++++++++- xen/include/asm-arm/domain.h | 1 + xen/include/public/domctl.h | 4 +++- 15 files changed, 83 insertions(+), 8 deletions(-) diff --git a/SUPPORT.md b/SUPPORT.md index 317392d8f3..3a34933c89 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -671,11 +671,19 @@ such as KVM, Hyper-V, Bromium, and so on as guests. ### vPMU -Virtual Performance Management Unit for HVM guests +Virtual Performance Management Unit - Status, x86: Supported, Not security supported + Status, x86 HVM: Supported, Not security supported + Status, ARM: Experimental + +On ARM, support for accessing PMU registers from the guests. +There is no interrupt support and Xen will not save/restore +the register values on context switches. + +Disabled by default. +On ARM, enable with guest parameter. +On x86, enable with hypervisor command line option. -Disabled by default (enable with hypervisor command line option). This feature is not security supported: see https://xenbits.xen.org/xsa/advisory-163.html ### Argo: Inter-domain message delivery by hypercall diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 4b1e3028d2..55c4881205 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -690,6 +690,23 @@ default. B: Acceptable values are platform specific. For Intel Processor Trace, this value must be a power of 2 between 4k and 16M. +=item B + +Currently ARM only. + +Specifies whether to enable the access to PMU registers by disabling +the PMU traps. + +The PMU registers are not virtualized and the physical registers are directly +accessible when this parameter is enabled. There is no interrupt support and +Xen will not save/restore the register values on context switches. + +vPMU, by design and purpose, exposes system level performance +information to the guest. Only to be used by sufficiently privileged +domains. This feature is currently in experimental state. + +If this option is not specified then it will default to B. + =back =head2 Devices diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index c8669837d8..2449580bad 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1119,6 +1119,9 @@ return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } x.Altp2M = Altp2MMode(xc.altp2m) x.VmtraceBufKb = int(xc.vmtrace_buf_kb) +if err := x.Vpmu.fromC(&xc.vpmu);err != nil { +return fmt.Errorf("converting field Vpmu: %v", err) +} return nil} @@ -1600,6 +1603,9 @@ return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } xc.altp2m = C.libxl_altp2m_mode(x.Altp2M) xc.vmtrace_buf_kb = C.int(x.VmtraceBufKb) +if err := x.Vpmu.toC(&xc.vpmu); err != nil { +return fmt.Errorf("converting field Vpmu: %v", err) +} return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 45f2cba3d2..b2e8bd1a85 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -521,6 +521,7 @@ MsrRelaxed Defbool } Altp2M Altp2MMode VmtraceBufKb int +Vpmu Defbool } type DomainBuildInfoTypeUnion interface { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index ec5e3badae..ee73eb06f1 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -508,6 +508,12 @@ */ #define LIBXL_HAVE_PHYSINFO_CAP_VPMU 1 +/* + * LIBXL_HAVE_VPMU indicates that libxl_domain_build_info has a vpmu parameter, + * which allows to enable the access to PMU registers. + */ +#define LIBXL_HAVE_VPMU 1 + /* * libxl ABI compatibility * diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index e356b2106d..6ebb2bfc76 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -91,6 +91,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); + libxl_defbool_setdefault(&b_info->vpmu, false); if (libxl_defbool_val(b_info->device_model_stubdomain) && !b_info->device_model_ssidref) @@ -622,6 +623,9 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, create.flags |= XEN_DOMCTL_CDF_nested_virt; } + if (libxl_defbool_val(b_info->vpmu)) + create.flags |= XEN_DOMCTL_CDF_vpmu; + assert(info->passthrough != LIBXL_PASSTHROUGH_DEFAULT); LOG(DETAIL, "passthrough: %s", libxl_passthrough_to_string(info->passthrough)); @@ -1199,6 +1203,12 @@ int libxl__domain_config_setdefault(libxl__gc *gc, goto error_out; } + if (libxl_defbool_val(d_config->b_info.vpmu) && !physinfo.cap_vpmu) { + ret = ERROR_INVAL; + LOGD(ERROR, domid, "vPMU not supported on this platform"); + goto error_out; + } + ret = 0; error_out: return ret; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 993e83acca..b96fb5c47e 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -655,6 +655,8 @@ libxl_domain_build_info = Struct("domain_build_info",[ # Use zero value to disable this feature. ("vmtrace_buf_kb", integer), + ("vpmu", libxl_defbool), + ], dir=DIR_IN, copy_deprecated_fn="libxl__domain_build_info_copy_deprecated", ) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 7a4030a192..86758babb3 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -70,6 +70,7 @@ type domain_create_flag = | CDF_IOMMU | CDF_NESTED_VIRT | CDF_VPCI + | CDF_VPMU type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 6900513e7f..0fdb0cc169 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -63,6 +63,7 @@ type domain_create_flag = | CDF_IOMMU | CDF_NESTED_VIRT | CDF_VPCI + | CDF_VPMU type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 17dddb4cd5..c503b9be00 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2750,6 +2750,8 @@ skip_usbdev: "If it fixes an issue you are having please report to " "xen-devel@lists.xenproject.org.\n"); + xlu_cfg_get_defbool(config, "vpmu", &b_info->vpmu, 0); + xlu_cfg_destroy(config); } diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index aae4472479..ad21c9b950 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -276,6 +276,8 @@ static void ctxt_switch_to(struct vcpu *n) * timer. The interrupt needs to be injected into the guest. */ WRITE_SYSREG(n->arch.cntkctl, CNTKCTL_EL1); virt_timer_restore(n); + + WRITE_SYSREG(n->arch.mdcr_el2, MDCR_EL2); } /* Update per-VCPU guest runstate shared memory area (if registered). */ @@ -586,6 +588,10 @@ int arch_vcpu_create(struct vcpu *v) v->arch.hcr_el2 = get_default_hcr_flags(); + v->arch.mdcr_el2 = HDCR_TDRA | HDCR_TDOSA | HDCR_TDA; + if ( !(v->domain->options & XEN_DOMCTL_CDF_vpmu) ) + v->arch.mdcr_el2 |= HDCR_TPM | HDCR_TPMCR; + if ( (rc = vcpu_vgic_init(v)) != 0 ) goto fail; @@ -621,10 +627,11 @@ void vcpu_switch_to_aarch64_mode(struct vcpu *v) int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) { unsigned int max_vcpus; + unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap); + unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpci | + XEN_DOMCTL_CDF_vpmu); - /* HVM and HAP must be set. IOMMU and VPCI may or may not be */ - if ( (config->flags & ~XEN_DOMCTL_CDF_iommu & ~XEN_DOMCTL_CDF_vpci) != - (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap) ) + if ( (config->flags & ~flags_optional) != flags_required ) { dprintk(XENLOG_INFO, "Unsupported configuration %#x\n", config->flags); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 49dc90d198..d5d0792ed4 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -999,6 +999,9 @@ void __init start_xen(unsigned long boot_phys_offset, printk("Brought up %ld CPUs\n", (long)num_online_cpus()); /* TODO: smp_cpus_done(); */ + /* This should be done in a vpmu driver but we do not have one yet. */ + vpmu_is_available = cpu_has_pmu; + /* * The IOMMU subsystem must be initialized before P2M as we need * to gather requirements regarding the maximum IPA bits supported by diff --git a/xen/common/domain.c b/xen/common/domain.c index 262b6c0c3c..8543fb54fd 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -480,12 +480,14 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) bool hvm = config->flags & XEN_DOMCTL_CDF_hvm; bool hap = config->flags & XEN_DOMCTL_CDF_hap; bool iommu = config->flags & XEN_DOMCTL_CDF_iommu; + bool vpmu = config->flags & XEN_DOMCTL_CDF_vpmu; if ( config->flags & ~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu | - XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci) ) + XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci | + XEN_DOMCTL_CDF_vpmu) ) { dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags); return -EINVAL; @@ -534,6 +536,12 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( vpmu && !vpmu_is_available ) + { + dprintk(XENLOG_INFO, "vpmu requested but cannot be enabled this way\n"); + return -EINVAL; + } + return arch_sanitise_domain_config(config); } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index c9277b5c6d..14e575288f 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -166,6 +166,7 @@ struct arch_vcpu /* HYP configuration */ register_t hcr_el2; + register_t mdcr_el2; uint32_t teecr, teehbr; /* ThumbEE, 32-bit guests only */ #ifdef CONFIG_ARM_32 diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 4cb3f662c2..a53cbd16f4 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -71,9 +71,11 @@ struct xen_domctl_createdomain { #define _XEN_DOMCTL_CDF_nested_virt 6 #define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt) #define XEN_DOMCTL_CDF_vpci (1U << 7) +/* Should we expose the vPMU to the guest? */ +#define XEN_DOMCTL_CDF_vpmu (1U << 8) /* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ -#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpci +#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpmu uint32_t flags; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 15:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 15:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208710.364938 (Exim 4.92) (envelope-from ) id 1magav-0002Og-RK; Wed, 13 Oct 2021 15:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208710.364938; Wed, 13 Oct 2021 15:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1magav-0002OY-OO; Wed, 13 Oct 2021 15:55:05 +0000 Received: by outflank-mailman (input) for mailman id 208710; Wed, 13 Oct 2021 15:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1magav-0002OS-5v for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 15:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1magav-0008Nd-0R for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 15:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1magau-00045H-VO for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lb27OTynPvpjxdmFRLdSX6KS63ijtGqiXCT99fjG/E8=; b=f24is79tgnYalZZigb5V/Y/Dhh mRyM+9PK7pRWPTEYdWMuilw8VuL5bXPxhOJgNDhGramjqoxo2XjujGVXOdn7aHn1pTzhjbSR5M27P DimvvBAJ93cocBa0TOh2iMRhQP6o6LwTQcgLat5cSV47dD0obLgfIDErBCbMdiRq/7E4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: clean common temporary files from root makefile Message-Id: Date: Wed, 13 Oct 2021 15:55:04 +0000 commit 9e319e5258d0274c15da2ea9355dc1569a0fa832 Author: Anthony PERARD AuthorDate: Wed Oct 13 17:51:12 2021 +0200 Commit: Jan Beulich CommitDate: Wed Oct 13 17:51:12 2021 +0200 build: clean common temporary files from root makefile Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich --- xen/Makefile | 1 + xen/scripts/Makefile.clean | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 5d01101662..a3189eb47c 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -379,6 +379,7 @@ _clean: delete-unfresh-files $(MAKE) $(clean) test $(MAKE) $(kconfig) clean find . \( -name "*.o" -o -name ".*.d" -o -name ".*.d2" \ + -o -name ".*.o.tmp" -o -name "*~" -o -name "core" \ -o -name "*.gcno" -o -name ".*.cmd" -o -name "lib.a" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core rm -f asm-offsets.s include/asm-*/asm-offsets.h diff --git a/xen/scripts/Makefile.clean b/xen/scripts/Makefile.clean index 027c200c0e..8582ec35e4 100644 --- a/xen/scripts/Makefile.clean +++ b/xen/scripts/Makefile.clean @@ -14,10 +14,8 @@ include Makefile subdir-all := $(subdir-y) $(subdir-n) $(subdir-) \ $(patsubst %/,%, $(filter %/, $(obj-y) $(obj-n) $(obj-))) -DEPS_RM = $(DEPS) $(DEPS_INCLUDE) .PHONY: clean -clean:: $(subdir-all) - rm -f *.o .*.o.tmp *~ core $(DEPS_RM) +clean:: $(subdir-all) ; # Descending # --------------------------------------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 20:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 20:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208873.365147 (Exim 4.92) (envelope-from ) id 1malHG-0006kd-BA; Wed, 13 Oct 2021 20:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208873.365147; Wed, 13 Oct 2021 20:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHG-0006kV-6r; Wed, 13 Oct 2021 20:55:06 +0000 Received: by outflank-mailman (input) for mailman id 208873; Wed, 13 Oct 2021 20:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHE-0006jN-FK for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHE-0005k6-Dm for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1malHE-0003Uv-Cd for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=M0h9jxAyPdM+BsJwCXL6rahAHveFaMbz9du7sLUXtqo=; b=RmYasqoW+IWMfqwUVFTdZf+aAB iGeykQhEGy/VAnJwx2lhzloMIeL+buUe8oWRqd4aXzFIrwrvQyikP0UrFpkirn7RHm0lbVykaiggu JGDDho/QUPvV+tpUFaLbX6qotyLlUoieRYhwgDyQs/R0vgRlQO+/Ozb2RPePQvjIhIOQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/efi: load dom0 modules from DT using UEFI Message-Id: Date: Wed, 13 Oct 2021 20:55:04 +0000 commit 048de2c47075d6106136bee110d4e930049a0fe3 Author: Luca Fancellu AuthorDate: Mon Oct 11 19:15:28 2021 +0100 Commit: Stefano Stabellini CommitDate: Wed Oct 13 11:09:46 2021 -0700 arm/efi: load dom0 modules from DT using UEFI Add support to load Dom0 boot modules from the device tree using the xen,uefi-binary property. Update documentation about that. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- docs/misc/arm/device-tree/booting.txt | 8 +++++ docs/misc/efi.pandoc | 64 +++++++++++++++++++++++++++++++++-- xen/arch/arm/efi/efi-boot.h | 52 +++++++++++++++++++++++++--- xen/common/efi/boot.c | 16 ++++++--- 4 files changed, 128 insertions(+), 12 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 7258e7e1ec..c6a775f4e8 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -70,6 +70,14 @@ Each node contains the following properties: priority of this field vs. other mechanisms of specifying the bootargs for the kernel. +- xen,uefi-binary (UEFI boot only) + + String property that specifies the file name to be loaded by the UEFI + boot for this module. If this is specified, there is no need to specify + the reg property because it will be created by the UEFI stub on boot. + This option is needed only when UEFI boot is used, the node needs to be + compatible with multiboot,kernel or multiboot,ramdisk. + Examples ======== diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index 876cd55005..4abbb5bb82 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -167,6 +167,28 @@ sbsign \ --output xen.signed.efi \ xen.unified.efi ``` +## UEFI boot and Dom0 modules on ARM + +When booting using UEFI on ARM, it is possible to specify the Dom0 modules +directly from the device tree without using the Xen configuration file, here an +example: + +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,xen-bootargs = "[Xen boot arguments]" + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "vmlinuz-3.0.31-0.4-xen"; + bootargs = "[domain 0 command line options]"; + }; + + module@2 { + compatible = "multiboot,ramdisk", "multiboot,module"; + xen,uefi-binary = "initrd-3.0.31-0.4-xen"; + }; +} ## UEFI boot and dom0less on ARM @@ -326,10 +348,10 @@ chosen { ### Boot Xen, Dom0 and DomU(s) This configuration is a mix of the two configuration above, to boot this one -the configuration file must be processed so the /chosen node must have the -"xen,uefi-cfg-load" property. +the configuration file can be processed or the Dom0 modules can be read from +the device tree. -Here an example: +Here the first example: Xen configuration file: @@ -369,4 +391,40 @@ chosen { }; ``` +Here the second example: + +Device tree: + +``` +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,xen-bootargs = "[Xen boot arguments]" + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "vmlinuz-3.0.31-0.4-xen"; + bootargs = "[domain 0 command line options]"; + }; + + module@2 { + compatible = "multiboot,ramdisk", "multiboot,module"; + xen,uefi-binary = "initrd-3.0.31-0.4-xen"; + }; + + domU1 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0xc0000>; + vpl011; + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu1.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; +}; +``` diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 0d86043567..8b88dd26a5 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -32,8 +32,12 @@ static unsigned int __initdata modules_idx; #define ERROR_RENAME_MODULE_NAME (-4) #define ERROR_SET_REG_PROPERTY (-5) #define ERROR_CHECK_MODULE_COMPAT (-6) +#define ERROR_DOM0_ALREADY_FOUND (-7) +#define ERROR_DOM0_RAMDISK_FOUND (-8) +#define ERROR_XSM_ALREADY_FOUND (-9) #define ERROR_DT_MODULE_DOMU (-1) #define ERROR_DT_CHOSEN_NODE (-2) +#define ERROR_DT_MODULE_DOM0 (-3) void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); void __flush_dcache_area(const void *vaddr, unsigned long size); @@ -46,7 +50,8 @@ static int allocate_module_file(EFI_FILE_HANDLE dir_handle, static int handle_module_node(EFI_FILE_HANDLE dir_handle, int module_node_offset, int reg_addr_cells, - int reg_size_cells); + int reg_size_cells, + bool is_domu_module); static int handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, int domain_node); static int efi_check_dt_boot(EFI_FILE_HANDLE dir_handle); @@ -701,7 +706,8 @@ static int __init allocate_module_file(EFI_FILE_HANDLE dir_handle, static int __init handle_module_node(EFI_FILE_HANDLE dir_handle, int module_node_offset, int reg_addr_cells, - int reg_size_cells) + int reg_size_cells, + bool is_domu_module) { const void *uefi_name_prop; char mod_string[24]; /* Placeholder for module@ + a 64-bit number + \0 */ @@ -754,6 +760,41 @@ static int __init handle_module_node(EFI_FILE_HANDLE dir_handle, return ERROR_SET_REG_PROPERTY; } + if ( !is_domu_module ) + { + if ( (fdt_node_check_compatible(fdt, module_node_offset, + "multiboot,kernel") == 0) ) + { + /* + * This is the Dom0 kernel, wire it to the kernel variable because it + * will be verified by the shim lock protocol later in the common + * code. + */ + if ( kernel.addr ) + { + PrintMessage(L"Dom0 kernel already found in cfg file."); + return ERROR_DOM0_ALREADY_FOUND; + } + kernel.need_to_free = false; /* Freed using the module array */ + kernel.addr = file->addr; + kernel.size = file->size; + } + else if ( ramdisk.addr && + (fdt_node_check_compatible(fdt, module_node_offset, + "multiboot,ramdisk") == 0) ) + { + PrintMessage(L"Dom0 ramdisk already found in cfg file."); + return ERROR_DOM0_RAMDISK_FOUND; + } + else if ( xsm.addr && + (fdt_node_check_compatible(fdt, module_node_offset, + "xen,xsm-policy") == 0) ) + { + PrintMessage(L"XSM policy already found in cfg file."); + return ERROR_XSM_ALREADY_FOUND; + } + } + return 0; } @@ -793,7 +834,7 @@ static int __init handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, module_node = fdt_next_subnode(fdt, module_node) ) { int ret = handle_module_node(dir_handle, module_node, addr_cells, - size_cells); + size_cells, true); if ( ret < 0 ) return ret; } @@ -803,7 +844,7 @@ static int __init handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, /* * This function checks for xen domain nodes under the /chosen node for possible - * domU guests to be loaded. + * dom0 and domU guests to be loaded. * Returns the number of modules loaded or a negative number for error. */ static int __init efi_check_dt_boot(EFI_FILE_HANDLE dir_handle) @@ -830,6 +871,9 @@ static int __init efi_check_dt_boot(EFI_FILE_HANDLE dir_handle) if ( handle_dom0less_domain_node(dir_handle, node) < 0 ) return ERROR_DT_MODULE_DOMU; } + else if ( handle_module_node(dir_handle, node, addr_len, size_len, + false) < 0 ) + return ERROR_DT_MODULE_DOM0; } /* Free boot modules file names if any */ diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index c9fdb5a3db..392ff3ac9b 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1302,11 +1302,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { read_file(dir_handle, s2w(&name), &kernel, option_str); efi_bs->FreePool(name.w); - - if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, - (void **)&shim_lock)) && - (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS ) - PrintErrMesg(L"Dom0 kernel image could not be verified", status); } if ( !read_section(loaded_image, L"ramdisk", &ramdisk, NULL) ) @@ -1384,6 +1379,17 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( !dt_modules_found && !kernel.ptr ) blexit(L"No initial domain kernel specified."); + /* + * The Dom0 kernel can be loaded from the configuration file or by the + * device tree through the efi_check_dt_boot function, in this stage + * verify it. + */ + if ( kernel.ptr && + !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, + (void **)&shim_lock)) && + (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS ) + PrintErrMesg(L"Dom0 kernel image could not be verified", status); + efi_arch_edd(); /* XXX Collect EDID info. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 20:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 20:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208877.365150 (Exim 4.92) (envelope-from ) id 1malHQ-0006yP-DM; Wed, 13 Oct 2021 20:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208877.365150; Wed, 13 Oct 2021 20:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHQ-0006yE-AN; Wed, 13 Oct 2021 20:55:16 +0000 Received: by outflank-mailman (input) for mailman id 208877; Wed, 13 Oct 2021 20:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHO-0006xh-IM for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHO-0005kJ-Hf for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1malHO-0003Ve-Fx for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BLX++Y86aluAMZofkh3zP2Lix2QbH3C0KGEJtBnYxa4=; b=lEbbkta9/uO4+eYaLws27v5uIS IA9ievT6+5C+JuWO41Ps7huv/R/imqqeF1M+m9Tl3Gh28WdI/M/GbIzfvx2Q1rLDruhYebwUGxtyg YZzkd2lTiXRRfw8EBVUmpC1Ns8up0KHLhbmRjtkaViHUeBUjTw+oNYMUBFvKQ4NGNe68=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/docs: Clarify legacy DT bindings on UEFI Message-Id: Date: Wed, 13 Oct 2021 20:55:14 +0000 commit a0ffee6b145933f411b1c33daa2cdd54e77b2b15 Author: Luca Fancellu AuthorDate: Wed Oct 13 15:52:02 2021 +0100 Commit: Stefano Stabellini CommitDate: Wed Oct 13 11:10:06 2021 -0700 arm/docs: Clarify legacy DT bindings on UEFI Since the introduction of UEFI boot for Xen, the legacy compatible strings were not supported and the stub code was checking only the presence of “multiboot,module” to require the Xen UEFI configuration file or not. The documentation was not updated to specify that behavior. Add a phrase to docs/misc/arm/device-tree/booting.txt to clarify it. Signed-off-by: Luca Fancellu Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index c6a775f4e8..71895663a4 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -51,6 +51,8 @@ Each node contains the following properties: Xen 4.4 supported a different set of legacy compatible strings which remain supported such that systems supporting both 4.4 and later can use a single DTB. + However when booting Xen using UEFI, the legacy compatible + strings are not supported. - "xen,multiboot-module" equivalent to "multiboot,module" - "xen,linux-zimage" equivalent to "multiboot,kernel" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 20:55:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 20:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208881.365164 (Exim 4.92) (envelope-from ) id 1malHZ-0007Ma-Nv; Wed, 13 Oct 2021 20:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208881.365164; Wed, 13 Oct 2021 20:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHZ-0007MT-Km; Wed, 13 Oct 2021 20:55:25 +0000 Received: by outflank-mailman (input) for mailman id 208881; Wed, 13 Oct 2021 20:55:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHY-0007LR-Ls for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1malHY-0005ke-L9 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1malHY-0003Wd-K1 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 20:55:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RfQvoaZuYSZTMZppfgvzYVLjbXbnDPlmo7rBWZIJyjQ=; b=Cb6ujHmUTL5NC9VhnIgDPsUT+P maCu0uwQgdDiFN0vz6U8A1MhXk9xWLbEWgwxp/hWmyQMHxmxKV6bo4CLCnrwhSsIFr4QPd9ZoYqsu N75On1JLqOaeRSUT54i8xWD5JpW7rxCtMNftQASWES3f+xSXvH4FcJQpM50TpXBp8bWw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Add linux,pci-domain property for hwdom if not available. Message-Id: Date: Wed, 13 Oct 2021 20:55:24 +0000 commit 4cfab4425d39f76660b4e76ba6ee4cbf0f92e7e5 Author: Rahul Singh AuthorDate: Wed Oct 13 13:28:43 2021 -0700 Commit: Stefano Stabellini CommitDate: Wed Oct 13 13:28:43 2021 -0700 xen/arm: Add linux,pci-domain property for hwdom if not available. If the property is not present in the device tree node for host bridge, XEN while creating the dtb for hwdom will create this property and assigns the already allocated segment to the host bridge so that XEN and linux will have the same segment for the host bridges. Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 16 ++++++++++++++++ xen/arch/arm/pci/pci-host-common.c | 21 +++++++++++++++++++++ xen/include/asm-arm/pci.h | 9 +++++++++ 3 files changed, 46 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4c28f1e4e2..0167731ab0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -747,6 +747,22 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, return res; } + if ( is_pci_passthrough_enabled() && dt_device_type_is_equal(node, "pci") ) + { + if ( !dt_find_property(node, "linux,pci-domain", NULL) ) + { + uint16_t segment; + + res = pci_get_host_bridge_segment(node, &segment); + if ( res < 0 ) + return res; + + res = fdt_property_cell(kinfo->fdt, "linux,pci-domain", segment); + if ( res ) + return res; + } + } + /* * Override the property "status" to disable the device when it's * marked for passthrough. diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index af208e7298..cdeb3a283a 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -271,6 +271,27 @@ struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus) return NULL; } + +/* + * This function will lookup an hostbridge based on config space address. + */ +int pci_get_host_bridge_segment(const struct dt_device_node *node, + uint16_t *segment) +{ + struct pci_host_bridge *bridge; + + list_for_each_entry( bridge, &pci_host_bridges, node ) + { + if ( bridge->dt_node != node ) + continue; + + *segment = bridge->segment; + return 0; + } + + return -EINVAL; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index aa0762ff15..81273e0d87 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -98,6 +98,8 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where); struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); struct dt_device_node *pci_find_host_bridge_node(struct device *dev); +int pci_get_host_bridge_segment(const struct dt_device_node *node, + uint16_t *segment); static always_inline bool is_pci_passthrough_enabled(void) { @@ -119,5 +121,12 @@ struct pci_dev; static inline void arch_pci_init_pdev(struct pci_dev *pdev) {} +static inline int pci_get_host_bridge_segment(const struct dt_device_node *node, + uint16_t *segment) +{ + ASSERT_UNREACHABLE(); + return -EINVAL; +} + #endif /*!CONFIG_HAS_PCI*/ #endif /* __ARM_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 23:22:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 23:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208931.365222 (Exim 4.92) (envelope-from ) id 1manZS-0006GE-1r; Wed, 13 Oct 2021 23:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208931.365222; Wed, 13 Oct 2021 23: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 1manZR-0006G5-Uz; Wed, 13 Oct 2021 23:22:01 +0000 Received: by outflank-mailman (input) for mailman id 208931; Wed, 13 Oct 2021 23:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZR-0006Fv-FW for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZR-0008BQ-Ek for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1manZR-00065f-Dh for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23: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=uSmLAFjI97M9NVAMjY60pq9sIWuyFgZkjLSChaw9GL8=; b=rJI2ZPqY26qIr65xXzRDCuTv2L Jr8Ytiv/w+mxxVso9wDmvSsuf+fVp4Le+V5ra4FqPhuKLs/dr8LzuETuud/QktYVltIb6kRB5Yv5F XIJPU4p+M8PxiIPdiCXmB7OCr2lQ9zNIyXn33sV3VGG5rnp+jZIO9miLQ/pMXdfQgjwM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: fix autoballoon regex Message-Id: Date: Wed, 13 Oct 2021 23:22:01 +0000 commit 2faeb4213d9b412836fe80e5685bfcccc51feb92 Author: Dmitry Isaykin AuthorDate: Fri Oct 1 15:24:16 2021 +0300 Commit: Ian Jackson CommitDate: Tue Oct 12 14:40:14 2021 +0100 tools/xl: fix autoballoon regex This regex is used for auto-balloon mode detection based on Xen command line. The case of specifying a negative size was handled incorrectly. >From misc/xen-command-line documentation: dom0_mem (x86) = List of ( min: | max: | ) If a size is positive, it represents an absolute value. If a size is negative, it is subtracted from the total available memory. Also add support for [tT] granularity suffix. Also add support for memory fractions (i.e. '50%' or '1G+25%'). Signed-off-by: Dmitry Isaykin Reviewed-by: Anthony PERARD --- tools/xl/xl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/xl/xl.c b/tools/xl/xl.c index 4107d10fd4..f422f9fed5 100644 --- a/tools/xl/xl.c +++ b/tools/xl/xl.c @@ -80,14 +80,20 @@ static int auto_autoballoon(void) if (!info) return 1; /* default to on */ +#define SIZE_PATTERN "-?[0-9]+[bBkKmMgGtT]?" + ret = regcomp(®ex, - "(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )", + "(^| )dom0_mem=((|min:|max:)(" SIZE_PATTERN "|(" SIZE_PATTERN "\\+)?[0-9]{1,2}%),?)+($| )", REG_NOSUB | REG_EXTENDED); + +#undef SIZE_PATTERN + if (ret) return 1; ret = regexec(®ex, info->commandline, 0, NULL, 0); regfree(®ex); + return ret == REG_NOMATCH; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 23:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 23:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208934.365225 (Exim 4.92) (envelope-from ) id 1manZd-0006KL-3C; Wed, 13 Oct 2021 23:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208934.365225; Wed, 13 Oct 2021 23:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZd-0006KE-0I; Wed, 13 Oct 2021 23:22:13 +0000 Received: by outflank-mailman (input) for mailman id 208934; Wed, 13 Oct 2021 23:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZb-0006Jt-Ih for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZb-0008Bk-Hy for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1manZb-00066e-H4 for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23: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=dLRNsmTtWa0nVYQ6QGfb9/eR+9tLvQTi+Rws7vwkvEQ=; b=Exas5Chk9jPvhBhCntVzMRyhqO 6UwFLp8/nOlqGPqceDEIZAIkGZ1RHCb2Aj1LJgg/AopGCUBAwQ/yv8ppbw0RaaUt6LprJMsEwLz5R isV1BPJMnSwU0NUtA//PqGsCGmA7RhNt9HZ3MFR0KxvokAA/9SuVdPScOjldZ//UDias=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/pv: Split pv_hypercall() in two Message-Id: Date: Wed, 13 Oct 2021 23:22:11 +0000 commit eb7518b89be6df874ec9b2bafadeaaa7c874ea6b Author: Andrew Cooper AuthorDate: Mon Oct 4 19:11:45 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Oct 12 16:56:11 2021 +0100 x86/pv: Split pv_hypercall() in two The is_pv_32bit_vcpu() conditionals hide four lfences, with two taken on any individual path through the function. There is very little code common between compat and native, and context-dependent conditionals predict very badly for a period of time after context switch. Move do_entry_int82() from pv/traps.c into pv/hypercall.c, allowing _pv_hypercall() to be static and forced inline. The delta is: add/remove: 0/0 grow/shrink: 1/1 up/down: 300/-282 (18) Function old new delta do_entry_int82 50 350 +300 pv_hypercall 579 297 -282 which is tiny, but the perf implications are large: Guest | Naples | Milan | SKX | CFL-R | ------+--------+--------+--------+--------+ pv64 | 17.4% | 15.5% | 2.6% | 4.5% | pv32 | 1.9% | 10.9% | 1.4% | 2.5% | These are percentage improvements in raw TSC detlas for a xen_version hypercall, with obvious outliers excluded. Therefore, it is an idealised best case improvement. The pv64 path uses `syscall`, while the pv32 path uses `int $0x82` so necessarily has higher overhead. Therefore, dropping the lfences is less over an overall improvement. I don't know why the Naples pv32 improvement is so small, but I've double checked the numbers and they're consistent. There's presumably something we're doing which is a large overhead in the pipeline. On the Intel side, both systems are writing to MSR_SPEC_CTRL on entry/exit (SKX using the retrofitted microcode implementation, CFL-R using the hardware implementation), while SKX is suffering further from XPTI for Meltdown protection. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/pv/hypercall.c | 24 +++++++++++++++++++----- xen/arch/x86/pv/traps.c | 11 ----------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 9765e674cf..3579ba905c 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -109,15 +110,15 @@ const pv_hypercall_table_t pv_hypercall_table[] = { #undef COMPAT_CALL #undef HYPERCALL -void pv_hypercall(struct cpu_user_regs *regs) +/* Forced inline to cause 'compat' to be evaluated at compile time. */ +static void always_inline +_pv_hypercall(struct cpu_user_regs *regs, bool compat) { struct vcpu *curr = current; - unsigned long eax; + unsigned long eax = compat ? regs->eax : regs->rax; ASSERT(guest_kernel_mode(curr, regs)); - eax = is_pv_32bit_vcpu(curr) ? regs->eax : regs->rax; - BUILD_BUG_ON(ARRAY_SIZE(pv_hypercall_table) > ARRAY_SIZE(hypercall_args_table)); @@ -137,7 +138,7 @@ void pv_hypercall(struct cpu_user_regs *regs) curr->hcall_preempted = false; - if ( !is_pv_32bit_vcpu(curr) ) + if ( !compat ) { unsigned long rdi = regs->rdi; unsigned long rsi = regs->rsi; @@ -348,8 +349,21 @@ void pv_ring1_init_hypercall_page(void *p) *(u8 *)(p+ 7) = 0xc3; /* ret */ } } + +void do_entry_int82(struct cpu_user_regs *regs) +{ + if ( unlikely(untrusted_msi) ) + check_for_unexpected_msi((uint8_t)regs->entry_vector); + + _pv_hypercall(regs, true /* compat */); +} #endif +void pv_hypercall(struct cpu_user_regs *regs) +{ + _pv_hypercall(regs, false /* native */); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 764773c021..1e05a9f1cd 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -24,22 +24,11 @@ #include #include -#include #include #include #include #include -#ifdef CONFIG_PV32 -void do_entry_int82(struct cpu_user_regs *regs) -{ - if ( unlikely(untrusted_msi) ) - check_for_unexpected_msi((uint8_t)regs->entry_vector); - - pv_hypercall(regs); -} -#endif - void pv_inject_event(const struct x86_event *event) { struct vcpu *curr = current; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 23:22:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 23:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208935.365230 (Exim 4.92) (envelope-from ) id 1manZn-0006Nf-55; Wed, 13 Oct 2021 23:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208935.365230; Wed, 13 Oct 2021 23: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 1manZn-0006NX-1q; Wed, 13 Oct 2021 23:22:23 +0000 Received: by outflank-mailman (input) for mailman id 208935; Wed, 13 Oct 2021 23:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZl-0006NB-MU for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZl-0008CF-Lg for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1manZl-00068y-KX for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23: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=jSuCWlYC7Jbv9VrvPlPSq4bCrQfLqsCpYJ/AmHliYDo=; b=nhiODjbFf0rnbk/PZ6SfkGcvr7 zC616KRpgtmtM3Mt6hoi9U0O4ANbUfYGFWnFA/4UeAIHibVhg3t9w/hJJxBe6osL7XzM5dkW1VKnk 5Kan7ffWoeoZA/Z16U5FHmskAe+xM713qqU4B4nUJyGNjlgHjcWvW4WJsKc0YXUbF9lg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/efi: Use dom0less configuration when using EFI boot Message-Id: Date: Wed, 13 Oct 2021 23:22:21 +0000 commit a1743fc3a9fe9b68c265c45264dddf214fd9b882 Author: Luca Fancellu AuthorDate: Mon Oct 11 19:15:27 2021 +0100 Commit: Stefano Stabellini CommitDate: Tue Oct 12 13:06:46 2021 -0700 arm/efi: Use dom0less configuration when using EFI boot This patch introduces the support for dom0less configuration when using UEFI boot on ARM, it permits the EFI boot to continue if no dom0 kernel is specified but at least one domU is found. Introduce the new property "xen,uefi-binary" for device tree boot module nodes that are subnode of "xen,domain" compatible nodes. The property holds a string containing the file name of the binary that shall be loaded by the uefi loader from the filesystem. Introduce a new call efi_check_dt_boot(...) called during EFI boot that checks for module to be loaded using device tree. Architectures that don't support device tree don't have to provide this function. Update efi documentation about how to start a dom0less setup using UEFI Signed-off-by: Luca Fancellu [stefano: drop inline from efi_check_dt_boot] Signed-off-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- docs/misc/arm/device-tree/booting.txt | 21 +++ docs/misc/efi.pandoc | 203 +++++++++++++++++++++++ xen/arch/arm/efi/efi-boot.h | 299 +++++++++++++++++++++++++++++++++- xen/common/efi/boot.c | 39 +++-- 4 files changed, 550 insertions(+), 12 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 352b0ec43a..7258e7e1ec 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -190,6 +190,13 @@ The kernel sub-node has the following properties: Command line parameters for the guest kernel. +- xen,uefi-binary (UEFI boot only) + + String property that specifies the file name to be loaded by the UEFI boot + for this module. If this is specified, there is no need to specify the reg + property because it will be created by the UEFI stub on boot. + This option is needed only when UEFI boot is used. + The ramdisk sub-node has the following properties: - compatible @@ -201,6 +208,13 @@ The ramdisk sub-node has the following properties: Specifies the physical address of the ramdisk in RAM and its length. +- xen,uefi-binary (UEFI boot only) + + String property that specifies the file name to be loaded by the UEFI boot + for this module. If this is specified, there is no need to specify the reg + property because it will be created by the UEFI stub on boot. + This option is needed only when UEFI boot is used. + Example ======= @@ -265,6 +279,13 @@ The dtb sub-node should have the following properties: Specifies the physical address of the device tree binary fragment RAM and its length. +- xen,uefi-binary (UEFI boot only) + + String property that specifies the file name to be loaded by the UEFI boot + for this module. If this is specified, there is no need to specify the reg + property because it will be created by the UEFI stub on boot. + This option is needed only when UEFI boot is used. + As an example: module@0xc000000 { diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index ed85351541..876cd55005 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -167,3 +167,206 @@ sbsign \ --output xen.signed.efi \ xen.unified.efi ``` + +## UEFI boot and dom0less on ARM + +Dom0less feature is supported by ARM and it is possible to use it when Xen is +started as an EFI application. +The way to specify the domU domains is by Device Tree as specified in the +[dom0less](dom0less.html) documentation page under the "Device Tree +configuration" section, but instead of declaring the reg property in the boot +module, the user must specify the "xen,uefi-binary" property containing the name +of the binary file that has to be loaded in memory. +The UEFI stub will load the binary in memory and it will add the reg property +accordingly. + +An example here: + +domU1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "xen,domain"; + memory = <0 0x20000>; + cpus = <1>; + vpl011; + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "vmlinuz-3.0.31-0.4-xen"; + bootargs = "console=ttyAMA0"; + }; + module@2 { + compatible = "multiboot,ramdisk", "multiboot,module"; + xen,uefi-binary = "initrd-3.0.31-0.4-xen"; + }; + module@3 { + compatible = "multiboot,ramdisk", "multiboot,module"; + xen,uefi-binary = "passthrough.dtb"; + }; +}; + +## How to boot different Xen setup using UEFI + +These are the different ways to boot a Xen system from UEFI: + + - Boot Xen and Dom0 (minimum required) + - Boot Xen and DomU(s) (true dom0less, only on ARM) + - Boot Xen, Dom0 and DomU(s) (only on ARM) + +### Boot Xen and Dom0 + +This configuration can be started using the Xen configuration file in the +example above. + +### Boot Xen and DomU(s) + +This configuration needs the domU domain(s) specified in the /chosen node, +examples of how to do that are provided by the documentation about dom0less +and the example above shows how to use the "xen,uefi-binary" property to use the +UEFI stub for module loading. +When adding DomU modules to device tree, also add the property +xen,uefi-cfg-load under chosen for Xen to load the Xen config file. +Otherwise, Xen will skip the config file and rely on device tree alone. + +Example 1 of how to boot a true dom0less configuration: + +Xen configuration file: skipped. + +Device tree: + +``` +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,xen-bootargs = "" + + domU1 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0xc0000>; + vpl011; + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu1.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; + domU2 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0x100000>; + vpl011; + + module@2 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu2.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; +}; +``` + +Example 2 of how to boot a true dom0less configuration: + +Xen configuration file: + +``` +[global] +default=xen + +[xen] +options= +dtb= +``` + +Device tree: + +``` +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,uefi-cfg-load; + + domU1 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0xc0000>; + vpl011; + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu1.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; + domU2 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0x100000>; + vpl011; + + module@2 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu2.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; +}; +``` + +### Boot Xen, Dom0 and DomU(s) + +This configuration is a mix of the two configuration above, to boot this one +the configuration file must be processed so the /chosen node must have the +"xen,uefi-cfg-load" property. + +Here an example: + +Xen configuration file: + +``` +[global] +default=xen + +[xen] +options= +kernel=vmlinuz-3.0.31-0.4-xen [domain 0 command line options] +ramdisk=initrd-3.0.31-0.4-xen +dtb= +``` + +Device tree: + +``` +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,uefi-cfg-load; + + domU1 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0xc0000>; + vpl011; + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu1.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; +}; +``` + + diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index e63dafac26..0d86043567 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -8,9 +8,49 @@ #include #include +typedef struct { + char *name; + unsigned int name_len; + EFI_PHYSICAL_ADDRESS addr; + UINTN size; +} module_name; + +/* + * Binaries will be translated into bootmodules, the maximum number for them is + * MAX_MODULES where we should remove a unit for Xen and one for Xen DTB + */ +#define MAX_UEFI_MODULES (MAX_MODULES - 2) +static struct file __initdata module_binary; +static module_name __initdata modules[MAX_UEFI_MODULES]; +static unsigned int __initdata modules_available = MAX_UEFI_MODULES; +static unsigned int __initdata modules_idx; + +#define ERROR_BINARY_FILE_NOT_FOUND (-1) +#define ERROR_ALLOC_MODULE_NO_SPACE (-1) +#define ERROR_ALLOC_MODULE_NAME (-2) +#define ERROR_MISSING_DT_PROPERTY (-3) +#define ERROR_RENAME_MODULE_NAME (-4) +#define ERROR_SET_REG_PROPERTY (-5) +#define ERROR_CHECK_MODULE_COMPAT (-6) +#define ERROR_DT_MODULE_DOMU (-1) +#define ERROR_DT_CHOSEN_NODE (-2) + void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); void __flush_dcache_area(const void *vaddr, unsigned long size); +static int get_module_file_index(const char *name, unsigned int name_len); +static void PrintMessage(const CHAR16 *s); +static int allocate_module_file(EFI_FILE_HANDLE dir_handle, + const char *name, + unsigned int name_len); +static int handle_module_node(EFI_FILE_HANDLE dir_handle, + int module_node_offset, + int reg_addr_cells, + int reg_size_cells); +static int handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, + int domain_node); +static int efi_check_dt_boot(EFI_FILE_HANDLE dir_handle); + #define DEVICE_TREE_GUID \ {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} @@ -552,8 +592,254 @@ static void __init efi_arch_handle_module(const struct file *file, kernel.size) < 0 ) blexit(L"Unable to set reg property."); } - else + else if ( file != &module_binary ) + /* + * If file is not a dom0 module file and it's not a domU module, + * stop here. + */ blexit(L"Unknown module type"); + + /* + * modules_available is decremented here because for each dom0 file added + * from the configuration file, there will be an additional bootmodule, + * so the number of available slots will be decremented because there is a + * maximum amount of bootmodules that can be loaded. + */ + modules_available--; +} + +/* + * This function checks for a binary previously loaded with a give name, it + * returns the index of the file in the modules array or a negative number if no + * file with that name is found. + */ +static int __init get_module_file_index(const char *name, + unsigned int name_len) +{ + unsigned int i; + int ret = ERROR_BINARY_FILE_NOT_FOUND; + + for ( i = 0; i < modules_idx; i++ ) + { + module_name *mod = &modules[i]; + if ( (mod->name_len == name_len) && + (strncmp(mod->name, name, name_len) == 0) ) + { + ret = i; + break; + } + } + return ret; +} + +static void __init PrintMessage(const CHAR16 *s) +{ + PrintStr(s); + PrintStr(newline); +} + +/* + * This function allocates a binary and keeps track of its name, it returns the + * index of the file in the modules array or a negative number on error. + */ +static int __init allocate_module_file(EFI_FILE_HANDLE dir_handle, + const char *name, + unsigned int name_len) +{ + module_name *file_name; + union string module_name; + int ret; + + /* + * Check if there is any space left for a module, the variable + * modules_available is updated each time we use read_file(...) + * successfully. + */ + if ( !modules_available ) + { + PrintMessage(L"No space left for modules"); + return ERROR_ALLOC_MODULE_NO_SPACE; + } + + module_name.cs = name; + ret = modules_idx; + + /* Save at this index the name of this binary */ + file_name = &modules[ret]; + + if ( efi_bs->AllocatePool(EfiLoaderData, (name_len + 1) * sizeof(char), + (void**)&file_name->name) != EFI_SUCCESS ) + { + PrintMessage(L"Error allocating memory for module binary name"); + return ERROR_ALLOC_MODULE_NAME; + } + + /* Save name and length of the binary in the data structure */ + strlcpy(file_name->name, name, name_len + 1); + file_name->name_len = name_len; + + /* Load the binary in memory */ + read_file(dir_handle, s2w(&module_name), &module_binary, NULL); + + /* Save address and size */ + file_name->addr = module_binary.addr; + file_name->size = module_binary.size; + + /* s2w(...) allocates some memory, free it */ + efi_bs->FreePool(module_name.w); + + modules_idx++; + + return ret; +} + +/* + * This function checks for the presence of the xen,uefi-binary property in the + * module, if found it loads the binary as module and sets the right address + * for the reg property into the module DT node. + */ +static int __init handle_module_node(EFI_FILE_HANDLE dir_handle, + int module_node_offset, + int reg_addr_cells, + int reg_size_cells) +{ + const void *uefi_name_prop; + char mod_string[24]; /* Placeholder for module@ + a 64-bit number + \0 */ + int uefi_name_len, file_idx, module_compat; + module_name *file; + + /* Check if the node is a multiboot,module otherwise return */ + module_compat = fdt_node_check_compatible(fdt, module_node_offset, + "multiboot,module"); + if ( module_compat < 0 ) + /* Error while checking the compatible string */ + return ERROR_CHECK_MODULE_COMPAT; + + if ( module_compat != 0 ) + /* Module is not a multiboot,module */ + return 0; + + /* Read xen,uefi-binary property to get the file name. */ + uefi_name_prop = fdt_getprop(fdt, module_node_offset, "xen,uefi-binary", + &uefi_name_len); + + if ( !uefi_name_prop ) + /* Property not found */ + return 0; + + file_idx = get_module_file_index(uefi_name_prop, uefi_name_len); + if ( file_idx < 0 ) + { + file_idx = allocate_module_file(dir_handle, uefi_name_prop, + uefi_name_len); + if ( file_idx < 0 ) + return file_idx; + } + + file = &modules[file_idx]; + + snprintf(mod_string, sizeof(mod_string), "module@%"PRIx64, file->addr); + + /* Rename the module to be module@{address} */ + if ( fdt_set_name(fdt, module_node_offset, mod_string) < 0 ) + { + PrintMessage(L"Unable to modify module node name."); + return ERROR_RENAME_MODULE_NAME; + } + + if ( fdt_set_reg(fdt, module_node_offset, reg_addr_cells, reg_size_cells, + file->addr, file->size) < 0 ) + { + PrintMessage(L"Unable to set module reg property."); + return ERROR_SET_REG_PROPERTY; + } + + return 0; +} + +/* + * This function checks for boot modules under the domU guest domain node + * in the DT. + * Returns 0 on success, negative number on error. + */ +static int __init handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, + int domain_node) +{ + int module_node, addr_cells, size_cells, len; + const struct fdt_property *prop; + + /* Get #address-cells and #size-cells from domain node */ + prop = fdt_get_property(fdt, domain_node, "#address-cells", &len); + if ( !prop ) + { + PrintMessage(L"#address-cells not found in domain node."); + return ERROR_MISSING_DT_PROPERTY; + } + + addr_cells = fdt32_to_cpu(*((uint32_t *)prop->data)); + + prop = fdt_get_property(fdt, domain_node, "#size-cells", &len); + if ( !prop ) + { + PrintMessage(L"#size-cells not found in domain node."); + return ERROR_MISSING_DT_PROPERTY; + } + + size_cells = fdt32_to_cpu(*((uint32_t *)prop->data)); + + /* Check for nodes compatible with multiboot,module inside this node */ + for ( module_node = fdt_first_subnode(fdt, domain_node); + module_node > 0; + module_node = fdt_next_subnode(fdt, module_node) ) + { + int ret = handle_module_node(dir_handle, module_node, addr_cells, + size_cells); + if ( ret < 0 ) + return ret; + } + + return 0; +} + +/* + * This function checks for xen domain nodes under the /chosen node for possible + * domU guests to be loaded. + * Returns the number of modules loaded or a negative number for error. + */ +static int __init efi_check_dt_boot(EFI_FILE_HANDLE dir_handle) +{ + int chosen, node, addr_len, size_len; + unsigned int i = 0; + + /* Check for the chosen node in the current DTB */ + chosen = setup_chosen_node(fdt, &addr_len, &size_len); + if ( chosen < 0 ) + { + PrintMessage(L"Unable to setup chosen node"); + return ERROR_DT_CHOSEN_NODE; + } + + /* Check for nodes compatible with xen,domain under the chosen node */ + for ( node = fdt_first_subnode(fdt, chosen); + node > 0; + node = fdt_next_subnode(fdt, node) ) + { + if ( !fdt_node_check_compatible(fdt, node, "xen,domain") ) + { + /* Found a node with compatible xen,domain; handle this node. */ + if ( handle_dom0less_domain_node(dir_handle, node) < 0 ) + return ERROR_DT_MODULE_DOMU; + } + } + + /* Free boot modules file names if any */ + for ( ; i < modules_idx; i++ ) + { + /* Free boot modules binary names */ + efi_bs->FreePool(modules[i].name); + } + + return modules_idx; } static void __init efi_arch_cpu(void) @@ -562,8 +848,19 @@ static void __init efi_arch_cpu(void) static void __init efi_arch_blexit(void) { + unsigned int i = 0; + if ( dtbfile.need_to_free ) efi_bs->FreePages(dtbfile.addr, PFN_UP(dtbfile.size)); + /* Free boot modules file names if any */ + for ( ; i < modules_idx; i++ ) + { + /* Free boot modules binary names */ + efi_bs->FreePool(modules[i].name); + /* Free modules binaries */ + efi_bs->FreePages(modules[i].addr, + PFN_UP(modules[i].size)); + } if ( memmap ) efi_bs->FreePool(memmap); } diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 758f9d74d2..c9fdb5a3db 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -166,6 +166,13 @@ static void __init PrintErr(const CHAR16 *s) StdErr->OutputString(StdErr, (CHAR16 *)s ); } +#ifndef CONFIG_HAS_DEVICE_TREE +static int __init efi_check_dt_boot(EFI_FILE_HANDLE dir_handle) +{ + return 0; +} +#endif + /* * Include architecture specific implementation here, which references the * static globals defined above. @@ -1136,6 +1143,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) bool base_video = false; const char *option_str; bool use_cfg_file; + int dt_modules_found; + EFI_FILE_HANDLE dir_handle; __set_bit(EFI_BOOT, &efi_flags); __set_bit(EFI_LOADER, &efi_flags); @@ -1216,9 +1225,11 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_relocate_image(0); + /* Get the file system interface. */ + dir_handle = get_parent_handle(loaded_image, &file_name); + if ( use_cfg_file ) { - EFI_FILE_HANDLE dir_handle; UINTN depth, cols, rows, size; size = cols = rows = depth = 0; @@ -1229,9 +1240,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) gop = efi_get_gop(); - /* Get the file system interface. */ - dir_handle = get_parent_handle(loaded_image, &file_name); - /* Read and parse the config file. */ if ( read_section(loaded_image, L"config", &cfg, NULL) ) PrintStr(L"Using builtin config file\r\n"); @@ -1285,14 +1293,12 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_bs->FreePool(name.w); } - if ( !name.s ) - blexit(L"No Dom0 kernel image specified."); - efi_arch_cfg_file_early(loaded_image, dir_handle, section.s); - option_str = split_string(name.s); + option_str = name.s ? split_string(name.s) : NULL; - if ( !read_section(loaded_image, L"kernel", &kernel, option_str) ) + if ( !read_section(loaded_image, L"kernel", &kernel, option_str) && + name.s ) { read_file(dir_handle, s2w(&name), &kernel, option_str); efi_bs->FreePool(name.w); @@ -1361,12 +1367,23 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); cfg.addr = 0; - dir_handle->Close(dir_handle); - if ( gop && !base_video ) gop_mode = efi_find_gop_mode(gop, cols, rows, depth); } + /* Get the number of boot modules specified on the DT or an error (<0) */ + dt_modules_found = efi_check_dt_boot(dir_handle); + + dir_handle->Close(dir_handle); + + if ( dt_modules_found < 0 ) + /* efi_check_dt_boot throws some error */ + blexit(L"Error processing boot modules on DT."); + + /* Check if at least one of Dom0 or DomU(s) is specified */ + if ( !dt_modules_found && !kernel.ptr ) + blexit(L"No initial domain kernel specified."); + efi_arch_edd(); /* XXX Collect EDID info. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 23:22:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 23:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208936.365234 (Exim 4.92) (envelope-from ) id 1manZx-0006Rr-7j; Wed, 13 Oct 2021 23:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208936.365234; Wed, 13 Oct 2021 23: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 1manZx-0006Rk-4j; Wed, 13 Oct 2021 23:22:33 +0000 Received: by outflank-mailman (input) for mailman id 208936; Wed, 13 Oct 2021 23:22:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZv-0006RQ-QZ for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1manZv-0008Cn-Pl for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1manZv-0006AX-Or for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23: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=CSEVWPpXPqcaJMsgpZ79R+jWR+slGRxJM8iPqZS1HmE=; b=SwtNDVnXpssA36pPAPTAaiOeI5 AcHaoApvSRbeVVsCPzHUjcmdsboTqGk6X8uYl5/BAHez/0JlKOlp9wBSlVuP5Wr36AMkhhPUyV6rO 8ZTmQB+JFGwR4Euc/gqMTtzr1xjOc0botV16BxKlRBRB1q4EUB1iwVxZDIe/aikADnpY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen+tools: Introduce XEN_SYSCTL_PHYSCAP_vpmu Message-Id: Date: Wed, 13 Oct 2021 23:22:31 +0000 commit 3b38b1d96408cf4ee9eb78801e277f5a048e07b0 Author: Michal Orzel AuthorDate: Tue Oct 12 10:13:21 2021 +0200 Commit: Stefano Stabellini CommitDate: Tue Oct 12 14:50:45 2021 -0700 xen+tools: Introduce XEN_SYSCTL_PHYSCAP_vpmu Introduce flag XEN_SYSCTL_PHYSCAP_vpmu which indicates whether the platform supports vPMU functionality. Modify Xen and tools accordingly. Take the opportunity and fix XEN_SYSCTL_PHYSCAP_vmtrace definition in sysctl.h which wrongly use (1 << 6) instead of (1u << 6). Signed-off-by: Michal Orzel Reviewed-by: Bertrand Marquis Acked-by: Nick Rosbrook Reviewed-by: Stefano Stabellini Acked-by: Ian Jackson Acked-by: Christian Lindig --- tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 6 ++++++ tools/libs/light/libxl.c | 1 + tools/libs/light/libxl_types.idl | 1 + tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/xl/xl_info.c | 5 +++-- xen/common/domain.c | 2 ++ xen/common/sysctl.c | 3 +++ xen/include/public/sysctl.h | 6 ++++-- xen/include/xen/domain.h | 2 ++ 12 files changed, 27 insertions(+), 4 deletions(-) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index bfc1e7f312..c8669837d8 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -3360,6 +3360,7 @@ x.CapHap = bool(xc.cap_hap) x.CapShadow = bool(xc.cap_shadow) x.CapIommuHapPtShare = bool(xc.cap_iommu_hap_pt_share) x.CapVmtrace = bool(xc.cap_vmtrace) +x.CapVpmu = bool(xc.cap_vpmu) return nil} @@ -3391,6 +3392,7 @@ xc.cap_hap = C.bool(x.CapHap) xc.cap_shadow = C.bool(x.CapShadow) xc.cap_iommu_hap_pt_share = C.bool(x.CapIommuHapPtShare) xc.cap_vmtrace = C.bool(x.CapVmtrace) +xc.cap_vpmu = C.bool(x.CapVpmu) return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 09a3bb67e2..45f2cba3d2 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -1008,6 +1008,7 @@ CapHap bool CapShadow bool CapIommuHapPtShare bool CapVmtrace bool +CapVpmu bool } type Connectorinfo struct { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index b9ba16d698..ec5e3badae 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -502,6 +502,12 @@ */ #define LIBXL_HAVE_X86_MSR_RELAXED 1 +/* + * LIBXL_HAVE_PHYSINFO_CAP_VPMU indicates that libxl_physinfo has a cap_vpmu + * field, which indicates the availability of vPMU functionality. + */ +#define LIBXL_HAVE_PHYSINFO_CAP_VPMU 1 + /* * libxl ABI compatibility * diff --git a/tools/libs/light/libxl.c b/tools/libs/light/libxl.c index 204eb0be2d..a032723fde 100644 --- a/tools/libs/light/libxl.c +++ b/tools/libs/light/libxl.c @@ -404,6 +404,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo) !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share); physinfo->cap_vmtrace = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_vmtrace); + physinfo->cap_vpmu = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_vpmu); GC_FREE; return 0; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 3f9fff653a..993e83acca 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -1061,6 +1061,7 @@ libxl_physinfo = Struct("physinfo", [ ("cap_shadow", bool), ("cap_iommu_hap_pt_share", bool), ("cap_vmtrace", bool), + ("cap_vpmu", bool), ], dir=DIR_OUT) libxl_connectorinfo = Struct("connectorinfo", [ diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 7ed1c00e47..7a4030a192 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -122,6 +122,7 @@ type physinfo_cap_flag = | CAP_Shadow | CAP_IOMMU_HAP_PT_SHARE | CAP_Vmtrace + | CAP_Vpmu type physinfo = { diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 391d4abdf8..6900513e7f 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -107,6 +107,7 @@ type physinfo_cap_flag = | CAP_Shadow | CAP_IOMMU_HAP_PT_SHARE | CAP_Vmtrace + | CAP_Vpmu type physinfo = { threads_per_core : int; diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index 8383e4a6df..2c86b317b7 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -210,7 +210,7 @@ static void output_physinfo(void) info.hw_cap[4], info.hw_cap[5], info.hw_cap[6], info.hw_cap[7] ); - maybe_printf("virt_caps :%s%s%s%s%s%s%s%s\n", + maybe_printf("virt_caps :%s%s%s%s%s%s%s%s%s\n", info.cap_pv ? " pv" : "", info.cap_hvm ? " hvm" : "", info.cap_hvm && info.cap_hvm_directio ? " hvm_directio" : "", @@ -218,7 +218,8 @@ static void output_physinfo(void) info.cap_hap ? " hap" : "", info.cap_shadow ? " shadow" : "", info.cap_iommu_hap_pt_share ? " iommu_hap_pt_share" : "", - info.cap_vmtrace ? " vmtrace" : "" + info.cap_vmtrace ? " vmtrace" : "", + info.cap_vpmu ? " vpmu" : "" ); vinfo = libxl_get_version_info(ctx); diff --git a/xen/common/domain.c b/xen/common/domain.c index 40d67ec342..262b6c0c3c 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -84,6 +84,8 @@ vcpu_info_t dummy_vcpu_info; bool __read_mostly vmtrace_available; +bool __read_mostly vpmu_is_available; + static void __domain_finalise_shutdown(struct domain *d) { struct vcpu *v; diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 3558641cd9..6e7189bb3c 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -280,6 +280,9 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) if ( vmtrace_available ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_vmtrace; + if ( vpmu_is_available ) + pi->capabilities |= XEN_SYSCTL_PHYSCAP_vpmu; + if ( copy_to_guest(u_sysctl, op, 1) ) ret = -EFAULT; } diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 039ccf885c..fead0e5b53 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -100,10 +100,12 @@ struct xen_sysctl_tbuf_op { #define _XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share 5 #define XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share \ (1u << _XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share) -#define XEN_SYSCTL_PHYSCAP_vmtrace (1 << 6) +#define XEN_SYSCTL_PHYSCAP_vmtrace (1u << 6) +/* The platform supports vPMU. */ +#define XEN_SYSCTL_PHYSCAP_vpmu (1u << 7) /* Max XEN_SYSCTL_PHYSCAP_* constant. Used for ABI checking. */ -#define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_vmtrace +#define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_vpmu struct xen_sysctl_physinfo { uint32_t threads_per_core; diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 1708c36964..160c8dbdab 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -133,4 +133,6 @@ static inline void vnuma_destroy(struct vnuma_info *vnuma) { ASSERT(!vnuma); } extern bool vmtrace_available; +extern bool vpmu_is_available; + #endif /* __XEN_DOMAIN_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 13 23:22:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 Oct 2021 23:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.208937.365238 (Exim 4.92) (envelope-from ) id 1mana7-0006VJ-9X; Wed, 13 Oct 2021 23:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 208937.365238; Wed, 13 Oct 2021 23: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 1mana7-0006VB-6S; Wed, 13 Oct 2021 23:22:43 +0000 Received: by outflank-mailman (input) for mailman id 208937; Wed, 13 Oct 2021 23:22:41 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mana5-0006Ux-TW for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mana5-0008DH-So for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23:22:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mana5-0006BH-Rw for xen-changelog@lists.xenproject.org; Wed, 13 Oct 2021 23: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=f1eApKAV2vEP1Xc0Gs8f8QcnqT/KtvFhzPbNDpgc1bU=; b=e5nD6JYMWciCc1ts6ZseRCNi9Z wF50wytpl/tb3mwLsIULSSzSAfjntCkQdV8uXNhynAXZGnAGxw5Sh+QJIr2u+ogAhbLbUok2nQfxC m2vqRR/v2HZMSv4iB93Dy7OyaNC9Yo9a6pltmioSCuKqv+QaINVkFomd+OdUfVlwnaC0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Check for PMU platform support Message-Id: Date: Wed, 13 Oct 2021 23:22:41 +0000 commit f9294486926c865a3ef11cacd7cb6b26cce6f4a4 Author: Michal Orzel AuthorDate: Tue Oct 12 10:13:22 2021 +0200 Commit: Stefano Stabellini CommitDate: Tue Oct 12 15:25:52 2021 -0700 xen/arm: Check for PMU platform support ID_AA64DFR0_EL1/ID_DFR0_EL1 registers provide information about PMU support. Replace structure dbg64/dbg32 with a union and fill in all the register fields according to document: ARM Architecture Registers(DDI 0595, 2021-06). Add macros boot_dbg_feature64/boot_dbg_feature32 to check for a debug feature. Add macro cpu_has_pmu to check for PMU support. Any value higher than 0 and less than 15 means that PMU is supported (we do not care about its version for now). Signed-off-by: Michal Orzel [stefano: add in-code comment] Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- xen/include/asm-arm/cpufeature.h | 59 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 5ca09b0bff..8a5afbaf0b 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -4,6 +4,7 @@ #ifdef CONFIG_ARM_64 #define cpu_feature64(c, feat) ((c)->pfr64.feat) #define boot_cpu_feature64(feat) (system_cpuinfo.pfr64.feat) +#define boot_dbg_feature64(feat) (system_cpuinfo.dbg64.feat) #define cpu_feature64_has_el0_32(c) (cpu_feature64(c, el0) == 2) @@ -22,6 +23,7 @@ #define cpu_feature32(c, feat) ((c)->pfr32.feat) #define boot_cpu_feature32(feat) (system_cpuinfo.pfr32.feat) +#define boot_dbg_feature32(feat) (system_cpuinfo.dbg32.feat) #define cpu_has_arm (boot_cpu_feature32(arm) == 1) #define cpu_has_thumb (boot_cpu_feature32(thumb) >= 1) @@ -32,8 +34,20 @@ #ifdef CONFIG_ARM_32 #define cpu_has_gentimer (boot_cpu_feature32(gentimer) == 1) +/* + * On Armv7, the value 0 is used to indicate that PMUv2 is not + * supported. IOW this doesn't tell us whether the PMU is not supported + * (a processor may implement PMUv1). + * + * For convenience, we treat 0 as not supported which matches the + * meaning on Armv8 + */ +#define cpu_has_pmu ((boot_dbg_feature32(perfmon) >= 1) && \ + (boot_dbg_feature32(perfmon) < 15)) #else #define cpu_has_gentimer (1) +#define cpu_has_pmu ((boot_dbg_feature64(pmu_ver) >= 1) && \ + (boot_dbg_feature64(pmu_ver) < 15)) #endif #define cpu_has_security (boot_cpu_feature32(security) > 0) @@ -181,8 +195,28 @@ struct cpuinfo_arm { }; } pfr64; - struct { + union { register_t bits[2]; + struct { + /* DFR0 */ + unsigned long debug_ver:4; + unsigned long trace_ver:4; + unsigned long pmu_ver:4; + unsigned long brps:4; + unsigned long __res0:4; + unsigned long wrps:4; + unsigned long __res1:4; + unsigned long ctx_cmps:4; + unsigned long pms_ver:4; + unsigned long double_lock:4; + unsigned long trace_filt:4; + unsigned long __res2:4; + unsigned long mtpmu:4; + unsigned long __res3:12; + + /* DFR1 */ + unsigned long __res4:64; + }; } dbg64; struct { @@ -321,8 +355,29 @@ struct cpuinfo_arm { }; } pfr32; - struct { + union { register_t bits[2]; + struct { + /* DFR0 */ + unsigned long copdbg:4; + unsigned long copsdbg:4; + unsigned long mmapdbg:4; + unsigned long coptrc:4; + unsigned long mmaptrc:4; + unsigned long mprofdbg:4; + unsigned long perfmon:4; + unsigned long tracefilt:4; +#ifdef CONFIG_ARM_64 + unsigned long __res0:32; +#endif + + /* DFR1 */ + unsigned long mtpmu:4; + unsigned long __res1:28; +#ifdef CONFIG_ARM_64 + unsigned long __res2:32; +#endif + }; } dbg32; struct { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 14 10:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Oct 2021 10:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209249.365643 (Exim 4.92) (envelope-from ) id 1maxsE-00048z-1p; Thu, 14 Oct 2021 10:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209249.365643; Thu, 14 Oct 2021 10:22:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maxsD-00048r-UZ; Thu, 14 Oct 2021 10:22:05 +0000 Received: by outflank-mailman (input) for mailman id 209249; Thu, 14 Oct 2021 10:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maxsC-00048l-KO for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 10:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maxsC-0006Ao-I9 for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 10:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1maxsC-0003Z4-HE for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 10:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JS548EA+/UjHDOL25Bu+DzIA1aj96/hqHPLlcbMHv2Y=; b=OfmzEU2GCxZMv0C1ZcWgEfNrR+ 1HljEGPJzit9yt52xlnWqjl1fjrQhuHeHLN4NRJelH27Q9bK/rLpwt5qrto7u7UaTThhZFQwP5I8D 9wiMHiD2camjR0vEoG0uQVIgguo4mAFScjHP+XrhZ12iLYvKgKHmdBy8GKkYiK5E16iU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert "xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag" Message-Id: Date: Thu, 14 Oct 2021 10:22:04 +0000 commit 9516d01ac3015f522528ed6dafb3f584eaa7ed2c Author: Michal Orzel AuthorDate: Thu Oct 14 10:47:18 2021 +0200 Commit: Julien Grall CommitDate: Thu Oct 14 10:08:07 2021 +0000 Revert "xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag" This reverts commit 2075b410ee8087662c880213c3aca196fb7ade22. During the discussion [1] that took place after the patch was merged it was agreed that it should be reverted to avoid introducing a bad interface. Furthermore, the patch rejected usage of flag XEN_DOMCTL_CDF_vpci for x86 which is not true as it should be set for dom0 PVH. Due to XEN_DOMCTL_CDF_vpmu being introduced after XEN_DOMCTL_CDF_vpci, modify its bit position from 8 to 7. [1] https://marc.info/?t=163354215300039&r=1&w=2 Signed-off-by: Michal Orzel Acked-by: Jan Beulich Acked-by: Christian Lindig > Acked-by: Julien Grall Reviewed-by: Bertrand Marquis --- tools/ocaml/libs/xc/xenctrl.ml | 1 - tools/ocaml/libs/xc/xenctrl.mli | 1 - xen/arch/arm/domain.c | 3 +-- xen/arch/x86/domain.c | 6 ------ xen/common/domain.c | 3 +-- xen/include/public/domctl.h | 3 +-- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 86758babb3..addcf4cc59 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -69,7 +69,6 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU | CDF_NESTED_VIRT - | CDF_VPCI | CDF_VPMU type domain_create_iommu_opts = diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 0fdb0cc169..0a5ce529e9 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -62,7 +62,6 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU | CDF_NESTED_VIRT - | CDF_VPCI | CDF_VPMU type domain_create_iommu_opts = diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index ad21c9b950..eef0661beb 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -628,8 +628,7 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) { unsigned int max_vcpus; unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap); - unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpci | - XEN_DOMCTL_CDF_vpmu); + unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpmu); if ( (config->flags & ~flags_optional) != flags_required ) { diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 79c2aa4636..ef1812dc14 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -662,12 +662,6 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } - if ( config->flags & XEN_DOMCTL_CDF_vpci ) - { - dprintk(XENLOG_INFO, "vPCI cannot be enabled yet\n"); - return -EINVAL; - } - if ( config->vmtrace_size ) { unsigned int size = config->vmtrace_size; diff --git a/xen/common/domain.c b/xen/common/domain.c index 8543fb54fd..8b53c49d1e 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -486,8 +486,7 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) ~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu | - XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci | - XEN_DOMCTL_CDF_vpmu) ) + XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpmu) ) { dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags); return -EINVAL; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index a53cbd16f4..238384b5ae 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -70,9 +70,8 @@ struct xen_domctl_createdomain { #define XEN_DOMCTL_CDF_iommu (1U<<_XEN_DOMCTL_CDF_iommu) #define _XEN_DOMCTL_CDF_nested_virt 6 #define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt) -#define XEN_DOMCTL_CDF_vpci (1U << 7) /* Should we expose the vPMU to the guest? */ -#define XEN_DOMCTL_CDF_vpmu (1U << 8) +#define XEN_DOMCTL_CDF_vpmu (1U << 7) /* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ #define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpmu -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 14 10:44:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Oct 2021 10:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209251.365646 (Exim 4.92) (envelope-from ) id 1mayDV-0005ui-M7; Thu, 14 Oct 2021 10:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209251.365646; Thu, 14 Oct 2021 10:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mayDV-0005ua-JA; Thu, 14 Oct 2021 10:44:05 +0000 Received: by outflank-mailman (input) for mailman id 209251; Thu, 14 Oct 2021 10:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mayDU-0005uU-4e for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 10:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mayDU-0006Vl-3X for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 10:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mayDU-00054s-2V for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 10:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oMG/eerWqJqTvIYUu8S6+e9u/C6DOzczCTEAKmZdsIs=; b=cxvF6ntF1Bs+kwRH1jswAv6zLx PgSvcGj9bIzXTIUja8Hy3QXbBJJWn3vvVA6IV+0OTrOHDGf6DpWLitNz4Fe6Kw0VlMHXGeA5sOx0b wM3dPRhSS3kTVgimykWi1ZvJf/8V+UNPedTWs4tqWCQ7sdHfiM6dZFjsWfVmKZgflSBs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: fix dependencies in arch/x86/boot Message-Id: Date: Thu, 14 Oct 2021 10:44:04 +0000 commit 2f5f0a1b77161993c16c4cc243467d75e5b7633b Author: Anthony PERARD AuthorDate: Thu Oct 14 12:35:42 2021 +0200 Commit: Jan Beulich CommitDate: Thu Oct 14 12:35:42 2021 +0200 build: fix dependencies in arch/x86/boot Temporary fix the list of headers that cmdline.c and reloc.c depends on, until the next time the list is out of sync again. Also, add the linker script to the list. Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich --- xen/arch/x86/boot/Makefile | 9 ++++++--- xen/arch/x86/boot/build32.mk | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index 9b31bfcbfb..d2eb277d42 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -2,19 +2,22 @@ obj-bin-y += head.o DEFS_H_DEPS = defs.h $(BASEDIR)/include/xen/stdbool.h -CMDLINE_DEPS = $(DEFS_H_DEPS) video.h +CMDLINE_DEPS = $(DEFS_H_DEPS) video.h \ + $(BASEDIR)/include/xen/kconfig.h \ + $(BASEDIR)/include/generated/autoconf.h RELOC_DEPS = $(DEFS_H_DEPS) \ $(BASEDIR)/include/generated/autoconf.h \ $(BASEDIR)/include/xen/kconfig.h \ $(BASEDIR)/include/xen/multiboot.h \ $(BASEDIR)/include/xen/multiboot2.h \ + $(BASEDIR)/include/xen/const.h \ $(BASEDIR)/include/public/arch-x86/hvm/start_info.h head.o: cmdline.S reloc.S -cmdline.S: cmdline.c $(CMDLINE_DEPS) +cmdline.S: cmdline.c $(CMDLINE_DEPS) build32.lds $(MAKE) -f build32.mk $@ CMDLINE_DEPS="$(CMDLINE_DEPS)" -reloc.S: reloc.c $(RELOC_DEPS) +reloc.S: reloc.c $(RELOC_DEPS) build32.lds $(MAKE) -f build32.mk $@ RELOC_DEPS="$(RELOC_DEPS)" diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index 8cd5403926..e90680cd9f 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -27,7 +27,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) done $(OBJCOPY) -O binary -R .got.plt $< $@ -%.lnk: %.o +%.lnk: %.o build32.lds $(LD) $(LDFLAGS_DIRECT) -N -T build32.lds -o $@ $< %.o: %.c -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 14 13:11:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Oct 2021 13:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209339.365755 (Exim 4.92) (envelope-from ) id 1mb0Vk-0007VI-4V; Thu, 14 Oct 2021 13:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209339.365755; Thu, 14 Oct 2021 13: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 1mb0Vk-0007VA-1a; Thu, 14 Oct 2021 13:11:04 +0000 Received: by outflank-mailman (input) for mailman id 209339; Thu, 14 Oct 2021 13:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb0Vi-0007V4-9c for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb0Vi-0000ax-8f for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mb0Vi-0007Up-7h for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13: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=GixtsiiTEUciFul8XLOa2BxJcOyjOZ4P5EK+9jzcXLE=; b=QbTulsk2rRlvRjvFq/YawqKWK4 QvNLFn4yqXQ/RVe7hhsNAcML5Z70YpWVguwI4IHs8lx5vSgJY+BHFUZ/gq298TYXZn9FV4lD+8oWz fRFm23eYMA9X8mGtx97eXZ/iE2DPMnuVTsSCMq3K9EquMQvEw+sjD2UqhT+3Bvjbx4Ms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: CODING_STYLE: Explicitly deprecate #ifdef Message-Id: Date: Thu, 14 Oct 2021 13:11:02 +0000 commit c8c6cd9eee9aa98c696607adb9d1e422da161110 Author: Ian Jackson AuthorDate: Tue Oct 12 15:50:28 2021 +0100 Commit: Ian Jackson CommitDate: Wed Oct 13 15:10:38 2021 +0100 libxl: CODING_STYLE: Explicitly deprecate #ifdef We don't use ifdefs in the main code. Actually document this. Signed-off-by: Ian Jackson Acked-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/light/CODING_STYLE | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/libs/light/CODING_STYLE b/tools/libs/light/CODING_STYLE index 3d572f6925..b1a6a45c74 100644 --- a/tools/libs/light/CODING_STYLE +++ b/tools/libs/light/CODING_STYLE @@ -121,6 +121,16 @@ permitted exceptions to the usual libxl code formatting rules. +ARCHITECTURE-SPECIFIC CODE, CONDITIONAL COMPILATION +--------------------------------------------------- + +Architecture-specific code should be isolated in libxl_.c, +with a function call interface, wherever possible. + +#ifdefs should be avoided, and in any case not interspersed through +the primary functional code. + + IDEMPOTENT DATA STRUCTURE CONSTRUCTION/DESTRUCTION -------------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 14 13:11:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Oct 2021 13:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209340.365759 (Exim 4.92) (envelope-from ) id 1mb0Vu-0007XB-6P; Thu, 14 Oct 2021 13:11:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209340.365759; Thu, 14 Oct 2021 13: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 1mb0Vu-0007Wz-3B; Thu, 14 Oct 2021 13:11:14 +0000 Received: by outflank-mailman (input) for mailman id 209340; Thu, 14 Oct 2021 13:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb0Vs-0007Wp-Db for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb0Vs-0000cs-Cs for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mb0Vs-0007VW-Bt for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13: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=CL3kUdhI9NhrIFB8/vRkK8rm8xR45PoK2Jg4O1qdT/c=; b=Tq3gsoYDxeWHWj/bFFl44lAcVU h6Cea5aWbqsAwQQm512XOjV2dOTfZLIot6BeR4HQd1FQXyPuyq8a52jinaf4FD8wIApM14H7K8Lrg w/uDP+CKKiCdClAmUT2AEtlKra8sTlBWAlyc10enzK9vXz5xAtF8ENz3JMsd8w+uecng=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Expose the PMU to the guests Message-Id: Date: Thu, 14 Oct 2021 13:11:12 +0000 commit dbb948110a0e23a8081882a980038e9c0f6aab88 Author: Michal Orzel AuthorDate: Wed Oct 13 14:33:52 2021 +0200 Commit: Ian Jackson CommitDate: Wed Oct 13 15:10:38 2021 +0100 xen: Expose the PMU to the guests Add parameter vpmu to xl domain configuration syntax to enable the access to PMU registers by disabling the PMU traps(currently only for ARM). The current status is that the PMU registers are not virtualized and the physical registers are directly accessible when this parameter is enabled. There is no interrupt support and Xen will not save/restore the register values on context switches. According to Arm Arm, section D7.1: "The Performance Monitors Extension is common to AArch64 operation and AArch32 operation." That means we have an ensurance that if PMU is present in one exception state, it must also be present in the other. Please note that this feature is experimental. Signed-off-by: Michal Orzel Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis Acked-by: Anthony PERARD Acked-by: Ian Jackson --- SUPPORT.md | 14 +++++++++++--- docs/man/xl.cfg.5.pod.in | 17 +++++++++++++++++ tools/golang/xenlight/helpers.gen.go | 6 ++++++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 6 ++++++ tools/libs/light/libxl_create.c | 10 ++++++++++ tools/libs/light/libxl_types.idl | 2 ++ tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/xl/xl_parse.c | 2 ++ xen/arch/arm/domain.c | 13 ++++++++++--- xen/arch/arm/setup.c | 3 +++ xen/common/domain.c | 10 +++++++++- xen/include/asm-arm/domain.h | 1 + xen/include/public/domctl.h | 4 +++- 15 files changed, 83 insertions(+), 8 deletions(-) diff --git a/SUPPORT.md b/SUPPORT.md index 317392d8f3..3a34933c89 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -671,11 +671,19 @@ such as KVM, Hyper-V, Bromium, and so on as guests. ### vPMU -Virtual Performance Management Unit for HVM guests +Virtual Performance Management Unit - Status, x86: Supported, Not security supported + Status, x86 HVM: Supported, Not security supported + Status, ARM: Experimental + +On ARM, support for accessing PMU registers from the guests. +There is no interrupt support and Xen will not save/restore +the register values on context switches. + +Disabled by default. +On ARM, enable with guest parameter. +On x86, enable with hypervisor command line option. -Disabled by default (enable with hypervisor command line option). This feature is not security supported: see https://xenbits.xen.org/xsa/advisory-163.html ### Argo: Inter-domain message delivery by hypercall diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 4b1e3028d2..55c4881205 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -690,6 +690,23 @@ default. B: Acceptable values are platform specific. For Intel Processor Trace, this value must be a power of 2 between 4k and 16M. +=item B + +Currently ARM only. + +Specifies whether to enable the access to PMU registers by disabling +the PMU traps. + +The PMU registers are not virtualized and the physical registers are directly +accessible when this parameter is enabled. There is no interrupt support and +Xen will not save/restore the register values on context switches. + +vPMU, by design and purpose, exposes system level performance +information to the guest. Only to be used by sufficiently privileged +domains. This feature is currently in experimental state. + +If this option is not specified then it will default to B. + =back =head2 Devices diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index c8669837d8..2449580bad 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1119,6 +1119,9 @@ return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } x.Altp2M = Altp2MMode(xc.altp2m) x.VmtraceBufKb = int(xc.vmtrace_buf_kb) +if err := x.Vpmu.fromC(&xc.vpmu);err != nil { +return fmt.Errorf("converting field Vpmu: %v", err) +} return nil} @@ -1600,6 +1603,9 @@ return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } xc.altp2m = C.libxl_altp2m_mode(x.Altp2M) xc.vmtrace_buf_kb = C.int(x.VmtraceBufKb) +if err := x.Vpmu.toC(&xc.vpmu); err != nil { +return fmt.Errorf("converting field Vpmu: %v", err) +} return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 45f2cba3d2..b2e8bd1a85 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -521,6 +521,7 @@ MsrRelaxed Defbool } Altp2M Altp2MMode VmtraceBufKb int +Vpmu Defbool } type DomainBuildInfoTypeUnion interface { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index ec5e3badae..ee73eb06f1 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -508,6 +508,12 @@ */ #define LIBXL_HAVE_PHYSINFO_CAP_VPMU 1 +/* + * LIBXL_HAVE_VPMU indicates that libxl_domain_build_info has a vpmu parameter, + * which allows to enable the access to PMU registers. + */ +#define LIBXL_HAVE_VPMU 1 + /* * libxl ABI compatibility * diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index e356b2106d..6ebb2bfc76 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -91,6 +91,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); + libxl_defbool_setdefault(&b_info->vpmu, false); if (libxl_defbool_val(b_info->device_model_stubdomain) && !b_info->device_model_ssidref) @@ -622,6 +623,9 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, create.flags |= XEN_DOMCTL_CDF_nested_virt; } + if (libxl_defbool_val(b_info->vpmu)) + create.flags |= XEN_DOMCTL_CDF_vpmu; + assert(info->passthrough != LIBXL_PASSTHROUGH_DEFAULT); LOG(DETAIL, "passthrough: %s", libxl_passthrough_to_string(info->passthrough)); @@ -1199,6 +1203,12 @@ int libxl__domain_config_setdefault(libxl__gc *gc, goto error_out; } + if (libxl_defbool_val(d_config->b_info.vpmu) && !physinfo.cap_vpmu) { + ret = ERROR_INVAL; + LOGD(ERROR, domid, "vPMU not supported on this platform"); + goto error_out; + } + ret = 0; error_out: return ret; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 993e83acca..b96fb5c47e 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -655,6 +655,8 @@ libxl_domain_build_info = Struct("domain_build_info",[ # Use zero value to disable this feature. ("vmtrace_buf_kb", integer), + ("vpmu", libxl_defbool), + ], dir=DIR_IN, copy_deprecated_fn="libxl__domain_build_info_copy_deprecated", ) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 7a4030a192..86758babb3 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -70,6 +70,7 @@ type domain_create_flag = | CDF_IOMMU | CDF_NESTED_VIRT | CDF_VPCI + | CDF_VPMU type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 6900513e7f..0fdb0cc169 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -63,6 +63,7 @@ type domain_create_flag = | CDF_IOMMU | CDF_NESTED_VIRT | CDF_VPCI + | CDF_VPMU type domain_create_iommu_opts = | IOMMU_NO_SHAREPT diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 17dddb4cd5..c503b9be00 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2750,6 +2750,8 @@ skip_usbdev: "If it fixes an issue you are having please report to " "xen-devel@lists.xenproject.org.\n"); + xlu_cfg_get_defbool(config, "vpmu", &b_info->vpmu, 0); + xlu_cfg_destroy(config); } diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index aae4472479..ad21c9b950 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -276,6 +276,8 @@ static void ctxt_switch_to(struct vcpu *n) * timer. The interrupt needs to be injected into the guest. */ WRITE_SYSREG(n->arch.cntkctl, CNTKCTL_EL1); virt_timer_restore(n); + + WRITE_SYSREG(n->arch.mdcr_el2, MDCR_EL2); } /* Update per-VCPU guest runstate shared memory area (if registered). */ @@ -586,6 +588,10 @@ int arch_vcpu_create(struct vcpu *v) v->arch.hcr_el2 = get_default_hcr_flags(); + v->arch.mdcr_el2 = HDCR_TDRA | HDCR_TDOSA | HDCR_TDA; + if ( !(v->domain->options & XEN_DOMCTL_CDF_vpmu) ) + v->arch.mdcr_el2 |= HDCR_TPM | HDCR_TPMCR; + if ( (rc = vcpu_vgic_init(v)) != 0 ) goto fail; @@ -621,10 +627,11 @@ void vcpu_switch_to_aarch64_mode(struct vcpu *v) int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) { unsigned int max_vcpus; + unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap); + unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpci | + XEN_DOMCTL_CDF_vpmu); - /* HVM and HAP must be set. IOMMU and VPCI may or may not be */ - if ( (config->flags & ~XEN_DOMCTL_CDF_iommu & ~XEN_DOMCTL_CDF_vpci) != - (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap) ) + if ( (config->flags & ~flags_optional) != flags_required ) { dprintk(XENLOG_INFO, "Unsupported configuration %#x\n", config->flags); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 49dc90d198..d5d0792ed4 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -999,6 +999,9 @@ void __init start_xen(unsigned long boot_phys_offset, printk("Brought up %ld CPUs\n", (long)num_online_cpus()); /* TODO: smp_cpus_done(); */ + /* This should be done in a vpmu driver but we do not have one yet. */ + vpmu_is_available = cpu_has_pmu; + /* * The IOMMU subsystem must be initialized before P2M as we need * to gather requirements regarding the maximum IPA bits supported by diff --git a/xen/common/domain.c b/xen/common/domain.c index 262b6c0c3c..8543fb54fd 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -480,12 +480,14 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) bool hvm = config->flags & XEN_DOMCTL_CDF_hvm; bool hap = config->flags & XEN_DOMCTL_CDF_hap; bool iommu = config->flags & XEN_DOMCTL_CDF_iommu; + bool vpmu = config->flags & XEN_DOMCTL_CDF_vpmu; if ( config->flags & ~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu | - XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci) ) + XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci | + XEN_DOMCTL_CDF_vpmu) ) { dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags); return -EINVAL; @@ -534,6 +536,12 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + if ( vpmu && !vpmu_is_available ) + { + dprintk(XENLOG_INFO, "vpmu requested but cannot be enabled this way\n"); + return -EINVAL; + } + return arch_sanitise_domain_config(config); } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index c9277b5c6d..14e575288f 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -166,6 +166,7 @@ struct arch_vcpu /* HYP configuration */ register_t hcr_el2; + register_t mdcr_el2; uint32_t teecr, teehbr; /* ThumbEE, 32-bit guests only */ #ifdef CONFIG_ARM_32 diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 4cb3f662c2..a53cbd16f4 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -71,9 +71,11 @@ struct xen_domctl_createdomain { #define _XEN_DOMCTL_CDF_nested_virt 6 #define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt) #define XEN_DOMCTL_CDF_vpci (1U << 7) +/* Should we expose the vPMU to the guest? */ +#define XEN_DOMCTL_CDF_vpmu (1U << 8) /* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ -#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpci +#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpmu uint32_t flags; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 14 13:11:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Oct 2021 13:11:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209341.365763 (Exim 4.92) (envelope-from ) id 1mb0W4-0007aB-7n; Thu, 14 Oct 2021 13:11:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209341.365763; Thu, 14 Oct 2021 13: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 1mb0W4-0007a3-4r; Thu, 14 Oct 2021 13:11:24 +0000 Received: by outflank-mailman (input) for mailman id 209341; Thu, 14 Oct 2021 13:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb0W2-0007Zi-H0 for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb0W2-0000d7-GC for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mb0W2-0007W8-FE for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 13: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=SF6jyjJMJJO7ZKlA5+BokM7jN1a7YGi6oEE8+xeJ2W0=; b=uAOl6ot2UiDRF3m3UUDIaJW4a9 biVGvaycb73fIgYCxVUuI5Qv07B9opqeLVJeI9tgE0hYl6bBfk8STS0wjIaiz9ciu21P1GCdJ3x4V Hza8c5hOLuEOKF7Dju4mMFbEIjEddGnYQ6D0KSB0YJA/yO2gzKKmlmeVZMpYwPOrYeP4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: clean common temporary files from root makefile Message-Id: Date: Thu, 14 Oct 2021 13:11:22 +0000 commit 9e319e5258d0274c15da2ea9355dc1569a0fa832 Author: Anthony PERARD AuthorDate: Wed Oct 13 17:51:12 2021 +0200 Commit: Jan Beulich CommitDate: Wed Oct 13 17:51:12 2021 +0200 build: clean common temporary files from root makefile Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich --- xen/Makefile | 1 + xen/scripts/Makefile.clean | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 5d01101662..a3189eb47c 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -379,6 +379,7 @@ _clean: delete-unfresh-files $(MAKE) $(clean) test $(MAKE) $(kconfig) clean find . \( -name "*.o" -o -name ".*.d" -o -name ".*.d2" \ + -o -name ".*.o.tmp" -o -name "*~" -o -name "core" \ -o -name "*.gcno" -o -name ".*.cmd" -o -name "lib.a" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core rm -f asm-offsets.s include/asm-*/asm-offsets.h diff --git a/xen/scripts/Makefile.clean b/xen/scripts/Makefile.clean index 027c200c0e..8582ec35e4 100644 --- a/xen/scripts/Makefile.clean +++ b/xen/scripts/Makefile.clean @@ -14,10 +14,8 @@ include Makefile subdir-all := $(subdir-y) $(subdir-n) $(subdir-) \ $(patsubst %/,%, $(filter %/, $(obj-y) $(obj-n) $(obj-))) -DEPS_RM = $(DEPS) $(DEPS_INCLUDE) .PHONY: clean -clean:: $(subdir-all) - rm -f *.o .*.o.tmp *~ core $(DEPS_RM) +clean:: $(subdir-all) ; # Descending # --------------------------------------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 14 14:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Oct 2021 14:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209429.365883 (Exim 4.92) (envelope-from ) id 1mb1n7-0003nC-Q2; Thu, 14 Oct 2021 14:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209429.365883; Thu, 14 Oct 2021 14:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb1n7-0003n4-N2; Thu, 14 Oct 2021 14:33:05 +0000 Received: by outflank-mailman (input) for mailman id 209429; Thu, 14 Oct 2021 14:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb1n7-0003my-9C for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 14:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb1n7-00026d-8L for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 14:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mb1n7-0004w5-7c for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 14:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d+6PCcJrNKdtqJNHeJip49Z3r4rhinYRvxiK+9AerEg=; b=rql0BqMDxUdPb2Ln/dC4i2IlIX wZpEpt03CUwBQK24ZHbVJcV1P86xShfe6fdvNYHkg2nY2qYN1iOx4vvqpHZbtXBMAteoPy9HjeWVv DssgOfIMiZFfeHIuTWxRdWlR9uILQ89Ki3wFN7rat29ktsjEJLayZlYxCnU2Hk0MWNig=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Introduce gpaddr_bits field to struct xen_domctl_getdomaininfo Message-Id: Date: Thu, 14 Oct 2021 14:33:05 +0000 commit 1e6706b0d12300a81db91e07af8340720a8d67c6 Author: Oleksandr Tyshchenko AuthorDate: Thu Oct 14 14:40:44 2021 +0300 Commit: Ian Jackson CommitDate: Thu Oct 14 15:18:32 2021 +0100 xen/arm: Introduce gpaddr_bits field to struct xen_domctl_getdomaininfo We need to pass info about maximum supported guest physical address space size to the toolstack on Arm in order to properly calculate the base and size of the extended region (safe range) for the guest. The extended region is unused address space which could be safely used by domain for foreign/grant mappings on Arm. The extended region itself will be handled by the subsequent patch. Currently the same guest physical address space size is used for all guests (p2m_ipa_bits variable on Arm, the x86 equivalent is hap_paddr_bits). Add an explicit padding after "gpaddr_bits" field and also (while at it) after "domain" field. Also make sure that full structure is cleared in all cases by moving the clearing into getdomaininfo(). Currently it is only cleared by the sysctl caller (and only once). Please note, we do not need to bump XEN_DOMCTL_INTERFACE_VERSION as a bump has already occurred in this release cycle. But we do need to bump XEN_SYSCTL_INTERFACE_VERSION as the structure is re-used in a sysctl. Suggested-by: Julien Grall Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Ian Jackson [hypervisor parts] Reviewed-by: Jan Beulich --- tools/include/libxl.h | 8 ++++++++ tools/include/xenctrl.h | 1 + tools/libs/ctrl/xc_domain.c | 1 + tools/libs/light/libxl_domain.c | 1 + tools/libs/light/libxl_types.idl | 1 + xen/arch/arm/domctl.c | 2 ++ xen/arch/x86/domctl.c | 1 + xen/common/domctl.c | 4 ++-- xen/common/sysctl.c | 2 +- xen/include/public/domctl.h | 3 +++ xen/include/public/sysctl.h | 2 +- 11 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index ee73eb06f1..2e8679dbcb 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -885,6 +885,14 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_DOMINFO_NEVER_STOP 1 +/* + * LIBXL_HAVE_DOMINFO_GPADDR_BITS + * + * If this is defined, libxl_dominfo will contain an uint8 field called + * gpaddr_bits, containing the guest physical address space size. + */ +#define LIBXL_HAVE_DOMINFO_GPADDR_BITS 1 + /* * LIBXL_HAVE_QXL * diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index a3063998e0..07b96e6671 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -462,6 +462,7 @@ typedef struct xc_dominfo { unsigned int max_vcpu_id; xen_domain_handle_t handle; unsigned int cpupool; + uint8_t gpaddr_bits; struct xen_arch_domainconfig arch_config; } xc_dominfo_t; diff --git a/tools/libs/ctrl/xc_domain.c b/tools/libs/ctrl/xc_domain.c index 23322b70b5..b155d6afd2 100644 --- a/tools/libs/ctrl/xc_domain.c +++ b/tools/libs/ctrl/xc_domain.c @@ -396,6 +396,7 @@ int xc_domain_getinfo(xc_interface *xch, info->nr_online_vcpus = domctl.u.getdomaininfo.nr_online_vcpus; info->max_vcpu_id = domctl.u.getdomaininfo.max_vcpu_id; info->cpupool = domctl.u.getdomaininfo.cpupool; + info->gpaddr_bits = domctl.u.getdomaininfo.gpaddr_bits; info->arch_config = domctl.u.getdomaininfo.arch_config; memcpy(info->handle, domctl.u.getdomaininfo.handle, diff --git a/tools/libs/light/libxl_domain.c b/tools/libs/light/libxl_domain.c index 51a6127552..544a9bf59d 100644 --- a/tools/libs/light/libxl_domain.c +++ b/tools/libs/light/libxl_domain.c @@ -306,6 +306,7 @@ void libxl__xcinfo2xlinfo(libxl_ctx *ctx, xlinfo->vcpu_max_id = xcinfo->max_vcpu_id; xlinfo->vcpu_online = xcinfo->nr_online_vcpus; xlinfo->cpupool = xcinfo->cpupool; + xlinfo->gpaddr_bits = xcinfo->gpaddr_bits; xlinfo->domain_type = (xcinfo->flags & XEN_DOMINF_hvm_guest) ? LIBXL_DOMAIN_TYPE_HVM : LIBXL_DOMAIN_TYPE_PV; } diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index b96fb5c47e..608d55a456 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -357,6 +357,7 @@ libxl_dominfo = Struct("dominfo",[ ("vcpu_max_id", uint32), ("vcpu_online", uint32), ("cpupool", uint32), + ("gpaddr_bits", uint8), ("domain_type", libxl_domain_type), ], dir=DIR_OUT) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index b7d27f37df..6245af6d0b 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -20,6 +20,8 @@ void arch_get_domain_info(const struct domain *d, { /* All ARM domains use hardware assisted paging. */ info->flags |= XEN_DOMINF_hap; + + info->gpaddr_bits = p2m_ipa_bits; } static int handle_vuart_init(struct domain *d, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 26a76d2be9..7d102e0647 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -151,6 +151,7 @@ void arch_get_domain_info(const struct domain *d, info->flags |= XEN_DOMINF_hap; info->arch_config.emulation_flags = d->arch.emulation_flags; + info->gpaddr_bits = hap_paddr_bits; } static int do_vmtrace_op(struct domain *d, struct xen_domctl_vmtrace_op *op, diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 12d6144d28..271862ae58 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -69,10 +69,10 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) int flags = XEN_DOMINF_blocked; struct vcpu_runstate_info runstate; + memset(info, 0, sizeof(*info)); + info->domain = d->domain_id; info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; - info->nr_online_vcpus = 0; - info->ssidref = 0; /* * - domain is marked as blocked only if all its vcpus are blocked diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 6e7189bb3c..f2dab722b6 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info = { 0 }; + struct xen_domctl_getdomaininfo info; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 238384b5ae..51017b47bc 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -107,6 +107,7 @@ struct xen_domctl_createdomain { struct xen_domctl_getdomaininfo { /* OUT variables. */ domid_t domain; /* Also echoed in domctl.domain */ + uint16_t pad1; /* Domain is scheduled to die. */ #define _XEN_DOMINF_dying 0 #define XEN_DOMINF_dying (1U<<_XEN_DOMINF_dying) @@ -151,6 +152,8 @@ struct xen_domctl_getdomaininfo { uint32_t ssidref; xen_domain_handle_t handle; uint32_t cpupool; + uint8_t gpaddr_bits; /* Guest physical address space size. */ + uint8_t pad2[7]; struct xen_arch_domainconfig arch_config; }; typedef struct xen_domctl_getdomaininfo xen_domctl_getdomaininfo_t; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index fead0e5b53..3e53681b43 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -35,7 +35,7 @@ #include "domctl.h" #include "physdev.h" -#define XEN_SYSCTL_INTERFACE_VERSION 0x00000013 +#define XEN_SYSCTL_INTERFACE_VERSION 0x00000014 /* * Read console content from Xen buffer ring. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 14 14:33:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Oct 2021 14:33:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209430.365888 (Exim 4.92) (envelope-from ) id 1mb1nI-0003pr-Tn; Thu, 14 Oct 2021 14:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209430.365888; Thu, 14 Oct 2021 14:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb1nI-0003pj-QH; Thu, 14 Oct 2021 14:33:16 +0000 Received: by outflank-mailman (input) for mailman id 209430; Thu, 14 Oct 2021 14:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb1nH-0003pb-Ez for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 14:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb1nH-00026m-Be for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 14:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mb1nH-0004wv-Ap for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 14:33:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=i+Z+h77hn7cvyTBULRGOQ4zAO7mkzUPb0j4bJUp3KTw=; b=xRdqUjNVyEPWo8vOEG/6DH/0G7 xqR7zeqOaf/6maNclzPD5fX0Kn6TqTPGPuHFsmWMi2YO0UC6lTjCjKeYKqVZFj5Fy63mZdgLhV481 GvUtnrm9GzC+dcJEraDjubrjMlzj/z2NxUp/WdYhtaDizM1pNnwJAgEyi7AgzwJ8F2tc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxl/arm: Add handling of extended regions for DomU Message-Id: Date: Thu, 14 Oct 2021 14:33:15 +0000 commit 57f87857dc2de452a796d6bad4f476510efd2aba Author: Oleksandr Tyshchenko AuthorDate: Thu Oct 14 14:40:45 2021 +0300 Commit: Ian Jackson CommitDate: Thu Oct 14 15:19:17 2021 +0100 libxl/arm: Add handling of extended regions for DomU The extended region (safe range) is a region of guest physical address space which is unused and could be safely used to create grant/foreign mappings instead of wasting real RAM pages from the domain memory for establishing these mappings. The extended regions are chosen at the domain creation time and advertised to it via "reg" property under hypervisor node in the guest device-tree. As region 0 is reserved for grant table space (always present), the indexes for extended regions are 1...N. If extended regions could not be allocated for some reason, Xen doesn't fail and behaves as usual, so only inserts region 0. Please note the following limitations: - The extended region feature is only supported for 64-bit domain currently. - The ACPI case is not covered. *** The algorithm to choose extended regions for non-direct mapped DomU is simpler in comparison with the algorithm for direct mapped Dom0. We usually have a lot of unused space above 4GB, and might have some unused space below 4GB (depends on guest memory size). Try to allocate separate 2MB-aligned extended regions from the first (below 4GB) and second (above 4GB) RAM banks taking into the account the maximum supported guest physical address space size and the amount of memory assigned to the guest. The minimum size of extended region the same as for Dom0 (64MB). Please note, we introduce fdt_property_reg_placeholder helper which purpose is to create N ranges that are zeroed. The interesting fact is that libfdt already has fdt_property_placeholder(). But this was introduced only in 2017, so there is a risk that some distros may not ship the last libfdt version. This is why we implement our own light variant for now. Suggested-by: Julien Grall Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Julien Grall Acked-by: Ian Jackson --- tools/libs/light/libxl_arm.c | 106 ++++++++++++++++++++++++++++++++++++++++-- xen/include/public/arch-arm.h | 5 ++ 2 files changed, 106 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index e3140a6e00..a7801558cf 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -269,6 +269,21 @@ static int fdt_property_regs(libxl__gc *gc, void *fdt, return fdt_property(fdt, "reg", regs, sizeof(regs)); } +static int fdt_property_reg_placeholder(libxl__gc *gc, void *fdt, + unsigned int addr_cells, + unsigned int size_cells, + unsigned int num_regs) +{ + uint32_t regs[num_regs * (addr_cells + size_cells)]; + be32 *cells = ®s[0]; + unsigned int i; + + for (i = 0; i < num_regs; i++) + set_range(&cells, addr_cells, size_cells, 0, 0); + + return fdt_property(fdt, "reg", regs, sizeof(regs)); +} + static int make_root_properties(libxl__gc *gc, const libxl_version_info *vers, void *fdt) @@ -615,9 +630,13 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, "xen,xen"); if (res) return res; - /* reg 0 is grant table space */ - res = fdt_property_regs(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, - 1,GUEST_GNTTAB_BASE, GUEST_GNTTAB_SIZE); + /* + * reg 0 is a placeholder for grant table space, reg 1...N are + * the placeholders for extended regions. + */ + res = fdt_property_reg_placeholder(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, + GUEST_ROOT_SIZE_CELLS, + GUEST_RAM_BANKS + 1); if (res) return res; /* @@ -1069,20 +1088,93 @@ static void finalise_one_node(libxl__gc *gc, void *fdt, const char *uname, } } +#define ALIGN_UP_TO_2MB(x) (((x) + MB(2) - 1) & (~(MB(2) - 1))) + +#define EXT_REGION_MIN_SIZE xen_mk_ullong(0x0004000000) /* 64MB */ + +static int finalize_hypervisor_node(libxl__gc *gc, struct xc_dom_image *dom) +{ + void *fdt = dom->devicetree_blob; + uint64_t region_size[GUEST_RAM_BANKS] = {0}, region_base[GUEST_RAM_BANKS], + bankend[GUEST_RAM_BANKS]; + uint32_t regs[(GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS) * + (GUEST_RAM_BANKS + 1)]; + be32 *cells = ®s[0]; + const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; + const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; + unsigned int i, len, nr_regions = 0; + libxl_dominfo info; + int offset, rc; + + offset = fdt_path_offset(fdt, "/hypervisor"); + if (offset < 0) + return offset; + + rc = libxl_domain_info(CTX, &info, dom->guest_domid); + if (rc) + return rc; + + if (info.gpaddr_bits > 64) + return ERROR_INVAL; + + /* + * Try to allocate separate 2MB-aligned extended regions from the first + * and second RAM banks taking into the account the maximum supported + * guest physical address space size and the amount of memory assigned + * to the guest. + */ + for (i = 0; i < GUEST_RAM_BANKS; i++) { + region_base[i] = bankbase[i] + + ALIGN_UP_TO_2MB((uint64_t)dom->rambank_size[i] << XC_PAGE_SHIFT); + + bankend[i] = ~0ULL >> (64 - info.gpaddr_bits); + bankend[i] = min(bankend[i], bankbase[i] + banksize[i] - 1); + if (bankend[i] > region_base[i]) + region_size[i] = bankend[i] - region_base[i] + 1; + } + + /* + * The region 0 for grant table space must be always present. If we managed + * to allocate the extended regions then insert them as regions 1...N. + */ + set_range(&cells, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, + GUEST_GNTTAB_BASE, GUEST_GNTTAB_SIZE); + + for (i = 0; i < GUEST_RAM_BANKS; i++) { + if (region_size[i] < EXT_REGION_MIN_SIZE) + continue; + + LOG(DEBUG, "Extended region %u: %#"PRIx64"->%#"PRIx64"", + nr_regions, region_base[i], region_base[i] + region_size[i]); + + set_range(&cells, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, + region_base[i], region_size[i]); + nr_regions++; + } + + if (!nr_regions) + LOG(WARN, "The extended regions cannot be allocated, not enough space"); + + len = sizeof(regs[0]) * (GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS) * + (nr_regions + 1); + + return fdt_setprop(fdt, offset, "reg", regs, len); +} + int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, uint32_t domid, libxl_domain_config *d_config, struct xc_dom_image *dom) { void *fdt = dom->devicetree_blob; - int i; + int i, res; const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; const struct xc_dom_seg *ramdisk = dom->modules[0].blob ? &dom->modules[0].seg : NULL; if (ramdisk) { - int chosen, res; + int chosen; uint64_t val; /* Neither the fdt_path_offset() nor either of the @@ -1109,6 +1201,10 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, } + res = finalize_hypervisor_node(gc, dom); + if (res) + return res; + for (i = 0; i < GUEST_RAM_BANKS; i++) { const uint64_t size = (uint64_t)dom->rambank_size[i] << XC_PAGE_SHIFT; diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index d46c61fca9..96ead3de07 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -438,6 +438,11 @@ typedef uint64_t xen_callback_t; #define GUEST_RAM_BANKS 2 +/* + * The way to find the extended regions (to be exposed to the guest as unused + * address space) relies on the fact that the regions reserved for the RAM + * below are big enough to also accommodate such regions. + */ #define GUEST_RAM0_BASE xen_mk_ullong(0x40000000) /* 3GB of low RAM @ 1GB */ #define GUEST_RAM0_SIZE xen_mk_ullong(0xc0000000) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 14 16:22:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 Oct 2021 16:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209513.365993 (Exim 4.92) (envelope-from ) id 1mb3Uc-0002Rc-8U; Thu, 14 Oct 2021 16:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209513.365993; Thu, 14 Oct 2021 16:22:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb3Uc-0002RU-5Z; Thu, 14 Oct 2021 16:22:06 +0000 Received: by outflank-mailman (input) for mailman id 209513; Thu, 14 Oct 2021 16:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb3Ua-0002RO-LY for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 16:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mb3Ua-0004VI-HY for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 16:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mb3Ua-0004zH-GX for xen-changelog@lists.xenproject.org; Thu, 14 Oct 2021 16:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EFKOGH4Y92IrQngSJSiU5oQh5SuFhlch9rF9xwSiOTg=; b=VLyOFq3pH3PP+8cE5vsn+PncUz z5ZJfKTrCYaQZH2zugjoCCMPGYJy+JTQxiZFME0+EZka6DNly1QZSyR4bGPgkHhqCisc7Dx2BMOgA lAGnn/kB+7yiFkOMAKjE6HJuDjjEaFr+AUfKCXxTCWra0i4ZHlm+U5xnOc11irPTwZj4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: optee: Allocate anonymous domheap pages Message-Id: Date: Thu, 14 Oct 2021 16:22:04 +0000 commit b75838ad6c4f42c93efee83fc2508c78641e1b57 Author: Oleksandr Tyshchenko AuthorDate: Mon Sep 6 16:42:21 2021 +0300 Commit: Julien Grall CommitDate: Thu Oct 14 16:12:47 2021 +0000 xen/arm: optee: Allocate anonymous domheap pages Allocate anonymous domheap pages as there is no strict need to account them to a particular domain. Since XSA-383 "xen/arm: Restrict the amount of memory that dom0less domU and dom0 can allocate" the dom0 cannot allocate memory outside of the pre-allocated region. This means if we try to allocate non-anonymous page to be accounted to dom0 we will get an over-allocation issue when assigning that page to the domain. The anonymous page, in turn, is not assigned to any domain. CC: Julien Grall Signed-off-by: Oleksandr Tyshchenko Acked-by: Volodymyr Babchuk Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/tee/optee.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index 131d2f9a8a..f49b3c0226 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -410,7 +410,7 @@ static struct shm_rpc *allocate_and_pin_shm_rpc(struct optee_domain *ctx, if ( !shm_rpc ) return ERR_PTR(-ENOMEM); - shm_rpc->xen_arg_pg = alloc_domheap_page(current->domain, 0); + shm_rpc->xen_arg_pg = alloc_domheap_page(NULL, 0); if ( !shm_rpc->xen_arg_pg ) { xfree(shm_rpc); @@ -774,7 +774,7 @@ static int translate_noncontig(struct optee_domain *ctx, * - There is a plan to implement preemption in the code below, which * will allow use to increase default MAX_SHM_BUFFER_PG value. */ - xen_pgs = alloc_domheap_pages(current->domain, order, 0); + xen_pgs = alloc_domheap_pages(NULL, order, 0); if ( !xen_pgs ) return -ENOMEM; @@ -942,7 +942,7 @@ static bool copy_std_request(struct cpu_user_regs *regs, BUILD_BUG_ON(OPTEE_MSG_NONCONTIG_PAGE_SIZE > PAGE_SIZE); - call->xen_arg_pg = alloc_domheap_page(current->domain, 0); + call->xen_arg_pg = alloc_domheap_page(NULL, 0); if ( !call->xen_arg_pg ) { set_user_reg(regs, 0, OPTEE_SMC_RETURN_ENOMEM); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 01:33:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 01:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209663.366182 (Exim 4.92) (envelope-from ) id 1mbC5n-0002TG-Jf; Fri, 15 Oct 2021 01:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209663.366182; Fri, 15 Oct 2021 01: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 1mbC5n-0002T7-FU; Fri, 15 Oct 2021 01:33:03 +0000 Received: by outflank-mailman (input) for mailman id 209663; Fri, 15 Oct 2021 01:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbC5m-0002T1-Dt for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbC5m-0007W5-4Z for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbC5m-0003pO-3N for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e80jDtpVMJfRFY5sYaOn2CyT5if2HE36SUM3eI4ivm4=; b=LB8KS/gEXS35nxPHIVP0bjY2qL 9sODzvZBrqnP4WE0zcKBWWCGvH+5OZyaT4MxBgUSmB3W7seSYZ0RD/nJpVuwD5ECGcI25Y829Odbm fjp6w/skSjMDolZd4vjxE3TY1oIxGoJrI9u7Nx9cKR8NEzIftm7oaveP1G5msQTwHPgA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/efi: load dom0 modules from DT using UEFI Message-Id: Date: Fri, 15 Oct 2021 01:33:02 +0000 commit 048de2c47075d6106136bee110d4e930049a0fe3 Author: Luca Fancellu AuthorDate: Mon Oct 11 19:15:28 2021 +0100 Commit: Stefano Stabellini CommitDate: Wed Oct 13 11:09:46 2021 -0700 arm/efi: load dom0 modules from DT using UEFI Add support to load Dom0 boot modules from the device tree using the xen,uefi-binary property. Update documentation about that. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- docs/misc/arm/device-tree/booting.txt | 8 +++++ docs/misc/efi.pandoc | 64 +++++++++++++++++++++++++++++++++-- xen/arch/arm/efi/efi-boot.h | 52 +++++++++++++++++++++++++--- xen/common/efi/boot.c | 16 ++++++--- 4 files changed, 128 insertions(+), 12 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 7258e7e1ec..c6a775f4e8 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -70,6 +70,14 @@ Each node contains the following properties: priority of this field vs. other mechanisms of specifying the bootargs for the kernel. +- xen,uefi-binary (UEFI boot only) + + String property that specifies the file name to be loaded by the UEFI + boot for this module. If this is specified, there is no need to specify + the reg property because it will be created by the UEFI stub on boot. + This option is needed only when UEFI boot is used, the node needs to be + compatible with multiboot,kernel or multiboot,ramdisk. + Examples ======== diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index 876cd55005..4abbb5bb82 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -167,6 +167,28 @@ sbsign \ --output xen.signed.efi \ xen.unified.efi ``` +## UEFI boot and Dom0 modules on ARM + +When booting using UEFI on ARM, it is possible to specify the Dom0 modules +directly from the device tree without using the Xen configuration file, here an +example: + +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,xen-bootargs = "[Xen boot arguments]" + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "vmlinuz-3.0.31-0.4-xen"; + bootargs = "[domain 0 command line options]"; + }; + + module@2 { + compatible = "multiboot,ramdisk", "multiboot,module"; + xen,uefi-binary = "initrd-3.0.31-0.4-xen"; + }; +} ## UEFI boot and dom0less on ARM @@ -326,10 +348,10 @@ chosen { ### Boot Xen, Dom0 and DomU(s) This configuration is a mix of the two configuration above, to boot this one -the configuration file must be processed so the /chosen node must have the -"xen,uefi-cfg-load" property. +the configuration file can be processed or the Dom0 modules can be read from +the device tree. -Here an example: +Here the first example: Xen configuration file: @@ -369,4 +391,40 @@ chosen { }; ``` +Here the second example: + +Device tree: + +``` +chosen { + #size-cells = <0x1>; + #address-cells = <0x1>; + xen,xen-bootargs = "[Xen boot arguments]" + + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "vmlinuz-3.0.31-0.4-xen"; + bootargs = "[domain 0 command line options]"; + }; + + module@2 { + compatible = "multiboot,ramdisk", "multiboot,module"; + xen,uefi-binary = "initrd-3.0.31-0.4-xen"; + }; + + domU1 { + #size-cells = <0x1>; + #address-cells = <0x1>; + compatible = "xen,domain"; + cpus = <0x1>; + memory = <0x0 0xc0000>; + vpl011; + module@1 { + compatible = "multiboot,kernel", "multiboot,module"; + xen,uefi-binary = "Image-domu1.bin"; + bootargs = "console=ttyAMA0 root=/dev/ram0 rw"; + }; + }; +}; +``` diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 0d86043567..8b88dd26a5 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -32,8 +32,12 @@ static unsigned int __initdata modules_idx; #define ERROR_RENAME_MODULE_NAME (-4) #define ERROR_SET_REG_PROPERTY (-5) #define ERROR_CHECK_MODULE_COMPAT (-6) +#define ERROR_DOM0_ALREADY_FOUND (-7) +#define ERROR_DOM0_RAMDISK_FOUND (-8) +#define ERROR_XSM_ALREADY_FOUND (-9) #define ERROR_DT_MODULE_DOMU (-1) #define ERROR_DT_CHOSEN_NODE (-2) +#define ERROR_DT_MODULE_DOM0 (-3) void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); void __flush_dcache_area(const void *vaddr, unsigned long size); @@ -46,7 +50,8 @@ static int allocate_module_file(EFI_FILE_HANDLE dir_handle, static int handle_module_node(EFI_FILE_HANDLE dir_handle, int module_node_offset, int reg_addr_cells, - int reg_size_cells); + int reg_size_cells, + bool is_domu_module); static int handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, int domain_node); static int efi_check_dt_boot(EFI_FILE_HANDLE dir_handle); @@ -701,7 +706,8 @@ static int __init allocate_module_file(EFI_FILE_HANDLE dir_handle, static int __init handle_module_node(EFI_FILE_HANDLE dir_handle, int module_node_offset, int reg_addr_cells, - int reg_size_cells) + int reg_size_cells, + bool is_domu_module) { const void *uefi_name_prop; char mod_string[24]; /* Placeholder for module@ + a 64-bit number + \0 */ @@ -754,6 +760,41 @@ static int __init handle_module_node(EFI_FILE_HANDLE dir_handle, return ERROR_SET_REG_PROPERTY; } + if ( !is_domu_module ) + { + if ( (fdt_node_check_compatible(fdt, module_node_offset, + "multiboot,kernel") == 0) ) + { + /* + * This is the Dom0 kernel, wire it to the kernel variable because it + * will be verified by the shim lock protocol later in the common + * code. + */ + if ( kernel.addr ) + { + PrintMessage(L"Dom0 kernel already found in cfg file."); + return ERROR_DOM0_ALREADY_FOUND; + } + kernel.need_to_free = false; /* Freed using the module array */ + kernel.addr = file->addr; + kernel.size = file->size; + } + else if ( ramdisk.addr && + (fdt_node_check_compatible(fdt, module_node_offset, + "multiboot,ramdisk") == 0) ) + { + PrintMessage(L"Dom0 ramdisk already found in cfg file."); + return ERROR_DOM0_RAMDISK_FOUND; + } + else if ( xsm.addr && + (fdt_node_check_compatible(fdt, module_node_offset, + "xen,xsm-policy") == 0) ) + { + PrintMessage(L"XSM policy already found in cfg file."); + return ERROR_XSM_ALREADY_FOUND; + } + } + return 0; } @@ -793,7 +834,7 @@ static int __init handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, module_node = fdt_next_subnode(fdt, module_node) ) { int ret = handle_module_node(dir_handle, module_node, addr_cells, - size_cells); + size_cells, true); if ( ret < 0 ) return ret; } @@ -803,7 +844,7 @@ static int __init handle_dom0less_domain_node(EFI_FILE_HANDLE dir_handle, /* * This function checks for xen domain nodes under the /chosen node for possible - * domU guests to be loaded. + * dom0 and domU guests to be loaded. * Returns the number of modules loaded or a negative number for error. */ static int __init efi_check_dt_boot(EFI_FILE_HANDLE dir_handle) @@ -830,6 +871,9 @@ static int __init efi_check_dt_boot(EFI_FILE_HANDLE dir_handle) if ( handle_dom0less_domain_node(dir_handle, node) < 0 ) return ERROR_DT_MODULE_DOMU; } + else if ( handle_module_node(dir_handle, node, addr_len, size_len, + false) < 0 ) + return ERROR_DT_MODULE_DOM0; } /* Free boot modules file names if any */ diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index c9fdb5a3db..392ff3ac9b 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1302,11 +1302,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { read_file(dir_handle, s2w(&name), &kernel, option_str); efi_bs->FreePool(name.w); - - if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, - (void **)&shim_lock)) && - (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS ) - PrintErrMesg(L"Dom0 kernel image could not be verified", status); } if ( !read_section(loaded_image, L"ramdisk", &ramdisk, NULL) ) @@ -1384,6 +1379,17 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( !dt_modules_found && !kernel.ptr ) blexit(L"No initial domain kernel specified."); + /* + * The Dom0 kernel can be loaded from the configuration file or by the + * device tree through the efi_check_dt_boot function, in this stage + * verify it. + */ + if ( kernel.ptr && + !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL, + (void **)&shim_lock)) && + (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS ) + PrintErrMesg(L"Dom0 kernel image could not be verified", status); + efi_arch_edd(); /* XXX Collect EDID info. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 01:33:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 01:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209664.366185 (Exim 4.92) (envelope-from ) id 1mbC5x-0002VI-Kt; Fri, 15 Oct 2021 01:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209664.366185; Fri, 15 Oct 2021 01: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 1mbC5x-0002V8-H5; Fri, 15 Oct 2021 01:33:13 +0000 Received: by outflank-mailman (input) for mailman id 209664; Fri, 15 Oct 2021 01:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbC5w-0002Ux-8a for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbC5w-0007WU-7s for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbC5w-0003qC-6s for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01: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=lgJ/yNxpBjauXRGZ/BE0AxK0iU/MmrFCXpWQxlCQZbY=; b=E/Hy9veA4C5bNC1+zrLbJugnM7 w+jRcwdlUxE740nEhW3LVVeNcXkhGkjT/4v43qQwG9cQrGVv7SdfIXtMASpp24C+RJ3fNpS6MJpVV bk3K2Y8r4p3UA2XX7VzVDqiib8E4OkQofJqeIIYgJqj4q/A425gvvGRUahSVZS6mZmLE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/docs: Clarify legacy DT bindings on UEFI Message-Id: Date: Fri, 15 Oct 2021 01:33:12 +0000 commit a0ffee6b145933f411b1c33daa2cdd54e77b2b15 Author: Luca Fancellu AuthorDate: Wed Oct 13 15:52:02 2021 +0100 Commit: Stefano Stabellini CommitDate: Wed Oct 13 11:10:06 2021 -0700 arm/docs: Clarify legacy DT bindings on UEFI Since the introduction of UEFI boot for Xen, the legacy compatible strings were not supported and the stub code was checking only the presence of “multiboot,module” to require the Xen UEFI configuration file or not. The documentation was not updated to specify that behavior. Add a phrase to docs/misc/arm/device-tree/booting.txt to clarify it. Signed-off-by: Luca Fancellu Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index c6a775f4e8..71895663a4 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -51,6 +51,8 @@ Each node contains the following properties: Xen 4.4 supported a different set of legacy compatible strings which remain supported such that systems supporting both 4.4 and later can use a single DTB. + However when booting Xen using UEFI, the legacy compatible + strings are not supported. - "xen,multiboot-module" equivalent to "multiboot,module" - "xen,linux-zimage" equivalent to "multiboot,kernel" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 01:33:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 01:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209665.366191 (Exim 4.92) (envelope-from ) id 1mbC67-0002Z3-PV; Fri, 15 Oct 2021 01:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209665.366191; Fri, 15 Oct 2021 01:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbC67-0002Yo-K9; Fri, 15 Oct 2021 01:33:23 +0000 Received: by outflank-mailman (input) for mailman id 209665; Fri, 15 Oct 2021 01:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbC66-0002YZ-Bl for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbC66-0007Wm-B5 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbC66-0003qo-A7 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 01: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=oTmeORcg0o2AF+S0SA7WbH9Sj7+4DcxdjLV1MJ2OSBM=; b=VmXjMrpQQE/JvFjtLw4L92cTje dJB82NkbCsJy8r4KLiHg+ZBwrPMFo9jvzQ9i/RFeIpbHMbinoR/6f7vWb1yYLZU+79P1YpmdQ8gVL 18HR6Imob3j7YWjlWG5sqSVtdO2CZ8/cVwbmD/Xw6Cm5z40ki53imAhgeIjYFcqQUqek=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Add linux,pci-domain property for hwdom if not available. Message-Id: Date: Fri, 15 Oct 2021 01:33:22 +0000 commit 4cfab4425d39f76660b4e76ba6ee4cbf0f92e7e5 Author: Rahul Singh AuthorDate: Wed Oct 13 13:28:43 2021 -0700 Commit: Stefano Stabellini CommitDate: Wed Oct 13 13:28:43 2021 -0700 xen/arm: Add linux,pci-domain property for hwdom if not available. If the property is not present in the device tree node for host bridge, XEN while creating the dtb for hwdom will create this property and assigns the already allocated segment to the host bridge so that XEN and linux will have the same segment for the host bridges. Signed-off-by: Rahul Singh Reviewed-by: Bertrand Marquis Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 16 ++++++++++++++++ xen/arch/arm/pci/pci-host-common.c | 21 +++++++++++++++++++++ xen/include/asm-arm/pci.h | 9 +++++++++ 3 files changed, 46 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4c28f1e4e2..0167731ab0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -747,6 +747,22 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, return res; } + if ( is_pci_passthrough_enabled() && dt_device_type_is_equal(node, "pci") ) + { + if ( !dt_find_property(node, "linux,pci-domain", NULL) ) + { + uint16_t segment; + + res = pci_get_host_bridge_segment(node, &segment); + if ( res < 0 ) + return res; + + res = fdt_property_cell(kinfo->fdt, "linux,pci-domain", segment); + if ( res ) + return res; + } + } + /* * Override the property "status" to disable the device when it's * marked for passthrough. diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index af208e7298..cdeb3a283a 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -271,6 +271,27 @@ struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus) return NULL; } + +/* + * This function will lookup an hostbridge based on config space address. + */ +int pci_get_host_bridge_segment(const struct dt_device_node *node, + uint16_t *segment) +{ + struct pci_host_bridge *bridge; + + list_for_each_entry( bridge, &pci_host_bridges, node ) + { + if ( bridge->dt_node != node ) + continue; + + *segment = bridge->segment; + return 0; + } + + return -EINVAL; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index aa0762ff15..81273e0d87 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -98,6 +98,8 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where); struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); struct dt_device_node *pci_find_host_bridge_node(struct device *dev); +int pci_get_host_bridge_segment(const struct dt_device_node *node, + uint16_t *segment); static always_inline bool is_pci_passthrough_enabled(void) { @@ -119,5 +121,12 @@ struct pci_dev; static inline void arch_pci_init_pdev(struct pci_dev *pdev) {} +static inline int pci_get_host_bridge_segment(const struct dt_device_node *node, + uint16_t *segment) +{ + ASSERT_UNREACHABLE(); + return -EINVAL; +} + #endif /*!CONFIG_HAS_PCI*/ #endif /* __ARM_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209987.366595 (Exim 4.92) (envelope-from ) id 1mbJF4-0006nx-BK; Fri, 15 Oct 2021 09:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209987.366595; Fri, 15 Oct 2021 09:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJF4-0006no-82; Fri, 15 Oct 2021 09:11:06 +0000 Received: by outflank-mailman (input) for mailman id 209987; Fri, 15 Oct 2021 09:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJF2-0006ni-Qn for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJF2-0008R4-P8 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJF2-0004Y0-Nx for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Qks0AcCAUPSjEqeHZNLubvIqtEU4R2MLc4u3fspgtXs=; b=alGFma6HISBHz4PGy0TkymbuqT eV2m2wv5zujhw9Fe4ZzgAeqxQj8VJqeadKDwePN0g8ANuwpgEYp3Qsn6vqa5RmShPxLvezuH6JigT SkoSVBMvgjoEUxWONRzstmgcVmeVXnkdDOYiRRMV7NFQp/h6VryDBUOij/2cVtDJsE94=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] update Xen version to 4.15.2-pre Message-Id: Date: Fri, 15 Oct 2021 09:11:04 +0000 commit 7799c8a0261867158da5dc9c22ef6c1cde6ab97a Author: Jan Beulich AuthorDate: Fri Oct 15 10:58:16 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 10:58:16 2021 +0200 update Xen version to 4.15.2-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 5d5a1a0fa6..251fed79f0 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 15 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:11:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:11:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209988.366599 (Exim 4.92) (envelope-from ) id 1mbJFE-0006pr-CO; Fri, 15 Oct 2021 09:11:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209988.366599; Fri, 15 Oct 2021 09:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFE-0006pj-9U; Fri, 15 Oct 2021 09:11:16 +0000 Received: by outflank-mailman (input) for mailman id 209988; Fri, 15 Oct 2021 09:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFC-0006pX-T2 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFC-0008Sh-SL for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJFC-0004Yq-RF for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=a6k5j0ejyAjHRYq+SeM2mv1rGzSUQPWOiq2JVp7Q+uc=; b=RIs0NbTGD0fRgYFjFSKAuSGtBV EwZhzBPyXAfV69167rRzYRPEw9jJWdJ0dEla61OjeVNyNuNJslL9qbvegVNZrWU6iRwRQxsNo6i2t PA2HGpjgTiOcpltDhVA6tN4JMZAYsLilLNtmldHwsjO0ccDa40550cX1wsZqem7q8a7Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] build: set policy filename on make command line Message-Id: Date: Fri, 15 Oct 2021 09:11:14 +0000 commit 05df87bc738df02d286e02c3aac81efbc39ccc8a Author: Anthony PERARD AuthorDate: Fri Oct 15 10:59:54 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 10:59:54 2021 +0200 build: set policy filename on make command line In order to avoid flask/Makefile.common calling `make xenversion`, we override POLICY_FILENAME with the value we are going to use anyway. Signed-off-by: Anthony PERARD Acked-by: Jan Beulich master commit: c81e7efe2146c8f381fbdbb037b9d46866a6451e master date: 2021-09-08 14:40:00 +0200 --- xen/xsm/flask/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index 637159ad82..af95697ed9 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -42,7 +42,9 @@ FLASK_BUILD_DIR := $(CURDIR) POLICY_SRC := $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) policy.bin: FORCE - $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common -C $(XEN_ROOT)/tools/flask/policy FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) + $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common \ + -C $(XEN_ROOT)/tools/flask/policy \ + FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) POLICY_FILENAME=$(POLICY_SRC) cmp -s $(POLICY_SRC) $@ || cp $(POLICY_SRC) $@ .PHONY: clean -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:11:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:11:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209989.366603 (Exim 4.92) (envelope-from ) id 1mbJFO-0006sz-E3; Fri, 15 Oct 2021 09:11:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209989.366603; Fri, 15 Oct 2021 09:11:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFO-0006sr-B1; Fri, 15 Oct 2021 09:11:26 +0000 Received: by outflank-mailman (input) for mailman id 209989; Fri, 15 Oct 2021 09:11:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFN-0006sd-0g for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFM-0008TC-WD for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJFM-0004Zi-UW for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=amHvNW6zW3cbu+CA2Ksn59MpEsXG14F/Z94DyKcEPB8=; b=4bgqHtDvgUjI81033YRazkS9sS lhL5DkkoI5YwAl922ZaQ3ZFMAzP97beVRE05XXhIvyoV0+ZPdG3N2tdKkF0tEE5JR8JcTEcpz3tlv xEA6qAyb3CeJu0F4AuZ1VBKpu+0Gv9Dv5ENhJ9L1+WpFC7C98gy/rFusv0NC2B17A0XY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] x86/spec-ctrl: Split the "Hardware features" diagnostic line Message-Id: Date: Fri, 15 Oct 2021 09:11:24 +0000 commit c554188a0c9310f79aaa8b5be71b569bb1e1b547 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:00:21 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:00:21 2021 +0200 x86/spec-ctrl: Split the "Hardware features" diagnostic line Separate the read-only hints from the features requiring active actions on Xen's behalf. Also take the opportunity split the IBRS/IBPB and IBPB mess. More features with overlapping enumeration are on the way, and and it is not useful to split them like this. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 565ebcda976c05b0c6191510d5e32b621a2b1867 master date: 2021-09-08 14:16:19 +0100 --- xen/arch/x86/spec_ctrl.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index aa85a0be46..a7953e43bc 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -317,23 +317,30 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) printk("Speculative mitigation facilities:\n"); - /* Hardware features which pertain to speculative mitigations. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", - (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", - (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", - (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", - (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", - (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL": "", - (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", - (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", - (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : "", - (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + /* + * Hardware read-only information, stating immunity to certain issues, or + * suggestions of which mitigation to use. + */ + printk(" Hardware hints:%s%s%s%s%s%s%s\n", + (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", + (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", + (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", + (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL" : "", + (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", + (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", + (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + + /* Hardware features which need driving to mitigate issues. */ + printk(" Hardware features:%s%s%s%s%s%s%s%s\n", + (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ if ( IS_ENABLED(CONFIG_INDIRECT_THUNK) || IS_ENABLED(CONFIG_SHADOW_PAGING) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:11:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:11:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209990.366607 (Exim 4.92) (envelope-from ) id 1mbJFY-0006vq-FZ; Fri, 15 Oct 2021 09:11:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209990.366607; Fri, 15 Oct 2021 09:11:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFY-0006vi-CV; Fri, 15 Oct 2021 09:11:36 +0000 Received: by outflank-mailman (input) for mailman id 209990; Fri, 15 Oct 2021 09:11:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFX-0006vW-4I for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFX-0008TM-3W for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJFX-0004aS-2c for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZE5tJ3148JEBzJeDt56XUxGj975cAPlk4hSGkDpZLt8=; b=YZMsgNGjiLb7Y9gAo8MFsgH77z fPn77TH0YekZJn4LY3Ek/MQjw74lYD0u4g+bUe+UBU88s+rrzKLkXF6CRpjZg6JkqIzEIr63sSoqY myk5W5Re1MdwYJ1YjfMKfQcnA8PW2cCZv24LLlxzff9N9RlsxVJ5NGg/1CY4YIB/jV4o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] x86/amd: Enumeration for speculative features/hints Message-Id: Date: Fri, 15 Oct 2021 09:11:35 +0000 commit 932ff4385afafb84034515646cde584e0a926011 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:00:53 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:00:53 2021 +0200 x86/amd: Enumeration for speculative features/hints There is a step change in speculation protections between the Zen1 and Zen2 microarchitectures. Zen1 and older have no special support. Control bits in non-architectural MSRs are used to make lfence be dispatch-serialising (Spectre v1), and to disable Memory Disambiguation (Speculative Store Bypass). IBPB was retrofitted in a microcode update, and software methods are required for Spectre v2 protections. Because the bit controlling Memory Disambiguation is model specific, hypervisors are expected to expose a MSR_VIRT_SPEC_CTRL interface which abstracts the model specific details. Zen2 and later implement the MSR_SPEC_CTRL interface in hardware, and virtualise the interface for HVM guests to use. A number of hint bits are specified too to help guide OS software to the most efficient mitigation strategy. Zen3 introduced a new feature, Predictive Store Forwarding, along with a control to disable it in sensitive code. Add CPUID and VMCB details for all the new functionality. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 747424c664bb164a04e7a9f2ffbf02d4a1630d7d master date: 2021-09-08 14:16:19 +0100 --- tools/libs/light/libxl_cpuid.c | 10 ++++++++++ tools/misc/xen-cpuid.c | 8 +++++++- xen/arch/x86/hvm/svm/svm.c | 1 + xen/arch/x86/hvm/svm/vmcb.c | 1 + xen/include/asm-x86/cpufeature.h | 5 +++++ xen/include/asm-x86/hvm/svm/svm.h | 2 ++ xen/include/asm-x86/hvm/svm/vmcb.h | 4 +++- xen/include/asm-x86/msr-index.h | 3 +++ xen/include/public/arch-x86/cpufeatureset.h | 10 ++++++++++ 9 files changed, 42 insertions(+), 2 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 289c59c742..aa6a6a5f4b 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -270,7 +270,17 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"rstr-fp-err-ptrs", 0x80000008, NA, CPUID_REG_EBX, 2, 1}, {"wbnoinvd", 0x80000008, NA, CPUID_REG_EBX, 9, 1}, {"ibpb", 0x80000008, NA, CPUID_REG_EBX, 12, 1}, + {"ibrs", 0x80000008, NA, CPUID_REG_EBX, 14, 1}, + {"amd-stibp", 0x80000008, NA, CPUID_REG_EBX, 15, 1}, + {"ibrs-always", 0x80000008, NA, CPUID_REG_EBX, 16, 1}, + {"stibp-always", 0x80000008, NA, CPUID_REG_EBX, 17, 1}, + {"ibrs-fast", 0x80000008, NA, CPUID_REG_EBX, 18, 1}, + {"ibrs-same-mode", 0x80000008, NA, CPUID_REG_EBX, 19, 1}, {"ppin", 0x80000008, NA, CPUID_REG_EBX, 23, 1}, + {"amd-ssbd", 0x80000008, NA, CPUID_REG_EBX, 24, 1}, + {"virt-ssbd", 0x80000008, NA, CPUID_REG_EBX, 25, 1}, + {"ssb-no", 0x80000008, NA, CPUID_REG_EBX, 26, 1}, + {"psfd", 0x80000008, NA, CPUID_REG_EBX, 28, 1}, {"nc", 0x80000008, NA, CPUID_REG_ECX, 0, 8}, {"apicidsize", 0x80000008, NA, CPUID_REG_ECX, 12, 4}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 531d56d9c9..47c75031d1 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -148,11 +148,17 @@ static const char *const str_e8b[32] = [ 0] = "clzero", [ 2] = "rstr-fp-err-ptrs", - /* [ 8] */ [ 9] = "wbnoinvd", + /* [ 8] */ [ 9] = "wbnoinvd", [12] = "ibpb", + [14] = "ibrs", [15] = "amd-stibp", + [16] = "ibrs-always", [17] = "stibp-always", + [18] = "ibrs-fast", [19] = "ibrs-same-mode", /* [22] */ [23] = "ppin", + [24] = "amd-ssbd", [25] = "virt-ssbd", + [26] = "ssb-no", + [28] = "psfd", }; static const char *const str_7d0[32] = diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 4585efe1f8..c38a7405c9 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1658,6 +1658,7 @@ const struct hvm_function_table * __init start_svm(void) P(cpu_has_pause_filter, "Pause-Intercept Filter"); P(cpu_has_pause_thresh, "Pause-Intercept Filter Threshold"); P(cpu_has_tsc_ratio, "TSC Rate MSR"); + P(cpu_has_svm_spec_ctrl, "MSR_SPEC_CTRL virtualisation"); #undef P if ( !printed ) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 373d5d4af4..55da9302e5 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -271,6 +271,7 @@ static void __init __maybe_unused build_assertions(void) BUILD_BUG_ON(offsetof(typeof(vmcb), rsp) != 0x5d8); BUILD_BUG_ON(offsetof(typeof(vmcb), rax) != 0x5f8); BUILD_BUG_ON(offsetof(typeof(vmcb), _g_pat) != 0x668); + BUILD_BUG_ON(offsetof(typeof(vmcb), spec_ctrl) != 0x6e0); /* Check struct segment_register against the VMCB segment layout. */ BUILD_BUG_ON(sizeof(vmcb.es) != 16); diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index a539a4bacd..3983200e67 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -127,6 +127,11 @@ /* CPUID level 0x80000007.edx */ #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) +/* CPUID level 0x80000008.ebx */ +#define cpu_has_amd_ssbd boot_cpu_has(X86_FEATURE_AMD_SSBD) +#define cpu_has_virt_ssbd boot_cpu_has(X86_FEATURE_VIRT_SSBD) +#define cpu_has_ssb_no boot_cpu_has(X86_FEATURE_SSB_NO) + /* CPUID level 0x00000007:0.edx */ #define cpu_has_avx512_4vnniw boot_cpu_has(X86_FEATURE_AVX512_4VNNIW) #define cpu_has_avx512_4fmaps boot_cpu_has(X86_FEATURE_AVX512_4FMAPS) diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index faeca40174..1598d01017 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -75,6 +75,7 @@ extern u32 svm_feature_flags; #define SVM_FEATURE_PAUSETHRESH 12 /* Pause intercept filter support */ #define SVM_FEATURE_VLOADSAVE 15 /* virtual vmload/vmsave */ #define SVM_FEATURE_VGIF 16 /* Virtual GIF */ +#define SVM_FEATURE_SPEC_CTRL 20 /* MSR_SPEC_CTRL virtualisation */ #define cpu_has_svm_feature(f) (svm_feature_flags & (1u << (f))) #define cpu_has_svm_npt cpu_has_svm_feature(SVM_FEATURE_NPT) @@ -89,6 +90,7 @@ extern u32 svm_feature_flags; #define cpu_has_pause_thresh cpu_has_svm_feature(SVM_FEATURE_PAUSETHRESH) #define cpu_has_tsc_ratio cpu_has_svm_feature(SVM_FEATURE_TSCRATEMSR) #define cpu_has_svm_vloadsave cpu_has_svm_feature(SVM_FEATURE_VLOADSAVE) +#define cpu_has_svm_spec_ctrl cpu_has_svm_feature(SVM_FEATURE_SPEC_CTRL) #define SVM_PAUSEFILTER_INIT 4000 #define SVM_PAUSETHRESH_INIT 1000 diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index 0b03a8f076..279c75a9dc 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -515,7 +515,9 @@ struct vmcb_struct { u64 _lastbranchtoip; /* cleanbit 10 */ u64 _lastintfromip; /* cleanbit 10 */ u64 _lastinttoip; /* cleanbit 10 */ - u64 res17[301]; + u64 res17[9]; + u64 spec_ctrl; + u64 res18[291]; }; struct svm_domain { diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 7e38c257d8..e3d44813ff 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -33,6 +33,7 @@ #define SPEC_CTRL_IBRS (_AC(1, ULL) << 0) #define SPEC_CTRL_STIBP (_AC(1, ULL) << 1) #define SPEC_CTRL_SSBD (_AC(1, ULL) << 2) +#define SPEC_CTRL_PSFD (_AC(1, ULL) << 7) #define MSR_PRED_CMD 0x00000049 #define PRED_CMD_IBPB (_AC(1, ULL) << 0) @@ -137,6 +138,8 @@ #define VM_CR_INIT_REDIRECTION (_AC(1, ULL) << 1) #define VM_CR_SVM_DISABLE (_AC(1, ULL) << 4) +#define MSR_VIRT_SPEC_CTRL 0xc001011f /* Layout matches MSR_SPEC_CTRL */ + /* * Legacy MSR constants in need of cleanup. No new MSRs below this comment. */ diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index b4f3d622a0..ec2706fe2e 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -255,7 +255,17 @@ XEN_CPUFEATURE(CLZERO, 8*32+ 0) /*A CLZERO instruction */ XEN_CPUFEATURE(RSTR_FP_ERR_PTRS, 8*32+ 2) /*A (F)X{SAVE,RSTOR} always saves/restores FPU Error pointers */ XEN_CPUFEATURE(WBNOINVD, 8*32+ 9) /* WBNOINVD instruction */ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by AMD) */ +XEN_CPUFEATURE(IBRS, 8*32+14) /* MSR_SPEC_CTRL.IBRS */ +XEN_CPUFEATURE(AMD_STIBP, 8*32+15) /* MSR_SPEC_CTRL.STIBP */ +XEN_CPUFEATURE(IBRS_ALWAYS, 8*32+16) /* IBRS preferred always on */ +XEN_CPUFEATURE(STIBP_ALWAYS, 8*32+17) /* STIBP preferred always on */ +XEN_CPUFEATURE(IBRS_FAST, 8*32+18) /* IBRS preferred over software options */ +XEN_CPUFEATURE(IBRS_SAME_MODE, 8*32+19) /* IBRS provides same-mode protection */ XEN_CPUFEATURE(AMD_PPIN, 8*32+23) /* Protected Processor Inventory Number */ +XEN_CPUFEATURE(AMD_SSBD, 8*32+24) /* MSR_SPEC_CTRL.SSBD available */ +XEN_CPUFEATURE(VIRT_SSBD, 8*32+25) /* MSR_VIRT_SPEC_CTRL.SSBD */ +XEN_CPUFEATURE(SSB_NO, 8*32+26) /* Hardware not vulnerable to SSB */ +XEN_CPUFEATURE(PSFD, 8*32+28) /* MSR_SPEC_CTRL.PSFD */ /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:11:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:11:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209991.366611 (Exim 4.92) (envelope-from ) id 1mbJFi-0006zD-JN; Fri, 15 Oct 2021 09:11:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209991.366611; Fri, 15 Oct 2021 09:11:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFi-0006z5-GR; Fri, 15 Oct 2021 09:11:46 +0000 Received: by outflank-mailman (input) for mailman id 209991; Fri, 15 Oct 2021 09:11:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFh-0006yu-7h for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFh-0008TW-6z for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJFh-0004b6-5s for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/qexClF/xxdacOyj01jF8VKTUmpspfvVHM0fWCAUIHA=; b=2ZsKL3dlrqMdZWGYBu0iuUCdAE TDGS3cq06LRgocghV4q7WeGWtmfIX2fLTz0MfSSKfKXm+/zwYqyHvqRNy4SHZq46Ha74yDCHxV+Oz kdgTHkU3op7Pc3mnZ6BJlYGra25qvLS2HxrZqQ2MmXjpi4NHuWUj2MfeljtbtTstu4VY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] x86/amd: Use newer SSBD mechanisms if they exist Message-Id: Date: Fri, 15 Oct 2021 09:11:45 +0000 commit cb7d7aa4c1bc40c987afdf73ee7e65689d2a24af Author: Andrew Cooper AuthorDate: Fri Oct 15 11:01:32 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:01:32 2021 +0200 x86/amd: Use newer SSBD mechanisms if they exist The opencoded legacy Memory Disambiguation logic in init_amd() neglected Fam19h for the Zen3 microarchitecture. Further more, all Zen2 based system have the architectural MSR_SPEC_CTRL and the SSBD bit within it, so shouldn't be using MSR_AMD64_LS_CFG. Implement the algorithm given in AMD's SSBD whitepaper, and leave a printk_once() behind in the case that no controls can be found. This now means that a user explicitly choosing `spec-ctrl=ssbd` will properly turn off Memory Disambiguation on Fam19h/Zen3 systems. This still remains a single system-wide setting (for now), and is not context switched between vCPUs. As such, it doesn't interact with Intel's use of MSR_SPEC_CTRL and default_xen_spec_ctrl (yet). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 2a4e6c4e4bea2e0bb720418c331ee28ff9c7632e master date: 2021-09-08 14:16:19 +0100 --- xen/arch/x86/cpu/amd.c | 69 +++++++++++++++++++++++++++++++++++------------- xen/arch/x86/cpu/cpu.h | 1 + xen/arch/x86/cpu/hygon.c | 9 +------ xen/arch/x86/spec_ctrl.c | 5 +++- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index db6916c1fd..10495aca35 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -642,6 +642,56 @@ void early_init_amd(struct cpuinfo_x86 *c) ctxt_switch_levelling(NULL); } +/* + * Refer to the AMD Speculative Store Bypass whitepaper: + * https://developer.amd.com/wp-content/resources/124441_AMD64_SpeculativeStoreBypassDisable_Whitepaper_final.pdf + */ +void amd_init_ssbd(const struct cpuinfo_x86 *c) +{ + int bit = -1; + + if (cpu_has_ssb_no) + return; + + if (cpu_has_amd_ssbd) { + wrmsrl(MSR_SPEC_CTRL, opt_ssbd ? SPEC_CTRL_SSBD : 0); + return; + } + + if (cpu_has_virt_ssbd) { + wrmsrl(MSR_VIRT_SPEC_CTRL, opt_ssbd ? SPEC_CTRL_SSBD : 0); + return; + } + + switch (c->x86) { + case 0x15: bit = 54; break; + case 0x16: bit = 33; break; + case 0x17: + case 0x18: bit = 10; break; + } + + if (bit >= 0) { + uint64_t val, mask = 1ull << bit; + + if (rdmsr_safe(MSR_AMD64_LS_CFG, val) || + ({ + val &= ~mask; + if (opt_ssbd) + val |= mask; + false; + }) || + wrmsr_safe(MSR_AMD64_LS_CFG, val) || + ({ + rdmsrl(MSR_AMD64_LS_CFG, val); + (val & mask) != (opt_ssbd * mask); + })) + bit = -1; + } + + if (bit < 0) + printk_once(XENLOG_ERR "No SSBD controls available\n"); +} + static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -718,24 +768,7 @@ static void init_amd(struct cpuinfo_x86 *c) c->x86_capability); } - /* - * If the user has explicitly chosen to disable Memory Disambiguation - * to mitigiate Speculative Store Bypass, poke the appropriate MSR. - */ - if (opt_ssbd) { - int bit = -1; - - switch (c->x86) { - case 0x15: bit = 54; break; - case 0x16: bit = 33; break; - case 0x17: bit = 10; break; - } - - if (bit >= 0 && !rdmsr_safe(MSR_AMD64_LS_CFG, value)) { - value |= 1ull << bit; - wrmsr_safe(MSR_AMD64_LS_CFG, value); - } - } + amd_init_ssbd(c); /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 1992596d1b..2550957801 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -20,3 +20,4 @@ extern bool detect_extended_topology(struct cpuinfo_x86 *c); void early_init_amd(struct cpuinfo_x86 *c); void amd_log_freq(const struct cpuinfo_x86 *c); +void amd_init_ssbd(const struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 46293f1f36..ccfa27201d 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -59,14 +59,7 @@ static void init_hygon(struct cpuinfo_x86 *c) __set_bit(X86_FEATURE_LFENCE_DISPATCH, c->x86_capability); - /* - * If the user has explicitly chosen to disable Memory Disambiguation - * to mitigiate Speculative Store Bypass, poke the appropriate MSR. - */ - if (opt_ssbd && !rdmsr_safe(MSR_AMD64_LS_CFG, value)) { - value |= 1ull << 10; - wrmsr_safe(MSR_AMD64_LS_CFG, value); - } + amd_init_ssbd(c); /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index a7953e43bc..e0e468783c 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -326,20 +326,23 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL" : "", + (e8b & cpufeat_mask(X86_FEATURE_SSB_NO)) || (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (e8b & cpufeat_mask(X86_FEATURE_AMD_SSBD)) || (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (e8b & cpufeat_mask(X86_FEATURE_VIRT_SSBD)) ? " VIRT_SSBD" : "", (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:11:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:11:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209993.366615 (Exim 4.92) (envelope-from ) id 1mbJFs-00072B-L0; Fri, 15 Oct 2021 09:11:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209993.366615; Fri, 15 Oct 2021 09:11:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFs-000723-Hx; Fri, 15 Oct 2021 09:11:56 +0000 Received: by outflank-mailman (input) for mailman id 209993; Fri, 15 Oct 2021 09:11:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFr-00071i-As for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJFr-0008Tg-AD for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJFr-0004bp-9A for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:11:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NbbPIXQF0fBWkH9Ufm5KJRheYX8r8ypfv10BaQ4venw=; b=YfMOC3FvpbLQKiceEEL3Tz7fe9 05T2MfB7FRXvbX4TfPru9njc2AeLvbobVWgm7DenZxjx6zEmGssoXNYGELiAw4CE7JeA1mS6SmxBJ iIEsbgHoOYCTUxFHJkjx2ZNb2CouCJQHUT6ih7nGTsoAE4CxupftPW7K/1ZAvy72XdMM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] x86/spec-ctrl: Print all AMD speculative hints/features Message-Id: Date: Fri, 15 Oct 2021 09:11:55 +0000 commit b482e969db68ff8d6b586f8b294f34ec5fa28c97 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:02:02 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:02:02 2021 +0200 x86/spec-ctrl: Print all AMD speculative hints/features We already print Intel features that aren't yet implemented/used, so be consistent on AMD too. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 3d189f16a11d5a209fb47fa3635847608d43745c master date: 2021-09-09 12:36:17 +0100 --- xen/arch/x86/spec_ctrl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index e0e468783c..7e0c171dc8 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -321,7 +321,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) * Hardware read-only information, stating immunity to certain issues, or * suggestions of which mitigation to use. */ - printk(" Hardware hints:%s%s%s%s%s%s%s\n", + printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s\n", (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", @@ -329,16 +329,23 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (e8b & cpufeat_mask(X86_FEATURE_SSB_NO)) || (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", - (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_ALWAYS)) ? " IBRS_ALWAYS" : "", + (e8b & cpufeat_mask(X86_FEATURE_STIBP_ALWAYS)) ? " STIBP_ALWAYS" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_FAST)) ? " IBRS_FAST" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_SAME_MODE)) ? " IBRS_SAME_MODE" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", + (e8b & cpufeat_mask(X86_FEATURE_AMD_STIBP)) || (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", (e8b & cpufeat_mask(X86_FEATURE_AMD_SSBD)) || (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (e8b & cpufeat_mask(X86_FEATURE_PSFD)) ? " PSFD" : "", (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:12:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:12:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209994.366619 (Exim 4.92) (envelope-from ) id 1mbJG3-00075B-Ma; Fri, 15 Oct 2021 09:12:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209994.366619; Fri, 15 Oct 2021 09:12:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJG3-000751-JX; Fri, 15 Oct 2021 09:12:07 +0000 Received: by outflank-mailman (input) for mailman id 209994; Fri, 15 Oct 2021 09:12:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJG1-00074k-EV for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJG1-0008UB-DK for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJG1-0004ct-CQ for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QRjpqZUHlRPeUeBIdd4vc8VSn6WNlvD0GiPfRtQEV+Q=; b=a5MMhU3mHWV57vrtyX4FSiyPDT 0OZ1aPNvv0uQF86uEli/8Edio+CK0KUKXEmDe+HYTvkBH7qc5NoZkrARHZjAGCc11Ay2lG7FL6sFu APYOqry7UVrt8ONRI2NdkFVVKH5vk7LcpGTpJqsWEQiW53IwmaEgqT8qDtoPHWLDM9Tw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] tools/libacpi: Use 64-byte alignment for FACS Message-Id: Date: Fri, 15 Oct 2021 09:12:05 +0000 commit 8f5a16cdc9df3f96c9246cf47b1d3b6e0e67b15a Author: Kevin Stefanov AuthorDate: Fri Oct 15 11:02:27 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:02:27 2021 +0200 tools/libacpi: Use 64-byte alignment for FACS The spec requires 64-byte alignment, not 16. Signed-off-by: Kevin Stefanov Reviewed-by: Jan Beulich master commit: c76cfada1cfad05aaf64ce3ad305c5467650e782 master date: 2021-09-10 13:27:08 +0100 --- tools/libacpi/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index a61dd5583a..fe2db66a62 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -532,7 +532,7 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config) * Fill in high-memory data structures, starting at @buf. */ - facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 16); + facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 64); if (!facs) goto oom; memcpy(facs, &Facs, sizeof(struct acpi_20_facs)); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:12:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:12:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209995.366623 (Exim 4.92) (envelope-from ) id 1mbJGC-00077X-O1; Fri, 15 Oct 2021 09:12:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209995.366623; Fri, 15 Oct 2021 09:12:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGC-00077Q-Kx; Fri, 15 Oct 2021 09:12:16 +0000 Received: by outflank-mailman (input) for mailman id 209995; Fri, 15 Oct 2021 09:12:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGB-00077A-Gz for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGB-0008Uc-GO for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJGB-0004dm-FZ for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4gc/Rzeu6TMQjF2vR+1wblagbFOVRFnycvy+WmmSO6w=; b=OaDlWyg5gQ1i6bsys3JHkopgqH yF3hb0fPHvERmpmBOWDl6+zTR/YseDWmGX5UPr45+thh67s/2cWRgsGikA1qV7gr3WXCqHxtg8JhY f5WasVeq2RdhSNv5PGYqKMTTXDdI7ZLE7cXd7d+bEsCeOr4MD8EAlz1Zpm0witHBWu9s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] sched: fix sched_move_domain() for domain without vcpus Message-Id: Date: Fri, 15 Oct 2021 09:12:15 +0000 commit c3c9a7c890537249c0777eb098a169bcfd946047 Author: Juergen Gross AuthorDate: Fri Oct 15 11:02:52 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:02:52 2021 +0200 sched: fix sched_move_domain() for domain without vcpus In case a domain is created with a cpupool other than Pool-0 specified it will be moved to that cpupool before any vcpus are allocated. This will lead to a NULL pointer dereference in sched_move_domain(). Fix that by tolerating vcpus not being allocated yet. Fixes: 70fadc41635b9b6 ("xen/cpupool: support moving domain between cpupools with different granularity") Reported-by: Bertrand Marquis Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli master commit: 999e1582f289cfb8d59e2e58927c1cba0ac2ada3 master date: 2021-09-15 10:57:47 +0200 --- xen/common/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 8d178baf3d..8f4b1ca10d 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -651,7 +651,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) struct scheduler *old_ops = dom_scheduler(d); void *old_domdata; unsigned int gran = cpupool_get_granularity(c); - unsigned int n_units = DIV_ROUND_UP(d->max_vcpus, gran); + unsigned int n_units = d->vcpu[0] ? DIV_ROUND_UP(d->max_vcpus, gran) : 0; int ret = 0; for_each_vcpu ( d, v ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:12:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:12:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209996.366627 (Exim 4.92) (envelope-from ) id 1mbJGM-0007AV-PW; Fri, 15 Oct 2021 09:12:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209996.366627; Fri, 15 Oct 2021 09:12:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGM-0007AN-Mc; Fri, 15 Oct 2021 09:12:26 +0000 Received: by outflank-mailman (input) for mailman id 209996; Fri, 15 Oct 2021 09:12:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGL-0007AE-LK for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGL-0008Ur-Kj for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJGL-0004gJ-JX for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=910kCC5FpDqLz2HoSuBJgXrm0HwN9qynUTvG0oRLYeg=; b=KUE+7v0eNmikbd6+gYOUvuiK6R qawzvZO8tf9WYlxj5fVSIY3wdAZCX6py5C00c5qJuHUUsVDc+TdGmHrVywM22RooEBJWFTMJstPzH W6xS1VnMsWV0f5lBGHeuq7DlgnGkLlF6mWkVLoFoCClihWb3hRIsnri9LFiAIBBytjXs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] x86: quote section names when defining them in linker script Message-Id: Date: Fri, 15 Oct 2021 09:12:25 +0000 commit c67f652339289ccf1a34bddb50522da2ab4fd351 Author: Roger Pau Monné AuthorDate: Fri Oct 15 11:03:18 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:03:18 2021 +0200 x86: quote section names when defining them in linker script LLVM ld seems to require section names to be quoted at both definition and when referencing them for a match to happen, or else we get the following errors: ld: error: xen.lds:45: undefined section ".text" ld: error: xen.lds:69: undefined section ".rodata" ld: error: xen.lds:104: undefined section ".note.gnu.build-id" [...] The original fix for GNU ld 2.37 only quoted the section name when referencing it in the ADDR function. Fix by also quoting the section names when declaring them. Fixes: 58ad654ebce7 ("x86: work around build issue with GNU ld 2.37") Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 6254920587c33bcc7ab884e6c9a11cfc0d5867ab master date: 2021-09-15 11:02:21 +0200 --- xen/arch/x86/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index a02df18a25..fcc6646487 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -18,7 +18,7 @@ ENTRY(efi_start) #else /* !EFI */ #define FORMAT "elf64-x86-64" -#define DECL_SECTION(x) x : AT(ADDR(#x) - __XEN_VIRT_START) +#define DECL_SECTION(x) #x : AT(ADDR(#x) - __XEN_VIRT_START) ENTRY(start_pa) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:12:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:12:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209997.366631 (Exim 4.92) (envelope-from ) id 1mbJGW-0007D9-RA; Fri, 15 Oct 2021 09:12:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209997.366631; Fri, 15 Oct 2021 09:12:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGW-0007Cz-O9; Fri, 15 Oct 2021 09:12:36 +0000 Received: by outflank-mailman (input) for mailman id 209997; Fri, 15 Oct 2021 09:12:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGV-0007Cq-PI for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGV-0008V4-OX for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJGV-0004h5-NG for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vbWssxhVhN3VyHE8v1mxYimbOdRnr67kZCy4zUoy2X8=; b=SdHWQ56rgz2wL/KBY+1AHNz9uL Yvl5B6fBiJ3mBhaNYjdjrO5V0bn/laKZZf78Bb5BzSuR0tC9U0TgazZyyo8wyf5drobLZZyw0Iwjb z9Bl0t0acL6BH42VJGsTY6Q5GuFZ2SlmKrbr6y/eLT/VUf9TanoG+7Rl+bgBOS8LuyvY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] VT-d: consider hidden devices when unmapping Message-Id: Date: Fri, 15 Oct 2021 09:12:35 +0000 commit 0950b18ae4bfbb27ca030731acd1ae4c90e659eb Author: Jan Beulich AuthorDate: Fri Oct 15 11:03:46 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:03:46 2021 +0200 VT-d: consider hidden devices when unmapping Whether to clear an IOMMU's bit in the domain's bitmap should depend on all devices the domain can control. For the hardware domain this includes hidden devices, which are associated with DomXEN. While touching related logic - convert the "current device" exclusion check to a simple pointer comparison, - convert "found" to "bool", - adjust style and correct a typo in an existing comment. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian master commit: 75bfe6ec4844f83b300b9807bceaed1e2fe23270 master date: 2021-09-20 10:24:27 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 48 ++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index affdf88b7e..be4eced660 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1654,6 +1654,27 @@ int domain_context_unmap_one( return rc; } +static bool any_pdev_behind_iommu(const struct domain *d, + const struct pci_dev *exclude, + const struct vtd_iommu *iommu) +{ + const struct pci_dev *pdev; + + for_each_pdev ( d, pdev ) + { + const struct acpi_drhd_unit *drhd; + + if ( pdev == exclude ) + continue; + + drhd = acpi_find_matched_drhd_unit(pdev); + if ( drhd && drhd->iommu == iommu ) + return true; + } + + return false; +} + static int domain_context_unmap(struct domain *domain, u8 devfn, struct pci_dev *pdev) { @@ -1661,7 +1682,7 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct vtd_iommu *iommu; int ret = 0; u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; - int found = 0; + bool found; drhd = acpi_find_matched_drhd_unit(pdev); if ( !drhd ) @@ -1743,23 +1764,18 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, goto out; /* - * if no other devices under the same iommu owned by this domain, - * clear iommu in iommu_bitmap and clear domain_id in domid_bitmp + * If no other devices under the same iommu owned by this domain, + * clear iommu in iommu_bitmap and clear domain_id in domid_bitmap. */ - for_each_pdev ( domain, pdev ) - { - if ( pdev->seg == seg && pdev->bus == bus && pdev->devfn == devfn ) - continue; - - drhd = acpi_find_matched_drhd_unit(pdev); - if ( drhd && drhd->iommu == iommu ) - { - found = 1; - break; - } - } + found = any_pdev_behind_iommu(domain, pdev, iommu); + /* + * Hidden devices are associated with DomXEN but usable by the hardware + * domain. Hence they need considering here as well. + */ + if ( !found && is_hardware_domain(domain) ) + found = any_pdev_behind_iommu(dom_xen, pdev, iommu); - if ( found == 0 ) + if ( !found ) { clear_bit(iommu->index, &dom_iommu(domain)->arch.vtd.iommu_bitmap); cleanup_domid_map(domain, iommu); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:12:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:12:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209998.366635 (Exim 4.92) (envelope-from ) id 1mbJGg-0007Ga-Tz; Fri, 15 Oct 2021 09:12:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209998.366635; Fri, 15 Oct 2021 09:12:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGg-0007GS-R6; Fri, 15 Oct 2021 09:12:46 +0000 Received: by outflank-mailman (input) for mailman id 209998; Fri, 15 Oct 2021 09:12:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGf-0007GI-Sd for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGf-0008VF-Ru for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJGf-0004hm-Qo for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jWUFsjiAs69Pc2eZUi1iRxCV1DTwxgwH0rfVxfPXPgY=; b=2y3g/DuBo887F0Vgc2uk/KxM7j sV+VW8ihpsJsKPTXcZYlV7QvSeNaAnPT8yd4h326C5rdJfzAuBQl77GLGr7S4/sCcZ0bA9UD+a8bs EfKmullk5KWunZGaCAb2u0Akjjh4pVbERYQ0uo/JM8TVTAjQLBf3BooNionrW9oRyXB0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] VT-d: PCI segment numbers are up to 16 bits wide Message-Id: Date: Fri, 15 Oct 2021 09:12:45 +0000 commit a82a0a89003e85c93f8f5179ea190e1771b4a77f Author: Jan Beulich AuthorDate: Fri Oct 15 11:04:22 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:04:22 2021 +0200 VT-d: PCI segment numbers are up to 16 bits wide We shouldn't silently truncate respective values. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian master commit: a3dd33e63c2c8c51102f223e6efe2e3d3bdcbec1 master date: 2021-09-20 10:25:03 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index be4eced660..fbc749436b 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1471,7 +1471,8 @@ static int domain_context_mapping(struct domain *domain, u8 devfn, { struct acpi_drhd_unit *drhd; int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, secbus; drhd = acpi_find_matched_drhd_unit(pdev); if ( !drhd ) @@ -1681,7 +1682,8 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct acpi_drhd_unit *drhd; struct vtd_iommu *iommu; int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, tmp_bus, tmp_devfn, secbus; bool found; drhd = acpi_find_matched_drhd_unit(pdev); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:12:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:12:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.209999.366639 (Exim 4.92) (envelope-from ) id 1mbJGq-0007JS-Vd; Fri, 15 Oct 2021 09:12:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 209999.366639; Fri, 15 Oct 2021 09:12:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGq-0007JK-SY; Fri, 15 Oct 2021 09:12:56 +0000 Received: by outflank-mailman (input) for mailman id 209999; Fri, 15 Oct 2021 09:12:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGp-0007J8-Vv for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJGp-0008VP-VE for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJGp-0004iQ-UJ for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:12:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5q2xahvXTGIlim2YQeZ4D/vG5s12al6vlVUse6hZtmA=; b=p16L6Kfcf4yQEfgi+MrmIMudWy 9HVWQQ6WKwstt81g/SU+vGXMQvHleOf8WGEBiYv4DnAb2gP4rIACYi2L2MInVh9Mxq5L+blbnJ9ea he+/+Pn+rm79Im5z0pPNL5ivI6OzoMy5jqW3hojc3OpWYvaQbsSdjkBW3zbk/JIU11N8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] pci: fix handling of PCI bridges with subordinate bus number 0xff Message-Id: Date: Fri, 15 Oct 2021 09:12:55 +0000 commit d4f39cf717539e9455a2b83321e05db37171f855 Author: Igor Druzhinin AuthorDate: Fri Oct 15 11:04:46 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:04:46 2021 +0200 pci: fix handling of PCI bridges with subordinate bus number 0xff Bus number 0xff is valid according to the PCI spec. Using u8 typed sub_bus and assigning 0xff to it will result in the following loop getting stuck. for ( ; sec_bus <= sub_bus; sec_bus++ ) {...} Just change its type to unsigned int similarly to what is already done in dmar_scope_add_buses(). Signed-off-by: Igor Druzhinin Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis master commit: 9c3b9800e2019c93ab22da69e4a0b22d6fb059ec master date: 2021-09-28 16:04:50 +0200 --- xen/drivers/passthrough/pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index a9e3ac906f..e2c022aeea 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -363,8 +363,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) /* update bus2bridge */ switch ( pdev->type = pdev_type(pseg->nr, bus, devfn) ) { - u16 cap; - u8 sec_bus, sub_bus; + unsigned int cap, sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: @@ -431,7 +430,7 @@ static void free_pdev(struct pci_seg *pseg, struct pci_dev *pdev) /* update bus2bridge */ switch ( pdev->type ) { - uint8_t sec_bus, sub_bus; + unsigned int sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:13:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:13:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210000.366643 (Exim 4.92) (envelope-from ) id 1mbJH1-0007Mb-0g; Fri, 15 Oct 2021 09:13:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210000.366643; Fri, 15 Oct 2021 09:13:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJH0-0007MT-U4; Fri, 15 Oct 2021 09:13:06 +0000 Received: by outflank-mailman (input) for mailman id 210000; Fri, 15 Oct 2021 09:13:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJH0-0007MK-2u for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJH0-0008Vr-28 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJH0-0004jM-15 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tIBAbJaFOwS4ZmuvjMfIrciHmroouR1oIsEsI2LEOpQ=; b=CiJsqdKWxfqzPNSpxZjzNEkblu FMkO5SLqiI819soVYF+ACwpD9TLTMj93lbyZ655DCEVlYHSo+F3A8p3OSKdZCO+aeKzJNMcvvAVy1 S/nduIllXvmr0Vj+iLKhU3AZyTsHa5or4hSsIzIHHQBl2m56KFXjafEWYvQPl89jvrcs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion Message-Id: Date: Fri, 15 Oct 2021 09:13:06 +0000 commit a2a17eec77da3d7882a2b5bf3c2e2937c4be6333 Author: Jan Beulich AuthorDate: Fri Oct 15 11:05:17 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:05:17 2021 +0200 x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion The xen-syms and xen.efi linking steps are serialized only when the intermediate note.o file is necessary. Otherwise both may run in parallel. This in turn means that the compiler / linker invocations to create efi/check.o / efi/check.efi may also happen twice in parallel. Obviously it's a bad idea to have multiple producers of the same output race with one another - every once in a while one may e.g. observe objdump: efi/check.efi: file format not recognized We don't need this EFI related checking to occur when producing the intermediate symbol and relocation table objects, and we have an easy way of suppressing it: Simply pass in "efi-y=", overriding the assignments done in the Makefile and thus forcing the tool chain checks to be bypassed. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD master commit: 24b0ce9a5da2e648cde818055a085bcbcf24ecb0 master date: 2021-10-11 10:58:17 +0200 --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index b560c12a58..2211616cdb 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -162,13 +162,13 @@ $(TARGET)-syms: prelink.o xen.lds $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort \ >$(@D)/.$(@F).0.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \ >$(@D)/.$(@F).1.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ @@ -222,14 +222,14 @@ $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:13:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:13:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210001.366647 (Exim 4.92) (envelope-from ) id 1mbJHB-0007PM-2K; Fri, 15 Oct 2021 09:13:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210001.366647; Fri, 15 Oct 2021 09:13:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHA-0007PE-Vb; Fri, 15 Oct 2021 09:13:16 +0000 Received: by outflank-mailman (input) for mailman id 210001; Fri, 15 Oct 2021 09:13:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHA-0007Oz-66 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHA-0008WL-5P for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJHA-0004kD-4N for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=x2XW/4089b0tudGF1mzF06xVl36Mxn3IiAW63wNLPYU=; b=m6N4FvOrZIsQKF9yt4mGJXskIw uY+sGcRI7PGA3D6vRpCgKvvYXK+GFNHOEma+ubiFNc8arlhk8i4wLPxh1TxajGoZkYOBpR7o8oH/V AHuP+2flIem9Ge/yA1yJN7X7mG9p7hCwt8rzk7sJjkohyXiEhAzhT77T5ntcazu/ymGM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] x86/HVM: fix xsm_op for 32-bit guests Message-Id: Date: Fri, 15 Oct 2021 09:13:16 +0000 commit ad70a247e132696944bd5f22fb886f99b4ed23e3 Author: Jan Beulich AuthorDate: Fri Oct 15 11:05:50 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:05:50 2021 +0200 x86/HVM: fix xsm_op for 32-bit guests Like for PV, 32-bit guests need to invoke the compat handler, not the native one. Fixes: db984809d61b ("hvm: wire up domctl and xsm hypercalls") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: b6b672e8a925ff4b71a1a67bc7d213ef445af74f master date: 2021-10-11 10:58:44 +0200 --- xen/arch/x86/hvm/hypercall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 01846b0718..40cc8fb993 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -136,7 +136,7 @@ static const hypercall_table_t hvm_hypercall_table[] = { HYPERCALL(event_channel_op), COMPAT_CALL(sched_op), COMPAT_CALL(set_timer_op), - HYPERCALL(xsm_op), + COMPAT_CALL(xsm_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), HYPERCALL(domctl), -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:13:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:13:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210002.366651 (Exim 4.92) (envelope-from ) id 1mbJHL-0007S5-3p; Fri, 15 Oct 2021 09:13:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210002.366651; Fri, 15 Oct 2021 09:13:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHL-0007Rx-0v; Fri, 15 Oct 2021 09:13:27 +0000 Received: by outflank-mailman (input) for mailman id 210002; Fri, 15 Oct 2021 09:13:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHK-0007Ro-A7 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHK-0008WV-9W for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJHK-0004lI-7j for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xSjlZNOThNsG/O/65aimP3g0XOb8u41kcKhpR1wSQMs=; b=O/++vy0zTZKbJsYIpeNcOVf6e+ J9baG7583Mw0JUNiQSTUYsGM5bQoNMF3Lwgz+wiWNRPb6oFzJe1WPXYtwmYjOVoiQISVWmSPDLiC5 uGjLz21GJW1LTBE/473v0mf+AOZdqFucxJRtOwfMyUKTtSK6lmIiUkpLYicg7CopP7mE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Message-Id: Date: Fri, 15 Oct 2021 09:13:26 +0000 commit b79615bd7e370944d088a719534391dc54f694df Author: Jan Beulich AuthorDate: Fri Oct 15 11:06:16 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:06:16 2021 +0200 AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Hidden devices are associated with DomXEN but usable by the hardware domain. Hence they need flushing as well when all devices are to have flushes invoked. While there drop a redundant ATS-enabled check and constify the first parameter of the involved function. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant master commit: 036432e8b27e1ef21e0f0204ba9b0e3972a031c2 master date: 2021-10-12 11:54:34 +0200 --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index 92a688dc9d..dfb8b1c860 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -304,14 +304,11 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, spin_unlock_irqrestore(&iommu->lock, flags); } -static void amd_iommu_flush_all_iotlbs(struct domain *d, daddr_t daddr, +static void amd_iommu_flush_all_iotlbs(const struct domain *d, daddr_t daddr, unsigned int order) { struct pci_dev *pdev; - if ( !ats_enabled ) - return; - for_each_pdev( d, pdev ) { u8 devfn = pdev->devfn; @@ -342,7 +339,16 @@ static void _amd_iommu_flush_pages(struct domain *d, } if ( ats_enabled ) + { amd_iommu_flush_all_iotlbs(d, daddr, order); + + /* + * Hidden devices are associated with DomXEN but usable by the + * hardware domain. Hence they need dealing with here as well. + */ + if ( is_hardware_domain(d) ) + amd_iommu_flush_all_iotlbs(dom_xen, daddr, order); + } } void amd_iommu_flush_all_pages(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:13:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:13:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210004.366655 (Exim 4.92) (envelope-from ) id 1mbJHV-0007Uq-5Q; Fri, 15 Oct 2021 09:13:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210004.366655; Fri, 15 Oct 2021 09:13:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHV-0007Ui-2O; Fri, 15 Oct 2021 09:13:37 +0000 Received: by outflank-mailman (input) for mailman id 210004; Fri, 15 Oct 2021 09:13:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHU-0007Ub-DU for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJHU-00005D-Cm for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJHU-0004mZ-BY for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:13:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AY7sGorTLnCYQS1T5Zzr261XC0qcO6wiK+PbAD9ExJ8=; b=zxg8DDNqMBUdSGVEv/AOIMPM86 XydZphOn0u07C9YqdslsDl9JCtxnxEmQOYtIQ4U0QktjovyEut6TRQ2c33VEWdfVeI9wMETAMPiqx MkMZgIuIS9VdIF0vwn42AQbTlYxGm7oW6uPHtjJic2hVBIhEfLDD3dnQLMXSUcq7qEIg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] x86/PV32: fix physdev_op_compat handling Message-Id: Date: Fri, 15 Oct 2021 09:13:36 +0000 commit f50ef17c9884c0c2d486d3b1de8f110bb6b22c42 Author: Jan Beulich AuthorDate: Fri Oct 15 11:06:38 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:06:38 2021 +0200 x86/PV32: fix physdev_op_compat handling The conversion of the original code failed to recognize that the 32-bit compat variant of this (sorry, two different meanings of "compat" here) needs to continue to invoke the compat handler, not the native one. Arrange for this by adding yet another #define. Affected functions (having existed prior to the introduction of the new hypercall) are PHYSDEVOP_set_iobitmap and PHYSDEVOP_apic_{read,write}. For all others the operand struct layout doesn't differ. Fixes: 1252e2823117 ("x86/pv: Export pv_hypercall_table[] rather than working around it in several ways") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Andrew Cooper master commit: 834cb8761051f7d87816785c0d99fe9bd5f0ce30 master date: 2021-10-12 11:55:42 +0200 --- xen/arch/x86/x86_64/compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c index 0e4c71f2aa..fcbc1cc0d7 100644 --- a/xen/arch/x86/x86_64/compat.c +++ b/xen/arch/x86/x86_64/compat.c @@ -12,6 +12,7 @@ EMIT_FILE; #define physdev_op_t physdev_op_compat_t #define do_physdev_op compat_physdev_op #define do_physdev_op_compat(x) compat_physdev_op_compat(_##x) +#define native compat #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:22:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210016.366670 (Exim 4.92) (envelope-from ) id 1mbJPi-0000cI-6Z; Fri, 15 Oct 2021 09:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210016.366670; Fri, 15 Oct 2021 09:22:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJPi-0000cA-3Y; Fri, 15 Oct 2021 09:22:06 +0000 Received: by outflank-mailman (input) for mailman id 210016; Fri, 15 Oct 2021 09:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJPg-0000c4-Nv for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJPg-0000FE-Kp for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJPg-0005c5-J9 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gv6HQNZl25Cz81MejEDS/o860bNTik9s5uT0/MvDJfo=; b=3f76PTqEP376PQuwmcMlpaD3UG ZxUB+V2N+gcQxk9uoGeDCHlurKlq32Bdr7ds22iE8lIuUHqjMTX1mKRzmwdAlaM6HsWu+DVH70nyo /4bZ9g6+3ibXoy3+1wyo41PxQHN2XzMjlBwCRUcpsbRvtm2ztF8nhToLOgqVeB0By8WA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] update Xen version to 4.14.4-pre Message-Id: Date: Fri, 15 Oct 2021 09:22:04 +0000 commit 6124f6c1893f3b2a8ada218820d9f4d1ca9066fc Author: Jan Beulich AuthorDate: Fri Oct 15 11:11:34 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:11:34 2021 +0200 update Xen version to 4.14.4-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 661f78741e..e20d61b5e4 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 14 -export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210017.366674 (Exim 4.92) (envelope-from ) id 1mbJPs-0000ei-8h; Fri, 15 Oct 2021 09:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210017.366674; Fri, 15 Oct 2021 09:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJPs-0000ea-54; Fri, 15 Oct 2021 09:22:16 +0000 Received: by outflank-mailman (input) for mailman id 210017; Fri, 15 Oct 2021 09:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJPq-0000eM-Ok for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJPq-0000FM-O2 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJPq-0005dC-N0 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=i6r81du4jGiZEa4KLpkmjvOhjUYSxyynCKHFWK9d3yk=; b=I7flbix8eNW7DOlRlCbYlqMZnk ptt0CEJdUAKO2EO4jMDouWWB0pChWshtHnmEiREaBeFXHrS4v7t2OlONke/9/hjoDE3yn6LBiNdVi r868fjwNWRQXQMQA2bEEaWyyujtPkJZ7sAWw98kvqoqfkCRvrF9By4d4JezNpHyots4g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] build: set policy filename on make command line Message-Id: Date: Fri, 15 Oct 2021 09:22:14 +0000 commit 76f2b04c90413dd00a418f9fc957dc402951a2a5 Author: Anthony PERARD AuthorDate: Fri Oct 15 11:13:39 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:13:39 2021 +0200 build: set policy filename on make command line In order to avoid flask/Makefile.common calling `make xenversion`, we override POLICY_FILENAME with the value we are going to use anyway. Signed-off-by: Anthony PERARD Acked-by: Jan Beulich master commit: c81e7efe2146c8f381fbdbb037b9d46866a6451e master date: 2021-09-08 14:40:00 +0200 --- xen/xsm/flask/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index 07f36d075d..c8ed3a8385 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -46,7 +46,9 @@ FLASK_BUILD_DIR := $(CURDIR) POLICY_SRC := $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) policy.bin: FORCE - $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common -C $(XEN_ROOT)/tools/flask/policy FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) + $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common \ + -C $(XEN_ROOT)/tools/flask/policy \ + FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) POLICY_FILENAME=$(POLICY_SRC) cmp -s $(POLICY_SRC) $@ || cp $(POLICY_SRC) $@ .PHONY: clean -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:22:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210018.366679 (Exim 4.92) (envelope-from ) id 1mbJQ2-0000i0-BW; Fri, 15 Oct 2021 09:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210018.366679; Fri, 15 Oct 2021 09:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQ2-0000hs-88; Fri, 15 Oct 2021 09:22:26 +0000 Received: by outflank-mailman (input) for mailman id 210018; Fri, 15 Oct 2021 09:22:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQ0-0000hc-Sa for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQ0-0000Fx-Rs for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJQ0-0005gS-QE for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MV6Yc39Nl35qQ3ojFRa0mXQ2mJXHyfASeLr4LW7Z4r0=; b=3pyEr5ikKE5f4ucGxTnZQJsTVv i8/wVsdJzDoQeMXjgfA6r0OJjN8H29bdfr9X6/S+/QaQGrRmEtw1S3fn4XA4rpaAUU2fVM2+nGS9Z qcIv97gMerqT4oswiRpZSVbfbH+JwmJ0tcZB8kMuc26kim++UpgC9oEw2plFJ2Ly3lug=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/spec-ctrl: Split the "Hardware features" diagnostic line Message-Id: Date: Fri, 15 Oct 2021 09:22:24 +0000 commit b7afc6b455d88ae440113ae222c98a9b49bf1fd5 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:14:16 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:14:16 2021 +0200 x86/spec-ctrl: Split the "Hardware features" diagnostic line Separate the read-only hints from the features requiring active actions on Xen's behalf. Also take the opportunity split the IBRS/IBPB and IBPB mess. More features with overlapping enumeration are on the way, and and it is not useful to split them like this. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 565ebcda976c05b0c6191510d5e32b621a2b1867 master date: 2021-09-08 14:16:19 +0100 --- xen/arch/x86/spec_ctrl.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index aa85a0be46..a7953e43bc 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -317,23 +317,30 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) printk("Speculative mitigation facilities:\n"); - /* Hardware features which pertain to speculative mitigations. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", - (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", - (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", - (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", - (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", - (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL": "", - (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", - (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", - (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : "", - (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + /* + * Hardware read-only information, stating immunity to certain issues, or + * suggestions of which mitigation to use. + */ + printk(" Hardware hints:%s%s%s%s%s%s%s\n", + (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", + (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", + (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", + (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL" : "", + (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", + (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", + (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + + /* Hardware features which need driving to mitigate issues. */ + printk(" Hardware features:%s%s%s%s%s%s%s%s\n", + (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ if ( IS_ENABLED(CONFIG_INDIRECT_THUNK) || IS_ENABLED(CONFIG_SHADOW_PAGING) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:22:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:22:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210019.366682 (Exim 4.92) (envelope-from ) id 1mbJQC-0000kv-CB; Fri, 15 Oct 2021 09:22:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210019.366682; Fri, 15 Oct 2021 09:22:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQC-0000ko-9R; Fri, 15 Oct 2021 09:22:36 +0000 Received: by outflank-mailman (input) for mailman id 210019; Fri, 15 Oct 2021 09:22:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQA-0000kc-W8 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQA-0000GG-VT for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJQA-0005hN-UW for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=noByPTpsUA9pLJmsmA3LGBEOdGZvu748y8nyqrBCKBw=; b=jVARW4m4jOJkACdfjPPIJZOsBo /cSpG+5eXmoIOqnLdilaBpT1/+r+B7J+W8oCRNtNfZ/EhZPiHOTBbnjm+NnVKfBmOHfn3wpDFHCeC XUJUzQiD2VXsFcd3KvSP2zElh9OiOna+C/Mc4eALvoJxJq8kaQ+mdH9QCs34eE43A6lg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/amd: Enumeration for speculative features/hints Message-Id: Date: Fri, 15 Oct 2021 09:22:34 +0000 commit 15734a72d7d38e9f8fd6a1a0bbb2a493a53d8dce Author: Andrew Cooper AuthorDate: Fri Oct 15 11:14:46 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:14:46 2021 +0200 x86/amd: Enumeration for speculative features/hints There is a step change in speculation protections between the Zen1 and Zen2 microarchitectures. Zen1 and older have no special support. Control bits in non-architectural MSRs are used to make lfence be dispatch-serialising (Spectre v1), and to disable Memory Disambiguation (Speculative Store Bypass). IBPB was retrofitted in a microcode update, and software methods are required for Spectre v2 protections. Because the bit controlling Memory Disambiguation is model specific, hypervisors are expected to expose a MSR_VIRT_SPEC_CTRL interface which abstracts the model specific details. Zen2 and later implement the MSR_SPEC_CTRL interface in hardware, and virtualise the interface for HVM guests to use. A number of hint bits are specified too to help guide OS software to the most efficient mitigation strategy. Zen3 introduced a new feature, Predictive Store Forwarding, along with a control to disable it in sensitive code. Add CPUID and VMCB details for all the new functionality. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 747424c664bb164a04e7a9f2ffbf02d4a1630d7d master date: 2021-09-08 14:16:19 +0100 --- tools/libxl/libxl_cpuid.c | 10 ++++++++++ tools/misc/xen-cpuid.c | 8 +++++++- xen/arch/x86/hvm/svm/svm.c | 1 + xen/arch/x86/hvm/svm/vmcb.c | 1 + xen/include/asm-x86/cpufeature.h | 5 +++++ xen/include/asm-x86/hvm/svm/svm.h | 2 ++ xen/include/asm-x86/hvm/svm/vmcb.h | 4 +++- xen/include/asm-x86/msr-index.h | 3 +++ xen/include/public/arch-x86/cpufeatureset.h | 10 ++++++++++ 9 files changed, 42 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index db2f12d115..fd63f606c8 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -267,7 +267,17 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"rstr-fp-err-ptrs", 0x80000008, NA, CPUID_REG_EBX, 2, 1}, {"wbnoinvd", 0x80000008, NA, CPUID_REG_EBX, 9, 1}, {"ibpb", 0x80000008, NA, CPUID_REG_EBX, 12, 1}, + {"ibrs", 0x80000008, NA, CPUID_REG_EBX, 14, 1}, + {"amd-stibp", 0x80000008, NA, CPUID_REG_EBX, 15, 1}, + {"ibrs-always", 0x80000008, NA, CPUID_REG_EBX, 16, 1}, + {"stibp-always", 0x80000008, NA, CPUID_REG_EBX, 17, 1}, + {"ibrs-fast", 0x80000008, NA, CPUID_REG_EBX, 18, 1}, + {"ibrs-same-mode", 0x80000008, NA, CPUID_REG_EBX, 19, 1}, {"ppin", 0x80000008, NA, CPUID_REG_EBX, 23, 1}, + {"amd-ssbd", 0x80000008, NA, CPUID_REG_EBX, 24, 1}, + {"virt-ssbd", 0x80000008, NA, CPUID_REG_EBX, 25, 1}, + {"ssb-no", 0x80000008, NA, CPUID_REG_EBX, 26, 1}, + {"psfd", 0x80000008, NA, CPUID_REG_EBX, 28, 1}, {"nc", 0x80000008, NA, CPUID_REG_ECX, 0, 8}, {"apicidsize", 0x80000008, NA, CPUID_REG_ECX, 12, 4}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index a231d96e13..a1d675da0f 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -148,11 +148,17 @@ static const char *const str_e8b[32] = [ 0] = "clzero", [ 2] = "rstr-fp-err-ptrs", - /* [ 8] */ [ 9] = "wbnoinvd", + /* [ 8] */ [ 9] = "wbnoinvd", [12] = "ibpb", + [14] = "ibrs", [15] = "amd-stibp", + [16] = "ibrs-always", [17] = "stibp-always", + [18] = "ibrs-fast", [19] = "ibrs-same-mode", /* [22] */ [23] = "ppin", + [24] = "amd-ssbd", [25] = "virt-ssbd", + [26] = "ssb-no", + [28] = "psfd", }; static const char *const str_7d0[32] = diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 90cdab3734..bb4a9da27e 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1653,6 +1653,7 @@ const struct hvm_function_table * __init start_svm(void) P(cpu_has_pause_filter, "Pause-Intercept Filter"); P(cpu_has_pause_thresh, "Pause-Intercept Filter Threshold"); P(cpu_has_tsc_ratio, "TSC Rate MSR"); + P(cpu_has_svm_spec_ctrl, "MSR_SPEC_CTRL virtualisation"); #undef P if ( !printed ) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 373d5d4af4..55da9302e5 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -271,6 +271,7 @@ static void __init __maybe_unused build_assertions(void) BUILD_BUG_ON(offsetof(typeof(vmcb), rsp) != 0x5d8); BUILD_BUG_ON(offsetof(typeof(vmcb), rax) != 0x5f8); BUILD_BUG_ON(offsetof(typeof(vmcb), _g_pat) != 0x668); + BUILD_BUG_ON(offsetof(typeof(vmcb), spec_ctrl) != 0x6e0); /* Check struct segment_register against the VMCB segment layout. */ BUILD_BUG_ON(sizeof(vmcb.es) != 16); diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 80eff688d4..a4900ef0c3 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -125,6 +125,11 @@ /* CPUID level 0x80000007.edx */ #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) +/* CPUID level 0x80000008.ebx */ +#define cpu_has_amd_ssbd boot_cpu_has(X86_FEATURE_AMD_SSBD) +#define cpu_has_virt_ssbd boot_cpu_has(X86_FEATURE_VIRT_SSBD) +#define cpu_has_ssb_no boot_cpu_has(X86_FEATURE_SSB_NO) + /* CPUID level 0x00000007:0.edx */ #define cpu_has_avx512_4vnniw boot_cpu_has(X86_FEATURE_AVX512_4VNNIW) #define cpu_has_avx512_4fmaps boot_cpu_has(X86_FEATURE_AVX512_4FMAPS) diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index 2310878e41..055bd4184a 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -74,6 +74,7 @@ extern u32 svm_feature_flags; #define SVM_FEATURE_PAUSETHRESH 12 /* Pause intercept filter support */ #define SVM_FEATURE_VLOADSAVE 15 /* virtual vmload/vmsave */ #define SVM_FEATURE_VGIF 16 /* Virtual GIF */ +#define SVM_FEATURE_SPEC_CTRL 20 /* MSR_SPEC_CTRL virtualisation */ #define cpu_has_svm_feature(f) (svm_feature_flags & (1u << (f))) #define cpu_has_svm_npt cpu_has_svm_feature(SVM_FEATURE_NPT) @@ -88,6 +89,7 @@ extern u32 svm_feature_flags; #define cpu_has_pause_thresh cpu_has_svm_feature(SVM_FEATURE_PAUSETHRESH) #define cpu_has_tsc_ratio cpu_has_svm_feature(SVM_FEATURE_TSCRATEMSR) #define cpu_has_svm_vloadsave cpu_has_svm_feature(SVM_FEATURE_VLOADSAVE) +#define cpu_has_svm_spec_ctrl cpu_has_svm_feature(SVM_FEATURE_SPEC_CTRL) #define SVM_PAUSEFILTER_INIT 4000 #define SVM_PAUSETHRESH_INIT 1000 diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index c4fda389b3..6dd5397862 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -515,7 +515,9 @@ struct vmcb_struct { u64 _lastbranchtoip; /* cleanbit 10 */ u64 _lastintfromip; /* cleanbit 10 */ u64 _lastinttoip; /* cleanbit 10 */ - u64 res17[301]; + u64 res17[9]; + u64 spec_ctrl; + u64 res18[291]; }; struct svm_domain { diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 80764266bf..9366386ef4 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -33,6 +33,7 @@ #define SPEC_CTRL_IBRS (_AC(1, ULL) << 0) #define SPEC_CTRL_STIBP (_AC(1, ULL) << 1) #define SPEC_CTRL_SSBD (_AC(1, ULL) << 2) +#define SPEC_CTRL_PSFD (_AC(1, ULL) << 7) #define MSR_PRED_CMD 0x00000049 #define PRED_CMD_IBPB (_AC(1, ULL) << 0) @@ -129,6 +130,8 @@ #define MSR_F15H_CU_POWER 0xc001007a #define MSR_F15H_CU_MAX_POWER 0xc001007b +#define MSR_VIRT_SPEC_CTRL 0xc001011f /* Layout matches MSR_SPEC_CTRL */ + #define MSR_AMD_RAPL_POWER_UNIT 0xc0010299 #define MSR_AMD_CORE_ENERGY_STATUS 0xc001029a #define MSR_AMD_PKG_ENERGY_STATUS 0xc001029b diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index d2422386c0..25a3fa03a4 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -254,7 +254,17 @@ XEN_CPUFEATURE(CLZERO, 8*32+ 0) /*A CLZERO instruction */ XEN_CPUFEATURE(RSTR_FP_ERR_PTRS, 8*32+ 2) /*A (F)X{SAVE,RSTOR} always saves/restores FPU Error pointers */ XEN_CPUFEATURE(WBNOINVD, 8*32+ 9) /* WBNOINVD instruction */ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by AMD) */ +XEN_CPUFEATURE(IBRS, 8*32+14) /* MSR_SPEC_CTRL.IBRS */ +XEN_CPUFEATURE(AMD_STIBP, 8*32+15) /* MSR_SPEC_CTRL.STIBP */ +XEN_CPUFEATURE(IBRS_ALWAYS, 8*32+16) /* IBRS preferred always on */ +XEN_CPUFEATURE(STIBP_ALWAYS, 8*32+17) /* STIBP preferred always on */ +XEN_CPUFEATURE(IBRS_FAST, 8*32+18) /* IBRS preferred over software options */ +XEN_CPUFEATURE(IBRS_SAME_MODE, 8*32+19) /* IBRS provides same-mode protection */ XEN_CPUFEATURE(AMD_PPIN, 8*32+23) /* Protected Processor Inventory Number */ +XEN_CPUFEATURE(AMD_SSBD, 8*32+24) /* MSR_SPEC_CTRL.SSBD available */ +XEN_CPUFEATURE(VIRT_SSBD, 8*32+25) /* MSR_VIRT_SPEC_CTRL.SSBD */ +XEN_CPUFEATURE(SSB_NO, 8*32+26) /* Hardware not vulnerable to SSB */ +XEN_CPUFEATURE(PSFD, 8*32+28) /* MSR_SPEC_CTRL.PSFD */ /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:22:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210020.366686 (Exim 4.92) (envelope-from ) id 1mbJQM-0000o6-E6; Fri, 15 Oct 2021 09:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210020.366686; Fri, 15 Oct 2021 09:22:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQM-0000ny-B1; Fri, 15 Oct 2021 09:22:46 +0000 Received: by outflank-mailman (input) for mailman id 210020; Fri, 15 Oct 2021 09:22:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQL-0000nk-3L for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQL-0000GQ-2e for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJQL-0005iT-1g for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1bRkO5n2DCvKIjNhoCk2FTva5fj8MKvHLJPgRTfBAjo=; b=LN5HPx452gHcg6mAx/EP4vtLTx NfNZEh/g/ST2JgMdeZ89eBxkHW7SQzp4LHe+JUiK+0WTplcZcWslohYzieb5iuC83W99KEPHrfEBS aAz6VlzYK2OjBe7qzPHev3YT7ZltLiOjtf6fCuInCp5jP0xlFKKGG8cd/uF0MgEm19uk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/amd: Use newer SSBD mechanisms if they exist Message-Id: Date: Fri, 15 Oct 2021 09:22:45 +0000 commit e0a8ffd498fb4c13bae0c80b0035dee4a34d3bb2 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:15:14 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:15:14 2021 +0200 x86/amd: Use newer SSBD mechanisms if they exist The opencoded legacy Memory Disambiguation logic in init_amd() neglected Fam19h for the Zen3 microarchitecture. Further more, all Zen2 based system have the architectural MSR_SPEC_CTRL and the SSBD bit within it, so shouldn't be using MSR_AMD64_LS_CFG. Implement the algorithm given in AMD's SSBD whitepaper, and leave a printk_once() behind in the case that no controls can be found. This now means that a user explicitly choosing `spec-ctrl=ssbd` will properly turn off Memory Disambiguation on Fam19h/Zen3 systems. This still remains a single system-wide setting (for now), and is not context switched between vCPUs. As such, it doesn't interact with Intel's use of MSR_SPEC_CTRL and default_xen_spec_ctrl (yet). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 2a4e6c4e4bea2e0bb720418c331ee28ff9c7632e master date: 2021-09-08 14:16:19 +0100 --- xen/arch/x86/cpu/amd.c | 69 +++++++++++++++++++++++++++++++++++------------- xen/arch/x86/cpu/cpu.h | 1 + xen/arch/x86/cpu/hygon.c | 9 +------ xen/arch/x86/spec_ctrl.c | 5 +++- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 8bc51bec10..c780397f18 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -642,6 +642,56 @@ void early_init_amd(struct cpuinfo_x86 *c) ctxt_switch_levelling(NULL); } +/* + * Refer to the AMD Speculative Store Bypass whitepaper: + * https://developer.amd.com/wp-content/resources/124441_AMD64_SpeculativeStoreBypassDisable_Whitepaper_final.pdf + */ +void amd_init_ssbd(const struct cpuinfo_x86 *c) +{ + int bit = -1; + + if (cpu_has_ssb_no) + return; + + if (cpu_has_amd_ssbd) { + wrmsrl(MSR_SPEC_CTRL, opt_ssbd ? SPEC_CTRL_SSBD : 0); + return; + } + + if (cpu_has_virt_ssbd) { + wrmsrl(MSR_VIRT_SPEC_CTRL, opt_ssbd ? SPEC_CTRL_SSBD : 0); + return; + } + + switch (c->x86) { + case 0x15: bit = 54; break; + case 0x16: bit = 33; break; + case 0x17: + case 0x18: bit = 10; break; + } + + if (bit >= 0) { + uint64_t val, mask = 1ull << bit; + + if (rdmsr_safe(MSR_AMD64_LS_CFG, val) || + ({ + val &= ~mask; + if (opt_ssbd) + val |= mask; + false; + }) || + wrmsr_safe(MSR_AMD64_LS_CFG, val) || + ({ + rdmsrl(MSR_AMD64_LS_CFG, val); + (val & mask) != (opt_ssbd * mask); + })) + bit = -1; + } + + if (bit < 0) + printk_once(XENLOG_ERR "No SSBD controls available\n"); +} + static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -718,24 +768,7 @@ static void init_amd(struct cpuinfo_x86 *c) c->x86_capability); } - /* - * If the user has explicitly chosen to disable Memory Disambiguation - * to mitigiate Speculative Store Bypass, poke the appropriate MSR. - */ - if (opt_ssbd) { - int bit = -1; - - switch (c->x86) { - case 0x15: bit = 54; break; - case 0x16: bit = 33; break; - case 0x17: bit = 10; break; - } - - if (bit >= 0 && !rdmsr_safe(MSR_AMD64_LS_CFG, value)) { - value |= 1ull << bit; - wrmsr_safe(MSR_AMD64_LS_CFG, value); - } - } + amd_init_ssbd(c); /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 1992596d1b..2550957801 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -20,3 +20,4 @@ extern bool detect_extended_topology(struct cpuinfo_x86 *c); void early_init_amd(struct cpuinfo_x86 *c); void amd_log_freq(const struct cpuinfo_x86 *c); +void amd_init_ssbd(const struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 46293f1f36..ccfa27201d 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -59,14 +59,7 @@ static void init_hygon(struct cpuinfo_x86 *c) __set_bit(X86_FEATURE_LFENCE_DISPATCH, c->x86_capability); - /* - * If the user has explicitly chosen to disable Memory Disambiguation - * to mitigiate Speculative Store Bypass, poke the appropriate MSR. - */ - if (opt_ssbd && !rdmsr_safe(MSR_AMD64_LS_CFG, value)) { - value |= 1ull << 10; - wrmsr_safe(MSR_AMD64_LS_CFG, value); - } + amd_init_ssbd(c); /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index a7953e43bc..e0e468783c 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -326,20 +326,23 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL" : "", + (e8b & cpufeat_mask(X86_FEATURE_SSB_NO)) || (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (e8b & cpufeat_mask(X86_FEATURE_AMD_SSBD)) || (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (e8b & cpufeat_mask(X86_FEATURE_VIRT_SSBD)) ? " VIRT_SSBD" : "", (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:22:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:22:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210021.366690 (Exim 4.92) (envelope-from ) id 1mbJQW-0000rH-GU; Fri, 15 Oct 2021 09:22:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210021.366690; Fri, 15 Oct 2021 09:22:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQW-0000r9-Cf; Fri, 15 Oct 2021 09:22:56 +0000 Received: by outflank-mailman (input) for mailman id 210021; Fri, 15 Oct 2021 09:22:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQV-0000qy-6Y for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQV-0000Gq-5w for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJQV-0005j9-4v for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:22:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mvxDdQERpJBj6aBkD8AvXFEhI2RMf9w1y/Cxp8RMKNs=; b=zUCpo+6jTZAqt+5XhY7Gfy/1GD +nmPvbMwm03X+kNOwrdaCbNzpfx0q+xEGkzplIDVZBJla8j7jo5haTXOQaZjily3S4SeQIV2tiqaU WQIGtrp4ExpNNE6kbnMGY5O1OtF9k+HO1dVTX/lA1+nxG02LMQjRw7foiudJ2IdBgYmU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/spec-ctrl: Print all AMD speculative hints/features Message-Id: Date: Fri, 15 Oct 2021 09:22:55 +0000 commit 9d32c26cfe680f0a114f460ab09260ee40319914 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:15:39 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:15:39 2021 +0200 x86/spec-ctrl: Print all AMD speculative hints/features We already print Intel features that aren't yet implemented/used, so be consistent on AMD too. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 3d189f16a11d5a209fb47fa3635847608d43745c master date: 2021-09-09 12:36:17 +0100 --- xen/arch/x86/spec_ctrl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index e0e468783c..7e0c171dc8 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -321,7 +321,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) * Hardware read-only information, stating immunity to certain issues, or * suggestions of which mitigation to use. */ - printk(" Hardware hints:%s%s%s%s%s%s%s\n", + printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s\n", (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", @@ -329,16 +329,23 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (e8b & cpufeat_mask(X86_FEATURE_SSB_NO)) || (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", - (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_ALWAYS)) ? " IBRS_ALWAYS" : "", + (e8b & cpufeat_mask(X86_FEATURE_STIBP_ALWAYS)) ? " STIBP_ALWAYS" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_FAST)) ? " IBRS_FAST" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_SAME_MODE)) ? " IBRS_SAME_MODE" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", + (e8b & cpufeat_mask(X86_FEATURE_AMD_STIBP)) || (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", (e8b & cpufeat_mask(X86_FEATURE_AMD_SSBD)) || (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (e8b & cpufeat_mask(X86_FEATURE_PSFD)) ? " PSFD" : "", (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:23:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:23:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210022.366694 (Exim 4.92) (envelope-from ) id 1mbJQg-0000ux-Ih; Fri, 15 Oct 2021 09:23:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210022.366694; Fri, 15 Oct 2021 09:23:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQg-0000up-Fk; Fri, 15 Oct 2021 09:23:06 +0000 Received: by outflank-mailman (input) for mailman id 210022; Fri, 15 Oct 2021 09:23:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQf-0000ua-9W for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQf-0000HR-8x for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJQf-0005jz-84 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Cq9EXYKau7hSwbVl7ihV3tT8sV1hO+aSNwLW9aUbL/Y=; b=05BueZ9DKPeAam0QvY5+HW1bcz Ly5isX7HtvxyLIj9RS8+EBVOQupMqVfJQSCqjis2AnGQPH4jQC6J8DXo7ORsg2j3dO0mZeahgKVO/ Luc2ilfYDsgrZLMGht9NdvzMByowmP+S+asvUHnw4CC65s2MJSj52p7wEBbdLYU+rCDA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] tools/libacpi: Use 64-byte alignment for FACS Message-Id: Date: Fri, 15 Oct 2021 09:23:05 +0000 commit 410f5d02b6b4878e9fca4b7330380a970facf29b Author: Kevin Stefanov AuthorDate: Fri Oct 15 11:16:09 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:16:09 2021 +0200 tools/libacpi: Use 64-byte alignment for FACS The spec requires 64-byte alignment, not 16. Signed-off-by: Kevin Stefanov Reviewed-by: Jan Beulich master commit: c76cfada1cfad05aaf64ce3ad305c5467650e782 master date: 2021-09-10 13:27:08 +0100 --- tools/libacpi/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index a61dd5583a..fe2db66a62 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -532,7 +532,7 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config) * Fill in high-memory data structures, starting at @buf. */ - facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 16); + facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 64); if (!facs) goto oom; memcpy(facs, &Facs, sizeof(struct acpi_20_facs)); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:23:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:23:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210023.366698 (Exim 4.92) (envelope-from ) id 1mbJQq-0000xj-KI; Fri, 15 Oct 2021 09:23:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210023.366698; Fri, 15 Oct 2021 09:23:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQq-0000xa-HA; Fri, 15 Oct 2021 09:23:16 +0000 Received: by outflank-mailman (input) for mailman id 210023; Fri, 15 Oct 2021 09:23:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQp-0000xO-Ch for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQp-0000Hd-C0 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJQp-0005l5-B1 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9Iz7stkc8+/XD/2KSEM+HvmmRMuqS1ge8Pwjcqm/zIY=; b=zxSkZExw1x6p/bA7kXbzfHxhvK XPKqeHw9wNa7bZObUG8l4Gn5/csm8UTvijPk1tUkx/VrzLqOAblGZIkYkLMGQ/UAK4RnPLzy5qXD7 cGstsiI4TRSpBvMMxSLxMRNhvazT/ZsEbgIlpOnLEF3lNNyjpb9O3PRxmWs5KSCaTFK8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86: quote section names when defining them in linker script Message-Id: Date: Fri, 15 Oct 2021 09:23:15 +0000 commit b4926b6c40bb635788a4987c8176c94826d193bd Author: Roger Pau Monné AuthorDate: Fri Oct 15 11:16:41 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:16:41 2021 +0200 x86: quote section names when defining them in linker script LLVM ld seems to require section names to be quoted at both definition and when referencing them for a match to happen, or else we get the following errors: ld: error: xen.lds:45: undefined section ".text" ld: error: xen.lds:69: undefined section ".rodata" ld: error: xen.lds:104: undefined section ".note.gnu.build-id" [...] The original fix for GNU ld 2.37 only quoted the section name when referencing it in the ADDR function. Fix by also quoting the section names when declaring them. Fixes: 58ad654ebce7 ("x86: work around build issue with GNU ld 2.37") Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 6254920587c33bcc7ab884e6c9a11cfc0d5867ab master date: 2021-09-15 11:02:21 +0200 --- xen/arch/x86/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index a02df18a25..fcc6646487 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -18,7 +18,7 @@ ENTRY(efi_start) #else /* !EFI */ #define FORMAT "elf64-x86-64" -#define DECL_SECTION(x) x : AT(ADDR(#x) - __XEN_VIRT_START) +#define DECL_SECTION(x) #x : AT(ADDR(#x) - __XEN_VIRT_START) ENTRY(start_pa) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:23:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:23:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210024.366701 (Exim 4.92) (envelope-from ) id 1mbJR1-00010W-Lk; Fri, 15 Oct 2021 09:23:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210024.366701; Fri, 15 Oct 2021 09:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJR1-00010O-Ih; Fri, 15 Oct 2021 09:23:27 +0000 Received: by outflank-mailman (input) for mailman id 210024; Fri, 15 Oct 2021 09:23:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQz-0000zx-Fj for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJQz-0000I7-F2 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJQz-0005m3-EH for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=meZEFSBF1W4YW6z2MlHh2qkWeUTe0dWgb2gYWc1v4Dw=; b=ek13Gq4G+oY2F0Q8OkVzSV0z2R TyRQX4UCKaOGjhdMHoObnRrT7Yfhoh3MVBVgksrew9k3zq4UgvKIRsA53OC5eCweHVeBz34utM5Sn NvuMvAQUMTZk2N1ptdgley4NLpyz0/9Z3vTZlA9glEngAT8zn6BGCzzp0w2beHB53iKc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] VT-d: consider hidden devices when unmapping Message-Id: Date: Fri, 15 Oct 2021 09:23:25 +0000 commit d8c60e68fb699bb0aa56f511367bc7f733353813 Author: Jan Beulich AuthorDate: Fri Oct 15 11:17:32 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:17:32 2021 +0200 VT-d: consider hidden devices when unmapping Whether to clear an IOMMU's bit in the domain's bitmap should depend on all devices the domain can control. For the hardware domain this includes hidden devices, which are associated with DomXEN. While touching related logic - convert the "current device" exclusion check to a simple pointer comparison, - convert "found" to "bool", - adjust style and correct a typo in an existing comment. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian master commit: 75bfe6ec4844f83b300b9807bceaed1e2fe23270 master date: 2021-09-20 10:24:27 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 48 ++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 4f6bb996d0..70cfe9dc1f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1673,6 +1673,27 @@ int domain_context_unmap_one( return rc; } +static bool any_pdev_behind_iommu(const struct domain *d, + const struct pci_dev *exclude, + const struct vtd_iommu *iommu) +{ + const struct pci_dev *pdev; + + for_each_pdev ( d, pdev ) + { + const struct acpi_drhd_unit *drhd; + + if ( pdev == exclude ) + continue; + + drhd = acpi_find_matched_drhd_unit(pdev); + if ( drhd && drhd->iommu == iommu ) + return true; + } + + return false; +} + static int domain_context_unmap(struct domain *domain, u8 devfn, struct pci_dev *pdev) { @@ -1680,7 +1701,7 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct vtd_iommu *iommu; int ret = 0; u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; - int found = 0; + bool found; drhd = acpi_find_matched_drhd_unit(pdev); if ( !drhd ) @@ -1765,23 +1786,18 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, goto out; /* - * if no other devices under the same iommu owned by this domain, - * clear iommu in iommu_bitmap and clear domain_id in domid_bitmp + * If no other devices under the same iommu owned by this domain, + * clear iommu in iommu_bitmap and clear domain_id in domid_bitmap. */ - for_each_pdev ( domain, pdev ) - { - if ( pdev->seg == seg && pdev->bus == bus && pdev->devfn == devfn ) - continue; - - drhd = acpi_find_matched_drhd_unit(pdev); - if ( drhd && drhd->iommu == iommu ) - { - found = 1; - break; - } - } + found = any_pdev_behind_iommu(domain, pdev, iommu); + /* + * Hidden devices are associated with DomXEN but usable by the hardware + * domain. Hence they need considering here as well. + */ + if ( !found && is_hardware_domain(domain) ) + found = any_pdev_behind_iommu(dom_xen, pdev, iommu); - if ( found == 0 ) + if ( !found ) { clear_bit(iommu->index, &dom_iommu(domain)->arch.iommu_bitmap); cleanup_domid_map(domain, iommu); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:23:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:23:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210025.366705 (Exim 4.92) (envelope-from ) id 1mbJRB-00013E-ND; Fri, 15 Oct 2021 09:23:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210025.366705; Fri, 15 Oct 2021 09:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRB-000139-KL; Fri, 15 Oct 2021 09:23:37 +0000 Received: by outflank-mailman (input) for mailman id 210025; Fri, 15 Oct 2021 09:23:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJR9-00012v-Im for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJR9-0000IS-IA for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJR9-0005n0-HL for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/TjNJKdYRg/Lfj2vuuk2+jjsiR8vmkoJvK8uETyEjZQ=; b=W+owZhrc8Vht6z6RtzI/yRZ8jx gzaxbM9ahBoohBrV1shR3ivt2nl76Bo5x53xvt/B64zBUQYSUInkn+gbNi5KiWtGnJWpeEQ7kTn41 kWvIDWkZzwgkaQk7yPTWkvN/axsYl4EvtpIt1jtYjtTCCo0wgHTdBbEFor1XrqhatRHI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] VT-d: PCI segment numbers are up to 16 bits wide Message-Id: Date: Fri, 15 Oct 2021 09:23:35 +0000 commit d53afcdcb33a2724303dfd789eafcb830120d3b8 Author: Jan Beulich AuthorDate: Fri Oct 15 11:17:56 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:17:56 2021 +0200 VT-d: PCI segment numbers are up to 16 bits wide We shouldn't silently truncate respective values. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian master commit: a3dd33e63c2c8c51102f223e6efe2e3d3bdcbec1 master date: 2021-09-20 10:25:03 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 70cfe9dc1f..870996abdb 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1486,7 +1486,8 @@ static int domain_context_mapping(struct domain *domain, u8 devfn, { struct acpi_drhd_unit *drhd; int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, secbus; drhd = acpi_find_matched_drhd_unit(pdev); if ( !drhd ) @@ -1700,7 +1701,8 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct acpi_drhd_unit *drhd; struct vtd_iommu *iommu; int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, tmp_bus, tmp_devfn, secbus; bool found; drhd = acpi_find_matched_drhd_unit(pdev); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:23:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:23:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210026.366710 (Exim 4.92) (envelope-from ) id 1mbJRK-00016E-Oq; Fri, 15 Oct 2021 09:23:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210026.366710; Fri, 15 Oct 2021 09:23:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRK-000166-Lj; Fri, 15 Oct 2021 09:23:46 +0000 Received: by outflank-mailman (input) for mailman id 210026; Fri, 15 Oct 2021 09:23:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRJ-00015u-Lh for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRJ-0000Id-L8 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJRJ-0005o0-KE for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TkyUTcmkFkFPvGJORa7Gl2ogFlzs4PjWTSvJuqQ3WBQ=; b=f1xt7JXtMs9lhHp9r1fh8vbB7X UwXCGJCSCOUoHP/hdmUruWBj/kcId7MpLqHTAIkYUAN9ZarcKbCWjMwVbPzcMjqZVzn3Df4aLy/tc slQ0vS4L7jzeD6NhYWugMhU6r8q62Ac6b/XNZ8wu5GdQYqNS5jc3pIXmJiQlGmtEdMLI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] pci: fix handling of PCI bridges with subordinate bus number 0xff Message-Id: Date: Fri, 15 Oct 2021 09:23:45 +0000 commit 28a28fa8194107794d5b8bd08cad5a46a67f6d64 Author: Igor Druzhinin AuthorDate: Fri Oct 15 11:18:19 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:18:19 2021 +0200 pci: fix handling of PCI bridges with subordinate bus number 0xff Bus number 0xff is valid according to the PCI spec. Using u8 typed sub_bus and assigning 0xff to it will result in the following loop getting stuck. for ( ; sec_bus <= sub_bus; sec_bus++ ) {...} Just change its type to unsigned int similarly to what is already done in dmar_scope_add_buses(). Signed-off-by: Igor Druzhinin Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis master commit: 9c3b9800e2019c93ab22da69e4a0b22d6fb059ec master date: 2021-09-28 16:04:50 +0200 --- xen/drivers/passthrough/pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 981e63061d..f15af59764 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -375,8 +375,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) /* update bus2bridge */ switch ( pdev->type = pdev_type(pseg->nr, bus, devfn) ) { - u16 cap; - u8 sec_bus, sub_bus; + unsigned int cap, sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: @@ -443,7 +442,7 @@ static void free_pdev(struct pci_seg *pseg, struct pci_dev *pdev) /* update bus2bridge */ switch ( pdev->type ) { - uint8_t sec_bus, sub_bus; + unsigned int sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:23:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:23:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210027.366714 (Exim 4.92) (envelope-from ) id 1mbJRU-00019V-QL; Fri, 15 Oct 2021 09:23:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210027.366714; Fri, 15 Oct 2021 09:23:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRU-00019O-NE; Fri, 15 Oct 2021 09:23:56 +0000 Received: by outflank-mailman (input) for mailman id 210027; Fri, 15 Oct 2021 09:23:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRT-000198-On for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRT-0000Io-OC for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJRT-0005oz-NF for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:23:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1HVriBhkKTbCywb+QK60uKjfW3VpnHaC9hDiMD0RmJc=; b=2I36lTkzR/upwjR3XR1FZhL7lh 9bXg/nNJATwPjHykz5z4Idw+YqWmmtJl42ApTbPeogPWy+8gbCEkmhsLqponFdxH/e6Uwo0o+psk0 i9/IJlpYca14oiLJOuCRrvEMv6lKmKOGiaFxyEd5B+YWCjya6BkMgUjxB8QppSawpDoo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion Message-Id: Date: Fri, 15 Oct 2021 09:23:55 +0000 commit b1ac7bb7f77b63838564e0c151f8aca80ab6a6b6 Author: Jan Beulich AuthorDate: Fri Oct 15 11:18:51 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:18:51 2021 +0200 x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion The xen-syms and xen.efi linking steps are serialized only when the intermediate note.o file is necessary. Otherwise both may run in parallel. This in turn means that the compiler / linker invocations to create efi/check.o / efi/check.efi may also happen twice in parallel. Obviously it's a bad idea to have multiple producers of the same output race with one another - every once in a while one may e.g. observe objdump: efi/check.efi: file format not recognized We don't need this EFI related checking to occur when producing the intermediate symbol and relocation table objects, and we have an easy way of suppressing it: Simply pass in "efi-y=", overriding the assignments done in the Makefile and thus forcing the tool chain checks to be bypassed. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD master commit: 24b0ce9a5da2e648cde818055a085bcbcf24ecb0 master date: 2021-10-11 10:58:17 +0200 --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index bbd11a4726..fd0acd566a 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -145,13 +145,13 @@ $(TARGET)-syms: prelink.o xen.lds $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort \ >$(@D)/.$(@F).0.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \ >$(@D)/.$(@F).1.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ @@ -211,14 +211,14 @@ $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:24:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:24:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210028.366718 (Exim 4.92) (envelope-from ) id 1mbJRe-0001CG-S7; Fri, 15 Oct 2021 09:24:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210028.366718; Fri, 15 Oct 2021 09:24:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRe-0001C8-P1; Fri, 15 Oct 2021 09:24:06 +0000 Received: by outflank-mailman (input) for mailman id 210028; Fri, 15 Oct 2021 09:24:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRd-0001Bx-Sh for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRd-0000JG-Rz for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJRd-0005qF-Qx for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+vv9y9WY2ia3DlunUmfDdlX6dLtcgruybYA0YkFY4DI=; b=yEJnBuVKZiYT9lsX/m8qvfIZW+ eAxvwwZpQEJNo/YwI/VNqMT2wUXKyp9WpnZ1bCPbn2hnD+Qf7Aqdc8RIko4pOv0Tsicftk6daRXzQ 9TTU72SDyaTQ+0Uo8u3YTEL5h9TjUy0KJAaIYJgU58DDE7vI5Rmj0r1pBPAMGHy4WijM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/HVM: fix xsm_op for 32-bit guests Message-Id: Date: Fri, 15 Oct 2021 09:24:05 +0000 commit 37ea2893e978ab311107f3e8cfdb8aaf8523f9fd Author: Jan Beulich AuthorDate: Fri Oct 15 11:19:11 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:19:11 2021 +0200 x86/HVM: fix xsm_op for 32-bit guests Like for PV, 32-bit guests need to invoke the compat handler, not the native one. Fixes: db984809d61b ("hvm: wire up domctl and xsm hypercalls") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: b6b672e8a925ff4b71a1a67bc7d213ef445af74f master date: 2021-10-11 10:58:44 +0200 --- xen/arch/x86/hvm/hypercall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index b6ccaf4457..f75285de51 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -137,7 +137,7 @@ static const hypercall_table_t hvm_hypercall_table[] = { HYPERCALL(event_channel_op), COMPAT_CALL(sched_op), COMPAT_CALL(set_timer_op), - HYPERCALL(xsm_op), + COMPAT_CALL(xsm_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), HYPERCALL(domctl), -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:24:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:24:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210029.366723 (Exim 4.92) (envelope-from ) id 1mbJRo-0001F4-Tu; Fri, 15 Oct 2021 09:24:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210029.366723; Fri, 15 Oct 2021 09:24:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRo-0001Ev-QW; Fri, 15 Oct 2021 09:24:16 +0000 Received: by outflank-mailman (input) for mailman id 210029; Fri, 15 Oct 2021 09:24:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRn-0001En-Vp for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRn-0000Jh-VE for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJRn-0005rJ-UE for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CbwAKuK3+QOkMf0MlotdpxkyyLOLhVYN63tVNm3HnZ8=; b=iGNU+jCrGndUIy+eD3D96pUiZr khRbrexcbYEkSbvMbzL7tTE4B9KrcSMySEpEoNn6mT2cMfiQOve00ySoAnrLSUm1bU9ul15UuUVlo Aj/Rrs2Ie5mD19bwHz4GjQXncs53ClHQT/4+3JJTlFX8fwalMexfjGEKA0cOdX3pCSKE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Message-Id: Date: Fri, 15 Oct 2021 09:24:15 +0000 commit 49b0aef3f916e325e10d7d90ea25ea0321ac0d48 Author: Jan Beulich AuthorDate: Fri Oct 15 11:19:41 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:19:41 2021 +0200 AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Hidden devices are associated with DomXEN but usable by the hardware domain. Hence they need flushing as well when all devices are to have flushes invoked. While there drop a redundant ATS-enabled check and constify the first parameter of the involved function. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant master commit: 036432e8b27e1ef21e0f0204ba9b0e3972a031c2 master date: 2021-10-12 11:54:34 +0200 --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index fc5377f5f2..e155b1168f 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -309,14 +309,11 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, spin_unlock_irqrestore(&iommu->lock, flags); } -static void amd_iommu_flush_all_iotlbs(struct domain *d, daddr_t daddr, +static void amd_iommu_flush_all_iotlbs(const struct domain *d, daddr_t daddr, unsigned int order) { struct pci_dev *pdev; - if ( !ats_enabled ) - return; - for_each_pdev( d, pdev ) { u8 devfn = pdev->devfn; @@ -347,7 +344,16 @@ static void _amd_iommu_flush_pages(struct domain *d, } if ( ats_enabled ) + { amd_iommu_flush_all_iotlbs(d, daddr, order); + + /* + * Hidden devices are associated with DomXEN but usable by the + * hardware domain. Hence they need dealing with here as well. + */ + if ( is_hardware_domain(d) ) + amd_iommu_flush_all_iotlbs(dom_xen, daddr, order); + } } void amd_iommu_flush_all_pages(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 09:24:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 09:24:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210030.366726 (Exim 4.92) (envelope-from ) id 1mbJRy-0001IL-W6; Fri, 15 Oct 2021 09:24:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210030.366726; Fri, 15 Oct 2021 09:24:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRy-0001ID-TK; Fri, 15 Oct 2021 09:24:26 +0000 Received: by outflank-mailman (input) for mailman id 210030; Fri, 15 Oct 2021 09:24:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRy-0001Hy-2p for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbJRy-0000Jr-2D for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbJRy-0005rv-18 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 09:24:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D+rhSiVtaCtCb+7hQwjB738lBgbPRcRW+ebUh3af2Y8=; b=hvSYbAFdn2Bb0jJFu2jpkqrsKH KW0TFtnYgIeB/On2nAzVVyvFVk+uCtMciEOpnZS5VYKzKSauA8orcIB9KlmY57fA9cyOAC44YaBLA 341NRm4Wt03GglgZ9TI2IKySbRdFIiNOpJTHPcp2McMVXgRFF1py3WczIbX/oaWeP5tQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] x86/PV32: fix physdev_op_compat handling Message-Id: Date: Fri, 15 Oct 2021 09:24:26 +0000 commit 99cbe2031a6bba62819c8e8c2acffe7fe3486cb9 Author: Jan Beulich AuthorDate: Fri Oct 15 11:20:04 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:20:04 2021 +0200 x86/PV32: fix physdev_op_compat handling The conversion of the original code failed to recognize that the 32-bit compat variant of this (sorry, two different meanings of "compat" here) needs to continue to invoke the compat handler, not the native one. Arrange for this by adding yet another #define. Affected functions (having existed prior to the introduction of the new hypercall) are PHYSDEVOP_set_iobitmap and PHYSDEVOP_apic_{read,write}. For all others the operand struct layout doesn't differ. Fixes: 1252e2823117 ("x86/pv: Export pv_hypercall_table[] rather than working around it in several ways") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Andrew Cooper master commit: 834cb8761051f7d87816785c0d99fe9bd5f0ce30 master date: 2021-10-12 11:55:42 +0200 --- xen/arch/x86/x86_64/compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c index 0e4c71f2aa..fcbc1cc0d7 100644 --- a/xen/arch/x86/x86_64/compat.c +++ b/xen/arch/x86/x86_64/compat.c @@ -12,6 +12,7 @@ EMIT_FILE; #define physdev_op_t physdev_op_compat_t #define do_physdev_op compat_physdev_op #define do_physdev_op_compat(x) compat_physdev_op_compat(_##x) +#define native compat #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 10:11:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 10:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210156.366906 (Exim 4.92) (envelope-from ) id 1mbKB7-0006wX-Rh; Fri, 15 Oct 2021 10:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210156.366906; Fri, 15 Oct 2021 10:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKB7-0006wN-OZ; Fri, 15 Oct 2021 10:11:05 +0000 Received: by outflank-mailman (input) for mailman id 210156; Fri, 15 Oct 2021 10:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKB6-0006w0-Ut for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKB6-0001H6-UD for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbKB6-0003Jt-St for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fQ0x61WqyHbi6VN3Tq3C8Fvnnw1oc17M46gpzM2P+sM=; b=KYw+qQB8qy5vsLej+59aHDdarU ymjGmJh60tF1W20A8kFtpSD6nzsYTDegE9HbD8vnHn9QSoprl2NRtu/k/fUV4jiigbLmAgS+HD3ni aw5a29rjdR8KHPvTlhJs8bfyJvpqzoulIfAPLblj/EOFuhgWy2eQvDsFAuX5F7vKPy/w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] stubdom: fix build with disabled pv-grub Message-Id: Date: Fri, 15 Oct 2021 10:11:04 +0000 commit 1223c4c0c439faa240f031b3dff2b1667547f830 Author: Juergen Gross AuthorDate: Fri Sep 10 07:55:16 2021 +0200 Commit: Ian Jackson CommitDate: Fri Oct 15 11:06:06 2021 +0100 stubdom: fix build with disabled pv-grub Today the build will fail if --disable-pv-grub as a parameter of configure, as the main Makefile will unconditionally try to build a 32-bit pv-grub stubdom. Fix that by introducing a pv-grub-if-enabled target in stubdom/Makefile taking care of this situation. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault Reviewed-by: Ian Jackson --- Makefile | 4 ++-- stubdom/Makefile | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 96d32cfd50..346d73a0dc 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ build-tools-oxenstored: build-tools-public-headers build-stubdom: mini-os-dir build-tools-public-headers $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub + XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub-if-enabled endif .PHONY: build-docs @@ -143,7 +143,7 @@ install-tools: install-tools-public-headers install-stubdom: mini-os-dir install-tools $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub + XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub-if-enabled endif .PHONY: tools/firmware/seabios-dir-force-update diff --git a/stubdom/Makefile b/stubdom/Makefile index 06aa69d8bc..ccfcf5b75f 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -531,6 +531,13 @@ vtpmmgr-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr vtpmmgr pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxenguest grub DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/grub/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a +.PHONY: pv-grub-if-enabled +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +pv-grub-if-enabled: pv-grub +else +pv-grub-if-enabled: +endif + .PHONY: xenstore-stubdom xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxenguest xenstore DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstore/xenstored.a @@ -560,6 +567,12 @@ install-grub: pv-grub $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +install-grub-if-enabled: install-grub +else +install-grub-if-enabled: +endif + install-c: c-stubdom install-caml: caml-stubdom -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 10:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 10:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210290.367078 (Exim 4.92) (envelope-from ) id 1mbKri-00033Y-KU; Fri, 15 Oct 2021 10:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210290.367078; Fri, 15 Oct 2021 10:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKri-00033Q-Hd; Fri, 15 Oct 2021 10:55:06 +0000 Received: by outflank-mailman (input) for mailman id 210290; Fri, 15 Oct 2021 10:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKrh-00033K-Jz for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKrh-00027z-II for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbKrh-0007Bj-Gf for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CAP1yC5G1/G2FbAmV95SNnFJDQyI15Qv0xZaVZbXo7M=; b=SNf6pCTSWWujGh+4tSWKqDx6aH iFBheitGnZcjt0zvBpew3f7YOUWmo0zPr+2UoP7BmSecVzkOu2eg+J+HyCzx+EHWUFzAPNI51o2NX ho2OnfXTWi6SaX6uembN1KqjnhI/W9vyDKQJcwnbjsWq00bP5ZdddJj3tV7uvbo4u6oQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] AMD/IOMMU: obtain IVHD type to use earlier Message-Id: Date: Fri, 15 Oct 2021 10:55:05 +0000 commit d8bd82327b0fffb16841862192e826fcb1344d8c Author: Jan Beulich AuthorDate: Fri Oct 15 12:44:20 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:44:20 2021 +0200 AMD/IOMMU: obtain IVHD type to use earlier Doing this in amd_iommu_prepare() is too late for it, in particular, to be used in amd_iommu_detect_one_acpi(), as a subsequent change will want to do. Moving it immediately ahead of amd_iommu_detect_acpi() is (luckily) pretty simple, (pretty importantly) without breaking amd_iommu_prepare()'s logic to prevent multiple processing. This involves moving table checksumming, as amd_iommu_get_supported_ivhd_type() -> get_supported_ivhd_type() will now be invoked before amd_iommu_detect_acpi() -> detect_iommu_acpi(). In the course of doing so stop open-coding acpi_tb_checksum(), seeing that we have other uses of this originally ACPI-private function elsewhere in the tree. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu_acpi.c | 24 +++++++++++------------- xen/drivers/passthrough/amd/iommu_init.c | 8 +------- xen/drivers/passthrough/amd/pci_amd_iommu.c | 8 ++++++++ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 53f4b61d0d..fdc601d498 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -22,6 +22,8 @@ #include +#include + #include "iommu.h" /* Some helper structures, particularly to deal with ranges. */ @@ -1167,20 +1169,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) static int __init detect_iommu_acpi(struct acpi_table_header *table) { const struct acpi_ivrs_header *ivrs_block; - unsigned long i; unsigned long length = sizeof(struct acpi_table_ivrs); - u8 checksum, *raw_table; - - /* validate checksum: sum of entire table == 0 */ - checksum = 0; - raw_table = (u8 *)table; - for ( i = 0; i < table->length; i++ ) - checksum += raw_table[i]; - if ( checksum ) - { - AMD_IOMMU_DEBUG("IVRS Error: Invalid Checksum %#x\n", checksum); - return -ENODEV; - } while ( table->length > (length + sizeof(*ivrs_block)) ) { @@ -1317,6 +1306,15 @@ get_supported_ivhd_type(struct acpi_table_header *table) { size_t length = sizeof(struct acpi_table_ivrs); const struct acpi_ivrs_header *ivrs_block, *blk = NULL; + uint8_t checksum; + + /* Validate checksum: Sum of entire table == 0. */ + checksum = acpi_tb_checksum(ACPI_CAST_PTR(uint8_t, table), table->length); + if ( checksum ) + { + AMD_IOMMU_DEBUG("IVRS Error: Invalid Checksum %#x\n", checksum); + return -ENODEV; + } while ( table->length > (length + sizeof(*ivrs_block)) ) { diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 312f335c1d..7eb5013756 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1398,15 +1398,9 @@ int __init amd_iommu_prepare(bool xt) goto error_out; /* Have we been here before? */ - if ( ivhd_type ) + if ( ivrs_bdf_entries ) return 0; - rc = amd_iommu_get_supported_ivhd_type(); - if ( rc < 0 ) - goto error_out; - BUG_ON(!rc); - ivhd_type = rc; - rc = amd_iommu_get_ivrs_dev_entries(); if ( !rc ) rc = -ENODEV; diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 86e4864e5d..de04ce90ad 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -179,9 +179,17 @@ static int __must_check amd_iommu_setup_domain_device( int __init acpi_ivrs_init(void) { + int rc; + if ( !iommu_enable && !iommu_intremap ) return 0; + rc = amd_iommu_get_supported_ivhd_type(); + if ( rc < 0 ) + return rc; + BUG_ON(!rc); + ivhd_type = rc; + if ( (amd_iommu_detect_acpi() !=0) || (iommu_found() == 0) ) { iommu_intremap = iommu_intremap_off; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 10:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 10:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210291.367082 (Exim 4.92) (envelope-from ) id 1mbKrs-000373-M2; Fri, 15 Oct 2021 10:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210291.367082; Fri, 15 Oct 2021 10:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKrs-00036v-JC; Fri, 15 Oct 2021 10:55:16 +0000 Received: by outflank-mailman (input) for mailman id 210291; Fri, 15 Oct 2021 10:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKrr-00036p-NJ for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKrr-000289-MR for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbKrr-0007CQ-Kw for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=owTfhEW877VGQOSASpim0evTqFslqJ03dfJIhwmXXoY=; b=ZcYnadP8KkFKjHYfkWT5oNe21F 52tzaAk9nLmrBDuv8c3CQYwKTmkGN1v1pfNvEtlwhLh9XTObwpsTXgDsGomzxTqKHRkm2CuHFbxVO tNt1pOp/CqdX344cioG/t23OFzg+G1/qCof4V8WEGtjsi/Td4MXvbMiFUSQ9GYbl+Y+4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] AMD/IOMMU: improve (extended) feature detection Message-Id: Date: Fri, 15 Oct 2021 10:55:15 +0000 commit 87caa1c3fb872c21297fee936f6247eb09cfe840 Author: Jan Beulich AuthorDate: Fri Oct 15 12:45:16 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:45:16 2021 +0200 AMD/IOMMU: improve (extended) feature detection First of all the documentation is very clear about ACPI table data superseding raw register data. Use raw register data only if EFRSup is clear in the ACPI tables (which may still go too far). Additionally if this flag is clear, the IVRS type 11H table is reserved and hence may not be recognized. Furthermore propagate IVRS type 10H data into the feature flags recorded, as the full extended features field is available in type 11H only. Note that this also makes necessary to stop the bad practice of us finding a type 11H IVHD entry, but still processing the type 10H one in detect_iommu_acpi()'s invocation of amd_iommu_detect_one_acpi(). Note also that the features.raw check in amd_iommu_prepare_one() needs replacing, now that the field can also be populated by different means. Key IOMMUv2 availability off of IVHD type not being 10H, and then move it a function layer up, so that it would be set only once all IOMMUs have been successfully prepared. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu.h | 1 + xen/drivers/passthrough/amd/iommu_acpi.c | 8 +++-- xen/drivers/passthrough/amd/iommu_detect.c | 48 ++++++++++++++++++++++++++---- xen/drivers/passthrough/amd/iommu_init.c | 7 +++-- xen/include/acpi/actbl2.h | 3 ++ 5 files changed, 56 insertions(+), 11 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index b0e6322906..3cec012103 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -306,6 +306,7 @@ extern struct hpet_sbdf { } init; } hpet_sbdf; +extern unsigned int amd_iommu_acpi_info; extern int amd_iommu_min_paging_mode; extern void *shared_intremap_table; diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index fdc601d498..acca2c685d 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -1062,7 +1062,8 @@ static unsigned int __initdata nr_ivmd; static inline bool_t is_ivhd_block(u8 type) { return (type == ACPI_IVRS_TYPE_HARDWARE || - type == ACPI_IVRS_TYPE_HARDWARE_11H); + ((amd_iommu_acpi_info & ACPI_IVRS_EFR_SUP) && + type == ACPI_IVRS_TYPE_HARDWARE_11H)); } static inline bool_t is_ivmd_block(u8 type) @@ -1176,7 +1177,7 @@ static int __init detect_iommu_acpi(struct acpi_table_header *table) ivrs_block = (struct acpi_ivrs_header *)((u8 *)table + length); if ( table->length < (length + ivrs_block->length) ) return -ENODEV; - if ( ivrs_block->type == ACPI_IVRS_TYPE_HARDWARE && + if ( ivrs_block->type == ivhd_type && amd_iommu_detect_one_acpi(to_ivhd_block(ivrs_block)) != 0 ) return -ENODEV; length += ivrs_block->length; @@ -1316,6 +1317,9 @@ get_supported_ivhd_type(struct acpi_table_header *table) return -ENODEV; } + amd_iommu_acpi_info = container_of(table, const struct acpi_table_ivrs, + header)->info; + while ( table->length > (length + sizeof(*ivrs_block)) ) { ivrs_block = (struct acpi_ivrs_header *)((u8 *)table + length); diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c index d05bc6a5bb..b017575325 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -60,14 +60,14 @@ void __init get_iommu_features(struct amd_iommu *iommu) const struct amd_iommu *first; ASSERT( iommu->mmio_base ); - if ( !iommu_has_cap(iommu, PCI_CAP_EFRSUP_SHIFT) ) + if ( !(amd_iommu_acpi_info & ACPI_IVRS_EFR_SUP) ) { - iommu->features.raw = 0; - return; - } + if ( !iommu_has_cap(iommu, PCI_CAP_EFRSUP_SHIFT) ) + return; - iommu->features.raw = - readq(iommu->mmio_base + IOMMU_EXT_FEATURE_MMIO_OFFSET); + iommu->features.raw = + readq(iommu->mmio_base + IOMMU_EXT_FEATURE_MMIO_OFFSET); + } /* Don't log the same set of features over and over. */ first = list_first_entry(&amd_iommu_head, struct amd_iommu, list); @@ -164,6 +164,42 @@ int __init amd_iommu_detect_one_acpi( iommu->cap_offset = ivhd_block->capability_offset; iommu->mmio_base_phys = ivhd_block->base_address; + if ( ivhd_type != ACPI_IVRS_TYPE_HARDWARE ) + iommu->features.raw = ivhd_block->efr_image; + else if ( amd_iommu_acpi_info & ACPI_IVRS_EFR_SUP ) + { + union { + uint32_t raw; + struct { + unsigned int xt_sup:1; + unsigned int nx_sup:1; + unsigned int gt_sup:1; + unsigned int glx_sup:2; + unsigned int ia_sup:1; + unsigned int ga_sup:1; + unsigned int he_sup:1; + unsigned int pas_max:5; + unsigned int pn_counters:4; + unsigned int pn_banks:6; + unsigned int msi_num_ppr:5; + unsigned int gats:2; + unsigned int hats:2; + }; + } attr = { .raw = ivhd_block->iommu_attr }; + + iommu->features.flds.xt_sup = attr.xt_sup; + iommu->features.flds.nx_sup = attr.nx_sup; + iommu->features.flds.gt_sup = attr.gt_sup; + iommu->features.flds.glx_sup = attr.glx_sup; + iommu->features.flds.ia_sup = attr.ia_sup; + iommu->features.flds.ga_sup = attr.ga_sup; + iommu->features.flds.pas_max = attr.pas_max; + iommu->features.flds.gats = attr.gats; + iommu->features.flds.hats = attr.hats; + } + else if ( list_empty(&amd_iommu_head) ) + AMD_IOMMU_DEBUG("EFRSup not set in ACPI table; will fall back to hardware\n"); + /* override IOMMU HT flags */ iommu->ht_flags = ivhd_block->header.flags; diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 7eb5013756..a4f152c150 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -29,6 +29,7 @@ static bool __initdata pci_init; static void do_amd_iommu_irq(void *data); static DECLARE_SOFTIRQ_TASKLET(amd_iommu_irq_tasklet, do_amd_iommu_irq, NULL); +unsigned int __read_mostly amd_iommu_acpi_info; unsigned int __read_mostly ivrs_bdf_entries; u8 __read_mostly ivhd_type; static struct radix_tree_root ivrs_maps; @@ -1375,9 +1376,6 @@ static int __init amd_iommu_prepare_one(struct amd_iommu *iommu) get_iommu_features(iommu); - if ( iommu->features.raw ) - iommuv2_enabled = true; - return 0; } @@ -1419,6 +1417,9 @@ int __init amd_iommu_prepare(bool xt) has_xt = false; } + if ( ivhd_type != ACPI_IVRS_TYPE_HARDWARE ) + iommuv2_enabled = true; + for_each_amd_iommu ( iommu ) { /* NB: There's no need to actually write these out right here. */ diff --git a/xen/include/acpi/actbl2.h b/xen/include/acpi/actbl2.h index 42beac4e26..4252c90a3f 100644 --- a/xen/include/acpi/actbl2.h +++ b/xen/include/acpi/actbl2.h @@ -716,6 +716,9 @@ struct acpi_table_ivrs { /* Values for Info field above */ +#define ACPI_IVRS_EFR_SUP 0x00000001 /* extended feature support */ +#define ACPI_IVRS_PREBOOT_DMA_REMAP 0x00000002 /* pre-boot DMA remapping in use */ +#define ACPI_IVRS_GVA_SIZE 0x000000E0 /* 3 bits, guest VA size */ #define ACPI_IVRS_PHYSICAL_SIZE 0x00007F00 /* 7 bits, physical address size */ #define ACPI_IVRS_VIRTUAL_SIZE 0x003F8000 /* 7 bits, virtual address size */ #define ACPI_IVRS_ATS_RESERVED 0x00400000 /* ATS address translation range reserved */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 10:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 10:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210292.367086 (Exim 4.92) (envelope-from ) id 1mbKs2-0003A1-Nj; Fri, 15 Oct 2021 10:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210292.367086; Fri, 15 Oct 2021 10:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKs2-00039t-Kk; Fri, 15 Oct 2021 10:55:26 +0000 Received: by outflank-mailman (input) for mailman id 210292; Fri, 15 Oct 2021 10:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKs1-00039j-Qz for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKs1-00028k-QF for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbKs1-0007DA-PJ for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=64yjqr8rLv+wHofuap3zvqP/1zfbBlX5CKJo11eqz/E=; b=Qs76g8m7GSeQFmCRTseuEJdmjZ lxmkMmAK/w7KNWltD33vRBtDlZEdVyk3g9cza2w/7X/kyKYT0GxeKdTB8Tz5peaRS1tBtZSZFsH0t Gj38i/DT1uegOSI/sJP3DJLaSkZDxAtXljWdCqsqtJXQa+nJNF+UsLqjYw+RRcJA/+Ss=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] AMD/IOMMU: check IVMD ranges against host implementation limits Message-Id: Date: Fri, 15 Oct 2021 10:55:25 +0000 commit 6f81a70baf839a94732a6b9dd2eaf11e1aa2eff2 Author: Jan Beulich AuthorDate: Fri Oct 15 12:46:05 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:46:05 2021 +0200 AMD/IOMMU: check IVMD ranges against host implementation limits When such ranges can't be represented as 1:1 mappings in page tables, reject them as presumably bogus. Note that when we detect features late (because of EFRSup being clear in the ACPI tables), it would be quite a bit of work to check for (and drop) out of range IVMD ranges, so IOMMU initialization gets failed in this case instead. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu.h | 3 ++- xen/drivers/passthrough/amd/iommu_acpi.c | 12 ++++++++++++ xen/drivers/passthrough/amd/iommu_detect.c | 7 +++++++ xen/drivers/passthrough/amd/iommu_init.c | 7 +++++++ xen/drivers/passthrough/amd/pci_amd_iommu.c | 1 + 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index 3cec012103..a915433f56 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -307,6 +307,7 @@ extern struct hpet_sbdf { } hpet_sbdf; extern unsigned int amd_iommu_acpi_info; +extern unsigned int amd_iommu_max_paging_mode; extern int amd_iommu_min_paging_mode; extern void *shared_intremap_table; @@ -360,7 +361,7 @@ static inline int amd_iommu_get_paging_mode(unsigned long max_frames) while ( max_frames > PTE_PER_TABLE_SIZE ) { max_frames = PTE_PER_TABLE_ALIGN(max_frames) >> PTE_PER_TABLE_SHIFT; - if ( ++level > 6 ) + if ( ++level > amd_iommu_max_paging_mode ) return -ENOMEM; } diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index acca2c685d..71c323fb33 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -378,6 +378,7 @@ static int __init parse_ivmd_device_iommu( static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) { unsigned long start_addr, mem_length, base, limit; + unsigned int addr_bits; bool iw = true, ir = true, exclusion = false; if ( ivmd_block->header.length < sizeof(*ivmd_block) ) @@ -394,6 +395,17 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) AMD_IOMMU_DEBUG("IVMD Block: type %#x phys %#lx len %#lx\n", ivmd_block->header.type, start_addr, mem_length); + addr_bits = min(MASK_EXTR(amd_iommu_acpi_info, ACPI_IVRS_PHYSICAL_SIZE), + MASK_EXTR(amd_iommu_acpi_info, ACPI_IVRS_VIRTUAL_SIZE)); + if ( amd_iommu_get_paging_mode(PFN_UP(start_addr + mem_length)) < 0 || + (addr_bits < BITS_PER_LONG && + ((start_addr + mem_length - 1) >> addr_bits)) ) + { + AMD_IOMMU_DEBUG("IVMD: [%lx,%lx) is not IOMMU addressable\n", + start_addr, start_addr + mem_length); + return 0; + } + if ( !e820_all_mapped(base, limit + PAGE_SIZE, E820_RESERVED) ) { paddr_t addr; diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c index b017575325..b8517ddafa 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -67,6 +67,9 @@ void __init get_iommu_features(struct amd_iommu *iommu) iommu->features.raw = readq(iommu->mmio_base + IOMMU_EXT_FEATURE_MMIO_OFFSET); + + if ( 4 + iommu->features.flds.hats < amd_iommu_max_paging_mode ) + amd_iommu_max_paging_mode = 4 + iommu->features.flds.hats; } /* Don't log the same set of features over and over. */ @@ -200,6 +203,10 @@ int __init amd_iommu_detect_one_acpi( else if ( list_empty(&amd_iommu_head) ) AMD_IOMMU_DEBUG("EFRSup not set in ACPI table; will fall back to hardware\n"); + if ( (amd_iommu_acpi_info & ACPI_IVRS_EFR_SUP) && + 4 + iommu->features.flds.hats < amd_iommu_max_paging_mode ) + amd_iommu_max_paging_mode = 4 + iommu->features.flds.hats; + /* override IOMMU HT flags */ iommu->ht_flags = ivhd_block->header.flags; diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index a4f152c150..6a8a2a711a 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1376,6 +1376,13 @@ static int __init amd_iommu_prepare_one(struct amd_iommu *iommu) get_iommu_features(iommu); + /* + * Late extended feature determination may cause previously mappable + * IVMD ranges to become unmappable. + */ + if ( amd_iommu_max_paging_mode < amd_iommu_min_paging_mode ) + return -ERANGE; + return 0; } diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index de04ce90ad..28f45e3fac 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -254,6 +254,7 @@ int amd_iommu_alloc_root(struct domain *d) return 0; } +unsigned int __read_mostly amd_iommu_max_paging_mode = 6; int __read_mostly amd_iommu_min_paging_mode = 1; static int amd_iommu_domain_init(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 10:55:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 10:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210293.367090 (Exim 4.92) (envelope-from ) id 1mbKsC-0003DJ-Qf; Fri, 15 Oct 2021 10:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210293.367090; Fri, 15 Oct 2021 10:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsC-0003DB-Nc; Fri, 15 Oct 2021 10:55:36 +0000 Received: by outflank-mailman (input) for mailman id 210293; Fri, 15 Oct 2021 10:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsB-0003Cx-UG for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsB-00028w-TV for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbKsB-0007Ds-SW for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Zq8B7Jg+CDuOZGjBGBj1I+rFQVCiAJE4NGC1L4CqhRA=; b=bPXX31cWQtb4Nq+xw/0t2KWZnt T4VkzZXm0GlyZ+6AI7oHHufj79x5VO5Y2J8PtyfAfuD6CAbJ18Z1eWdWTz73LTD0cpDwg9+5olHiL Qy18Qv6p+ZUq4RVR36tEQb0KkMxqH5VJf0rZI+sBL3E8K8tQ9k5g+IoepESAqLNGXs+0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] AMD/IOMMU: respect AtsDisabled device flag Message-Id: Date: Fri, 15 Oct 2021 10:55:35 +0000 commit 246a0cd415af377d26576dd9962ee78c0f83f1f9 Author: Jan Beulich AuthorDate: Fri Oct 15 12:46:42 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:46:42 2021 +0200 AMD/IOMMU: respect AtsDisabled device flag IVHD entries may specify that ATS is to be blocked for a device or range of devices. Honor firmware telling us so. While adding respective checks I noticed that the 2nd conditional in amd_iommu_setup_domain_device() failed to check the IOMMU's capability. Add the missing part of the condition there, as no good can come from enabling ATS on a device when the IOMMU is not capable of dealing with ATS requests. For actually using ACPI_IVHD_ATS_DISABLED, make its expansion no longer exhibit UB. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu.h | 1 + xen/drivers/passthrough/amd/iommu_acpi.c | 20 +++++++++++--------- xen/drivers/passthrough/amd/pci_amd_iommu.c | 8 +++++--- xen/include/acpi/actbl2.h | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index a915433f56..49c4bbd7e1 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -120,6 +120,7 @@ struct ivrs_mappings { uint16_t dte_requestor_id; bool valid:1; bool dte_allow_exclusion:1; + bool block_ats:1; /* ivhd device data settings */ uint8_t device_flags; diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 71c323fb33..4aed8a17fd 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -55,8 +55,8 @@ union acpi_ivhd_device { }; static void __init add_ivrs_mapping_entry( - uint16_t bdf, uint16_t alias_id, uint8_t flags, bool alloc_irt, - struct amd_iommu *iommu) + uint16_t bdf, uint16_t alias_id, uint8_t flags, unsigned int ext_flags, + bool alloc_irt, struct amd_iommu *iommu) { struct ivrs_mappings *ivrs_mappings = get_ivrs_mappings(iommu->seg); @@ -66,6 +66,7 @@ static void __init add_ivrs_mapping_entry( ivrs_mappings[bdf].dte_requestor_id = alias_id; /* override flags for range of devices */ + ivrs_mappings[bdf].block_ats = ext_flags & ACPI_IVHD_ATS_DISABLED; ivrs_mappings[bdf].device_flags = flags; /* Don't map an IOMMU by itself. */ @@ -499,7 +500,7 @@ static u16 __init parse_ivhd_device_select( return 0; } - add_ivrs_mapping_entry(bdf, bdf, select->header.data_setting, false, + add_ivrs_mapping_entry(bdf, bdf, select->header.data_setting, 0, false, iommu); return sizeof(*select); @@ -545,7 +546,7 @@ static u16 __init parse_ivhd_device_range( AMD_IOMMU_DEBUG(" Dev_Id Range: %#x -> %#x\n", first_bdf, last_bdf); for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) - add_ivrs_mapping_entry(bdf, bdf, range->start.header.data_setting, + add_ivrs_mapping_entry(bdf, bdf, range->start.header.data_setting, 0, false, iommu); return dev_length; @@ -580,7 +581,7 @@ static u16 __init parse_ivhd_device_alias( AMD_IOMMU_DEBUG(" Dev_Id Alias: %#x\n", alias_id); - add_ivrs_mapping_entry(bdf, alias_id, alias->header.data_setting, true, + add_ivrs_mapping_entry(bdf, alias_id, alias->header.data_setting, 0, true, iommu); return dev_length; @@ -636,7 +637,7 @@ static u16 __init parse_ivhd_device_alias_range( for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) add_ivrs_mapping_entry(bdf, alias_id, range->alias.header.data_setting, - true, iommu); + 0, true, iommu); return dev_length; } @@ -661,7 +662,8 @@ static u16 __init parse_ivhd_device_extended( return 0; } - add_ivrs_mapping_entry(bdf, bdf, ext->header.data_setting, false, iommu); + add_ivrs_mapping_entry(bdf, bdf, ext->header.data_setting, + ext->extended_data, false, iommu); return dev_length; } @@ -708,7 +710,7 @@ static u16 __init parse_ivhd_device_extended_range( for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) add_ivrs_mapping_entry(bdf, bdf, range->extended.header.data_setting, - false, iommu); + range->extended.extended_data, false, iommu); return dev_length; } @@ -800,7 +802,7 @@ static u16 __init parse_ivhd_device_special( AMD_IOMMU_DEBUG("IVHD Special: %pp variety %#x handle %#x\n", &PCI_SBDF2(seg, bdf), special->variety, special->handle); - add_ivrs_mapping_entry(bdf, bdf, special->header.data_setting, true, + add_ivrs_mapping_entry(bdf, bdf, special->header.data_setting, 0, true, iommu); switch ( special->variety ) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 28f45e3fac..45d16b731f 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -105,6 +105,7 @@ static int __must_check amd_iommu_setup_domain_device( int req_id, valid = 1, rc; u8 bus = pdev->bus; struct domain_iommu *hd = dom_iommu(domain); + const struct ivrs_mappings *ivrs_dev; if ( QUARANTINE_SKIP(domain) ) return 0; @@ -122,20 +123,18 @@ static int __must_check amd_iommu_setup_domain_device( req_id = get_dma_requestor_id(iommu->seg, PCI_BDF2(bus, devfn)); table = iommu->dev_table.buffer; dte = &table[req_id]; + ivrs_dev = &get_ivrs_mappings(iommu->seg)[req_id]; spin_lock_irqsave(&iommu->lock, flags); if ( !dte->v || !dte->tv ) { - const struct ivrs_mappings *ivrs_dev; - /* bind DTE to domain page-tables */ amd_iommu_set_root_page_table( dte, page_to_maddr(hd->arch.amd.root_table), domain->domain_id, hd->arch.amd.paging_mode, valid); /* Undo what amd_iommu_disable_domain_device() may have done. */ - ivrs_dev = &get_ivrs_mappings(iommu->seg)[req_id]; if ( dte->it_root ) { dte->int_ctl = IOMMU_DEV_TABLE_INT_CONTROL_TRANSLATED; @@ -146,6 +145,7 @@ static int __must_check amd_iommu_setup_domain_device( dte->sys_mgt = MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT); if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && + !ivrs_dev->block_ats && iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) ) dte->i = ats_enabled; @@ -166,6 +166,8 @@ static int __must_check amd_iommu_setup_domain_device( ASSERT(pcidevs_locked()); if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && + !ivrs_dev->block_ats && + iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) && !pci_ats_enabled(iommu->seg, bus, pdev->devfn) ) { if ( devfn == pdev->devfn ) diff --git a/xen/include/acpi/actbl2.h b/xen/include/acpi/actbl2.h index 4252c90a3f..2ad08ea467 100644 --- a/xen/include/acpi/actbl2.h +++ b/xen/include/acpi/actbl2.h @@ -851,7 +851,7 @@ struct acpi_ivrs_device8b { /* Values for extended_data above */ -#define ACPI_IVHD_ATS_DISABLED (1<<31) +#define ACPI_IVHD_ATS_DISABLED (1u << 31) /* Type 72: 8-byte device entry */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 10:55:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 10:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210294.367094 (Exim 4.92) (envelope-from ) id 1mbKsM-0003G0-SN; Fri, 15 Oct 2021 10:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210294.367094; Fri, 15 Oct 2021 10:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsM-0003Fs-PM; Fri, 15 Oct 2021 10:55:46 +0000 Received: by outflank-mailman (input) for mailman id 210294; Fri, 15 Oct 2021 10:55:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsM-0003Fl-1E for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsM-000297-0X for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbKsL-0007Ed-Vd for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=s848B2SvrncqH1jE1A9zXDVRleVnGWZkV5AQ241JFj4=; b=w9gTMEPmlDyG37L+p/D+7ZUq5T 2xT+wL0Kt5safWxDHssaCIzXTWOT6/cJqEze84hG88WBbUnHDFThlsKVPEHCZ8R8nC5binMnWOLNF c91NHKJ+gq+7jpwZmFJmm9YjzYmytjyYpbcATmqBlTXUZPvXG5ZKQ6Q/OLj9UIZdeUWQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] AMD/IOMMU: pull ATS disabling earlier Message-Id: Date: Fri, 15 Oct 2021 10:55:45 +0000 commit 388b5f1be68861b8abaf67e6a311b09b5a0816c5 Author: Jan Beulich AuthorDate: Fri Oct 15 12:47:18 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:47:18 2021 +0200 AMD/IOMMU: pull ATS disabling earlier Disabling should be done in the opposite order of enabling: ATS wants to be turned off before adjusting the DTE, just like it gets enabled only after the DTE was suitably prepared. Note that we want ATS to be disabled as soon as any of the DTEs involved in the handling of a device (including phantom devices) gets adjusted respectively. For this reason the "devfn == pdev->devfn" of the original conditional gets dropped. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 45d16b731f..63fa426273 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -313,6 +313,12 @@ static void amd_iommu_disable_domain_device(const struct domain *domain, if ( QUARANTINE_SKIP(domain) ) return; + ASSERT(pcidevs_locked()); + + if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && + pci_ats_enabled(iommu->seg, bus, pdev->devfn) ) + disable_ats_device(pdev); + BUG_ON ( iommu->dev_table.buffer == NULL ); req_id = get_dma_requestor_id(iommu->seg, PCI_BDF2(bus, devfn)); table = iommu->dev_table.buffer; @@ -348,13 +354,6 @@ static void amd_iommu_disable_domain_device(const struct domain *domain, } else spin_unlock_irqrestore(&iommu->lock, flags); - - ASSERT(pcidevs_locked()); - - if ( devfn == pdev->devfn && - pci_ats_device(iommu->seg, bus, devfn) && - pci_ats_enabled(iommu->seg, bus, devfn) ) - disable_ats_device(pdev); } static int reassign_device(struct domain *source, struct domain *target, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 10:55:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 10:55:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210295.367098 (Exim 4.92) (envelope-from ) id 1mbKsW-0003JB-Tp; Fri, 15 Oct 2021 10:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210295.367098; Fri, 15 Oct 2021 10:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsW-0003J4-Qt; Fri, 15 Oct 2021 10:55:56 +0000 Received: by outflank-mailman (input) for mailman id 210295; Fri, 15 Oct 2021 10:55:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsW-0003Iw-4q for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsW-00029I-3y for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbKsW-0007Fq-2x for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:55:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jKRiapRVzlUZenovdHbINz1z8VmtHao1ZP9l1Obw4eM=; b=x0gWICFWh4zl24X0FMDrmCanMx EAlYY5uue3N6J9a7GMgHSwBvp1GVKn7uXut1qOewrvYyTGAE6oVAGyAOI7PJpqlfftNkdTeQe7bbj s2CAx9IalRu2Q957J81Wk4Leuy1PGmFn6EYtVMPO2Igs23ebG+dIR1gsjeUOhF9A+Zt0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] AMD/IOMMU: expose errors and warnings unconditionally Message-Id: Date: Fri, 15 Oct 2021 10:55:56 +0000 commit 91f428ea7cf89ec3f3d4ed2ba0fe931561d85eac Author: Jan Beulich AuthorDate: Fri Oct 15 12:47:52 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:47:52 2021 +0200 AMD/IOMMU: expose errors and warnings unconditionally Making these dependent upon "iommu=debug" isn't really helpful in the field. Where touching respective code anyway also make use of %pp and %pd. Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu.h | 12 +++ xen/drivers/passthrough/amd/iommu_acpi.c | 111 +++++++++++++--------------- xen/drivers/passthrough/amd/iommu_cmd.c | 3 +- xen/drivers/passthrough/amd/iommu_detect.c | 6 +- xen/drivers/passthrough/amd/iommu_init.c | 14 ++-- xen/drivers/passthrough/amd/iommu_intr.c | 14 ++-- xen/drivers/passthrough/amd/iommu_map.c | 10 +-- xen/drivers/passthrough/amd/pci_amd_iommu.c | 22 +++--- 8 files changed, 93 insertions(+), 99 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index 49c4bbd7e1..93243424e8 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -203,6 +203,18 @@ struct acpi_ivrs_hardware; #define DMA_32BIT_MASK 0x00000000ffffffffULL +#define AMD_IOMMU_ERROR(fmt, args...) \ + printk(XENLOG_ERR "AMD-Vi: Error: " fmt, ## args) + +#define AMD_IOMMU_WARN(fmt, args...) \ + printk(XENLOG_WARNING "AMD-Vi: Warning: " fmt, ## args) + +#define AMD_IOMMU_VERBOSE(fmt, args...) \ + do { \ + if ( iommu_verbose ) \ + printk(XENLOG_INFO "AMD-Vi: " fmt, ## args); \ + } while ( false ) + #define AMD_IOMMU_DEBUG(fmt, args...) \ do \ { \ diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 4aed8a17fd..b07fa4c401 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -174,7 +174,7 @@ static int __init reserve_unity_map_for_device( if ( unity_map->addr + unity_map->length > base && base + length > unity_map->addr ) { - AMD_IOMMU_DEBUG("IVMD Error: overlap [%lx,%lx) vs [%lx,%lx)\n", + AMD_IOMMU_ERROR("IVMD: overlap [%lx,%lx) vs [%lx,%lx)\n", base, base + length, unity_map->addr, unity_map->addr + unity_map->length); return -EPERM; @@ -248,7 +248,7 @@ static int __init register_range_for_device( iommu = find_iommu_for_device(seg, bdf); if ( !iommu ) { - AMD_IOMMU_DEBUG("IVMD Error: No IOMMU for Dev_Id %#x!\n", bdf); + AMD_IOMMU_ERROR("IVMD: no IOMMU for Dev_Id %#x\n", bdf); return -ENODEV; } req = ivrs_mappings[bdf].dte_requestor_id; @@ -318,7 +318,7 @@ static int __init parse_ivmd_device_select( bdf = ivmd_block->header.device_id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVMD Error: Invalid Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVMD: invalid Dev_Id %#x\n", bdf); return -ENODEV; } @@ -335,16 +335,14 @@ static int __init parse_ivmd_device_range( first_bdf = ivmd_block->header.device_id; if ( first_bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVMD Error: " - "Invalid Range_First Dev_Id %#x\n", first_bdf); + AMD_IOMMU_ERROR("IVMD: invalid Range_First Dev_Id %#x\n", first_bdf); return -ENODEV; } last_bdf = ivmd_block->aux_data; if ( (last_bdf >= ivrs_bdf_entries) || (last_bdf <= first_bdf) ) { - AMD_IOMMU_DEBUG("IVMD Error: " - "Invalid Range_Last Dev_Id %#x\n", last_bdf); + AMD_IOMMU_ERROR("IVMD: invalid Range_Last Dev_Id %#x\n", last_bdf); return -ENODEV; } @@ -367,7 +365,7 @@ static int __init parse_ivmd_device_iommu( ivmd_block->aux_data); if ( !iommu ) { - AMD_IOMMU_DEBUG("IVMD Error: No IOMMU for Dev_Id %#x Cap %#x\n", + AMD_IOMMU_ERROR("IVMD: no IOMMU for Dev_Id %#x Cap %#x\n", ivmd_block->header.device_id, ivmd_block->aux_data); return -ENODEV; } @@ -384,7 +382,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) if ( ivmd_block->header.length < sizeof(*ivmd_block) ) { - AMD_IOMMU_DEBUG("IVMD Error: Invalid Block Length!\n"); + AMD_IOMMU_ERROR("IVMD: invalid block length\n"); return -ENODEV; } @@ -402,8 +400,8 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) (addr_bits < BITS_PER_LONG && ((start_addr + mem_length - 1) >> addr_bits)) ) { - AMD_IOMMU_DEBUG("IVMD: [%lx,%lx) is not IOMMU addressable\n", - start_addr, start_addr + mem_length); + AMD_IOMMU_WARN("IVMD: [%lx,%lx) is not IOMMU addressable\n", + start_addr, start_addr + mem_length); return 0; } @@ -411,8 +409,8 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) { paddr_t addr; - AMD_IOMMU_DEBUG("IVMD: [%lx,%lx) is not (entirely) in reserved memory\n", - base, limit + PAGE_SIZE); + AMD_IOMMU_WARN("IVMD: [%lx,%lx) is not (entirely) in reserved memory\n", + base, limit + PAGE_SIZE); for ( addr = base; addr <= limit; addr += PAGE_SIZE ) { @@ -423,7 +421,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) if ( e820_add_range(&e820, addr, addr + PAGE_SIZE, E820_RESERVED) ) continue; - AMD_IOMMU_DEBUG("IVMD Error: Page at %lx couldn't be reserved\n", + AMD_IOMMU_ERROR("IVMD: page at %lx couldn't be reserved\n", addr); return -EIO; } @@ -433,8 +431,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) RAM_TYPE_UNUSABLE)) ) continue; - AMD_IOMMU_DEBUG("IVMD Error: Page at %lx can't be converted\n", - addr); + AMD_IOMMU_ERROR("IVMD: page at %lx can't be converted\n", addr); return -EIO; } } @@ -448,7 +445,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) } else { - AMD_IOMMU_DEBUG("IVMD Error: Invalid Flag Field!\n"); + AMD_IOMMU_ERROR("IVMD: invalid flag field\n"); return -ENODEV; } @@ -471,7 +468,8 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) iw, ir, exclusion); default: - AMD_IOMMU_DEBUG("IVMD Error: Invalid Block Type!\n"); + AMD_IOMMU_ERROR("IVMD: unknown block type %#x\n", + ivmd_block->header.type); return -ENODEV; } } @@ -481,7 +479,7 @@ static u16 __init parse_ivhd_device_padding( { if ( header_length < (block_length + pad_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } @@ -496,7 +494,7 @@ static u16 __init parse_ivhd_device_select( bdf = select->header.id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry Dev_Id %#x\n", bdf); return 0; } @@ -515,14 +513,13 @@ static u16 __init parse_ivhd_device_range( dev_length = sizeof(*range); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } if ( range->end.header.type != ACPI_IVRS_TYPE_END ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: End_Type %#x\n", + AMD_IOMMU_ERROR("IVHD: invalid range: End_Type %#x\n", range->end.header.type); return 0; } @@ -530,16 +527,14 @@ static u16 __init parse_ivhd_device_range( first_bdf = range->start.header.id; if ( first_bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: First Dev_Id %#x\n", first_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: First Dev_Id %#x\n", first_bdf); return 0; } last_bdf = range->end.header.id; if ( (last_bdf >= ivrs_bdf_entries) || (last_bdf <= first_bdf) ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: Last Dev_Id %#x\n", last_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: Last Dev_Id %#x\n", last_bdf); return 0; } @@ -561,21 +556,21 @@ static u16 __init parse_ivhd_device_alias( dev_length = sizeof(*alias); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } bdf = alias->header.id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry Dev_Id %#x\n", bdf); return 0; } alias_id = alias->used_id; if ( alias_id >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Alias Dev_Id %#x\n", alias_id); + AMD_IOMMU_ERROR("IVHD: invalid Alias Dev_Id %#x\n", alias_id); return 0; } @@ -597,14 +592,13 @@ static u16 __init parse_ivhd_device_alias_range( dev_length = sizeof(*range); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } if ( range->end.header.type != ACPI_IVRS_TYPE_END ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: End_Type %#x\n", + AMD_IOMMU_ERROR("IVHD: invalid range: End_Type %#x\n", range->end.header.type); return 0; } @@ -612,16 +606,14 @@ static u16 __init parse_ivhd_device_alias_range( first_bdf = range->alias.header.id; if ( first_bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: First Dev_Id %#x\n", first_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: First Dev_Id %#x\n", first_bdf); return 0; } last_bdf = range->end.header.id; if ( last_bdf >= ivrs_bdf_entries || last_bdf <= first_bdf ) { - AMD_IOMMU_DEBUG( - "IVHD Error: Invalid Range: Last Dev_Id %#x\n", last_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: Last Dev_Id %#x\n", last_bdf); return 0; } @@ -651,14 +643,14 @@ static u16 __init parse_ivhd_device_extended( dev_length = sizeof(*ext); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } bdf = ext->header.id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry Dev_Id %#x\n", bdf); return 0; } @@ -677,14 +669,13 @@ static u16 __init parse_ivhd_device_extended_range( dev_length = sizeof(*range); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } if ( range->end.header.type != ACPI_IVRS_TYPE_END ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: End_Type %#x\n", + AMD_IOMMU_ERROR("IVHD: invalid range: End_Type %#x\n", range->end.header.type); return 0; } @@ -692,16 +683,14 @@ static u16 __init parse_ivhd_device_extended_range( first_bdf = range->extended.header.id; if ( first_bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: First Dev_Id %#x\n", first_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: First Dev_Id %#x\n", first_bdf); return 0; } last_bdf = range->end.header.id; if ( (last_bdf >= ivrs_bdf_entries) || (last_bdf <= first_bdf) ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: Last Dev_Id %#x\n", last_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: Last Dev_Id %#x\n", last_bdf); return 0; } @@ -789,14 +778,14 @@ static u16 __init parse_ivhd_device_special( dev_length = sizeof(*special); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } bdf = special->used_id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry Dev_Id %#x\n", bdf); return 0; } @@ -844,12 +833,12 @@ static u16 __init parse_ivhd_device_special( { if ( ioapic_sbdf[idx].bdf == bdf && ioapic_sbdf[idx].seg == seg ) - AMD_IOMMU_DEBUG("IVHD Warning: Duplicate IO-APIC %#x entries\n", + AMD_IOMMU_WARN("IVHD: duplicate IO-APIC %#x entries\n", special->handle); else { - printk(XENLOG_ERR "IVHD Error: Conflicting IO-APIC %#x entries\n", - special->handle); + AMD_IOMMU_ERROR("IVHD: conflicting IO-APIC %#x entries\n", + special->handle); if ( amd_iommu_perdev_intremap ) return 0; } @@ -944,7 +933,7 @@ static int __init parse_ivhd_block(const struct acpi_ivrs_hardware *ivhd_block) if ( ivhd_block->header.length < hdr_size ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Block Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid block length\n"); return -ENODEV; } @@ -953,7 +942,7 @@ static int __init parse_ivhd_block(const struct acpi_ivrs_hardware *ivhd_block) ivhd_block->capability_offset); if ( !iommu ) { - AMD_IOMMU_DEBUG("IVHD Error: No IOMMU for Dev_Id %#x Cap %#x\n", + AMD_IOMMU_ERROR("IVHD: no IOMMU for Dev_Id %#x Cap %#x\n", ivhd_block->header.device_id, ivhd_block->capability_offset); return -ENODEV; @@ -1016,7 +1005,8 @@ static int __init parse_ivhd_block(const struct acpi_ivrs_hardware *ivhd_block) ivhd_block->header.length, block_length, iommu); break; default: - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device Type!\n"); + AMD_IOMMU_WARN("IVHD: unknown device type %#x\n", + ivhd_device->header.type); dev_length = 0; break; } @@ -1113,8 +1103,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) if ( table->length < (length + ivrs_block->length) ) { - AMD_IOMMU_DEBUG("IVRS Error: " - "Table Length Exceeded: %#x -> %#lx\n", + AMD_IOMMU_ERROR("IVRS: table length exceeded: %#x -> %#lx\n", table->length, (length + ivrs_block->length)); return -ENODEV; @@ -1214,7 +1203,7 @@ static int __init get_last_bdf_ivhd( if ( ivhd_block->header.length < hdr_size ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Block Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid block length\n"); return -ENODEV; } @@ -1261,7 +1250,8 @@ static int __init get_last_bdf_ivhd( dev_length = sizeof(ivhd_device->special); break; default: - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device Type!\n"); + AMD_IOMMU_WARN("IVHD: unknown device type %#x\n", + ivhd_device->header.type); dev_length = 0; break; } @@ -1327,7 +1317,7 @@ get_supported_ivhd_type(struct acpi_table_header *table) checksum = acpi_tb_checksum(ACPI_CAST_PTR(uint8_t, table), table->length); if ( checksum ) { - AMD_IOMMU_DEBUG("IVRS Error: Invalid Checksum %#x\n", checksum); + AMD_IOMMU_ERROR("IVRS: invalid checksum %#x\n", checksum); return -ENODEV; } @@ -1340,8 +1330,7 @@ get_supported_ivhd_type(struct acpi_table_header *table) if ( table->length < (length + ivrs_block->length) ) { - AMD_IOMMU_DEBUG("IVRS Error: " - "Table Length Exceeded: %#x -> %#lx\n", + AMD_IOMMU_ERROR("IVRS: table length exceeded: %#x -> %#lx\n", table->length, (length + ivrs_block->length)); return -ENODEV; diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index a73830386b..809d93b89f 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -291,8 +291,7 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, if ( !iommu ) { - AMD_IOMMU_DEBUG("%s: Can't find iommu for %pp\n", - __func__, &pdev->sbdf); + AMD_IOMMU_WARN("can't find IOMMU for %pp\n", &pdev->sbdf); return; } diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c index b8517ddafa..f52e7b90e1 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -141,21 +141,21 @@ int __init amd_iommu_detect_one_acpi( if ( ivhd_block->header.length < sizeof(*ivhd_block) ) { - AMD_IOMMU_DEBUG("Invalid IVHD Block Length!\n"); + AMD_IOMMU_ERROR("invalid IVHD block length\n"); return -ENODEV; } if ( !ivhd_block->header.device_id || !ivhd_block->capability_offset || !ivhd_block->base_address) { - AMD_IOMMU_DEBUG("Invalid IVHD Block!\n"); + AMD_IOMMU_ERROR("invalid IVHD block\n"); return -ENODEV; } iommu = xzalloc(struct amd_iommu); if ( !iommu ) { - AMD_IOMMU_DEBUG("Error allocating amd_iommu\n"); + AMD_IOMMU_ERROR("cannot allocate amd_iommu\n"); return -ENOMEM; } diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 6a8a2a711a..559a734bda 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -386,8 +386,8 @@ static void iommu_reset_log(struct amd_iommu *iommu, if ( log_run ) { - AMD_IOMMU_DEBUG("Warning: Log Run bit %d is not cleared" - "before reset!\n", run_bit); + AMD_IOMMU_WARN("Log Run bit %d is not cleared before reset\n", + run_bit); return; } @@ -754,8 +754,8 @@ static bool_t __init set_iommu_interrupt_handler(struct amd_iommu *iommu) pcidevs_unlock(); if ( !iommu->msi.dev ) { - AMD_IOMMU_DEBUG("IOMMU: no pdev for %pp\n", - &PCI_SBDF2(iommu->seg, iommu->bdf)); + AMD_IOMMU_WARN("no pdev for %pp\n", + &PCI_SBDF2(iommu->seg, iommu->bdf)); return 0; } @@ -799,7 +799,7 @@ static bool_t __init set_iommu_interrupt_handler(struct amd_iommu *iommu) if ( ret ) { destroy_irq(irq); - AMD_IOMMU_DEBUG("can't request irq\n"); + AMD_IOMMU_ERROR("can't request irq\n"); return 0; } @@ -992,7 +992,7 @@ static void *__init allocate_buffer(unsigned long alloc_size, if ( buffer == NULL ) { - AMD_IOMMU_DEBUG("Error allocating %s\n", name); + AMD_IOMMU_ERROR("cannot allocate %s\n", name); return NULL; } @@ -1224,7 +1224,7 @@ static int __init alloc_ivrs_mappings(u16 seg) ivrs_mappings = xzalloc_array(struct ivrs_mappings, ivrs_bdf_entries + 1); if ( ivrs_mappings == NULL ) { - AMD_IOMMU_DEBUG("Error allocating IVRS Mappings table\n"); + AMD_IOMMU_ERROR("cannot allocate IVRS Mappings table\n"); return -ENOMEM; } IVRS_MAPPINGS_SEG(ivrs_mappings) = seg; diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index bf00370574..b166a04666 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -377,8 +377,8 @@ void amd_iommu_ioapic_update_ire( iommu = find_iommu_for_device(seg, bdf); if ( !iommu ) { - AMD_IOMMU_DEBUG("Fail to find iommu for ioapic device id =" - " %04x:%04x\n", seg, bdf); + AMD_IOMMU_WARN("failed to find IOMMU for IO-APIC @ %04x:%04x\n", + seg, bdf); __io_apic_write(apic, reg, value); return; } @@ -747,8 +747,8 @@ bool __init iov_supports_xt(void) if ( !find_iommu_for_device(ioapic_sbdf[idx].seg, ioapic_sbdf[idx].bdf) ) { - AMD_IOMMU_DEBUG("No IOMMU for IO-APIC %#x (ID %x)\n", - apic, IO_APIC_ID(apic)); + AMD_IOMMU_WARN("no IOMMU for IO-APIC %#x (ID %x)\n", + apic, IO_APIC_ID(apic)); return false; } } @@ -765,14 +765,12 @@ int __init amd_setup_hpet_msi(struct msi_desc *msi_desc) if ( hpet_sbdf.init == HPET_NONE ) { - AMD_IOMMU_DEBUG("Failed to setup HPET MSI remapping." - " Missing IVRS HPET info.\n"); + AMD_IOMMU_ERROR("failed to setup HPET MSI remapping: missing IVRS HPET info\n"); return -ENODEV; } if ( msi_desc->hpet_id != hpet_sbdf.id ) { - AMD_IOMMU_DEBUG("Failed to setup HPET MSI remapping." - " Wrong HPET.\n"); + AMD_IOMMU_ERROR("failed to setup HPET MSI remapping: wrong HPET\n"); return -ENODEV; } diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index 93501ee2c5..b0330157ea 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -222,7 +222,7 @@ static int iommu_pde_from_dfn(struct domain *d, unsigned long dfn, table = iommu_alloc_pgtable(d); if ( table == NULL ) { - AMD_IOMMU_DEBUG("Cannot allocate I/O page table\n"); + AMD_IOMMU_ERROR("cannot allocate I/O page table\n"); unmap_domain_page(next_table_vaddr); return 1; } @@ -252,7 +252,7 @@ static int iommu_pde_from_dfn(struct domain *d, unsigned long dfn, table = iommu_alloc_pgtable(d); if ( table == NULL ) { - AMD_IOMMU_DEBUG("Cannot allocate I/O page table\n"); + AMD_IOMMU_ERROR("cannot allocate I/O page table\n"); unmap_domain_page(next_table_vaddr); return 1; } @@ -301,7 +301,7 @@ int amd_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, if ( rc ) { spin_unlock(&hd->arch.mapping_lock); - AMD_IOMMU_DEBUG("Root table alloc failed, dfn = %"PRI_dfn"\n", + AMD_IOMMU_ERROR("root table alloc failed, dfn = %"PRI_dfn"\n", dfn_x(dfn)); domain_crash(d); return rc; @@ -310,7 +310,7 @@ int amd_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, if ( iommu_pde_from_dfn(d, dfn_x(dfn), &pt_mfn, true) || !pt_mfn ) { spin_unlock(&hd->arch.mapping_lock); - AMD_IOMMU_DEBUG("Invalid IO pagetable entry dfn = %"PRI_dfn"\n", + AMD_IOMMU_ERROR("invalid IO pagetable entry dfn = %"PRI_dfn"\n", dfn_x(dfn)); domain_crash(d); return -EFAULT; @@ -343,7 +343,7 @@ int amd_iommu_unmap_page(struct domain *d, dfn_t dfn, if ( iommu_pde_from_dfn(d, dfn_x(dfn), &pt_mfn, false) ) { spin_unlock(&hd->arch.mapping_lock); - AMD_IOMMU_DEBUG("Invalid IO pagetable entry dfn = %"PRI_dfn"\n", + AMD_IOMMU_ERROR("invalid IO pagetable entry dfn = %"PRI_dfn"\n", dfn_x(dfn)); domain_crash(d); return -EFAULT; diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 63fa426273..03228a9952 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -367,10 +367,8 @@ static int reassign_device(struct domain *source, struct domain *target, iommu = find_iommu_for_device(pdev->seg, bdf); if ( !iommu ) { - AMD_IOMMU_DEBUG("Fail to find iommu." - " %04x:%02x:%x02.%x cannot be assigned to dom%d\n", - pdev->seg, pdev->bus, PCI_SLOT(devfn), PCI_FUNC(devfn), - target->domain_id); + AMD_IOMMU_WARN("failed to find IOMMU: %pp cannot be assigned to %pd\n", + &pdev->sbdf, target); return -ENODEV; } @@ -484,8 +482,8 @@ static int amd_iommu_add_device(u8 devfn, struct pci_dev *pdev) return 0; } - AMD_IOMMU_DEBUG("No iommu for %pp; cannot be handed to d%d\n", - &pdev->sbdf, pdev->domain->domain_id); + AMD_IOMMU_WARN("no IOMMU for %pp; cannot be handed to %pd\n", + &pdev->sbdf, pdev->domain); return -ENODEV; } @@ -527,9 +525,8 @@ static int amd_iommu_add_device(u8 devfn, struct pci_dev *pdev) pdev->domain, ivrs_mappings[ivrs_mappings[bdf].dte_requestor_id].unity_map, 0) ) - AMD_IOMMU_DEBUG("%pd: unity mapping failed for %04x:%02x:%02x.%u\n", - pdev->domain, pdev->seg, pdev->bus, PCI_SLOT(devfn), - PCI_FUNC(devfn)); + AMD_IOMMU_WARN("%pd: unity mapping failed for %pp\n", + pdev->domain, &pdev->sbdf); return amd_iommu_setup_domain_device(pdev->domain, iommu, devfn, pdev); } @@ -547,7 +544,7 @@ static int amd_iommu_remove_device(u8 devfn, struct pci_dev *pdev) iommu = find_iommu_for_device(pdev->seg, bdf); if ( !iommu ) { - AMD_IOMMU_DEBUG("Fail to find iommu. %pp cannot be removed from %pd\n", + AMD_IOMMU_WARN("failed to find IOMMU: %pp cannot be removed from %pd\n", &pdev->sbdf, pdev->domain); return -ENODEV; } @@ -560,9 +557,8 @@ static int amd_iommu_remove_device(u8 devfn, struct pci_dev *pdev) if ( amd_iommu_reserve_domain_unity_unmap( pdev->domain, ivrs_mappings[ivrs_mappings[bdf].dte_requestor_id].unity_map) ) - AMD_IOMMU_DEBUG("%pd: unity unmapping failed for %04x:%02x:%02x.%u\n", - pdev->domain, pdev->seg, pdev->bus, PCI_SLOT(devfn), - PCI_FUNC(devfn)); + AMD_IOMMU_WARN("%pd: unity unmapping failed for %pp\n", + pdev->domain, &pdev->sbdf); if ( amd_iommu_perdev_intremap && ivrs_mappings[bdf].dte_requestor_id == bdf && -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 10:56:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 10:56:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210296.367102 (Exim 4.92) (envelope-from ) id 1mbKsh-0003MD-0g; Fri, 15 Oct 2021 10:56:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210296.367102; Fri, 15 Oct 2021 10:56:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsg-0003M5-Tt; Fri, 15 Oct 2021 10:56:06 +0000 Received: by outflank-mailman (input) for mailman id 210296; Fri, 15 Oct 2021 10:56:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsg-0003Lx-8u for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:56:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbKsg-00029d-8F for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:56:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbKsg-0007Gy-6g for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 10:56:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DosBOfSF1Tp7QI9onJtyAkgVwKBpWtLMOZcGcaHcJQg=; b=qsadqIAL+r7Hy1pl1G8cM0Iuag l9KDDytcQBNqim47CiDUWzs2q8qwsHQOMB6uUbckPzGZ/WPxS2YfBL+74YCJQ7UH/hDELtuEeCbSf 4LFKvWGNmk224jx2toRSpxdAtXddbPDL2lt0n64rdFHxy2PmL0Ga5TC+2f/LC1jTkVhg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: adjust some shadow_set_le() callers Message-Id: Date: Fri, 15 Oct 2021 10:56:06 +0000 commit 9f4f20b27b0733e9b792e3cd2ad996febdea46ba Author: Jan Beulich AuthorDate: Fri Oct 15 12:48:31 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:48:31 2021 +0200 x86/shadow: adjust some shadow_set_le() callers Coverity dislikes sh_page_fault() storing the return value into a local variable but then never using the value (and oddly enough spots this in the 2- and 3-level cases, but not in the 4-level one). Instead of adding yet another cast to void as replacement, take the opportunity and drop a bunch of such casts at the same time - not using function return values is a common thing to do. (It of course is an independent question whether ignoring errors like this is a good idea.) Coverity-ID: 1492856 Coverity-ID: 1492858 Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm/shadow/multi.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index a2fa7b87d8..b879677d77 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1416,7 +1416,7 @@ void sh_unhook_32b_mappings(struct domain *d, mfn_t sl2mfn, int user_only) shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) - (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); + shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); }); } @@ -1428,7 +1428,7 @@ void sh_unhook_pae_mappings(struct domain *d, mfn_t sl2mfn, int user_only) shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) - (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); + shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); }); } @@ -1439,7 +1439,7 @@ void sh_unhook_64b_mappings(struct domain *d, mfn_t sl4mfn, int user_only) shadow_l4e_t *sl4e; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( !user_only || (sl4e->l4 & _PAGE_USER) ) - (void) shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); + shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); }); } @@ -1969,7 +1969,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, /* Propagate the entry. */ l1e_propagate_from_guest(v, gl1e, gmfn, &sl1e, ft_prefetch, p2mt); - (void) shadow_set_l1e(d, ptr_sl1e + i, sl1e, p2mt, sl1mfn); + shadow_set_l1e(d, ptr_sl1e + i, sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( snpl1p != NULL ) @@ -2534,7 +2534,7 @@ static int sh_page_fault(struct vcpu *v, /* Calculate the shadow entry and write it */ l1e_propagate_from_guest(v, gw.l1e, gmfn, &sl1e, ft, p2mt); - r = shadow_set_l1e(d, ptr_sl1e, sl1e, p2mt, sl1mfn); + shadow_set_l1e(d, ptr_sl1e, sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_valid(gw.l1mfn) @@ -3014,8 +3014,7 @@ static bool sh_invlpg(struct vcpu *v, unsigned long linear) shadow_l1e_t *sl1; sl1 = sh_linear_l1_table(v) + shadow_l1_linear_offset(linear); /* Remove the shadow entry that maps this VA */ - (void) shadow_set_l1e(d, sl1, shadow_l1e_empty(), - p2m_invalid, sl1mfn); + shadow_set_l1e(d, sl1, shadow_l1e_empty(), p2m_invalid, sl1mfn); } paging_unlock(d); /* Need the invlpg, to pick up the disappeareance of the sl1e */ @@ -3608,7 +3607,8 @@ int sh_rm_write_access_from_l1(struct domain *d, mfn_t sl1mfn, && (mfn_x(shadow_l1e_get_mfn(*sl1e)) == mfn_x(readonly_mfn)) ) { shadow_l1e_t ro_sl1e = shadow_l1e_remove_flags(*sl1e, _PAGE_RW); - (void) shadow_set_l1e(d, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); + + shadow_set_l1e(d, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC /* Remember the last shadow that we shot a writeable mapping in */ if ( curr->domain == d ) @@ -3637,8 +3637,7 @@ int sh_rm_mappings_from_l1(struct domain *d, mfn_t sl1mfn, mfn_t target_mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l1e_get_mfn(*sl1e)) == mfn_x(target_mfn)) ) { - (void) shadow_set_l1e(d, sl1e, shadow_l1e_empty(), - p2m_invalid, sl1mfn); + shadow_set_l1e(d, sl1e, shadow_l1e_empty(), p2m_invalid, sl1mfn); if ( sh_check_page_has_no_refs(mfn_to_page(target_mfn)) ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -3656,20 +3655,20 @@ void sh_clear_shadow_entry(struct domain *d, void *ep, mfn_t smfn) switch ( mfn_to_page(smfn)->u.sh.type ) { case SH_type_l1_shadow: - (void) shadow_set_l1e(d, ep, shadow_l1e_empty(), p2m_invalid, smfn); + shadow_set_l1e(d, ep, shadow_l1e_empty(), p2m_invalid, smfn); break; case SH_type_l2_shadow: #if GUEST_PAGING_LEVELS >= 4 case SH_type_l2h_shadow: #endif - (void) shadow_set_l2e(d, ep, shadow_l2e_empty(), smfn); + shadow_set_l2e(d, ep, shadow_l2e_empty(), smfn); break; #if GUEST_PAGING_LEVELS >= 4 case SH_type_l3_shadow: - (void) shadow_set_l3e(d, ep, shadow_l3e_empty(), smfn); + shadow_set_l3e(d, ep, shadow_l3e_empty(), smfn); break; case SH_type_l4_shadow: - (void) shadow_set_l4e(d, ep, shadow_l4e_empty(), smfn); + shadow_set_l4e(d, ep, shadow_l4e_empty(), smfn); break; #endif default: BUG(); /* Called with the wrong kind of shadow. */ @@ -3689,7 +3688,7 @@ int sh_remove_l1_shadow(struct domain *d, mfn_t sl2mfn, mfn_t sl1mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l2e_get_mfn(*sl2e)) == mfn_x(sl1mfn)) ) { - (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); + shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); if ( mfn_to_page(sl1mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -3712,7 +3711,7 @@ int sh_remove_l2_shadow(struct domain *d, mfn_t sl3mfn, mfn_t sl2mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l3e_get_mfn(*sl3e)) == mfn_x(sl2mfn)) ) { - (void) shadow_set_l3e(d, sl3e, shadow_l3e_empty(), sl3mfn); + shadow_set_l3e(d, sl3e, shadow_l3e_empty(), sl3mfn); if ( mfn_to_page(sl2mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -3734,7 +3733,7 @@ int sh_remove_l3_shadow(struct domain *d, mfn_t sl4mfn, mfn_t sl3mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l4e_get_mfn(*sl4e)) == mfn_x(sl3mfn)) ) { - (void) shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); + shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); if ( mfn_to_page(sl3mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 11:22:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 11:22:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210330.367150 (Exim 4.92) (envelope-from ) id 1mbLHo-0008NC-29; Fri, 15 Oct 2021 11:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210330.367150; Fri, 15 Oct 2021 11:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLHn-0008N4-V9; Fri, 15 Oct 2021 11:22:03 +0000 Received: by outflank-mailman (input) for mailman id 210330; Fri, 15 Oct 2021 11:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLHm-0008My-KX for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLHm-0002dh-IN for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbLHm-00014H-GT for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I8IP9px7LYuDVB2N9a7Cfg2DhGDgXihWR5VvRJ+iPK8=; b=JaBFS2B3nVcG9YXMi7Uhl2NpYP QpXnOciDzX/UTLXz9DvKxjBHLmH03T4ep3IPf6lb61nZn0a50u0LJW8y+/misDcKXwA1VXf9yM0aI Y4UfuKmQGOmuUTWtTY2c5s8HwuSHzHwfMY5HZquFCYo/vuC9vETzzn/tVaYS+mnIfoJw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag" Message-Id: Date: Fri, 15 Oct 2021 11:22:02 +0000 commit 9516d01ac3015f522528ed6dafb3f584eaa7ed2c Author: Michal Orzel AuthorDate: Thu Oct 14 10:47:18 2021 +0200 Commit: Julien Grall CommitDate: Thu Oct 14 10:08:07 2021 +0000 Revert "xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag" This reverts commit 2075b410ee8087662c880213c3aca196fb7ade22. During the discussion [1] that took place after the patch was merged it was agreed that it should be reverted to avoid introducing a bad interface. Furthermore, the patch rejected usage of flag XEN_DOMCTL_CDF_vpci for x86 which is not true as it should be set for dom0 PVH. Due to XEN_DOMCTL_CDF_vpmu being introduced after XEN_DOMCTL_CDF_vpci, modify its bit position from 8 to 7. [1] https://marc.info/?t=163354215300039&r=1&w=2 Signed-off-by: Michal Orzel Acked-by: Jan Beulich Acked-by: Christian Lindig > Acked-by: Julien Grall Reviewed-by: Bertrand Marquis --- tools/ocaml/libs/xc/xenctrl.ml | 1 - tools/ocaml/libs/xc/xenctrl.mli | 1 - xen/arch/arm/domain.c | 3 +-- xen/arch/x86/domain.c | 6 ------ xen/common/domain.c | 3 +-- xen/include/public/domctl.h | 3 +-- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 86758babb3..addcf4cc59 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -69,7 +69,6 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU | CDF_NESTED_VIRT - | CDF_VPCI | CDF_VPMU type domain_create_iommu_opts = diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 0fdb0cc169..0a5ce529e9 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -62,7 +62,6 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU | CDF_NESTED_VIRT - | CDF_VPCI | CDF_VPMU type domain_create_iommu_opts = diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index ad21c9b950..eef0661beb 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -628,8 +628,7 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) { unsigned int max_vcpus; unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap); - unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpci | - XEN_DOMCTL_CDF_vpmu); + unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpmu); if ( (config->flags & ~flags_optional) != flags_required ) { diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 79c2aa4636..ef1812dc14 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -662,12 +662,6 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } - if ( config->flags & XEN_DOMCTL_CDF_vpci ) - { - dprintk(XENLOG_INFO, "vPCI cannot be enabled yet\n"); - return -EINVAL; - } - if ( config->vmtrace_size ) { unsigned int size = config->vmtrace_size; diff --git a/xen/common/domain.c b/xen/common/domain.c index 8543fb54fd..8b53c49d1e 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -486,8 +486,7 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) ~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu | - XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci | - XEN_DOMCTL_CDF_vpmu) ) + XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpmu) ) { dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags); return -EINVAL; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index a53cbd16f4..238384b5ae 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -70,9 +70,8 @@ struct xen_domctl_createdomain { #define XEN_DOMCTL_CDF_iommu (1U<<_XEN_DOMCTL_CDF_iommu) #define _XEN_DOMCTL_CDF_nested_virt 6 #define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt) -#define XEN_DOMCTL_CDF_vpci (1U << 7) /* Should we expose the vPMU to the guest? */ -#define XEN_DOMCTL_CDF_vpmu (1U << 8) +#define XEN_DOMCTL_CDF_vpmu (1U << 7) /* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ #define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpmu -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 11:22:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 11:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210331.367154 (Exim 4.92) (envelope-from ) id 1mbLHy-0008P1-43; Fri, 15 Oct 2021 11:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210331.367154; Fri, 15 Oct 2021 11:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLHy-0008Ot-0e; Fri, 15 Oct 2021 11:22:14 +0000 Received: by outflank-mailman (input) for mailman id 210331; Fri, 15 Oct 2021 11:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLHw-0008Ol-N9 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLHw-0002dv-MM for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbLHw-000152-L9 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=33WwxHK4HGAvusqUIT+Rp1Yx2hDeDCwUctRSme121ls=; b=1NyP8ymtlTnGkUfbE6hA+w+7Fp 5Uj6pyiIhhqqzs5Plu2kRaUuax48WiOU5UA3OdZ29+I13td3xZIJGed+r53HKivkiGnzZcrbmZ4FK qxU3IeyyT18XqQEJbSROjC7GWMCITAcPcw0fAVfu24sYsRgoA7zHO1UNPYW3bOyK1hG4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: fix dependencies in arch/x86/boot Message-Id: Date: Fri, 15 Oct 2021 11:22:12 +0000 commit 2f5f0a1b77161993c16c4cc243467d75e5b7633b Author: Anthony PERARD AuthorDate: Thu Oct 14 12:35:42 2021 +0200 Commit: Jan Beulich CommitDate: Thu Oct 14 12:35:42 2021 +0200 build: fix dependencies in arch/x86/boot Temporary fix the list of headers that cmdline.c and reloc.c depends on, until the next time the list is out of sync again. Also, add the linker script to the list. Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich --- xen/arch/x86/boot/Makefile | 9 ++++++--- xen/arch/x86/boot/build32.mk | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index 9b31bfcbfb..d2eb277d42 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -2,19 +2,22 @@ obj-bin-y += head.o DEFS_H_DEPS = defs.h $(BASEDIR)/include/xen/stdbool.h -CMDLINE_DEPS = $(DEFS_H_DEPS) video.h +CMDLINE_DEPS = $(DEFS_H_DEPS) video.h \ + $(BASEDIR)/include/xen/kconfig.h \ + $(BASEDIR)/include/generated/autoconf.h RELOC_DEPS = $(DEFS_H_DEPS) \ $(BASEDIR)/include/generated/autoconf.h \ $(BASEDIR)/include/xen/kconfig.h \ $(BASEDIR)/include/xen/multiboot.h \ $(BASEDIR)/include/xen/multiboot2.h \ + $(BASEDIR)/include/xen/const.h \ $(BASEDIR)/include/public/arch-x86/hvm/start_info.h head.o: cmdline.S reloc.S -cmdline.S: cmdline.c $(CMDLINE_DEPS) +cmdline.S: cmdline.c $(CMDLINE_DEPS) build32.lds $(MAKE) -f build32.mk $@ CMDLINE_DEPS="$(CMDLINE_DEPS)" -reloc.S: reloc.c $(RELOC_DEPS) +reloc.S: reloc.c $(RELOC_DEPS) build32.lds $(MAKE) -f build32.mk $@ RELOC_DEPS="$(RELOC_DEPS)" diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index 8cd5403926..e90680cd9f 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -27,7 +27,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) done $(OBJCOPY) -O binary -R .got.plt $< $@ -%.lnk: %.o +%.lnk: %.o build32.lds $(LD) $(LDFLAGS_DIRECT) -N -T build32.lds -o $@ $< %.o: %.c -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 11:22:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 11:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210332.367159 (Exim 4.92) (envelope-from ) id 1mbLI8-0008SE-5w; Fri, 15 Oct 2021 11:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210332.367159; Fri, 15 Oct 2021 11:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLI8-0008S5-2P; Fri, 15 Oct 2021 11:22:24 +0000 Received: by outflank-mailman (input) for mailman id 210332; Fri, 15 Oct 2021 11:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLI6-0008Rs-R9 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLI6-0002eM-QS for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbLI6-00017G-PV for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XtiamZioFrd3NGRiDW7FCi53l4SBzRVHMMQYZldxaNs=; b=WU8VNFQTk/HQqlOi+zuq3UxkAS tfyC/BsZnjp3Nwa7K5MijFs7xlsiXP62eJPHBgf8w8i37y52cHEx+NsoKfLpFez/v5yOTTTYvCP4I Qw+PJ+AvCMewcn5blUB1XnjvQyOa9FD0++tt8HtPFQVlB09Qgw9/SVr5i0doRKtpRoDg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Introduce gpaddr_bits field to struct xen_domctl_getdomaininfo Message-Id: Date: Fri, 15 Oct 2021 11:22:22 +0000 commit 1e6706b0d12300a81db91e07af8340720a8d67c6 Author: Oleksandr Tyshchenko AuthorDate: Thu Oct 14 14:40:44 2021 +0300 Commit: Ian Jackson CommitDate: Thu Oct 14 15:18:32 2021 +0100 xen/arm: Introduce gpaddr_bits field to struct xen_domctl_getdomaininfo We need to pass info about maximum supported guest physical address space size to the toolstack on Arm in order to properly calculate the base and size of the extended region (safe range) for the guest. The extended region is unused address space which could be safely used by domain for foreign/grant mappings on Arm. The extended region itself will be handled by the subsequent patch. Currently the same guest physical address space size is used for all guests (p2m_ipa_bits variable on Arm, the x86 equivalent is hap_paddr_bits). Add an explicit padding after "gpaddr_bits" field and also (while at it) after "domain" field. Also make sure that full structure is cleared in all cases by moving the clearing into getdomaininfo(). Currently it is only cleared by the sysctl caller (and only once). Please note, we do not need to bump XEN_DOMCTL_INTERFACE_VERSION as a bump has already occurred in this release cycle. But we do need to bump XEN_SYSCTL_INTERFACE_VERSION as the structure is re-used in a sysctl. Suggested-by: Julien Grall Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Ian Jackson [hypervisor parts] Reviewed-by: Jan Beulich --- tools/include/libxl.h | 8 ++++++++ tools/include/xenctrl.h | 1 + tools/libs/ctrl/xc_domain.c | 1 + tools/libs/light/libxl_domain.c | 1 + tools/libs/light/libxl_types.idl | 1 + xen/arch/arm/domctl.c | 2 ++ xen/arch/x86/domctl.c | 1 + xen/common/domctl.c | 4 ++-- xen/common/sysctl.c | 2 +- xen/include/public/domctl.h | 3 +++ xen/include/public/sysctl.h | 2 +- 11 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tools/include/libxl.h b/tools/include/libxl.h index ee73eb06f1..2e8679dbcb 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -885,6 +885,14 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_DOMINFO_NEVER_STOP 1 +/* + * LIBXL_HAVE_DOMINFO_GPADDR_BITS + * + * If this is defined, libxl_dominfo will contain an uint8 field called + * gpaddr_bits, containing the guest physical address space size. + */ +#define LIBXL_HAVE_DOMINFO_GPADDR_BITS 1 + /* * LIBXL_HAVE_QXL * diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index a3063998e0..07b96e6671 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -462,6 +462,7 @@ typedef struct xc_dominfo { unsigned int max_vcpu_id; xen_domain_handle_t handle; unsigned int cpupool; + uint8_t gpaddr_bits; struct xen_arch_domainconfig arch_config; } xc_dominfo_t; diff --git a/tools/libs/ctrl/xc_domain.c b/tools/libs/ctrl/xc_domain.c index 23322b70b5..b155d6afd2 100644 --- a/tools/libs/ctrl/xc_domain.c +++ b/tools/libs/ctrl/xc_domain.c @@ -396,6 +396,7 @@ int xc_domain_getinfo(xc_interface *xch, info->nr_online_vcpus = domctl.u.getdomaininfo.nr_online_vcpus; info->max_vcpu_id = domctl.u.getdomaininfo.max_vcpu_id; info->cpupool = domctl.u.getdomaininfo.cpupool; + info->gpaddr_bits = domctl.u.getdomaininfo.gpaddr_bits; info->arch_config = domctl.u.getdomaininfo.arch_config; memcpy(info->handle, domctl.u.getdomaininfo.handle, diff --git a/tools/libs/light/libxl_domain.c b/tools/libs/light/libxl_domain.c index 51a6127552..544a9bf59d 100644 --- a/tools/libs/light/libxl_domain.c +++ b/tools/libs/light/libxl_domain.c @@ -306,6 +306,7 @@ void libxl__xcinfo2xlinfo(libxl_ctx *ctx, xlinfo->vcpu_max_id = xcinfo->max_vcpu_id; xlinfo->vcpu_online = xcinfo->nr_online_vcpus; xlinfo->cpupool = xcinfo->cpupool; + xlinfo->gpaddr_bits = xcinfo->gpaddr_bits; xlinfo->domain_type = (xcinfo->flags & XEN_DOMINF_hvm_guest) ? LIBXL_DOMAIN_TYPE_HVM : LIBXL_DOMAIN_TYPE_PV; } diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index b96fb5c47e..608d55a456 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -357,6 +357,7 @@ libxl_dominfo = Struct("dominfo",[ ("vcpu_max_id", uint32), ("vcpu_online", uint32), ("cpupool", uint32), + ("gpaddr_bits", uint8), ("domain_type", libxl_domain_type), ], dir=DIR_OUT) diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index b7d27f37df..6245af6d0b 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -20,6 +20,8 @@ void arch_get_domain_info(const struct domain *d, { /* All ARM domains use hardware assisted paging. */ info->flags |= XEN_DOMINF_hap; + + info->gpaddr_bits = p2m_ipa_bits; } static int handle_vuart_init(struct domain *d, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 26a76d2be9..7d102e0647 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -151,6 +151,7 @@ void arch_get_domain_info(const struct domain *d, info->flags |= XEN_DOMINF_hap; info->arch_config.emulation_flags = d->arch.emulation_flags; + info->gpaddr_bits = hap_paddr_bits; } static int do_vmtrace_op(struct domain *d, struct xen_domctl_vmtrace_op *op, diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 12d6144d28..271862ae58 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -69,10 +69,10 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) int flags = XEN_DOMINF_blocked; struct vcpu_runstate_info runstate; + memset(info, 0, sizeof(*info)); + info->domain = d->domain_id; info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; - info->nr_online_vcpus = 0; - info->ssidref = 0; /* * - domain is marked as blocked only if all its vcpus are blocked diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 6e7189bb3c..f2dab722b6 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info = { 0 }; + struct xen_domctl_getdomaininfo info; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 238384b5ae..51017b47bc 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -107,6 +107,7 @@ struct xen_domctl_createdomain { struct xen_domctl_getdomaininfo { /* OUT variables. */ domid_t domain; /* Also echoed in domctl.domain */ + uint16_t pad1; /* Domain is scheduled to die. */ #define _XEN_DOMINF_dying 0 #define XEN_DOMINF_dying (1U<<_XEN_DOMINF_dying) @@ -151,6 +152,8 @@ struct xen_domctl_getdomaininfo { uint32_t ssidref; xen_domain_handle_t handle; uint32_t cpupool; + uint8_t gpaddr_bits; /* Guest physical address space size. */ + uint8_t pad2[7]; struct xen_arch_domainconfig arch_config; }; typedef struct xen_domctl_getdomaininfo xen_domctl_getdomaininfo_t; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index fead0e5b53..3e53681b43 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -35,7 +35,7 @@ #include "domctl.h" #include "physdev.h" -#define XEN_SYSCTL_INTERFACE_VERSION 0x00000013 +#define XEN_SYSCTL_INTERFACE_VERSION 0x00000014 /* * Read console content from Xen buffer ring. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 11:22:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 11:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210333.367162 (Exim 4.92) (envelope-from ) id 1mbLII-0008VT-8l; Fri, 15 Oct 2021 11:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210333.367162; Fri, 15 Oct 2021 11:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLII-0008VK-5o; Fri, 15 Oct 2021 11:22:34 +0000 Received: by outflank-mailman (input) for mailman id 210333; Fri, 15 Oct 2021 11:22:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLIG-0008V8-V2 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLIG-0002eb-UH for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbLIG-00018K-St for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gyB87GVL+IFcW3fQqxPuGJ3EF7RI4s/nJjLPK0y9vkU=; b=K5jVRHcadtbYDtlE+zgv+mGeRz rg1O1IaRlgwmcC0q2+j7YYacRKr+rcMIYdKeRJLXmwtOrk1m7NpanUKMr1NLdHOpHzTwY+rhxylk9 5hwCAeE4fw4ulNLOkAqNPF4Mch303k8PZt/7DQ8xdSmyVKJLk+GK8OefSHhBjqWJRbuU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl/arm: Add handling of extended regions for DomU Message-Id: Date: Fri, 15 Oct 2021 11:22:32 +0000 commit 57f87857dc2de452a796d6bad4f476510efd2aba Author: Oleksandr Tyshchenko AuthorDate: Thu Oct 14 14:40:45 2021 +0300 Commit: Ian Jackson CommitDate: Thu Oct 14 15:19:17 2021 +0100 libxl/arm: Add handling of extended regions for DomU The extended region (safe range) is a region of guest physical address space which is unused and could be safely used to create grant/foreign mappings instead of wasting real RAM pages from the domain memory for establishing these mappings. The extended regions are chosen at the domain creation time and advertised to it via "reg" property under hypervisor node in the guest device-tree. As region 0 is reserved for grant table space (always present), the indexes for extended regions are 1...N. If extended regions could not be allocated for some reason, Xen doesn't fail and behaves as usual, so only inserts region 0. Please note the following limitations: - The extended region feature is only supported for 64-bit domain currently. - The ACPI case is not covered. *** The algorithm to choose extended regions for non-direct mapped DomU is simpler in comparison with the algorithm for direct mapped Dom0. We usually have a lot of unused space above 4GB, and might have some unused space below 4GB (depends on guest memory size). Try to allocate separate 2MB-aligned extended regions from the first (below 4GB) and second (above 4GB) RAM banks taking into the account the maximum supported guest physical address space size and the amount of memory assigned to the guest. The minimum size of extended region the same as for Dom0 (64MB). Please note, we introduce fdt_property_reg_placeholder helper which purpose is to create N ranges that are zeroed. The interesting fact is that libfdt already has fdt_property_placeholder(). But this was introduced only in 2017, so there is a risk that some distros may not ship the last libfdt version. This is why we implement our own light variant for now. Suggested-by: Julien Grall Signed-off-by: Oleksandr Tyshchenko Reviewed-by: Julien Grall Acked-by: Ian Jackson --- tools/libs/light/libxl_arm.c | 106 ++++++++++++++++++++++++++++++++++++++++-- xen/include/public/arch-arm.h | 5 ++ 2 files changed, 106 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index e3140a6e00..a7801558cf 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -269,6 +269,21 @@ static int fdt_property_regs(libxl__gc *gc, void *fdt, return fdt_property(fdt, "reg", regs, sizeof(regs)); } +static int fdt_property_reg_placeholder(libxl__gc *gc, void *fdt, + unsigned int addr_cells, + unsigned int size_cells, + unsigned int num_regs) +{ + uint32_t regs[num_regs * (addr_cells + size_cells)]; + be32 *cells = ®s[0]; + unsigned int i; + + for (i = 0; i < num_regs; i++) + set_range(&cells, addr_cells, size_cells, 0, 0); + + return fdt_property(fdt, "reg", regs, sizeof(regs)); +} + static int make_root_properties(libxl__gc *gc, const libxl_version_info *vers, void *fdt) @@ -615,9 +630,13 @@ static int make_hypervisor_node(libxl__gc *gc, void *fdt, "xen,xen"); if (res) return res; - /* reg 0 is grant table space */ - res = fdt_property_regs(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, - 1,GUEST_GNTTAB_BASE, GUEST_GNTTAB_SIZE); + /* + * reg 0 is a placeholder for grant table space, reg 1...N are + * the placeholders for extended regions. + */ + res = fdt_property_reg_placeholder(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, + GUEST_ROOT_SIZE_CELLS, + GUEST_RAM_BANKS + 1); if (res) return res; /* @@ -1069,20 +1088,93 @@ static void finalise_one_node(libxl__gc *gc, void *fdt, const char *uname, } } +#define ALIGN_UP_TO_2MB(x) (((x) + MB(2) - 1) & (~(MB(2) - 1))) + +#define EXT_REGION_MIN_SIZE xen_mk_ullong(0x0004000000) /* 64MB */ + +static int finalize_hypervisor_node(libxl__gc *gc, struct xc_dom_image *dom) +{ + void *fdt = dom->devicetree_blob; + uint64_t region_size[GUEST_RAM_BANKS] = {0}, region_base[GUEST_RAM_BANKS], + bankend[GUEST_RAM_BANKS]; + uint32_t regs[(GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS) * + (GUEST_RAM_BANKS + 1)]; + be32 *cells = ®s[0]; + const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; + const uint64_t banksize[] = GUEST_RAM_BANK_SIZES; + unsigned int i, len, nr_regions = 0; + libxl_dominfo info; + int offset, rc; + + offset = fdt_path_offset(fdt, "/hypervisor"); + if (offset < 0) + return offset; + + rc = libxl_domain_info(CTX, &info, dom->guest_domid); + if (rc) + return rc; + + if (info.gpaddr_bits > 64) + return ERROR_INVAL; + + /* + * Try to allocate separate 2MB-aligned extended regions from the first + * and second RAM banks taking into the account the maximum supported + * guest physical address space size and the amount of memory assigned + * to the guest. + */ + for (i = 0; i < GUEST_RAM_BANKS; i++) { + region_base[i] = bankbase[i] + + ALIGN_UP_TO_2MB((uint64_t)dom->rambank_size[i] << XC_PAGE_SHIFT); + + bankend[i] = ~0ULL >> (64 - info.gpaddr_bits); + bankend[i] = min(bankend[i], bankbase[i] + banksize[i] - 1); + if (bankend[i] > region_base[i]) + region_size[i] = bankend[i] - region_base[i] + 1; + } + + /* + * The region 0 for grant table space must be always present. If we managed + * to allocate the extended regions then insert them as regions 1...N. + */ + set_range(&cells, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, + GUEST_GNTTAB_BASE, GUEST_GNTTAB_SIZE); + + for (i = 0; i < GUEST_RAM_BANKS; i++) { + if (region_size[i] < EXT_REGION_MIN_SIZE) + continue; + + LOG(DEBUG, "Extended region %u: %#"PRIx64"->%#"PRIx64"", + nr_regions, region_base[i], region_base[i] + region_size[i]); + + set_range(&cells, GUEST_ROOT_ADDRESS_CELLS, GUEST_ROOT_SIZE_CELLS, + region_base[i], region_size[i]); + nr_regions++; + } + + if (!nr_regions) + LOG(WARN, "The extended regions cannot be allocated, not enough space"); + + len = sizeof(regs[0]) * (GUEST_ROOT_ADDRESS_CELLS + GUEST_ROOT_SIZE_CELLS) * + (nr_regions + 1); + + return fdt_setprop(fdt, offset, "reg", regs, len); +} + int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, uint32_t domid, libxl_domain_config *d_config, struct xc_dom_image *dom) { void *fdt = dom->devicetree_blob; - int i; + int i, res; const uint64_t bankbase[] = GUEST_RAM_BANK_BASES; const struct xc_dom_seg *ramdisk = dom->modules[0].blob ? &dom->modules[0].seg : NULL; if (ramdisk) { - int chosen, res; + int chosen; uint64_t val; /* Neither the fdt_path_offset() nor either of the @@ -1109,6 +1201,10 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, } + res = finalize_hypervisor_node(gc, dom); + if (res) + return res; + for (i = 0; i < GUEST_RAM_BANKS; i++) { const uint64_t size = (uint64_t)dom->rambank_size[i] << XC_PAGE_SHIFT; diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index d46c61fca9..96ead3de07 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -438,6 +438,11 @@ typedef uint64_t xen_callback_t; #define GUEST_RAM_BANKS 2 +/* + * The way to find the extended regions (to be exposed to the guest as unused + * address space) relies on the fact that the regions reserved for the RAM + * below are big enough to also accommodate such regions. + */ #define GUEST_RAM0_BASE xen_mk_ullong(0x40000000) /* 3GB of low RAM @ 1GB */ #define GUEST_RAM0_SIZE xen_mk_ullong(0xc0000000) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 11:22:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 11:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210334.367166 (Exim 4.92) (envelope-from ) id 1mbLIS-00006V-AH; Fri, 15 Oct 2021 11:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210334.367166; Fri, 15 Oct 2021 11:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLIS-00006N-7H; Fri, 15 Oct 2021 11:22:44 +0000 Received: by outflank-mailman (input) for mailman id 210334; Fri, 15 Oct 2021 11:22:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLIR-00006C-21 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLIR-0002em-1I for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbLIR-00018y-0M for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:22:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TImCTCOD9XOsn4B0RpDdqvRrWvGiIv9jj6gQ0nsGISE=; b=rJ/xBWWlBT6kcUfmR4X0whvyw+ UQrm4JgTilSKaPMQM/fS8WxWS4O6vHqfafw2KKbw25CdXS5kDuyp2hGvyqtF2pliGJjJsRtLfGxqx Ho0gSWw33Ic6La/kQO9LhR0Ekhwq64IRDq0AYaaXvBOb7YGKg1FkfuutTeOEHrihGdPQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: optee: Allocate anonymous domheap pages Message-Id: Date: Fri, 15 Oct 2021 11:22:43 +0000 commit b75838ad6c4f42c93efee83fc2508c78641e1b57 Author: Oleksandr Tyshchenko AuthorDate: Mon Sep 6 16:42:21 2021 +0300 Commit: Julien Grall CommitDate: Thu Oct 14 16:12:47 2021 +0000 xen/arm: optee: Allocate anonymous domheap pages Allocate anonymous domheap pages as there is no strict need to account them to a particular domain. Since XSA-383 "xen/arm: Restrict the amount of memory that dom0less domU and dom0 can allocate" the dom0 cannot allocate memory outside of the pre-allocated region. This means if we try to allocate non-anonymous page to be accounted to dom0 we will get an over-allocation issue when assigning that page to the domain. The anonymous page, in turn, is not assigned to any domain. CC: Julien Grall Signed-off-by: Oleksandr Tyshchenko Acked-by: Volodymyr Babchuk Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/tee/optee.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index 131d2f9a8a..f49b3c0226 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -410,7 +410,7 @@ static struct shm_rpc *allocate_and_pin_shm_rpc(struct optee_domain *ctx, if ( !shm_rpc ) return ERR_PTR(-ENOMEM); - shm_rpc->xen_arg_pg = alloc_domheap_page(current->domain, 0); + shm_rpc->xen_arg_pg = alloc_domheap_page(NULL, 0); if ( !shm_rpc->xen_arg_pg ) { xfree(shm_rpc); @@ -774,7 +774,7 @@ static int translate_noncontig(struct optee_domain *ctx, * - There is a plan to implement preemption in the code below, which * will allow use to increase default MAX_SHM_BUFFER_PG value. */ - xen_pgs = alloc_domheap_pages(current->domain, order, 0); + xen_pgs = alloc_domheap_pages(NULL, order, 0); if ( !xen_pgs ) return -ENOMEM; @@ -942,7 +942,7 @@ static bool copy_std_request(struct cpu_user_regs *regs, BUILD_BUG_ON(OPTEE_MSG_NONCONTIG_PAGE_SIZE > PAGE_SIZE); - call->xen_arg_pg = alloc_domheap_page(current->domain, 0); + call->xen_arg_pg = alloc_domheap_page(NULL, 0); if ( !call->xen_arg_pg ) { set_user_reg(regs, 0, OPTEE_SMC_RETURN_ENOMEM); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 11:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 11:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.210355.367195 (Exim 4.92) (envelope-from ) id 1mbLd7-00039m-Gr; Fri, 15 Oct 2021 11:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 210355.367195; Fri, 15 Oct 2021 11:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLd7-00039e-Dt; Fri, 15 Oct 2021 11:44:05 +0000 Received: by outflank-mailman (input) for mailman id 210355; Fri, 15 Oct 2021 11:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLd6-00039Y-SR for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbLd6-000319-Ql for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbLd6-0003YK-Pk for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 11:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ai/M4v4qfxAP99Hh1xHCJZR+sEvOuJQK5Kze140aw/w=; b=YI1xwgrqFfJORoELmeFIY7zfI1 PI6UAHQ9uMks20xGmz9EugLF6yFYAPn0gKfO+L86xCjBjFvjSP3lJ/87WErMWkKRgdc1UuGT/DWiI FE+6h4GCbQvIKJuX/F98i9NhO7GCpUd/Wd7XCdVrH7JRG/e/SyNpu07pttzOtwInoxJs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: adjust 2-level case of SHADOW_FOREACH_L2E() Message-Id: Date: Fri, 15 Oct 2021 11:44:04 +0000 commit f791392f82ffe39cc1ea4c4db1d877223754a04a Author: Jan Beulich AuthorDate: Fri Oct 15 13:43:35 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 13:43:35 2021 +0200 x86/shadow: adjust 2-level case of SHADOW_FOREACH_L2E() Coverity apparently takes issue with the assignment inside an if(), but then only in two of the cases (sh_destroy_l2_shadow() and sh_unhook_32b_mappings()). As it's pretty simple to break out of the outer loop without the need for a local helper variable, adjust the code that way. While there, with the other "unused value" reports also in mind, further drop a dead assignment from SHADOW_FOREACH_L1E(). Coverity-ID: 1492857 Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm/shadow/multi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b879677d77..a3ce4b6259 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -794,8 +794,7 @@ do { \ ({ (__done = _done); }), _code); \ _sl1mfn = sh_next_page(_sl1mfn); \ if ( !__done ) \ - _SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, \ - ({ (__done = _done); }), _code); \ + _SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code); \ } while (0) #else /* Everything else; l1 shadows are only one page */ #define SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code) \ @@ -808,10 +807,10 @@ do { \ /* 32-bit l2 on PAE/64: four pages, touch every second entry */ #define SHADOW_FOREACH_L2E(_sl2mfn, _sl2e, _gl2p, _done, _dom, _code) \ do { \ - int _i, _j, __done = 0; \ + int _i, _j; \ ASSERT(shadow_mode_external(_dom)); \ ASSERT(mfn_to_page(_sl2mfn)->u.sh.type == SH_type_l2_32_shadow); \ - for ( _j = 0; _j < 4 && !__done; _j++ ) \ + for ( _j = 0; _j < 4; _j++ ) \ { \ shadow_l2e_t *_sp = map_domain_page(_sl2mfn); \ for ( _i = 0; _i < SHADOW_L2_PAGETABLE_ENTRIES; _i += 2 ) \ @@ -819,11 +818,12 @@ do { \ (_sl2e) = _sp + _i; \ if ( shadow_l2e_get_flags(*(_sl2e)) & _PAGE_PRESENT ) \ {_code} \ - if ( (__done = (_done)) ) break; \ + if ( _done ) break; \ increment_ptr_to_guest_entry(_gl2p); \ } \ unmap_domain_page(_sp); \ if ( _j < 3 ) _sl2mfn = sh_next_page(_sl2mfn); \ + if ( _i < SHADOW_L2_PAGETABLE_ENTRIES ) break; \ } \ } while (0) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 19:55:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 19:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211055.368110 (Exim 4.92) (envelope-from ) id 1mbTIH-0003ri-Pw; Fri, 15 Oct 2021 19:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211055.368110; Fri, 15 Oct 2021 19:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIH-0003rZ-Mn; Fri, 15 Oct 2021 19:55:05 +0000 Received: by outflank-mailman (input) for mailman id 211055; Fri, 15 Oct 2021 19:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIH-0003rT-6M for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIH-00046s-3A for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbTIH-000109-1m for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7os3q03JK03yPRzZQTgLZBaqHdOjFE0PsSEuCBrYTOo=; b=aYwgu1eBgGs1GrKjfGTk9Rq3WB zOaIK2cz+UGS3/LrFojdvlj/nht7BVdMH49z7f8Kw1wXb6AE4gnEACSlmOQviKuOrVE4GF2VhFiVL hHLL5qJV9UxLj1gwC7kaE1m7H/Xj4xkHtEnrkmz16dcH0unPMMMZQo+VzyhtRw82xt9o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/vpci: Move ecam access functions to common code Message-Id: Date: Fri, 15 Oct 2021 19:55:05 +0000 commit be4eefbce6cada21b8a17354c1f11d7865d9a603 Author: Bertrand Marquis AuthorDate: Fri Oct 15 17:51:41 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 11:21:54 2021 -0700 xen/vpci: Move ecam access functions to common code PCI standard is using ECAM and not MCFG which is coming from ACPI[1]. Use ECAM/ecam instead of MCFG in common code and in new functions added in common vpci code by this patch. Move vpci_access_allowed from arch/x86/hvm/io.c to drivers/vpci/vpci.c. Create vpci_ecam_{read,write} in drivers/vpci/vpci.c that contains the common code to perform these operations, changed vpci_mmcfg_{read,write} accordingly to make use of these functions. The vpci_ecam_{read,write} functions are returning false on error and true on success. As the x86 code was previously always returning X86EMUL_OKAY the return code is ignored. A comment has been added in the code to show that this is intentional. Those functions will be used in a following patch inside by arm vpci implementation. Rename MMCFG_BDF to VPCI_ECAM_BDF and move it to vpci.h. This macro is only used by functions calling vpci_ecam helpers. No functional change intended with this patch. [1] https://wiki.osdev.org/PCI_Express Suggested-by: Roger Pau Monné Signed-off-by: Bertrand Marquis Acked-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- xen/arch/x86/hvm/io.c | 46 +++++----------------------------------- xen/drivers/vpci/vpci.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/pci.h | 2 -- xen/include/xen/vpci.h | 12 +++++++++++ 4 files changed, 71 insertions(+), 43 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 046a8eb4ed..93f1d1503f 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -260,20 +260,6 @@ unsigned int hvm_pci_decode_addr(unsigned int cf8, unsigned int addr, return CF8_ADDR_LO(cf8) | (addr & 3); } -/* Do some sanity checks. */ -static bool vpci_access_allowed(unsigned int reg, unsigned int len) -{ - /* Check access size. */ - if ( len != 1 && len != 2 && len != 4 && len != 8 ) - return false; - - /* Check that access is size aligned. */ - if ( (reg & (len - 1)) ) - return false; - - return true; -} - /* vPCI config space IO ports handlers (0xcf8/0xcfc). */ static bool vpci_portio_accept(const struct hvm_io_handler *handler, const ioreq_t *p) @@ -394,7 +380,7 @@ static unsigned int vpci_mmcfg_decode_addr(const struct hvm_mmcfg *mmcfg, paddr_t addr, pci_sbdf_t *sbdf) { addr -= mmcfg->addr; - sbdf->bdf = MMCFG_BDF(addr); + sbdf->bdf = VPCI_ECAM_BDF(addr); sbdf->bus += mmcfg->start_bus; sbdf->seg = mmcfg->segment; @@ -434,25 +420,8 @@ static int vpci_mmcfg_read(struct vcpu *v, unsigned long addr, reg = vpci_mmcfg_decode_addr(mmcfg, addr, &sbdf); read_unlock(&d->arch.hvm.mmcfg_lock); - if ( !vpci_access_allowed(reg, len) || - (reg + len) > PCI_CFG_SPACE_EXP_SIZE ) - return X86EMUL_OKAY; - - /* - * According to the PCIe 3.1A specification: - * - Configuration Reads and Writes must usually be DWORD or smaller - * in size. - * - Because Root Complex implementations are not required to support - * accesses to a RCRB that cross DW boundaries [...] software - * should take care not to cause the generation of such accesses - * when accessing a RCRB unless the Root Complex will support the - * access. - * Xen however supports 8byte accesses by splitting them into two - * 4byte accesses. - */ - *data = vpci_read(sbdf, reg, min(4u, len)); - if ( len == 8 ) - *data |= (uint64_t)vpci_read(sbdf, reg + 4, 4) << 32; + /* Failed reads are not propagated to the caller */ + vpci_ecam_read(sbdf, reg, len, data); return X86EMUL_OKAY; } @@ -476,13 +445,8 @@ static int vpci_mmcfg_write(struct vcpu *v, unsigned long addr, reg = vpci_mmcfg_decode_addr(mmcfg, addr, &sbdf); read_unlock(&d->arch.hvm.mmcfg_lock); - if ( !vpci_access_allowed(reg, len) || - (reg + len) > PCI_CFG_SPACE_EXP_SIZE ) - return X86EMUL_OKAY; - - vpci_write(sbdf, reg, min(4u, len), data); - if ( len == 8 ) - vpci_write(sbdf, reg + 4, 4, data >> 32); + /* Failed writes are not propagated to the caller */ + vpci_ecam_write(sbdf, reg, len, data); return X86EMUL_OKAY; } diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index cbd1bac7fc..ef690f15a9 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -478,6 +478,60 @@ void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, spin_unlock(&pdev->vpci->lock); } +/* Helper function to check an access size and alignment on vpci space. */ +bool vpci_access_allowed(unsigned int reg, unsigned int len) +{ + /* Check access size. */ + if ( len != 1 && len != 2 && len != 4 && len != 8 ) + return false; + + /* Check that access is size aligned. */ + if ( (reg & (len - 1)) ) + return false; + + return true; +} + +bool vpci_ecam_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, + unsigned long data) +{ + if ( !vpci_access_allowed(reg, len) || + (reg + len) > PCI_CFG_SPACE_EXP_SIZE ) + return false; + + vpci_write(sbdf, reg, min(4u, len), data); + if ( len == 8 ) + vpci_write(sbdf, reg + 4, 4, data >> 32); + + return true; +} + +bool vpci_ecam_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, + unsigned long *data) +{ + if ( !vpci_access_allowed(reg, len) || + (reg + len) > PCI_CFG_SPACE_EXP_SIZE ) + return false; + + /* + * According to the PCIe 3.1A specification: + * - Configuration Reads and Writes must usually be DWORD or smaller + * in size. + * - Because Root Complex implementations are not required to support + * accesses to a RCRB that cross DW boundaries [...] software + * should take care not to cause the generation of such accesses + * when accessing a RCRB unless the Root Complex will support the + * access. + * Xen however supports 8byte accesses by splitting them into two + * 4byte accesses. + */ + *data = vpci_read(sbdf, reg, min(4u, len)); + if ( len == 8 ) + *data |= (uint64_t)vpci_read(sbdf, reg + 4, 4) << 32; + + return true; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index edd7c3e71a..443f25347d 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -6,8 +6,6 @@ #define CF8_ADDR_HI(cf8) ( ((cf8) & 0x0f000000) >> 16) #define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000)) -#define MMCFG_BDF(addr) ( ((addr) & 0x0ffff000) >> 12) - #define IS_SNB_GFX(id) (id == 0x01068086 || id == 0x01168086 \ || id == 0x01268086 || id == 0x01028086 \ || id == 0x01128086 || id == 0x01228086 \ diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 9f5b5d52e1..6746c2589a 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -19,6 +19,8 @@ typedef int vpci_register_init_t(struct pci_dev *dev); #define VPCI_PRIORITY_MIDDLE "5" #define VPCI_PRIORITY_LOW "9" +#define VPCI_ECAM_BDF(addr) (((addr) & 0x0ffff000) >> 12) + #define REGISTER_VPCI_INIT(x, p) \ static vpci_register_init_t *const x##_entry \ __used_section(".data.vpci." p) = x @@ -208,6 +210,16 @@ static inline unsigned int vmsix_entry_nr(const struct vpci_msix *msix, { return entry - msix->entries; } + +bool vpci_access_allowed(unsigned int reg, unsigned int len); + +/* ECAM mmio read/write helpers */ +bool vpci_ecam_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, + unsigned long data); + +bool vpci_ecam_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, + unsigned long *data); + #endif /* __XEN__ */ #else /* !CONFIG_HAS_VPCI */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 19:55:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 19:55:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211056.368114 (Exim 4.92) (envelope-from ) id 1mbTIR-0003v1-RS; Fri, 15 Oct 2021 19:55:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211056.368114; Fri, 15 Oct 2021 19:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIR-0003us-OL; Fri, 15 Oct 2021 19:55:15 +0000 Received: by outflank-mailman (input) for mailman id 211056; Fri, 15 Oct 2021 19:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIR-0003uY-8C for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIR-000472-7P for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbTIR-00010v-5k for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e1u+3Fqy7zbNw6aYXK0QWls1IjcCKfQAu+lPFLuzD2s=; b=AreCXapD3qp/W7W3Q3BzjUy5XO mjpU/UTTX2Yc/Qg6l1rZClEZ4YvlNEJO7EOOYG4a3bq0w5DJzJ/DkCOHRRisrIdGyjpMXHQzn/SmP XQfNAcsyGKtBb25jJXhniNyLsSUrU9+pxK/97BdNXeisr8V+ujdHYlTBSJ/3uKVGuTgU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: Enable the existing x86 virtual PCI support for ARM Message-Id: Date: Fri, 15 Oct 2021 19:55:15 +0000 commit d59168dc05a5f98b12a7e243268c7d1050c8676c Author: Rahul Singh AuthorDate: Fri Oct 15 17:51:42 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 12:40:21 2021 -0700 xen/arm: Enable the existing x86 virtual PCI support for ARM The existing VPCI support available for X86 is adapted for Arm. When the device is added to XEN via the hyper call “PHYSDEVOP_pci_device_add”, VPCI handler for the config space access is added to the Xen to emulate the PCI devices config space. A MMIO trap handler for the PCI ECAM space is registered in XEN so that when guest is trying to access the PCI config space,XEN will trap the access and emulate read/write using the VPCI and not the real PCI hardware. For Dom0less systems scan_pci_devices() would be used to discover the PCI device in XEN and VPCI handler will be added during XEN boots. This patch is also doing some small fixes to fix compilation errors on arm32 of vpci and prevent 64bit accesses on 32bit: - use %zu instead of lu in header.c for print - prevent 64bit accesses in vpci_access_allowed - ifdef out using CONFIG_64BIT handling of len 8 in vpci_ecam_{read/write} TODO: currently vpci_add_handlers is marked as __hwdom_init, but on ARM vpci_add_handlers can be called after boot from PHYSDEVOP_pci_device_add. Consider removing __hwdom_init. Signed-off-by: Rahul Singh Signed-off-by: Bertrand Marquis [stefano: add TODO item to commit message] Signed-off-by: Stefano Stabellini Acked-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + xen/arch/arm/domain.c | 4 +++ xen/arch/arm/vpci.c | 77 +++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vpci.h | 36 ++++++++++++++++++++ xen/drivers/passthrough/pci.c | 13 ++++++++ xen/drivers/vpci/header.c | 2 +- xen/drivers/vpci/vpci.c | 10 ++++++ xen/include/asm-arm/domain.h | 1 + xen/include/public/arch-arm.h | 7 ++++ xen/include/xen/pci.h | 2 ++ 10 files changed, 152 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 64518848b2..07f634508e 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -7,6 +7,7 @@ ifneq ($(CONFIG_NO_PLAT),y) obj-y += platforms/ endif obj-$(CONFIG_TEE) += tee/ +obj-$(CONFIG_HAS_VPCI) += vpci.o obj-$(CONFIG_HAS_ALTERNATIVE) += alternative.o obj-y += bootfdt.init.o diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index eef0661beb..96e1b23550 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -39,6 +39,7 @@ #include #include +#include "vpci.h" #include "vuart.h" DEFINE_PER_CPU(struct vcpu *, curr_vcpu); @@ -773,6 +774,9 @@ int arch_domain_create(struct domain *d, if ( is_hardware_domain(d) && (rc = domain_vuart_init(d)) ) goto fail; + if ( (rc = domain_vpci_init(d)) != 0 ) + goto fail; + return 0; fail: diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c new file mode 100644 index 0000000000..8f40a0dec6 --- /dev/null +++ b/xen/arch/arm/vpci.c @@ -0,0 +1,77 @@ +/* + * xen/arch/arm/vpci.c + * + * 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. + */ +#include +#include + +#include + +static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, + register_t *r, void *p) +{ + pci_sbdf_t sbdf; + /* data is needed to prevent a pointer cast on 32bit */ + unsigned long data; + + /* We ignore segment part and always handle segment 0 */ + sbdf.sbdf = VPCI_ECAM_BDF(info->gpa); + + if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), + 1U << info->dabt.size, &data) ) + { + *r = data; + return 1; + } + + *r = ~0ul; + + return 0; +} + +static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, + register_t r, void *p) +{ + pci_sbdf_t sbdf; + + /* We ignore segment part and always handle segment 0 */ + sbdf.sbdf = VPCI_ECAM_BDF(info->gpa); + + return vpci_ecam_write(sbdf, ECAM_REG_OFFSET(info->gpa), + 1U << info->dabt.size, r); +} + +static const struct mmio_handler_ops vpci_mmio_handler = { + .read = vpci_mmio_read, + .write = vpci_mmio_write, +}; + +int domain_vpci_init(struct domain *d) +{ + if ( !has_vpci(d) ) + return 0; + + register_mmio_handler(d, &vpci_mmio_handler, + GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ + diff --git a/xen/arch/arm/vpci.h b/xen/arch/arm/vpci.h new file mode 100644 index 0000000000..d8a7b0e3e8 --- /dev/null +++ b/xen/arch/arm/vpci.h @@ -0,0 +1,36 @@ +/* + * xen/arch/arm/vpci.h + * + * 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. + */ + +#ifndef __ARCH_ARM_VPCI_H__ +#define __ARCH_ARM_VPCI_H__ + +#ifdef CONFIG_HAS_VPCI +int domain_vpci_init(struct domain *d); +#else +static inline int domain_vpci_init(struct domain *d) +{ + return 0; +} +#endif + +#endif /* __ARCH_ARM_VPCI_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 3aa8c3175f..35e0190796 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -756,6 +756,19 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, if ( !pdev->domain ) { pdev->domain = hardware_domain; +#ifdef CONFIG_ARM + /* + * On ARM PCI devices discovery will be done by Dom0. Add vpci handler + * when Dom0 inform XEN to add the PCI devices in XEN. + */ + ret = vpci_add_handlers(pdev); + if ( ret ) + { + printk(XENLOG_ERR "Setup of vPCI failed: %d\n", ret); + pdev->domain = NULL; + goto out; + } +#endif ret = iommu_add_device(pdev); if ( ret ) { diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index f8cd55e7c0..40ff79c33f 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -373,7 +373,7 @@ static void bar_write(const struct pci_dev *pdev, unsigned int reg, /* If the value written is the current one avoid printing a warning. */ if ( val != (uint32_t)(bar->addr >> (hi ? 32 : 0)) ) gprintk(XENLOG_WARNING, - "%pp: ignored BAR %lu write with memory decoding enabled\n", + "%pp: ignored BAR %zu write with memory decoding enabled\n", &pdev->sbdf, bar - pdev->vpci->header.bars + hi); return; } diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index ef690f15a9..decf7d87a1 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -485,6 +485,12 @@ bool vpci_access_allowed(unsigned int reg, unsigned int len) if ( len != 1 && len != 2 && len != 4 && len != 8 ) return false; +#ifndef CONFIG_64BIT + /* Prevent 64bit accesses on 32bit */ + if ( len == 8 ) + return false; +#endif + /* Check that access is size aligned. */ if ( (reg & (len - 1)) ) return false; @@ -500,8 +506,10 @@ bool vpci_ecam_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, return false; vpci_write(sbdf, reg, min(4u, len), data); +#ifdef CONFIG_64BIT if ( len == 8 ) vpci_write(sbdf, reg + 4, 4, data >> 32); +#endif return true; } @@ -526,8 +534,10 @@ bool vpci_ecam_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, * 4byte accesses. */ *data = vpci_read(sbdf, reg, min(4u, len)); +#ifdef CONFIG_64BIT if ( len == 8 ) *data |= (uint64_t)vpci_read(sbdf, reg + 4, 4) << 32; +#endif return true; } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 14e575288f..9b3647587a 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -263,6 +263,7 @@ static inline void arch_vcpu_block(struct vcpu *v) {} #define arch_vm_assist_valid_mask(d) (1UL << VMASST_TYPE_runstate_update_flag) +/* vPCI is not available on Arm */ #define has_vpci(d) ({ (void)(d); false; }) #endif /* __ASM_DOMAIN_H__ */ diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 96ead3de07..b4c615bcdf 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -418,6 +418,13 @@ typedef uint64_t xen_callback_t; #define GUEST_GICV3_GICR0_BASE xen_mk_ullong(0x03020000) /* vCPU0..127 */ #define GUEST_GICV3_GICR0_SIZE xen_mk_ullong(0x01000000) +/* + * 256 MB is reserved for VPCI configuration space based on calculation + * 256 buses x 32 devices x 8 functions x 4 KB = 256 MB + */ +#define GUEST_VPCI_ECAM_BASE xen_mk_ullong(0x10000000) +#define GUEST_VPCI_ECAM_SIZE xen_mk_ullong(0x10000000) + /* ACPI tables physical address */ #define GUEST_ACPI_BASE xen_mk_ullong(0x20000000) #define GUEST_ACPI_SIZE xen_mk_ullong(0x02000000) diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 70ac25345c..b6d7e454f8 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -40,6 +40,8 @@ #define PCI_SBDF3(s,b,df) \ ((pci_sbdf_t){ .sbdf = (((s) & 0xffff) << 16) | PCI_BDF2(b, df) }) +#define ECAM_REG_OFFSET(addr) ((addr) & 0x00000fff) + typedef union { uint32_t sbdf; struct { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 19:55:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 19:55:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211057.368118 (Exim 4.92) (envelope-from ) id 1mbTIb-0003xl-Sj; Fri, 15 Oct 2021 19:55:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211057.368118; Fri, 15 Oct 2021 19:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIb-0003xd-Pq; Fri, 15 Oct 2021 19:55:25 +0000 Received: by outflank-mailman (input) for mailman id 211057; Fri, 15 Oct 2021 19:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIb-0003xW-BY for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIb-00047X-Al for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbTIb-00011o-9i for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=COZEFspG1JXIwe4gFvFq0xxByure8QlsNp9vF/S+yvE=; b=ieqKW1EhYzjszv+RfzPhbJf/XY njYl2broVEYb6XcQNLKBHbFhVN6AQHiMSjEVHc/m8K2PahIX6YR/UxUyUkSHnMHjUqb7J8sSHE2s7 vaa5OgdhZ+890NnWzTp9hw7eiKp1hbYSSsJYXwawSYI5GLElbHo8ywphkgTgm7qCNwXU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxl: Modify libxl__arch_domain_init_hw_description... Message-Id: Date: Fri, 15 Oct 2021 19:55:25 +0000 commit 1b4047a9f2c6fe7331fcb283796eb1b1d1a5d827 Author: Michal Orzel AuthorDate: Fri Oct 15 17:51:43 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 12:40:21 2021 -0700 tools/libxl: Modify libxl__arch_domain_init_hw_description... ... to take a second argument of type libxl_domain_config* rather than libxl_domain_build_info*. We need to pass the whole libxl_domain_config structure as this will be needed later on to modify the libxl__prepare_dtb function to also take libxl_domain_config. Signed-off-by: Michal Orzel Signed-off-by: Bertrand Marquis Suggested-by: Ian Jackson Reviewed-by: Ian Jackson Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_arch.h | 2 +- tools/libs/light/libxl_arm.c | 3 ++- tools/libs/light/libxl_dom.c | 2 +- tools/libs/light/libxl_x86.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/libs/light/libxl_arch.h b/tools/libs/light/libxl_arch.h index 8527fc5c6c..1522ecb97f 100644 --- a/tools/libs/light/libxl_arch.h +++ b/tools/libs/light/libxl_arch.h @@ -38,7 +38,7 @@ int libxl__arch_domain_create(libxl__gc *gc, /* setup arch specific hardware description, i.e. DTB on ARM */ _hidden int libxl__arch_domain_init_hw_description(libxl__gc *gc, - libxl_domain_build_info *info, + libxl_domain_config *d_config, libxl__domain_build_state *state, struct xc_dom_image *dom); /* finalize arch specific hardware description. */ diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index a7801558cf..d5771f98dd 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -1016,12 +1016,13 @@ out: } int libxl__arch_domain_init_hw_description(libxl__gc *gc, - libxl_domain_build_info *info, + libxl_domain_config *d_config, libxl__domain_build_state *state, struct xc_dom_image *dom) { int rc; uint64_t val; + libxl_domain_build_info *const info = &d_config->b_info; if (info->type != LIBXL_DOMAIN_TYPE_PVH) { LOG(ERROR, "Unsupported Arm guest type %s", diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index e9f58ee4b2..fe9f760f71 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -571,7 +571,7 @@ static int libxl__build_dom(libxl__gc *gc, uint32_t domid, LOG(ERROR, "xc_dom_parse_image failed"); goto out; } - if ( (ret = libxl__arch_domain_init_hw_description(gc, info, state, dom)) != 0 ) { + if ( (ret = libxl__arch_domain_init_hw_description(gc, d_config, state, dom)) != 0 ) { LOGE(ERROR, "libxl__arch_domain_init_hw_description failed"); goto out; } diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 6083878315..1feadebb18 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -568,7 +568,7 @@ int libxl__arch_extra_memory(libxl__gc *gc, } int libxl__arch_domain_init_hw_description(libxl__gc *gc, - libxl_domain_build_info *info, + libxl_domain_config *d_config, libxl__domain_build_state *state, struct xc_dom_image *dom) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 19:55:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 19:55:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211058.368122 (Exim 4.92) (envelope-from ) id 1mbTIl-00041A-UB; Fri, 15 Oct 2021 19:55:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211058.368122; Fri, 15 Oct 2021 19:55:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIl-000412-RH; Fri, 15 Oct 2021 19:55:35 +0000 Received: by outflank-mailman (input) for mailman id 211058; Fri, 15 Oct 2021 19:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIl-00040q-Eg for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIl-00047h-E2 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbTIl-00012Z-D7 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SyTB5xfIHL8CNoGuPcx1KKTc6T5WQxg2uPauTuDe+8Q=; b=0ivM2G+f2KM1983HEfQe4JwzfT O2cgkSSsvBWYuoRmAkujFPHqTzfX4bx7zSswOr6Qqf/F4Xi2c7z0cCsg8r5TaeaPeU0fidKq4rBXb 5c50Yd/ACUbFZh9UvJlFs4VQqFVSPwQ78VCDOiUxqNAeRRrQqvHlocRQh/yt0ujaf+MI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxl_arm: Modify libxl__prepare_dtb... Message-Id: Date: Fri, 15 Oct 2021 19:55:35 +0000 commit 559ea0debabac5f142d3b901527d48cc99021588 Author: Michal Orzel AuthorDate: Fri Oct 15 17:51:44 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 12:40:21 2021 -0700 tools/libxl_arm: Modify libxl__prepare_dtb... ... to take a second argument of type libxl_domain_config* rather than libxl_domain_build_info*. This change will be needed to get access from libxl__prepare_dtb to "num_pcidevs" field of libxl_domain_config to check whether to create a vPCI DT node or not. Signed-off-by: Michal Orzel Signed-off-by: Bertrand Marquis Suggested-by: Ian Jackson Reviewed-by: Ian Jackson Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_arm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index d5771f98dd..fdae129605 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -878,7 +878,7 @@ static int copy_partial_fdt(libxl__gc *gc, void *fdt, void *pfdt) #define FDT_MAX_SIZE (1<<20) -static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_build_info *info, +static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, libxl__domain_build_state *state, struct xc_dom_image *dom) { @@ -887,6 +887,7 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_build_info *info, int rc, res; size_t fdt_size = 0; int pfdt_size = 0; + libxl_domain_build_info *const info = &d_config->b_info; const libxl_version_info *vers; const struct arch_info *ainfo; @@ -1042,7 +1043,7 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, if (rc) return rc; - rc = libxl__prepare_dtb(gc, info, state, dom); + rc = libxl__prepare_dtb(gc, d_config, state, dom); if (rc) goto out; if (!libxl_defbool_val(info->acpi)) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 19:55:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 19:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211059.368126 (Exim 4.92) (envelope-from ) id 1mbTIw-00044b-0o; Fri, 15 Oct 2021 19:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211059.368126; Fri, 15 Oct 2021 19:55:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIv-00044U-UC; Fri, 15 Oct 2021 19:55:45 +0000 Received: by outflank-mailman (input) for mailman id 211059; Fri, 15 Oct 2021 19:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIv-00044O-IQ for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbTIv-00047v-Hd for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbTIv-00013M-GX for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 19:55:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ti3grGV6RmO+8vksuwSN+/Yv84QIa4ybXXyG673zSio=; b=FsnyOLTeRzYa2fWE4dPJs1RXV5 jN5C/8qhQzfPsYT7MmieLapIzr8usn8eS6N2iMVCkZLnFfOYF7OH8IkZVbnGkFme44PaSTkSJhlZ2 va0GBI7kRqj1zQIDIrssfWYx/UEOi3r4T/+BdMR4O8q8y/TAvafnfXB4ifjSMPqrmWTU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/libxl: Emulated PCI device tree node in libxl Message-Id: Date: Fri, 15 Oct 2021 19:55:45 +0000 commit 52d0847d7c6972baa74156f14ee8544f5aba1d2d Author: Rahul Singh AuthorDate: Fri Oct 15 17:51:45 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 12:40:21 2021 -0700 arm/libxl: Emulated PCI device tree node in libxl libxl will create an emulated PCI device tree node in the device tree to enable the guest OS to discover the virtual PCI during guest boot. Emulated PCI device tree node will only be created when there is any device assigned to guest. A new area has been reserved in the arm guest physical map at which the VPCI bus is declared in the device tree (reg and ranges parameters of the node). Note that currently we are using num_pcidevs instead of c_info->passthrough to decide whether to create a vPCI DT node. This will be insufficient if and when ARM does PCI hotplug. Add this note inside libxl_create.c where c_info->passthrough is set. Signed-off-by: Rahul Singh Signed-off-by: Michal Orzel Signed-off-by: Bertrand Marquis Reviewed-by: Julien Grall Acked-by: Ian Jackson Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_arm.c | 103 ++++++++++++++++++++++++++++++++++++++++ tools/libs/light/libxl_create.c | 5 ++ xen/include/public/arch-arm.h | 10 ++++ 3 files changed, 118 insertions(+) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index fdae129605..eef1de0939 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -284,6 +284,59 @@ static int fdt_property_reg_placeholder(libxl__gc *gc, void *fdt, return fdt_property(fdt, "reg", regs, sizeof(regs)); } +static int fdt_property_values(libxl__gc *gc, void *fdt, + const char *name, + unsigned num_cells, ...) +{ + uint32_t prop[num_cells]; + be32 *cells = &prop[0]; + int i; + va_list ap; + uint32_t arg; + + va_start(ap, num_cells); + for (i = 0 ; i < num_cells; i++) { + arg = va_arg(ap, uint32_t); + set_cell(&cells, 1, arg); + } + va_end(ap); + + return fdt_property(fdt, name, prop, sizeof(prop)); +} + +static int fdt_property_vpci_ranges(libxl__gc *gc, void *fdt, + unsigned addr_cells, + unsigned size_cells, + unsigned num_regs, ...) +{ + uint32_t regs[num_regs*((addr_cells*2)+size_cells+1)]; + be32 *cells = ®s[0]; + int i; + va_list ap; + uint64_t arg; + + va_start(ap, num_regs); + for (i = 0 ; i < num_regs; i++) { + /* Set the memory bit field */ + arg = va_arg(ap, uint32_t); + set_cell(&cells, 1, arg); + + /* Set the vpci bus address */ + arg = addr_cells ? va_arg(ap, uint64_t) : 0; + set_cell(&cells, addr_cells , arg); + + /* Set the cpu bus address where vpci address is mapped */ + set_cell(&cells, addr_cells, arg); + + /* Set the vpci size requested */ + arg = size_cells ? va_arg(ap, uint64_t) : 0; + set_cell(&cells, size_cells, arg); + } + va_end(ap); + + return fdt_property(fdt, "ranges", regs, sizeof(regs)); +} + static int make_root_properties(libxl__gc *gc, const libxl_version_info *vers, void *fdt) @@ -687,6 +740,53 @@ static int make_vpl011_uart_node(libxl__gc *gc, void *fdt, return 0; } +static int make_vpci_node(libxl__gc *gc, void *fdt, + const struct arch_info *ainfo, + struct xc_dom_image *dom) +{ + int res; + const uint64_t vpci_ecam_base = GUEST_VPCI_ECAM_BASE; + const uint64_t vpci_ecam_size = GUEST_VPCI_ECAM_SIZE; + const char *name = GCSPRINTF("pcie@%"PRIx64, vpci_ecam_base); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, "pci-host-ecam-generic"); + if (res) return res; + + res = fdt_property_string(fdt, "device_type", "pci"); + if (res) return res; + + res = fdt_property_regs(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, + GUEST_ROOT_SIZE_CELLS, 1, vpci_ecam_base, vpci_ecam_size); + if (res) return res; + + res = fdt_property_values(gc, fdt, "bus-range", 2, 0, 255); + if (res) return res; + + res = fdt_property_cell(fdt, "#address-cells", 3); + if (res) return res; + + res = fdt_property_cell(fdt, "#size-cells", 2); + if (res) return res; + + res = fdt_property_string(fdt, "status", "okay"); + if (res) return res; + + res = fdt_property_vpci_ranges(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, + GUEST_ROOT_SIZE_CELLS, 2, + GUEST_VPCI_ADDR_TYPE_MEM, GUEST_VPCI_MEM_ADDR, GUEST_VPCI_MEM_SIZE, + GUEST_VPCI_ADDR_TYPE_PREFETCH_MEM, GUEST_VPCI_PREFETCH_MEM_ADDR, + GUEST_VPCI_PREFETCH_MEM_SIZE); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + static const struct arch_info *get_arch_info(libxl__gc *gc, const struct xc_dom_image *dom) { @@ -991,6 +1091,9 @@ next_resize: if (info->tee == LIBXL_TEE_TYPE_OPTEE) FDT( make_optee_node(gc, fdt) ); + if (d_config->num_pcidevs) + FDT( make_vpci_node(gc, fdt, ainfo, dom) ); + if (pfdt) FDT( copy_partial_fdt(gc, fdt, pfdt) ); diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 6ebb2bfc76..5a61d01722 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -1096,6 +1096,11 @@ int libxl__domain_config_setdefault(libxl__gc *gc, goto error_out; } + /* + * Note: libxl_arm directly examines num_pcidevs to decide whether + * to create a vPCI DT node, rather than using c_info->passthrough. + * This will be insufficient if and when ARM does PCI hotplug. + */ bool need_pt = d_config->num_pcidevs || d_config->num_dtdevs; if (c_info->passthrough == LIBXL_PASSTHROUGH_DEFAULT) { c_info->passthrough = need_pt diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index b4c615bcdf..94b31511dd 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -433,6 +433,11 @@ typedef uint64_t xen_callback_t; #define GUEST_PL011_BASE xen_mk_ullong(0x22000000) #define GUEST_PL011_SIZE xen_mk_ullong(0x00001000) +/* Guest PCI-PCIe memory space where config space and BAR will be available.*/ +#define GUEST_VPCI_ADDR_TYPE_MEM xen_mk_ullong(0x02000000) +#define GUEST_VPCI_MEM_ADDR xen_mk_ullong(0x23000000) +#define GUEST_VPCI_MEM_SIZE xen_mk_ullong(0x10000000) + /* * 16MB == 4096 pages reserved for guest to use as a region to map its * grant table in. @@ -453,6 +458,11 @@ typedef uint64_t xen_callback_t; #define GUEST_RAM0_BASE xen_mk_ullong(0x40000000) /* 3GB of low RAM @ 1GB */ #define GUEST_RAM0_SIZE xen_mk_ullong(0xc0000000) +/* 4GB @ 4GB Prefetch Memory for VPCI */ +#define GUEST_VPCI_ADDR_TYPE_PREFETCH_MEM xen_mk_ullong(0x42000000) +#define GUEST_VPCI_PREFETCH_MEM_ADDR xen_mk_ullong(0x100000000) +#define GUEST_VPCI_PREFETCH_MEM_SIZE xen_mk_ullong(0x100000000) + #define GUEST_RAM1_BASE xen_mk_ullong(0x0200000000) /* 1016GB of RAM @ 8GB */ #define GUEST_RAM1_SIZE xen_mk_ullong(0xfe00000000) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211106.368168 (Exim 4.92) (envelope-from ) id 1mbVvn-0003dK-DV; Fri, 15 Oct 2021 22:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211106.368168; Fri, 15 Oct 2021 22:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVvn-0003dC-Al; Fri, 15 Oct 2021 22:44:03 +0000 Received: by outflank-mailman (input) for mailman id 211106; Fri, 15 Oct 2021 22:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVvm-0003d4-5n for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVvm-00070d-4v for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVvm-0007bM-3r for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22: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=mfgTDnJJpGq4JQiaof1qgqqsd52R7VbrmwhWLGGq7nk=; b=x90E797Dhy3pcghorMrKgG07cO btR1JIhWtm2AEY54S6A0Y/37jzSVdQmBwXDtsnn9tx9S2hd75xTHAhBsJHuihz7wbLjcVsnLZkl5+ 052XlALcCwMNfni2GavFrdJACRoef1/UkrvrzRBi0wmA07sdz0nKhH8DIcLIh7NbmbcA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] update Xen version to 4.14.4-pre Message-Id: Date: Fri, 15 Oct 2021 22:44:02 +0000 commit 6124f6c1893f3b2a8ada218820d9f4d1ca9066fc Author: Jan Beulich AuthorDate: Fri Oct 15 11:11:34 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:11:34 2021 +0200 update Xen version to 4.14.4-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 661f78741e..e20d61b5e4 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 14 -export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211107.368173 (Exim 4.92) (envelope-from ) id 1mbVvx-0003fK-FF; Fri, 15 Oct 2021 22:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211107.368173; Fri, 15 Oct 2021 22: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 1mbVvx-0003fC-CG; Fri, 15 Oct 2021 22:44:13 +0000 Received: by outflank-mailman (input) for mailman id 211107; Fri, 15 Oct 2021 22:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVvw-0003ey-8s for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVvw-00070h-85 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVvw-0007cD-6z for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22: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=5PJW9XeJAzDjx2oTH/LN3JgxNyXY7vuXid3qpznYCaE=; b=JOlY9e7hegHrUjaKawqVtIHVpu R+hPWS63NEUdQiJDBuRJvC4T74c6u1XQdd64TGSRWBrhWD1LbTrVY9lOqklGTiecodLJEBUbkQCJ3 V8t5C7q2Fvk2O8Oly6OrYLvcI9XrtGolt0XZ0Ke3ec5TOUtIWUxUbfStzeOKmox8WZsY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] build: set policy filename on make command line Message-Id: Date: Fri, 15 Oct 2021 22:44:12 +0000 commit 76f2b04c90413dd00a418f9fc957dc402951a2a5 Author: Anthony PERARD AuthorDate: Fri Oct 15 11:13:39 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:13:39 2021 +0200 build: set policy filename on make command line In order to avoid flask/Makefile.common calling `make xenversion`, we override POLICY_FILENAME with the value we are going to use anyway. Signed-off-by: Anthony PERARD Acked-by: Jan Beulich master commit: c81e7efe2146c8f381fbdbb037b9d46866a6451e master date: 2021-09-08 14:40:00 +0200 --- xen/xsm/flask/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index 07f36d075d..c8ed3a8385 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -46,7 +46,9 @@ FLASK_BUILD_DIR := $(CURDIR) POLICY_SRC := $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) policy.bin: FORCE - $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common -C $(XEN_ROOT)/tools/flask/policy FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) + $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common \ + -C $(XEN_ROOT)/tools/flask/policy \ + FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) POLICY_FILENAME=$(POLICY_SRC) cmp -s $(POLICY_SRC) $@ || cp $(POLICY_SRC) $@ .PHONY: clean -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:44:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211108.368176 (Exim 4.92) (envelope-from ) id 1mbVw8-0003ii-GZ; Fri, 15 Oct 2021 22:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211108.368176; Fri, 15 Oct 2021 22:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVw8-0003ib-Df; Fri, 15 Oct 2021 22:44:24 +0000 Received: by outflank-mailman (input) for mailman id 211108; Fri, 15 Oct 2021 22:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVw6-0003iF-C4 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVw6-000712-BI for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVw6-0007cu-AN for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ixwomKRWs9J22pLSafypt4dN+cbMVNyZbadKRDOtV4I=; b=yn83WPhIuG2gxmbz3WrtDpyZxu UcGHo8dlQomvOUCENmA+c7nW6gkqX91w3idpqclsHjCCN/FASnsSbztE8tA7y+gW/b44JE/oLi9hv 9QcqAU6WrWhHOobhzU3PetS4sTNgwRKNoJXbkABPR4dXDLHrEB11qij5OTI8HCepRvJ4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/spec-ctrl: Split the "Hardware features" diagnostic line Message-Id: Date: Fri, 15 Oct 2021 22:44:22 +0000 commit b7afc6b455d88ae440113ae222c98a9b49bf1fd5 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:14:16 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:14:16 2021 +0200 x86/spec-ctrl: Split the "Hardware features" diagnostic line Separate the read-only hints from the features requiring active actions on Xen's behalf. Also take the opportunity split the IBRS/IBPB and IBPB mess. More features with overlapping enumeration are on the way, and and it is not useful to split them like this. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 565ebcda976c05b0c6191510d5e32b621a2b1867 master date: 2021-09-08 14:16:19 +0100 --- xen/arch/x86/spec_ctrl.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index aa85a0be46..a7953e43bc 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -317,23 +317,30 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) printk("Speculative mitigation facilities:\n"); - /* Hardware features which pertain to speculative mitigations. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", - (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", - (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", - (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", - (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", - (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL": "", - (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", - (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", - (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : "", - (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + /* + * Hardware read-only information, stating immunity to certain issues, or + * suggestions of which mitigation to use. + */ + printk(" Hardware hints:%s%s%s%s%s%s%s\n", + (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", + (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", + (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", + (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL" : "", + (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", + (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", + (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + + /* Hardware features which need driving to mitigate issues. */ + printk(" Hardware features:%s%s%s%s%s%s%s%s\n", + (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ if ( IS_ENABLED(CONFIG_INDIRECT_THUNK) || IS_ENABLED(CONFIG_SHADOW_PAGING) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:44:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:44:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211109.368181 (Exim 4.92) (envelope-from ) id 1mbVwI-0003lm-Is; Fri, 15 Oct 2021 22:44:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211109.368181; Fri, 15 Oct 2021 22:44:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwI-0003le-FG; Fri, 15 Oct 2021 22:44:34 +0000 Received: by outflank-mailman (input) for mailman id 211109; Fri, 15 Oct 2021 22:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwG-0003lM-FR for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwG-00071T-Eb for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVwG-0007df-Dp for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nh2Jne6El4sjs5w121EsvQuss1OPrbPvxX6Qvisu8lI=; b=KPYriVeIf7uZwORzS1+Q+/sTWq 9Opj3bD2oixQzkhnQA7AuQgOjDv8bkgSlLFl9Q1jkZxZbt5zlimLtVCDy1Oba6vW543OdE5xSfuU+ Qebkmiv8BXkGWE7eHZU74icDcsbhBVQQ0Dqm2+n+xJkb7CnOqgq8Zyux8Biz1SiXxbEM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/amd: Enumeration for speculative features/hints Message-Id: Date: Fri, 15 Oct 2021 22:44:32 +0000 commit 15734a72d7d38e9f8fd6a1a0bbb2a493a53d8dce Author: Andrew Cooper AuthorDate: Fri Oct 15 11:14:46 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:14:46 2021 +0200 x86/amd: Enumeration for speculative features/hints There is a step change in speculation protections between the Zen1 and Zen2 microarchitectures. Zen1 and older have no special support. Control bits in non-architectural MSRs are used to make lfence be dispatch-serialising (Spectre v1), and to disable Memory Disambiguation (Speculative Store Bypass). IBPB was retrofitted in a microcode update, and software methods are required for Spectre v2 protections. Because the bit controlling Memory Disambiguation is model specific, hypervisors are expected to expose a MSR_VIRT_SPEC_CTRL interface which abstracts the model specific details. Zen2 and later implement the MSR_SPEC_CTRL interface in hardware, and virtualise the interface for HVM guests to use. A number of hint bits are specified too to help guide OS software to the most efficient mitigation strategy. Zen3 introduced a new feature, Predictive Store Forwarding, along with a control to disable it in sensitive code. Add CPUID and VMCB details for all the new functionality. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 747424c664bb164a04e7a9f2ffbf02d4a1630d7d master date: 2021-09-08 14:16:19 +0100 --- tools/libxl/libxl_cpuid.c | 10 ++++++++++ tools/misc/xen-cpuid.c | 8 +++++++- xen/arch/x86/hvm/svm/svm.c | 1 + xen/arch/x86/hvm/svm/vmcb.c | 1 + xen/include/asm-x86/cpufeature.h | 5 +++++ xen/include/asm-x86/hvm/svm/svm.h | 2 ++ xen/include/asm-x86/hvm/svm/vmcb.h | 4 +++- xen/include/asm-x86/msr-index.h | 3 +++ xen/include/public/arch-x86/cpufeatureset.h | 10 ++++++++++ 9 files changed, 42 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index db2f12d115..fd63f606c8 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -267,7 +267,17 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"rstr-fp-err-ptrs", 0x80000008, NA, CPUID_REG_EBX, 2, 1}, {"wbnoinvd", 0x80000008, NA, CPUID_REG_EBX, 9, 1}, {"ibpb", 0x80000008, NA, CPUID_REG_EBX, 12, 1}, + {"ibrs", 0x80000008, NA, CPUID_REG_EBX, 14, 1}, + {"amd-stibp", 0x80000008, NA, CPUID_REG_EBX, 15, 1}, + {"ibrs-always", 0x80000008, NA, CPUID_REG_EBX, 16, 1}, + {"stibp-always", 0x80000008, NA, CPUID_REG_EBX, 17, 1}, + {"ibrs-fast", 0x80000008, NA, CPUID_REG_EBX, 18, 1}, + {"ibrs-same-mode", 0x80000008, NA, CPUID_REG_EBX, 19, 1}, {"ppin", 0x80000008, NA, CPUID_REG_EBX, 23, 1}, + {"amd-ssbd", 0x80000008, NA, CPUID_REG_EBX, 24, 1}, + {"virt-ssbd", 0x80000008, NA, CPUID_REG_EBX, 25, 1}, + {"ssb-no", 0x80000008, NA, CPUID_REG_EBX, 26, 1}, + {"psfd", 0x80000008, NA, CPUID_REG_EBX, 28, 1}, {"nc", 0x80000008, NA, CPUID_REG_ECX, 0, 8}, {"apicidsize", 0x80000008, NA, CPUID_REG_ECX, 12, 4}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index a231d96e13..a1d675da0f 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -148,11 +148,17 @@ static const char *const str_e8b[32] = [ 0] = "clzero", [ 2] = "rstr-fp-err-ptrs", - /* [ 8] */ [ 9] = "wbnoinvd", + /* [ 8] */ [ 9] = "wbnoinvd", [12] = "ibpb", + [14] = "ibrs", [15] = "amd-stibp", + [16] = "ibrs-always", [17] = "stibp-always", + [18] = "ibrs-fast", [19] = "ibrs-same-mode", /* [22] */ [23] = "ppin", + [24] = "amd-ssbd", [25] = "virt-ssbd", + [26] = "ssb-no", + [28] = "psfd", }; static const char *const str_7d0[32] = diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 90cdab3734..bb4a9da27e 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1653,6 +1653,7 @@ const struct hvm_function_table * __init start_svm(void) P(cpu_has_pause_filter, "Pause-Intercept Filter"); P(cpu_has_pause_thresh, "Pause-Intercept Filter Threshold"); P(cpu_has_tsc_ratio, "TSC Rate MSR"); + P(cpu_has_svm_spec_ctrl, "MSR_SPEC_CTRL virtualisation"); #undef P if ( !printed ) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 373d5d4af4..55da9302e5 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -271,6 +271,7 @@ static void __init __maybe_unused build_assertions(void) BUILD_BUG_ON(offsetof(typeof(vmcb), rsp) != 0x5d8); BUILD_BUG_ON(offsetof(typeof(vmcb), rax) != 0x5f8); BUILD_BUG_ON(offsetof(typeof(vmcb), _g_pat) != 0x668); + BUILD_BUG_ON(offsetof(typeof(vmcb), spec_ctrl) != 0x6e0); /* Check struct segment_register against the VMCB segment layout. */ BUILD_BUG_ON(sizeof(vmcb.es) != 16); diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 80eff688d4..a4900ef0c3 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -125,6 +125,11 @@ /* CPUID level 0x80000007.edx */ #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) +/* CPUID level 0x80000008.ebx */ +#define cpu_has_amd_ssbd boot_cpu_has(X86_FEATURE_AMD_SSBD) +#define cpu_has_virt_ssbd boot_cpu_has(X86_FEATURE_VIRT_SSBD) +#define cpu_has_ssb_no boot_cpu_has(X86_FEATURE_SSB_NO) + /* CPUID level 0x00000007:0.edx */ #define cpu_has_avx512_4vnniw boot_cpu_has(X86_FEATURE_AVX512_4VNNIW) #define cpu_has_avx512_4fmaps boot_cpu_has(X86_FEATURE_AVX512_4FMAPS) diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index 2310878e41..055bd4184a 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -74,6 +74,7 @@ extern u32 svm_feature_flags; #define SVM_FEATURE_PAUSETHRESH 12 /* Pause intercept filter support */ #define SVM_FEATURE_VLOADSAVE 15 /* virtual vmload/vmsave */ #define SVM_FEATURE_VGIF 16 /* Virtual GIF */ +#define SVM_FEATURE_SPEC_CTRL 20 /* MSR_SPEC_CTRL virtualisation */ #define cpu_has_svm_feature(f) (svm_feature_flags & (1u << (f))) #define cpu_has_svm_npt cpu_has_svm_feature(SVM_FEATURE_NPT) @@ -88,6 +89,7 @@ extern u32 svm_feature_flags; #define cpu_has_pause_thresh cpu_has_svm_feature(SVM_FEATURE_PAUSETHRESH) #define cpu_has_tsc_ratio cpu_has_svm_feature(SVM_FEATURE_TSCRATEMSR) #define cpu_has_svm_vloadsave cpu_has_svm_feature(SVM_FEATURE_VLOADSAVE) +#define cpu_has_svm_spec_ctrl cpu_has_svm_feature(SVM_FEATURE_SPEC_CTRL) #define SVM_PAUSEFILTER_INIT 4000 #define SVM_PAUSETHRESH_INIT 1000 diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index c4fda389b3..6dd5397862 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -515,7 +515,9 @@ struct vmcb_struct { u64 _lastbranchtoip; /* cleanbit 10 */ u64 _lastintfromip; /* cleanbit 10 */ u64 _lastinttoip; /* cleanbit 10 */ - u64 res17[301]; + u64 res17[9]; + u64 spec_ctrl; + u64 res18[291]; }; struct svm_domain { diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 80764266bf..9366386ef4 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -33,6 +33,7 @@ #define SPEC_CTRL_IBRS (_AC(1, ULL) << 0) #define SPEC_CTRL_STIBP (_AC(1, ULL) << 1) #define SPEC_CTRL_SSBD (_AC(1, ULL) << 2) +#define SPEC_CTRL_PSFD (_AC(1, ULL) << 7) #define MSR_PRED_CMD 0x00000049 #define PRED_CMD_IBPB (_AC(1, ULL) << 0) @@ -129,6 +130,8 @@ #define MSR_F15H_CU_POWER 0xc001007a #define MSR_F15H_CU_MAX_POWER 0xc001007b +#define MSR_VIRT_SPEC_CTRL 0xc001011f /* Layout matches MSR_SPEC_CTRL */ + #define MSR_AMD_RAPL_POWER_UNIT 0xc0010299 #define MSR_AMD_CORE_ENERGY_STATUS 0xc001029a #define MSR_AMD_PKG_ENERGY_STATUS 0xc001029b diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index d2422386c0..25a3fa03a4 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -254,7 +254,17 @@ XEN_CPUFEATURE(CLZERO, 8*32+ 0) /*A CLZERO instruction */ XEN_CPUFEATURE(RSTR_FP_ERR_PTRS, 8*32+ 2) /*A (F)X{SAVE,RSTOR} always saves/restores FPU Error pointers */ XEN_CPUFEATURE(WBNOINVD, 8*32+ 9) /* WBNOINVD instruction */ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by AMD) */ +XEN_CPUFEATURE(IBRS, 8*32+14) /* MSR_SPEC_CTRL.IBRS */ +XEN_CPUFEATURE(AMD_STIBP, 8*32+15) /* MSR_SPEC_CTRL.STIBP */ +XEN_CPUFEATURE(IBRS_ALWAYS, 8*32+16) /* IBRS preferred always on */ +XEN_CPUFEATURE(STIBP_ALWAYS, 8*32+17) /* STIBP preferred always on */ +XEN_CPUFEATURE(IBRS_FAST, 8*32+18) /* IBRS preferred over software options */ +XEN_CPUFEATURE(IBRS_SAME_MODE, 8*32+19) /* IBRS provides same-mode protection */ XEN_CPUFEATURE(AMD_PPIN, 8*32+23) /* Protected Processor Inventory Number */ +XEN_CPUFEATURE(AMD_SSBD, 8*32+24) /* MSR_SPEC_CTRL.SSBD available */ +XEN_CPUFEATURE(VIRT_SSBD, 8*32+25) /* MSR_VIRT_SPEC_CTRL.SSBD */ +XEN_CPUFEATURE(SSB_NO, 8*32+26) /* Hardware not vulnerable to SSB */ +XEN_CPUFEATURE(PSFD, 8*32+28) /* MSR_SPEC_CTRL.PSFD */ /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:44:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211110.368185 (Exim 4.92) (envelope-from ) id 1mbVwR-0003p0-Mr; Fri, 15 Oct 2021 22:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211110.368185; Fri, 15 Oct 2021 22:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwR-0003os-Jq; Fri, 15 Oct 2021 22:44:43 +0000 Received: by outflank-mailman (input) for mailman id 211110; Fri, 15 Oct 2021 22:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwQ-0003oc-Ij for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwQ-00071b-I0 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVwQ-0007eV-H7 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fSW7JP0Z7B2Dd/EWKtkHn+585rBLE2eJy0EQrv5MNbE=; b=bxHBuHLd6/+vrD+mTvboIrdnMR AF7ywetizMfv8uyypcIyjuIhdvXDKucidH+2+leBtgrp1R5KWCitmbd1s0tO82JN0HXUEvaoQlbgw tk/ygObEBIUMqsojOZLh+2ixmExxmP59gy80Y/G2lUDXEuayLoX18fUx8IEGAfCbbVqk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/amd: Use newer SSBD mechanisms if they exist Message-Id: Date: Fri, 15 Oct 2021 22:44:42 +0000 commit e0a8ffd498fb4c13bae0c80b0035dee4a34d3bb2 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:15:14 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:15:14 2021 +0200 x86/amd: Use newer SSBD mechanisms if they exist The opencoded legacy Memory Disambiguation logic in init_amd() neglected Fam19h for the Zen3 microarchitecture. Further more, all Zen2 based system have the architectural MSR_SPEC_CTRL and the SSBD bit within it, so shouldn't be using MSR_AMD64_LS_CFG. Implement the algorithm given in AMD's SSBD whitepaper, and leave a printk_once() behind in the case that no controls can be found. This now means that a user explicitly choosing `spec-ctrl=ssbd` will properly turn off Memory Disambiguation on Fam19h/Zen3 systems. This still remains a single system-wide setting (for now), and is not context switched between vCPUs. As such, it doesn't interact with Intel's use of MSR_SPEC_CTRL and default_xen_spec_ctrl (yet). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 2a4e6c4e4bea2e0bb720418c331ee28ff9c7632e master date: 2021-09-08 14:16:19 +0100 --- xen/arch/x86/cpu/amd.c | 69 +++++++++++++++++++++++++++++++++++------------- xen/arch/x86/cpu/cpu.h | 1 + xen/arch/x86/cpu/hygon.c | 9 +------ xen/arch/x86/spec_ctrl.c | 5 +++- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 8bc51bec10..c780397f18 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -642,6 +642,56 @@ void early_init_amd(struct cpuinfo_x86 *c) ctxt_switch_levelling(NULL); } +/* + * Refer to the AMD Speculative Store Bypass whitepaper: + * https://developer.amd.com/wp-content/resources/124441_AMD64_SpeculativeStoreBypassDisable_Whitepaper_final.pdf + */ +void amd_init_ssbd(const struct cpuinfo_x86 *c) +{ + int bit = -1; + + if (cpu_has_ssb_no) + return; + + if (cpu_has_amd_ssbd) { + wrmsrl(MSR_SPEC_CTRL, opt_ssbd ? SPEC_CTRL_SSBD : 0); + return; + } + + if (cpu_has_virt_ssbd) { + wrmsrl(MSR_VIRT_SPEC_CTRL, opt_ssbd ? SPEC_CTRL_SSBD : 0); + return; + } + + switch (c->x86) { + case 0x15: bit = 54; break; + case 0x16: bit = 33; break; + case 0x17: + case 0x18: bit = 10; break; + } + + if (bit >= 0) { + uint64_t val, mask = 1ull << bit; + + if (rdmsr_safe(MSR_AMD64_LS_CFG, val) || + ({ + val &= ~mask; + if (opt_ssbd) + val |= mask; + false; + }) || + wrmsr_safe(MSR_AMD64_LS_CFG, val) || + ({ + rdmsrl(MSR_AMD64_LS_CFG, val); + (val & mask) != (opt_ssbd * mask); + })) + bit = -1; + } + + if (bit < 0) + printk_once(XENLOG_ERR "No SSBD controls available\n"); +} + static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -718,24 +768,7 @@ static void init_amd(struct cpuinfo_x86 *c) c->x86_capability); } - /* - * If the user has explicitly chosen to disable Memory Disambiguation - * to mitigiate Speculative Store Bypass, poke the appropriate MSR. - */ - if (opt_ssbd) { - int bit = -1; - - switch (c->x86) { - case 0x15: bit = 54; break; - case 0x16: bit = 33; break; - case 0x17: bit = 10; break; - } - - if (bit >= 0 && !rdmsr_safe(MSR_AMD64_LS_CFG, value)) { - value |= 1ull << bit; - wrmsr_safe(MSR_AMD64_LS_CFG, value); - } - } + amd_init_ssbd(c); /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 1992596d1b..2550957801 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -20,3 +20,4 @@ extern bool detect_extended_topology(struct cpuinfo_x86 *c); void early_init_amd(struct cpuinfo_x86 *c); void amd_log_freq(const struct cpuinfo_x86 *c); +void amd_init_ssbd(const struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 46293f1f36..ccfa27201d 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -59,14 +59,7 @@ static void init_hygon(struct cpuinfo_x86 *c) __set_bit(X86_FEATURE_LFENCE_DISPATCH, c->x86_capability); - /* - * If the user has explicitly chosen to disable Memory Disambiguation - * to mitigiate Speculative Store Bypass, poke the appropriate MSR. - */ - if (opt_ssbd && !rdmsr_safe(MSR_AMD64_LS_CFG, value)) { - value |= 1ull << 10; - wrmsr_safe(MSR_AMD64_LS_CFG, value); - } + amd_init_ssbd(c); /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index a7953e43bc..e0e468783c 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -326,20 +326,23 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL" : "", + (e8b & cpufeat_mask(X86_FEATURE_SSB_NO)) || (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (e8b & cpufeat_mask(X86_FEATURE_AMD_SSBD)) || (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (e8b & cpufeat_mask(X86_FEATURE_VIRT_SSBD)) ? " VIRT_SSBD" : "", (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:44:53 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211111.368189 (Exim 4.92) (envelope-from ) id 1mbVwb-0003ru-OQ; Fri, 15 Oct 2021 22:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211111.368189; Fri, 15 Oct 2021 22:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwb-0003rl-LM; Fri, 15 Oct 2021 22:44:53 +0000 Received: by outflank-mailman (input) for mailman id 211111; Fri, 15 Oct 2021 22:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwa-0003rR-MA for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwa-00071o-LW for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVwa-0007fG-KL for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ltqF+C5rV8YNR0YhCinZvAO0Mkl9Kc/+0bofQMJD2UM=; b=wn5ZUgj/mbtJP5oLMLOU5XrudZ 6zUvzJvee97hw4gcaFlSMMYr05SHTKHFxag8qKMO0cYTHllqDYUQvVfZuYQff2pIeMe1uLQlF5Ys8 OpUcpRJFAmobpzoEpg0lXO4hQ3HVo3w4/ww3HtqlXuU2Kbt36haAV06cF0Or4+/5t0mk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/spec-ctrl: Print all AMD speculative hints/features Message-Id: Date: Fri, 15 Oct 2021 22:44:52 +0000 commit 9d32c26cfe680f0a114f460ab09260ee40319914 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:15:39 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:15:39 2021 +0200 x86/spec-ctrl: Print all AMD speculative hints/features We already print Intel features that aren't yet implemented/used, so be consistent on AMD too. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 3d189f16a11d5a209fb47fa3635847608d43745c master date: 2021-09-09 12:36:17 +0100 --- xen/arch/x86/spec_ctrl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index e0e468783c..7e0c171dc8 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -321,7 +321,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) * Hardware read-only information, stating immunity to certain issues, or * suggestions of which mitigation to use. */ - printk(" Hardware hints:%s%s%s%s%s%s%s\n", + printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s\n", (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", @@ -329,16 +329,23 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (e8b & cpufeat_mask(X86_FEATURE_SSB_NO)) || (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", - (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_ALWAYS)) ? " IBRS_ALWAYS" : "", + (e8b & cpufeat_mask(X86_FEATURE_STIBP_ALWAYS)) ? " STIBP_ALWAYS" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_FAST)) ? " IBRS_FAST" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_SAME_MODE)) ? " IBRS_SAME_MODE" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", + (e8b & cpufeat_mask(X86_FEATURE_AMD_STIBP)) || (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", (e8b & cpufeat_mask(X86_FEATURE_AMD_SSBD)) || (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (e8b & cpufeat_mask(X86_FEATURE_PSFD)) ? " PSFD" : "", (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:45:03 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:45:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211112.368193 (Exim 4.92) (envelope-from ) id 1mbVwl-0003v1-Pv; Fri, 15 Oct 2021 22:45:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211112.368193; Fri, 15 Oct 2021 22: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 1mbVwl-0003ut-Mv; Fri, 15 Oct 2021 22:45:03 +0000 Received: by outflank-mailman (input) for mailman id 211112; Fri, 15 Oct 2021 22:45:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwk-0003ul-PS for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwk-00072O-Os for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVwk-0007gF-Nq for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22: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=X49uXQPmNXeS37Z3D5kuGrwYgilkGmLTX43XjfWl/70=; b=btWmw9Cr3hHhih5f7uuDOoQBQ5 8EUmsbLjFF9dcQCGof4X4aHwPVvodvIfYX04rPgtVVMPsAPMRk0qT8HsnUcR/GDkOBBWREAqqKB6K xeTQglcMUjr8chYNR/lSQhlQ/ETPECoYg9ag2jmK3DEcVFwDq2t8lAEIrnWVe/dmwT5k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] tools/libacpi: Use 64-byte alignment for FACS Message-Id: Date: Fri, 15 Oct 2021 22:45:02 +0000 commit 410f5d02b6b4878e9fca4b7330380a970facf29b Author: Kevin Stefanov AuthorDate: Fri Oct 15 11:16:09 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:16:09 2021 +0200 tools/libacpi: Use 64-byte alignment for FACS The spec requires 64-byte alignment, not 16. Signed-off-by: Kevin Stefanov Reviewed-by: Jan Beulich master commit: c76cfada1cfad05aaf64ce3ad305c5467650e782 master date: 2021-09-10 13:27:08 +0100 --- tools/libacpi/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index a61dd5583a..fe2db66a62 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -532,7 +532,7 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config) * Fill in high-memory data structures, starting at @buf. */ - facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 16); + facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 64); if (!facs) goto oom; memcpy(facs, &Facs, sizeof(struct acpi_20_facs)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:45:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:45:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211113.368197 (Exim 4.92) (envelope-from ) id 1mbVwv-0003zM-RR; Fri, 15 Oct 2021 22:45:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211113.368197; Fri, 15 Oct 2021 22: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 1mbVwv-0003zE-OP; Fri, 15 Oct 2021 22:45:13 +0000 Received: by outflank-mailman (input) for mailman id 211113; Fri, 15 Oct 2021 22:45:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwu-0003z3-SO for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVwu-00072g-Rn for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVwu-0007gq-R0 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22: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=S72cjLUaD1HF4+UQgOHzpNTvCYG1CtIMEIiAZPQuH8M=; b=dgs+1EgEaFABUO6GqhcVHBlVGH OZuXYu8RGFX8m980xmyyqETkaTkO7WLE5gWu5m3TZ5CNTDZ51Nn6mcZbCsX7tKpNHle6gUwrC5P/I fplLpaADIgEjcLGmGiRxmorRm7KPFvY05zz9XsGYaPBRVXJtKtMxRrpXYJdZlpSU4dmI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86: quote section names when defining them in linker script Message-Id: Date: Fri, 15 Oct 2021 22:45:12 +0000 commit b4926b6c40bb635788a4987c8176c94826d193bd Author: Roger Pau Monné AuthorDate: Fri Oct 15 11:16:41 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:16:41 2021 +0200 x86: quote section names when defining them in linker script LLVM ld seems to require section names to be quoted at both definition and when referencing them for a match to happen, or else we get the following errors: ld: error: xen.lds:45: undefined section ".text" ld: error: xen.lds:69: undefined section ".rodata" ld: error: xen.lds:104: undefined section ".note.gnu.build-id" [...] The original fix for GNU ld 2.37 only quoted the section name when referencing it in the ADDR function. Fix by also quoting the section names when declaring them. Fixes: 58ad654ebce7 ("x86: work around build issue with GNU ld 2.37") Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 6254920587c33bcc7ab884e6c9a11cfc0d5867ab master date: 2021-09-15 11:02:21 +0200 --- xen/arch/x86/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index a02df18a25..fcc6646487 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -18,7 +18,7 @@ ENTRY(efi_start) #else /* !EFI */ #define FORMAT "elf64-x86-64" -#define DECL_SECTION(x) x : AT(ADDR(#x) - __XEN_VIRT_START) +#define DECL_SECTION(x) #x : AT(ADDR(#x) - __XEN_VIRT_START) ENTRY(start_pa) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:45:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:45:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211114.368201 (Exim 4.92) (envelope-from ) id 1mbVx5-00041w-Sx; Fri, 15 Oct 2021 22:45:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211114.368201; Fri, 15 Oct 2021 22: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 1mbVx5-00041n-Pp; Fri, 15 Oct 2021 22:45:23 +0000 Received: by outflank-mailman (input) for mailman id 211114; Fri, 15 Oct 2021 22:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVx4-00041Z-VV for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVx4-00072r-Up for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVx4-0007hW-Tu for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22: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=9ETb9K8fEt00yC3KuA4mKi3RAiBBb/1sTgTTwRM48X4=; b=r7r2Mx5crXjFttxSWp7EdnmAOL DtuA7q6nyH2Ue6DAOgP3uD7S3wZsDyxMukltiWb17Pa4tdiy2PZgUO89czoPJEveUYMRpLEx2HlvI TcXdqSLeCZhR5sAahKSWJUMy3YQaJGjyCvdhZODKAMV79DG/FOhO/c38EkUBMVODMemo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] VT-d: consider hidden devices when unmapping Message-Id: Date: Fri, 15 Oct 2021 22:45:22 +0000 commit d8c60e68fb699bb0aa56f511367bc7f733353813 Author: Jan Beulich AuthorDate: Fri Oct 15 11:17:32 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:17:32 2021 +0200 VT-d: consider hidden devices when unmapping Whether to clear an IOMMU's bit in the domain's bitmap should depend on all devices the domain can control. For the hardware domain this includes hidden devices, which are associated with DomXEN. While touching related logic - convert the "current device" exclusion check to a simple pointer comparison, - convert "found" to "bool", - adjust style and correct a typo in an existing comment. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian master commit: 75bfe6ec4844f83b300b9807bceaed1e2fe23270 master date: 2021-09-20 10:24:27 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 48 ++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 4f6bb996d0..70cfe9dc1f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1673,6 +1673,27 @@ int domain_context_unmap_one( return rc; } +static bool any_pdev_behind_iommu(const struct domain *d, + const struct pci_dev *exclude, + const struct vtd_iommu *iommu) +{ + const struct pci_dev *pdev; + + for_each_pdev ( d, pdev ) + { + const struct acpi_drhd_unit *drhd; + + if ( pdev == exclude ) + continue; + + drhd = acpi_find_matched_drhd_unit(pdev); + if ( drhd && drhd->iommu == iommu ) + return true; + } + + return false; +} + static int domain_context_unmap(struct domain *domain, u8 devfn, struct pci_dev *pdev) { @@ -1680,7 +1701,7 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct vtd_iommu *iommu; int ret = 0; u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; - int found = 0; + bool found; drhd = acpi_find_matched_drhd_unit(pdev); if ( !drhd ) @@ -1765,23 +1786,18 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, goto out; /* - * if no other devices under the same iommu owned by this domain, - * clear iommu in iommu_bitmap and clear domain_id in domid_bitmp + * If no other devices under the same iommu owned by this domain, + * clear iommu in iommu_bitmap and clear domain_id in domid_bitmap. */ - for_each_pdev ( domain, pdev ) - { - if ( pdev->seg == seg && pdev->bus == bus && pdev->devfn == devfn ) - continue; - - drhd = acpi_find_matched_drhd_unit(pdev); - if ( drhd && drhd->iommu == iommu ) - { - found = 1; - break; - } - } + found = any_pdev_behind_iommu(domain, pdev, iommu); + /* + * Hidden devices are associated with DomXEN but usable by the hardware + * domain. Hence they need considering here as well. + */ + if ( !found && is_hardware_domain(domain) ) + found = any_pdev_behind_iommu(dom_xen, pdev, iommu); - if ( found == 0 ) + if ( !found ) { clear_bit(iommu->index, &dom_iommu(domain)->arch.iommu_bitmap); cleanup_domid_map(domain, iommu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:45:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:45:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211115.368205 (Exim 4.92) (envelope-from ) id 1mbVxF-00044y-UF; Fri, 15 Oct 2021 22:45:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211115.368205; Fri, 15 Oct 2021 22:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxF-00044q-RN; Fri, 15 Oct 2021 22:45:33 +0000 Received: by outflank-mailman (input) for mailman id 211115; Fri, 15 Oct 2021 22:45:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxF-00044e-2e for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxF-00073M-1w for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVxF-0007iF-0x for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22: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=vdEs7r/yk6oBupb/ph4dBo0V4EecI3LmnrfbgO/pIi0=; b=Yc/RWuP2vaggP+j98OsQxeja8R AsH8WSZKmqG9Rbi1N9MdVbWbh3kM0etUND9uQjGlg3LwUpY+QQvKn7sNkeLxJ23J32aSJMbRZclhG 1tS2iEMdpHhi/dJhg0Inn8hMTob/gCZ/Ag0WOGh+c5T2HggX1CSy7f2mRR5i/tDCaSgk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] VT-d: PCI segment numbers are up to 16 bits wide Message-Id: Date: Fri, 15 Oct 2021 22:45:33 +0000 commit d53afcdcb33a2724303dfd789eafcb830120d3b8 Author: Jan Beulich AuthorDate: Fri Oct 15 11:17:56 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:17:56 2021 +0200 VT-d: PCI segment numbers are up to 16 bits wide We shouldn't silently truncate respective values. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian master commit: a3dd33e63c2c8c51102f223e6efe2e3d3bdcbec1 master date: 2021-09-20 10:25:03 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 70cfe9dc1f..870996abdb 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1486,7 +1486,8 @@ static int domain_context_mapping(struct domain *domain, u8 devfn, { struct acpi_drhd_unit *drhd; int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, secbus; drhd = acpi_find_matched_drhd_unit(pdev); if ( !drhd ) @@ -1700,7 +1701,8 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct acpi_drhd_unit *drhd; struct vtd_iommu *iommu; int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, tmp_bus, tmp_devfn, secbus; bool found; drhd = acpi_find_matched_drhd_unit(pdev); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:45:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:45:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211116.368209 (Exim 4.92) (envelope-from ) id 1mbVxQ-00048G-0u; Fri, 15 Oct 2021 22:45:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211116.368209; Fri, 15 Oct 2021 22:45:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxP-000488-U8; Fri, 15 Oct 2021 22:45:43 +0000 Received: by outflank-mailman (input) for mailman id 211116; Fri, 15 Oct 2021 22:45:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxP-000481-5f for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxP-00073X-53 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVxP-0007j2-4B for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22: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=IlxC51itMatSNJdZsDkfBE8Lq7XMZ0VyRiFm51AI3V8=; b=vhnLLhFBRxfAGfQzdd/gLSJI+J fo8mQ4/hoPWtsmwHjuCa9Tq+YUmlVmvXeHhudTPUru65UpfFCoO/bFbuG3sYAvAWzcVuWB9qUrMe/ b6PL4KBd0oDJzWHQ+xFh1bgWN2KP3kUBSwsLlRvuLm8ZbZwTUr5V++DKEg42iKmXJ++c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] pci: fix handling of PCI bridges with subordinate bus number 0xff Message-Id: Date: Fri, 15 Oct 2021 22:45:43 +0000 commit 28a28fa8194107794d5b8bd08cad5a46a67f6d64 Author: Igor Druzhinin AuthorDate: Fri Oct 15 11:18:19 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:18:19 2021 +0200 pci: fix handling of PCI bridges with subordinate bus number 0xff Bus number 0xff is valid according to the PCI spec. Using u8 typed sub_bus and assigning 0xff to it will result in the following loop getting stuck. for ( ; sec_bus <= sub_bus; sec_bus++ ) {...} Just change its type to unsigned int similarly to what is already done in dmar_scope_add_buses(). Signed-off-by: Igor Druzhinin Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis master commit: 9c3b9800e2019c93ab22da69e4a0b22d6fb059ec master date: 2021-09-28 16:04:50 +0200 --- xen/drivers/passthrough/pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 981e63061d..f15af59764 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -375,8 +375,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) /* update bus2bridge */ switch ( pdev->type = pdev_type(pseg->nr, bus, devfn) ) { - u16 cap; - u8 sec_bus, sub_bus; + unsigned int cap, sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: @@ -443,7 +442,7 @@ static void free_pdev(struct pci_seg *pseg, struct pci_dev *pdev) /* update bus2bridge */ switch ( pdev->type ) { - uint8_t sec_bus, sub_bus; + unsigned int sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:45:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211117.368213 (Exim 4.92) (envelope-from ) id 1mbVxa-0004B4-2X; Fri, 15 Oct 2021 22:45:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211117.368213; Fri, 15 Oct 2021 22:45:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxZ-0004Aw-Vh; Fri, 15 Oct 2021 22:45:53 +0000 Received: by outflank-mailman (input) for mailman id 211117; Fri, 15 Oct 2021 22:45:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxZ-0004Am-8v for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxZ-00073h-89 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVxZ-0007jy-7F for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:45: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=OnJIXkAXeRDZ36tmaahmMk1Sz0WzuJE3GJ6RkrcZMd4=; b=jUkXlS59Zfoq7Z/nLNlVmXRYYS yfMhSyID/qduvo3uuZrMVhiXuW/hpNNs7CZ2uszjEN5s0Rj+50umWQ9WEulFBzVAbzn/1SJh3SbJM MDJJyBOfmh467mWGcwHTdtoHu5mkfIDGEWw7S81TYngJWIe9iDQ/gppPjOkXI5G4TH3s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion Message-Id: Date: Fri, 15 Oct 2021 22:45:53 +0000 commit b1ac7bb7f77b63838564e0c151f8aca80ab6a6b6 Author: Jan Beulich AuthorDate: Fri Oct 15 11:18:51 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:18:51 2021 +0200 x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion The xen-syms and xen.efi linking steps are serialized only when the intermediate note.o file is necessary. Otherwise both may run in parallel. This in turn means that the compiler / linker invocations to create efi/check.o / efi/check.efi may also happen twice in parallel. Obviously it's a bad idea to have multiple producers of the same output race with one another - every once in a while one may e.g. observe objdump: efi/check.efi: file format not recognized We don't need this EFI related checking to occur when producing the intermediate symbol and relocation table objects, and we have an easy way of suppressing it: Simply pass in "efi-y=", overriding the assignments done in the Makefile and thus forcing the tool chain checks to be bypassed. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD master commit: 24b0ce9a5da2e648cde818055a085bcbcf24ecb0 master date: 2021-10-11 10:58:17 +0200 --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index bbd11a4726..fd0acd566a 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -145,13 +145,13 @@ $(TARGET)-syms: prelink.o xen.lds $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort \ >$(@D)/.$(@F).0.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \ >$(@D)/.$(@F).1.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ @@ -211,14 +211,14 @@ $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:46:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:46:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211118.368217 (Exim 4.92) (envelope-from ) id 1mbVxk-0004E0-4b; Fri, 15 Oct 2021 22:46:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211118.368217; Fri, 15 Oct 2021 22:46:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxk-0004Ds-16; Fri, 15 Oct 2021 22:46:04 +0000 Received: by outflank-mailman (input) for mailman id 211118; Fri, 15 Oct 2021 22:46:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxj-0004Dm-Bm for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxj-000745-B6 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVxj-0007ko-AI for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=X1iOWcEJXFMR9g9p94i3L/gJwsnO9WeXrSfHbjZdmYc=; b=gwBqrs3Gp8rnFXUY8XslcaXzXC hUqjuqjf2MdPG2G166Bh0D7+SXiq3e5IvEC0PrvkSyR2Bbwam8HkleUqRfg5VOYi9Zc8jQSdfqgcv DLjYdxpa4kGs2jfxKZY2wZnE9xChRbo10HhttJayznCX8JmsEB8EHzqSEog8rV2nn7M8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/HVM: fix xsm_op for 32-bit guests Message-Id: Date: Fri, 15 Oct 2021 22:46:03 +0000 commit 37ea2893e978ab311107f3e8cfdb8aaf8523f9fd Author: Jan Beulich AuthorDate: Fri Oct 15 11:19:11 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:19:11 2021 +0200 x86/HVM: fix xsm_op for 32-bit guests Like for PV, 32-bit guests need to invoke the compat handler, not the native one. Fixes: db984809d61b ("hvm: wire up domctl and xsm hypercalls") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: b6b672e8a925ff4b71a1a67bc7d213ef445af74f master date: 2021-10-11 10:58:44 +0200 --- xen/arch/x86/hvm/hypercall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index b6ccaf4457..f75285de51 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -137,7 +137,7 @@ static const hypercall_table_t hvm_hypercall_table[] = { HYPERCALL(event_channel_op), COMPAT_CALL(sched_op), COMPAT_CALL(set_timer_op), - HYPERCALL(xsm_op), + COMPAT_CALL(xsm_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), HYPERCALL(domctl), -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:46:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:46:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211119.368222 (Exim 4.92) (envelope-from ) id 1mbVxu-0004Gn-6O; Fri, 15 Oct 2021 22:46:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211119.368222; Fri, 15 Oct 2021 22:46:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxu-0004Gf-2n; Fri, 15 Oct 2021 22:46:14 +0000 Received: by outflank-mailman (input) for mailman id 211119; Fri, 15 Oct 2021 22:46:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxt-0004GX-Eg for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVxt-00075n-Dy for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVxt-0007lj-DC for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5bJJnzeGA7GvVLKw4Ck3J9FQIqfK7fCuMqd3B5YuF0Y=; b=w0E9MEn/ufB+J8U+0TsLwNf32M k6wshBHs/SdOQnYsaXbl+UBfvDkKD67wxtHWDmS8Mtj7PUndBp8r7O6DcZK7v7UqMvKBU+hwilqs2 KTfJMMGsQV8vNGRl2jN1y1Yms4+SRijpt0irIukkXj3mium8wBIE18MqbtwZ6j2qB2f0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Message-Id: Date: Fri, 15 Oct 2021 22:46:13 +0000 commit 49b0aef3f916e325e10d7d90ea25ea0321ac0d48 Author: Jan Beulich AuthorDate: Fri Oct 15 11:19:41 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:19:41 2021 +0200 AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Hidden devices are associated with DomXEN but usable by the hardware domain. Hence they need flushing as well when all devices are to have flushes invoked. While there drop a redundant ATS-enabled check and constify the first parameter of the involved function. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant master commit: 036432e8b27e1ef21e0f0204ba9b0e3972a031c2 master date: 2021-10-12 11:54:34 +0200 --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index fc5377f5f2..e155b1168f 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -309,14 +309,11 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, spin_unlock_irqrestore(&iommu->lock, flags); } -static void amd_iommu_flush_all_iotlbs(struct domain *d, daddr_t daddr, +static void amd_iommu_flush_all_iotlbs(const struct domain *d, daddr_t daddr, unsigned int order) { struct pci_dev *pdev; - if ( !ats_enabled ) - return; - for_each_pdev( d, pdev ) { u8 devfn = pdev->devfn; @@ -347,7 +344,16 @@ static void _amd_iommu_flush_pages(struct domain *d, } if ( ats_enabled ) + { amd_iommu_flush_all_iotlbs(d, daddr, order); + + /* + * Hidden devices are associated with DomXEN but usable by the + * hardware domain. Hence they need dealing with here as well. + */ + if ( is_hardware_domain(d) ) + amd_iommu_flush_all_iotlbs(dom_xen, daddr, order); + } } void amd_iommu_flush_all_pages(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Fri Oct 15 22:46:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 Oct 2021 22:46:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211120.368225 (Exim 4.92) (envelope-from ) id 1mbVy4-0004Jd-7R; Fri, 15 Oct 2021 22:46:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211120.368225; Fri, 15 Oct 2021 22:46:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVy4-0004JV-4E; Fri, 15 Oct 2021 22:46:24 +0000 Received: by outflank-mailman (input) for mailman id 211120; Fri, 15 Oct 2021 22:46:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVy3-0004JP-HU for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbVy3-00075x-Gs for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbVy3-0007mK-G5 for xen-changelog@lists.xenproject.org; Fri, 15 Oct 2021 22:46:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wb70p2ydwHkTiByd/DWxIk8GAkFD+o9xq7LfiqpSiw0=; b=Q7SsKpZuM+8n8k/67nkt5ih+Hy epu+qw/lNLVQIzV52yCQIqk47PfdDxdRLuRwIP5PCgOiOMkVpxOFEoaejOr/sJRrgoLDTR7wvMv1j nrTPW1L3cIEmRqcjQFmS4eVDXBkndzl6v0JuEcwuRY4enVT29RGAFS5qhlsxYGB2hahE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] x86/PV32: fix physdev_op_compat handling Message-Id: Date: Fri, 15 Oct 2021 22:46:23 +0000 commit 99cbe2031a6bba62819c8e8c2acffe7fe3486cb9 Author: Jan Beulich AuthorDate: Fri Oct 15 11:20:04 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:20:04 2021 +0200 x86/PV32: fix physdev_op_compat handling The conversion of the original code failed to recognize that the 32-bit compat variant of this (sorry, two different meanings of "compat" here) needs to continue to invoke the compat handler, not the native one. Arrange for this by adding yet another #define. Affected functions (having existed prior to the introduction of the new hypercall) are PHYSDEVOP_set_iobitmap and PHYSDEVOP_apic_{read,write}. For all others the operand struct layout doesn't differ. Fixes: 1252e2823117 ("x86/pv: Export pv_hypercall_table[] rather than working around it in several ways") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Andrew Cooper master commit: 834cb8761051f7d87816785c0d99fe9bd5f0ce30 master date: 2021-10-12 11:55:42 +0200 --- xen/arch/x86/x86_64/compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c index 0e4c71f2aa..fcbc1cc0d7 100644 --- a/xen/arch/x86/x86_64/compat.c +++ b/xen/arch/x86/x86_64/compat.c @@ -12,6 +12,7 @@ EMIT_FILE; #define physdev_op_t physdev_op_compat_t #define do_physdev_op compat_physdev_op #define do_physdev_op_compat(x) compat_physdev_op_compat(_##x) +#define native compat #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211220.368364 (Exim 4.92) (envelope-from ) id 1mbZVP-0000J3-G6; Sat, 16 Oct 2021 02:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211220.368364; Sat, 16 Oct 2021 02:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVP-0000Iu-Cm; Sat, 16 Oct 2021 02:33:03 +0000 Received: by outflank-mailman (input) for mailman id 211220; Sat, 16 Oct 2021 02:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVO-0000Io-8V for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVO-00050K-7T for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZVO-0007GP-6O for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3Ogs92KrLH1oVgkb0bVZUbVtqtPurV9QIwq9R9ULXFQ=; b=crf9QYhg8hhoIpiLC0/0qlQSRM IXppa1hElY+4DckbTPylfGU7v3ZXV9Ku0f4OWSoie9odcCEH27YRHf8d1W4NEvMTqTUaH9s/fAaeu tZZwv/UuhtEavwsc5vO4jaUDWqMVWgf9qqNOs2laNv/OXznaEg7CL3woF8WpivB5j/aU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] update Xen version to 4.15.2-pre Message-Id: Date: Sat, 16 Oct 2021 02:33:02 +0000 commit 7799c8a0261867158da5dc9c22ef6c1cde6ab97a Author: Jan Beulich AuthorDate: Fri Oct 15 10:58:16 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 10:58:16 2021 +0200 update Xen version to 4.15.2-pre --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index 5d5a1a0fa6..251fed79f0 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 15 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:33:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211221.368367 (Exim 4.92) (envelope-from ) id 1mbZVZ-0000Ke-HC; Sat, 16 Oct 2021 02:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211221.368367; Sat, 16 Oct 2021 02:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVZ-0000KW-EI; Sat, 16 Oct 2021 02:33:13 +0000 Received: by outflank-mailman (input) for mailman id 211221; Sat, 16 Oct 2021 02:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVY-0000KQ-Bg for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVY-00050Q-As for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZVY-0007HD-9a for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02: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=k/nmBmPtf+eGkVfXywrvJEsXsNFcAFe5AlxEdBCO8jw=; b=q/8Jthe3Haucx9tiHnc+KAYnbi EnWdJ0rj6eRjG+YWs+aNaRP6weiqrmx48xm6DWnytN+328/4x9fsqrmkPSJU6o4cWjCKlTaeh2CpP GMDO2w9nbo/FY6ewuef0y/Xbz0PVTYBejReTez/yhDdpxO08LrbBUE5qBRg2EzOuxVv8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] build: set policy filename on make command line Message-Id: Date: Sat, 16 Oct 2021 02:33:12 +0000 commit 05df87bc738df02d286e02c3aac81efbc39ccc8a Author: Anthony PERARD AuthorDate: Fri Oct 15 10:59:54 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 10:59:54 2021 +0200 build: set policy filename on make command line In order to avoid flask/Makefile.common calling `make xenversion`, we override POLICY_FILENAME with the value we are going to use anyway. Signed-off-by: Anthony PERARD Acked-by: Jan Beulich master commit: c81e7efe2146c8f381fbdbb037b9d46866a6451e master date: 2021-09-08 14:40:00 +0200 --- xen/xsm/flask/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index 637159ad82..af95697ed9 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -42,7 +42,9 @@ FLASK_BUILD_DIR := $(CURDIR) POLICY_SRC := $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) policy.bin: FORCE - $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common -C $(XEN_ROOT)/tools/flask/policy FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) + $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common \ + -C $(XEN_ROOT)/tools/flask/policy \ + FLASK_BUILD_DIR=$(FLASK_BUILD_DIR) POLICY_FILENAME=$(POLICY_SRC) cmp -s $(POLICY_SRC) $@ || cp $(POLICY_SRC) $@ .PHONY: clean -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:33:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211222.368372 (Exim 4.92) (envelope-from ) id 1mbZVj-0000Nk-Io; Sat, 16 Oct 2021 02:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211222.368372; Sat, 16 Oct 2021 02:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVj-0000Nc-Fg; Sat, 16 Oct 2021 02:33:23 +0000 Received: by outflank-mailman (input) for mailman id 211222; Sat, 16 Oct 2021 02:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVi-0000NK-Em for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVi-00050b-Dz for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZVi-0007Hv-D1 for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8djgtrfc9WFA20lEZHbHFAsSZOnWQEqm4RE7NTk2P1Y=; b=xNtnb4mJJpDAleW5nenm5FWvNk qKfzMkv8sRsu/xWI88BOvabI9/FHtVP//Zc68LLxD4hsMWlbuZ1wB7GHHJCAqsXdqfWIYzfS9v7xZ Ip6yHnqUaDNROwcv2+caDLAW/d6vc4vZLMYilnwntuJKTd2xepeMjcDsseI1zdANTJTQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec-ctrl: Split the "Hardware features" diagnostic line Message-Id: Date: Sat, 16 Oct 2021 02:33:22 +0000 commit c554188a0c9310f79aaa8b5be71b569bb1e1b547 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:00:21 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:00:21 2021 +0200 x86/spec-ctrl: Split the "Hardware features" diagnostic line Separate the read-only hints from the features requiring active actions on Xen's behalf. Also take the opportunity split the IBRS/IBPB and IBPB mess. More features with overlapping enumeration are on the way, and and it is not useful to split them like this. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 565ebcda976c05b0c6191510d5e32b621a2b1867 master date: 2021-09-08 14:16:19 +0100 --- xen/arch/x86/spec_ctrl.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index aa85a0be46..a7953e43bc 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -317,23 +317,30 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) printk("Speculative mitigation facilities:\n"); - /* Hardware features which pertain to speculative mitigations. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", - (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", - (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", - (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", - (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", - (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", - (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", - (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL": "", - (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", - (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", - (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : "", - (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + /* + * Hardware read-only information, stating immunity to certain issues, or + * suggestions of which mitigation to use. + */ + printk(" Hardware hints:%s%s%s%s%s%s%s\n", + (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", + (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", + (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", + (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL" : "", + (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", + (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", + (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + + /* Hardware features which need driving to mitigate issues. */ + printk(" Hardware features:%s%s%s%s%s%s%s%s\n", + (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ if ( IS_ENABLED(CONFIG_INDIRECT_THUNK) || IS_ENABLED(CONFIG_SHADOW_PAGING) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:33:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211225.368390 (Exim 4.92) (envelope-from ) id 1mbZVu-0000jZ-2s; Sat, 16 Oct 2021 02:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211225.368390; Sat, 16 Oct 2021 02: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 1mbZVt-0000jR-Vd; Sat, 16 Oct 2021 02:33:33 +0000 Received: by outflank-mailman (input) for mailman id 211225; Sat, 16 Oct 2021 02:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVs-0000id-IT for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZVs-00051N-Hf for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZVs-0007Id-GZ for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vvQcYUXH6A7SuxmCHY2RsPMmeSh2yLTvUhtb0vsQ0TA=; b=JlfbjVW8lbxKKY5FGTz1X0KA5m Y1KaCA4QR60YZFT6nkjN7DrwRzcvcQrqEkLgtDqZlraIjKMKOVpcjmJ1TjPHj/C67dA8S1f3PKJBi O+5gYpUPDj144BGBCdqNWk/5Sd6iaix0ZNdbjtnxHykQzomKsi8UxzZw1ivcARtUI7R8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/amd: Enumeration for speculative features/hints Message-Id: Date: Sat, 16 Oct 2021 02:33:32 +0000 commit 932ff4385afafb84034515646cde584e0a926011 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:00:53 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:00:53 2021 +0200 x86/amd: Enumeration for speculative features/hints There is a step change in speculation protections between the Zen1 and Zen2 microarchitectures. Zen1 and older have no special support. Control bits in non-architectural MSRs are used to make lfence be dispatch-serialising (Spectre v1), and to disable Memory Disambiguation (Speculative Store Bypass). IBPB was retrofitted in a microcode update, and software methods are required for Spectre v2 protections. Because the bit controlling Memory Disambiguation is model specific, hypervisors are expected to expose a MSR_VIRT_SPEC_CTRL interface which abstracts the model specific details. Zen2 and later implement the MSR_SPEC_CTRL interface in hardware, and virtualise the interface for HVM guests to use. A number of hint bits are specified too to help guide OS software to the most efficient mitigation strategy. Zen3 introduced a new feature, Predictive Store Forwarding, along with a control to disable it in sensitive code. Add CPUID and VMCB details for all the new functionality. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 747424c664bb164a04e7a9f2ffbf02d4a1630d7d master date: 2021-09-08 14:16:19 +0100 --- tools/libs/light/libxl_cpuid.c | 10 ++++++++++ tools/misc/xen-cpuid.c | 8 +++++++- xen/arch/x86/hvm/svm/svm.c | 1 + xen/arch/x86/hvm/svm/vmcb.c | 1 + xen/include/asm-x86/cpufeature.h | 5 +++++ xen/include/asm-x86/hvm/svm/svm.h | 2 ++ xen/include/asm-x86/hvm/svm/vmcb.h | 4 +++- xen/include/asm-x86/msr-index.h | 3 +++ xen/include/public/arch-x86/cpufeatureset.h | 10 ++++++++++ 9 files changed, 42 insertions(+), 2 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 289c59c742..aa6a6a5f4b 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -270,7 +270,17 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"rstr-fp-err-ptrs", 0x80000008, NA, CPUID_REG_EBX, 2, 1}, {"wbnoinvd", 0x80000008, NA, CPUID_REG_EBX, 9, 1}, {"ibpb", 0x80000008, NA, CPUID_REG_EBX, 12, 1}, + {"ibrs", 0x80000008, NA, CPUID_REG_EBX, 14, 1}, + {"amd-stibp", 0x80000008, NA, CPUID_REG_EBX, 15, 1}, + {"ibrs-always", 0x80000008, NA, CPUID_REG_EBX, 16, 1}, + {"stibp-always", 0x80000008, NA, CPUID_REG_EBX, 17, 1}, + {"ibrs-fast", 0x80000008, NA, CPUID_REG_EBX, 18, 1}, + {"ibrs-same-mode", 0x80000008, NA, CPUID_REG_EBX, 19, 1}, {"ppin", 0x80000008, NA, CPUID_REG_EBX, 23, 1}, + {"amd-ssbd", 0x80000008, NA, CPUID_REG_EBX, 24, 1}, + {"virt-ssbd", 0x80000008, NA, CPUID_REG_EBX, 25, 1}, + {"ssb-no", 0x80000008, NA, CPUID_REG_EBX, 26, 1}, + {"psfd", 0x80000008, NA, CPUID_REG_EBX, 28, 1}, {"nc", 0x80000008, NA, CPUID_REG_ECX, 0, 8}, {"apicidsize", 0x80000008, NA, CPUID_REG_ECX, 12, 4}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 531d56d9c9..47c75031d1 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -148,11 +148,17 @@ static const char *const str_e8b[32] = [ 0] = "clzero", [ 2] = "rstr-fp-err-ptrs", - /* [ 8] */ [ 9] = "wbnoinvd", + /* [ 8] */ [ 9] = "wbnoinvd", [12] = "ibpb", + [14] = "ibrs", [15] = "amd-stibp", + [16] = "ibrs-always", [17] = "stibp-always", + [18] = "ibrs-fast", [19] = "ibrs-same-mode", /* [22] */ [23] = "ppin", + [24] = "amd-ssbd", [25] = "virt-ssbd", + [26] = "ssb-no", + [28] = "psfd", }; static const char *const str_7d0[32] = diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 4585efe1f8..c38a7405c9 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1658,6 +1658,7 @@ const struct hvm_function_table * __init start_svm(void) P(cpu_has_pause_filter, "Pause-Intercept Filter"); P(cpu_has_pause_thresh, "Pause-Intercept Filter Threshold"); P(cpu_has_tsc_ratio, "TSC Rate MSR"); + P(cpu_has_svm_spec_ctrl, "MSR_SPEC_CTRL virtualisation"); #undef P if ( !printed ) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 373d5d4af4..55da9302e5 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -271,6 +271,7 @@ static void __init __maybe_unused build_assertions(void) BUILD_BUG_ON(offsetof(typeof(vmcb), rsp) != 0x5d8); BUILD_BUG_ON(offsetof(typeof(vmcb), rax) != 0x5f8); BUILD_BUG_ON(offsetof(typeof(vmcb), _g_pat) != 0x668); + BUILD_BUG_ON(offsetof(typeof(vmcb), spec_ctrl) != 0x6e0); /* Check struct segment_register against the VMCB segment layout. */ BUILD_BUG_ON(sizeof(vmcb.es) != 16); diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index a539a4bacd..3983200e67 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -127,6 +127,11 @@ /* CPUID level 0x80000007.edx */ #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) +/* CPUID level 0x80000008.ebx */ +#define cpu_has_amd_ssbd boot_cpu_has(X86_FEATURE_AMD_SSBD) +#define cpu_has_virt_ssbd boot_cpu_has(X86_FEATURE_VIRT_SSBD) +#define cpu_has_ssb_no boot_cpu_has(X86_FEATURE_SSB_NO) + /* CPUID level 0x00000007:0.edx */ #define cpu_has_avx512_4vnniw boot_cpu_has(X86_FEATURE_AVX512_4VNNIW) #define cpu_has_avx512_4fmaps boot_cpu_has(X86_FEATURE_AVX512_4FMAPS) diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index faeca40174..1598d01017 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -75,6 +75,7 @@ extern u32 svm_feature_flags; #define SVM_FEATURE_PAUSETHRESH 12 /* Pause intercept filter support */ #define SVM_FEATURE_VLOADSAVE 15 /* virtual vmload/vmsave */ #define SVM_FEATURE_VGIF 16 /* Virtual GIF */ +#define SVM_FEATURE_SPEC_CTRL 20 /* MSR_SPEC_CTRL virtualisation */ #define cpu_has_svm_feature(f) (svm_feature_flags & (1u << (f))) #define cpu_has_svm_npt cpu_has_svm_feature(SVM_FEATURE_NPT) @@ -89,6 +90,7 @@ extern u32 svm_feature_flags; #define cpu_has_pause_thresh cpu_has_svm_feature(SVM_FEATURE_PAUSETHRESH) #define cpu_has_tsc_ratio cpu_has_svm_feature(SVM_FEATURE_TSCRATEMSR) #define cpu_has_svm_vloadsave cpu_has_svm_feature(SVM_FEATURE_VLOADSAVE) +#define cpu_has_svm_spec_ctrl cpu_has_svm_feature(SVM_FEATURE_SPEC_CTRL) #define SVM_PAUSEFILTER_INIT 4000 #define SVM_PAUSETHRESH_INIT 1000 diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index 0b03a8f076..279c75a9dc 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -515,7 +515,9 @@ struct vmcb_struct { u64 _lastbranchtoip; /* cleanbit 10 */ u64 _lastintfromip; /* cleanbit 10 */ u64 _lastinttoip; /* cleanbit 10 */ - u64 res17[301]; + u64 res17[9]; + u64 spec_ctrl; + u64 res18[291]; }; struct svm_domain { diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 7e38c257d8..e3d44813ff 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -33,6 +33,7 @@ #define SPEC_CTRL_IBRS (_AC(1, ULL) << 0) #define SPEC_CTRL_STIBP (_AC(1, ULL) << 1) #define SPEC_CTRL_SSBD (_AC(1, ULL) << 2) +#define SPEC_CTRL_PSFD (_AC(1, ULL) << 7) #define MSR_PRED_CMD 0x00000049 #define PRED_CMD_IBPB (_AC(1, ULL) << 0) @@ -137,6 +138,8 @@ #define VM_CR_INIT_REDIRECTION (_AC(1, ULL) << 1) #define VM_CR_SVM_DISABLE (_AC(1, ULL) << 4) +#define MSR_VIRT_SPEC_CTRL 0xc001011f /* Layout matches MSR_SPEC_CTRL */ + /* * Legacy MSR constants in need of cleanup. No new MSRs below this comment. */ diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index b4f3d622a0..ec2706fe2e 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -255,7 +255,17 @@ XEN_CPUFEATURE(CLZERO, 8*32+ 0) /*A CLZERO instruction */ XEN_CPUFEATURE(RSTR_FP_ERR_PTRS, 8*32+ 2) /*A (F)X{SAVE,RSTOR} always saves/restores FPU Error pointers */ XEN_CPUFEATURE(WBNOINVD, 8*32+ 9) /* WBNOINVD instruction */ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by AMD) */ +XEN_CPUFEATURE(IBRS, 8*32+14) /* MSR_SPEC_CTRL.IBRS */ +XEN_CPUFEATURE(AMD_STIBP, 8*32+15) /* MSR_SPEC_CTRL.STIBP */ +XEN_CPUFEATURE(IBRS_ALWAYS, 8*32+16) /* IBRS preferred always on */ +XEN_CPUFEATURE(STIBP_ALWAYS, 8*32+17) /* STIBP preferred always on */ +XEN_CPUFEATURE(IBRS_FAST, 8*32+18) /* IBRS preferred over software options */ +XEN_CPUFEATURE(IBRS_SAME_MODE, 8*32+19) /* IBRS provides same-mode protection */ XEN_CPUFEATURE(AMD_PPIN, 8*32+23) /* Protected Processor Inventory Number */ +XEN_CPUFEATURE(AMD_SSBD, 8*32+24) /* MSR_SPEC_CTRL.SSBD available */ +XEN_CPUFEATURE(VIRT_SSBD, 8*32+25) /* MSR_VIRT_SPEC_CTRL.SSBD */ +XEN_CPUFEATURE(SSB_NO, 8*32+26) /* Hardware not vulnerable to SSB */ +XEN_CPUFEATURE(PSFD, 8*32+28) /* MSR_SPEC_CTRL.PSFD */ /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:33:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211226.368395 (Exim 4.92) (envelope-from ) id 1mbZW3-0000qi-5K; Sat, 16 Oct 2021 02:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211226.368395; Sat, 16 Oct 2021 02:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZW3-0000qU-0u; Sat, 16 Oct 2021 02:33:43 +0000 Received: by outflank-mailman (input) for mailman id 211226; Sat, 16 Oct 2021 02:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZW2-0000qC-LM for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZW2-00051d-Kd for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZW2-0007JZ-Jx for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8/J9I62Y68zLKHDile/zXl/fE7fMaIAD+PoKA555N8w=; b=zDTvwg9vuxpIitqyPtVDVaDOfg us78uSlyBoymyFy97K6bnGY6knG7l3PpJ74MAvkZ+d37bemeMnS/B7KRW7Krioj3eXyux2hcow9qo sD6s/Ow/1E+h4EjsHm96G2yI583rMPZXSWdIBhiEnHKjF1nxdks1aX04gIKmDK5XnjPM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/amd: Use newer SSBD mechanisms if they exist Message-Id: Date: Sat, 16 Oct 2021 02:33:42 +0000 commit cb7d7aa4c1bc40c987afdf73ee7e65689d2a24af Author: Andrew Cooper AuthorDate: Fri Oct 15 11:01:32 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:01:32 2021 +0200 x86/amd: Use newer SSBD mechanisms if they exist The opencoded legacy Memory Disambiguation logic in init_amd() neglected Fam19h for the Zen3 microarchitecture. Further more, all Zen2 based system have the architectural MSR_SPEC_CTRL and the SSBD bit within it, so shouldn't be using MSR_AMD64_LS_CFG. Implement the algorithm given in AMD's SSBD whitepaper, and leave a printk_once() behind in the case that no controls can be found. This now means that a user explicitly choosing `spec-ctrl=ssbd` will properly turn off Memory Disambiguation on Fam19h/Zen3 systems. This still remains a single system-wide setting (for now), and is not context switched between vCPUs. As such, it doesn't interact with Intel's use of MSR_SPEC_CTRL and default_xen_spec_ctrl (yet). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 2a4e6c4e4bea2e0bb720418c331ee28ff9c7632e master date: 2021-09-08 14:16:19 +0100 --- xen/arch/x86/cpu/amd.c | 69 +++++++++++++++++++++++++++++++++++------------- xen/arch/x86/cpu/cpu.h | 1 + xen/arch/x86/cpu/hygon.c | 9 +------ xen/arch/x86/spec_ctrl.c | 5 +++- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index db6916c1fd..10495aca35 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -642,6 +642,56 @@ void early_init_amd(struct cpuinfo_x86 *c) ctxt_switch_levelling(NULL); } +/* + * Refer to the AMD Speculative Store Bypass whitepaper: + * https://developer.amd.com/wp-content/resources/124441_AMD64_SpeculativeStoreBypassDisable_Whitepaper_final.pdf + */ +void amd_init_ssbd(const struct cpuinfo_x86 *c) +{ + int bit = -1; + + if (cpu_has_ssb_no) + return; + + if (cpu_has_amd_ssbd) { + wrmsrl(MSR_SPEC_CTRL, opt_ssbd ? SPEC_CTRL_SSBD : 0); + return; + } + + if (cpu_has_virt_ssbd) { + wrmsrl(MSR_VIRT_SPEC_CTRL, opt_ssbd ? SPEC_CTRL_SSBD : 0); + return; + } + + switch (c->x86) { + case 0x15: bit = 54; break; + case 0x16: bit = 33; break; + case 0x17: + case 0x18: bit = 10; break; + } + + if (bit >= 0) { + uint64_t val, mask = 1ull << bit; + + if (rdmsr_safe(MSR_AMD64_LS_CFG, val) || + ({ + val &= ~mask; + if (opt_ssbd) + val |= mask; + false; + }) || + wrmsr_safe(MSR_AMD64_LS_CFG, val) || + ({ + rdmsrl(MSR_AMD64_LS_CFG, val); + (val & mask) != (opt_ssbd * mask); + })) + bit = -1; + } + + if (bit < 0) + printk_once(XENLOG_ERR "No SSBD controls available\n"); +} + static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; @@ -718,24 +768,7 @@ static void init_amd(struct cpuinfo_x86 *c) c->x86_capability); } - /* - * If the user has explicitly chosen to disable Memory Disambiguation - * to mitigiate Speculative Store Bypass, poke the appropriate MSR. - */ - if (opt_ssbd) { - int bit = -1; - - switch (c->x86) { - case 0x15: bit = 54; break; - case 0x16: bit = 33; break; - case 0x17: bit = 10; break; - } - - if (bit >= 0 && !rdmsr_safe(MSR_AMD64_LS_CFG, value)) { - value |= 1ull << bit; - wrmsr_safe(MSR_AMD64_LS_CFG, value); - } - } + amd_init_ssbd(c); /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index 1992596d1b..2550957801 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -20,3 +20,4 @@ extern bool detect_extended_topology(struct cpuinfo_x86 *c); void early_init_amd(struct cpuinfo_x86 *c); void amd_log_freq(const struct cpuinfo_x86 *c); +void amd_init_ssbd(const struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 46293f1f36..ccfa27201d 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -59,14 +59,7 @@ static void init_hygon(struct cpuinfo_x86 *c) __set_bit(X86_FEATURE_LFENCE_DISPATCH, c->x86_capability); - /* - * If the user has explicitly chosen to disable Memory Disambiguation - * to mitigiate Speculative Store Bypass, poke the appropriate MSR. - */ - if (opt_ssbd && !rdmsr_safe(MSR_AMD64_LS_CFG, value)) { - value |= 1ull << 10; - wrmsr_safe(MSR_AMD64_LS_CFG, value); - } + amd_init_ssbd(c); /* MFENCE stops RDTSC speculation */ if (!cpu_has_lfence_dispatch) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index a7953e43bc..e0e468783c 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -326,20 +326,23 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", (caps & ARCH_CAPS_SKIP_L1DFL) ? " SKIP_L1DFL" : "", + (e8b & cpufeat_mask(X86_FEATURE_SSB_NO)) || (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (e8b & cpufeat_mask(X86_FEATURE_AMD_SSBD)) || (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (e8b & cpufeat_mask(X86_FEATURE_VIRT_SSBD)) ? " VIRT_SSBD" : "", (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:33:53 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211230.368398 (Exim 4.92) (envelope-from ) id 1mbZWD-00015n-5N; Sat, 16 Oct 2021 02:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211230.368398; Sat, 16 Oct 2021 02:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWD-00015g-2S; Sat, 16 Oct 2021 02:33:53 +0000 Received: by outflank-mailman (input) for mailman id 211230; Sat, 16 Oct 2021 02:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWC-00015C-OX for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWC-00051q-Nl for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZWC-0007KJ-Mx for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:33:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5ID52VdfRG3Io40N9LRJM0tYx9uA5MvOs9PQvC9w3ro=; b=1ndxdMwD3xdPHs3CYQBYHf6O4Z eyXtHtYCXqqS/qpjfVkOzzgB+7nc1KM2D57e7C03Kj9doV81y2Ay0o6GzPbfEg4bUn82lPI3GNNk2 Pu8fu9HVQ4Dn9msIn0DDWd9PMvaB9NJIZ3xlwii7nF8SS/+399NWvQEbB4jfNlvuhznM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/spec-ctrl: Print all AMD speculative hints/features Message-Id: Date: Sat, 16 Oct 2021 02:33:52 +0000 commit b482e969db68ff8d6b586f8b294f34ec5fa28c97 Author: Andrew Cooper AuthorDate: Fri Oct 15 11:02:02 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:02:02 2021 +0200 x86/spec-ctrl: Print all AMD speculative hints/features We already print Intel features that aren't yet implemented/used, so be consistent on AMD too. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: 3d189f16a11d5a209fb47fa3635847608d43745c master date: 2021-09-09 12:36:17 +0100 --- xen/arch/x86/spec_ctrl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index e0e468783c..7e0c171dc8 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -321,7 +321,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) * Hardware read-only information, stating immunity to certain issues, or * suggestions of which mitigation to use. */ - printk(" Hardware hints:%s%s%s%s%s%s%s\n", + printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s\n", (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", @@ -329,16 +329,23 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) (e8b & cpufeat_mask(X86_FEATURE_SSB_NO)) || (caps & ARCH_CAPS_SSB_NO) ? " SSB_NO" : "", (caps & ARCH_CAPS_MDS_NO) ? " MDS_NO" : "", - (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : ""); + (caps & ARCH_CAPS_TAA_NO) ? " TAA_NO" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_ALWAYS)) ? " IBRS_ALWAYS" : "", + (e8b & cpufeat_mask(X86_FEATURE_STIBP_ALWAYS)) ? " STIBP_ALWAYS" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_FAST)) ? " IBRS_FAST" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS_SAME_MODE)) ? " IBRS_SAME_MODE" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBRS)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS" : "", + (e8b & cpufeat_mask(X86_FEATURE_AMD_STIBP)) || (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", (e8b & cpufeat_mask(X86_FEATURE_AMD_SSBD)) || (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (e8b & cpufeat_mask(X86_FEATURE_PSFD)) ? " PSFD" : "", (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:34:03 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:34:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211233.368403 (Exim 4.92) (envelope-from ) id 1mbZWN-0001CB-7O; Sat, 16 Oct 2021 02:34:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211233.368403; Sat, 16 Oct 2021 02:34:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWN-0001C1-43; Sat, 16 Oct 2021 02:34:03 +0000 Received: by outflank-mailman (input) for mailman id 211233; Sat, 16 Oct 2021 02:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWM-0001Bt-Rt for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWM-00052I-RB for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZWM-0007L7-QG for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=K5gSdk2HJHK5e8XfO6ua4FmS3R+AAjOvqb96y+AmuD0=; b=cvSGV90gWTaw8jro3jeSYCVYe7 k6xR6vc5yk0p6bCjqcd5NzGcHnxdXK72eTD/CyEYK2Dmtq+w/HI4Qxk+wA1PVa1/m9VVGzGwux/p6 pxwVc3DHsJ8dsL3PlunV/HxvH5no9WOfeutKB+Ox4Exbfwm0Mv3d5y/m+Xi/Xe2JeYTU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] tools/libacpi: Use 64-byte alignment for FACS Message-Id: Date: Sat, 16 Oct 2021 02:34:02 +0000 commit 8f5a16cdc9df3f96c9246cf47b1d3b6e0e67b15a Author: Kevin Stefanov AuthorDate: Fri Oct 15 11:02:27 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:02:27 2021 +0200 tools/libacpi: Use 64-byte alignment for FACS The spec requires 64-byte alignment, not 16. Signed-off-by: Kevin Stefanov Reviewed-by: Jan Beulich master commit: c76cfada1cfad05aaf64ce3ad305c5467650e782 master date: 2021-09-10 13:27:08 +0100 --- tools/libacpi/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index a61dd5583a..fe2db66a62 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -532,7 +532,7 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config) * Fill in high-memory data structures, starting at @buf. */ - facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 16); + facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 64); if (!facs) goto oom; memcpy(facs, &Facs, sizeof(struct acpi_20_facs)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:34:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:34:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211235.368406 (Exim 4.92) (envelope-from ) id 1mbZWY-0001FO-8U; Sat, 16 Oct 2021 02:34:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211235.368406; Sat, 16 Oct 2021 02:34:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWY-0001FG-5X; Sat, 16 Oct 2021 02:34:14 +0000 Received: by outflank-mailman (input) for mailman id 211235; Sat, 16 Oct 2021 02:34:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWW-0001FA-VT for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWW-00052T-Ul for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZWW-0007M8-Tr for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=44e9b0ReYUvz997IOUxDza65COlbmadK3E78jvfAhOw=; b=UQoXTbhYPam3v42soo7hJ9wiPj j2S5Cpbw0TFGaJen8OJl+jzxC/k/yR4hQKRD+U9svV9dbsdWb6xMqd/sdqGFVPZ3wH2rc0o3W7OV6 W9CEIWUMalImXgO/BBssyBC6bDa+IiG2dMq2ZgatwG79HpOwo6AlsBdh+8UEGh/L3O3w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] sched: fix sched_move_domain() for domain without vcpus Message-Id: Date: Sat, 16 Oct 2021 02:34:12 +0000 commit c3c9a7c890537249c0777eb098a169bcfd946047 Author: Juergen Gross AuthorDate: Fri Oct 15 11:02:52 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:02:52 2021 +0200 sched: fix sched_move_domain() for domain without vcpus In case a domain is created with a cpupool other than Pool-0 specified it will be moved to that cpupool before any vcpus are allocated. This will lead to a NULL pointer dereference in sched_move_domain(). Fix that by tolerating vcpus not being allocated yet. Fixes: 70fadc41635b9b6 ("xen/cpupool: support moving domain between cpupools with different granularity") Reported-by: Bertrand Marquis Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli master commit: 999e1582f289cfb8d59e2e58927c1cba0ac2ada3 master date: 2021-09-15 10:57:47 +0200 --- xen/common/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 8d178baf3d..8f4b1ca10d 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -651,7 +651,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) struct scheduler *old_ops = dom_scheduler(d); void *old_domdata; unsigned int gran = cpupool_get_granularity(c); - unsigned int n_units = DIV_ROUND_UP(d->max_vcpus, gran); + unsigned int n_units = d->vcpu[0] ? DIV_ROUND_UP(d->max_vcpus, gran) : 0; int ret = 0; for_each_vcpu ( d, v ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:34:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:34:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211237.368410 (Exim 4.92) (envelope-from ) id 1mbZWi-0001JA-B9; Sat, 16 Oct 2021 02:34:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211237.368410; Sat, 16 Oct 2021 02:34:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWi-0001J2-8L; Sat, 16 Oct 2021 02:34:24 +0000 Received: by outflank-mailman (input) for mailman id 211237; Sat, 16 Oct 2021 02:34:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWh-0001Il-2Q for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWh-00052e-1m for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZWh-0007N5-0l for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FBTGvwBb0VZ3j7Cm7F/cIKFxjT1TxfFBp48sic5KcQs=; b=vCFjywffICsoMlEEjRmhTsWsF5 o7g8Ibdhg2qB6MehCbG7e8hgERhWSQTvE8Wyay4a4yiN/uo/4eYgwYJu5koF2L+HN3bVwFq1fqXxd 9XEeEtutefW885NgoRopgg0KS4tf3k5oGb+7dEW8uJKwQZxBotCoHtFx/QNw3ejNR4cw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86: quote section names when defining them in linker script Message-Id: Date: Sat, 16 Oct 2021 02:34:23 +0000 commit c67f652339289ccf1a34bddb50522da2ab4fd351 Author: Roger Pau Monné AuthorDate: Fri Oct 15 11:03:18 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:03:18 2021 +0200 x86: quote section names when defining them in linker script LLVM ld seems to require section names to be quoted at both definition and when referencing them for a match to happen, or else we get the following errors: ld: error: xen.lds:45: undefined section ".text" ld: error: xen.lds:69: undefined section ".rodata" ld: error: xen.lds:104: undefined section ".note.gnu.build-id" [...] The original fix for GNU ld 2.37 only quoted the section name when referencing it in the ADDR function. Fix by also quoting the section names when declaring them. Fixes: 58ad654ebce7 ("x86: work around build issue with GNU ld 2.37") Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich master commit: 6254920587c33bcc7ab884e6c9a11cfc0d5867ab master date: 2021-09-15 11:02:21 +0200 --- xen/arch/x86/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index a02df18a25..fcc6646487 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -18,7 +18,7 @@ ENTRY(efi_start) #else /* !EFI */ #define FORMAT "elf64-x86-64" -#define DECL_SECTION(x) x : AT(ADDR(#x) - __XEN_VIRT_START) +#define DECL_SECTION(x) #x : AT(ADDR(#x) - __XEN_VIRT_START) ENTRY(start_pa) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:34:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:34:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211238.368414 (Exim 4.92) (envelope-from ) id 1mbZWs-0001MD-Cg; Sat, 16 Oct 2021 02:34:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211238.368414; Sat, 16 Oct 2021 02:34:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWs-0001M5-9o; Sat, 16 Oct 2021 02:34:34 +0000 Received: by outflank-mailman (input) for mailman id 211238; Sat, 16 Oct 2021 02:34:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWr-0001Lv-5q for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZWr-000535-59 for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZWr-0007Nz-4L for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=60tDTJrDCkfLHaJM5P82mXjAo5bYFh+XnirKm+F2W6s=; b=J9tb6ANDytTkIyVOMSi7GWUX5Y iIJB0N349zVGHpCgU579Gdz3nwjoCtszIwkrxHz7v+bjqIKZNgRAR94+rNHkaWNFULQJ02sJOOdR2 5XP6L0/Pz1WwzwVZn1A6fkn0FKJpWRQvvCCuhKd/OvmYx23Wpj/tcr2BgZNl0j6iomBE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] VT-d: consider hidden devices when unmapping Message-Id: Date: Sat, 16 Oct 2021 02:34:33 +0000 commit 0950b18ae4bfbb27ca030731acd1ae4c90e659eb Author: Jan Beulich AuthorDate: Fri Oct 15 11:03:46 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:03:46 2021 +0200 VT-d: consider hidden devices when unmapping Whether to clear an IOMMU's bit in the domain's bitmap should depend on all devices the domain can control. For the hardware domain this includes hidden devices, which are associated with DomXEN. While touching related logic - convert the "current device" exclusion check to a simple pointer comparison, - convert "found" to "bool", - adjust style and correct a typo in an existing comment. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian master commit: 75bfe6ec4844f83b300b9807bceaed1e2fe23270 master date: 2021-09-20 10:24:27 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 48 ++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index affdf88b7e..be4eced660 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1654,6 +1654,27 @@ int domain_context_unmap_one( return rc; } +static bool any_pdev_behind_iommu(const struct domain *d, + const struct pci_dev *exclude, + const struct vtd_iommu *iommu) +{ + const struct pci_dev *pdev; + + for_each_pdev ( d, pdev ) + { + const struct acpi_drhd_unit *drhd; + + if ( pdev == exclude ) + continue; + + drhd = acpi_find_matched_drhd_unit(pdev); + if ( drhd && drhd->iommu == iommu ) + return true; + } + + return false; +} + static int domain_context_unmap(struct domain *domain, u8 devfn, struct pci_dev *pdev) { @@ -1661,7 +1682,7 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct vtd_iommu *iommu; int ret = 0; u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; - int found = 0; + bool found; drhd = acpi_find_matched_drhd_unit(pdev); if ( !drhd ) @@ -1743,23 +1764,18 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, goto out; /* - * if no other devices under the same iommu owned by this domain, - * clear iommu in iommu_bitmap and clear domain_id in domid_bitmp + * If no other devices under the same iommu owned by this domain, + * clear iommu in iommu_bitmap and clear domain_id in domid_bitmap. */ - for_each_pdev ( domain, pdev ) - { - if ( pdev->seg == seg && pdev->bus == bus && pdev->devfn == devfn ) - continue; - - drhd = acpi_find_matched_drhd_unit(pdev); - if ( drhd && drhd->iommu == iommu ) - { - found = 1; - break; - } - } + found = any_pdev_behind_iommu(domain, pdev, iommu); + /* + * Hidden devices are associated with DomXEN but usable by the hardware + * domain. Hence they need considering here as well. + */ + if ( !found && is_hardware_domain(domain) ) + found = any_pdev_behind_iommu(dom_xen, pdev, iommu); - if ( found == 0 ) + if ( !found ) { clear_bit(iommu->index, &dom_iommu(domain)->arch.vtd.iommu_bitmap); cleanup_domid_map(domain, iommu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:34:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:34:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211239.368418 (Exim 4.92) (envelope-from ) id 1mbZX2-0001PX-Eg; Sat, 16 Oct 2021 02:34:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211239.368418; Sat, 16 Oct 2021 02:34:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZX2-0001PO-BL; Sat, 16 Oct 2021 02:34:44 +0000 Received: by outflank-mailman (input) for mailman id 211239; Sat, 16 Oct 2021 02:34:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZX1-0001PD-97 for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZX1-00053G-8U for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZX1-0007P4-7Y for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xzOVGXng95yNbal0Wo70EBg/mUWz5RxUfs/PcS6RQ5Y=; b=WTdrVkGobHUYef3/pYUZaI9QQv Eac13tC8822uoxvf941+I3BqwRnfdXVG05PM9AThu6/0plV0UOEWHWtSPLV2WlSu1D3XAXlnQCG2Z WEomn2JgSLUkYeuUV8sp71RfpeQT+nbLYWX9e7ewsTr42WhZNX9ugzChIgn1KgLGEnZU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] VT-d: PCI segment numbers are up to 16 bits wide Message-Id: Date: Sat, 16 Oct 2021 02:34:43 +0000 commit a82a0a89003e85c93f8f5179ea190e1771b4a77f Author: Jan Beulich AuthorDate: Fri Oct 15 11:04:22 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:04:22 2021 +0200 VT-d: PCI segment numbers are up to 16 bits wide We shouldn't silently truncate respective values. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian master commit: a3dd33e63c2c8c51102f223e6efe2e3d3bdcbec1 master date: 2021-09-20 10:25:03 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index be4eced660..fbc749436b 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1471,7 +1471,8 @@ static int domain_context_mapping(struct domain *domain, u8 devfn, { struct acpi_drhd_unit *drhd; int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, secbus; drhd = acpi_find_matched_drhd_unit(pdev); if ( !drhd ) @@ -1681,7 +1682,8 @@ static int domain_context_unmap(struct domain *domain, u8 devfn, struct acpi_drhd_unit *drhd; struct vtd_iommu *iommu; int ret = 0; - u8 seg = pdev->seg, bus = pdev->bus, tmp_bus, tmp_devfn, secbus; + uint16_t seg = pdev->seg; + uint8_t bus = pdev->bus, tmp_bus, tmp_devfn, secbus; bool found; drhd = acpi_find_matched_drhd_unit(pdev); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:34:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:34:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211240.368421 (Exim 4.92) (envelope-from ) id 1mbZXC-0001Sg-Fu; Sat, 16 Oct 2021 02:34:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211240.368421; Sat, 16 Oct 2021 02:34:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXC-0001SX-Cr; Sat, 16 Oct 2021 02:34:54 +0000 Received: by outflank-mailman (input) for mailman id 211240; Sat, 16 Oct 2021 02:34:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXB-0001SM-CE for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXB-00053R-BV for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZXB-0007Pt-Af for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:34:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YCkSFLy1byNMXOnIwzOt6S1fRYDkC2cOOn+nQEN08g0=; b=0QABSn/gf0lGUY8+NoU2AoXH2l B0DsM+4sNReR0wO3T0diHDFBCB97AJRVRGVQgLfsrHsRbyZCkWOUki3bgrOdcH+ESCcsbkuoj7L/V EmFZlsNzuSl6XkJwUuGpF4nNy1XLmr7u6k/OJi7L2ga/KvHX006XkVrkp4frP4tPvvA4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] pci: fix handling of PCI bridges with subordinate bus number 0xff Message-Id: Date: Sat, 16 Oct 2021 02:34:53 +0000 commit d4f39cf717539e9455a2b83321e05db37171f855 Author: Igor Druzhinin AuthorDate: Fri Oct 15 11:04:46 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:04:46 2021 +0200 pci: fix handling of PCI bridges with subordinate bus number 0xff Bus number 0xff is valid according to the PCI spec. Using u8 typed sub_bus and assigning 0xff to it will result in the following loop getting stuck. for ( ; sec_bus <= sub_bus; sec_bus++ ) {...} Just change its type to unsigned int similarly to what is already done in dmar_scope_add_buses(). Signed-off-by: Igor Druzhinin Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis master commit: 9c3b9800e2019c93ab22da69e4a0b22d6fb059ec master date: 2021-09-28 16:04:50 +0200 --- xen/drivers/passthrough/pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index a9e3ac906f..e2c022aeea 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -363,8 +363,7 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn) /* update bus2bridge */ switch ( pdev->type = pdev_type(pseg->nr, bus, devfn) ) { - u16 cap; - u8 sec_bus, sub_bus; + unsigned int cap, sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: @@ -431,7 +430,7 @@ static void free_pdev(struct pci_seg *pseg, struct pci_dev *pdev) /* update bus2bridge */ switch ( pdev->type ) { - uint8_t sec_bus, sub_bus; + unsigned int sec_bus, sub_bus; case DEV_TYPE_PCIe2PCI_BRIDGE: case DEV_TYPE_LEGACY_PCI_BRIDGE: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:35:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:35:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211241.368426 (Exim 4.92) (envelope-from ) id 1mbZXM-0001WL-HF; Sat, 16 Oct 2021 02:35:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211241.368426; Sat, 16 Oct 2021 02:35:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXM-0001WD-EN; Sat, 16 Oct 2021 02:35:04 +0000 Received: by outflank-mailman (input) for mailman id 211241; Sat, 16 Oct 2021 02:35:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXL-0001Vz-FR for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXL-00053o-El for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZXL-0007RJ-Dp for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VOrSMjY6jGPfEcKfgnNFlJOyIROfd9C8RsAtiGy8l/s=; b=VQQtPbmLALskuqBmffip4lC9xc P4whf6jhc9ts3IfGGjokw3tCdBWAP3VFNpd7cuJpyGchJyOCVMcWskBQfLOy/+IOHJinLQSLGyTxd 0qzM5nPxnOF2nF0gzFxU3O7xeutNlUArOUfE+24euR9wFGDj1cBDHg2rImj3sM39/xPY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion Message-Id: Date: Sat, 16 Oct 2021 02:35:03 +0000 commit a2a17eec77da3d7882a2b5bf3c2e2937c4be6333 Author: Jan Beulich AuthorDate: Fri Oct 15 11:05:17 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:05:17 2021 +0200 x86/build: suppress EFI-related tool chain checks upon local $(MAKE) recursion The xen-syms and xen.efi linking steps are serialized only when the intermediate note.o file is necessary. Otherwise both may run in parallel. This in turn means that the compiler / linker invocations to create efi/check.o / efi/check.efi may also happen twice in parallel. Obviously it's a bad idea to have multiple producers of the same output race with one another - every once in a while one may e.g. observe objdump: efi/check.efi: file format not recognized We don't need this EFI related checking to occur when producing the intermediate symbol and relocation table objects, and we have an easy way of suppressing it: Simply pass in "efi-y=", overriding the assignments done in the Makefile and thus forcing the tool chain checks to be bypassed. Signed-off-by: Jan Beulich Reviewed-by: Anthony PERARD master commit: 24b0ce9a5da2e648cde818055a085bcbcf24ecb0 master date: 2021-10-11 10:58:17 +0200 --- xen/arch/x86/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index b560c12a58..2211616cdb 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -162,13 +162,13 @@ $(TARGET)-syms: prelink.o xen.lds $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort \ >$(@D)/.$(@F).0.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \ >$(@D)/.$(@F).1.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1.o $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ @@ -222,14 +222,14 @@ $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o + $(MAKE) -f $(BASEDIR)/Rules.mk efi-y= $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:35:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:35:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211243.368430 (Exim 4.92) (envelope-from ) id 1mbZXW-0001b0-It; Sat, 16 Oct 2021 02:35:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211243.368430; Sat, 16 Oct 2021 02:35:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXW-0001as-Fq; Sat, 16 Oct 2021 02:35:14 +0000 Received: by outflank-mailman (input) for mailman id 211243; Sat, 16 Oct 2021 02:35:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXV-0001ad-IL for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXV-000545-Hc for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZXV-0007SI-Gt for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Yva98xmUnfdKtEyd2eA1JNG6pSFISdgr+/c+rKVuvMI=; b=NvZopz/cQyNFvpc6BQ40yxRUxA gK/DpxrAW8G5karjGZBGnLjdTZiIm9HCuclsvw+DC5fAh3kz7jlm+ycV1n3R3AfXVmTq/ynmALTMO 5vaTLRiwMoLwRAd/SLXQFoSIbBt1eJu+uRkGeLGSGL6P0DEReGxu2i8LsSa8RFkfthGc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/HVM: fix xsm_op for 32-bit guests Message-Id: Date: Sat, 16 Oct 2021 02:35:13 +0000 commit ad70a247e132696944bd5f22fb886f99b4ed23e3 Author: Jan Beulich AuthorDate: Fri Oct 15 11:05:50 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:05:50 2021 +0200 x86/HVM: fix xsm_op for 32-bit guests Like for PV, 32-bit guests need to invoke the compat handler, not the native one. Fixes: db984809d61b ("hvm: wire up domctl and xsm hypercalls") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: b6b672e8a925ff4b71a1a67bc7d213ef445af74f master date: 2021-10-11 10:58:44 +0200 --- xen/arch/x86/hvm/hypercall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 01846b0718..40cc8fb993 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -136,7 +136,7 @@ static const hypercall_table_t hvm_hypercall_table[] = { HYPERCALL(event_channel_op), COMPAT_CALL(sched_op), COMPAT_CALL(set_timer_op), - HYPERCALL(xsm_op), + COMPAT_CALL(xsm_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), HYPERCALL(domctl), -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:35:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:35:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211244.368434 (Exim 4.92) (envelope-from ) id 1mbZXg-0001dt-KN; Sat, 16 Oct 2021 02:35:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211244.368434; Sat, 16 Oct 2021 02:35:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXg-0001dl-HH; Sat, 16 Oct 2021 02:35:24 +0000 Received: by outflank-mailman (input) for mailman id 211244; Sat, 16 Oct 2021 02:35:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXf-0001dd-LM for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXf-00054G-Kg for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZXf-0007TW-Ji for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iTaIzXy6a9xKkttb0nH+EpAYFpRm/8f/0s5h6QYl06A=; b=WOJJwMBWL7rq7OcRpjURwzJvlR DMVrmJcsllJ9Az3xUajtAdHuZP9ARcdOkb9l/K5tFqVAEZltKw5ZnECABDsWJMd/LBWxzhnyNEAEa FPqzChfgSXXFe4LOsjA+03uSEz9CZdZgEPQKu8BsR9kD+v/YlTXSvtRXMJXqCL/LAN+k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Message-Id: Date: Sat, 16 Oct 2021 02:35:23 +0000 commit b79615bd7e370944d088a719534391dc54f694df Author: Jan Beulich AuthorDate: Fri Oct 15 11:06:16 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:06:16 2021 +0200 AMD/IOMMU: consider hidden devices when flushing device I/O TLBs Hidden devices are associated with DomXEN but usable by the hardware domain. Hence they need flushing as well when all devices are to have flushes invoked. While there drop a redundant ATS-enabled check and constify the first parameter of the involved function. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant master commit: 036432e8b27e1ef21e0f0204ba9b0e3972a031c2 master date: 2021-10-12 11:54:34 +0200 --- xen/drivers/passthrough/amd/iommu_cmd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index 92a688dc9d..dfb8b1c860 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -304,14 +304,11 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, spin_unlock_irqrestore(&iommu->lock, flags); } -static void amd_iommu_flush_all_iotlbs(struct domain *d, daddr_t daddr, +static void amd_iommu_flush_all_iotlbs(const struct domain *d, daddr_t daddr, unsigned int order) { struct pci_dev *pdev; - if ( !ats_enabled ) - return; - for_each_pdev( d, pdev ) { u8 devfn = pdev->devfn; @@ -342,7 +339,16 @@ static void _amd_iommu_flush_pages(struct domain *d, } if ( ats_enabled ) + { amd_iommu_flush_all_iotlbs(d, daddr, order); + + /* + * Hidden devices are associated with DomXEN but usable by the + * hardware domain. Hence they need dealing with here as well. + */ + if ( is_hardware_domain(d) ) + amd_iommu_flush_all_iotlbs(dom_xen, daddr, order); + } } void amd_iommu_flush_all_pages(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sat Oct 16 02:35:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 Oct 2021 02:35:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211245.368438 (Exim 4.92) (envelope-from ) id 1mbZXq-0001hO-N2; Sat, 16 Oct 2021 02:35:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211245.368438; Sat, 16 Oct 2021 02:35:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXq-0001hG-K1; Sat, 16 Oct 2021 02:35:34 +0000 Received: by outflank-mailman (input) for mailman id 211245; Sat, 16 Oct 2021 02:35:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXp-0001h4-OV for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mbZXp-00054s-Nq for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mbZXp-0007UP-Mv for xen-changelog@lists.xenproject.org; Sat, 16 Oct 2021 02:35:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8fsP4QH7dxXW72dMrgGqMZMQq1Agwrtm0gCUfMX6BYI=; b=ktYf2sCWXa0tT5Km0FnyxBVbGM OUyxTV0/vYItR693oZBI0CILVP9ekJg/Lll3vAKnj8hZxsYDUZXRKUI9r+L1eCeXfH3jxiY6LNR02 q3nO9rseaR+6mXeI9QcTR0ibmR3v6JrpvrCFZ+xEer3dM4+3hMadEiVJ5PuhQq4g4A+w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] x86/PV32: fix physdev_op_compat handling Message-Id: Date: Sat, 16 Oct 2021 02:35:33 +0000 commit f50ef17c9884c0c2d486d3b1de8f110bb6b22c42 Author: Jan Beulich AuthorDate: Fri Oct 15 11:06:38 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 11:06:38 2021 +0200 x86/PV32: fix physdev_op_compat handling The conversion of the original code failed to recognize that the 32-bit compat variant of this (sorry, two different meanings of "compat" here) needs to continue to invoke the compat handler, not the native one. Arrange for this by adding yet another #define. Affected functions (having existed prior to the introduction of the new hypercall) are PHYSDEVOP_set_iobitmap and PHYSDEVOP_apic_{read,write}. For all others the operand struct layout doesn't differ. Fixes: 1252e2823117 ("x86/pv: Export pv_hypercall_table[] rather than working around it in several ways") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Andrew Cooper master commit: 834cb8761051f7d87816785c0d99fe9bd5f0ce30 master date: 2021-10-12 11:55:42 +0200 --- xen/arch/x86/x86_64/compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c index 0e4c71f2aa..fcbc1cc0d7 100644 --- a/xen/arch/x86/x86_64/compat.c +++ b/xen/arch/x86/x86_64/compat.c @@ -12,6 +12,7 @@ EMIT_FILE; #define physdev_op_t physdev_op_compat_t #define do_physdev_op compat_physdev_op #define do_physdev_op_compat(x) compat_physdev_op_compat(_##x) +#define native compat #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:00:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211575.369151 (Exim 4.92) (envelope-from ) id 1mc4pf-0004YS-Le; Sun, 17 Oct 2021 12:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211575.369151; Sun, 17 Oct 2021 12:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4pf-0004YK-I4; Sun, 17 Oct 2021 12:00:03 +0000 Received: by outflank-mailman (input) for mailman id 211575; Sun, 17 Oct 2021 12:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4pe-0004O7-9r for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4pe-0000vx-7A for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4pe-0006tY-62 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12: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=C5covduyN9fKKeLu78OzUkGWPds7defoyOc2clqKiQE=; b=V2wWVK1VCt0ybfB91Lo4xnJJr0 pIA2UTCxgS+WxCQ+MmTTcpweYdSZEw1WGWeZWkqDFTGq3DrvT51AKCYZ/FCPhR1fKOORWvD3U0KbJ pYb4lTLeCxSQeDPjPXuMoZyUkFQFKdvgV3urpzigv2L1iKG3cSgoHMxusi5zgQimNvnY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] stubdom: fix build with disabled pv-grub Message-Id: Date: Sun, 17 Oct 2021 12:00:02 +0000 commit 1223c4c0c439faa240f031b3dff2b1667547f830 Author: Juergen Gross AuthorDate: Fri Sep 10 07:55:16 2021 +0200 Commit: Ian Jackson CommitDate: Fri Oct 15 11:06:06 2021 +0100 stubdom: fix build with disabled pv-grub Today the build will fail if --disable-pv-grub as a parameter of configure, as the main Makefile will unconditionally try to build a 32-bit pv-grub stubdom. Fix that by introducing a pv-grub-if-enabled target in stubdom/Makefile taking care of this situation. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault Reviewed-by: Ian Jackson --- Makefile | 4 ++-- stubdom/Makefile | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 96d32cfd50..346d73a0dc 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ build-tools-oxenstored: build-tools-public-headers build-stubdom: mini-os-dir build-tools-public-headers $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub + XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub-if-enabled endif .PHONY: build-docs @@ -143,7 +143,7 @@ install-tools: install-tools-public-headers install-stubdom: mini-os-dir install-tools $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) - XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub + XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub-if-enabled endif .PHONY: tools/firmware/seabios-dir-force-update diff --git a/stubdom/Makefile b/stubdom/Makefile index 06aa69d8bc..ccfcf5b75f 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -531,6 +531,13 @@ vtpmmgr-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr vtpmmgr pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxenguest grub DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/grub/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a +.PHONY: pv-grub-if-enabled +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +pv-grub-if-enabled: pv-grub +else +pv-grub-if-enabled: +endif + .PHONY: xenstore-stubdom xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxenguest xenstore DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstore/xenstored.a @@ -560,6 +567,12 @@ install-grub: pv-grub $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" +ifneq ($(filter grub,$(STUBDOM_TARGETS)),) +install-grub-if-enabled: install-grub +else +install-grub-if-enabled: +endif + install-c: c-stubdom install-caml: caml-stubdom -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:00:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211577.369156 (Exim 4.92) (envelope-from ) id 1mc4pp-00056I-NL; Sun, 17 Oct 2021 12:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211577.369156; Sun, 17 Oct 2021 12:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4pp-00056A-K4; Sun, 17 Oct 2021 12:00:13 +0000 Received: by outflank-mailman (input) for mailman id 211577; Sun, 17 Oct 2021 12:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4po-00055p-BP for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4po-0000wB-Ah for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4po-0006ux-9j for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12: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=ohhTXsdtUEdZV1oKsuF6pAFmqOPVekbDmzU+c6p15yA=; b=vwszE54wz+saEL8P9moov/Ml2r tG3V+49PgGMSr6wE+rkHdeSoKjbJ/LEKUO6GLQYOWi4f/aRDPACub5ZpDv91+Z+L5HyVlV2CEvsiK +wMb0U3PTfTucJXPLiZiA6DtkFaIKyc1I2UXFMgJQzM1wK6IARnT16Gm2QB8pDC2eN18=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: obtain IVHD type to use earlier Message-Id: Date: Sun, 17 Oct 2021 12:00:12 +0000 commit d8bd82327b0fffb16841862192e826fcb1344d8c Author: Jan Beulich AuthorDate: Fri Oct 15 12:44:20 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:44:20 2021 +0200 AMD/IOMMU: obtain IVHD type to use earlier Doing this in amd_iommu_prepare() is too late for it, in particular, to be used in amd_iommu_detect_one_acpi(), as a subsequent change will want to do. Moving it immediately ahead of amd_iommu_detect_acpi() is (luckily) pretty simple, (pretty importantly) without breaking amd_iommu_prepare()'s logic to prevent multiple processing. This involves moving table checksumming, as amd_iommu_get_supported_ivhd_type() -> get_supported_ivhd_type() will now be invoked before amd_iommu_detect_acpi() -> detect_iommu_acpi(). In the course of doing so stop open-coding acpi_tb_checksum(), seeing that we have other uses of this originally ACPI-private function elsewhere in the tree. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu_acpi.c | 24 +++++++++++------------- xen/drivers/passthrough/amd/iommu_init.c | 8 +------- xen/drivers/passthrough/amd/pci_amd_iommu.c | 8 ++++++++ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 53f4b61d0d..fdc601d498 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -22,6 +22,8 @@ #include +#include + #include "iommu.h" /* Some helper structures, particularly to deal with ranges. */ @@ -1167,20 +1169,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) static int __init detect_iommu_acpi(struct acpi_table_header *table) { const struct acpi_ivrs_header *ivrs_block; - unsigned long i; unsigned long length = sizeof(struct acpi_table_ivrs); - u8 checksum, *raw_table; - - /* validate checksum: sum of entire table == 0 */ - checksum = 0; - raw_table = (u8 *)table; - for ( i = 0; i < table->length; i++ ) - checksum += raw_table[i]; - if ( checksum ) - { - AMD_IOMMU_DEBUG("IVRS Error: Invalid Checksum %#x\n", checksum); - return -ENODEV; - } while ( table->length > (length + sizeof(*ivrs_block)) ) { @@ -1317,6 +1306,15 @@ get_supported_ivhd_type(struct acpi_table_header *table) { size_t length = sizeof(struct acpi_table_ivrs); const struct acpi_ivrs_header *ivrs_block, *blk = NULL; + uint8_t checksum; + + /* Validate checksum: Sum of entire table == 0. */ + checksum = acpi_tb_checksum(ACPI_CAST_PTR(uint8_t, table), table->length); + if ( checksum ) + { + AMD_IOMMU_DEBUG("IVRS Error: Invalid Checksum %#x\n", checksum); + return -ENODEV; + } while ( table->length > (length + sizeof(*ivrs_block)) ) { diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 312f335c1d..7eb5013756 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1398,15 +1398,9 @@ int __init amd_iommu_prepare(bool xt) goto error_out; /* Have we been here before? */ - if ( ivhd_type ) + if ( ivrs_bdf_entries ) return 0; - rc = amd_iommu_get_supported_ivhd_type(); - if ( rc < 0 ) - goto error_out; - BUG_ON(!rc); - ivhd_type = rc; - rc = amd_iommu_get_ivrs_dev_entries(); if ( !rc ) rc = -ENODEV; diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 86e4864e5d..de04ce90ad 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -179,9 +179,17 @@ static int __must_check amd_iommu_setup_domain_device( int __init acpi_ivrs_init(void) { + int rc; + if ( !iommu_enable && !iommu_intremap ) return 0; + rc = amd_iommu_get_supported_ivhd_type(); + if ( rc < 0 ) + return rc; + BUG_ON(!rc); + ivhd_type = rc; + if ( (amd_iommu_detect_acpi() !=0) || (iommu_found() == 0) ) { iommu_intremap = iommu_intremap_off; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:00:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211578.369160 (Exim 4.92) (envelope-from ) id 1mc4pz-0005A8-P2; Sun, 17 Oct 2021 12:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211578.369160; Sun, 17 Oct 2021 12:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4pz-0005A0-Ll; Sun, 17 Oct 2021 12:00:23 +0000 Received: by outflank-mailman (input) for mailman id 211578; Sun, 17 Oct 2021 12:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4py-00059e-F7 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4py-0000wS-EE for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4py-0006vi-D8 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12: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=4VNZtx0fs65oNUMOSeoo/2S9wZJu7OENK1bBvHWUBzk=; b=NP9P+O46wVldMfCbftN1LbajYH r0A/F32+I9NRQkXphNfCl/sN+PKt87z4roi4XPOGoBnZKiRG/fJeoSxtEvU60gcAJ4hJa14TYMGsU 8LTGb1YC/elzxdMFNKfkGxJ5/xFLf2Xr0pYyj/FuiK9fv9nIzx2Xcs/SnOvICyq8iA0w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: improve (extended) feature detection Message-Id: Date: Sun, 17 Oct 2021 12:00:22 +0000 commit 87caa1c3fb872c21297fee936f6247eb09cfe840 Author: Jan Beulich AuthorDate: Fri Oct 15 12:45:16 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:45:16 2021 +0200 AMD/IOMMU: improve (extended) feature detection First of all the documentation is very clear about ACPI table data superseding raw register data. Use raw register data only if EFRSup is clear in the ACPI tables (which may still go too far). Additionally if this flag is clear, the IVRS type 11H table is reserved and hence may not be recognized. Furthermore propagate IVRS type 10H data into the feature flags recorded, as the full extended features field is available in type 11H only. Note that this also makes necessary to stop the bad practice of us finding a type 11H IVHD entry, but still processing the type 10H one in detect_iommu_acpi()'s invocation of amd_iommu_detect_one_acpi(). Note also that the features.raw check in amd_iommu_prepare_one() needs replacing, now that the field can also be populated by different means. Key IOMMUv2 availability off of IVHD type not being 10H, and then move it a function layer up, so that it would be set only once all IOMMUs have been successfully prepared. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu.h | 1 + xen/drivers/passthrough/amd/iommu_acpi.c | 8 +++-- xen/drivers/passthrough/amd/iommu_detect.c | 48 ++++++++++++++++++++++++++---- xen/drivers/passthrough/amd/iommu_init.c | 7 +++-- xen/include/acpi/actbl2.h | 3 ++ 5 files changed, 56 insertions(+), 11 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index b0e6322906..3cec012103 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -306,6 +306,7 @@ extern struct hpet_sbdf { } init; } hpet_sbdf; +extern unsigned int amd_iommu_acpi_info; extern int amd_iommu_min_paging_mode; extern void *shared_intremap_table; diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index fdc601d498..acca2c685d 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -1062,7 +1062,8 @@ static unsigned int __initdata nr_ivmd; static inline bool_t is_ivhd_block(u8 type) { return (type == ACPI_IVRS_TYPE_HARDWARE || - type == ACPI_IVRS_TYPE_HARDWARE_11H); + ((amd_iommu_acpi_info & ACPI_IVRS_EFR_SUP) && + type == ACPI_IVRS_TYPE_HARDWARE_11H)); } static inline bool_t is_ivmd_block(u8 type) @@ -1176,7 +1177,7 @@ static int __init detect_iommu_acpi(struct acpi_table_header *table) ivrs_block = (struct acpi_ivrs_header *)((u8 *)table + length); if ( table->length < (length + ivrs_block->length) ) return -ENODEV; - if ( ivrs_block->type == ACPI_IVRS_TYPE_HARDWARE && + if ( ivrs_block->type == ivhd_type && amd_iommu_detect_one_acpi(to_ivhd_block(ivrs_block)) != 0 ) return -ENODEV; length += ivrs_block->length; @@ -1316,6 +1317,9 @@ get_supported_ivhd_type(struct acpi_table_header *table) return -ENODEV; } + amd_iommu_acpi_info = container_of(table, const struct acpi_table_ivrs, + header)->info; + while ( table->length > (length + sizeof(*ivrs_block)) ) { ivrs_block = (struct acpi_ivrs_header *)((u8 *)table + length); diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c index d05bc6a5bb..b017575325 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -60,14 +60,14 @@ void __init get_iommu_features(struct amd_iommu *iommu) const struct amd_iommu *first; ASSERT( iommu->mmio_base ); - if ( !iommu_has_cap(iommu, PCI_CAP_EFRSUP_SHIFT) ) + if ( !(amd_iommu_acpi_info & ACPI_IVRS_EFR_SUP) ) { - iommu->features.raw = 0; - return; - } + if ( !iommu_has_cap(iommu, PCI_CAP_EFRSUP_SHIFT) ) + return; - iommu->features.raw = - readq(iommu->mmio_base + IOMMU_EXT_FEATURE_MMIO_OFFSET); + iommu->features.raw = + readq(iommu->mmio_base + IOMMU_EXT_FEATURE_MMIO_OFFSET); + } /* Don't log the same set of features over and over. */ first = list_first_entry(&amd_iommu_head, struct amd_iommu, list); @@ -164,6 +164,42 @@ int __init amd_iommu_detect_one_acpi( iommu->cap_offset = ivhd_block->capability_offset; iommu->mmio_base_phys = ivhd_block->base_address; + if ( ivhd_type != ACPI_IVRS_TYPE_HARDWARE ) + iommu->features.raw = ivhd_block->efr_image; + else if ( amd_iommu_acpi_info & ACPI_IVRS_EFR_SUP ) + { + union { + uint32_t raw; + struct { + unsigned int xt_sup:1; + unsigned int nx_sup:1; + unsigned int gt_sup:1; + unsigned int glx_sup:2; + unsigned int ia_sup:1; + unsigned int ga_sup:1; + unsigned int he_sup:1; + unsigned int pas_max:5; + unsigned int pn_counters:4; + unsigned int pn_banks:6; + unsigned int msi_num_ppr:5; + unsigned int gats:2; + unsigned int hats:2; + }; + } attr = { .raw = ivhd_block->iommu_attr }; + + iommu->features.flds.xt_sup = attr.xt_sup; + iommu->features.flds.nx_sup = attr.nx_sup; + iommu->features.flds.gt_sup = attr.gt_sup; + iommu->features.flds.glx_sup = attr.glx_sup; + iommu->features.flds.ia_sup = attr.ia_sup; + iommu->features.flds.ga_sup = attr.ga_sup; + iommu->features.flds.pas_max = attr.pas_max; + iommu->features.flds.gats = attr.gats; + iommu->features.flds.hats = attr.hats; + } + else if ( list_empty(&amd_iommu_head) ) + AMD_IOMMU_DEBUG("EFRSup not set in ACPI table; will fall back to hardware\n"); + /* override IOMMU HT flags */ iommu->ht_flags = ivhd_block->header.flags; diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 7eb5013756..a4f152c150 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -29,6 +29,7 @@ static bool __initdata pci_init; static void do_amd_iommu_irq(void *data); static DECLARE_SOFTIRQ_TASKLET(amd_iommu_irq_tasklet, do_amd_iommu_irq, NULL); +unsigned int __read_mostly amd_iommu_acpi_info; unsigned int __read_mostly ivrs_bdf_entries; u8 __read_mostly ivhd_type; static struct radix_tree_root ivrs_maps; @@ -1375,9 +1376,6 @@ static int __init amd_iommu_prepare_one(struct amd_iommu *iommu) get_iommu_features(iommu); - if ( iommu->features.raw ) - iommuv2_enabled = true; - return 0; } @@ -1419,6 +1417,9 @@ int __init amd_iommu_prepare(bool xt) has_xt = false; } + if ( ivhd_type != ACPI_IVRS_TYPE_HARDWARE ) + iommuv2_enabled = true; + for_each_amd_iommu ( iommu ) { /* NB: There's no need to actually write these out right here. */ diff --git a/xen/include/acpi/actbl2.h b/xen/include/acpi/actbl2.h index 42beac4e26..4252c90a3f 100644 --- a/xen/include/acpi/actbl2.h +++ b/xen/include/acpi/actbl2.h @@ -716,6 +716,9 @@ struct acpi_table_ivrs { /* Values for Info field above */ +#define ACPI_IVRS_EFR_SUP 0x00000001 /* extended feature support */ +#define ACPI_IVRS_PREBOOT_DMA_REMAP 0x00000002 /* pre-boot DMA remapping in use */ +#define ACPI_IVRS_GVA_SIZE 0x000000E0 /* 3 bits, guest VA size */ #define ACPI_IVRS_PHYSICAL_SIZE 0x00007F00 /* 7 bits, physical address size */ #define ACPI_IVRS_VIRTUAL_SIZE 0x003F8000 /* 7 bits, virtual address size */ #define ACPI_IVRS_ATS_RESERVED 0x00400000 /* ATS address translation range reserved */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:00:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211580.369164 (Exim 4.92) (envelope-from ) id 1mc4q9-0005Fb-QL; Sun, 17 Oct 2021 12:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211580.369164; Sun, 17 Oct 2021 12:00:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4q9-0005FT-NU; Sun, 17 Oct 2021 12:00:33 +0000 Received: by outflank-mailman (input) for mailman id 211580; Sun, 17 Oct 2021 12:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4q8-0005FL-I7 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4q8-0000wg-HO for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4q8-0006xB-GT for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12: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=Qp4xge4wkbG3dUuheW9zvXnmOOpkdb5x9F84pXRwYqI=; b=gK5E9ilgRObZzo7zoDg1FzFEPz jpVGGjODZRYrnOsoC691OvPFnDLZYs60S0DbY2JXx/VRXtalyWNAGZ/7O2m9wSvQPX7DPya23dIgb S6coEWt01KRNHwVh3Ce5kI7xTuepGldtb+XxyYKXZkZ36W0Hge7gvmfdj+Y7R1lv1MgU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: check IVMD ranges against host implementation limits Message-Id: Date: Sun, 17 Oct 2021 12:00:32 +0000 commit 6f81a70baf839a94732a6b9dd2eaf11e1aa2eff2 Author: Jan Beulich AuthorDate: Fri Oct 15 12:46:05 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:46:05 2021 +0200 AMD/IOMMU: check IVMD ranges against host implementation limits When such ranges can't be represented as 1:1 mappings in page tables, reject them as presumably bogus. Note that when we detect features late (because of EFRSup being clear in the ACPI tables), it would be quite a bit of work to check for (and drop) out of range IVMD ranges, so IOMMU initialization gets failed in this case instead. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu.h | 3 ++- xen/drivers/passthrough/amd/iommu_acpi.c | 12 ++++++++++++ xen/drivers/passthrough/amd/iommu_detect.c | 7 +++++++ xen/drivers/passthrough/amd/iommu_init.c | 7 +++++++ xen/drivers/passthrough/amd/pci_amd_iommu.c | 1 + 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index 3cec012103..a915433f56 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -307,6 +307,7 @@ extern struct hpet_sbdf { } hpet_sbdf; extern unsigned int amd_iommu_acpi_info; +extern unsigned int amd_iommu_max_paging_mode; extern int amd_iommu_min_paging_mode; extern void *shared_intremap_table; @@ -360,7 +361,7 @@ static inline int amd_iommu_get_paging_mode(unsigned long max_frames) while ( max_frames > PTE_PER_TABLE_SIZE ) { max_frames = PTE_PER_TABLE_ALIGN(max_frames) >> PTE_PER_TABLE_SHIFT; - if ( ++level > 6 ) + if ( ++level > amd_iommu_max_paging_mode ) return -ENOMEM; } diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index acca2c685d..71c323fb33 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -378,6 +378,7 @@ static int __init parse_ivmd_device_iommu( static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) { unsigned long start_addr, mem_length, base, limit; + unsigned int addr_bits; bool iw = true, ir = true, exclusion = false; if ( ivmd_block->header.length < sizeof(*ivmd_block) ) @@ -394,6 +395,17 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) AMD_IOMMU_DEBUG("IVMD Block: type %#x phys %#lx len %#lx\n", ivmd_block->header.type, start_addr, mem_length); + addr_bits = min(MASK_EXTR(amd_iommu_acpi_info, ACPI_IVRS_PHYSICAL_SIZE), + MASK_EXTR(amd_iommu_acpi_info, ACPI_IVRS_VIRTUAL_SIZE)); + if ( amd_iommu_get_paging_mode(PFN_UP(start_addr + mem_length)) < 0 || + (addr_bits < BITS_PER_LONG && + ((start_addr + mem_length - 1) >> addr_bits)) ) + { + AMD_IOMMU_DEBUG("IVMD: [%lx,%lx) is not IOMMU addressable\n", + start_addr, start_addr + mem_length); + return 0; + } + if ( !e820_all_mapped(base, limit + PAGE_SIZE, E820_RESERVED) ) { paddr_t addr; diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c index b017575325..b8517ddafa 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -67,6 +67,9 @@ void __init get_iommu_features(struct amd_iommu *iommu) iommu->features.raw = readq(iommu->mmio_base + IOMMU_EXT_FEATURE_MMIO_OFFSET); + + if ( 4 + iommu->features.flds.hats < amd_iommu_max_paging_mode ) + amd_iommu_max_paging_mode = 4 + iommu->features.flds.hats; } /* Don't log the same set of features over and over. */ @@ -200,6 +203,10 @@ int __init amd_iommu_detect_one_acpi( else if ( list_empty(&amd_iommu_head) ) AMD_IOMMU_DEBUG("EFRSup not set in ACPI table; will fall back to hardware\n"); + if ( (amd_iommu_acpi_info & ACPI_IVRS_EFR_SUP) && + 4 + iommu->features.flds.hats < amd_iommu_max_paging_mode ) + amd_iommu_max_paging_mode = 4 + iommu->features.flds.hats; + /* override IOMMU HT flags */ iommu->ht_flags = ivhd_block->header.flags; diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index a4f152c150..6a8a2a711a 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1376,6 +1376,13 @@ static int __init amd_iommu_prepare_one(struct amd_iommu *iommu) get_iommu_features(iommu); + /* + * Late extended feature determination may cause previously mappable + * IVMD ranges to become unmappable. + */ + if ( amd_iommu_max_paging_mode < amd_iommu_min_paging_mode ) + return -ERANGE; + return 0; } diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index de04ce90ad..28f45e3fac 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -254,6 +254,7 @@ int amd_iommu_alloc_root(struct domain *d) return 0; } +unsigned int __read_mostly amd_iommu_max_paging_mode = 6; int __read_mostly amd_iommu_min_paging_mode = 1; static int amd_iommu_domain_init(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:00:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211581.369168 (Exim 4.92) (envelope-from ) id 1mc4qK-0005Jj-Sd; Sun, 17 Oct 2021 12:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211581.369168; Sun, 17 Oct 2021 12:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qK-0005Jb-P4; Sun, 17 Oct 2021 12:00:44 +0000 Received: by outflank-mailman (input) for mailman id 211581; Sun, 17 Oct 2021 12:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qI-0005J6-Lj for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qI-0000wu-Ko for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4qI-0006yj-Jl for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=L/Ayy9gQTrU/OuDAgeIGGXDYwN6eIOFjbI8OaG0KDSs=; b=cICjOMZW77hOu6TKsT6qPjzKCA SUg27nBeEdVLezLsuiye8wuSaR1zABwba9MAfm14F4tz7O+tOg8GMAm/kGq91jc/FR/3Jdyrc8g0v SWjC3o4UY+VrVfdYbcQ7fqJBITdCHeLOdOwFI1elR6hByLFBrgMk92hjTCGF6YEw4YuE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: respect AtsDisabled device flag Message-Id: Date: Sun, 17 Oct 2021 12:00:42 +0000 commit 246a0cd415af377d26576dd9962ee78c0f83f1f9 Author: Jan Beulich AuthorDate: Fri Oct 15 12:46:42 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:46:42 2021 +0200 AMD/IOMMU: respect AtsDisabled device flag IVHD entries may specify that ATS is to be blocked for a device or range of devices. Honor firmware telling us so. While adding respective checks I noticed that the 2nd conditional in amd_iommu_setup_domain_device() failed to check the IOMMU's capability. Add the missing part of the condition there, as no good can come from enabling ATS on a device when the IOMMU is not capable of dealing with ATS requests. For actually using ACPI_IVHD_ATS_DISABLED, make its expansion no longer exhibit UB. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu.h | 1 + xen/drivers/passthrough/amd/iommu_acpi.c | 20 +++++++++++--------- xen/drivers/passthrough/amd/pci_amd_iommu.c | 8 +++++--- xen/include/acpi/actbl2.h | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index a915433f56..49c4bbd7e1 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -120,6 +120,7 @@ struct ivrs_mappings { uint16_t dte_requestor_id; bool valid:1; bool dte_allow_exclusion:1; + bool block_ats:1; /* ivhd device data settings */ uint8_t device_flags; diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 71c323fb33..4aed8a17fd 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -55,8 +55,8 @@ union acpi_ivhd_device { }; static void __init add_ivrs_mapping_entry( - uint16_t bdf, uint16_t alias_id, uint8_t flags, bool alloc_irt, - struct amd_iommu *iommu) + uint16_t bdf, uint16_t alias_id, uint8_t flags, unsigned int ext_flags, + bool alloc_irt, struct amd_iommu *iommu) { struct ivrs_mappings *ivrs_mappings = get_ivrs_mappings(iommu->seg); @@ -66,6 +66,7 @@ static void __init add_ivrs_mapping_entry( ivrs_mappings[bdf].dte_requestor_id = alias_id; /* override flags for range of devices */ + ivrs_mappings[bdf].block_ats = ext_flags & ACPI_IVHD_ATS_DISABLED; ivrs_mappings[bdf].device_flags = flags; /* Don't map an IOMMU by itself. */ @@ -499,7 +500,7 @@ static u16 __init parse_ivhd_device_select( return 0; } - add_ivrs_mapping_entry(bdf, bdf, select->header.data_setting, false, + add_ivrs_mapping_entry(bdf, bdf, select->header.data_setting, 0, false, iommu); return sizeof(*select); @@ -545,7 +546,7 @@ static u16 __init parse_ivhd_device_range( AMD_IOMMU_DEBUG(" Dev_Id Range: %#x -> %#x\n", first_bdf, last_bdf); for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) - add_ivrs_mapping_entry(bdf, bdf, range->start.header.data_setting, + add_ivrs_mapping_entry(bdf, bdf, range->start.header.data_setting, 0, false, iommu); return dev_length; @@ -580,7 +581,7 @@ static u16 __init parse_ivhd_device_alias( AMD_IOMMU_DEBUG(" Dev_Id Alias: %#x\n", alias_id); - add_ivrs_mapping_entry(bdf, alias_id, alias->header.data_setting, true, + add_ivrs_mapping_entry(bdf, alias_id, alias->header.data_setting, 0, true, iommu); return dev_length; @@ -636,7 +637,7 @@ static u16 __init parse_ivhd_device_alias_range( for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) add_ivrs_mapping_entry(bdf, alias_id, range->alias.header.data_setting, - true, iommu); + 0, true, iommu); return dev_length; } @@ -661,7 +662,8 @@ static u16 __init parse_ivhd_device_extended( return 0; } - add_ivrs_mapping_entry(bdf, bdf, ext->header.data_setting, false, iommu); + add_ivrs_mapping_entry(bdf, bdf, ext->header.data_setting, + ext->extended_data, false, iommu); return dev_length; } @@ -708,7 +710,7 @@ static u16 __init parse_ivhd_device_extended_range( for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) add_ivrs_mapping_entry(bdf, bdf, range->extended.header.data_setting, - false, iommu); + range->extended.extended_data, false, iommu); return dev_length; } @@ -800,7 +802,7 @@ static u16 __init parse_ivhd_device_special( AMD_IOMMU_DEBUG("IVHD Special: %pp variety %#x handle %#x\n", &PCI_SBDF2(seg, bdf), special->variety, special->handle); - add_ivrs_mapping_entry(bdf, bdf, special->header.data_setting, true, + add_ivrs_mapping_entry(bdf, bdf, special->header.data_setting, 0, true, iommu); switch ( special->variety ) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 28f45e3fac..45d16b731f 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -105,6 +105,7 @@ static int __must_check amd_iommu_setup_domain_device( int req_id, valid = 1, rc; u8 bus = pdev->bus; struct domain_iommu *hd = dom_iommu(domain); + const struct ivrs_mappings *ivrs_dev; if ( QUARANTINE_SKIP(domain) ) return 0; @@ -122,20 +123,18 @@ static int __must_check amd_iommu_setup_domain_device( req_id = get_dma_requestor_id(iommu->seg, PCI_BDF2(bus, devfn)); table = iommu->dev_table.buffer; dte = &table[req_id]; + ivrs_dev = &get_ivrs_mappings(iommu->seg)[req_id]; spin_lock_irqsave(&iommu->lock, flags); if ( !dte->v || !dte->tv ) { - const struct ivrs_mappings *ivrs_dev; - /* bind DTE to domain page-tables */ amd_iommu_set_root_page_table( dte, page_to_maddr(hd->arch.amd.root_table), domain->domain_id, hd->arch.amd.paging_mode, valid); /* Undo what amd_iommu_disable_domain_device() may have done. */ - ivrs_dev = &get_ivrs_mappings(iommu->seg)[req_id]; if ( dte->it_root ) { dte->int_ctl = IOMMU_DEV_TABLE_INT_CONTROL_TRANSLATED; @@ -146,6 +145,7 @@ static int __must_check amd_iommu_setup_domain_device( dte->sys_mgt = MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT); if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && + !ivrs_dev->block_ats && iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) ) dte->i = ats_enabled; @@ -166,6 +166,8 @@ static int __must_check amd_iommu_setup_domain_device( ASSERT(pcidevs_locked()); if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && + !ivrs_dev->block_ats && + iommu_has_cap(iommu, PCI_CAP_IOTLB_SHIFT) && !pci_ats_enabled(iommu->seg, bus, pdev->devfn) ) { if ( devfn == pdev->devfn ) diff --git a/xen/include/acpi/actbl2.h b/xen/include/acpi/actbl2.h index 4252c90a3f..2ad08ea467 100644 --- a/xen/include/acpi/actbl2.h +++ b/xen/include/acpi/actbl2.h @@ -851,7 +851,7 @@ struct acpi_ivrs_device8b { /* Values for extended_data above */ -#define ACPI_IVHD_ATS_DISABLED (1<<31) +#define ACPI_IVHD_ATS_DISABLED (1u << 31) /* Type 72: 8-byte device entry */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:00:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211583.369172 (Exim 4.92) (envelope-from ) id 1mc4qU-0005NA-01; Sun, 17 Oct 2021 12:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211583.369172; Sun, 17 Oct 2021 12:00:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qT-0005N2-TA; Sun, 17 Oct 2021 12:00:53 +0000 Received: by outflank-mailman (input) for mailman id 211583; Sun, 17 Oct 2021 12:00:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qS-0005Mo-Oe for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qS-0000xP-O3 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4qS-000700-N7 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:00:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0Gf7065rPutd+SYEUc344DgODa15QUKmQRrR0dJzHoE=; b=l9tktyJFsGaJQg6UMnJV3Yrvk/ fudz+qnXeEAt1pRvwKdt+6S6HDVNzlsfs4isHRcWbiZpuZlqepk39q123rfQgBRrO8q18cArmSUEa bTN/apPWRa576M407PILEzkGF4xZQpzaozltlvSExAS8k35E8PzFGQrmkIvD7M2MR3uc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: pull ATS disabling earlier Message-Id: Date: Sun, 17 Oct 2021 12:00:52 +0000 commit 388b5f1be68861b8abaf67e6a311b09b5a0816c5 Author: Jan Beulich AuthorDate: Fri Oct 15 12:47:18 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:47:18 2021 +0200 AMD/IOMMU: pull ATS disabling earlier Disabling should be done in the opposite order of enabling: ATS wants to be turned off before adjusting the DTE, just like it gets enabled only after the DTE was suitably prepared. Note that we want ATS to be disabled as soon as any of the DTEs involved in the handling of a device (including phantom devices) gets adjusted respectively. For this reason the "devfn == pdev->devfn" of the original conditional gets dropped. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 45d16b731f..63fa426273 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -313,6 +313,12 @@ static void amd_iommu_disable_domain_device(const struct domain *domain, if ( QUARANTINE_SKIP(domain) ) return; + ASSERT(pcidevs_locked()); + + if ( pci_ats_device(iommu->seg, bus, pdev->devfn) && + pci_ats_enabled(iommu->seg, bus, pdev->devfn) ) + disable_ats_device(pdev); + BUG_ON ( iommu->dev_table.buffer == NULL ); req_id = get_dma_requestor_id(iommu->seg, PCI_BDF2(bus, devfn)); table = iommu->dev_table.buffer; @@ -348,13 +354,6 @@ static void amd_iommu_disable_domain_device(const struct domain *domain, } else spin_unlock_irqrestore(&iommu->lock, flags); - - ASSERT(pcidevs_locked()); - - if ( devfn == pdev->devfn && - pci_ats_device(iommu->seg, bus, devfn) && - pci_ats_enabled(iommu->seg, bus, devfn) ) - disable_ats_device(pdev); } static int reassign_device(struct domain *source, struct domain *target, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:01:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211585.369176 (Exim 4.92) (envelope-from ) id 1mc4qe-0005QD-1l; Sun, 17 Oct 2021 12:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211585.369176; Sun, 17 Oct 2021 12:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qd-0005Q5-Uw; Sun, 17 Oct 2021 12:01:03 +0000 Received: by outflank-mailman (input) for mailman id 211585; Sun, 17 Oct 2021 12:01:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qc-0005Pv-Rz for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qc-0000xs-RE for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4qc-00071V-QR for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V2/Ji3/POFQksP5aRECtU7VKgHAQxEzh1zy4Kui1Iq4=; b=kvE4kXC3Tv+FFysYHqHWi4Xg9z M8pesj/+Pm9mn93mhEyorm9dcwhoOWOQYEHNxWPpspIumG74cydxXSDFm9dSj4nJbR7wZIDs2Rsjt 8UAbXE2PKW9zKgkWF+mi9F+7AY9NpM7//B+dgWus+ae/Y/3Odw6FNm3uFCztt+LmVaJs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] AMD/IOMMU: expose errors and warnings unconditionally Message-Id: Date: Sun, 17 Oct 2021 12:01:02 +0000 commit 91f428ea7cf89ec3f3d4ed2ba0fe931561d85eac Author: Jan Beulich AuthorDate: Fri Oct 15 12:47:52 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:47:52 2021 +0200 AMD/IOMMU: expose errors and warnings unconditionally Making these dependent upon "iommu=debug" isn't really helpful in the field. Where touching respective code anyway also make use of %pp and %pd. Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/drivers/passthrough/amd/iommu.h | 12 +++ xen/drivers/passthrough/amd/iommu_acpi.c | 111 +++++++++++++--------------- xen/drivers/passthrough/amd/iommu_cmd.c | 3 +- xen/drivers/passthrough/amd/iommu_detect.c | 6 +- xen/drivers/passthrough/amd/iommu_init.c | 14 ++-- xen/drivers/passthrough/amd/iommu_intr.c | 14 ++-- xen/drivers/passthrough/amd/iommu_map.c | 10 +-- xen/drivers/passthrough/amd/pci_amd_iommu.c | 22 +++--- 8 files changed, 93 insertions(+), 99 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index 49c4bbd7e1..93243424e8 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -203,6 +203,18 @@ struct acpi_ivrs_hardware; #define DMA_32BIT_MASK 0x00000000ffffffffULL +#define AMD_IOMMU_ERROR(fmt, args...) \ + printk(XENLOG_ERR "AMD-Vi: Error: " fmt, ## args) + +#define AMD_IOMMU_WARN(fmt, args...) \ + printk(XENLOG_WARNING "AMD-Vi: Warning: " fmt, ## args) + +#define AMD_IOMMU_VERBOSE(fmt, args...) \ + do { \ + if ( iommu_verbose ) \ + printk(XENLOG_INFO "AMD-Vi: " fmt, ## args); \ + } while ( false ) + #define AMD_IOMMU_DEBUG(fmt, args...) \ do \ { \ diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 4aed8a17fd..b07fa4c401 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -174,7 +174,7 @@ static int __init reserve_unity_map_for_device( if ( unity_map->addr + unity_map->length > base && base + length > unity_map->addr ) { - AMD_IOMMU_DEBUG("IVMD Error: overlap [%lx,%lx) vs [%lx,%lx)\n", + AMD_IOMMU_ERROR("IVMD: overlap [%lx,%lx) vs [%lx,%lx)\n", base, base + length, unity_map->addr, unity_map->addr + unity_map->length); return -EPERM; @@ -248,7 +248,7 @@ static int __init register_range_for_device( iommu = find_iommu_for_device(seg, bdf); if ( !iommu ) { - AMD_IOMMU_DEBUG("IVMD Error: No IOMMU for Dev_Id %#x!\n", bdf); + AMD_IOMMU_ERROR("IVMD: no IOMMU for Dev_Id %#x\n", bdf); return -ENODEV; } req = ivrs_mappings[bdf].dte_requestor_id; @@ -318,7 +318,7 @@ static int __init parse_ivmd_device_select( bdf = ivmd_block->header.device_id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVMD Error: Invalid Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVMD: invalid Dev_Id %#x\n", bdf); return -ENODEV; } @@ -335,16 +335,14 @@ static int __init parse_ivmd_device_range( first_bdf = ivmd_block->header.device_id; if ( first_bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVMD Error: " - "Invalid Range_First Dev_Id %#x\n", first_bdf); + AMD_IOMMU_ERROR("IVMD: invalid Range_First Dev_Id %#x\n", first_bdf); return -ENODEV; } last_bdf = ivmd_block->aux_data; if ( (last_bdf >= ivrs_bdf_entries) || (last_bdf <= first_bdf) ) { - AMD_IOMMU_DEBUG("IVMD Error: " - "Invalid Range_Last Dev_Id %#x\n", last_bdf); + AMD_IOMMU_ERROR("IVMD: invalid Range_Last Dev_Id %#x\n", last_bdf); return -ENODEV; } @@ -367,7 +365,7 @@ static int __init parse_ivmd_device_iommu( ivmd_block->aux_data); if ( !iommu ) { - AMD_IOMMU_DEBUG("IVMD Error: No IOMMU for Dev_Id %#x Cap %#x\n", + AMD_IOMMU_ERROR("IVMD: no IOMMU for Dev_Id %#x Cap %#x\n", ivmd_block->header.device_id, ivmd_block->aux_data); return -ENODEV; } @@ -384,7 +382,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) if ( ivmd_block->header.length < sizeof(*ivmd_block) ) { - AMD_IOMMU_DEBUG("IVMD Error: Invalid Block Length!\n"); + AMD_IOMMU_ERROR("IVMD: invalid block length\n"); return -ENODEV; } @@ -402,8 +400,8 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) (addr_bits < BITS_PER_LONG && ((start_addr + mem_length - 1) >> addr_bits)) ) { - AMD_IOMMU_DEBUG("IVMD: [%lx,%lx) is not IOMMU addressable\n", - start_addr, start_addr + mem_length); + AMD_IOMMU_WARN("IVMD: [%lx,%lx) is not IOMMU addressable\n", + start_addr, start_addr + mem_length); return 0; } @@ -411,8 +409,8 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) { paddr_t addr; - AMD_IOMMU_DEBUG("IVMD: [%lx,%lx) is not (entirely) in reserved memory\n", - base, limit + PAGE_SIZE); + AMD_IOMMU_WARN("IVMD: [%lx,%lx) is not (entirely) in reserved memory\n", + base, limit + PAGE_SIZE); for ( addr = base; addr <= limit; addr += PAGE_SIZE ) { @@ -423,7 +421,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) if ( e820_add_range(&e820, addr, addr + PAGE_SIZE, E820_RESERVED) ) continue; - AMD_IOMMU_DEBUG("IVMD Error: Page at %lx couldn't be reserved\n", + AMD_IOMMU_ERROR("IVMD: page at %lx couldn't be reserved\n", addr); return -EIO; } @@ -433,8 +431,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) RAM_TYPE_UNUSABLE)) ) continue; - AMD_IOMMU_DEBUG("IVMD Error: Page at %lx can't be converted\n", - addr); + AMD_IOMMU_ERROR("IVMD: page at %lx can't be converted\n", addr); return -EIO; } } @@ -448,7 +445,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) } else { - AMD_IOMMU_DEBUG("IVMD Error: Invalid Flag Field!\n"); + AMD_IOMMU_ERROR("IVMD: invalid flag field\n"); return -ENODEV; } @@ -471,7 +468,8 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) iw, ir, exclusion); default: - AMD_IOMMU_DEBUG("IVMD Error: Invalid Block Type!\n"); + AMD_IOMMU_ERROR("IVMD: unknown block type %#x\n", + ivmd_block->header.type); return -ENODEV; } } @@ -481,7 +479,7 @@ static u16 __init parse_ivhd_device_padding( { if ( header_length < (block_length + pad_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } @@ -496,7 +494,7 @@ static u16 __init parse_ivhd_device_select( bdf = select->header.id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry Dev_Id %#x\n", bdf); return 0; } @@ -515,14 +513,13 @@ static u16 __init parse_ivhd_device_range( dev_length = sizeof(*range); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } if ( range->end.header.type != ACPI_IVRS_TYPE_END ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: End_Type %#x\n", + AMD_IOMMU_ERROR("IVHD: invalid range: End_Type %#x\n", range->end.header.type); return 0; } @@ -530,16 +527,14 @@ static u16 __init parse_ivhd_device_range( first_bdf = range->start.header.id; if ( first_bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: First Dev_Id %#x\n", first_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: First Dev_Id %#x\n", first_bdf); return 0; } last_bdf = range->end.header.id; if ( (last_bdf >= ivrs_bdf_entries) || (last_bdf <= first_bdf) ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: Last Dev_Id %#x\n", last_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: Last Dev_Id %#x\n", last_bdf); return 0; } @@ -561,21 +556,21 @@ static u16 __init parse_ivhd_device_alias( dev_length = sizeof(*alias); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } bdf = alias->header.id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry Dev_Id %#x\n", bdf); return 0; } alias_id = alias->used_id; if ( alias_id >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Alias Dev_Id %#x\n", alias_id); + AMD_IOMMU_ERROR("IVHD: invalid Alias Dev_Id %#x\n", alias_id); return 0; } @@ -597,14 +592,13 @@ static u16 __init parse_ivhd_device_alias_range( dev_length = sizeof(*range); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } if ( range->end.header.type != ACPI_IVRS_TYPE_END ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: End_Type %#x\n", + AMD_IOMMU_ERROR("IVHD: invalid range: End_Type %#x\n", range->end.header.type); return 0; } @@ -612,16 +606,14 @@ static u16 __init parse_ivhd_device_alias_range( first_bdf = range->alias.header.id; if ( first_bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: First Dev_Id %#x\n", first_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: First Dev_Id %#x\n", first_bdf); return 0; } last_bdf = range->end.header.id; if ( last_bdf >= ivrs_bdf_entries || last_bdf <= first_bdf ) { - AMD_IOMMU_DEBUG( - "IVHD Error: Invalid Range: Last Dev_Id %#x\n", last_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: Last Dev_Id %#x\n", last_bdf); return 0; } @@ -651,14 +643,14 @@ static u16 __init parse_ivhd_device_extended( dev_length = sizeof(*ext); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } bdf = ext->header.id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry Dev_Id %#x\n", bdf); return 0; } @@ -677,14 +669,13 @@ static u16 __init parse_ivhd_device_extended_range( dev_length = sizeof(*range); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } if ( range->end.header.type != ACPI_IVRS_TYPE_END ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: End_Type %#x\n", + AMD_IOMMU_ERROR("IVHD: invalid range: End_Type %#x\n", range->end.header.type); return 0; } @@ -692,16 +683,14 @@ static u16 __init parse_ivhd_device_extended_range( first_bdf = range->extended.header.id; if ( first_bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: First Dev_Id %#x\n", first_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: First Dev_Id %#x\n", first_bdf); return 0; } last_bdf = range->end.header.id; if ( (last_bdf >= ivrs_bdf_entries) || (last_bdf <= first_bdf) ) { - AMD_IOMMU_DEBUG("IVHD Error: " - "Invalid Range: Last Dev_Id %#x\n", last_bdf); + AMD_IOMMU_ERROR("IVHD: invalid range: Last Dev_Id %#x\n", last_bdf); return 0; } @@ -789,14 +778,14 @@ static u16 __init parse_ivhd_device_special( dev_length = sizeof(*special); if ( header_length < (block_length + dev_length) ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry length\n"); return 0; } bdf = special->used_id; if ( bdf >= ivrs_bdf_entries ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device_Entry Dev_Id %#x\n", bdf); + AMD_IOMMU_ERROR("IVHD: invalid Device_Entry Dev_Id %#x\n", bdf); return 0; } @@ -844,12 +833,12 @@ static u16 __init parse_ivhd_device_special( { if ( ioapic_sbdf[idx].bdf == bdf && ioapic_sbdf[idx].seg == seg ) - AMD_IOMMU_DEBUG("IVHD Warning: Duplicate IO-APIC %#x entries\n", + AMD_IOMMU_WARN("IVHD: duplicate IO-APIC %#x entries\n", special->handle); else { - printk(XENLOG_ERR "IVHD Error: Conflicting IO-APIC %#x entries\n", - special->handle); + AMD_IOMMU_ERROR("IVHD: conflicting IO-APIC %#x entries\n", + special->handle); if ( amd_iommu_perdev_intremap ) return 0; } @@ -944,7 +933,7 @@ static int __init parse_ivhd_block(const struct acpi_ivrs_hardware *ivhd_block) if ( ivhd_block->header.length < hdr_size ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Block Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid block length\n"); return -ENODEV; } @@ -953,7 +942,7 @@ static int __init parse_ivhd_block(const struct acpi_ivrs_hardware *ivhd_block) ivhd_block->capability_offset); if ( !iommu ) { - AMD_IOMMU_DEBUG("IVHD Error: No IOMMU for Dev_Id %#x Cap %#x\n", + AMD_IOMMU_ERROR("IVHD: no IOMMU for Dev_Id %#x Cap %#x\n", ivhd_block->header.device_id, ivhd_block->capability_offset); return -ENODEV; @@ -1016,7 +1005,8 @@ static int __init parse_ivhd_block(const struct acpi_ivrs_hardware *ivhd_block) ivhd_block->header.length, block_length, iommu); break; default: - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device Type!\n"); + AMD_IOMMU_WARN("IVHD: unknown device type %#x\n", + ivhd_device->header.type); dev_length = 0; break; } @@ -1113,8 +1103,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) if ( table->length < (length + ivrs_block->length) ) { - AMD_IOMMU_DEBUG("IVRS Error: " - "Table Length Exceeded: %#x -> %#lx\n", + AMD_IOMMU_ERROR("IVRS: table length exceeded: %#x -> %#lx\n", table->length, (length + ivrs_block->length)); return -ENODEV; @@ -1214,7 +1203,7 @@ static int __init get_last_bdf_ivhd( if ( ivhd_block->header.length < hdr_size ) { - AMD_IOMMU_DEBUG("IVHD Error: Invalid Block Length!\n"); + AMD_IOMMU_ERROR("IVHD: invalid block length\n"); return -ENODEV; } @@ -1261,7 +1250,8 @@ static int __init get_last_bdf_ivhd( dev_length = sizeof(ivhd_device->special); break; default: - AMD_IOMMU_DEBUG("IVHD Error: Invalid Device Type!\n"); + AMD_IOMMU_WARN("IVHD: unknown device type %#x\n", + ivhd_device->header.type); dev_length = 0; break; } @@ -1327,7 +1317,7 @@ get_supported_ivhd_type(struct acpi_table_header *table) checksum = acpi_tb_checksum(ACPI_CAST_PTR(uint8_t, table), table->length); if ( checksum ) { - AMD_IOMMU_DEBUG("IVRS Error: Invalid Checksum %#x\n", checksum); + AMD_IOMMU_ERROR("IVRS: invalid checksum %#x\n", checksum); return -ENODEV; } @@ -1340,8 +1330,7 @@ get_supported_ivhd_type(struct acpi_table_header *table) if ( table->length < (length + ivrs_block->length) ) { - AMD_IOMMU_DEBUG("IVRS Error: " - "Table Length Exceeded: %#x -> %#lx\n", + AMD_IOMMU_ERROR("IVRS: table length exceeded: %#x -> %#lx\n", table->length, (length + ivrs_block->length)); return -ENODEV; diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c b/xen/drivers/passthrough/amd/iommu_cmd.c index a73830386b..809d93b89f 100644 --- a/xen/drivers/passthrough/amd/iommu_cmd.c +++ b/xen/drivers/passthrough/amd/iommu_cmd.c @@ -291,8 +291,7 @@ void amd_iommu_flush_iotlb(u8 devfn, const struct pci_dev *pdev, if ( !iommu ) { - AMD_IOMMU_DEBUG("%s: Can't find iommu for %pp\n", - __func__, &pdev->sbdf); + AMD_IOMMU_WARN("can't find IOMMU for %pp\n", &pdev->sbdf); return; } diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c index b8517ddafa..f52e7b90e1 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -141,21 +141,21 @@ int __init amd_iommu_detect_one_acpi( if ( ivhd_block->header.length < sizeof(*ivhd_block) ) { - AMD_IOMMU_DEBUG("Invalid IVHD Block Length!\n"); + AMD_IOMMU_ERROR("invalid IVHD block length\n"); return -ENODEV; } if ( !ivhd_block->header.device_id || !ivhd_block->capability_offset || !ivhd_block->base_address) { - AMD_IOMMU_DEBUG("Invalid IVHD Block!\n"); + AMD_IOMMU_ERROR("invalid IVHD block\n"); return -ENODEV; } iommu = xzalloc(struct amd_iommu); if ( !iommu ) { - AMD_IOMMU_DEBUG("Error allocating amd_iommu\n"); + AMD_IOMMU_ERROR("cannot allocate amd_iommu\n"); return -ENOMEM; } diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 6a8a2a711a..559a734bda 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -386,8 +386,8 @@ static void iommu_reset_log(struct amd_iommu *iommu, if ( log_run ) { - AMD_IOMMU_DEBUG("Warning: Log Run bit %d is not cleared" - "before reset!\n", run_bit); + AMD_IOMMU_WARN("Log Run bit %d is not cleared before reset\n", + run_bit); return; } @@ -754,8 +754,8 @@ static bool_t __init set_iommu_interrupt_handler(struct amd_iommu *iommu) pcidevs_unlock(); if ( !iommu->msi.dev ) { - AMD_IOMMU_DEBUG("IOMMU: no pdev for %pp\n", - &PCI_SBDF2(iommu->seg, iommu->bdf)); + AMD_IOMMU_WARN("no pdev for %pp\n", + &PCI_SBDF2(iommu->seg, iommu->bdf)); return 0; } @@ -799,7 +799,7 @@ static bool_t __init set_iommu_interrupt_handler(struct amd_iommu *iommu) if ( ret ) { destroy_irq(irq); - AMD_IOMMU_DEBUG("can't request irq\n"); + AMD_IOMMU_ERROR("can't request irq\n"); return 0; } @@ -992,7 +992,7 @@ static void *__init allocate_buffer(unsigned long alloc_size, if ( buffer == NULL ) { - AMD_IOMMU_DEBUG("Error allocating %s\n", name); + AMD_IOMMU_ERROR("cannot allocate %s\n", name); return NULL; } @@ -1224,7 +1224,7 @@ static int __init alloc_ivrs_mappings(u16 seg) ivrs_mappings = xzalloc_array(struct ivrs_mappings, ivrs_bdf_entries + 1); if ( ivrs_mappings == NULL ) { - AMD_IOMMU_DEBUG("Error allocating IVRS Mappings table\n"); + AMD_IOMMU_ERROR("cannot allocate IVRS Mappings table\n"); return -ENOMEM; } IVRS_MAPPINGS_SEG(ivrs_mappings) = seg; diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index bf00370574..b166a04666 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -377,8 +377,8 @@ void amd_iommu_ioapic_update_ire( iommu = find_iommu_for_device(seg, bdf); if ( !iommu ) { - AMD_IOMMU_DEBUG("Fail to find iommu for ioapic device id =" - " %04x:%04x\n", seg, bdf); + AMD_IOMMU_WARN("failed to find IOMMU for IO-APIC @ %04x:%04x\n", + seg, bdf); __io_apic_write(apic, reg, value); return; } @@ -747,8 +747,8 @@ bool __init iov_supports_xt(void) if ( !find_iommu_for_device(ioapic_sbdf[idx].seg, ioapic_sbdf[idx].bdf) ) { - AMD_IOMMU_DEBUG("No IOMMU for IO-APIC %#x (ID %x)\n", - apic, IO_APIC_ID(apic)); + AMD_IOMMU_WARN("no IOMMU for IO-APIC %#x (ID %x)\n", + apic, IO_APIC_ID(apic)); return false; } } @@ -765,14 +765,12 @@ int __init amd_setup_hpet_msi(struct msi_desc *msi_desc) if ( hpet_sbdf.init == HPET_NONE ) { - AMD_IOMMU_DEBUG("Failed to setup HPET MSI remapping." - " Missing IVRS HPET info.\n"); + AMD_IOMMU_ERROR("failed to setup HPET MSI remapping: missing IVRS HPET info\n"); return -ENODEV; } if ( msi_desc->hpet_id != hpet_sbdf.id ) { - AMD_IOMMU_DEBUG("Failed to setup HPET MSI remapping." - " Wrong HPET.\n"); + AMD_IOMMU_ERROR("failed to setup HPET MSI remapping: wrong HPET\n"); return -ENODEV; } diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index 93501ee2c5..b0330157ea 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -222,7 +222,7 @@ static int iommu_pde_from_dfn(struct domain *d, unsigned long dfn, table = iommu_alloc_pgtable(d); if ( table == NULL ) { - AMD_IOMMU_DEBUG("Cannot allocate I/O page table\n"); + AMD_IOMMU_ERROR("cannot allocate I/O page table\n"); unmap_domain_page(next_table_vaddr); return 1; } @@ -252,7 +252,7 @@ static int iommu_pde_from_dfn(struct domain *d, unsigned long dfn, table = iommu_alloc_pgtable(d); if ( table == NULL ) { - AMD_IOMMU_DEBUG("Cannot allocate I/O page table\n"); + AMD_IOMMU_ERROR("cannot allocate I/O page table\n"); unmap_domain_page(next_table_vaddr); return 1; } @@ -301,7 +301,7 @@ int amd_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, if ( rc ) { spin_unlock(&hd->arch.mapping_lock); - AMD_IOMMU_DEBUG("Root table alloc failed, dfn = %"PRI_dfn"\n", + AMD_IOMMU_ERROR("root table alloc failed, dfn = %"PRI_dfn"\n", dfn_x(dfn)); domain_crash(d); return rc; @@ -310,7 +310,7 @@ int amd_iommu_map_page(struct domain *d, dfn_t dfn, mfn_t mfn, if ( iommu_pde_from_dfn(d, dfn_x(dfn), &pt_mfn, true) || !pt_mfn ) { spin_unlock(&hd->arch.mapping_lock); - AMD_IOMMU_DEBUG("Invalid IO pagetable entry dfn = %"PRI_dfn"\n", + AMD_IOMMU_ERROR("invalid IO pagetable entry dfn = %"PRI_dfn"\n", dfn_x(dfn)); domain_crash(d); return -EFAULT; @@ -343,7 +343,7 @@ int amd_iommu_unmap_page(struct domain *d, dfn_t dfn, if ( iommu_pde_from_dfn(d, dfn_x(dfn), &pt_mfn, false) ) { spin_unlock(&hd->arch.mapping_lock); - AMD_IOMMU_DEBUG("Invalid IO pagetable entry dfn = %"PRI_dfn"\n", + AMD_IOMMU_ERROR("invalid IO pagetable entry dfn = %"PRI_dfn"\n", dfn_x(dfn)); domain_crash(d); return -EFAULT; diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 63fa426273..03228a9952 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -367,10 +367,8 @@ static int reassign_device(struct domain *source, struct domain *target, iommu = find_iommu_for_device(pdev->seg, bdf); if ( !iommu ) { - AMD_IOMMU_DEBUG("Fail to find iommu." - " %04x:%02x:%x02.%x cannot be assigned to dom%d\n", - pdev->seg, pdev->bus, PCI_SLOT(devfn), PCI_FUNC(devfn), - target->domain_id); + AMD_IOMMU_WARN("failed to find IOMMU: %pp cannot be assigned to %pd\n", + &pdev->sbdf, target); return -ENODEV; } @@ -484,8 +482,8 @@ static int amd_iommu_add_device(u8 devfn, struct pci_dev *pdev) return 0; } - AMD_IOMMU_DEBUG("No iommu for %pp; cannot be handed to d%d\n", - &pdev->sbdf, pdev->domain->domain_id); + AMD_IOMMU_WARN("no IOMMU for %pp; cannot be handed to %pd\n", + &pdev->sbdf, pdev->domain); return -ENODEV; } @@ -527,9 +525,8 @@ static int amd_iommu_add_device(u8 devfn, struct pci_dev *pdev) pdev->domain, ivrs_mappings[ivrs_mappings[bdf].dte_requestor_id].unity_map, 0) ) - AMD_IOMMU_DEBUG("%pd: unity mapping failed for %04x:%02x:%02x.%u\n", - pdev->domain, pdev->seg, pdev->bus, PCI_SLOT(devfn), - PCI_FUNC(devfn)); + AMD_IOMMU_WARN("%pd: unity mapping failed for %pp\n", + pdev->domain, &pdev->sbdf); return amd_iommu_setup_domain_device(pdev->domain, iommu, devfn, pdev); } @@ -547,7 +544,7 @@ static int amd_iommu_remove_device(u8 devfn, struct pci_dev *pdev) iommu = find_iommu_for_device(pdev->seg, bdf); if ( !iommu ) { - AMD_IOMMU_DEBUG("Fail to find iommu. %pp cannot be removed from %pd\n", + AMD_IOMMU_WARN("failed to find IOMMU: %pp cannot be removed from %pd\n", &pdev->sbdf, pdev->domain); return -ENODEV; } @@ -560,9 +557,8 @@ static int amd_iommu_remove_device(u8 devfn, struct pci_dev *pdev) if ( amd_iommu_reserve_domain_unity_unmap( pdev->domain, ivrs_mappings[ivrs_mappings[bdf].dte_requestor_id].unity_map) ) - AMD_IOMMU_DEBUG("%pd: unity unmapping failed for %04x:%02x:%02x.%u\n", - pdev->domain, pdev->seg, pdev->bus, PCI_SLOT(devfn), - PCI_FUNC(devfn)); + AMD_IOMMU_WARN("%pd: unity unmapping failed for %pp\n", + pdev->domain, &pdev->sbdf); if ( amd_iommu_perdev_intremap && ivrs_mappings[bdf].dte_requestor_id == bdf && -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:01:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:01:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211587.369179 (Exim 4.92) (envelope-from ) id 1mc4qo-0005Ti-4c; Sun, 17 Oct 2021 12:01:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211587.369179; Sun, 17 Oct 2021 12:01:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qo-0005Ta-1i; Sun, 17 Oct 2021 12:01:14 +0000 Received: by outflank-mailman (input) for mailman id 211587; Sun, 17 Oct 2021 12:01:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qm-0005TS-V4 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qm-0000zf-UP for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4qm-000733-Td for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TbAap7js4RmVnprXv/HCQYWTLKzwGsGQokjdi/slxDY=; b=AvX4Bpe6rlDJbfBnhY/Y60E126 GEB8tI66KZgVwR7BaMPwXsGtbj53vden4aAfDxZADni+bHXYo3S0SjFYEVCj41FufLxr15UCrPuZp nngtx0oP3269fGK29ucKEjLFknqCoI7d1kOlUkh8pR+5KQKerGS01Yl9VTRMuDoxcH5Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: adjust some shadow_set_le() callers Message-Id: Date: Sun, 17 Oct 2021 12:01:12 +0000 commit 9f4f20b27b0733e9b792e3cd2ad996febdea46ba Author: Jan Beulich AuthorDate: Fri Oct 15 12:48:31 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 12:48:31 2021 +0200 x86/shadow: adjust some shadow_set_le() callers Coverity dislikes sh_page_fault() storing the return value into a local variable but then never using the value (and oddly enough spots this in the 2- and 3-level cases, but not in the 4-level one). Instead of adding yet another cast to void as replacement, take the opportunity and drop a bunch of such casts at the same time - not using function return values is a common thing to do. (It of course is an independent question whether ignoring errors like this is a good idea.) Coverity-ID: 1492856 Coverity-ID: 1492858 Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm/shadow/multi.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index a2fa7b87d8..b879677d77 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1416,7 +1416,7 @@ void sh_unhook_32b_mappings(struct domain *d, mfn_t sl2mfn, int user_only) shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) - (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); + shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); }); } @@ -1428,7 +1428,7 @@ void sh_unhook_pae_mappings(struct domain *d, mfn_t sl2mfn, int user_only) shadow_l2e_t *sl2e; SHADOW_FOREACH_L2E(sl2mfn, sl2e, 0, 0, d, { if ( !user_only || (sl2e->l2 & _PAGE_USER) ) - (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); + shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); }); } @@ -1439,7 +1439,7 @@ void sh_unhook_64b_mappings(struct domain *d, mfn_t sl4mfn, int user_only) shadow_l4e_t *sl4e; SHADOW_FOREACH_L4E(sl4mfn, sl4e, 0, 0, d, { if ( !user_only || (sl4e->l4 & _PAGE_USER) ) - (void) shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); + shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); }); } @@ -1969,7 +1969,7 @@ static void sh_prefetch(struct vcpu *v, walk_t *gw, /* Propagate the entry. */ l1e_propagate_from_guest(v, gl1e, gmfn, &sl1e, ft_prefetch, p2mt); - (void) shadow_set_l1e(d, ptr_sl1e + i, sl1e, p2mt, sl1mfn); + shadow_set_l1e(d, ptr_sl1e + i, sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( snpl1p != NULL ) @@ -2534,7 +2534,7 @@ static int sh_page_fault(struct vcpu *v, /* Calculate the shadow entry and write it */ l1e_propagate_from_guest(v, gw.l1e, gmfn, &sl1e, ft, p2mt); - r = shadow_set_l1e(d, ptr_sl1e, sl1e, p2mt, sl1mfn); + shadow_set_l1e(d, ptr_sl1e, sl1e, p2mt, sl1mfn); #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) if ( mfn_valid(gw.l1mfn) @@ -3014,8 +3014,7 @@ static bool sh_invlpg(struct vcpu *v, unsigned long linear) shadow_l1e_t *sl1; sl1 = sh_linear_l1_table(v) + shadow_l1_linear_offset(linear); /* Remove the shadow entry that maps this VA */ - (void) shadow_set_l1e(d, sl1, shadow_l1e_empty(), - p2m_invalid, sl1mfn); + shadow_set_l1e(d, sl1, shadow_l1e_empty(), p2m_invalid, sl1mfn); } paging_unlock(d); /* Need the invlpg, to pick up the disappeareance of the sl1e */ @@ -3608,7 +3607,8 @@ int sh_rm_write_access_from_l1(struct domain *d, mfn_t sl1mfn, && (mfn_x(shadow_l1e_get_mfn(*sl1e)) == mfn_x(readonly_mfn)) ) { shadow_l1e_t ro_sl1e = shadow_l1e_remove_flags(*sl1e, _PAGE_RW); - (void) shadow_set_l1e(d, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); + + shadow_set_l1e(d, sl1e, ro_sl1e, p2m_ram_rw, sl1mfn); #if SHADOW_OPTIMIZATIONS & SHOPT_WRITABLE_HEURISTIC /* Remember the last shadow that we shot a writeable mapping in */ if ( curr->domain == d ) @@ -3637,8 +3637,7 @@ int sh_rm_mappings_from_l1(struct domain *d, mfn_t sl1mfn, mfn_t target_mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l1e_get_mfn(*sl1e)) == mfn_x(target_mfn)) ) { - (void) shadow_set_l1e(d, sl1e, shadow_l1e_empty(), - p2m_invalid, sl1mfn); + shadow_set_l1e(d, sl1e, shadow_l1e_empty(), p2m_invalid, sl1mfn); if ( sh_check_page_has_no_refs(mfn_to_page(target_mfn)) ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -3656,20 +3655,20 @@ void sh_clear_shadow_entry(struct domain *d, void *ep, mfn_t smfn) switch ( mfn_to_page(smfn)->u.sh.type ) { case SH_type_l1_shadow: - (void) shadow_set_l1e(d, ep, shadow_l1e_empty(), p2m_invalid, smfn); + shadow_set_l1e(d, ep, shadow_l1e_empty(), p2m_invalid, smfn); break; case SH_type_l2_shadow: #if GUEST_PAGING_LEVELS >= 4 case SH_type_l2h_shadow: #endif - (void) shadow_set_l2e(d, ep, shadow_l2e_empty(), smfn); + shadow_set_l2e(d, ep, shadow_l2e_empty(), smfn); break; #if GUEST_PAGING_LEVELS >= 4 case SH_type_l3_shadow: - (void) shadow_set_l3e(d, ep, shadow_l3e_empty(), smfn); + shadow_set_l3e(d, ep, shadow_l3e_empty(), smfn); break; case SH_type_l4_shadow: - (void) shadow_set_l4e(d, ep, shadow_l4e_empty(), smfn); + shadow_set_l4e(d, ep, shadow_l4e_empty(), smfn); break; #endif default: BUG(); /* Called with the wrong kind of shadow. */ @@ -3689,7 +3688,7 @@ int sh_remove_l1_shadow(struct domain *d, mfn_t sl2mfn, mfn_t sl1mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l2e_get_mfn(*sl2e)) == mfn_x(sl1mfn)) ) { - (void) shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); + shadow_set_l2e(d, sl2e, shadow_l2e_empty(), sl2mfn); if ( mfn_to_page(sl1mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -3712,7 +3711,7 @@ int sh_remove_l2_shadow(struct domain *d, mfn_t sl3mfn, mfn_t sl2mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l3e_get_mfn(*sl3e)) == mfn_x(sl2mfn)) ) { - (void) shadow_set_l3e(d, sl3e, shadow_l3e_empty(), sl3mfn); + shadow_set_l3e(d, sl3e, shadow_l3e_empty(), sl3mfn); if ( mfn_to_page(sl2mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; @@ -3734,7 +3733,7 @@ int sh_remove_l3_shadow(struct domain *d, mfn_t sl4mfn, mfn_t sl3mfn) if ( (flags & _PAGE_PRESENT) && (mfn_x(shadow_l4e_get_mfn(*sl4e)) == mfn_x(sl3mfn)) ) { - (void) shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); + shadow_set_l4e(d, sl4e, shadow_l4e_empty(), sl4mfn); if ( mfn_to_page(sl3mfn)->u.sh.type == 0 ) /* This breaks us cleanly out of the FOREACH macro */ done = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:01:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:01:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211588.369184 (Exim 4.92) (envelope-from ) id 1mc4qy-0005XD-6B; Sun, 17 Oct 2021 12:01:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211588.369184; Sun, 17 Oct 2021 12:01:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qy-0005X5-3H; Sun, 17 Oct 2021 12:01:24 +0000 Received: by outflank-mailman (input) for mailman id 211588; Sun, 17 Oct 2021 12:01:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qx-0005Ws-1x for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4qx-0000zv-1F for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4qx-000742-0S for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hCYbgQM00NhJw8cEgnF6kVootPW++xdQWi+QFw9tm0U=; b=QUOVff9S56uvsSSiMmJJz0kZMd Mz5db1Ck9hO9eYHnFOOOsVHoIjfK8WxMLUBNBPmDwakRO+gf2ZAdtN2gbsJtCrkKMmIJ5hMZ9IeuZ 1DUkfvXRut3/YR1YVsHs1iQcm+8uwlIvshFAZAA/fsScokbVyMXcjCG3dU9VojQrlupI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: adjust 2-level case of SHADOW_FOREACH_L2E() Message-Id: Date: Sun, 17 Oct 2021 12:01:23 +0000 commit f791392f82ffe39cc1ea4c4db1d877223754a04a Author: Jan Beulich AuthorDate: Fri Oct 15 13:43:35 2021 +0200 Commit: Jan Beulich CommitDate: Fri Oct 15 13:43:35 2021 +0200 x86/shadow: adjust 2-level case of SHADOW_FOREACH_L2E() Coverity apparently takes issue with the assignment inside an if(), but then only in two of the cases (sh_destroy_l2_shadow() and sh_unhook_32b_mappings()). As it's pretty simple to break out of the outer loop without the need for a local helper variable, adjust the code that way. While there, with the other "unused value" reports also in mind, further drop a dead assignment from SHADOW_FOREACH_L1E(). Coverity-ID: 1492857 Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm/shadow/multi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b879677d77..a3ce4b6259 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -794,8 +794,7 @@ do { \ ({ (__done = _done); }), _code); \ _sl1mfn = sh_next_page(_sl1mfn); \ if ( !__done ) \ - _SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, \ - ({ (__done = _done); }), _code); \ + _SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code); \ } while (0) #else /* Everything else; l1 shadows are only one page */ #define SHADOW_FOREACH_L1E(_sl1mfn, _sl1e, _gl1p, _done, _code) \ @@ -808,10 +807,10 @@ do { \ /* 32-bit l2 on PAE/64: four pages, touch every second entry */ #define SHADOW_FOREACH_L2E(_sl2mfn, _sl2e, _gl2p, _done, _dom, _code) \ do { \ - int _i, _j, __done = 0; \ + int _i, _j; \ ASSERT(shadow_mode_external(_dom)); \ ASSERT(mfn_to_page(_sl2mfn)->u.sh.type == SH_type_l2_32_shadow); \ - for ( _j = 0; _j < 4 && !__done; _j++ ) \ + for ( _j = 0; _j < 4; _j++ ) \ { \ shadow_l2e_t *_sp = map_domain_page(_sl2mfn); \ for ( _i = 0; _i < SHADOW_L2_PAGETABLE_ENTRIES; _i += 2 ) \ @@ -819,11 +818,12 @@ do { \ (_sl2e) = _sp + _i; \ if ( shadow_l2e_get_flags(*(_sl2e)) & _PAGE_PRESENT ) \ {_code} \ - if ( (__done = (_done)) ) break; \ + if ( _done ) break; \ increment_ptr_to_guest_entry(_gl2p); \ } \ unmap_domain_page(_sp); \ if ( _j < 3 ) _sl2mfn = sh_next_page(_sl2mfn); \ + if ( _i < SHADOW_L2_PAGETABLE_ENTRIES ) break; \ } \ } while (0) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:01:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:01:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211589.369188 (Exim 4.92) (envelope-from ) id 1mc4r8-0005Zx-7e; Sun, 17 Oct 2021 12:01:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211589.369188; Sun, 17 Oct 2021 12:01:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4r8-0005Zp-4g; Sun, 17 Oct 2021 12:01:34 +0000 Received: by outflank-mailman (input) for mailman id 211589; Sun, 17 Oct 2021 12:01:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4r7-0005Zb-53 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4r7-000108-4O for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4r7-00075G-3P for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uKBSpIuQqYqQR6tGYlO9dIE/XFn7cdaYiN9GDZaZxTg=; b=k4apYPmI0DGrX78t5upabh4ISk XWBpvETHlz7EVnyiyyvJoAC9IsO60InGI/64zIDzyukC9yB0Erg1HSTxQ4Cd/Ensi7kpUPWJK4e1O pwH/AdC/GGb5ZvvBwwIZ5fqvu6zLoYUC/9w1rZKauQkaZ/Yvwq14mjrr4LKt3tX3Yw+c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/vpci: Move ecam access functions to common code Message-Id: Date: Sun, 17 Oct 2021 12:01:33 +0000 commit be4eefbce6cada21b8a17354c1f11d7865d9a603 Author: Bertrand Marquis AuthorDate: Fri Oct 15 17:51:41 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 11:21:54 2021 -0700 xen/vpci: Move ecam access functions to common code PCI standard is using ECAM and not MCFG which is coming from ACPI[1]. Use ECAM/ecam instead of MCFG in common code and in new functions added in common vpci code by this patch. Move vpci_access_allowed from arch/x86/hvm/io.c to drivers/vpci/vpci.c. Create vpci_ecam_{read,write} in drivers/vpci/vpci.c that contains the common code to perform these operations, changed vpci_mmcfg_{read,write} accordingly to make use of these functions. The vpci_ecam_{read,write} functions are returning false on error and true on success. As the x86 code was previously always returning X86EMUL_OKAY the return code is ignored. A comment has been added in the code to show that this is intentional. Those functions will be used in a following patch inside by arm vpci implementation. Rename MMCFG_BDF to VPCI_ECAM_BDF and move it to vpci.h. This macro is only used by functions calling vpci_ecam helpers. No functional change intended with this patch. [1] https://wiki.osdev.org/PCI_Express Suggested-by: Roger Pau Monné Signed-off-by: Bertrand Marquis Acked-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- xen/arch/x86/hvm/io.c | 46 +++++----------------------------------- xen/drivers/vpci/vpci.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/pci.h | 2 -- xen/include/xen/vpci.h | 12 +++++++++++ 4 files changed, 71 insertions(+), 43 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 046a8eb4ed..93f1d1503f 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -260,20 +260,6 @@ unsigned int hvm_pci_decode_addr(unsigned int cf8, unsigned int addr, return CF8_ADDR_LO(cf8) | (addr & 3); } -/* Do some sanity checks. */ -static bool vpci_access_allowed(unsigned int reg, unsigned int len) -{ - /* Check access size. */ - if ( len != 1 && len != 2 && len != 4 && len != 8 ) - return false; - - /* Check that access is size aligned. */ - if ( (reg & (len - 1)) ) - return false; - - return true; -} - /* vPCI config space IO ports handlers (0xcf8/0xcfc). */ static bool vpci_portio_accept(const struct hvm_io_handler *handler, const ioreq_t *p) @@ -394,7 +380,7 @@ static unsigned int vpci_mmcfg_decode_addr(const struct hvm_mmcfg *mmcfg, paddr_t addr, pci_sbdf_t *sbdf) { addr -= mmcfg->addr; - sbdf->bdf = MMCFG_BDF(addr); + sbdf->bdf = VPCI_ECAM_BDF(addr); sbdf->bus += mmcfg->start_bus; sbdf->seg = mmcfg->segment; @@ -434,25 +420,8 @@ static int vpci_mmcfg_read(struct vcpu *v, unsigned long addr, reg = vpci_mmcfg_decode_addr(mmcfg, addr, &sbdf); read_unlock(&d->arch.hvm.mmcfg_lock); - if ( !vpci_access_allowed(reg, len) || - (reg + len) > PCI_CFG_SPACE_EXP_SIZE ) - return X86EMUL_OKAY; - - /* - * According to the PCIe 3.1A specification: - * - Configuration Reads and Writes must usually be DWORD or smaller - * in size. - * - Because Root Complex implementations are not required to support - * accesses to a RCRB that cross DW boundaries [...] software - * should take care not to cause the generation of such accesses - * when accessing a RCRB unless the Root Complex will support the - * access. - * Xen however supports 8byte accesses by splitting them into two - * 4byte accesses. - */ - *data = vpci_read(sbdf, reg, min(4u, len)); - if ( len == 8 ) - *data |= (uint64_t)vpci_read(sbdf, reg + 4, 4) << 32; + /* Failed reads are not propagated to the caller */ + vpci_ecam_read(sbdf, reg, len, data); return X86EMUL_OKAY; } @@ -476,13 +445,8 @@ static int vpci_mmcfg_write(struct vcpu *v, unsigned long addr, reg = vpci_mmcfg_decode_addr(mmcfg, addr, &sbdf); read_unlock(&d->arch.hvm.mmcfg_lock); - if ( !vpci_access_allowed(reg, len) || - (reg + len) > PCI_CFG_SPACE_EXP_SIZE ) - return X86EMUL_OKAY; - - vpci_write(sbdf, reg, min(4u, len), data); - if ( len == 8 ) - vpci_write(sbdf, reg + 4, 4, data >> 32); + /* Failed writes are not propagated to the caller */ + vpci_ecam_write(sbdf, reg, len, data); return X86EMUL_OKAY; } diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index cbd1bac7fc..ef690f15a9 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -478,6 +478,60 @@ void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, spin_unlock(&pdev->vpci->lock); } +/* Helper function to check an access size and alignment on vpci space. */ +bool vpci_access_allowed(unsigned int reg, unsigned int len) +{ + /* Check access size. */ + if ( len != 1 && len != 2 && len != 4 && len != 8 ) + return false; + + /* Check that access is size aligned. */ + if ( (reg & (len - 1)) ) + return false; + + return true; +} + +bool vpci_ecam_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, + unsigned long data) +{ + if ( !vpci_access_allowed(reg, len) || + (reg + len) > PCI_CFG_SPACE_EXP_SIZE ) + return false; + + vpci_write(sbdf, reg, min(4u, len), data); + if ( len == 8 ) + vpci_write(sbdf, reg + 4, 4, data >> 32); + + return true; +} + +bool vpci_ecam_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, + unsigned long *data) +{ + if ( !vpci_access_allowed(reg, len) || + (reg + len) > PCI_CFG_SPACE_EXP_SIZE ) + return false; + + /* + * According to the PCIe 3.1A specification: + * - Configuration Reads and Writes must usually be DWORD or smaller + * in size. + * - Because Root Complex implementations are not required to support + * accesses to a RCRB that cross DW boundaries [...] software + * should take care not to cause the generation of such accesses + * when accessing a RCRB unless the Root Complex will support the + * access. + * Xen however supports 8byte accesses by splitting them into two + * 4byte accesses. + */ + *data = vpci_read(sbdf, reg, min(4u, len)); + if ( len == 8 ) + *data |= (uint64_t)vpci_read(sbdf, reg + 4, 4) << 32; + + return true; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index edd7c3e71a..443f25347d 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -6,8 +6,6 @@ #define CF8_ADDR_HI(cf8) ( ((cf8) & 0x0f000000) >> 16) #define CF8_ENABLED(cf8) (!!((cf8) & 0x80000000)) -#define MMCFG_BDF(addr) ( ((addr) & 0x0ffff000) >> 12) - #define IS_SNB_GFX(id) (id == 0x01068086 || id == 0x01168086 \ || id == 0x01268086 || id == 0x01028086 \ || id == 0x01128086 || id == 0x01228086 \ diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 9f5b5d52e1..6746c2589a 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -19,6 +19,8 @@ typedef int vpci_register_init_t(struct pci_dev *dev); #define VPCI_PRIORITY_MIDDLE "5" #define VPCI_PRIORITY_LOW "9" +#define VPCI_ECAM_BDF(addr) (((addr) & 0x0ffff000) >> 12) + #define REGISTER_VPCI_INIT(x, p) \ static vpci_register_init_t *const x##_entry \ __used_section(".data.vpci." p) = x @@ -208,6 +210,16 @@ static inline unsigned int vmsix_entry_nr(const struct vpci_msix *msix, { return entry - msix->entries; } + +bool vpci_access_allowed(unsigned int reg, unsigned int len); + +/* ECAM mmio read/write helpers */ +bool vpci_ecam_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, + unsigned long data); + +bool vpci_ecam_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, + unsigned long *data); + #endif /* __XEN__ */ #else /* !CONFIG_HAS_VPCI */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:01:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:01:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211590.369192 (Exim 4.92) (envelope-from ) id 1mc4rI-0005cz-9B; Sun, 17 Oct 2021 12:01:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211590.369192; Sun, 17 Oct 2021 12:01:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rI-0005cr-6H; Sun, 17 Oct 2021 12:01:44 +0000 Received: by outflank-mailman (input) for mailman id 211590; Sun, 17 Oct 2021 12:01:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rH-0005cf-93 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rH-00010G-8K for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4rH-00076W-7J for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9ZbO1imzZdRknaaP64UPBehm07oo4c/b7H88R90dXiE=; b=YOrhkhEvPzFIz7YDTndLGy0T2E edkFcdli/SD+Pu3O6k/A2J+yqkLHt+6HUB26VNz4ZKs65GfUfMqw0W8JbcnyzQ0Mz2C7G3aHFNy2s mW03wlzPdbDOaFjp1iLpRJu8saENRWKUFZ03WBdvbnhUyslxIScHqbifDSFJ2Qa5PKq8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Enable the existing x86 virtual PCI support for ARM Message-Id: Date: Sun, 17 Oct 2021 12:01:43 +0000 commit d59168dc05a5f98b12a7e243268c7d1050c8676c Author: Rahul Singh AuthorDate: Fri Oct 15 17:51:42 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 12:40:21 2021 -0700 xen/arm: Enable the existing x86 virtual PCI support for ARM The existing VPCI support available for X86 is adapted for Arm. When the device is added to XEN via the hyper call “PHYSDEVOP_pci_device_add”, VPCI handler for the config space access is added to the Xen to emulate the PCI devices config space. A MMIO trap handler for the PCI ECAM space is registered in XEN so that when guest is trying to access the PCI config space,XEN will trap the access and emulate read/write using the VPCI and not the real PCI hardware. For Dom0less systems scan_pci_devices() would be used to discover the PCI device in XEN and VPCI handler will be added during XEN boots. This patch is also doing some small fixes to fix compilation errors on arm32 of vpci and prevent 64bit accesses on 32bit: - use %zu instead of lu in header.c for print - prevent 64bit accesses in vpci_access_allowed - ifdef out using CONFIG_64BIT handling of len 8 in vpci_ecam_{read/write} TODO: currently vpci_add_handlers is marked as __hwdom_init, but on ARM vpci_add_handlers can be called after boot from PHYSDEVOP_pci_device_add. Consider removing __hwdom_init. Signed-off-by: Rahul Singh Signed-off-by: Bertrand Marquis [stefano: add TODO item to commit message] Signed-off-by: Stefano Stabellini Acked-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + xen/arch/arm/domain.c | 4 +++ xen/arch/arm/vpci.c | 77 +++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vpci.h | 36 ++++++++++++++++++++ xen/drivers/passthrough/pci.c | 13 ++++++++ xen/drivers/vpci/header.c | 2 +- xen/drivers/vpci/vpci.c | 10 ++++++ xen/include/asm-arm/domain.h | 1 + xen/include/public/arch-arm.h | 7 ++++ xen/include/xen/pci.h | 2 ++ 10 files changed, 152 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 64518848b2..07f634508e 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -7,6 +7,7 @@ ifneq ($(CONFIG_NO_PLAT),y) obj-y += platforms/ endif obj-$(CONFIG_TEE) += tee/ +obj-$(CONFIG_HAS_VPCI) += vpci.o obj-$(CONFIG_HAS_ALTERNATIVE) += alternative.o obj-y += bootfdt.init.o diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index eef0661beb..96e1b23550 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -39,6 +39,7 @@ #include #include +#include "vpci.h" #include "vuart.h" DEFINE_PER_CPU(struct vcpu *, curr_vcpu); @@ -773,6 +774,9 @@ int arch_domain_create(struct domain *d, if ( is_hardware_domain(d) && (rc = domain_vuart_init(d)) ) goto fail; + if ( (rc = domain_vpci_init(d)) != 0 ) + goto fail; + return 0; fail: diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c new file mode 100644 index 0000000000..8f40a0dec6 --- /dev/null +++ b/xen/arch/arm/vpci.c @@ -0,0 +1,77 @@ +/* + * xen/arch/arm/vpci.c + * + * 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. + */ +#include +#include + +#include + +static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, + register_t *r, void *p) +{ + pci_sbdf_t sbdf; + /* data is needed to prevent a pointer cast on 32bit */ + unsigned long data; + + /* We ignore segment part and always handle segment 0 */ + sbdf.sbdf = VPCI_ECAM_BDF(info->gpa); + + if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), + 1U << info->dabt.size, &data) ) + { + *r = data; + return 1; + } + + *r = ~0ul; + + return 0; +} + +static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, + register_t r, void *p) +{ + pci_sbdf_t sbdf; + + /* We ignore segment part and always handle segment 0 */ + sbdf.sbdf = VPCI_ECAM_BDF(info->gpa); + + return vpci_ecam_write(sbdf, ECAM_REG_OFFSET(info->gpa), + 1U << info->dabt.size, r); +} + +static const struct mmio_handler_ops vpci_mmio_handler = { + .read = vpci_mmio_read, + .write = vpci_mmio_write, +}; + +int domain_vpci_init(struct domain *d) +{ + if ( !has_vpci(d) ) + return 0; + + register_mmio_handler(d, &vpci_mmio_handler, + GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ + diff --git a/xen/arch/arm/vpci.h b/xen/arch/arm/vpci.h new file mode 100644 index 0000000000..d8a7b0e3e8 --- /dev/null +++ b/xen/arch/arm/vpci.h @@ -0,0 +1,36 @@ +/* + * xen/arch/arm/vpci.h + * + * 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. + */ + +#ifndef __ARCH_ARM_VPCI_H__ +#define __ARCH_ARM_VPCI_H__ + +#ifdef CONFIG_HAS_VPCI +int domain_vpci_init(struct domain *d); +#else +static inline int domain_vpci_init(struct domain *d) +{ + return 0; +} +#endif + +#endif /* __ARCH_ARM_VPCI_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 3aa8c3175f..35e0190796 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -756,6 +756,19 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, if ( !pdev->domain ) { pdev->domain = hardware_domain; +#ifdef CONFIG_ARM + /* + * On ARM PCI devices discovery will be done by Dom0. Add vpci handler + * when Dom0 inform XEN to add the PCI devices in XEN. + */ + ret = vpci_add_handlers(pdev); + if ( ret ) + { + printk(XENLOG_ERR "Setup of vPCI failed: %d\n", ret); + pdev->domain = NULL; + goto out; + } +#endif ret = iommu_add_device(pdev); if ( ret ) { diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index f8cd55e7c0..40ff79c33f 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -373,7 +373,7 @@ static void bar_write(const struct pci_dev *pdev, unsigned int reg, /* If the value written is the current one avoid printing a warning. */ if ( val != (uint32_t)(bar->addr >> (hi ? 32 : 0)) ) gprintk(XENLOG_WARNING, - "%pp: ignored BAR %lu write with memory decoding enabled\n", + "%pp: ignored BAR %zu write with memory decoding enabled\n", &pdev->sbdf, bar - pdev->vpci->header.bars + hi); return; } diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index ef690f15a9..decf7d87a1 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -485,6 +485,12 @@ bool vpci_access_allowed(unsigned int reg, unsigned int len) if ( len != 1 && len != 2 && len != 4 && len != 8 ) return false; +#ifndef CONFIG_64BIT + /* Prevent 64bit accesses on 32bit */ + if ( len == 8 ) + return false; +#endif + /* Check that access is size aligned. */ if ( (reg & (len - 1)) ) return false; @@ -500,8 +506,10 @@ bool vpci_ecam_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, return false; vpci_write(sbdf, reg, min(4u, len), data); +#ifdef CONFIG_64BIT if ( len == 8 ) vpci_write(sbdf, reg + 4, 4, data >> 32); +#endif return true; } @@ -526,8 +534,10 @@ bool vpci_ecam_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, * 4byte accesses. */ *data = vpci_read(sbdf, reg, min(4u, len)); +#ifdef CONFIG_64BIT if ( len == 8 ) *data |= (uint64_t)vpci_read(sbdf, reg + 4, 4) << 32; +#endif return true; } diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 14e575288f..9b3647587a 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -263,6 +263,7 @@ static inline void arch_vcpu_block(struct vcpu *v) {} #define arch_vm_assist_valid_mask(d) (1UL << VMASST_TYPE_runstate_update_flag) +/* vPCI is not available on Arm */ #define has_vpci(d) ({ (void)(d); false; }) #endif /* __ASM_DOMAIN_H__ */ diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 96ead3de07..b4c615bcdf 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -418,6 +418,13 @@ typedef uint64_t xen_callback_t; #define GUEST_GICV3_GICR0_BASE xen_mk_ullong(0x03020000) /* vCPU0..127 */ #define GUEST_GICV3_GICR0_SIZE xen_mk_ullong(0x01000000) +/* + * 256 MB is reserved for VPCI configuration space based on calculation + * 256 buses x 32 devices x 8 functions x 4 KB = 256 MB + */ +#define GUEST_VPCI_ECAM_BASE xen_mk_ullong(0x10000000) +#define GUEST_VPCI_ECAM_SIZE xen_mk_ullong(0x10000000) + /* ACPI tables physical address */ #define GUEST_ACPI_BASE xen_mk_ullong(0x20000000) #define GUEST_ACPI_SIZE xen_mk_ullong(0x02000000) diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 70ac25345c..b6d7e454f8 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -40,6 +40,8 @@ #define PCI_SBDF3(s,b,df) \ ((pci_sbdf_t){ .sbdf = (((s) & 0xffff) << 16) | PCI_BDF2(b, df) }) +#define ECAM_REG_OFFSET(addr) ((addr) & 0x00000fff) + typedef union { uint32_t sbdf; struct { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:01:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:01:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211591.369197 (Exim 4.92) (envelope-from ) id 1mc4rS-0005gS-CX; Sun, 17 Oct 2021 12:01:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211591.369197; Sun, 17 Oct 2021 12:01:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rS-0005gD-9A; Sun, 17 Oct 2021 12:01:54 +0000 Received: by outflank-mailman (input) for mailman id 211591; Sun, 17 Oct 2021 12:01:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rR-0005g3-CD for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rR-00010k-BY for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4rR-00077Y-Am for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:01:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fRU8UxebZul9rJm+sq5cLZMl/k9c2wO+8YeIdwRiB/E=; b=MatxZvuxNDaiXJSLA8rPqXpATc 9JLB5X23ZLMxGaonLQ2FteXwGwy/BHuLJI3Ai4DC9eG8gvR04McoaljSDbdCCMnik6DfAbdDzGJOD TaLV5eLV8R+nKLsugB6mcROXf4NmyCsv7S8nJZ7zsTE2SwhDAc9uTwaqRIbaIW6VQMTA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxl: Modify libxl__arch_domain_init_hw_description... Message-Id: Date: Sun, 17 Oct 2021 12:01:53 +0000 commit 1b4047a9f2c6fe7331fcb283796eb1b1d1a5d827 Author: Michal Orzel AuthorDate: Fri Oct 15 17:51:43 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 12:40:21 2021 -0700 tools/libxl: Modify libxl__arch_domain_init_hw_description... ... to take a second argument of type libxl_domain_config* rather than libxl_domain_build_info*. We need to pass the whole libxl_domain_config structure as this will be needed later on to modify the libxl__prepare_dtb function to also take libxl_domain_config. Signed-off-by: Michal Orzel Signed-off-by: Bertrand Marquis Suggested-by: Ian Jackson Reviewed-by: Ian Jackson Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_arch.h | 2 +- tools/libs/light/libxl_arm.c | 3 ++- tools/libs/light/libxl_dom.c | 2 +- tools/libs/light/libxl_x86.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/libs/light/libxl_arch.h b/tools/libs/light/libxl_arch.h index 8527fc5c6c..1522ecb97f 100644 --- a/tools/libs/light/libxl_arch.h +++ b/tools/libs/light/libxl_arch.h @@ -38,7 +38,7 @@ int libxl__arch_domain_create(libxl__gc *gc, /* setup arch specific hardware description, i.e. DTB on ARM */ _hidden int libxl__arch_domain_init_hw_description(libxl__gc *gc, - libxl_domain_build_info *info, + libxl_domain_config *d_config, libxl__domain_build_state *state, struct xc_dom_image *dom); /* finalize arch specific hardware description. */ diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index a7801558cf..d5771f98dd 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -1016,12 +1016,13 @@ out: } int libxl__arch_domain_init_hw_description(libxl__gc *gc, - libxl_domain_build_info *info, + libxl_domain_config *d_config, libxl__domain_build_state *state, struct xc_dom_image *dom) { int rc; uint64_t val; + libxl_domain_build_info *const info = &d_config->b_info; if (info->type != LIBXL_DOMAIN_TYPE_PVH) { LOG(ERROR, "Unsupported Arm guest type %s", diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index e9f58ee4b2..fe9f760f71 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -571,7 +571,7 @@ static int libxl__build_dom(libxl__gc *gc, uint32_t domid, LOG(ERROR, "xc_dom_parse_image failed"); goto out; } - if ( (ret = libxl__arch_domain_init_hw_description(gc, info, state, dom)) != 0 ) { + if ( (ret = libxl__arch_domain_init_hw_description(gc, d_config, state, dom)) != 0 ) { LOGE(ERROR, "libxl__arch_domain_init_hw_description failed"); goto out; } diff --git a/tools/libs/light/libxl_x86.c b/tools/libs/light/libxl_x86.c index 6083878315..1feadebb18 100644 --- a/tools/libs/light/libxl_x86.c +++ b/tools/libs/light/libxl_x86.c @@ -568,7 +568,7 @@ int libxl__arch_extra_memory(libxl__gc *gc, } int libxl__arch_domain_init_hw_description(libxl__gc *gc, - libxl_domain_build_info *info, + libxl_domain_config *d_config, libxl__domain_build_state *state, struct xc_dom_image *dom) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:02:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:02:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211592.369200 (Exim 4.92) (envelope-from ) id 1mc4rc-0005jJ-DW; Sun, 17 Oct 2021 12:02:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211592.369200; Sun, 17 Oct 2021 12:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rc-0005jB-Ad; Sun, 17 Oct 2021 12:02:04 +0000 Received: by outflank-mailman (input) for mailman id 211592; Sun, 17 Oct 2021 12:02:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rb-0005iz-F4 for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:02:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rb-00011E-EO for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:02:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4rb-00078b-Di for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:02:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QS9AxUgm/Rmbuccrv7fkOs9yHK0DR7UEl7NGB3vGUF4=; b=lEYRQZPMZR0P5y3wGMMymMei/l AwFPAWVhAe8TC/fILi5+8kZpvWhg/Vzbc1GKKc0Uu4qWubME0P7t69hEEdwi6Jv+gH4DSrbWzmWvZ QM5QsUnLbnZ75GCD9xoInvtyzggWQIc1ltjUQnOKRA3oo6nqaWHs+c2TEUpzvMO+d0m4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxl_arm: Modify libxl__prepare_dtb... Message-Id: Date: Sun, 17 Oct 2021 12:02:03 +0000 commit 559ea0debabac5f142d3b901527d48cc99021588 Author: Michal Orzel AuthorDate: Fri Oct 15 17:51:44 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 12:40:21 2021 -0700 tools/libxl_arm: Modify libxl__prepare_dtb... ... to take a second argument of type libxl_domain_config* rather than libxl_domain_build_info*. This change will be needed to get access from libxl__prepare_dtb to "num_pcidevs" field of libxl_domain_config to check whether to create a vPCI DT node or not. Signed-off-by: Michal Orzel Signed-off-by: Bertrand Marquis Suggested-by: Ian Jackson Reviewed-by: Ian Jackson Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_arm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index d5771f98dd..fdae129605 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -878,7 +878,7 @@ static int copy_partial_fdt(libxl__gc *gc, void *fdt, void *pfdt) #define FDT_MAX_SIZE (1<<20) -static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_build_info *info, +static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, libxl__domain_build_state *state, struct xc_dom_image *dom) { @@ -887,6 +887,7 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_build_info *info, int rc, res; size_t fdt_size = 0; int pfdt_size = 0; + libxl_domain_build_info *const info = &d_config->b_info; const libxl_version_info *vers; const struct arch_info *ainfo; @@ -1042,7 +1043,7 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, if (rc) return rc; - rc = libxl__prepare_dtb(gc, info, state, dom); + rc = libxl__prepare_dtb(gc, d_config, state, dom); if (rc) goto out; if (!libxl_defbool_val(info->acpi)) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun Oct 17 12:02:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 Oct 2021 12:02:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.211594.369203 (Exim 4.92) (envelope-from ) id 1mc4rm-0005mM-F0; Sun, 17 Oct 2021 12:02:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 211594.369203; Sun, 17 Oct 2021 12:02:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rm-0005mF-CC; Sun, 17 Oct 2021 12:02:14 +0000 Received: by outflank-mailman (input) for mailman id 211594; Sun, 17 Oct 2021 12:02:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rl-0005m8-IA for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:02:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mc4rl-00011Q-HR for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:02:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mc4rl-00079J-Gc for xen-changelog@lists.xenproject.org; Sun, 17 Oct 2021 12:02:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ecnLHkEnFCTEVN6n6XlgmLBe4W9h76Hw87MFIIfvXcA=; b=2KlMsaqceKHv1xo9UEaAGFvcyF JxIEeBTRYS/kre3nzgf93FqLRMnX5nf7EQpiwQqwCVa/Y528ZUIqAWOAcUvEFOcqOexCAPhsSzWqv 6aRMe9oHDi28AI3TpCySkK6XxQlOeiNCTG5OsmaAQdu1ohq3cXG/3QehO6uYzGWOa2c0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/libxl: Emulated PCI device tree node in libxl Message-Id: Date: Sun, 17 Oct 2021 12:02:13 +0000 commit 52d0847d7c6972baa74156f14ee8544f5aba1d2d Author: Rahul Singh AuthorDate: Fri Oct 15 17:51:45 2021 +0100 Commit: Stefano Stabellini CommitDate: Fri Oct 15 12:40:21 2021 -0700 arm/libxl: Emulated PCI device tree node in libxl libxl will create an emulated PCI device tree node in the device tree to enable the guest OS to discover the virtual PCI during guest boot. Emulated PCI device tree node will only be created when there is any device assigned to guest. A new area has been reserved in the arm guest physical map at which the VPCI bus is declared in the device tree (reg and ranges parameters of the node). Note that currently we are using num_pcidevs instead of c_info->passthrough to decide whether to create a vPCI DT node. This will be insufficient if and when ARM does PCI hotplug. Add this note inside libxl_create.c where c_info->passthrough is set. Signed-off-by: Rahul Singh Signed-off-by: Michal Orzel Signed-off-by: Bertrand Marquis Reviewed-by: Julien Grall Acked-by: Ian Jackson Reviewed-by: Stefano Stabellini --- tools/libs/light/libxl_arm.c | 103 ++++++++++++++++++++++++++++++++++++++++ tools/libs/light/libxl_create.c | 5 ++ xen/include/public/arch-arm.h | 10 ++++ 3 files changed, 118 insertions(+) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index fdae129605..eef1de0939 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -284,6 +284,59 @@ static int fdt_property_reg_placeholder(libxl__gc *gc, void *fdt, return fdt_property(fdt, "reg", regs, sizeof(regs)); } +static int fdt_property_values(libxl__gc *gc, void *fdt, + const char *name, + unsigned num_cells, ...) +{ + uint32_t prop[num_cells]; + be32 *cells = &prop[0]; + int i; + va_list ap; + uint32_t arg; + + va_start(ap, num_cells); + for (i = 0 ; i < num_cells; i++) { + arg = va_arg(ap, uint32_t); + set_cell(&cells, 1, arg); + } + va_end(ap); + + return fdt_property(fdt, name, prop, sizeof(prop)); +} + +static int fdt_property_vpci_ranges(libxl__gc *gc, void *fdt, + unsigned addr_cells, + unsigned size_cells, + unsigned num_regs, ...) +{ + uint32_t regs[num_regs*((addr_cells*2)+size_cells+1)]; + be32 *cells = ®s[0]; + int i; + va_list ap; + uint64_t arg; + + va_start(ap, num_regs); + for (i = 0 ; i < num_regs; i++) { + /* Set the memory bit field */ + arg = va_arg(ap, uint32_t); + set_cell(&cells, 1, arg); + + /* Set the vpci bus address */ + arg = addr_cells ? va_arg(ap, uint64_t) : 0; + set_cell(&cells, addr_cells , arg); + + /* Set the cpu bus address where vpci address is mapped */ + set_cell(&cells, addr_cells, arg); + + /* Set the vpci size requested */ + arg = size_cells ? va_arg(ap, uint64_t) : 0; + set_cell(&cells, size_cells, arg); + } + va_end(ap); + + return fdt_property(fdt, "ranges", regs, sizeof(regs)); +} + static int make_root_properties(libxl__gc *gc, const libxl_version_info *vers, void *fdt) @@ -687,6 +740,53 @@ static int make_vpl011_uart_node(libxl__gc *gc, void *fdt, return 0; } +static int make_vpci_node(libxl__gc *gc, void *fdt, + const struct arch_info *ainfo, + struct xc_dom_image *dom) +{ + int res; + const uint64_t vpci_ecam_base = GUEST_VPCI_ECAM_BASE; + const uint64_t vpci_ecam_size = GUEST_VPCI_ECAM_SIZE; + const char *name = GCSPRINTF("pcie@%"PRIx64, vpci_ecam_base); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, "pci-host-ecam-generic"); + if (res) return res; + + res = fdt_property_string(fdt, "device_type", "pci"); + if (res) return res; + + res = fdt_property_regs(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, + GUEST_ROOT_SIZE_CELLS, 1, vpci_ecam_base, vpci_ecam_size); + if (res) return res; + + res = fdt_property_values(gc, fdt, "bus-range", 2, 0, 255); + if (res) return res; + + res = fdt_property_cell(fdt, "#address-cells", 3); + if (res) return res; + + res = fdt_property_cell(fdt, "#size-cells", 2); + if (res) return res; + + res = fdt_property_string(fdt, "status", "okay"); + if (res) return res; + + res = fdt_property_vpci_ranges(gc, fdt, GUEST_ROOT_ADDRESS_CELLS, + GUEST_ROOT_SIZE_CELLS, 2, + GUEST_VPCI_ADDR_TYPE_MEM, GUEST_VPCI_MEM_ADDR, GUEST_VPCI_MEM_SIZE, + GUEST_VPCI_ADDR_TYPE_PREFETCH_MEM, GUEST_VPCI_PREFETCH_MEM_ADDR, + GUEST_VPCI_PREFETCH_MEM_SIZE); + if (res) return res; + + res = fdt_end_node(fdt); + if (res) return res; + + return 0; +} + static const struct arch_info *get_arch_info(libxl__gc *gc, const struct xc_dom_image *dom) { @@ -991,6 +1091,9 @@ next_resize: if (info->tee == LIBXL_TEE_TYPE_OPTEE) FDT( make_optee_node(gc, fdt) ); + if (d_config->num_pcidevs) + FDT( make_vpci_node(gc, fdt, ainfo, dom) ); + if (pfdt) FDT( copy_partial_fdt(gc, fdt, pfdt) ); diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 6ebb2bfc76..5a61d01722 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -1096,6 +1096,11 @@ int libxl__domain_config_setdefault(libxl__gc *gc, goto error_out; } + /* + * Note: libxl_arm directly examines num_pcidevs to decide whether + * to create a vPCI DT node, rather than using c_info->passthrough. + * This will be insufficient if and when ARM does PCI hotplug. + */ bool need_pt = d_config->num_pcidevs || d_config->num_dtdevs; if (c_info->passthrough == LIBXL_PASSTHROUGH_DEFAULT) { c_info->passthrough = need_pt diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index b4c615bcdf..94b31511dd 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -433,6 +433,11 @@ typedef uint64_t xen_callback_t; #define GUEST_PL011_BASE xen_mk_ullong(0x22000000) #define GUEST_PL011_SIZE xen_mk_ullong(0x00001000) +/* Guest PCI-PCIe memory space where config space and BAR will be available.*/ +#define GUEST_VPCI_ADDR_TYPE_MEM xen_mk_ullong(0x02000000) +#define GUEST_VPCI_MEM_ADDR xen_mk_ullong(0x23000000) +#define GUEST_VPCI_MEM_SIZE xen_mk_ullong(0x10000000) + /* * 16MB == 4096 pages reserved for guest to use as a region to map its * grant table in. @@ -453,6 +458,11 @@ typedef uint64_t xen_callback_t; #define GUEST_RAM0_BASE xen_mk_ullong(0x40000000) /* 3GB of low RAM @ 1GB */ #define GUEST_RAM0_SIZE xen_mk_ullong(0xc0000000) +/* 4GB @ 4GB Prefetch Memory for VPCI */ +#define GUEST_VPCI_ADDR_TYPE_PREFETCH_MEM xen_mk_ullong(0x42000000) +#define GUEST_VPCI_PREFETCH_MEM_ADDR xen_mk_ullong(0x100000000) +#define GUEST_VPCI_PREFETCH_MEM_SIZE xen_mk_ullong(0x100000000) + #define GUEST_RAM1_BASE xen_mk_ullong(0x0200000000) /* 1016GB of RAM @ 8GB */ #define GUEST_RAM1_SIZE xen_mk_ullong(0xfe00000000) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Oct 18 12:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Oct 2021 12:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212176.369948 (Exim 4.92) (envelope-from ) id 1mcRpC-0001OT-C1; Mon, 18 Oct 2021 12:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212176.369948; Mon, 18 Oct 2021 12:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpC-0001OL-8y; Mon, 18 Oct 2021 12:33:06 +0000 Received: by outflank-mailman (input) for mailman id 212176; Mon, 18 Oct 2021 12:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpB-0001OD-1t for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpA-0004nA-Vb for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcRpA-0001js-U2 for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=q7gHQrVa49aH7WgGdADIYCroQJ0U2fK5U9yAyvfiluI=; b=JoefNnzfnkJgih1ZpPZzgd7JLM uNJip1xxJweJk/JlC4kMuqWqIoiEh5E9jcf+ls7/i3TeEQLa1QC05YIl0+odpon8jOtjJ6MCyUIWT aGXl3A8PS/ZG7ZMk6PamDTMBEU3cmyTCIBXN00sVi8F/1lDkOtTUg8Ggfx40TweQKRrw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: correct cleanup after failed viridian_vcpu_init() Message-Id: Date: Mon, 18 Oct 2021 12:33:04 +0000 commit 66675056c6e59b8a8b651a29ef53c63e9e04f58d Author: Jan Beulich AuthorDate: Mon Oct 18 14:21:17 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 18 14:21:17 2021 +0200 x86/HVM: correct cleanup after failed viridian_vcpu_init() This happens after nestedhvm_vcpu_initialise(), so its effects also need to be undone. Fixes: 40a4a9d72d16 ("viridian: add init hooks") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/hvm/hvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index aa418a3ca1..3a6fd865d9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1583,7 +1583,7 @@ int hvm_vcpu_initialise(struct vcpu *v) rc = viridian_vcpu_init(v); if ( rc ) - goto fail5; + goto fail6; rc = ioreq_server_add_vcpu_all(d, v); if ( rc != 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Oct 18 12:33:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Oct 2021 12:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212177.369953 (Exim 4.92) (envelope-from ) id 1mcRpM-0001Qa-Ds; Mon, 18 Oct 2021 12:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212177.369953; Mon, 18 Oct 2021 12:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpM-0001QQ-AT; Mon, 18 Oct 2021 12:33:16 +0000 Received: by outflank-mailman (input) for mailman id 212177; Mon, 18 Oct 2021 12:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpL-0001Q7-3n for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpL-0004nN-30 for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcRpL-0001kf-1w for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SW2tL4k5v56ioLrWU0/zfc4s6M2LOxGPE9snl+kQBDM=; b=AUg8rn+TFsMfiOwAy2Zxl5qyC6 +8RyHcVd7LM9PWlnlHb8PzwYVgVcwbfsTYsT+Yug2Z9YIG0INtTzXeVMmULWI60b1nnozsQMZ5GJS XDNeugvR4arUYva2M/BFIBOhC1B+ctCqlx37wL8LvKYlbiF9BCBi2kppoRy8uBtEBGDg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: make a local variable in sh_page_fault() HVM-only Message-Id: Date: Mon, 18 Oct 2021 12:33:15 +0000 commit c8ac573c238308dbaa31fa6acb571c91b587714f Author: Jan Beulich AuthorDate: Mon Oct 18 14:22:32 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 18 14:22:32 2021 +0200 x86/shadow: make a local variable in sh_page_fault() HVM-only I recall checking that "r" would still have a user, but when doing so I failed to recognize that all uses are inside a CONFIG_HVM conditional section. Fixes: 9f4f20b27b07 ("x86/shadow: adjust some shadow_set_le() callers") Reported-by: Stefano Stabellini Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm/shadow/multi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index a3ce4b6259..7b8f4dd13b 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2155,8 +2155,8 @@ static int sh_page_fault(struct vcpu *v, #ifdef CONFIG_HVM struct sh_emulate_ctxt emul_ctxt; const struct x86_emulate_ops *emul_ops; -#endif int r; +#endif p2m_type_t p2mt; uint32_t rc, error_code; bool walk_ok; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Oct 18 12:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Oct 2021 12:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212179.369956 (Exim 4.92) (envelope-from ) id 1mcRpW-0001Tu-FE; Mon, 18 Oct 2021 12:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212179.369956; Mon, 18 Oct 2021 12:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpW-0001Tm-Bw; Mon, 18 Oct 2021 12:33:26 +0000 Received: by outflank-mailman (input) for mailman id 212179; Mon, 18 Oct 2021 12:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpV-0001TW-71 for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcRpV-0004nf-6C for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcRpV-0001lS-5E for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 12:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=57ghb9HRJSMDNHB+9ygSS7G/2hCwsDoF9okTbk1ZGoQ=; b=czkDXCCE/xmFC2w9BR8a2tEEzo u6F2bszUO4XBn/sIOmt8B+8fytO0Uhnv+WJ5vGyKPBIa/abhlGyrE8Vps/zogke5dVpyNuJSz4Rfg gKgA7870kKoiLt9K6+jzOjPhyafOSav36qcHKO+oeUgXKr6zX8ZhIl/CYB7sBUOI6wR4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PV: address odd UB in I/O emulation Message-Id: Date: Mon, 18 Oct 2021 12:33:25 +0000 commit c11b8d25fbe9c0155e91409594ea6701008409ed Author: Jan Beulich AuthorDate: Mon Oct 18 14:23:29 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 18 14:23:29 2021 +0200 x86/PV: address odd UB in I/O emulation Compilers are certainly right in detecting UB here, given that fully parenthesized (to express precedence) the original offending expression was (((stub_va + p) - ctxt->io_emul_stub) + 5), which in fact exhibits two overflows in pointer calculations. We really want to calculate (p - ctxt->io_emul_stub) first, which is guaranteed to not overflow. The issue was observed with clang 9 on 4.13. The oddities are - the issue was detected on APPEND_CALL(save_guest_gprs), despite the earlier similar APPEND_CALL(load_guest_gprs), - merely casting the original offending expression to long was reported to also help. While at it also avoid converting guaranteed (with our current address space layout) negative values to unsigned long (which has implementation defined behavior): Have stub_va be of pointer type. And since it's on an immediately adjacent line, also constify this_stubs. Fixes: d89e5e65f305 ("x86/ioemul: Rewrite stub generation to be shadow stack compatible") Reported-by: Franklin Shen <2284696125@qq.com> Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/pv/emul-priv-op.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index d0df5bc616..7f4279a051 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -90,8 +90,8 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0xc3, /* ret */ }; - struct stubs *this_stubs = &this_cpu(stubs); - unsigned long stub_va = this_stubs->addr + STUB_BUF_SIZE / 2; + const struct stubs *this_stubs = &this_cpu(stubs); + const void *stub_va = (void *)this_stubs->addr + STUB_BUF_SIZE / 2; unsigned int quirk_bytes = 0; char *p; @@ -99,7 +99,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, #define APPEND_BUFF(b) ({ memcpy(p, b, sizeof(b)); p += sizeof(b); }) #define APPEND_CALL(f) \ ({ \ - long disp = (long)(f) - (stub_va + p - ctxt->io_emul_stub + 5); \ + long disp = (void *)(f) - (stub_va + (p - ctxt->io_emul_stub) + 5); \ BUG_ON((int32_t)disp != disp); \ *p++ = 0xe8; \ *(int32_t *)p = disp; p += 4; \ @@ -107,7 +107,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, if ( !ctxt->io_emul_stub ) ctxt->io_emul_stub = - map_domain_page(_mfn(this_stubs->mfn)) + (stub_va & ~PAGE_MASK); + map_domain_page(_mfn(this_stubs->mfn)) + PAGE_OFFSET(stub_va); p = ctxt->io_emul_stub; @@ -142,7 +142,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, block_speculation(); /* SCSB */ /* Handy function-typed pointer to the stub. */ - return (void *)stub_va; + return stub_va; #undef APPEND_CALL #undef APPEND_BUFF -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Oct 18 13:33:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Oct 2021 13:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212302.370128 (Exim 4.92) (envelope-from ) id 1mcSlF-0007t0-UX; Mon, 18 Oct 2021 13:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212302.370128; Mon, 18 Oct 2021 13:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlF-0007ss-Ra; Mon, 18 Oct 2021 13:33:05 +0000 Received: by outflank-mailman (input) for mailman id 212302; Mon, 18 Oct 2021 13:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlF-0007sm-5d for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlF-0005ud-4F for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcSlF-00064x-3U for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GrRGVVExtHp1lyLDD57Bth9kEarWg/yzi8y8v/+UwTI=; b=YJ7uLfLNuOfTzwhHznPRva+PBy TvRru6XwdU7Y6xX1+LVZey8acqmvATugDqeC2VjFpcCFDIJVIg3KijuisK9Bv/7p+mkgz8f7Nrqo8 Z3gi4XdA31AyCyV6Adw600zHudyOl0naqSaGqyAquFYv/2diQiv0Rr/4NjGEalWlk52w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: set oom score for xenstore daemon on Linux Message-Id: Date: Mon, 18 Oct 2021 13:33:05 +0000 commit f282182af32939107d47943aba242d3189ec6f90 Author: Juergen Gross AuthorDate: Tue Oct 12 15:41:47 2021 +0200 Commit: Ian Jackson CommitDate: Mon Oct 18 14:15:59 2021 +0100 tools/xenstore: set oom score for xenstore daemon on Linux Xenstored is absolutely mandatory for a Xen host and it can't be restarted, so being killed by OOM-killer in case of memory shortage is to be avoided. Set /proc/$pid/oom_score_adj (if available) per default to -500 (this translates to 50% of dom0 memory size) in order to allow xenstored to use large amounts of memory without being killed. The percentage of dom0 memory above which the oom killer is allowed to kill xenstored can be set via XENSTORED_OOM_MEM_THRESHOLD in xencommons. Make sure the pid file isn't a left-over from a previous run delete it before starting xenstored. Signed-off-by: Juergen Gross Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 9 +++++++++ tools/hotplug/Linux/launch-xenstore.in | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in index 00cf7f91d4..b83101ab7e 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -48,6 +48,15 @@ XENSTORED_ARGS= # Only evaluated if XENSTORETYPE is "daemon". #XENSTORED_TRACE=[yes|on|1] +## Type: integer +## Default: 50 +# +# Percentage of dom0 memory size the xenstore daemon can use before the +# OOM killer is allowed to kill it. +# The specified value is multiplied by -10 and echoed to +# /proc/PID/oom_score_adj. +#XENSTORED_OOM_MEM_THRESHOLD=50 + ## Type: string ## Default: @LIBEXEC@/boot/xenstore-stubdom.gz # diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/launch-xenstore.in index 019f9d6f4d..1747c96065 100644 --- a/tools/hotplug/Linux/launch-xenstore.in +++ b/tools/hotplug/Linux/launch-xenstore.in @@ -59,11 +59,17 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF echo "No xenstored found" exit 1 } + [ -z "$XENSTORED_OOM_MEM_THRESHOLD" ] || XENSTORED_OOM_MEM_THRESHOLD=50 + XS_OOM_SCORE=-$(($XENSTORED_OOM_MEM_THRESHOLD * 10)) + + rm -f @XEN_RUN_DIR@/xenstored.pid echo -n Starting $XENSTORED... $XENSTORED --pid-file @XEN_RUN_DIR@/xenstored.pid $XENSTORED_ARGS systemd-notify --booted 2>/dev/null || timeout_xenstore $XENSTORED || exit 1 + XS_PID=`cat @XEN_RUN_DIR@/xenstored.pid` + echo $XS_OOM_SCORE >/proc/$XS_PID/oom_score_adj exit 0 } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Oct 18 13:33:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Oct 2021 13:33:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212303.370132 (Exim 4.92) (envelope-from ) id 1mcSlQ-0007vA-0M; Mon, 18 Oct 2021 13:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212303.370132; Mon, 18 Oct 2021 13:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlP-0007ux-T9; Mon, 18 Oct 2021 13:33:15 +0000 Received: by outflank-mailman (input) for mailman id 212303; Mon, 18 Oct 2021 13:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlP-0007un-80 for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlP-0005un-7H for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcSlP-00066C-6P for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lF+EXro1vQ6EkKBhGpu8hmxp0m3pQI2kAAy+MjMaQek=; b=sCB8JNSTMIuF5s7/YVcU+ywIJZ 0oZq398j/oNFr8Im27M7sXJ/SbOpPNcj1Xgrhx4Lbe9AT3FNFGKoUQLMaTZ6MeNL8MGJtxthN8xJy PKzp0qOylJUbiU1ZPY/l4M3rPQnYcubVO4rLv1nATaNRJ8NPyUGerJG7Lx5bH91u07kw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: set open file descriptor limit for xenstored Message-Id: Date: Mon, 18 Oct 2021 13:33:15 +0000 commit 9cfeb83cbe23a873de512211d7ecd989348b9df0 Author: Juergen Gross AuthorDate: Tue Oct 12 15:41:48 2021 +0200 Commit: Ian Jackson CommitDate: Mon Oct 18 14:17:28 2021 +0100 tools/xenstore: set open file descriptor limit for xenstored Add a configuration item for the maximum number of open file descriptors xenstored should be allowed to have. The default should be "unlimited" in order not to restrict xenstored in the number of domains it can support, but unfortunately the kernel is normally limiting the maximum value via /proc/sys/fs/nr_open [1], [2]. So check that file to exist and if it does, limit the maximum value to the one specified by /proc/sys/fs/nr_open. As an aid for the admin configuring the value add a comment specifying the common needs of xenstored for the different domain types. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=60fd760fb9ff7034360bab7137c917c0330628c2 [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0c2d64fb6cae9aae480f6a46cfe79f8d7d48b59f Signed-off-by: Juergen Gross Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 13 +++++++++++++ tools/hotplug/Linux/launch-xenstore.in | 21 ++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in index b83101ab7e..433e4849af 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -32,6 +32,19 @@ # Changing this requires a reboot to take effect. #XENSTORED=@XENSTORED@ +## Type: string +## Default: unlimited +# +# Select maximum number of file descriptors xenstored is allowed to have +# opened at one time. +# For each HVM domain xenstored might need up to 5 open file descriptors, +# PVH and PV domains will require up to 3 open file descriptors. Additionally +# 20-30 file descriptors will be opened for internal uses. +# The specified value (including "unlimited") will be capped by the contents +# of /proc/sys/fs/nr_open if existing. +# Only evaluated if XENSTORETYPE is "daemon". +#XENSTORED_MAX_OPEN_FDS=unlimited + ## Type: string ## Default: "" # diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/launch-xenstore.in index 1747c96065..8438af9977 100644 --- a/tools/hotplug/Linux/launch-xenstore.in +++ b/tools/hotplug/Linux/launch-xenstore.in @@ -54,6 +54,7 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF [ "$XENSTORETYPE" = "daemon" ] && { [ -z "$XENSTORED_TRACE" ] || XENSTORED_ARGS="$XENSTORED_ARGS -T @XEN_LOG_DIR@/xenstored-trace.log" + [ -z "$XENSTORED_MAX_OPEN_FDS" ] && XENSTORED_MAX_OPEN_FDS=unlimited [ -z "$XENSTORED" ] && XENSTORED=@XENSTORED@ [ -x "$XENSTORED" ] || { echo "No xenstored found" @@ -62,10 +63,28 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF [ -z "$XENSTORED_OOM_MEM_THRESHOLD" ] || XENSTORED_OOM_MEM_THRESHOLD=50 XS_OOM_SCORE=-$(($XENSTORED_OOM_MEM_THRESHOLD * 10)) + [ "$XENSTORED_MAX_OPEN_FDS" = "unlimited" ] || { + [ -z "${XENSTORED_MAX_OPEN_FDS//[0-9]}" ] && + [ -n "$XENSTORED_MAX_OPEN_FDS" ] || { + echo "XENSTORED_MAX_OPEN_FDS=$XENSTORED_MAX_OPEN_FDS invalid" + echo "Setting to default \"unlimited\"." + XENSTORED_MAX_OPEN_FDS=unlimited + } + } + [ -r /proc/sys/fs/nr_open ] && { + MAX_FDS=`cat /proc/sys/fs/nr_open` + [ "$XENSTORED_MAX_OPEN_FDS" = "unlimited" ] && XENSTORED_MAX_OPEN_FDS=$MAX_FDS + [ $XENSTORED_MAX_OPEN_FDS -gt $MAX_FDS ] && { + echo "XENSTORED_MAX_OPEN_FDS exceeds system limit." + echo "Setting to \"$MAX_FDS\"." + XENSTORED_MAX_OPEN_FDS=$MAX_FDS + } + } + rm -f @XEN_RUN_DIR@/xenstored.pid echo -n Starting $XENSTORED... - $XENSTORED --pid-file @XEN_RUN_DIR@/xenstored.pid $XENSTORED_ARGS + prlimit --nofile=$XENSTORED_MAX_OPEN_FDS $XENSTORED --pid-file @XEN_RUN_DIR@/xenstored.pid $XENSTORED_ARGS systemd-notify --booted 2>/dev/null || timeout_xenstore $XENSTORED || exit 1 XS_PID=`cat @XEN_RUN_DIR@/xenstored.pid` -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Oct 18 13:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 Oct 2021 13:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212304.370136 (Exim 4.92) (envelope-from ) id 1mcSla-0007y7-1Z; Mon, 18 Oct 2021 13:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212304.370136; Mon, 18 Oct 2021 13:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlZ-0007xz-Ui; Mon, 18 Oct 2021 13:33:25 +0000 Received: by outflank-mailman (input) for mailman id 212304; Mon, 18 Oct 2021 13:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlZ-0007xr-BD for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcSlZ-0005uy-AT for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcSlZ-00066k-9g for xen-changelog@lists.xenproject.org; Mon, 18 Oct 2021 13:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MjuB/tk6J9e67wvps3JZlbdM6TDsLWDStEuAlwFAO58=; b=VVX3u5YVnhL2rBcAHFhCQtq377 KnTTLAucIlp6nLVJJJVp2ivLS54vBoGuKTVvHdhgIRTJ170pJZXoEPztiajKW35ZqMsv3aD7IT2GE 7cp8la16b0G9o3ZkY0sbOhUyW8PtH9hZPdJSgXW/LIeTnpkT+xwmF+tcRJxuAPAZURs0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] stubdom: disable building pv-grub Message-Id: Date: Mon, 18 Oct 2021 13:33:25 +0000 commit 3ae80dea4601764818d1e5b84bd1e4479c0d4790 Author: Juergen Gross AuthorDate: Fri Sep 10 07:55:17 2021 +0200 Commit: Ian Jackson CommitDate: Mon Oct 18 14:28:46 2021 +0100 stubdom: disable building pv-grub The stubdom based pv-grub is using a very outdated version of grub (0.97) and should not be used any longer. Mainline grub has support for PV guests for a long time now, so that should be used as a boot loader of a PV domain. So disable building pv-grub per default. In case someone really wants to continue using it he/she can still use a pv-grub binary from an older Xen version or manually enable building it via: configure --enable-pv-grub [ This was already disabled in osstest by 8dee6e333622 "make-flight: Drop pvgrub (pvgrub1) tests" -iwj ] Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault Acked-by: Ian Jackson Release-Acked-by: Ian Jackson --- CHANGELOG.md | 2 ++ stubdom/configure | 8 ++------ stubdom/configure.ac | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22cfdb4298..e7107ac3de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) appearing in 4.12.2 and 4.11.4). Prior (4.13...4.15-like) behavior can be arranged for either by enabling the IOMMU_QUARANTINE_SCRATCH_PAGE setting at build (configuration) time or by passing "iommu=quarantine=scratch-page" on the hypervisor command line. + - pv-grub stubdoms will no longer be built per default. In order to be able to use pv-grub + configure needs to be called with "--enable-pv-grub" as parameter. ## [4.15.0 UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0) - TBD diff --git a/stubdom/configure b/stubdom/configure index aa48df986d..df31532abb 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1342,7 +1342,7 @@ Optional Features: --enable-ioemu-stubdom Build and install ioemu-stubdom --enable-c-stubdom Build and install c-stubdom (default is DISABLED) --enable-caml-stubdom Build and install caml-stubdom (default is DISABLED) - --disable-pv-grub Build and install pv-grub (default is ENABLED) + --enable-pv-grub Build and install pv-grub (default is DISABLED) --disable-xenstore-stubdom Build and install xenstore-stubdom (default is ENABLED) @@ -2129,11 +2129,7 @@ fi else -grub=y -STUBDOM_TARGETS="$STUBDOM_TARGETS grub" -STUBDOM_BUILD="$STUBDOM_BUILD pv-grub" -STUBDOM_INSTALL="$STUBDOM_INSTALL install-grub" -STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-grub" +grub=n fi diff --git a/stubdom/configure.ac b/stubdom/configure.ac index bd6f765929..a07a1edae5 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -21,7 +21,7 @@ m4_include([../m4/fetcher.m4]) AX_STUBDOM_CONDITIONAL([ioemu-stubdom], [ioemu]) AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c]) AX_STUBDOM_DEFAULT_DISABLE([caml-stubdom], [caml]) -AX_STUBDOM_DEFAULT_ENABLE([pv-grub], [grub]) +AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub]) AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore]) AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh]) AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm]) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 02:22:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 02:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212595.370514 (Exim 4.92) (envelope-from ) id 1mcelP-000810-Kl; Tue, 19 Oct 2021 02:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212595.370514; Tue, 19 Oct 2021 02: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 1mcelP-00080r-HV; Tue, 19 Oct 2021 02:22:03 +0000 Received: by outflank-mailman (input) for mailman id 212595; Tue, 19 Oct 2021 02:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcelO-00080l-9s for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcelO-00052j-6W for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcelO-000470-4t for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02: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=JAdclCdedm4Nlu+Wq69SSH+DhnAEWl99cfsmOsXuj38=; b=yJNMrBLa9GdHXX4OIDxMvZziSI bKMepTRtrzt865KgpnUggdiveQF1ZX4MR40H6tj4mbDnG2kIQeLX1LkCxGNWiev3HfBk3S8U8Vq+L R4JiQgBaiypWyvOxEzj2d3zlzTDIOh+km00TgHYc0jvKY2639HQMxwsqVLaR2dlutXW0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: correct cleanup after failed viridian_vcpu_init() Message-Id: Date: Tue, 19 Oct 2021 02:22:02 +0000 commit 66675056c6e59b8a8b651a29ef53c63e9e04f58d Author: Jan Beulich AuthorDate: Mon Oct 18 14:21:17 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 18 14:21:17 2021 +0200 x86/HVM: correct cleanup after failed viridian_vcpu_init() This happens after nestedhvm_vcpu_initialise(), so its effects also need to be undone. Fixes: 40a4a9d72d16 ("viridian: add init hooks") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/hvm/hvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index aa418a3ca1..3a6fd865d9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1583,7 +1583,7 @@ int hvm_vcpu_initialise(struct vcpu *v) rc = viridian_vcpu_init(v); if ( rc ) - goto fail5; + goto fail6; rc = ioreq_server_add_vcpu_all(d, v); if ( rc != 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 02:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 02:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212596.370518 (Exim 4.92) (envelope-from ) id 1mcelZ-00083C-NR; Tue, 19 Oct 2021 02:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212596.370518; Tue, 19 Oct 2021 02: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 1mcelZ-000834-KP; Tue, 19 Oct 2021 02:22:13 +0000 Received: by outflank-mailman (input) for mailman id 212596; Tue, 19 Oct 2021 02:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcelY-00082Y-Ap for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcelY-00053D-A5 for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcelY-00048S-95 for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02: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=0Jb8t/cNlap40roAIgMfBx5rie6Rbu1j7jKo2sJFuh0=; b=kDCC5O1oVmVizjBoV5g/oBDJfd eQr7gYKcWBmMX+GyOJQVqIJim1k6kWT5dRSfhbXUBtEOygEfqXbHZuAzgpTbFLCFM87f+hNQ7HPou zjo7gMc4nNMQ0VjDNgmK93/nqOz7MuL7gl5xCdNcQoWG9IsocHLihH7PFrgYp3Arp1o8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: make a local variable in sh_page_fault() HVM-only Message-Id: Date: Tue, 19 Oct 2021 02:22:12 +0000 commit c8ac573c238308dbaa31fa6acb571c91b587714f Author: Jan Beulich AuthorDate: Mon Oct 18 14:22:32 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 18 14:22:32 2021 +0200 x86/shadow: make a local variable in sh_page_fault() HVM-only I recall checking that "r" would still have a user, but when doing so I failed to recognize that all uses are inside a CONFIG_HVM conditional section. Fixes: 9f4f20b27b07 ("x86/shadow: adjust some shadow_set_le() callers") Reported-by: Stefano Stabellini Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm/shadow/multi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index a3ce4b6259..7b8f4dd13b 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2155,8 +2155,8 @@ static int sh_page_fault(struct vcpu *v, #ifdef CONFIG_HVM struct sh_emulate_ctxt emul_ctxt; const struct x86_emulate_ops *emul_ops; -#endif int r; +#endif p2m_type_t p2mt; uint32_t rc, error_code; bool walk_ok; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 02:22:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 02:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212597.370522 (Exim 4.92) (envelope-from ) id 1mcelj-000867-PN; Tue, 19 Oct 2021 02:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212597.370522; Tue, 19 Oct 2021 02: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 1mcelj-00085z-Lz; Tue, 19 Oct 2021 02:22:23 +0000 Received: by outflank-mailman (input) for mailman id 212597; Tue, 19 Oct 2021 02:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mceli-00085c-EE for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mceli-00053P-DR for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mceli-0004B3-CQ for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 02:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PfQvuvxAvQZafJfYA3l4u5pr5vhq0YBFRoRQGalvO8Y=; b=R61C7cutfXkt5/uC7lXV2eETeZ AQXRtsG3ZzA/U4Allr86cq7GqRZ360PpxCU+fL7ygDO3rjoBX8Q6DOsr1rHzwgYeUqF/sobTQFbHy bdUTaTkuNao7HKwyL0+VPjCSuRsNv0Taryvc4qjkeG12RGifOBSKMRdmwLrBTTvWicAY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV: address odd UB in I/O emulation Message-Id: Date: Tue, 19 Oct 2021 02:22:22 +0000 commit c11b8d25fbe9c0155e91409594ea6701008409ed Author: Jan Beulich AuthorDate: Mon Oct 18 14:23:29 2021 +0200 Commit: Jan Beulich CommitDate: Mon Oct 18 14:23:29 2021 +0200 x86/PV: address odd UB in I/O emulation Compilers are certainly right in detecting UB here, given that fully parenthesized (to express precedence) the original offending expression was (((stub_va + p) - ctxt->io_emul_stub) + 5), which in fact exhibits two overflows in pointer calculations. We really want to calculate (p - ctxt->io_emul_stub) first, which is guaranteed to not overflow. The issue was observed with clang 9 on 4.13. The oddities are - the issue was detected on APPEND_CALL(save_guest_gprs), despite the earlier similar APPEND_CALL(load_guest_gprs), - merely casting the original offending expression to long was reported to also help. While at it also avoid converting guaranteed (with our current address space layout) negative values to unsigned long (which has implementation defined behavior): Have stub_va be of pointer type. And since it's on an immediately adjacent line, also constify this_stubs. Fixes: d89e5e65f305 ("x86/ioemul: Rewrite stub generation to be shadow stack compatible") Reported-by: Franklin Shen <2284696125@qq.com> Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/pv/emul-priv-op.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index d0df5bc616..7f4279a051 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -90,8 +90,8 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, 0xc3, /* ret */ }; - struct stubs *this_stubs = &this_cpu(stubs); - unsigned long stub_va = this_stubs->addr + STUB_BUF_SIZE / 2; + const struct stubs *this_stubs = &this_cpu(stubs); + const void *stub_va = (void *)this_stubs->addr + STUB_BUF_SIZE / 2; unsigned int quirk_bytes = 0; char *p; @@ -99,7 +99,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, #define APPEND_BUFF(b) ({ memcpy(p, b, sizeof(b)); p += sizeof(b); }) #define APPEND_CALL(f) \ ({ \ - long disp = (long)(f) - (stub_va + p - ctxt->io_emul_stub + 5); \ + long disp = (void *)(f) - (stub_va + (p - ctxt->io_emul_stub) + 5); \ BUG_ON((int32_t)disp != disp); \ *p++ = 0xe8; \ *(int32_t *)p = disp; p += 4; \ @@ -107,7 +107,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, if ( !ctxt->io_emul_stub ) ctxt->io_emul_stub = - map_domain_page(_mfn(this_stubs->mfn)) + (stub_va & ~PAGE_MASK); + map_domain_page(_mfn(this_stubs->mfn)) + PAGE_OFFSET(stub_va); p = ctxt->io_emul_stub; @@ -142,7 +142,7 @@ static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, block_speculation(); /* SCSB */ /* Handy function-typed pointer to the stub. */ - return (void *)stub_va; + return stub_va; #undef APPEND_CALL #undef APPEND_BUFF -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 08:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 08:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212857.370885 (Exim 4.92) (envelope-from ) id 1mckDB-0007a5-Fz; Tue, 19 Oct 2021 08:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212857.370885; Tue, 19 Oct 2021 08:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDB-0007Zx-D2; Tue, 19 Oct 2021 08:11:05 +0000 Received: by outflank-mailman (input) for mailman id 212857; Tue, 19 Oct 2021 08:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDA-0007Zn-9e for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDA-00059o-7z for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mckDA-0000oN-6v for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Gm4I79VSQ/9U/Q/k4kyZGjOVxTHwC4GJNF1lx2Sj+4M=; b=xgejKs5S0qvrkGp716MzTfgCw5 QIFtKYzIuUDRXLlqDCGy0nRh2MOstNzpFj36Z1ZihDpCubn5EyqyF6bWgUFKB7IrMTF5t2S8oCG/m gA3uzcYmd5DyVwMRiv1GQmDiwN1t1vLla77UcaKAMaify4rDbWx9DO8Bp32MITcitmYk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86emul: de-duplicate scatters to the same linear address Message-Id: Date: Tue, 19 Oct 2021 08:11:04 +0000 commit a8cddbac5051020bb4a59a7f0ea27500c51063fb Author: Jan Beulich AuthorDate: Tue Oct 19 10:02:39 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:02:39 2021 +0200 x86emul: de-duplicate scatters to the same linear address The SDM specifically allows for earlier writes to fully overlapping ranges to be dropped. If a guest did so, hvmemul_phys_mmio_access() would crash it if varying data was written to the same address. Detect overlaps early, as doing so in hvmemul_{linear,phys}_mmio_access() would be quite a bit more difficult. To maintain proper faulting behavior, instead of dropping earlier write instances of fully overlapping slots altogether, write the data of the final of these slots multiple times. (We also can't pull ahead the [single] write of the data of the last of the slots, clearing all involved slots' op_mask bits together, as this would yield incorrect results if there were intervening partially overlapping ones.) Note that due to cache slot use being linear address based, there's no similar issue with multiple writes to the same physical address (mapped through different linear addresses). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_emulate/x86_emulate.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index c9a9e031cf..069acde517 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -10076,15 +10076,36 @@ x86_emulate( for ( i = 0; op_mask; ++i ) { - long idx = b & 1 ? index.qw[i] : index.dw[i]; + long idx = (b & 1 ? index.qw[i] + : index.dw[i]) * (1 << state->sib_scale); + unsigned long offs = truncate_ea(ea.mem.off + idx); + unsigned int j, slot; if ( !(op_mask & (1 << i)) ) continue; - rc = ops->write(ea.mem.seg, - truncate_ea(ea.mem.off + - idx * (1 << state->sib_scale)), - (void *)mmvalp + i * op_bytes, op_bytes, ctxt); + /* + * hvmemul_linear_mmio_access() will find a cache slot based on + * linear address. hvmemul_phys_mmio_access() will crash the + * domain if observing varying data getting written to the same + * cache slot. Utilize that squashing earlier writes to fully + * overlapping addresses is permitted by the spec. We can't, + * however, drop the writes altogether, to maintain correct + * faulting behavior. Instead write the data from the last of + * the fully overlapping slots multiple times. + */ + for ( j = (slot = i) + 1; j < n; ++j ) + { + long idx2 = (b & 1 ? index.qw[j] + : index.dw[j]) * (1 << state->sib_scale); + + if ( (op_mask & (1 << j)) && + truncate_ea(ea.mem.off + idx2) == offs ) + slot = j; + } + + rc = ops->write(ea.mem.seg, offs, + (void *)mmvalp + slot * op_bytes, op_bytes, ctxt); if ( rc != X86EMUL_OKAY ) { /* See comment in gather emulation. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 08:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 08:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212858.370888 (Exim 4.92) (envelope-from ) id 1mckDL-0007dc-Hc; Tue, 19 Oct 2021 08:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212858.370888; Tue, 19 Oct 2021 08:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDL-0007dT-EZ; Tue, 19 Oct 2021 08:11:15 +0000 Received: by outflank-mailman (input) for mailman id 212858; Tue, 19 Oct 2021 08:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDK-0007dF-CK for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDK-0005BW-BZ for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mckDK-0000pN-AN for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SJCuyjI2fQi0GC9l1qUW5N5+8uQVhkziuRgbKzCZpUI=; b=LxArteDqkmcT3XINgziFtRJCgJ 3PhcORVU9F+FVQyKgyWY/QN9GWZRWGMscCTe5rdH60w1f/47ycvk8RCIVk4DJcG0PcwLU61cY+0RJ Q0d2D7T6vr/5gGGbI12UuhxuMgnMSrkKSirwyWwuJxrDES0z1YmQUC+KNPM5KTSsyM/0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/AMD: make HT range dynamic for Fam17 and up Message-Id: Date: Tue, 19 Oct 2021 08:11:14 +0000 commit d6e38eea2d806c53d976603717aebf6e5de30a1e Author: Jan Beulich AuthorDate: Tue Oct 19 10:04:13 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:04:13 2021 +0200 x86/AMD: make HT range dynamic for Fam17 and up At the time of d838ac2539cf ("x86: don't allow Dom0 access to the HT address range") documentation correctly stated that the range was completely fixed. For Fam17 and newer, it lives at the top of physical address space, though. To correctly determine the top of physical address space, we need to account for their physical address reduction, hence the calculation of paddr_bits also gets adjusted. While for paddr_bits < 40 the HT range is completely hidden, there's no need to suppress the range insertion in that case: It'll just have no real meaning. Reported-by: Igor Druzhinin Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/common.c | 7 +++++++ xen/arch/x86/dom0_build.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 302f7f35d8..4a163afbfc 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -349,16 +349,23 @@ void __init early_cpu_init(void) eax = cpuid_eax(0x80000000); if ((eax >> 16) == 0x8000 && eax >= 0x80000008) { + ebx = eax >= 0x8000001f ? cpuid_ebx(0x8000001f) : 0; eax = cpuid_eax(0x80000008); + paddr_bits = eax & 0xff; if (paddr_bits > PADDR_BITS) paddr_bits = PADDR_BITS; + vaddr_bits = (eax >> 8) & 0xff; if (vaddr_bits > VADDR_BITS) vaddr_bits = VADDR_BITS; + hap_paddr_bits = ((eax >> 16) & 0xff) ?: paddr_bits; if (hap_paddr_bits > PADDR_BITS) hap_paddr_bits = PADDR_BITS; + + /* Account for SME's physical address space reduction. */ + paddr_bits -= (ebx >> 6) & 0x3f; } if (!(c->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON))) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 74b443e509..fe24e11b37 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -524,8 +524,11 @@ int __init dom0_setup_permissions(struct domain *d) MSI_ADDR_DEST_ID_MASK)); /* HyperTransport range. */ if ( boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) - rc |= iomem_deny_access(d, paddr_to_pfn(0xfdULL << 32), - paddr_to_pfn((1ULL << 40) - 1)); + { + mfn = paddr_to_pfn(1UL << + (boot_cpu_data.x86 < 0x17 ? 40 : paddr_bits)); + rc |= iomem_deny_access(d, mfn - paddr_to_pfn(3UL << 32), mfn - 1); + } /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 08:11:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 08:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212859.370893 (Exim 4.92) (envelope-from ) id 1mckDV-0007hK-Ix; Tue, 19 Oct 2021 08:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212859.370893; Tue, 19 Oct 2021 08:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDV-0007hC-G4; Tue, 19 Oct 2021 08:11:25 +0000 Received: by outflank-mailman (input) for mailman id 212859; Tue, 19 Oct 2021 08:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDU-0007gw-GH for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDU-0005Bw-Fd for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mckDU-0000pu-E4 for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XlKsUL2OZ/1qNc9pDQK2JJ0Wt5oRe/PqbjP2EauqJ3o=; b=qytXRsZ6Qhv0M4PzUQb1FvEzpx 42cKj2mO5/8sXnS1BSfLRE7XUVXSt595BvHC7hIYqBYbTS86quAs+waLaKuUksFWWeCeD4Qq0KekC BPPoEqDDLzVwAXA2wwErsGhGYoR9apAzxEDRSTv/zFyImyg8UGXCI7oNb+M4flFdbtB8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/altp2m: don't consider "active" when enabling failed Message-Id: Date: Tue, 19 Oct 2021 08:11:24 +0000 commit 5e97b97bc254b0ee23f701a4d5a317853136d288 Author: Jan Beulich AuthorDate: Tue Oct 19 10:05:10 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:05:10 2021 +0200 x86/altp2m: don't consider "active" when enabling failed We should not rely on guests to not use altp2m after reporting failure of HVMOP_altp2m_set_domain_state to them. Set "active" back to false in this case. Signed-off-by: Jan Beulich Reviewed-by: Tamas K Lengyel Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/hvm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3a6fd865d9..eee365711d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4622,6 +4622,8 @@ static int do_altp2m_op( if ( ostate ) p2m_flush_altp2m(d); } + else if ( rc ) + d->arch.altp2m_active = false; domain_unpause_except_self(d); break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 08:11:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 08:11:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212861.370897 (Exim 4.92) (envelope-from ) id 1mckDf-0007ki-Ka; Tue, 19 Oct 2021 08:11:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212861.370897; Tue, 19 Oct 2021 08:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDf-0007kb-Hg; Tue, 19 Oct 2021 08:11:35 +0000 Received: by outflank-mailman (input) for mailman id 212861; Tue, 19 Oct 2021 08:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDe-0007kQ-Jo for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDe-0005CD-J7 for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mckDe-0000qg-I6 for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kBDpMlUXVAYl7cEJc8agM8yz/ehA7u7wLzWXRvc6qJ0=; b=zqMDwHwu6W0SO3Fo1tdIbDyJwf ng8I2ZyWr/G868d0cXQ9Avd6PAbOVrYNyH+uQMZAdTJrsT8CpwD1SroCffmZe4fBZq0ScNpjKfqws nnbiCIVoM0r3gCDoN3ssDiUZi7S1zAdhldl+Ei8+pQxODlkq9zf7qVqIHionXQC4GO1k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PV: make '0' debug key dump Dom0's stacks again Message-Id: Date: Tue, 19 Oct 2021 08:11:34 +0000 commit 4843546fef5e024d5754f722fd01a8dfb482ac7d Author: Jan Beulich AuthorDate: Tue Oct 19 10:07:00 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:07:00 2021 +0200 x86/PV: make '0' debug key dump Dom0's stacks again The conversion to __get_guest() failed to account for the fact that for remote vCPU-s dumping gets done through a pointer obtained from map_domain_page(): __get_guest() arranges for (apparent) accesses to hypervisor space to cause #GP(0). Fixes: 6a1d72d3739e ('x86: split __{get,put}_user() into "guest" and "unsafe" variants') Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/traps.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 64f3396f20..4f3a7131d6 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -275,7 +275,9 @@ static void compat_show_guest_stack(struct vcpu *v, { if ( (((long)stack - 1) ^ ((long)(stack + 1) - 1)) & mask ) break; - if ( __get_guest(addr, stack) ) + if ( stack_page ) + addr = *stack; + else if ( __get_guest(addr, stack) ) { if ( i != 0 ) printk("\n "); @@ -344,7 +346,9 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) { if ( (((long)stack - 1) ^ ((long)(stack + 1) - 1)) & mask ) break; - if ( __get_guest(addr, stack) ) + if ( stack_page ) + addr = *stack; + else if ( __get_guest(addr, stack) ) { if ( i != 0 ) printk("\n "); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 08:11:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 08:11:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212862.370901 (Exim 4.92) (envelope-from ) id 1mckDp-0007nm-Md; Tue, 19 Oct 2021 08:11:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212862.370901; Tue, 19 Oct 2021 08:11:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDp-0007nd-JB; Tue, 19 Oct 2021 08:11:45 +0000 Received: by outflank-mailman (input) for mailman id 212862; Tue, 19 Oct 2021 08:11:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDo-0007nT-Mu for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDo-0005CQ-MA for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mckDo-0000rD-LL for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3bD00tku71IJMu/J4ELqvneebtOjBdCB/Lod/kLVtWc=; b=zqggX9n0Wv41vfpRNOGP46Aw/A onDuhUjAxL0MyTBNjQTWo5nudW8wEUZpK2f9k6epUgQAMDgOBt+/foVS2vMgnVAylnS5DI+rghxb9 1Ypdb3D99iYyJYp1iTzYmVY/YRQ5M0TyQnpaF9yotw6IWZB533AcibtNUU8vWWARc9p4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PV: replace assertions in '0' debug key stack dumping Message-Id: Date: Tue, 19 Oct 2021 08:11:44 +0000 commit 525eac931794434593c39a1d1cd739ad8b326e27 Author: Jan Beulich AuthorDate: Tue Oct 19 10:07:42 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:07:42 2021 +0200 x86/PV: replace assertions in '0' debug key stack dumping While it was me to add them, I'm afraid I don't see justification for the assertions: A vCPU may very well have got preempted while in user mode. Limit compat guest user mode stack dumps to the containing page (like is done when using do_page_walk()), and suppress user mode stack dumping altogether for 64-bit domains. Fixes: cc0de53a903c ("x86: improve output resulting from sending '0' over serial") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/traps.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4f3a7131d6..a1c2adb7ad 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -254,7 +254,6 @@ static void compat_show_guest_stack(struct vcpu *v, struct vcpu *vcpu; unsigned long mfn; - ASSERT(guest_kernel_mode(v, regs)); mfn = read_cr3() >> PAGE_SHIFT; for_each_vcpu( v->domain, vcpu ) if ( pagetable_get_pfn(vcpu->arch.guest_table) == mfn ) @@ -269,6 +268,8 @@ static void compat_show_guest_stack(struct vcpu *v, } mask = PAGE_SIZE; } + else if ( !guest_kernel_mode(v, regs) ) + mask = PAGE_SIZE; } for ( i = 0; i < debug_stack_lines * 8; i++ ) @@ -328,7 +329,12 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) { struct vcpu *vcpu; - ASSERT(guest_kernel_mode(v, regs)); + if ( !guest_kernel_mode(v, regs) ) + { + printk("User mode stack\n"); + return; + } + vcpu = maddr_get_owner(read_cr3()) == v->domain ? v : NULL; if ( !vcpu ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 08:11:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 08:11:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.212863.370905 (Exim 4.92) (envelope-from ) id 1mckDz-0007re-PW; Tue, 19 Oct 2021 08:11:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212863.370905; Tue, 19 Oct 2021 08:11:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDz-0007rV-MV; Tue, 19 Oct 2021 08:11:55 +0000 Received: by outflank-mailman (input) for mailman id 212863; Tue, 19 Oct 2021 08:11:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDy-0007rI-Pq for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mckDy-0005Ca-PA for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mckDy-0000sE-OH for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 08:11:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SuXTFoo1OPjy++jMaNqWxCEXjd3KoQmVcPrf+7kFkgE=; b=NjijLi1jPZg0xvr0Jl/dCBsm84 iREGCh87gQWb0QP8iqNYE1dRONFcpGcpO55YFa2Ya1LPcGW5fYsnLyGrtWS0CpFnUJLKMSM4vD5+S nXqbhy9p2SABVE0YSZ4g1bPhay8/bd3DozvUWQYVDzEc5IerQKzjQn1UfC5el2oaPzIw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/paging: restrict physical address width reported to guests Message-Id: Date: Tue, 19 Oct 2021 08:11:54 +0000 commit b7635526acffbe4ad8ad16fd92812c57742e54c2 Author: Jan Beulich AuthorDate: Tue Oct 19 10:08:30 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:08:30 2021 +0200 x86/paging: restrict physical address width reported to guests Modern hardware may report more than 48 bits of physical address width. For paging-external guests our P2M implementation does not cope with larger values. Telling the guest of more available bits means misleading it into perhaps trying to actually put some page there (like was e.g. intermediately done in OVMF for the shared info page). While there also convert the PV check to a paging-external one (which in our current code base are synonyms of one another anyway). Fixes: 5dbd60e16a1f ("x86/shadow: Correct guest behaviour when creating PTEs above maxphysaddr") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/include/asm-x86/paging.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index fa22558e2e..996c2cd038 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -400,11 +400,18 @@ static always_inline unsigned int paging_max_paddr_bits(const struct domain *d) { unsigned int bits = paging_mode_hap(d) ? hap_paddr_bits : paddr_bits; - if ( !IS_ENABLED(CONFIG_BIGMEM) && paging_mode_shadow(d) && - !is_pv_domain(d) ) + if ( paging_mode_external(d) ) { - /* Shadowed superpages store GFNs in 32-bit page_info fields. */ - bits = min(bits, 32U + PAGE_SHIFT); + if ( !IS_ENABLED(CONFIG_BIGMEM) && paging_mode_shadow(d) ) + { + /* Shadowed superpages store GFNs in 32-bit page_info fields. */ + bits = min(bits, 32U + PAGE_SHIFT); + } + else + { + /* Both p2m-ept and p2m-pt only support 4-level page tables. */ + bits = min(bits, 48U); + } } return bits; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 19 11:33:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 Oct 2021 11:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213060.371167 (Exim 4.92) (envelope-from ) id 1mcnMf-0003zU-7g; Tue, 19 Oct 2021 11:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213060.371167; Tue, 19 Oct 2021 11:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcnMf-0003zM-4k; Tue, 19 Oct 2021 11:33:05 +0000 Received: by outflank-mailman (input) for mailman id 213060; Tue, 19 Oct 2021 11:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcnMe-0003zG-6N for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 11:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcnMe-0000Ff-5i for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 11:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mcnMe-0007EH-4V for xen-changelog@lists.xenproject.org; Tue, 19 Oct 2021 11:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=B/gtNXGDcl216TuVvDHrfwh0HYkxUalbDjMJJwqwTkk=; b=0ekckfq/CDxQCVnpG/k/RaWFh5 ubLZc+bQkGzFlpYKw3TGvY0JBi8IbPmskdrQKGoC5qgbesvSsl0+mfz3br95w+ElLD02XS48siC0z CKfRtKZuBdkEmyoWG43UqLsddu0R7KHb23qGTW5TmZEkL/kRGUhIYJptqPVzLIB2z/kE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: fix oom setting of xenstored Message-Id: Date: Tue, 19 Oct 2021 11:33:04 +0000 commit 6809998c5f8f1d2e26ac9e867af8ac71e7a66cf2 Author: Juergen Gross AuthorDate: Tue Oct 19 13:21:40 2021 +0200 Commit: Ian Jackson CommitDate: Tue Oct 19 12:23:34 2021 +0100 tools: fix oom setting of xenstored Commit f282182af32939 ("tools/xenstore: set oom score for xenstore daemon on Linux") introduced a regression when not setting the oom value in the xencommons file. Fix that. Fixes: f282182af32939 ("tools/xenstore: set oom score for xenstore daemon on Linux") Signed-off-by: Juergen Gross Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/hotplug/Linux/launch-xenstore.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/launch-xenstore.in index 8438af9977..e854ca1eb8 100644 --- a/tools/hotplug/Linux/launch-xenstore.in +++ b/tools/hotplug/Linux/launch-xenstore.in @@ -60,8 +60,7 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF echo "No xenstored found" exit 1 } - [ -z "$XENSTORED_OOM_MEM_THRESHOLD" ] || XENSTORED_OOM_MEM_THRESHOLD=50 - XS_OOM_SCORE=-$(($XENSTORED_OOM_MEM_THRESHOLD * 10)) + XS_OOM_SCORE=-$((${XENSTORED_OOM_MEM_THRESHOLD:-50} * 10)) [ "$XENSTORED_MAX_OPEN_FDS" = "unlimited" ] || { [ -z "${XENSTORED_MAX_OPEN_FDS//[0-9]}" ] && -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:33:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213542.371772 (Exim 4.92) (envelope-from ) id 1md4Dm-0002WK-Be; Wed, 20 Oct 2021 05:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213542.371772; Wed, 20 Oct 2021 05:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Dm-0002WA-86; Wed, 20 Oct 2021 05:33:02 +0000 Received: by outflank-mailman (input) for mailman id 213542; Wed, 20 Oct 2021 05:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Dl-0002W4-RK for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Dl-0005PU-Pa for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4Dl-0004wA-OP for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05: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=mq7dERlxL7/AlE8fTplfVMPiVLPO/U4uxxC/VSB5UlE=; b=A/+so/BKSOkanBSPGelBwdQGCr 0/GgRTlCzv7qfztHEARw1tI2K/Xihc7Bwv2728L57cYSEkJbjr4127Uh5dCuj5bnFG4+4CXhgOv8d m2n47jZwo9jt9MSChwXN3AuVWsG3zBHyGoOxVqEXJofv1Yburr7G92MFGYw3eYW58Qd4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: set oom score for xenstore daemon on Linux Message-Id: Date: Wed, 20 Oct 2021 05:33:01 +0000 commit f282182af32939107d47943aba242d3189ec6f90 Author: Juergen Gross AuthorDate: Tue Oct 12 15:41:47 2021 +0200 Commit: Ian Jackson CommitDate: Mon Oct 18 14:15:59 2021 +0100 tools/xenstore: set oom score for xenstore daemon on Linux Xenstored is absolutely mandatory for a Xen host and it can't be restarted, so being killed by OOM-killer in case of memory shortage is to be avoided. Set /proc/$pid/oom_score_adj (if available) per default to -500 (this translates to 50% of dom0 memory size) in order to allow xenstored to use large amounts of memory without being killed. The percentage of dom0 memory above which the oom killer is allowed to kill xenstored can be set via XENSTORED_OOM_MEM_THRESHOLD in xencommons. Make sure the pid file isn't a left-over from a previous run delete it before starting xenstored. Signed-off-by: Juergen Gross Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 9 +++++++++ tools/hotplug/Linux/launch-xenstore.in | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in index 00cf7f91d4..b83101ab7e 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -48,6 +48,15 @@ XENSTORED_ARGS= # Only evaluated if XENSTORETYPE is "daemon". #XENSTORED_TRACE=[yes|on|1] +## Type: integer +## Default: 50 +# +# Percentage of dom0 memory size the xenstore daemon can use before the +# OOM killer is allowed to kill it. +# The specified value is multiplied by -10 and echoed to +# /proc/PID/oom_score_adj. +#XENSTORED_OOM_MEM_THRESHOLD=50 + ## Type: string ## Default: @LIBEXEC@/boot/xenstore-stubdom.gz # diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/launch-xenstore.in index 019f9d6f4d..1747c96065 100644 --- a/tools/hotplug/Linux/launch-xenstore.in +++ b/tools/hotplug/Linux/launch-xenstore.in @@ -59,11 +59,17 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF echo "No xenstored found" exit 1 } + [ -z "$XENSTORED_OOM_MEM_THRESHOLD" ] || XENSTORED_OOM_MEM_THRESHOLD=50 + XS_OOM_SCORE=-$(($XENSTORED_OOM_MEM_THRESHOLD * 10)) + + rm -f @XEN_RUN_DIR@/xenstored.pid echo -n Starting $XENSTORED... $XENSTORED --pid-file @XEN_RUN_DIR@/xenstored.pid $XENSTORED_ARGS systemd-notify --booted 2>/dev/null || timeout_xenstore $XENSTORED || exit 1 + XS_PID=`cat @XEN_RUN_DIR@/xenstored.pid` + echo $XS_OOM_SCORE >/proc/$XS_PID/oom_score_adj exit 0 } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:33:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213543.371776 (Exim 4.92) (envelope-from ) id 1md4Dw-0002Y9-Cy; Wed, 20 Oct 2021 05:33:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213543.371776; Wed, 20 Oct 2021 05:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Dw-0002Y0-9k; Wed, 20 Oct 2021 05:33:12 +0000 Received: by outflank-mailman (input) for mailman id 213543; Wed, 20 Oct 2021 05:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Dv-0002Xu-Tp for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Dv-0005Pd-T3 for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4Dv-0004x1-Rr for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05: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=VX5hUnb0gYi0tyKvUbRHaX/Uh4h8rBFjDMI3sUSG/Vw=; b=YgnAPuRSvE9+J5A1sGEvH7OpZf GtMEVgYRCgzIeu0okwMZ7pty9xhu15mZhhTz029pN4RAQDkat51lt9yoQzZNJrU92UsVXuUnK5H3W gAKuuj9zN/MfYGtwsbDShImt3+ews93+fqM1H11CNnfpHHMYKM7Kal8ij2KA7WuJtlzc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: set open file descriptor limit for xenstored Message-Id: Date: Wed, 20 Oct 2021 05:33:11 +0000 commit 9cfeb83cbe23a873de512211d7ecd989348b9df0 Author: Juergen Gross AuthorDate: Tue Oct 12 15:41:48 2021 +0200 Commit: Ian Jackson CommitDate: Mon Oct 18 14:17:28 2021 +0100 tools/xenstore: set open file descriptor limit for xenstored Add a configuration item for the maximum number of open file descriptors xenstored should be allowed to have. The default should be "unlimited" in order not to restrict xenstored in the number of domains it can support, but unfortunately the kernel is normally limiting the maximum value via /proc/sys/fs/nr_open [1], [2]. So check that file to exist and if it does, limit the maximum value to the one specified by /proc/sys/fs/nr_open. As an aid for the admin configuring the value add a comment specifying the common needs of xenstored for the different domain types. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=60fd760fb9ff7034360bab7137c917c0330628c2 [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0c2d64fb6cae9aae480f6a46cfe79f8d7d48b59f Signed-off-by: Juergen Gross Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 13 +++++++++++++ tools/hotplug/Linux/launch-xenstore.in | 21 ++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in index b83101ab7e..433e4849af 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -32,6 +32,19 @@ # Changing this requires a reboot to take effect. #XENSTORED=@XENSTORED@ +## Type: string +## Default: unlimited +# +# Select maximum number of file descriptors xenstored is allowed to have +# opened at one time. +# For each HVM domain xenstored might need up to 5 open file descriptors, +# PVH and PV domains will require up to 3 open file descriptors. Additionally +# 20-30 file descriptors will be opened for internal uses. +# The specified value (including "unlimited") will be capped by the contents +# of /proc/sys/fs/nr_open if existing. +# Only evaluated if XENSTORETYPE is "daemon". +#XENSTORED_MAX_OPEN_FDS=unlimited + ## Type: string ## Default: "" # diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/launch-xenstore.in index 1747c96065..8438af9977 100644 --- a/tools/hotplug/Linux/launch-xenstore.in +++ b/tools/hotplug/Linux/launch-xenstore.in @@ -54,6 +54,7 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF [ "$XENSTORETYPE" = "daemon" ] && { [ -z "$XENSTORED_TRACE" ] || XENSTORED_ARGS="$XENSTORED_ARGS -T @XEN_LOG_DIR@/xenstored-trace.log" + [ -z "$XENSTORED_MAX_OPEN_FDS" ] && XENSTORED_MAX_OPEN_FDS=unlimited [ -z "$XENSTORED" ] && XENSTORED=@XENSTORED@ [ -x "$XENSTORED" ] || { echo "No xenstored found" @@ -62,10 +63,28 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF [ -z "$XENSTORED_OOM_MEM_THRESHOLD" ] || XENSTORED_OOM_MEM_THRESHOLD=50 XS_OOM_SCORE=-$(($XENSTORED_OOM_MEM_THRESHOLD * 10)) + [ "$XENSTORED_MAX_OPEN_FDS" = "unlimited" ] || { + [ -z "${XENSTORED_MAX_OPEN_FDS//[0-9]}" ] && + [ -n "$XENSTORED_MAX_OPEN_FDS" ] || { + echo "XENSTORED_MAX_OPEN_FDS=$XENSTORED_MAX_OPEN_FDS invalid" + echo "Setting to default \"unlimited\"." + XENSTORED_MAX_OPEN_FDS=unlimited + } + } + [ -r /proc/sys/fs/nr_open ] && { + MAX_FDS=`cat /proc/sys/fs/nr_open` + [ "$XENSTORED_MAX_OPEN_FDS" = "unlimited" ] && XENSTORED_MAX_OPEN_FDS=$MAX_FDS + [ $XENSTORED_MAX_OPEN_FDS -gt $MAX_FDS ] && { + echo "XENSTORED_MAX_OPEN_FDS exceeds system limit." + echo "Setting to \"$MAX_FDS\"." + XENSTORED_MAX_OPEN_FDS=$MAX_FDS + } + } + rm -f @XEN_RUN_DIR@/xenstored.pid echo -n Starting $XENSTORED... - $XENSTORED --pid-file @XEN_RUN_DIR@/xenstored.pid $XENSTORED_ARGS + prlimit --nofile=$XENSTORED_MAX_OPEN_FDS $XENSTORED --pid-file @XEN_RUN_DIR@/xenstored.pid $XENSTORED_ARGS systemd-notify --booted 2>/dev/null || timeout_xenstore $XENSTORED || exit 1 XS_PID=`cat @XEN_RUN_DIR@/xenstored.pid` -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:33:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213546.371795 (Exim 4.92) (envelope-from ) id 1md4E7-0002uK-PG; Wed, 20 Oct 2021 05:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213546.371795; Wed, 20 Oct 2021 05:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4E7-0002u5-LW; Wed, 20 Oct 2021 05:33:23 +0000 Received: by outflank-mailman (input) for mailman id 213546; Wed, 20 Oct 2021 05:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4E6-0002sd-1I for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4E6-0005Q2-0T for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4E5-0004xv-Vb for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=H9QF7uX5ySqmC+28GTrGt1hnAQX3w4Igrn0P7o6Avlc=; b=jp1bA8NXoAQv5x8ccr+CijPWw0 BnFbT/R/AoQxQ39aUrixzF33c+lvLmb5L9Q4O/bPuM3cAugwR/85EAjDwADNYx/UokjsOhmB3YhqI 04NzwmR9+AIBteqAdSZxcylGknVIm8dSGJTq29zz9Gwtn6I12+jvjXs+YWrPFp3nsDa4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] stubdom: disable building pv-grub Message-Id: Date: Wed, 20 Oct 2021 05:33:21 +0000 commit 3ae80dea4601764818d1e5b84bd1e4479c0d4790 Author: Juergen Gross AuthorDate: Fri Sep 10 07:55:17 2021 +0200 Commit: Ian Jackson CommitDate: Mon Oct 18 14:28:46 2021 +0100 stubdom: disable building pv-grub The stubdom based pv-grub is using a very outdated version of grub (0.97) and should not be used any longer. Mainline grub has support for PV guests for a long time now, so that should be used as a boot loader of a PV domain. So disable building pv-grub per default. In case someone really wants to continue using it he/she can still use a pv-grub binary from an older Xen version or manually enable building it via: configure --enable-pv-grub [ This was already disabled in osstest by 8dee6e333622 "make-flight: Drop pvgrub (pvgrub1) tests" -iwj ] Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault Acked-by: Ian Jackson Release-Acked-by: Ian Jackson --- CHANGELOG.md | 2 ++ stubdom/configure | 8 ++------ stubdom/configure.ac | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22cfdb4298..e7107ac3de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) appearing in 4.12.2 and 4.11.4). Prior (4.13...4.15-like) behavior can be arranged for either by enabling the IOMMU_QUARANTINE_SCRATCH_PAGE setting at build (configuration) time or by passing "iommu=quarantine=scratch-page" on the hypervisor command line. + - pv-grub stubdoms will no longer be built per default. In order to be able to use pv-grub + configure needs to be called with "--enable-pv-grub" as parameter. ## [4.15.0 UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0) - TBD diff --git a/stubdom/configure b/stubdom/configure index aa48df986d..df31532abb 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1342,7 +1342,7 @@ Optional Features: --enable-ioemu-stubdom Build and install ioemu-stubdom --enable-c-stubdom Build and install c-stubdom (default is DISABLED) --enable-caml-stubdom Build and install caml-stubdom (default is DISABLED) - --disable-pv-grub Build and install pv-grub (default is ENABLED) + --enable-pv-grub Build and install pv-grub (default is DISABLED) --disable-xenstore-stubdom Build and install xenstore-stubdom (default is ENABLED) @@ -2129,11 +2129,7 @@ fi else -grub=y -STUBDOM_TARGETS="$STUBDOM_TARGETS grub" -STUBDOM_BUILD="$STUBDOM_BUILD pv-grub" -STUBDOM_INSTALL="$STUBDOM_INSTALL install-grub" -STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-grub" +grub=n fi diff --git a/stubdom/configure.ac b/stubdom/configure.ac index bd6f765929..a07a1edae5 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -21,7 +21,7 @@ m4_include([../m4/fetcher.m4]) AX_STUBDOM_CONDITIONAL([ioemu-stubdom], [ioemu]) AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c]) AX_STUBDOM_DEFAULT_DISABLE([caml-stubdom], [caml]) -AX_STUBDOM_DEFAULT_ENABLE([pv-grub], [grub]) +AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub]) AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore]) AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh]) AX_STUBDOM_CONDITIONAL([vtpm-stubdom], [vtpm]) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:33:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213548.371796 (Exim 4.92) (envelope-from ) id 1md4EH-00032g-QO; Wed, 20 Oct 2021 05:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213548.371796; Wed, 20 Oct 2021 05:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4EH-000327-NQ; Wed, 20 Oct 2021 05:33:33 +0000 Received: by outflank-mailman (input) for mailman id 213548; Wed, 20 Oct 2021 05:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4EG-00030a-4y for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4EG-0005QV-4A for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4EG-0004yv-3G for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05: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=X8kzVIYmsWLwWj05xhpIeKgE1XODwDBJl3jjhTqPRFc=; b=iXZFiYjZMYbIcgLLQOEpa+WaRm R+5col99irwnPCmF7bf5Ru6y1LotXQRYrhAorCVgmGDrkRj4xt8F2s5Tk95CoS+kRPNBgq1VEbd+a DmLtLPVqsl0tQajRe4P0SyjQzsTYubIcUX4iwg0CPAG2MPjvsIHc2pa7p7rD2Vr9Mz1o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: de-duplicate scatters to the same linear address Message-Id: Date: Wed, 20 Oct 2021 05:33:32 +0000 commit a8cddbac5051020bb4a59a7f0ea27500c51063fb Author: Jan Beulich AuthorDate: Tue Oct 19 10:02:39 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:02:39 2021 +0200 x86emul: de-duplicate scatters to the same linear address The SDM specifically allows for earlier writes to fully overlapping ranges to be dropped. If a guest did so, hvmemul_phys_mmio_access() would crash it if varying data was written to the same address. Detect overlaps early, as doing so in hvmemul_{linear,phys}_mmio_access() would be quite a bit more difficult. To maintain proper faulting behavior, instead of dropping earlier write instances of fully overlapping slots altogether, write the data of the final of these slots multiple times. (We also can't pull ahead the [single] write of the data of the last of the slots, clearing all involved slots' op_mask bits together, as this would yield incorrect results if there were intervening partially overlapping ones.) Note that due to cache slot use being linear address based, there's no similar issue with multiple writes to the same physical address (mapped through different linear addresses). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/x86_emulate/x86_emulate.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index c9a9e031cf..069acde517 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -10076,15 +10076,36 @@ x86_emulate( for ( i = 0; op_mask; ++i ) { - long idx = b & 1 ? index.qw[i] : index.dw[i]; + long idx = (b & 1 ? index.qw[i] + : index.dw[i]) * (1 << state->sib_scale); + unsigned long offs = truncate_ea(ea.mem.off + idx); + unsigned int j, slot; if ( !(op_mask & (1 << i)) ) continue; - rc = ops->write(ea.mem.seg, - truncate_ea(ea.mem.off + - idx * (1 << state->sib_scale)), - (void *)mmvalp + i * op_bytes, op_bytes, ctxt); + /* + * hvmemul_linear_mmio_access() will find a cache slot based on + * linear address. hvmemul_phys_mmio_access() will crash the + * domain if observing varying data getting written to the same + * cache slot. Utilize that squashing earlier writes to fully + * overlapping addresses is permitted by the spec. We can't, + * however, drop the writes altogether, to maintain correct + * faulting behavior. Instead write the data from the last of + * the fully overlapping slots multiple times. + */ + for ( j = (slot = i) + 1; j < n; ++j ) + { + long idx2 = (b & 1 ? index.qw[j] + : index.dw[j]) * (1 << state->sib_scale); + + if ( (op_mask & (1 << j)) && + truncate_ea(ea.mem.off + idx2) == offs ) + slot = j; + } + + rc = ops->write(ea.mem.seg, offs, + (void *)mmvalp + slot * op_bytes, op_bytes, ctxt); if ( rc != X86EMUL_OKAY ) { /* See comment in gather emulation. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:33:43 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213551.371801 (Exim 4.92) (envelope-from ) id 1md4ER-0003Dl-SY; Wed, 20 Oct 2021 05:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213551.371801; Wed, 20 Oct 2021 05:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4ER-0003Dd-Ov; Wed, 20 Oct 2021 05:33:43 +0000 Received: by outflank-mailman (input) for mailman id 213551; Wed, 20 Oct 2021 05:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4EQ-0003Aq-85 for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4EQ-0005Ql-7P for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4EQ-0004zj-6V for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XEwAG/7hDyjq8Is/wloD6tvwUct1iTgsixTdKxzjKqc=; b=6Ox+OM1Tb5gmI0MHjxK7tNoxMt nClxdt91x/4UCUXQcYtRhMj2Ak4xhJ1HK8MoQV1nA3UOboCMN4tKU+TIW5qSPzuj/gCFrwD++jfgI 7Un3xU298vCDpOt4TU9y597nj6v0iswEKIZKa4fIE/XWCE8ZeLugeFs1lm991O82iZa8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/AMD: make HT range dynamic for Fam17 and up Message-Id: Date: Wed, 20 Oct 2021 05:33:42 +0000 commit d6e38eea2d806c53d976603717aebf6e5de30a1e Author: Jan Beulich AuthorDate: Tue Oct 19 10:04:13 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:04:13 2021 +0200 x86/AMD: make HT range dynamic for Fam17 and up At the time of d838ac2539cf ("x86: don't allow Dom0 access to the HT address range") documentation correctly stated that the range was completely fixed. For Fam17 and newer, it lives at the top of physical address space, though. To correctly determine the top of physical address space, we need to account for their physical address reduction, hence the calculation of paddr_bits also gets adjusted. While for paddr_bits < 40 the HT range is completely hidden, there's no need to suppress the range insertion in that case: It'll just have no real meaning. Reported-by: Igor Druzhinin Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/common.c | 7 +++++++ xen/arch/x86/dom0_build.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 302f7f35d8..4a163afbfc 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -349,16 +349,23 @@ void __init early_cpu_init(void) eax = cpuid_eax(0x80000000); if ((eax >> 16) == 0x8000 && eax >= 0x80000008) { + ebx = eax >= 0x8000001f ? cpuid_ebx(0x8000001f) : 0; eax = cpuid_eax(0x80000008); + paddr_bits = eax & 0xff; if (paddr_bits > PADDR_BITS) paddr_bits = PADDR_BITS; + vaddr_bits = (eax >> 8) & 0xff; if (vaddr_bits > VADDR_BITS) vaddr_bits = VADDR_BITS; + hap_paddr_bits = ((eax >> 16) & 0xff) ?: paddr_bits; if (hap_paddr_bits > PADDR_BITS) hap_paddr_bits = PADDR_BITS; + + /* Account for SME's physical address space reduction. */ + paddr_bits -= (ebx >> 6) & 0x3f; } if (!(c->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON))) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 74b443e509..fe24e11b37 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -524,8 +524,11 @@ int __init dom0_setup_permissions(struct domain *d) MSI_ADDR_DEST_ID_MASK)); /* HyperTransport range. */ if ( boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) - rc |= iomem_deny_access(d, paddr_to_pfn(0xfdULL << 32), - paddr_to_pfn((1ULL << 40) - 1)); + { + mfn = paddr_to_pfn(1UL << + (boot_cpu_data.x86 < 0x17 ? 40 : paddr_bits)); + rc |= iomem_deny_access(d, mfn - paddr_to_pfn(3UL << 32), mfn - 1); + } /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:33:53 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213554.371804 (Exim 4.92) (envelope-from ) id 1md4Eb-0003IV-TP; Wed, 20 Oct 2021 05:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213554.371804; Wed, 20 Oct 2021 05:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Eb-0003IN-QU; Wed, 20 Oct 2021 05:33:53 +0000 Received: by outflank-mailman (input) for mailman id 213554; Wed, 20 Oct 2021 05:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Ea-0003I8-BR for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Ea-0005Qv-Ar for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4Ea-00050e-9w for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:33:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6eOy1+bRdT6RIVN42JAiypKANrTHGmxB4EqpnkDLwTI=; b=eNUcSCB2Lp4Gb9H0YJJvFNKdO8 XBX1FN7LfGwpCOjTNhFwgKQlUo7L/77doM6lc0CpHn2CWQRfVqnCHvHv59Fj1f8mlrmZC298LPpGa GlXqmD3iVffHiT7BjEYEc1RHbX5uGVUca+MS+uU+Cv0ZSPVJE2nJM8WqHI7KH1bwZlMg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/altp2m: don't consider "active" when enabling failed Message-Id: Date: Wed, 20 Oct 2021 05:33:52 +0000 commit 5e97b97bc254b0ee23f701a4d5a317853136d288 Author: Jan Beulich AuthorDate: Tue Oct 19 10:05:10 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:05:10 2021 +0200 x86/altp2m: don't consider "active" when enabling failed We should not rely on guests to not use altp2m after reporting failure of HVMOP_altp2m_set_domain_state to them. Set "active" back to false in this case. Signed-off-by: Jan Beulich Reviewed-by: Tamas K Lengyel Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/hvm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3a6fd865d9..eee365711d 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4622,6 +4622,8 @@ static int do_altp2m_op( if ( ostate ) p2m_flush_altp2m(d); } + else if ( rc ) + d->arch.altp2m_active = false; domain_unpause_except_self(d); break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:34:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:34:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213555.371809 (Exim 4.92) (envelope-from ) id 1md4Em-0003M1-04; Wed, 20 Oct 2021 05:34:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213555.371809; Wed, 20 Oct 2021 05:34:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4El-0003Lt-TK; Wed, 20 Oct 2021 05:34:03 +0000 Received: by outflank-mailman (input) for mailman id 213555; Wed, 20 Oct 2021 05:34:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Ek-0003Lc-F6 for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Ek-0005RO-EQ for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4Ek-00051T-DH for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=J7xFsICNo9Fahq/FQ/300VO25toT5pjdtQsbCAXsBvQ=; b=OclHq8zzvL+tHCHhVOstbI017/ U7Ruu24CVibvJUAxU+Z8w3/Kh8qVkfC5ia3c9UJuO3FKozVGX2t2yyGQAifsEU5yiwIoCnm7Djqgj s61Y9l7sZ8WoCFHkIueW0nYy9xzyZSF17WiDKafotKmTGYqAbsL00yqQt8XWMd7vfgt0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV: make '0' debug key dump Dom0's stacks again Message-Id: Date: Wed, 20 Oct 2021 05:34:02 +0000 commit 4843546fef5e024d5754f722fd01a8dfb482ac7d Author: Jan Beulich AuthorDate: Tue Oct 19 10:07:00 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:07:00 2021 +0200 x86/PV: make '0' debug key dump Dom0's stacks again The conversion to __get_guest() failed to account for the fact that for remote vCPU-s dumping gets done through a pointer obtained from map_domain_page(): __get_guest() arranges for (apparent) accesses to hypervisor space to cause #GP(0). Fixes: 6a1d72d3739e ('x86: split __{get,put}_user() into "guest" and "unsafe" variants') Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/traps.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 64f3396f20..4f3a7131d6 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -275,7 +275,9 @@ static void compat_show_guest_stack(struct vcpu *v, { if ( (((long)stack - 1) ^ ((long)(stack + 1) - 1)) & mask ) break; - if ( __get_guest(addr, stack) ) + if ( stack_page ) + addr = *stack; + else if ( __get_guest(addr, stack) ) { if ( i != 0 ) printk("\n "); @@ -344,7 +346,9 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) { if ( (((long)stack - 1) ^ ((long)(stack + 1) - 1)) & mask ) break; - if ( __get_guest(addr, stack) ) + if ( stack_page ) + addr = *stack; + else if ( __get_guest(addr, stack) ) { if ( i != 0 ) printk("\n "); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:34:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:34:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213556.371812 (Exim 4.92) (envelope-from ) id 1md4Ew-0003PP-1h; Wed, 20 Oct 2021 05:34:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213556.371812; Wed, 20 Oct 2021 05:34:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Ev-0003PH-Uo; Wed, 20 Oct 2021 05:34:13 +0000 Received: by outflank-mailman (input) for mailman id 213556; Wed, 20 Oct 2021 05:34:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Eu-0003Ou-Ia for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4Eu-0005RZ-Ht for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4Eu-00052K-Gv for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cJUj64AtRgMe2SZ9SUY4Ayes+m7uamYFRm/VVyg/9lc=; b=Jqu7l4zwIV2Q1YAfVwzH7hqKKn uQfOjrM1OduQoae4lSOD0P8YzcV5TWMhhvlUETsZwXJl68pJDYECa92KRcF7yFe+XUyCEFqXPMcwB OfLIDvJbX/r4XSH7HU1Xh2e17ZTVAoqULG2V15nQ+RXUOEDpBcn+Ta8NhjAeURur0dgg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV: replace assertions in '0' debug key stack dumping Message-Id: Date: Wed, 20 Oct 2021 05:34:12 +0000 commit 525eac931794434593c39a1d1cd739ad8b326e27 Author: Jan Beulich AuthorDate: Tue Oct 19 10:07:42 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:07:42 2021 +0200 x86/PV: replace assertions in '0' debug key stack dumping While it was me to add them, I'm afraid I don't see justification for the assertions: A vCPU may very well have got preempted while in user mode. Limit compat guest user mode stack dumps to the containing page (like is done when using do_page_walk()), and suppress user mode stack dumping altogether for 64-bit domains. Fixes: cc0de53a903c ("x86: improve output resulting from sending '0' over serial") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/traps.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4f3a7131d6..a1c2adb7ad 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -254,7 +254,6 @@ static void compat_show_guest_stack(struct vcpu *v, struct vcpu *vcpu; unsigned long mfn; - ASSERT(guest_kernel_mode(v, regs)); mfn = read_cr3() >> PAGE_SHIFT; for_each_vcpu( v->domain, vcpu ) if ( pagetable_get_pfn(vcpu->arch.guest_table) == mfn ) @@ -269,6 +268,8 @@ static void compat_show_guest_stack(struct vcpu *v, } mask = PAGE_SIZE; } + else if ( !guest_kernel_mode(v, regs) ) + mask = PAGE_SIZE; } for ( i = 0; i < debug_stack_lines * 8; i++ ) @@ -328,7 +329,12 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) { struct vcpu *vcpu; - ASSERT(guest_kernel_mode(v, regs)); + if ( !guest_kernel_mode(v, regs) ) + { + printk("User mode stack\n"); + return; + } + vcpu = maddr_get_owner(read_cr3()) == v->domain ? v : NULL; if ( !vcpu ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:34:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:34:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213557.371816 (Exim 4.92) (envelope-from ) id 1md4F6-0003SX-35; Wed, 20 Oct 2021 05:34:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213557.371816; Wed, 20 Oct 2021 05:34:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4F6-0003SP-02; Wed, 20 Oct 2021 05:34:24 +0000 Received: by outflank-mailman (input) for mailman id 213557; Wed, 20 Oct 2021 05:34:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4F4-0003S9-Lp for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4F4-0005Rk-LA for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4F4-000537-KB for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VS9jcOqMsqCmnCLYA2/LNE3flkX1+1pvgFO74B+6l1E=; b=3k4G/CpSNPeI0vNJZnTJt2ZukS XPMkC/nNSpY2Pzvlb8LPntpLMK6y9cXpUIlabo5w0KTrWgsogBOwdSIdXnKJp9QEyk2y1mEjqdyvP 3p747BsVo0BXaf6NQ0PP0W91WFhx9zfGnZxjdIxawZauxtdEf9JZjUgsaLWRWnKtAOHM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/paging: restrict physical address width reported to guests Message-Id: Date: Wed, 20 Oct 2021 05:34:22 +0000 commit b7635526acffbe4ad8ad16fd92812c57742e54c2 Author: Jan Beulich AuthorDate: Tue Oct 19 10:08:30 2021 +0200 Commit: Jan Beulich CommitDate: Tue Oct 19 10:08:30 2021 +0200 x86/paging: restrict physical address width reported to guests Modern hardware may report more than 48 bits of physical address width. For paging-external guests our P2M implementation does not cope with larger values. Telling the guest of more available bits means misleading it into perhaps trying to actually put some page there (like was e.g. intermediately done in OVMF for the shared info page). While there also convert the PV check to a paging-external one (which in our current code base are synonyms of one another anyway). Fixes: 5dbd60e16a1f ("x86/shadow: Correct guest behaviour when creating PTEs above maxphysaddr") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/include/asm-x86/paging.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index fa22558e2e..996c2cd038 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -400,11 +400,18 @@ static always_inline unsigned int paging_max_paddr_bits(const struct domain *d) { unsigned int bits = paging_mode_hap(d) ? hap_paddr_bits : paddr_bits; - if ( !IS_ENABLED(CONFIG_BIGMEM) && paging_mode_shadow(d) && - !is_pv_domain(d) ) + if ( paging_mode_external(d) ) { - /* Shadowed superpages store GFNs in 32-bit page_info fields. */ - bits = min(bits, 32U + PAGE_SHIFT); + if ( !IS_ENABLED(CONFIG_BIGMEM) && paging_mode_shadow(d) ) + { + /* Shadowed superpages store GFNs in 32-bit page_info fields. */ + bits = min(bits, 32U + PAGE_SHIFT); + } + else + { + /* Both p2m-ept and p2m-pt only support 4-level page tables. */ + bits = min(bits, 48U); + } } return bits; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 05:34:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 05:34:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213558.371821 (Exim 4.92) (envelope-from ) id 1md4FG-0003Vh-4E; Wed, 20 Oct 2021 05:34:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213558.371821; Wed, 20 Oct 2021 05:34:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4FG-0003VZ-1T; Wed, 20 Oct 2021 05:34:34 +0000 Received: by outflank-mailman (input) for mailman id 213558; Wed, 20 Oct 2021 05:34:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4FE-0003VC-Op for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md4FE-0005SD-OD for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md4FE-00053s-NN for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 05:34:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FmVdp4MN7mgH6G+FNtPD2bh8ANwFjG2e4XQxTHmnAIE=; b=4jRg/K76436PeDL1TxI4vkw1M3 fiwmPPHO7rJOqR9YrYObKnwBbW3OjLi3mXNdTvnp+NZTNV02PyZWUzodt7fXPhx3kwM9XMfJbkIhQ J3OWWgpBxCgsv4ZGyw2EuozBhgqeXNJMDNIjzde7revo0CoX5L9+YzZglar10f5OO8C0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: fix oom setting of xenstored Message-Id: Date: Wed, 20 Oct 2021 05:34:32 +0000 commit 6809998c5f8f1d2e26ac9e867af8ac71e7a66cf2 Author: Juergen Gross AuthorDate: Tue Oct 19 13:21:40 2021 +0200 Commit: Ian Jackson CommitDate: Tue Oct 19 12:23:34 2021 +0100 tools: fix oom setting of xenstored Commit f282182af32939 ("tools/xenstore: set oom score for xenstore daemon on Linux") introduced a regression when not setting the oom value in the xencommons file. Fix that. Fixes: f282182af32939 ("tools/xenstore: set oom score for xenstore daemon on Linux") Signed-off-by: Juergen Gross Reviewed-by: Ian Jackson Release-Acked-by: Ian Jackson --- tools/hotplug/Linux/launch-xenstore.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/launch-xenstore.in index 8438af9977..e854ca1eb8 100644 --- a/tools/hotplug/Linux/launch-xenstore.in +++ b/tools/hotplug/Linux/launch-xenstore.in @@ -60,8 +60,7 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF echo "No xenstored found" exit 1 } - [ -z "$XENSTORED_OOM_MEM_THRESHOLD" ] || XENSTORED_OOM_MEM_THRESHOLD=50 - XS_OOM_SCORE=-$(($XENSTORED_OOM_MEM_THRESHOLD * 10)) + XS_OOM_SCORE=-$((${XENSTORED_OOM_MEM_THRESHOLD:-50} * 10)) [ "$XENSTORED_MAX_OPEN_FDS" = "unlimited" ] || { [ -z "${XENSTORED_MAX_OPEN_FDS//[0-9]}" ] && -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 10:55:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 10:55:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213836.372178 (Exim 4.92) (envelope-from ) id 1md9FS-0000Zq-HE; Wed, 20 Oct 2021 10:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213836.372178; Wed, 20 Oct 2021 10:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md9FS-0000Zi-EM; Wed, 20 Oct 2021 10:55:06 +0000 Received: by outflank-mailman (input) for mailman id 213836; Wed, 20 Oct 2021 10:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md9FQ-0000Zc-Sl for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 10:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md9FQ-0003BT-S0 for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 10:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md9FQ-0004U9-R4 for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 10:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Wb8134dHNAr5T6AjdN3QpiKX6oY4BeyONLU6GJjjvi8=; b=wDSbbDao1lSLOIqdkg64p2sfO9 RA7VFRo7+RMcsWXc33Y8DRHd5CmAWMScyf12yovo/3b8iYZ9GtCfoX+FC1H4M/kDq/HcaGxNl2EyO uBnwHB4tzj8vil/l1I6TBt/9yt3JES+47DqHjs0haAck4yVZAZiNJnyzH++EqfVDVHrc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PoD: defer nested P2M flushes Message-Id: Date: Wed, 20 Oct 2021 10:55:04 +0000 commit 6d187caae50284625af8799a79712c7a4c6a9a59 Author: Jan Beulich AuthorDate: Wed Oct 20 12:42:44 2021 +0200 Commit: Jan Beulich CommitDate: Wed Oct 20 12:42:44 2021 +0200 x86/PoD: defer nested P2M flushes With NPT or shadow in use, the p2m_set_entry() -> p2m_pt_set_entry() -> write_p2m_entry() -> p2m_flush_nestedp2m() call sequence triggers a lock order violation when the PoD lock is held around it. Hence such flushing needs to be deferred. Steal the approach from p2m_change_type_range(). (Note that strictly speaking the change at the out_of_memory label is not needed, as the domain gets crashed there anyway. The change is being made nevertheless to avoid setting up a trap from someone meaning to deal with that case better than by domain_crash().) Similarly for EPT I think ept_set_entry() -> ept_sync_domain() -> ept_sync_domain_prepare() -> p2m_flush_nestedp2m() is affected. Make its p2m_flush_nestedp2m() invocation conditional. Note that this then also alters behavior of p2m_change_type_range() on EPT, deferring the nested flushes there as well. I think this should have been that way from the introduction of the flag. Reported-by: Elliott Mitchell Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Kevin Tian --- xen/arch/x86/mm/p2m-ept.c | 2 +- xen/arch/x86/mm/p2m-pod.c | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index e7e873dc28..b2d57a3ee8 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1253,7 +1253,7 @@ static void ept_sync_domain_prepare(struct p2m_domain *p2m) { if ( p2m_is_nestedp2m(p2m) ) ept = &p2m_get_hostp2m(d)->ept; - else + else if ( !p2m->defer_nested_flush ) p2m_flush_nestedp2m(d); } diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 8abc57265c..d0134755e5 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -494,6 +495,13 @@ p2m_pod_offline_or_broken_replace(struct page_info *p) static int p2m_pod_zero_check_superpage(struct p2m_domain *p2m, gfn_t gfn); +static void pod_unlock_and_flush(struct p2m_domain *p2m) +{ + pod_unlock(p2m); + p2m->defer_nested_flush = false; + if ( nestedhvm_enabled(p2m->domain) ) + p2m_flush_nestedp2m(p2m->domain); +} /* * This function is needed for two reasons: @@ -514,6 +522,7 @@ p2m_pod_decrease_reservation(struct domain *d, gfn_t gfn, unsigned int order) gfn_lock(p2m, gfn, order); pod_lock(p2m); + p2m->defer_nested_flush = true; /* * If we don't have any outstanding PoD entries, let things take their @@ -665,7 +674,7 @@ out_entry_check: } out_unlock: - pod_unlock(p2m); + pod_unlock_and_flush(p2m); gfn_unlock(p2m, gfn, order); return ret; } @@ -1144,8 +1153,10 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, * won't start until we're done. */ if ( unlikely(d->is_dying) ) - goto out_fail; - + { + pod_unlock(p2m); + return false; + } /* * Because PoD does not have cache list for 1GB pages, it has to remap @@ -1167,6 +1178,8 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, p2m_populate_on_demand, p2m->default_access); } + p2m->defer_nested_flush = true; + /* Only reclaim if we're in actual need of more cache. */ if ( p2m->pod.entry_count > p2m->pod.count ) pod_eager_reclaim(p2m); @@ -1229,22 +1242,25 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, __trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), &t); } - pod_unlock(p2m); + pod_unlock_and_flush(p2m); return true; + out_of_memory: - pod_unlock(p2m); + pod_unlock_and_flush(p2m); printk("%s: Dom%d out of PoD memory! (tot=%"PRIu32" ents=%ld dom%d)\n", __func__, d->domain_id, domain_tot_pages(d), p2m->pod.entry_count, current->domain->domain_id); domain_crash(d); return false; + out_fail: - pod_unlock(p2m); + pod_unlock_and_flush(p2m); return false; + remap_and_retry: BUG_ON(order != PAGE_ORDER_2M); - pod_unlock(p2m); + pod_unlock_and_flush(p2m); /* * Remap this 2-meg region in singleton chunks. See the comment on the -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 10:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 10:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213837.372182 (Exim 4.92) (envelope-from ) id 1md9Fc-0000dn-J3; Wed, 20 Oct 2021 10:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213837.372182; Wed, 20 Oct 2021 10:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md9Fc-0000df-Fr; Wed, 20 Oct 2021 10:55:16 +0000 Received: by outflank-mailman (input) for mailman id 213837; Wed, 20 Oct 2021 10:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md9Fa-0000dI-W5 for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 10:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1md9Fa-0003Bd-VM for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 10:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1md9Fa-0004Uq-UP for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 10:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pHV/BrGDPT81CbFfBB+8sfROD35xyUJkbk5YeQa8J5s=; b=w5WH8AfEIId/jzsXIf9feOiL9/ IEyRjMq+BcbtHTX7t/6PzBkBcUrn+fkNXVMbFznfw63hrznsMWhkMlx3dDhYVHARsP1lSQHx9tNsj l6cTdw+fiz69YSeyhqiqe2rBiINjVdkwCfe0J+S9YvTTMGcX1mId8X+mnnXDcjYvWr6Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hpet: Use another crystalball to evaluate HPET usability Message-Id: Date: Wed, 20 Oct 2021 10:55:14 +0000 commit c12731493ae39640c4e44d9fe2029c3165f9f429 Author: Thomas Gleixner AuthorDate: Wed Oct 20 12:50:15 2021 +0200 Commit: Jan Beulich CommitDate: Wed Oct 20 12:50:15 2021 +0200 x86/hpet: Use another crystalball to evaluate HPET usability On recent Intel systems the HPET stops working when the system reaches PC10 idle state. The approach of adding PCI ids to the early quirks to disable HPET on these systems is a whack a mole game which makes no sense. Check for PC10 instead and force disable HPET if supported. The check is overbroad as it does not take ACPI, mwait-idle enablement and command line parameters into account. That's fine as long as there is at least PMTIMER available to calibrate the TSC frequency. The decision can be overruled by adding "clocksource=hpet" on the Xen command line. Remove the related PCI quirks for affected Coffee Lake systems as they are not longer required. That should also cover all other systems, i.e. Ice Lake, Tiger Lake, and newer generations, which are most likely affected by this as well. Fixes: Yet another hardware trainwreck Reported-by: Jakub Kicinski Signed-off-by: Thomas Gleixner [Linux commit: 6e3cd95234dc1eda488f4f487c281bac8fef4d9b] I have to admit that the purpose of checking CPUID5_ECX_INTERRUPT_BREAK is unclear to me, but I didn't want to diverge in technical aspects from the Linux commit. In mwait_pc10_supported(), besides some cosmetic adjustments, avoid UB from shifting left a signed 4-bit constant by 28 bits. Pull in Linux'es MSR_PKG_CST_CONFIG_CONTROL. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/mwait-idle.c | 23 ++++++++++++++++++--- xen/arch/x86/time.c | 44 ++++++++++++++++++++++++++++++++++------- xen/include/asm-x86/msr-index.h | 12 ++++++----- xen/include/asm-x86/mwait.h | 3 +++ 4 files changed, 67 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index f0c6ff9d52..d1739f6fc3 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -840,9 +840,9 @@ static void auto_demotion_disable(void *dummy) { u64 msr_bits; - rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits); msr_bits &= ~(icpu->auto_demotion_disable_flags); - wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); + wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits); } static void byt_auto_demotion_disable(void *dummy) @@ -1105,7 +1105,7 @@ static void __init sklh_idle_state_table_update(void) if ((mwait_substates & (MWAIT_CSTATE_MASK << 28)) == 0) return; - rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr); + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr); /* PC10 is not enabled in PKG C-state limit */ if ((msr & 0xF) != 8) @@ -1308,3 +1308,20 @@ int __init mwait_idle_init(struct notifier_block *nfb) return err; } + +/* Helper function for HPET. */ +bool __init mwait_pc10_supported(void) +{ + unsigned int ecx, edx, dummy; + + if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || + !cpu_has_monitor || + boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) + return false; + + cpuid(CPUID_MWAIT_LEAF, &dummy, &dummy, &ecx, &edx); + + return (ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) && + (ecx & CPUID5_ECX_INTERRUPT_BREAK) && + (edx >> 28); +} diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 10418cdc54..cbadaa036f 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -395,14 +396,43 @@ static int64_t __init init_hpet(struct platform_timesource *pts) } /* - * Some Coffee Lake platforms have a skewed HPET timer once the SoCs - * entered PC10. + * Some Coffee Lake and later platforms have a skewed HPET timer once + * they entered PC10. + * + * Check whether the system supports PC10. If so force disable HPET as + * that stops counting in PC10. This check is overbroad as it does not + * take any of the following into account: + * + * - ACPI tables + * - Enablement of mwait-idle + * - Command line arguments which limit mwait-idle C-state support + * + * That's perfectly fine. HPET is a piece of hardware designed by + * committee and the only reasons why it is still in use on modern + * systems is the fact that it is impossible to reliably query TSC and + * CPU frequency via CPUID or firmware. + * + * If HPET is functional it is useful for calibrating TSC, but this can + * be done via PMTIMER as well which seems to be the last remaining + * timer on X86/INTEL platforms that has not been completely wreckaged + * by feature creep. + * + * In theory HPET support should be removed altogether, but there are + * older systems out there which depend on it because TSC and APIC timer + * are dysfunctional in deeper C-states. */ - if ( pci_conf_read16(PCI_SBDF(0, 0, 0, 0), - PCI_VENDOR_ID) == PCI_VENDOR_ID_INTEL && - pci_conf_read16(PCI_SBDF(0, 0, 0, 0), - PCI_DEVICE_ID) == 0x3ec4 ) - hpet_address = 0; + if ( mwait_pc10_supported() ) + { + uint64_t pcfg; + + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, pcfg); + if ( (pcfg & 0xf) < 8 ) + /* nothing */; + else if ( !strcmp(opt_clocksource, pts->id) ) + printk("HPET use requested via command line, but dysfunctional in PC10\n"); + else + hpet_address = 0; + } if ( !hpet_address ) printk("Disabling HPET for being unreliable\n"); diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 90c0589cd6..ab68ef2681 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -46,6 +46,13 @@ #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) +#define MSR_PKG_CST_CONFIG_CONTROL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (_AC(1, ULL) << 25) +#define NHM_C1_AUTO_DEMOTE (_AC(1, ULL) << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (_AC(1, ULL) << 25) +#define SNB_C3_AUTO_UNDEMOTE (_AC(1, ULL) << 27) +#define SNB_C1_AUTO_UNDEMOTE (_AC(1, ULL) << 28) + #define MSR_ARCH_CAPABILITIES 0x0000010a #define ARCH_CAPS_RDCL_NO (_AC(1, ULL) << 0) #define ARCH_CAPS_IBRS_ALL (_AC(1, ULL) << 1) @@ -179,11 +186,6 @@ #define MSR_IA32_A_PERFCTR0 0x000004c1 #define MSR_FSB_FREQ 0x000000cd -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) - #define MSR_MTRRcap 0x000000fe #define MTRRcap_VCNT 0x000000ff diff --git a/xen/include/asm-x86/mwait.h b/xen/include/asm-x86/mwait.h index ba9c0ea096..f377d9fdca 100644 --- a/xen/include/asm-x86/mwait.h +++ b/xen/include/asm-x86/mwait.h @@ -1,6 +1,8 @@ #ifndef __ASM_X86_MWAIT_H__ #define __ASM_X86_MWAIT_H__ +#include + #define MWAIT_SUBSTATE_MASK 0xf #define MWAIT_CSTATE_MASK 0xf #define MWAIT_SUBSTATE_SIZE 4 @@ -12,5 +14,6 @@ #define MWAIT_ECX_INTERRUPT_BREAK 0x1 void mwait_idle_with_hints(unsigned int eax, unsigned int ecx); +bool mwait_pc10_supported(void); #endif /* __ASM_X86_MWAIT_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Oct 20 15:33:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 Oct 2021 15:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.213996.372390 (Exim 4.92) (envelope-from ) id 1mdDaT-0002Ay-Ep; Wed, 20 Oct 2021 15:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 213996.372390; Wed, 20 Oct 2021 15:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdDaT-0002Aq-Br; Wed, 20 Oct 2021 15:33:05 +0000 Received: by outflank-mailman (input) for mailman id 213996; Wed, 20 Oct 2021 15:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdDaS-0002Ak-Lo for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 15:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdDaS-0008GJ-JV for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 15:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mdDaS-0000DX-IM for xen-changelog@lists.xenproject.org; Wed, 20 Oct 2021 15:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SY4vVXS7TESyffIxHs3ieaT79YPUFeThzDNoOrYWy4g=; b=qOpitdi0XNOtF+gFR/E1shpEF0 AmA7sLkzYeRmDph5f1y+gdlAfLjjSU6jKpPnmJ7rUplWnO/U8FTYB6A+UuZ0zeKQHC6HgBNbZt1tl 6ojdWix44gEEw3DezC5m6ckA79q9FS1LZkaukDUJzQIyCRoXTJ++vDpcsO830hRDgZlE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/pci: Install vpci handlers on x86 and fix error paths Message-Id: Date: Wed, 20 Oct 2021 15:33:04 +0000 commit 118da371d1ff5d8432fa299544b1ea5e7e3710f0 Author: Bertrand Marquis AuthorDate: Wed Oct 20 17:22:52 2021 +0200 Commit: Jan Beulich CommitDate: Wed Oct 20 17:22:52 2021 +0200 xen/pci: Install vpci handlers on x86 and fix error paths Xen might not be able to discover at boot time all devices or some devices might appear after specific actions from dom0. In this case dom0 can use the PHYSDEVOP_pci_device_add to signal some PCI devices to Xen. As those devices where not known from Xen before, the vpci handlers must be properly installed during pci_device_add for x86 PVH Dom0, in the same way as what is done currently on arm (where Xen does not detect PCI devices but relies on Dom0 to declare them all the time). So this patch is removing the ifdef protecting the call to vpci_add_handlers and the comment which was arm specific. vpci_add_handlers is called on during pci_device_add which can be called at runtime through hypercall physdev_op. Remove __hwdom_init as the call is not limited anymore to hardware domain init and fix linker script to only keep vpci_array in rodata section. Add missing vpci handlers cleanup during pci_device_remove and in case of error with iommu during pci_device_add. Move code adding the domain to the pdev domain_list as vpci_add_handlers needs this to be set and remove it from the list in the error path. Exit early of vpci_remove_device if the domain has no vpci support. Add empty static inline for vpci_remove_device when CONFIG_VPCI is not defined. Add an ASSERT in vpci_add_handlers to check that the function is not called twice for the same device. Fixes: d59168dc05 ("xen/arm: Enable the existing x86 virtual PCI support for ARM") Suggested-by: Jan Beulich Signed-off-by: Bertrand Marquis Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/xen.lds.S | 9 +-------- xen/arch/x86/xen.lds.S | 9 +-------- xen/drivers/passthrough/pci.c | 14 ++++++++------ xen/drivers/vpci/vpci.c | 8 +++++++- xen/include/xen/vpci.h | 2 ++ 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index b773f91f1c..08016948ab 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -60,7 +60,7 @@ SECTIONS *(.proc.info) __proc_info_end = .; -#if defined(CONFIG_HAS_VPCI) && defined(CONFIG_LATE_HWDOM) +#ifdef CONFIG_HAS_VPCI . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; *(SORT(.data.vpci.*)) @@ -189,13 +189,6 @@ SECTIONS *(.init_array) *(SORT(.init_array.*)) __ctors_end = .; - -#if defined(CONFIG_HAS_VPCI) && !defined(CONFIG_LATE_HWDOM) - . = ALIGN(POINTER_ALIGN); - __start_vpci_array = .; - *(SORT(.data.vpci.*)) - __end_vpci_array = .; -#endif } :text __init_end_efi = .; . = ALIGN(STACK_SIZE); diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 11b1da2154..87e344d4dd 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -134,7 +134,7 @@ SECTIONS *(.ex_table.pre) __stop___pre_ex_table = .; -#if defined(CONFIG_HAS_VPCI) && defined(CONFIG_LATE_HWDOM) +#ifdef CONFIG_HAS_VPCI . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; *(SORT(.data.vpci.*)) @@ -247,13 +247,6 @@ SECTIONS *(.init_array) *(SORT(.init_array.*)) __ctors_end = .; - -#if defined(CONFIG_HAS_VPCI) && !defined(CONFIG_LATE_HWDOM) - . = ALIGN(POINTER_ALIGN); - __start_vpci_array = .; - *(SORT(.data.vpci.*)) - __end_vpci_array = .; -#endif } PHDR(text) . = ALIGN(SECTION_ALIGN); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 35e0190796..0d8ab2e716 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -756,27 +756,28 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, if ( !pdev->domain ) { pdev->domain = hardware_domain; -#ifdef CONFIG_ARM + list_add(&pdev->domain_list, &hardware_domain->pdev_list); + /* - * On ARM PCI devices discovery will be done by Dom0. Add vpci handler - * when Dom0 inform XEN to add the PCI devices in XEN. + * For devices not discovered by Xen during boot, add vPCI handlers + * when Dom0 first informs Xen about such devices. */ ret = vpci_add_handlers(pdev); if ( ret ) { printk(XENLOG_ERR "Setup of vPCI failed: %d\n", ret); + list_del(&pdev->domain_list); pdev->domain = NULL; goto out; } -#endif ret = iommu_add_device(pdev); if ( ret ) { + vpci_remove_device(pdev); + list_del(&pdev->domain_list); pdev->domain = NULL; goto out; } - - list_add(&pdev->domain_list, &hardware_domain->pdev_list); } else iommu_enable_device(pdev); @@ -819,6 +820,7 @@ int pci_remove_device(u16 seg, u8 bus, u8 devfn) list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list ) if ( pdev->bus == bus && pdev->devfn == devfn ) { + vpci_remove_device(pdev); pci_cleanup_msi(pdev); ret = iommu_remove_device(pdev); if ( pdev->domain ) diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index decf7d87a1..657697fe34 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -37,6 +37,9 @@ extern vpci_register_init_t *const __end_vpci_array[]; void vpci_remove_device(struct pci_dev *pdev) { + if ( !has_vpci(pdev->domain) ) + return; + spin_lock(&pdev->vpci->lock); while ( !list_empty(&pdev->vpci->handlers) ) { @@ -54,7 +57,7 @@ void vpci_remove_device(struct pci_dev *pdev) pdev->vpci = NULL; } -int __hwdom_init vpci_add_handlers(struct pci_dev *pdev) +int vpci_add_handlers(struct pci_dev *pdev) { unsigned int i; int rc = 0; @@ -62,6 +65,9 @@ int __hwdom_init vpci_add_handlers(struct pci_dev *pdev) if ( !has_vpci(pdev->domain) ) return 0; + /* We should not get here twice for the same device. */ + ASSERT(!pdev->vpci); + pdev->vpci = xzalloc(struct vpci); if ( !pdev->vpci ) return -ENOMEM; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 6746c2589a..9ea66e033f 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -230,6 +230,8 @@ static inline int vpci_add_handlers(struct pci_dev *pdev) return 0; } +static inline void vpci_remove_device(struct pci_dev *pdev) { } + static inline void vpci_dump_msi(void) { } static inline uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 21 03:00:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Oct 2021 03:00:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.214127.372573 (Exim 4.92) (envelope-from ) id 1mdOJH-0005cs-6T; Thu, 21 Oct 2021 03:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 214127.372573; Thu, 21 Oct 2021 03:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdOJH-0005ca-2T; Thu, 21 Oct 2021 03:00:03 +0000 Received: by outflank-mailman (input) for mailman id 214127; Thu, 21 Oct 2021 03:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdOJG-0005Vc-2U for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 03:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdOJG-00067d-0h for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 03:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mdOJF-0006JO-Vr for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 03:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6uCb4hMUMZm94G0XgceXoE6e4ZueoNJvqIcJEHGsHr4=; b=Omr/ZWEs93yo9T34poufsP+NlP kDbS4ch2p/ouMvJQUHLs6ECupvLZav6y6TGrGBofsCEX49m7VBNsSW2x6HJq833W5+SMf5XMhrxeC Ps6MwZvh9sQYwhWK62H+MeczErKWG4mjzwn/BseskPAANAJX9tMeZF2GYY110shWTDis=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PoD: defer nested P2M flushes Message-Id: Date: Thu, 21 Oct 2021 03:00:01 +0000 commit 6d187caae50284625af8799a79712c7a4c6a9a59 Author: Jan Beulich AuthorDate: Wed Oct 20 12:42:44 2021 +0200 Commit: Jan Beulich CommitDate: Wed Oct 20 12:42:44 2021 +0200 x86/PoD: defer nested P2M flushes With NPT or shadow in use, the p2m_set_entry() -> p2m_pt_set_entry() -> write_p2m_entry() -> p2m_flush_nestedp2m() call sequence triggers a lock order violation when the PoD lock is held around it. Hence such flushing needs to be deferred. Steal the approach from p2m_change_type_range(). (Note that strictly speaking the change at the out_of_memory label is not needed, as the domain gets crashed there anyway. The change is being made nevertheless to avoid setting up a trap from someone meaning to deal with that case better than by domain_crash().) Similarly for EPT I think ept_set_entry() -> ept_sync_domain() -> ept_sync_domain_prepare() -> p2m_flush_nestedp2m() is affected. Make its p2m_flush_nestedp2m() invocation conditional. Note that this then also alters behavior of p2m_change_type_range() on EPT, deferring the nested flushes there as well. I think this should have been that way from the introduction of the flag. Reported-by: Elliott Mitchell Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Reviewed-by: Kevin Tian --- xen/arch/x86/mm/p2m-ept.c | 2 +- xen/arch/x86/mm/p2m-pod.c | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index e7e873dc28..b2d57a3ee8 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1253,7 +1253,7 @@ static void ept_sync_domain_prepare(struct p2m_domain *p2m) { if ( p2m_is_nestedp2m(p2m) ) ept = &p2m_get_hostp2m(d)->ept; - else + else if ( !p2m->defer_nested_flush ) p2m_flush_nestedp2m(d); } diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 8abc57265c..d0134755e5 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -494,6 +495,13 @@ p2m_pod_offline_or_broken_replace(struct page_info *p) static int p2m_pod_zero_check_superpage(struct p2m_domain *p2m, gfn_t gfn); +static void pod_unlock_and_flush(struct p2m_domain *p2m) +{ + pod_unlock(p2m); + p2m->defer_nested_flush = false; + if ( nestedhvm_enabled(p2m->domain) ) + p2m_flush_nestedp2m(p2m->domain); +} /* * This function is needed for two reasons: @@ -514,6 +522,7 @@ p2m_pod_decrease_reservation(struct domain *d, gfn_t gfn, unsigned int order) gfn_lock(p2m, gfn, order); pod_lock(p2m); + p2m->defer_nested_flush = true; /* * If we don't have any outstanding PoD entries, let things take their @@ -665,7 +674,7 @@ out_entry_check: } out_unlock: - pod_unlock(p2m); + pod_unlock_and_flush(p2m); gfn_unlock(p2m, gfn, order); return ret; } @@ -1144,8 +1153,10 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, * won't start until we're done. */ if ( unlikely(d->is_dying) ) - goto out_fail; - + { + pod_unlock(p2m); + return false; + } /* * Because PoD does not have cache list for 1GB pages, it has to remap @@ -1167,6 +1178,8 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, p2m_populate_on_demand, p2m->default_access); } + p2m->defer_nested_flush = true; + /* Only reclaim if we're in actual need of more cache. */ if ( p2m->pod.entry_count > p2m->pod.count ) pod_eager_reclaim(p2m); @@ -1229,22 +1242,25 @@ p2m_pod_demand_populate(struct p2m_domain *p2m, gfn_t gfn, __trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), &t); } - pod_unlock(p2m); + pod_unlock_and_flush(p2m); return true; + out_of_memory: - pod_unlock(p2m); + pod_unlock_and_flush(p2m); printk("%s: Dom%d out of PoD memory! (tot=%"PRIu32" ents=%ld dom%d)\n", __func__, d->domain_id, domain_tot_pages(d), p2m->pod.entry_count, current->domain->domain_id); domain_crash(d); return false; + out_fail: - pod_unlock(p2m); + pod_unlock_and_flush(p2m); return false; + remap_and_retry: BUG_ON(order != PAGE_ORDER_2M); - pod_unlock(p2m); + pod_unlock_and_flush(p2m); /* * Remap this 2-meg region in singleton chunks. See the comment on the -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 21 03:00:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Oct 2021 03:00:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.214128.372576 (Exim 4.92) (envelope-from ) id 1mdOJS-00069d-7U; Thu, 21 Oct 2021 03:00:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 214128.372576; Thu, 21 Oct 2021 03: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 1mdOJS-00069V-47; Thu, 21 Oct 2021 03:00:14 +0000 Received: by outflank-mailman (input) for mailman id 214128; Thu, 21 Oct 2021 03:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdOJQ-00069C-5X for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 03:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdOJQ-00067n-4g for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 03:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mdOJQ-0006L6-37 for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 03: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=285QndyjN357yctSmE/JBfVUXdYCQsIvCrvPvuY1fKo=; b=pU57aGLHxQSAtrAxKstZf2qW4l tyVoYzq8MEbYWCbhDg38ges8Yq8Ib1AYBTDmiu3Io1zNiljqk+K2rfFT6g43yIh7VeAV/eSncC6zB ziZERLR9mzUsvc78/hfEptTjJmgG4QBa8KnknVOBPHHBITDLTwSf6zdE2cdrZc/K6K1k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hpet: Use another crystalball to evaluate HPET usability Message-Id: Date: Thu, 21 Oct 2021 03:00:12 +0000 commit c12731493ae39640c4e44d9fe2029c3165f9f429 Author: Thomas Gleixner AuthorDate: Wed Oct 20 12:50:15 2021 +0200 Commit: Jan Beulich CommitDate: Wed Oct 20 12:50:15 2021 +0200 x86/hpet: Use another crystalball to evaluate HPET usability On recent Intel systems the HPET stops working when the system reaches PC10 idle state. The approach of adding PCI ids to the early quirks to disable HPET on these systems is a whack a mole game which makes no sense. Check for PC10 instead and force disable HPET if supported. The check is overbroad as it does not take ACPI, mwait-idle enablement and command line parameters into account. That's fine as long as there is at least PMTIMER available to calibrate the TSC frequency. The decision can be overruled by adding "clocksource=hpet" on the Xen command line. Remove the related PCI quirks for affected Coffee Lake systems as they are not longer required. That should also cover all other systems, i.e. Ice Lake, Tiger Lake, and newer generations, which are most likely affected by this as well. Fixes: Yet another hardware trainwreck Reported-by: Jakub Kicinski Signed-off-by: Thomas Gleixner [Linux commit: 6e3cd95234dc1eda488f4f487c281bac8fef4d9b] I have to admit that the purpose of checking CPUID5_ECX_INTERRUPT_BREAK is unclear to me, but I didn't want to diverge in technical aspects from the Linux commit. In mwait_pc10_supported(), besides some cosmetic adjustments, avoid UB from shifting left a signed 4-bit constant by 28 bits. Pull in Linux'es MSR_PKG_CST_CONFIG_CONTROL. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/cpu/mwait-idle.c | 23 ++++++++++++++++++--- xen/arch/x86/time.c | 44 ++++++++++++++++++++++++++++++++++------- xen/include/asm-x86/msr-index.h | 12 ++++++----- xen/include/asm-x86/mwait.h | 3 +++ 4 files changed, 67 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index f0c6ff9d52..d1739f6fc3 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -840,9 +840,9 @@ static void auto_demotion_disable(void *dummy) { u64 msr_bits; - rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits); msr_bits &= ~(icpu->auto_demotion_disable_flags); - wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); + wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits); } static void byt_auto_demotion_disable(void *dummy) @@ -1105,7 +1105,7 @@ static void __init sklh_idle_state_table_update(void) if ((mwait_substates & (MWAIT_CSTATE_MASK << 28)) == 0) return; - rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr); + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr); /* PC10 is not enabled in PKG C-state limit */ if ((msr & 0xF) != 8) @@ -1308,3 +1308,20 @@ int __init mwait_idle_init(struct notifier_block *nfb) return err; } + +/* Helper function for HPET. */ +bool __init mwait_pc10_supported(void) +{ + unsigned int ecx, edx, dummy; + + if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || + !cpu_has_monitor || + boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) + return false; + + cpuid(CPUID_MWAIT_LEAF, &dummy, &dummy, &ecx, &edx); + + return (ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) && + (ecx & CPUID5_ECX_INTERRUPT_BREAK) && + (edx >> 28); +} diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 10418cdc54..cbadaa036f 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -395,14 +396,43 @@ static int64_t __init init_hpet(struct platform_timesource *pts) } /* - * Some Coffee Lake platforms have a skewed HPET timer once the SoCs - * entered PC10. + * Some Coffee Lake and later platforms have a skewed HPET timer once + * they entered PC10. + * + * Check whether the system supports PC10. If so force disable HPET as + * that stops counting in PC10. This check is overbroad as it does not + * take any of the following into account: + * + * - ACPI tables + * - Enablement of mwait-idle + * - Command line arguments which limit mwait-idle C-state support + * + * That's perfectly fine. HPET is a piece of hardware designed by + * committee and the only reasons why it is still in use on modern + * systems is the fact that it is impossible to reliably query TSC and + * CPU frequency via CPUID or firmware. + * + * If HPET is functional it is useful for calibrating TSC, but this can + * be done via PMTIMER as well which seems to be the last remaining + * timer on X86/INTEL platforms that has not been completely wreckaged + * by feature creep. + * + * In theory HPET support should be removed altogether, but there are + * older systems out there which depend on it because TSC and APIC timer + * are dysfunctional in deeper C-states. */ - if ( pci_conf_read16(PCI_SBDF(0, 0, 0, 0), - PCI_VENDOR_ID) == PCI_VENDOR_ID_INTEL && - pci_conf_read16(PCI_SBDF(0, 0, 0, 0), - PCI_DEVICE_ID) == 0x3ec4 ) - hpet_address = 0; + if ( mwait_pc10_supported() ) + { + uint64_t pcfg; + + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, pcfg); + if ( (pcfg & 0xf) < 8 ) + /* nothing */; + else if ( !strcmp(opt_clocksource, pts->id) ) + printk("HPET use requested via command line, but dysfunctional in PC10\n"); + else + hpet_address = 0; + } if ( !hpet_address ) printk("Disabling HPET for being unreliable\n"); diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 90c0589cd6..ab68ef2681 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -46,6 +46,13 @@ #define MSR_CORE_CAPABILITIES 0x000000cf #define CORE_CAPS_SPLITLOCK_DETECT (_AC(1, ULL) << 5) +#define MSR_PKG_CST_CONFIG_CONTROL 0x000000e2 +#define NHM_C3_AUTO_DEMOTE (_AC(1, ULL) << 25) +#define NHM_C1_AUTO_DEMOTE (_AC(1, ULL) << 26) +#define ATM_LNC_C6_AUTO_DEMOTE (_AC(1, ULL) << 25) +#define SNB_C3_AUTO_UNDEMOTE (_AC(1, ULL) << 27) +#define SNB_C1_AUTO_UNDEMOTE (_AC(1, ULL) << 28) + #define MSR_ARCH_CAPABILITIES 0x0000010a #define ARCH_CAPS_RDCL_NO (_AC(1, ULL) << 0) #define ARCH_CAPS_IBRS_ALL (_AC(1, ULL) << 1) @@ -179,11 +186,6 @@ #define MSR_IA32_A_PERFCTR0 0x000004c1 #define MSR_FSB_FREQ 0x000000cd -#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 -#define NHM_C3_AUTO_DEMOTE (1UL << 25) -#define NHM_C1_AUTO_DEMOTE (1UL << 26) -#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) - #define MSR_MTRRcap 0x000000fe #define MTRRcap_VCNT 0x000000ff diff --git a/xen/include/asm-x86/mwait.h b/xen/include/asm-x86/mwait.h index ba9c0ea096..f377d9fdca 100644 --- a/xen/include/asm-x86/mwait.h +++ b/xen/include/asm-x86/mwait.h @@ -1,6 +1,8 @@ #ifndef __ASM_X86_MWAIT_H__ #define __ASM_X86_MWAIT_H__ +#include + #define MWAIT_SUBSTATE_MASK 0xf #define MWAIT_CSTATE_MASK 0xf #define MWAIT_SUBSTATE_SIZE 4 @@ -12,5 +14,6 @@ #define MWAIT_ECX_INTERRUPT_BREAK 0x1 void mwait_idle_with_hints(unsigned int eax, unsigned int ecx); +bool mwait_pc10_supported(void); #endif /* __ASM_X86_MWAIT_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 21 10:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Oct 2021 10:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.214325.372833 (Exim 4.92) (envelope-from ) id 1mdViz-0000wb-2C; Thu, 21 Oct 2021 10:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 214325.372833; Thu, 21 Oct 2021 10:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdViy-0000wL-Uw; Thu, 21 Oct 2021 10:55:04 +0000 Received: by outflank-mailman (input) for mailman id 214325; Thu, 21 Oct 2021 10:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdViy-0000w2-AO for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 10:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdViy-0006mV-9g for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 10:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mdViy-0005N9-8t for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 10:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lt9M8QVl4Eermiw+uGoNWurrVs39ZMAV3THhCT//hPc=; b=aq/SVH1EttdJ1xhBsNEIPh30Ym BrPDcb/48I7KYut65if89F5FMuHVb55FBe0Eq6cLfuVqXllU+1UoH6j++5loJ04sBYtseKcd1nJZ8 KQKGFdd7eCH9UB8SXyLJYURZ23BmP02u9NEm9YC/JDU8Zi3oUW+8Fg010Iq79vGZAlZY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstored: Ignore domain we were unable to restore Message-Id: Date: Thu, 21 Oct 2021 10:55:04 +0000 commit 98f60e5de00baf650c574c9352bb19aedb082dea Author: Julien Grall AuthorDate: Wed Oct 20 14:45:19 2021 +0000 Commit: Ian Jackson CommitDate: Thu Oct 21 11:52:12 2021 +0100 tools/xenstored: Ignore domain we were unable to restore Commit 939775cfd3 "handle dying domains in live update" was meant to handle gracefully dying domain. However, the @releaseDomain watch will end up to be sent as soon as we finished to restore Xenstored state. This may be before Xen reports the domain to be dying (such as if the guest decided to revoke access to the xenstore page). Consequently daemon like xenconsoled will not clean-up the domain and it will be left as a zombie. To avoid the problem, mark the connection as ignored. This also requires to tweak conn_can_write() and conn_can_read() to prevent dereferencing a NULL pointer (the interface will not mapped). The check conn->is_ignored was originally added after the callbacks because the helpers for a socket connection may close the fd. However, ignore_connection() will close a socket connection directly. So it is fine to do the re-order. Signed-off-by: Julien Grall Release-Acked-by: Ian Jackson Reviewed-by: Juergen Gross Reviewed-by: Luca Fancellu --- tools/xenstore/xenstored_core.c | 8 ++++---- tools/xenstore/xenstored_core.h | 1 + tools/xenstore/xenstored_domain.c | 21 ++++++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 0d4c73d6e2..91d093a12e 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -338,10 +338,10 @@ static int destroy_conn(void *_conn) static bool conn_can_read(struct connection *conn) { - if (!conn->funcs->can_read(conn)) + if (conn->is_ignored) return false; - if (conn->is_ignored) + if (!conn->funcs->can_read(conn)) return false; /* @@ -356,7 +356,7 @@ static bool conn_can_read(struct connection *conn) static bool conn_can_write(struct connection *conn) { - return conn->funcs->can_write(conn) && !conn->is_ignored; + return !conn->is_ignored && conn->funcs->can_write(conn); } /* This function returns index inside the array if succeed, -1 if fail */ @@ -1466,7 +1466,7 @@ static struct { * * All watches, transactions, buffers will be freed. */ -static void ignore_connection(struct connection *conn) +void ignore_connection(struct connection *conn) { struct buffered_data *out, *tmp; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 258f6ff382..07d861d924 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -206,6 +206,7 @@ struct node *read_node(struct connection *conn, const void *ctx, struct connection *new_connection(const struct interface_funcs *funcs); struct connection *get_connection_by_id(unsigned int conn_id); +void ignore_connection(struct connection *conn); void check_store(void); void corrupt(struct connection *conn, const char *fmt, ...); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 47e9107c14..d03c7d93a9 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -268,14 +268,7 @@ void check_domains(void) domain->shutdown = true; notify = 1; } - /* - * On Restore, we may have been unable to remap the - * interface and the port. As we don't know whether - * this was because of a dying domain, we need to - * check if the interface and port are still valid. - */ - if (!dominfo.dying && domain->port && - domain->interface) + if (!dominfo.dying) continue; } if (domain->conn) { @@ -1303,6 +1296,17 @@ void read_state_connection(const void *ctx, const void *state) if (!domain) barf("domain allocation error"); + conn = domain->conn; + + /* + * We may not have been able to restore the domain (for + * instance because it revoked the Xenstore grant). We need + * to keep it around to send @releaseDomain when it is + * dead. So mark it as ignored. + */ + if (!domain->port || !domain->interface) + ignore_connection(conn); + if (sc->spec.ring.tdomid != DOMID_INVALID) { tdomain = find_or_alloc_domain(ctx, sc->spec.ring.tdomid); @@ -1311,7 +1315,6 @@ void read_state_connection(const void *ctx, const void *state) talloc_reference(domain->conn, tdomain->conn); domain->conn->target = tdomain->conn; } - conn = domain->conn; } conn->conn_id = sc->conn_id; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 21 14:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Oct 2021 14:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.214488.373045 (Exim 4.92) (envelope-from ) id 1mdZIZ-0006LU-PD; Thu, 21 Oct 2021 14:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 214488.373045; Thu, 21 Oct 2021 14:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdZIZ-0006LM-MJ; Thu, 21 Oct 2021 14:44:03 +0000 Received: by outflank-mailman (input) for mailman id 214488; Thu, 21 Oct 2021 14:44:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdZIX-0006LG-Ry for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 14:44:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdZIX-0002fc-PX for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 14:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mdZIX-0000U8-OS for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 14:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=J9JoBt0NghxvyBwxsonIpS1Bm4cqyY2AntYY3VUyXlU=; b=BY7ijwduJfLYLnALbnbpavXJME UlFnmxMlUufROLwdJ9TJilZ3C7nCqAqWPAgXO7oMfjYPrKI6138M46vLNa8q41nBwPwkqpHA0SdWC oK503SLHCaPCd4Qq5arBBfSGPDGQlupnY/BFFcQTrL6fRZCbFTCUTetRa28b3kAOWnRE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/pci: Install vpci handlers on x86 and fix error paths Message-Id: Date: Thu, 21 Oct 2021 14:44:01 +0000 commit 118da371d1ff5d8432fa299544b1ea5e7e3710f0 Author: Bertrand Marquis AuthorDate: Wed Oct 20 17:22:52 2021 +0200 Commit: Jan Beulich CommitDate: Wed Oct 20 17:22:52 2021 +0200 xen/pci: Install vpci handlers on x86 and fix error paths Xen might not be able to discover at boot time all devices or some devices might appear after specific actions from dom0. In this case dom0 can use the PHYSDEVOP_pci_device_add to signal some PCI devices to Xen. As those devices where not known from Xen before, the vpci handlers must be properly installed during pci_device_add for x86 PVH Dom0, in the same way as what is done currently on arm (where Xen does not detect PCI devices but relies on Dom0 to declare them all the time). So this patch is removing the ifdef protecting the call to vpci_add_handlers and the comment which was arm specific. vpci_add_handlers is called on during pci_device_add which can be called at runtime through hypercall physdev_op. Remove __hwdom_init as the call is not limited anymore to hardware domain init and fix linker script to only keep vpci_array in rodata section. Add missing vpci handlers cleanup during pci_device_remove and in case of error with iommu during pci_device_add. Move code adding the domain to the pdev domain_list as vpci_add_handlers needs this to be set and remove it from the list in the error path. Exit early of vpci_remove_device if the domain has no vpci support. Add empty static inline for vpci_remove_device when CONFIG_VPCI is not defined. Add an ASSERT in vpci_add_handlers to check that the function is not called twice for the same device. Fixes: d59168dc05 ("xen/arm: Enable the existing x86 virtual PCI support for ARM") Suggested-by: Jan Beulich Signed-off-by: Bertrand Marquis Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/xen.lds.S | 9 +-------- xen/arch/x86/xen.lds.S | 9 +-------- xen/drivers/passthrough/pci.c | 14 ++++++++------ xen/drivers/vpci/vpci.c | 8 +++++++- xen/include/xen/vpci.h | 2 ++ 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index b773f91f1c..08016948ab 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -60,7 +60,7 @@ SECTIONS *(.proc.info) __proc_info_end = .; -#if defined(CONFIG_HAS_VPCI) && defined(CONFIG_LATE_HWDOM) +#ifdef CONFIG_HAS_VPCI . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; *(SORT(.data.vpci.*)) @@ -189,13 +189,6 @@ SECTIONS *(.init_array) *(SORT(.init_array.*)) __ctors_end = .; - -#if defined(CONFIG_HAS_VPCI) && !defined(CONFIG_LATE_HWDOM) - . = ALIGN(POINTER_ALIGN); - __start_vpci_array = .; - *(SORT(.data.vpci.*)) - __end_vpci_array = .; -#endif } :text __init_end_efi = .; . = ALIGN(STACK_SIZE); diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 11b1da2154..87e344d4dd 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -134,7 +134,7 @@ SECTIONS *(.ex_table.pre) __stop___pre_ex_table = .; -#if defined(CONFIG_HAS_VPCI) && defined(CONFIG_LATE_HWDOM) +#ifdef CONFIG_HAS_VPCI . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; *(SORT(.data.vpci.*)) @@ -247,13 +247,6 @@ SECTIONS *(.init_array) *(SORT(.init_array.*)) __ctors_end = .; - -#if defined(CONFIG_HAS_VPCI) && !defined(CONFIG_LATE_HWDOM) - . = ALIGN(POINTER_ALIGN); - __start_vpci_array = .; - *(SORT(.data.vpci.*)) - __end_vpci_array = .; -#endif } PHDR(text) . = ALIGN(SECTION_ALIGN); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 35e0190796..0d8ab2e716 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -756,27 +756,28 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, if ( !pdev->domain ) { pdev->domain = hardware_domain; -#ifdef CONFIG_ARM + list_add(&pdev->domain_list, &hardware_domain->pdev_list); + /* - * On ARM PCI devices discovery will be done by Dom0. Add vpci handler - * when Dom0 inform XEN to add the PCI devices in XEN. + * For devices not discovered by Xen during boot, add vPCI handlers + * when Dom0 first informs Xen about such devices. */ ret = vpci_add_handlers(pdev); if ( ret ) { printk(XENLOG_ERR "Setup of vPCI failed: %d\n", ret); + list_del(&pdev->domain_list); pdev->domain = NULL; goto out; } -#endif ret = iommu_add_device(pdev); if ( ret ) { + vpci_remove_device(pdev); + list_del(&pdev->domain_list); pdev->domain = NULL; goto out; } - - list_add(&pdev->domain_list, &hardware_domain->pdev_list); } else iommu_enable_device(pdev); @@ -819,6 +820,7 @@ int pci_remove_device(u16 seg, u8 bus, u8 devfn) list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list ) if ( pdev->bus == bus && pdev->devfn == devfn ) { + vpci_remove_device(pdev); pci_cleanup_msi(pdev); ret = iommu_remove_device(pdev); if ( pdev->domain ) diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index decf7d87a1..657697fe34 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -37,6 +37,9 @@ extern vpci_register_init_t *const __end_vpci_array[]; void vpci_remove_device(struct pci_dev *pdev) { + if ( !has_vpci(pdev->domain) ) + return; + spin_lock(&pdev->vpci->lock); while ( !list_empty(&pdev->vpci->handlers) ) { @@ -54,7 +57,7 @@ void vpci_remove_device(struct pci_dev *pdev) pdev->vpci = NULL; } -int __hwdom_init vpci_add_handlers(struct pci_dev *pdev) +int vpci_add_handlers(struct pci_dev *pdev) { unsigned int i; int rc = 0; @@ -62,6 +65,9 @@ int __hwdom_init vpci_add_handlers(struct pci_dev *pdev) if ( !has_vpci(pdev->domain) ) return 0; + /* We should not get here twice for the same device. */ + ASSERT(!pdev->vpci); + pdev->vpci = xzalloc(struct vpci); if ( !pdev->vpci ) return -ENOMEM; diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 6746c2589a..9ea66e033f 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -230,6 +230,8 @@ static inline int vpci_add_handlers(struct pci_dev *pdev) return 0; } +static inline void vpci_remove_device(struct pci_dev *pdev) { } + static inline void vpci_dump_msi(void) { } static inline uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Oct 21 17:22:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Oct 2021 17:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.214547.373130 (Exim 4.92) (envelope-from ) id 1mdblV-0007Ox-N8; Thu, 21 Oct 2021 17:22:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 214547.373130; Thu, 21 Oct 2021 17:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdblV-0007Op-KC; Thu, 21 Oct 2021 17:22:05 +0000 Received: by outflank-mailman (input) for mailman id 214547; Thu, 21 Oct 2021 17:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdblU-0007Oj-Mv for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 17:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdblU-0005qB-Gm for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 17:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mdblU-0000Iu-Fj for xen-changelog@lists.xenproject.org; Thu, 21 Oct 2021 17:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=g33i+VFsoxBiO37ehOKRH33TKjQkRaIw3svy9Gqz2rk=; b=gCZF+ezNvYvyXC7LxK3+u5p6r8 JMPbHqN63s0bRA1kuRTtiJ6DDhbxLDVixS0fMc4q6l526wUe3xCNq1i0SzWBTyLLfOaBdvU1Pchzh dXBTSq2AuLhJb1imHvfjnjx99snejNy98tAaY1DT00TXXW1fbON47ItwMgv0Ht/lYHVM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: vgic: Ignore write access to ICPENDR* Message-Id: Date: Thu, 21 Oct 2021 17:22:04 +0000 commit 23ec1ebc8acbfd2bf06f6085a776f0db923f9fa9 Author: Hongda Deng AuthorDate: Thu Oct 21 20:03:19 2021 +0800 Commit: Julien Grall CommitDate: Thu Oct 21 17:12:53 2021 +0000 xen/arm: vgic: Ignore write access to ICPENDR* Currently, Xen will return IO unhandled when guests write ICPENDR* virtual registers, which will raise a data abort inside the guest. For Linux guest, these virtual registers will not be accessed. But for Zephyr, these virtual registers will be accessed during the initialization. Zephyr guest will get an IO data abort and crash. Emulating ICPENDR is not easy with the existing vGIC, this patch reworks the emulation to ignore write access to ICPENDR* virtual registers and print a message about whether they are already pending instead of returning unhandled. More details can be found at [1]. [1] https://github.com/zephyrproject-rtos/zephyr/blob/eaf6cf745df3807e6e cc941c3a30de6c179ae359/drivers/interrupt_controller/intc_gicv3.c#L274 Signed-off-by: Hongda Deng Release-Acked-by: Ian Jackson Reviewed-by: Julien Grall --- xen/arch/arm/vgic-v2.c | 10 ++++++---- xen/arch/arm/vgic-v3.c | 17 ++++++++--------- xen/arch/arm/vgic.c | 28 ++++++++++++++++++++++++++++ xen/include/asm-arm/vgic.h | 2 ++ 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index b2da886adc..589c033eda 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -481,10 +481,12 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info, case VRANGE32(GICD_ICPENDR, GICD_ICPENDRN): if ( dabt.size != DABT_WORD ) goto bad_width; - printk(XENLOG_G_ERR - "%pv: vGICD: unhandled word write %#"PRIregister" to ICPENDR%d\n", - v, r, gicd_reg - GICD_ICPENDR); - return 0; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + + vgic_check_inflight_irqs_pending(v->domain, v, rank->index, r); + + goto write_ignore; case VRANGE32(GICD_ISACTIVER, GICD_ISACTIVERN): if ( dabt.size != DABT_WORD ) goto bad_width; diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index cb5a70c42e..65bb7991a6 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -817,10 +817,12 @@ static int __vgic_v3_distr_common_mmio_write(const char *name, struct vcpu *v, case VRANGE32(GICD_ICPENDR, GICD_ICPENDRN): if ( dabt.size != DABT_WORD ) goto bad_width; - printk(XENLOG_G_ERR - "%pv: %s: unhandled word write %#"PRIregister" to ICPENDR%d\n", - v, name, r, reg - GICD_ICPENDR); - return 0; + rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + + vgic_check_inflight_irqs_pending(v->domain, v, rank->index, r); + + goto write_ignore; case VRANGE32(GICD_ISACTIVER, GICD_ISACTIVERN): if ( dabt.size != DABT_WORD ) goto bad_width; @@ -986,11 +988,8 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, info, gicr_reg, r); case VREG32(GICR_ICPENDR0): - if ( dabt.size != DABT_WORD ) goto bad_width; - printk(XENLOG_G_ERR - "%pv: vGICR: SGI: unhandled word write %#"PRIregister" to ICPENDR0\n", - v, r); - return 0; + return __vgic_v3_distr_common_mmio_write("vGICR: SGI", v, + info, gicr_reg, r); case VREG32(GICR_IGRPMODR0): /* We do not implement security extensions for guests, write ignore */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 8f9400a519..83386cf3d5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -726,6 +726,34 @@ unsigned int vgic_max_vcpus(unsigned int domctl_vgic_version) } } +void vgic_check_inflight_irqs_pending(struct domain *d, struct vcpu *v, + unsigned int rank, uint32_t r) +{ + const unsigned long mask = r; + unsigned int i; + + for_each_set_bit( i, &mask, 32 ) + { + struct pending_irq *p; + struct vcpu *v_target; + unsigned long flags; + unsigned int irq = i + 32 * rank; + + v_target = vgic_get_target_vcpu(v, irq); + + spin_lock_irqsave(&v_target->arch.vgic.lock, flags); + + p = irq_to_pending(v_target, irq); + + if ( p && !list_empty(&p->inflight) ) + printk(XENLOG_G_WARNING + "%pv trying to clear pending interrupt %u.\n", + v, irq); + + spin_unlock_irqrestore(&v_target->arch.vgic.lock, flags); + } +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 62c2ae538d..e69a59063a 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -298,6 +298,8 @@ extern bool vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq, const struct sgi_target *target); extern bool vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq); +extern void vgic_check_inflight_irqs_pending(struct domain *d, struct vcpu *v, + unsigned int rank, uint32_t r); #endif /* !CONFIG_NEW_VGIC */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Oct 22 09:22:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Oct 2021 09:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.214880.373699 (Exim 4.92) (envelope-from ) id 1mdqkU-00033k-MA; Fri, 22 Oct 2021 09:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 214880.373699; Fri, 22 Oct 2021 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 1mdqkU-00033c-J1; Fri, 22 Oct 2021 09:22:02 +0000 Received: by outflank-mailman (input) for mailman id 214880; Fri, 22 Oct 2021 09:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdqkU-00033W-2L for xen-changelog@lists.xenproject.org; Fri, 22 Oct 2021 09:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdqkT-0000Ra-W4 for xen-changelog@lists.xenproject.org; Fri, 22 Oct 2021 09:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mdqkT-0001Qx-V3 for xen-changelog@lists.xenproject.org; Fri, 22 Oct 2021 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=vU9boLxcvyDbbsIi/ZHn02tLD2lhPRpVoOaIdTEPJjs=; b=k3v4b2iyzKr1AWFBjbgMctQHQs 8tKzg0TBpqKywU+DpwECEhX3b7JCiEUUFhtf6mTsKw5Hdic/MZAF8bOK+hOJUAILjBORD3UTIFQYF qqu2hYZmY6wjiQ2lFeXA7N7kj1VyznvASAbxx+8Lygk6PrCn8j1lHPHtElqzZgC5QhE4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Ignore domain we were unable to restore Message-Id: Date: Fri, 22 Oct 2021 09:22:01 +0000 commit 98f60e5de00baf650c574c9352bb19aedb082dea Author: Julien Grall AuthorDate: Wed Oct 20 14:45:19 2021 +0000 Commit: Ian Jackson CommitDate: Thu Oct 21 11:52:12 2021 +0100 tools/xenstored: Ignore domain we were unable to restore Commit 939775cfd3 "handle dying domains in live update" was meant to handle gracefully dying domain. However, the @releaseDomain watch will end up to be sent as soon as we finished to restore Xenstored state. This may be before Xen reports the domain to be dying (such as if the guest decided to revoke access to the xenstore page). Consequently daemon like xenconsoled will not clean-up the domain and it will be left as a zombie. To avoid the problem, mark the connection as ignored. This also requires to tweak conn_can_write() and conn_can_read() to prevent dereferencing a NULL pointer (the interface will not mapped). The check conn->is_ignored was originally added after the callbacks because the helpers for a socket connection may close the fd. However, ignore_connection() will close a socket connection directly. So it is fine to do the re-order. Signed-off-by: Julien Grall Release-Acked-by: Ian Jackson Reviewed-by: Juergen Gross Reviewed-by: Luca Fancellu --- tools/xenstore/xenstored_core.c | 8 ++++---- tools/xenstore/xenstored_core.h | 1 + tools/xenstore/xenstored_domain.c | 21 ++++++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 0d4c73d6e2..91d093a12e 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -338,10 +338,10 @@ static int destroy_conn(void *_conn) static bool conn_can_read(struct connection *conn) { - if (!conn->funcs->can_read(conn)) + if (conn->is_ignored) return false; - if (conn->is_ignored) + if (!conn->funcs->can_read(conn)) return false; /* @@ -356,7 +356,7 @@ static bool conn_can_read(struct connection *conn) static bool conn_can_write(struct connection *conn) { - return conn->funcs->can_write(conn) && !conn->is_ignored; + return !conn->is_ignored && conn->funcs->can_write(conn); } /* This function returns index inside the array if succeed, -1 if fail */ @@ -1466,7 +1466,7 @@ static struct { * * All watches, transactions, buffers will be freed. */ -static void ignore_connection(struct connection *conn) +void ignore_connection(struct connection *conn) { struct buffered_data *out, *tmp; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 258f6ff382..07d861d924 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -206,6 +206,7 @@ struct node *read_node(struct connection *conn, const void *ctx, struct connection *new_connection(const struct interface_funcs *funcs); struct connection *get_connection_by_id(unsigned int conn_id); +void ignore_connection(struct connection *conn); void check_store(void); void corrupt(struct connection *conn, const char *fmt, ...); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 47e9107c14..d03c7d93a9 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -268,14 +268,7 @@ void check_domains(void) domain->shutdown = true; notify = 1; } - /* - * On Restore, we may have been unable to remap the - * interface and the port. As we don't know whether - * this was because of a dying domain, we need to - * check if the interface and port are still valid. - */ - if (!dominfo.dying && domain->port && - domain->interface) + if (!dominfo.dying) continue; } if (domain->conn) { @@ -1303,6 +1296,17 @@ void read_state_connection(const void *ctx, const void *state) if (!domain) barf("domain allocation error"); + conn = domain->conn; + + /* + * We may not have been able to restore the domain (for + * instance because it revoked the Xenstore grant). We need + * to keep it around to send @releaseDomain when it is + * dead. So mark it as ignored. + */ + if (!domain->port || !domain->interface) + ignore_connection(conn); + if (sc->spec.ring.tdomid != DOMID_INVALID) { tdomain = find_or_alloc_domain(ctx, sc->spec.ring.tdomid); @@ -1311,7 +1315,6 @@ void read_state_connection(const void *ctx, const void *state) talloc_reference(domain->conn, tdomain->conn); domain->conn->target = tdomain->conn; } - conn = domain->conn; } conn->conn_id = sc->conn_id; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 22 12:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Oct 2021 12:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.215038.373965 (Exim 4.92) (envelope-from ) id 1mdtO2-0003Fe-Tf; Fri, 22 Oct 2021 12:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 215038.373965; Fri, 22 Oct 2021 12:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdtO2-0003FW-Qj; Fri, 22 Oct 2021 12:11:02 +0000 Received: by outflank-mailman (input) for mailman id 215038; Fri, 22 Oct 2021 12:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdtO2-0003FQ-66 for xen-changelog@lists.xenproject.org; Fri, 22 Oct 2021 12:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdtO2-0003UV-5R for xen-changelog@lists.xenproject.org; Fri, 22 Oct 2021 12:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mdtO2-0005ke-4Q for xen-changelog@lists.xenproject.org; Fri, 22 Oct 2021 12: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=w4KSGmrxb1cxJiIUgCBgNoJy/J0hCmgg5X4eUqTN3iI=; b=VoViwYnNosimyDkq+9XkC/74Xy EKynfr1LGZkfQpUqC4mB+yoOfKBh9fOjsN/jV+y3ZftOM3niilPCZAhiG6Jo56+yo5ChTQM/ID1Hv 5JrC1731omQnXF82PghlsfbgNVt4IUrt8498zM1YekI9LXsUtbbiheps8JclVBdFYtEo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: vgic: Ignore write access to ICPENDR* Message-Id: Date: Fri, 22 Oct 2021 12:11:02 +0000 commit 23ec1ebc8acbfd2bf06f6085a776f0db923f9fa9 Author: Hongda Deng AuthorDate: Thu Oct 21 20:03:19 2021 +0800 Commit: Julien Grall CommitDate: Thu Oct 21 17:12:53 2021 +0000 xen/arm: vgic: Ignore write access to ICPENDR* Currently, Xen will return IO unhandled when guests write ICPENDR* virtual registers, which will raise a data abort inside the guest. For Linux guest, these virtual registers will not be accessed. But for Zephyr, these virtual registers will be accessed during the initialization. Zephyr guest will get an IO data abort and crash. Emulating ICPENDR is not easy with the existing vGIC, this patch reworks the emulation to ignore write access to ICPENDR* virtual registers and print a message about whether they are already pending instead of returning unhandled. More details can be found at [1]. [1] https://github.com/zephyrproject-rtos/zephyr/blob/eaf6cf745df3807e6e cc941c3a30de6c179ae359/drivers/interrupt_controller/intc_gicv3.c#L274 Signed-off-by: Hongda Deng Release-Acked-by: Ian Jackson Reviewed-by: Julien Grall --- xen/arch/arm/vgic-v2.c | 10 ++++++---- xen/arch/arm/vgic-v3.c | 17 ++++++++--------- xen/arch/arm/vgic.c | 28 ++++++++++++++++++++++++++++ xen/include/asm-arm/vgic.h | 2 ++ 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index b2da886adc..589c033eda 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -481,10 +481,12 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info, case VRANGE32(GICD_ICPENDR, GICD_ICPENDRN): if ( dabt.size != DABT_WORD ) goto bad_width; - printk(XENLOG_G_ERR - "%pv: vGICD: unhandled word write %#"PRIregister" to ICPENDR%d\n", - v, r, gicd_reg - GICD_ICPENDR); - return 0; + rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + + vgic_check_inflight_irqs_pending(v->domain, v, rank->index, r); + + goto write_ignore; case VRANGE32(GICD_ISACTIVER, GICD_ISACTIVERN): if ( dabt.size != DABT_WORD ) goto bad_width; diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index cb5a70c42e..65bb7991a6 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -817,10 +817,12 @@ static int __vgic_v3_distr_common_mmio_write(const char *name, struct vcpu *v, case VRANGE32(GICD_ICPENDR, GICD_ICPENDRN): if ( dabt.size != DABT_WORD ) goto bad_width; - printk(XENLOG_G_ERR - "%pv: %s: unhandled word write %#"PRIregister" to ICPENDR%d\n", - v, name, r, reg - GICD_ICPENDR); - return 0; + rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + + vgic_check_inflight_irqs_pending(v->domain, v, rank->index, r); + + goto write_ignore; case VRANGE32(GICD_ISACTIVER, GICD_ISACTIVERN): if ( dabt.size != DABT_WORD ) goto bad_width; @@ -986,11 +988,8 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, info, gicr_reg, r); case VREG32(GICR_ICPENDR0): - if ( dabt.size != DABT_WORD ) goto bad_width; - printk(XENLOG_G_ERR - "%pv: vGICR: SGI: unhandled word write %#"PRIregister" to ICPENDR0\n", - v, r); - return 0; + return __vgic_v3_distr_common_mmio_write("vGICR: SGI", v, + info, gicr_reg, r); case VREG32(GICR_IGRPMODR0): /* We do not implement security extensions for guests, write ignore */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 8f9400a519..83386cf3d5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -726,6 +726,34 @@ unsigned int vgic_max_vcpus(unsigned int domctl_vgic_version) } } +void vgic_check_inflight_irqs_pending(struct domain *d, struct vcpu *v, + unsigned int rank, uint32_t r) +{ + const unsigned long mask = r; + unsigned int i; + + for_each_set_bit( i, &mask, 32 ) + { + struct pending_irq *p; + struct vcpu *v_target; + unsigned long flags; + unsigned int irq = i + 32 * rank; + + v_target = vgic_get_target_vcpu(v, irq); + + spin_lock_irqsave(&v_target->arch.vgic.lock, flags); + + p = irq_to_pending(v_target, irq); + + if ( p && !list_empty(&p->inflight) ) + printk(XENLOG_G_WARNING + "%pv trying to clear pending interrupt %u.\n", + v, irq); + + spin_unlock_irqrestore(&v_target->arch.vgic.lock, flags); + } +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 62c2ae538d..e69a59063a 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -298,6 +298,8 @@ extern bool vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq, const struct sgi_target *target); extern bool vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq); +extern void vgic_check_inflight_irqs_pending(struct domain *d, struct vcpu *v, + unsigned int rank, uint32_t r); #endif /* !CONFIG_NEW_VGIC */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Oct 25 15:44:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 Oct 2021 15:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.215925.375353 (Exim 4.92) (envelope-from ) id 1mf28s-0007NS-Dp; Mon, 25 Oct 2021 15:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 215925.375353; Mon, 25 Oct 2021 15:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mf28s-0007NJ-Ab; Mon, 25 Oct 2021 15:44:06 +0000 Received: by outflank-mailman (input) for mailman id 215925; Mon, 25 Oct 2021 15:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mf28q-0007NB-Vd for xen-changelog@lists.xenproject.org; Mon, 25 Oct 2021 15:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mf28q-0008DR-Us for xen-changelog@lists.xenproject.org; Mon, 25 Oct 2021 15:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mf28q-0003HH-U5 for xen-changelog@lists.xenproject.org; Mon, 25 Oct 2021 15:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gwychaXBHnYkkq/CEqueWJSXYDrmDYmvIHxpAvjXUzg=; b=bgcCsKxKMUrj4k/3JVz9yael3e uEs0mBDuq69ouQcuIFUh0ob69vbtIgKKmPFDnYOtioadJ56Tx0b2XqFcnrsGHb/MkpwNK9LY7ya2y R21vuPo12FD38vEC7KuORIUZTwIgHb08qwkqDSnbxu9B0XL4S7kILxYIDPblNLnYZQsw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: actually build with clang for ubuntu-focal-clang* jobs Message-Id: Date: Mon, 25 Oct 2021 15:44:04 +0000 commit b0fce57a6a491c120f2554ad7cc9a0c43ee5defa Author: Anthony PERARD AuthorDate: Fri Oct 22 17:36:44 2021 +0100 Commit: Ian Jackson CommitDate: Mon Oct 25 16:40:49 2021 +0100 automation: actually build with clang for ubuntu-focal-clang* jobs Signed-off-by: Anthony PERARD Release-Acked-by: Ian Jackson Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d177da1710..08a43146ab 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -429,12 +429,12 @@ ubuntu-focal-gcc-debug: CONTAINER: ubuntu:focal ubuntu-focal-clang: - extends: .gcc-x86-64-build + extends: .clang-x86-64-build variables: CONTAINER: ubuntu:focal ubuntu-focal-clang-debug: - extends: .gcc-x86-64-build-debug + extends: .clang-x86-64-build-debug variables: CONTAINER: ubuntu:focal -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Oct 26 08:44:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 Oct 2021 08:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.216300.375843 (Exim 4.92) (envelope-from ) id 1mfI3v-0006sX-7Z; Tue, 26 Oct 2021 08:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 216300.375843; Tue, 26 Oct 2021 08:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfI3v-0006sP-4n; Tue, 26 Oct 2021 08:44:03 +0000 Received: by outflank-mailman (input) for mailman id 216300; Tue, 26 Oct 2021 08:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfI3u-0006sJ-Ez for xen-changelog@lists.xenproject.org; Tue, 26 Oct 2021 08:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfI3u-0004ZN-9R for xen-changelog@lists.xenproject.org; Tue, 26 Oct 2021 08:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mfI3u-0005yg-8M for xen-changelog@lists.xenproject.org; Tue, 26 Oct 2021 08: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=z2+7pNhG+A4hR3sFwmnesiYuqBrb+Kzi4F650kDSQpc=; b=eSvvH+4Jwwp5jJidxZt9Vk0JGA v914Y8PXyfQLPVAlvoMQpAC0Xn+9uMQXQq0p+/iB+JooI5X0f7JYFe7EMPmX72whuxIUE/419+XcC 3RI3cIghNAPUOZJgMGPW1klK775PbuZgTQNNIzSaYGC0OwVXmNvrYT1+Y88+73tZ9akA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: actually build with clang for ubuntu-focal-clang* jobs Message-Id: Date: Tue, 26 Oct 2021 08:44:02 +0000 commit b0fce57a6a491c120f2554ad7cc9a0c43ee5defa Author: Anthony PERARD AuthorDate: Fri Oct 22 17:36:44 2021 +0100 Commit: Ian Jackson CommitDate: Mon Oct 25 16:40:49 2021 +0100 automation: actually build with clang for ubuntu-focal-clang* jobs Signed-off-by: Anthony PERARD Release-Acked-by: Ian Jackson Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d177da1710..08a43146ab 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -429,12 +429,12 @@ ubuntu-focal-gcc-debug: CONTAINER: ubuntu:focal ubuntu-focal-clang: - extends: .gcc-x86-64-build + extends: .clang-x86-64-build variables: CONTAINER: ubuntu:focal ubuntu-focal-clang-debug: - extends: .gcc-x86-64-build-debug + extends: .clang-x86-64-build-debug variables: CONTAINER: ubuntu:focal -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Oct 27 16:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 Oct 2021 16:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.217113.376959 (Exim 4.92) (envelope-from ) id 1mfm21-00028L-57; Wed, 27 Oct 2021 16:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 217113.376959; Wed, 27 Oct 2021 16:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfm21-00028D-22; Wed, 27 Oct 2021 16:44:05 +0000 Received: by outflank-mailman (input) for mailman id 217113; Wed, 27 Oct 2021 16:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfm20-000287-Fc for xen-changelog@lists.xenproject.org; Wed, 27 Oct 2021 16:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfm20-0008DQ-Cr for xen-changelog@lists.xenproject.org; Wed, 27 Oct 2021 16:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mfm20-00037D-BX for xen-changelog@lists.xenproject.org; Wed, 27 Oct 2021 16:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=03ZEN41gW6kSF6saHOO8G+0xK8v3j/LdUSF77T7q7PY=; b=O4uzwtEUbeCu1GIYfw1y46OUCv zttbOh29I97201bJmimF7dStVp9P0RIf7keZZN5Y2pTmyVRj9dfTyafT/ywVQh7sHuqyxCjAGtTMe OkokcODvllmaoEOIgSQC+V0xcvfvCbJwhabXGufLneOs03OTIMC32lcttTV86v7Y/0ZY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/hpet: setup HPET even when disabled due to stopping in deep C states Message-Id: Date: Wed, 27 Oct 2021 16:44:04 +0000 commit c91c967f329f866b1826b04e73e32aea936930cd Author: Roger Pau Monne AuthorDate: Tue Oct 26 17:12:33 2021 +0200 Commit: Andrew Cooper CommitDate: Wed Oct 27 16:13:40 2021 +0100 x86/hpet: setup HPET even when disabled due to stopping in deep C states Always allow the HPET to be setup, but don't report a frequency back to the platform time source probe in order to avoid it from being selected as a valid timer if it's not usable. Doing the setup even when not intended to be used as a platform timer is required so that is can be used in legacy replacement mode in order to assert the IO-APIC is capable of receiving interrupts. Fixes: c12731493a ('x86/hpet: Use another crystalball to evaluate HPET usability') Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Tested-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/time.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index cbadaa036f..a290aba3e8 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -379,6 +379,12 @@ static int64_t __init init_hpet(struct platform_timesource *pts) { uint64_t hpet_rate, start; uint32_t count, target; + /* + * Allow HPET to be setup, but report a frequency of 0 so it's not selected + * as a timer source. This is required so it can be used in legacy + * replacement mode in check_timer. + */ + bool disable_hpet = false; if ( hpet_address && strcmp(opt_clocksource, pts->id) && cpuidle_using_deep_cstate() ) @@ -391,7 +397,7 @@ static int64_t __init init_hpet(struct platform_timesource *pts) case 0x0f1c: /* HPET on Cherry Trail platforms will halt in deep C states. */ case 0x229c: - hpet_address = 0; + disable_hpet = true; break; } @@ -431,14 +437,14 @@ static int64_t __init init_hpet(struct platform_timesource *pts) else if ( !strcmp(opt_clocksource, pts->id) ) printk("HPET use requested via command line, but dysfunctional in PC10\n"); else - hpet_address = 0; + disable_hpet = true; } - if ( !hpet_address ) + if ( disable_hpet ) printk("Disabling HPET for being unreliable\n"); } - if ( (hpet_rate = hpet_setup()) == 0 ) + if ( (hpet_rate = hpet_setup()) == 0 || disable_hpet ) return 0; pts->frequency = hpet_rate; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Oct 28 12:11:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 Oct 2021 12:11:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.217953.378197 (Exim 4.92) (envelope-from ) id 1mg4FL-0002XT-BD; Thu, 28 Oct 2021 12:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 217953.378197; Thu, 28 Oct 2021 12:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mg4FL-0002XK-85; Thu, 28 Oct 2021 12:11:03 +0000 Received: by outflank-mailman (input) for mailman id 217953; Thu, 28 Oct 2021 12:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mg4FJ-0002Wx-VP for xen-changelog@lists.xenproject.org; Thu, 28 Oct 2021 12:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mg4FJ-0006rC-Tf for xen-changelog@lists.xenproject.org; Thu, 28 Oct 2021 12:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mg4FJ-0005wA-Sd for xen-changelog@lists.xenproject.org; Thu, 28 Oct 2021 12:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Lyoav3df3hKG5UIr4RRZQ/tDPq2GGBdGXRH7d+lzJuQ=; b=s7BFaLlaNSFsp56YzYGHqkvelE 8YVimSgw7W1K37f2KX+aocq79SD6FJOvgt4Q21MgbDl7BQTvGJVnxYZLGgVol9X64YtbVPD0KLPPY FONvRrDSHt+Hz1mraM10X0MpjhpKdWllbZd3IQWXmMLws1Cn33IhjbJHCEE3IHLbcGuI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hpet: setup HPET even when disabled due to stopping in deep C states Message-Id: Date: Thu, 28 Oct 2021 12:11:01 +0000 commit c91c967f329f866b1826b04e73e32aea936930cd Author: Roger Pau Monne AuthorDate: Tue Oct 26 17:12:33 2021 +0200 Commit: Andrew Cooper CommitDate: Wed Oct 27 16:13:40 2021 +0100 x86/hpet: setup HPET even when disabled due to stopping in deep C states Always allow the HPET to be setup, but don't report a frequency back to the platform time source probe in order to avoid it from being selected as a valid timer if it's not usable. Doing the setup even when not intended to be used as a platform timer is required so that is can be used in legacy replacement mode in order to assert the IO-APIC is capable of receiving interrupts. Fixes: c12731493a ('x86/hpet: Use another crystalball to evaluate HPET usability') Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Tested-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/time.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index cbadaa036f..a290aba3e8 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -379,6 +379,12 @@ static int64_t __init init_hpet(struct platform_timesource *pts) { uint64_t hpet_rate, start; uint32_t count, target; + /* + * Allow HPET to be setup, but report a frequency of 0 so it's not selected + * as a timer source. This is required so it can be used in legacy + * replacement mode in check_timer. + */ + bool disable_hpet = false; if ( hpet_address && strcmp(opt_clocksource, pts->id) && cpuidle_using_deep_cstate() ) @@ -391,7 +397,7 @@ static int64_t __init init_hpet(struct platform_timesource *pts) case 0x0f1c: /* HPET on Cherry Trail platforms will halt in deep C states. */ case 0x229c: - hpet_address = 0; + disable_hpet = true; break; } @@ -431,14 +437,14 @@ static int64_t __init init_hpet(struct platform_timesource *pts) else if ( !strcmp(opt_clocksource, pts->id) ) printk("HPET use requested via command line, but dysfunctional in PC10\n"); else - hpet_address = 0; + disable_hpet = true; } - if ( !hpet_address ) + if ( disable_hpet ) printk("Disabling HPET for being unreliable\n"); } - if ( (hpet_rate = hpet_setup()) == 0 ) + if ( (hpet_rate = hpet_setup()) == 0 || disable_hpet ) return 0; pts->frequency = hpet_rate; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Oct 29 20:33:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 Oct 2021 20:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.218649.379164 (Exim 4.92) (envelope-from ) id 1mgYYj-0000Kk-UV; Fri, 29 Oct 2021 20:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 218649.379164; Fri, 29 Oct 2021 20:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgYYj-0000Kb-RP; Fri, 29 Oct 2021 20:33:05 +0000 Received: by outflank-mailman (input) for mailman id 218649; Fri, 29 Oct 2021 20:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgYYi-0000KV-9Q for xen-changelog@lists.xenproject.org; Fri, 29 Oct 2021 20:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgYYi-0002kP-4m for xen-changelog@lists.xenproject.org; Fri, 29 Oct 2021 20:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mgYYi-0003ew-3c for xen-changelog@lists.xenproject.org; Fri, 29 Oct 2021 20:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Q45xi11VxCjD39yg5pOQz9djk9pQiRYm9/K4X3x6jCg=; b=0XQDhgkxQidzJ0taGh83bvzvd0 ku68XKrL7PGwRFchYpYJkR3wb2ePnwdJSTCzy5ot4gPs7387hmm36avvZ5G47PtKiJZ/5myCIngq0 kCJANjr9BqJe+y7ntiefBcKEPBCvXxxtja1X4Rnuz0JT7yAfWcAo9utv5+zcRbxEvmNo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpuid: prevent decreasing of hypervisor max leaf on migration Message-Id: Date: Fri, 29 Oct 2021 20:33:04 +0000 commit 6f1d6682de832d12b728f856331e700a89737a1e Author: Roger Pau Monne AuthorDate: Wed Oct 27 16:00:50 2021 +0200 Commit: Andrew Cooper CommitDate: Fri Oct 29 17:42:03 2021 +0100 x86/cpuid: prevent decreasing of hypervisor max leaf on migration In order to be compatible with previous Xen versions, and not change max hypervisor leaf as a result of a migration, keep the clamping of the maximum leaf value provided to XEN_CPUID_MAX_NUM_LEAVES, instead of doing it based on the domain type. Also set the default maximum leaf without taking the domain type into account. The maximum hypervisor leaf is not migrated, so we need the default to not regress beyond what might already be reported to a guest by existing Xen versions. This is a partial revert of 540d911c28 and restores the previous behaviour and assures that HVM guests won't see it's maximum hypervisor leaf reduced from 5 to 4 as a result of a migration. Fixes: 540d911c28 ('x86/CPUID: shrink max_{,sub}leaf fields according to actual leaf contents') Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/traps.c | 6 ++---- xen/include/public/arch-x86/cpuid.h | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index a1c2adb7ad..79fd276a41 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1086,15 +1086,13 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, uint32_t leaf, uint32_t base = is_viridian_domain(d) ? 0x40000100 : 0x40000000; uint32_t idx = leaf - base; unsigned int limit = is_viridian_domain(d) ? p->hv2_limit : p->hv_limit; - unsigned int dflt = is_pv_domain(d) ? XEN_CPUID_MAX_PV_NUM_LEAVES - : XEN_CPUID_MAX_HVM_NUM_LEAVES; if ( limit == 0 ) /* Default number of leaves */ - limit = dflt; + limit = XEN_CPUID_MAX_NUM_LEAVES; else /* Clamp toolstack value between 2 and MAX_NUM_LEAVES. */ - limit = min(max(limit, 2u), dflt); + limit = min(max(limit, 2u), XEN_CPUID_MAX_NUM_LEAVES + 0u); if ( idx > limit ) return; diff --git a/xen/include/public/arch-x86/cpuid.h b/xen/include/public/arch-x86/cpuid.h index 00926b1fef..ce46305bee 100644 --- a/xen/include/public/arch-x86/cpuid.h +++ b/xen/include/public/arch-x86/cpuid.h @@ -113,10 +113,6 @@ /* Max. address width in bits taking memory hotplug into account. */ #define XEN_CPUID_MACHINE_ADDRESS_WIDTH_MASK (0xffu << 0) -#define XEN_CPUID_MAX_PV_NUM_LEAVES 5 -#define XEN_CPUID_MAX_HVM_NUM_LEAVES 4 -#define XEN_CPUID_MAX_NUM_LEAVES \ - (XEN_CPUID_MAX_PV_NUM_LEAVES > XEN_CPUID_MAX_HVM_NUM_LEAVES ? \ - XEN_CPUID_MAX_PV_NUM_LEAVES : XEN_CPUID_MAX_HVM_NUM_LEAVES) +#define XEN_CPUID_MAX_NUM_LEAVES 5 #endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Oct 30 00:55:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Oct 2021 00:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.218681.379215 (Exim 4.92) (envelope-from ) id 1mgceI-0001Bu-PQ; Sat, 30 Oct 2021 00:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 218681.379215; Sat, 30 Oct 2021 00:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgceI-0001Bm-MO; Sat, 30 Oct 2021 00:55:06 +0000 Received: by outflank-mailman (input) for mailman id 218681; Sat, 30 Oct 2021 00:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgceH-0001Bg-Ag for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgceH-0007fm-7Q for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mgceH-0004G7-68 for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2+9TYOEOpFH0vaTGLdSXiLhtcSDK5tUdqwye6cyM3Tk=; b=qh3d+pH9QjC2kjLn6xBr5fef7P yeAulBYaNRUO7+cPv2Zz7WAf9jEA3Mh9p6H7LSvNTzSobFpuNF0znVYMknzn+mA2LaF3oF72Uz7Nd 0sVdJv0u0UuP6kjyqQ2SJMij3I83b926347J1T65kAgHgioCwzITFMApvWHnzrcQI10w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: add x86_64 alpine 3.12 test-artifact Message-Id: Date: Sat, 30 Oct 2021 00:55:05 +0000 commit 69157cf82f73c2f2b94a1750c03001d77a01ac27 Author: Stefano Stabellini AuthorDate: Fri Oct 22 13:30:49 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 29 16:23:26 2021 -0700 automation: add x86_64 alpine 3.12 test-artifact It is the same as the existing ARM64 alpine 3.12 test-artifact. It is used to export an Alpine rootfs for Dom0 used for testing. Also add the exporting job to build.yaml so that the binaries can be used during gitlab-ci runs. Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- automation/gitlab-ci/build.yaml | 13 +++++ automation/tests-artifacts/alpine/3.12.dockerfile | 66 +++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 08a43146ab..b4e0eb6b79 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -596,3 +596,16 @@ qemu-system-aarch64-5.2.0-arm64-export: tags: - arm64 + +# x86_64 test artifacts + +alpine-3.12-rootfs-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12 + script: + - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz + artifacts: + paths: + - binaries/initrd.tar.gz + tags: + - x86_64 diff --git a/automation/tests-artifacts/alpine/3.12.dockerfile b/automation/tests-artifacts/alpine/3.12.dockerfile new file mode 100644 index 0000000000..b3909996b4 --- /dev/null +++ b/automation/tests-artifacts/alpine/3.12.dockerfile @@ -0,0 +1,66 @@ +FROM alpine:3.12 +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV USER root + +RUN mkdir /build +WORKDIR /build + +RUN \ + # apk + apk update && \ + \ + # xen runtime deps + apk add musl && \ + apk add openrc && \ + apk add busybox && \ + apk add sudo && \ + apk add dbus && \ + apk add bash && \ + apk add python2 && \ + apk add zlib && \ + apk add ncurses && \ + apk add texinfo && \ + apk add yajl && \ + apk add libaio && \ + apk add xz-dev && \ + apk add util-linux && \ + apk add argp-standalone && \ + apk add libfdt && \ + apk add glib && \ + apk add pixman && \ + apk add curl && \ + apk add udev && \ + \ + # Xen + cd / && \ + # Minimal ramdisk environment in case of cpio output + rc-update add udev && \ + rc-update add udev-trigger && \ + rc-update add udev-settle && \ + rc-update add networking sysinit && \ + rc-update add loopback sysinit && \ + rc-update add bootmisc boot && \ + rc-update add devfs sysinit && \ + rc-update add dmesg sysinit && \ + rc-update add hostname boot && \ + rc-update add hwclock boot && \ + rc-update add hwdrivers sysinit && \ + rc-update add killprocs shutdown && \ + rc-update add modloop sysinit && \ + rc-update add modules boot && \ + rc-update add mount-ro shutdown && \ + rc-update add savecache shutdown && \ + rc-update add sysctl boot && \ + rc-update add local default && \ + cp -a /sbin/init /init && \ + echo "ttyS0" >> /etc/securetty && \ + echo "hvc0" >> /etc/securetty && \ + echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ + echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ + passwd -d "root" root && \ + \ + # Create rootfs + cd / && \ + tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Oct 30 00:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Oct 2021 00:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.218682.379218 (Exim 4.92) (envelope-from ) id 1mgceS-0001F2-Qk; Sat, 30 Oct 2021 00:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 218682.379218; Sat, 30 Oct 2021 00:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgceS-0001Ev-Nu; Sat, 30 Oct 2021 00:55:16 +0000 Received: by outflank-mailman (input) for mailman id 218682; Sat, 30 Oct 2021 00:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgceR-0001El-BX for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgceR-0007fy-Am for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mgceR-0004H8-9p for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KkxmyJmNsmcHlKAqU4RRt0JHydkNOhVcVP1W7vb7yPw=; b=6xx3Wg60PoHceRzsG5/26E0iHc EcB5JDXkvXihFdqHVG8RrHUvks8DYHV4mX3fSn9oYndYgftA6wXM9/Kq2weW68xlKVJkQOSIU0N1v NUw54Eu/U+Bx080w4Vyg2X4TOfdF28pWxmqJQ/M5gmxTvnkKM6qOH3PPuY7u8ZqnJRcM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: Linux 5.10.74 test-artifact Message-Id: Date: Sat, 30 Oct 2021 00:55:15 +0000 commit d07af6949febaefe07b4131232cc6223b4e9abf8 Author: Stefano Stabellini AuthorDate: Mon Oct 25 17:55:40 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 29 16:23:26 2021 -0700 automation: Linux 5.10.74 test-artifact Build a 5.10 kernel to be used as Dom0 and DomU kernel for testing. This is almost the same as the existing ARM64 recipe for Linux 5.9, the only differences are: - upgrade to latest 5.10.x stable - force Xen modules to built-in (on ARM it was already done by defconfig) Also add the exporting job to build.yaml so that the binary can be used during gitlab-ci runs. Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- automation/gitlab-ci/build.yaml | 11 +++++++ .../tests-artifacts/kernel/5.10.74.dockerfile | 38 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index b4e0eb6b79..fdd5c76582 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -609,3 +609,14 @@ alpine-3.12-rootfs-export: - binaries/initrd.tar.gz tags: - x86_64 + +kernel-5.10.74-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.10.74 + script: + - mkdir binaries && cp /bzImage binaries/bzImage + artifacts: + paths: + - binaries/bzImage + tags: + - x86_64 diff --git a/automation/tests-artifacts/kernel/5.10.74.dockerfile b/automation/tests-artifacts/kernel/5.10.74.dockerfile new file mode 100644 index 0000000000..112e27fe45 --- /dev/null +++ b/automation/tests-artifacts/kernel/5.10.74.dockerfile @@ -0,0 +1,38 @@ +FROM debian:unstable +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV LINUX_VERSION=5.10.74 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + libssl-dev \ + bc \ + curl \ + flex \ + bison \ + libelf-dev \ + && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* + +# Build the kernel +RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ + tar xvJf linux-"$LINUX_VERSION".tar.xz && \ + cd linux-"$LINUX_VERSION" && \ + make defconfig && \ + make xen.config && \ + cp .config .config.orig && \ + cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ + make -j$(nproc) bzImage && \ + cp arch/x86/boot/bzImage / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Oct 30 00:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Oct 2021 00:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.218683.379223 (Exim 4.92) (envelope-from ) id 1mgcec-0001ID-SW; Sat, 30 Oct 2021 00:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 218683.379223; Sat, 30 Oct 2021 00:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgcec-0001I5-Pd; Sat, 30 Oct 2021 00:55:26 +0000 Received: by outflank-mailman (input) for mailman id 218683; Sat, 30 Oct 2021 00:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgceb-0001Hs-En for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgceb-0007gJ-Dz for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mgceb-0004Hn-D7 for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 00:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=v7iqyiGaLARbjbObdTu4g0fwaPtWYgFHZiSe+HTKTwQ=; b=ouzMIbMa180UhwKO+s254Zmddk vhuMWTU7lBJJkPTzvnxUM5CV8SSaAlCVuiBZlQITnvZEV/gl2QWaeB5N4k/VMb12vYvzVJ4j8BQWj FXLamW4KGqdXB0qm336/E0B3OtTguHg1EYgQ0NPuRtFH1uBQ63YHltIS7x+GqudaRvIk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] automation: add a QEMU based x86_64 Dom0/DomU test Message-Id: Date: Sat, 30 Oct 2021 00:55:25 +0000 commit 3030a73bf849a50411da95e94abf23cb7e8642fc Author: Stefano Stabellini AuthorDate: Fri Oct 29 09:33:38 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 29 16:23:26 2021 -0700 automation: add a QEMU based x86_64 Dom0/DomU test Introduce a test based on QEMU to run Xen, Dom0 and start a DomU. This is similar to the existing qemu-alpine-arm64.sh script and test. The only differences are: - use Debian's qemu-system-x86_64 (on ARM we build our own) - use ipxe instead of u-boot and ImageBuilder Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- automation/gitlab-ci/test.yaml | 24 ++++++++ automation/scripts/qemu-alpine-x86_64.sh | 95 ++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 91a10febbf..47e8704df3 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -47,6 +47,30 @@ qemu-alpine-arm64-gcc: - /^coverity-tested\/.*/ - /^stable-.*/ +qemu-alpine-x86_64-gcc: + stage: test + image: registry.gitlab.com/xen-project/xen/${CONTAINER} + variables: + CONTAINER: debian:stretch + script: + - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee qemu-smoke-x86_64.log + dependencies: + - alpine-3.12-gcc + - alpine-3.12-rootfs-export + - kernel-5.10.74-export + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - x86_64 + except: + - master + - smoke + - /^coverity-tested\/.*/ + - /^stable-.*/ + qemu-smoke-arm64-gcc: stage: test image: registry.gitlab.com/xen-project/xen/${CONTAINER} diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh new file mode 100755 index 0000000000..2e9625109c --- /dev/null +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -0,0 +1,95 @@ +#!/bin/bash + +set -ex + +apt-get -qy update +apt-get -qy install --no-install-recommends cpio \ + busybox-static + +# DomU Busybox +cd binaries +mkdir -p initrd +mkdir -p initrd/bin +mkdir -p initrd/sbin +mkdir -p initrd/etc +mkdir -p initrd/dev +mkdir -p initrd/proc +mkdir -p initrd/sys +mkdir -p initrd/lib +mkdir -p initrd/var +mkdir -p initrd/mnt +cp /bin/busybox initrd/bin/busybox +initrd/bin/busybox --install initrd/bin +echo "#!/bin/sh + +mount -t proc proc /proc +mount -t sysfs sysfs /sys +mount -t devtmpfs devtmpfs /dev +/bin/sh" > initrd/init +chmod +x initrd/init +# DomU rootfs +cd initrd +find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +cd .. + +# initrd.tar.gz is Dom0 rootfs +mkdir -p rootfs +cd rootfs +tar xvzf ../initrd.tar.gz +mkdir proc +mkdir run +mkdir srv +mkdir sys +rm var/run +cp -ar ../dist/install/* . +mv ../initrd.cpio.gz ./root +cp ../bzImage ./root +echo "name=\"test\" +memory=512 +vcpus=1 +kernel=\"/root/bzImage\" +ramdisk=\"/root/initrd.cpio.gz\" +extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" +" > root/test.cfg +echo "#!/bin/bash + +set -x + +export LD_LIBRARY_PATH=/usr/local/lib +bash /etc/init.d/xencommons start + +xl list + +xl create -c /root/test.cfg + +" > etc/local.d/xen.start +chmod +x etc/local.d/xen.start +echo "rc_verbose=yes" >> etc/rc.conf +# rebuild Dom0 rootfs +find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +cd ../.. + +cat >> binaries/pxelinux.0 << EOF +#!ipxe + +kernel xen console=com1 +module bzImage console=hvc0 +module xen-rootfs.cpio.gz +boot +EOF + +# Run the test +rm -f smoke.serial +set +e +timeout -k 1 720 \ +qemu-system-x86_64 \ + -cpu qemu64,+svm \ + -m 2G -smp 2 \ + -monitor none -serial stdio \ + -nographic \ + -device virtio-net-pci,netdev=n0 \ + -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& tee smoke.serial + +set -e +(grep -q "Domain-0" smoke.serial && grep -q "BusyBox" smoke.serial) || exit 1 +exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Oct 30 10:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Oct 2021 10:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.218752.379316 (Exim 4.92) (envelope-from ) id 1mglfb-0000xQ-5R; Sat, 30 Oct 2021 10:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 218752.379316; Sat, 30 Oct 2021 10:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mglfb-0000xI-2Q; Sat, 30 Oct 2021 10:33:03 +0000 Received: by outflank-mailman (input) for mailman id 218752; Sat, 30 Oct 2021 10:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mglfa-0000xA-8L for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 10:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mglfZ-0003IL-UO for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 10:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mglfZ-0005n6-TK for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 10:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bnKRsHVFDXwn65zY93R5ZT4Lqg4btXMuado7picN05Y=; b=AGQfF7IJSrjuQaJqGXnMde5MlV YnxSOcMrzZeMslI380/ua/jJZ/pOb/ZYXbkpkYias2NP7Q8plwSFlj4FtPJvfUgq9JvwdmjCtvNB/ TtX822uv8NxtkMIjL//f5pG4M7bsp7mAxydktDrwGY/9SWEW4/rfFVOrI6jZp4tskZLw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpuid: prevent decreasing of hypervisor max leaf on migration Message-Id: Date: Sat, 30 Oct 2021 10:33:01 +0000 commit 6f1d6682de832d12b728f856331e700a89737a1e Author: Roger Pau Monne AuthorDate: Wed Oct 27 16:00:50 2021 +0200 Commit: Andrew Cooper CommitDate: Fri Oct 29 17:42:03 2021 +0100 x86/cpuid: prevent decreasing of hypervisor max leaf on migration In order to be compatible with previous Xen versions, and not change max hypervisor leaf as a result of a migration, keep the clamping of the maximum leaf value provided to XEN_CPUID_MAX_NUM_LEAVES, instead of doing it based on the domain type. Also set the default maximum leaf without taking the domain type into account. The maximum hypervisor leaf is not migrated, so we need the default to not regress beyond what might already be reported to a guest by existing Xen versions. This is a partial revert of 540d911c28 and restores the previous behaviour and assures that HVM guests won't see it's maximum hypervisor leaf reduced from 5 to 4 as a result of a migration. Fixes: 540d911c28 ('x86/CPUID: shrink max_{,sub}leaf fields according to actual leaf contents') Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper Release-Acked-by: Ian Jackson --- xen/arch/x86/traps.c | 6 ++---- xen/include/public/arch-x86/cpuid.h | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index a1c2adb7ad..79fd276a41 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1086,15 +1086,13 @@ void cpuid_hypervisor_leaves(const struct vcpu *v, uint32_t leaf, uint32_t base = is_viridian_domain(d) ? 0x40000100 : 0x40000000; uint32_t idx = leaf - base; unsigned int limit = is_viridian_domain(d) ? p->hv2_limit : p->hv_limit; - unsigned int dflt = is_pv_domain(d) ? XEN_CPUID_MAX_PV_NUM_LEAVES - : XEN_CPUID_MAX_HVM_NUM_LEAVES; if ( limit == 0 ) /* Default number of leaves */ - limit = dflt; + limit = XEN_CPUID_MAX_NUM_LEAVES; else /* Clamp toolstack value between 2 and MAX_NUM_LEAVES. */ - limit = min(max(limit, 2u), dflt); + limit = min(max(limit, 2u), XEN_CPUID_MAX_NUM_LEAVES + 0u); if ( idx > limit ) return; diff --git a/xen/include/public/arch-x86/cpuid.h b/xen/include/public/arch-x86/cpuid.h index 00926b1fef..ce46305bee 100644 --- a/xen/include/public/arch-x86/cpuid.h +++ b/xen/include/public/arch-x86/cpuid.h @@ -113,10 +113,6 @@ /* Max. address width in bits taking memory hotplug into account. */ #define XEN_CPUID_MACHINE_ADDRESS_WIDTH_MASK (0xffu << 0) -#define XEN_CPUID_MAX_PV_NUM_LEAVES 5 -#define XEN_CPUID_MAX_HVM_NUM_LEAVES 4 -#define XEN_CPUID_MAX_NUM_LEAVES \ - (XEN_CPUID_MAX_PV_NUM_LEAVES > XEN_CPUID_MAX_HVM_NUM_LEAVES ? \ - XEN_CPUID_MAX_PV_NUM_LEAVES : XEN_CPUID_MAX_HVM_NUM_LEAVES) +#define XEN_CPUID_MAX_NUM_LEAVES 5 #endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Oct 30 18:22:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Oct 2021 18:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.218801.379387 (Exim 4.92) (envelope-from ) id 1mgszT-00039j-Q9; Sat, 30 Oct 2021 18:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 218801.379387; Sat, 30 Oct 2021 18:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszT-00039b-NK; Sat, 30 Oct 2021 18:22:03 +0000 Received: by outflank-mailman (input) for mailman id 218801; Sat, 30 Oct 2021 18:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszS-00039T-7K for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszS-000348-6Q for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mgszS-0005Qo-5M for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18: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=b7Wr6jAOrJdriHQ3hcmoDRzaEH9uA7pIEnjbNWBQ2XE=; b=1hwz5Rsznz/TPMrHohNNv+lezq hpwk922MSYCyg4Np2FQEFrqYXs/Fyy1v4Do++exBbpr1JRzk/iWjX3uZ+6Z+8FDYSXGQyaE6hYmBi 80BCoMFaOg3kwhnA69lF/FMn8QyuNUVl4SvXqCxKIQkp+VkZ49BH5Wir+Ua3eLNzBvTs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: add x86_64 alpine 3.12 test-artifact Message-Id: Date: Sat, 30 Oct 2021 18:22:02 +0000 commit 69157cf82f73c2f2b94a1750c03001d77a01ac27 Author: Stefano Stabellini AuthorDate: Fri Oct 22 13:30:49 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 29 16:23:26 2021 -0700 automation: add x86_64 alpine 3.12 test-artifact It is the same as the existing ARM64 alpine 3.12 test-artifact. It is used to export an Alpine rootfs for Dom0 used for testing. Also add the exporting job to build.yaml so that the binaries can be used during gitlab-ci runs. Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- automation/gitlab-ci/build.yaml | 13 +++++ automation/tests-artifacts/alpine/3.12.dockerfile | 66 +++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 08a43146ab..b4e0eb6b79 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -596,3 +596,16 @@ qemu-system-aarch64-5.2.0-arm64-export: tags: - arm64 + +# x86_64 test artifacts + +alpine-3.12-rootfs-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12 + script: + - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz + artifacts: + paths: + - binaries/initrd.tar.gz + tags: + - x86_64 diff --git a/automation/tests-artifacts/alpine/3.12.dockerfile b/automation/tests-artifacts/alpine/3.12.dockerfile new file mode 100644 index 0000000000..b3909996b4 --- /dev/null +++ b/automation/tests-artifacts/alpine/3.12.dockerfile @@ -0,0 +1,66 @@ +FROM alpine:3.12 +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV USER root + +RUN mkdir /build +WORKDIR /build + +RUN \ + # apk + apk update && \ + \ + # xen runtime deps + apk add musl && \ + apk add openrc && \ + apk add busybox && \ + apk add sudo && \ + apk add dbus && \ + apk add bash && \ + apk add python2 && \ + apk add zlib && \ + apk add ncurses && \ + apk add texinfo && \ + apk add yajl && \ + apk add libaio && \ + apk add xz-dev && \ + apk add util-linux && \ + apk add argp-standalone && \ + apk add libfdt && \ + apk add glib && \ + apk add pixman && \ + apk add curl && \ + apk add udev && \ + \ + # Xen + cd / && \ + # Minimal ramdisk environment in case of cpio output + rc-update add udev && \ + rc-update add udev-trigger && \ + rc-update add udev-settle && \ + rc-update add networking sysinit && \ + rc-update add loopback sysinit && \ + rc-update add bootmisc boot && \ + rc-update add devfs sysinit && \ + rc-update add dmesg sysinit && \ + rc-update add hostname boot && \ + rc-update add hwclock boot && \ + rc-update add hwdrivers sysinit && \ + rc-update add killprocs shutdown && \ + rc-update add modloop sysinit && \ + rc-update add modules boot && \ + rc-update add mount-ro shutdown && \ + rc-update add savecache shutdown && \ + rc-update add sysctl boot && \ + rc-update add local default && \ + cp -a /sbin/init /init && \ + echo "ttyS0" >> /etc/securetty && \ + echo "hvc0" >> /etc/securetty && \ + echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ + echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ + passwd -d "root" root && \ + \ + # Create rootfs + cd / && \ + tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Oct 30 18:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Oct 2021 18:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.218802.379390 (Exim 4.92) (envelope-from ) id 1mgszd-0003BW-Rn; Sat, 30 Oct 2021 18:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 218802.379390; Sat, 30 Oct 2021 18:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszd-0003BQ-Op; Sat, 30 Oct 2021 18:22:13 +0000 Received: by outflank-mailman (input) for mailman id 218802; Sat, 30 Oct 2021 18:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszc-0003BH-AF for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszc-00034V-9c for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mgszc-0005Rr-8h for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=l8U4NxhTqYMpphWvvkXCFY6rvA5aslSGbYH45HuXc8M=; b=CnW5mwTbVRAyqGCSJ2ry6b4uep a4fZSu6jWXTmbDNSyYNeUpe2tpV9FSeQhILlzUmxMPenEHYzt7Mczsn/9rYR8WFvos4FiMW83wKUB iE+LfqyLlD+9bE/whFnttcSA0OAf81NW2UvUvEPxAKIJcJ20xIRD9ZkScs3hpvCL2yKM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Linux 5.10.74 test-artifact Message-Id: Date: Sat, 30 Oct 2021 18:22:12 +0000 commit d07af6949febaefe07b4131232cc6223b4e9abf8 Author: Stefano Stabellini AuthorDate: Mon Oct 25 17:55:40 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 29 16:23:26 2021 -0700 automation: Linux 5.10.74 test-artifact Build a 5.10 kernel to be used as Dom0 and DomU kernel for testing. This is almost the same as the existing ARM64 recipe for Linux 5.9, the only differences are: - upgrade to latest 5.10.x stable - force Xen modules to built-in (on ARM it was already done by defconfig) Also add the exporting job to build.yaml so that the binary can be used during gitlab-ci runs. Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- automation/gitlab-ci/build.yaml | 11 +++++++ .../tests-artifacts/kernel/5.10.74.dockerfile | 38 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index b4e0eb6b79..fdd5c76582 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -609,3 +609,14 @@ alpine-3.12-rootfs-export: - binaries/initrd.tar.gz tags: - x86_64 + +kernel-5.10.74-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.10.74 + script: + - mkdir binaries && cp /bzImage binaries/bzImage + artifacts: + paths: + - binaries/bzImage + tags: + - x86_64 diff --git a/automation/tests-artifacts/kernel/5.10.74.dockerfile b/automation/tests-artifacts/kernel/5.10.74.dockerfile new file mode 100644 index 0000000000..112e27fe45 --- /dev/null +++ b/automation/tests-artifacts/kernel/5.10.74.dockerfile @@ -0,0 +1,38 @@ +FROM debian:unstable +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV LINUX_VERSION=5.10.74 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + libssl-dev \ + bc \ + curl \ + flex \ + bison \ + libelf-dev \ + && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* + +# Build the kernel +RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ + tar xvJf linux-"$LINUX_VERSION".tar.xz && \ + cd linux-"$LINUX_VERSION" && \ + make defconfig && \ + make xen.config && \ + cp .config .config.orig && \ + cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ + make -j$(nproc) bzImage && \ + cp arch/x86/boot/bzImage / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Oct 30 18:22:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Oct 2021 18:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.218803.379395 (Exim 4.92) (envelope-from ) id 1mgszn-0003Es-Ti; Sat, 30 Oct 2021 18:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 218803.379395; Sat, 30 Oct 2021 18:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszn-0003Ek-QP; Sat, 30 Oct 2021 18:22:23 +0000 Received: by outflank-mailman (input) for mailman id 218803; Sat, 30 Oct 2021 18:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszm-0003EV-DS for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mgszm-00034h-Cl for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mgszm-0005UR-Bu for xen-changelog@lists.xenproject.org; Sat, 30 Oct 2021 18:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JJ1vDOHLJfpMzTdVhiV5VNkISd4zNxIMqpfC9zAQocs=; b=ThQSWV4VCRiiU2Q6DtXmxKQTmg CicnsTT3V7Niq3yefD0rhXsRRzvv93AhJvp/Paqgu/F0ltruFE2u7vDqESC/sbHbctmAtJ7qob6TK djwimtOC8fkbnkeJNC23S3FPba/4cDvvb6izpjFniUJBI1IXGlttugR3JUmQKQ6HsA8A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: add a QEMU based x86_64 Dom0/DomU test Message-Id: Date: Sat, 30 Oct 2021 18:22:22 +0000 commit 3030a73bf849a50411da95e94abf23cb7e8642fc Author: Stefano Stabellini AuthorDate: Fri Oct 29 09:33:38 2021 -0700 Commit: Stefano Stabellini CommitDate: Fri Oct 29 16:23:26 2021 -0700 automation: add a QEMU based x86_64 Dom0/DomU test Introduce a test based on QEMU to run Xen, Dom0 and start a DomU. This is similar to the existing qemu-alpine-arm64.sh script and test. The only differences are: - use Debian's qemu-system-x86_64 (on ARM we build our own) - use ipxe instead of u-boot and ImageBuilder Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- automation/gitlab-ci/test.yaml | 24 ++++++++ automation/scripts/qemu-alpine-x86_64.sh | 95 ++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 91a10febbf..47e8704df3 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -47,6 +47,30 @@ qemu-alpine-arm64-gcc: - /^coverity-tested\/.*/ - /^stable-.*/ +qemu-alpine-x86_64-gcc: + stage: test + image: registry.gitlab.com/xen-project/xen/${CONTAINER} + variables: + CONTAINER: debian:stretch + script: + - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee qemu-smoke-x86_64.log + dependencies: + - alpine-3.12-gcc + - alpine-3.12-rootfs-export + - kernel-5.10.74-export + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - x86_64 + except: + - master + - smoke + - /^coverity-tested\/.*/ + - /^stable-.*/ + qemu-smoke-arm64-gcc: stage: test image: registry.gitlab.com/xen-project/xen/${CONTAINER} diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh new file mode 100755 index 0000000000..2e9625109c --- /dev/null +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -0,0 +1,95 @@ +#!/bin/bash + +set -ex + +apt-get -qy update +apt-get -qy install --no-install-recommends cpio \ + busybox-static + +# DomU Busybox +cd binaries +mkdir -p initrd +mkdir -p initrd/bin +mkdir -p initrd/sbin +mkdir -p initrd/etc +mkdir -p initrd/dev +mkdir -p initrd/proc +mkdir -p initrd/sys +mkdir -p initrd/lib +mkdir -p initrd/var +mkdir -p initrd/mnt +cp /bin/busybox initrd/bin/busybox +initrd/bin/busybox --install initrd/bin +echo "#!/bin/sh + +mount -t proc proc /proc +mount -t sysfs sysfs /sys +mount -t devtmpfs devtmpfs /dev +/bin/sh" > initrd/init +chmod +x initrd/init +# DomU rootfs +cd initrd +find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +cd .. + +# initrd.tar.gz is Dom0 rootfs +mkdir -p rootfs +cd rootfs +tar xvzf ../initrd.tar.gz +mkdir proc +mkdir run +mkdir srv +mkdir sys +rm var/run +cp -ar ../dist/install/* . +mv ../initrd.cpio.gz ./root +cp ../bzImage ./root +echo "name=\"test\" +memory=512 +vcpus=1 +kernel=\"/root/bzImage\" +ramdisk=\"/root/initrd.cpio.gz\" +extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\" +" > root/test.cfg +echo "#!/bin/bash + +set -x + +export LD_LIBRARY_PATH=/usr/local/lib +bash /etc/init.d/xencommons start + +xl list + +xl create -c /root/test.cfg + +" > etc/local.d/xen.start +chmod +x etc/local.d/xen.start +echo "rc_verbose=yes" >> etc/rc.conf +# rebuild Dom0 rootfs +find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +cd ../.. + +cat >> binaries/pxelinux.0 << EOF +#!ipxe + +kernel xen console=com1 +module bzImage console=hvc0 +module xen-rootfs.cpio.gz +boot +EOF + +# Run the test +rm -f smoke.serial +set +e +timeout -k 1 720 \ +qemu-system-x86_64 \ + -cpu qemu64,+svm \ + -m 2G -smp 2 \ + -monitor none -serial stdio \ + -nographic \ + -device virtio-net-pci,netdev=n0 \ + -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& tee smoke.serial + +set -e +(grep -q "Domain-0" smoke.serial && grep -q "BusyBox" smoke.serial) || exit 1 +exit 0 -- generated by git-patchbot for /home/xen/git/xen.git#master