add per-domain IOMMU control
v10 cover add per-domain IOMMU control
These are revisions of the remaining uncommitted patches from my previous series:
https://lists.xenproject.org/archives/html/xen-devel/2019-08/msg01737.html
Paul Durrant (6):
domain: introduce XEN_DOMCTL_CDF_iommu flag
use is_iommu_enabled() where appropriate...
sysctl / libxl: report whether IOMMU/HAP page table sharing is
supported
remove late (on-demand) construction of IOMMU page tables
iommu: tidy up iommu_use_hap_pt() and need_iommu_pt_sync() macros introduce a 'passthrough' configuration option to xl.cfg...
docs/man/xl.cfg.5.pod.in | 56 ++++++ tools/libxl/libxl.c | 2 + tools/libxl/libxl.h | 23 +++ tools/libxl/libxl_create.c | 9 + tools/libxl/libxl_mem.c | 6 +- tools/libxl/libxl_types.idl | 9 + tools/libxl/libxl_utils.c | 15 ++ tools/libxl/libxl_utils.h | 1 + tools/ocaml/libs/xc/xenctrl.ml | 6 + tools/ocaml/libs/xc/xenctrl.mli | 7 + tools/ocaml/libs/xc/xenctrl_stubs.c | 16 +- tools/xl/xl_info.c | 5 +- tools/xl/xl_parse.c | 172 +++++++++++++------ xen/arch/arm/Kconfig | 1 + xen/arch/arm/domain.c | 17 +- xen/arch/arm/p2m.c | 4 +- xen/arch/arm/setup.c | 3 + xen/arch/x86/dom0_build.c | 4 +- xen/arch/x86/domain.c | 2 +- xen/arch/x86/domctl.c | 4 +- xen/arch/x86/hvm/hvm.c | 31 ++-- xen/arch/x86/hvm/mtrr.c | 5 +- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/mm/mem_sharing.c | 2 +- xen/arch/x86/mm/p2m-ept.c | 4 +- xen/arch/x86/mm/p2m.c | 4 +- xen/arch/x86/mm/paging.c | 2 +- xen/arch/x86/setup.c | 3 + xen/arch/x86/x86_64/mm.c | 2 +- xen/common/domain.c | 16 +- xen/common/memory.c | 4 +- xen/common/sysctl.c | 2 + xen/common/vm_event.c | 2 +- xen/drivers/passthrough/Kconfig | 3 + xen/drivers/passthrough/amd/iommu_guest.c | 2 +- xen/drivers/passthrough/amd/iommu_init.c | 5 +- xen/drivers/passthrough/device_tree.c | 18 +- xen/drivers/passthrough/io.c | 8 +- xen/drivers/passthrough/iommu.c | 198 ++++++++-------------- xen/drivers/passthrough/pci.c | 28 +-- xen/drivers/passthrough/vtd/iommu.c | 18 +- xen/drivers/passthrough/vtd/x86/hvm.c | 2 +- xen/drivers/passthrough/x86/iommu.c | 99 +---------- xen/include/asm-arm/iommu.h | 3 - xen/include/asm-x86/iommu.h | 15 +- xen/include/public/domctl.h | 15 +- xen/include/public/sysctl.h | 6 +- xen/include/xen/iommu.h | 46 ++--- xen/include/xen/sched.h | 13 +- xen/xsm/flask/hooks.c | 18 +- 52 files changed, 523 insertions(+), 419 deletions(-)
---
Cc: Andrew Cooper <[email protected]>
Cc: Anthony PERARD <[email protected]>
Cc: Christian Lindig <[email protected]>
Cc: David Scott <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Jun Nakajima <[email protected]>
Cc: Kevin Tian <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Petre Pircalabu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Tamas K Lengyel <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Cc: Wei Liu <[email protected]>
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v10 1/6 domain: introduce XEN_DOMCTL_CDF_iommu flag
This patch introduces a common domain creation flag to determine whether the domain is permitted to make use of the IOMMU. Currently the flag is always set for both dom0 and any domU created by libxl if the IOMMU is globally enabled (i.e. iommu_enabled == 1). sanitise_domain_config() is modified to reject the flag if !iommu_enabled.
A new helper function, is_iommu_enabled(), is added to test the flag and iommu_domain_init() will return immediately if !is_iommu_enabled(). This is slightly different to the previous behaviour based on !iommu_enabled where the call to arch_iommu_domain_init() was made regardless, however it appears that this call was only necessary to initialize the dt_devices list for ARM such that iommu_release_dt_devices() can be called unconditionally by domain_relinquish_resources(). Adding a simple check of is_iommu_enabled() into iommu_release_dt_devices() keeps this unconditional call working.
No functional change should be observed with this patch applied.
Subsequent patches will allow the toolstack to control whether use of the IOMMU is enabled for a domain.
NOTE: The introduction of the is_iommu_enabled() helper function might
seem excessive but its use is expected to increase with subsequent patches. Also, having iommu_domain_init() bail before calling arch_iommu_domain_init() is not strictly necessary, but I think the consequent addition of the call to is_iommu_enabled() in iommu_release_dt_devices() makes the code clearer.
---
Cc: David Scott <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Previously part of series https://lists.xenproject.org/archives/html/xen-devel/2019-07/msg02267.html
v9:
- Fix oversight in ARM's arch_sanitise_domain_config() to tolerate setting of XEN_DOMCTL_CDF_iommu
v7:
- Add a check to verify that the toolstack has not set XEN_DOMCTL_CDF_iommu
- Add missing ocaml binding changes
v6:
- Remove the toolstack parts as there's no nice method of testing whether the IOMMU is enabled in an architecture-neutral way
v5:
- Move is_iommu_enabled() check into iommu_domain_init()
- Reject XEN_DOMCTL_CDF_iommu in sanitise_domain_config() if !iommu_enabled
- Use evaluate_nospec() in defintion of is_iommu_enabled()
--- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + xen/arch/arm/domain.c | 7 +++++-- xen/arch/arm/setup.c | 3 +++ xen/arch/x86/setup.c | 3 +++ xen/common/domain.c | 9 ++++++++- xen/common/domctl.c | 13 +++++++++++++ xen/drivers/passthrough/device_tree.c | 3 +++ xen/drivers/passthrough/iommu.c | 6 +++--- xen/include/public/domctl.h | 5 ++++- xen/include/xen/sched.h | 5 +++++ 11 files changed, 49 insertions(+), 7 deletions(-)
tools/ocaml/libs/xc/xenctrl.ml +1 -0
@@ -63,6 +63,7 @@ type domain_create_flag = | CDF_S3_INTEGRITY | CDF_OOS_OFF | CDF_XS_DOMAIN + | CDF_IOMMU type domctl_create_config = {
tools/ocaml/libs/xc/xenctrl.mli +1 -0
@@ -56,6 +56,7 @@ type domain_create_flag = | CDF_S3_INTEGRITY | CDF_OOS_OFF | CDF_XS_DOMAIN + | CDF_IOMMU type domctl_create_config = { ssidref: int32;
xen/arch/arm/domain.c +5 -2
@@ -608,9 +608,12 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) {unsigned int max_vcpus; -if ( config->flags != (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap) ) +/* HVM and HAP must be set. IOMMU may or may not be */ +if ( (config->flags & ~XEN_DOMCTL_CDF_iommu) != + (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap) ) { -dprintk (XENLOG_INFO ,"Unsupported configuration %#x\n" , config->flags); +dprintk (XENLOG_INFO ,"Unsupported configuration %#x\n" , + config->flags);return -EINVAL ; }
xen/arch/arm/setup.c +3 -0
@@ -961,6 +961,9 @@ void __init start_xen(unsigned long boot_phys_offset, dom0_cfg.arch.tee_type =tee_get_type (); dom0_cfg.max_vcpus =dom0_max_vcpus (); +if ( iommu_enabled ) + dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; + dom0 =domain_create (0 , &dom0_cfg, true);if (IS_ERR (dom0) || (alloc_dom0_vcpu0 (dom0) ==NULL ) )panic ("Error creating domain 0\n" );
xen/arch/x86/setup.c +3 -0
@@ -1732,6 +1732,9 @@ void __init noreturn __start_xen(unsigned long mbi_p) } dom0_cfg.max_vcpus =dom0_max_vcpus (); +if ( iommu_enabled ) + dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; +/* Create initial domain 0. */ dom0 =domain_create (get_initial_domain_id (), &dom0_cfg, !pv_shim);if (IS_ERR (dom0) || (alloc_dom0_vcpu0 (dom0) ==NULL ) )
xen/common/domain.c +8 -1
@@ -301,7 +301,8 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config) XEN_DOMCTL_CDF_hap | XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off | - XEN_DOMCTL_CDF_xs_domain) ) + XEN_DOMCTL_CDF_xs_domain | + XEN_DOMCTL_CDF_iommu) ) {dprintk (XENLOG_INFO ,"Unknown CDF flags %#x\n" , config->flags);return -EINVAL ;
@@ -320,6 +321,12 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config)return -EINVAL ; } +if ( (config->flags & XEN_DOMCTL_CDF_iommu) && !iommu_enabled ) + { +dprintk (XENLOG_INFO ,"IOMMU is not enabled\n" ); +return -EINVAL ; + } +return arch_sanitise_domain_config (config); }
xen/common/domctl.c +13 -0
@@ -515,6 +515,19 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) rover = dom; } +/* +* For now, make sure the createdomain IOMMU flag is set if the +* IOMMU is enabled. When the flag comes under toolstack control +* this can go away. +*/ +if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_iommu ) + { +ASSERT_UNREACHABLE (); +return -EINVAL ; + } +if ( iommu_enabled ) + op->u.createdomain.flags |= XEN_DOMCTL_CDF_iommu; + d =domain_create (dom, &op->u.createdomain, false);if (IS_ERR (d) ) {
xen/drivers/passthrough/device_tree.c +3 -0
@@ -119,6 +119,9 @@ int iommu_release_dt_devices(struct domain *d)struct dt_device_node *dev, *_dev;int rc; +if ( !is_iommu_enabled (d) ) +return 0 ; +list_for_each_entry_safe (dev, _dev, &hd->dt_devices, domain_list) { rc =iommu_deassign_dt_device (d, dev);
xen/drivers/passthrough/iommu.c +3 -3
@@ -151,6 +151,9 @@ int iommu_domain_init(struct domain *d)struct domain_iommu *hd =dom_iommu (d);int ret =0 ; +if ( !is_iommu_enabled (d) ) +return 0 ; +#ifdef CONFIG_NUMA hd->node =NUMA_NO_NODE ;#endif
@@ -159,9 +162,6 @@ int iommu_domain_init(struct domain *d)if ( ret )return ret; -if ( !iommu_enabled ) -return 0 ; - hd->platform_ops =iommu_get_ops ();return hd->platform_ops->init (d); }
xen/include/public/domctl.h +4 -1
@@ -64,9 +64,12 @@ struct xen_domctl_createdomain {/* Is this a xenstore domain? */ #define _XEN_DOMCTL_CDF_xs_domain 4#define XEN_DOMCTL_CDF_xs_domain (1U<<_XEN_DOMCTL_CDF_xs_domain) +/* Should this domain be permitted to use the IOMMU? */ +#define _XEN_DOMCTL_CDF_iommu 5 +#define XEN_DOMCTL_CDF_iommu (1U<<_XEN_DOMCTL_CDF_iommu)/* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */ -#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_xs_domain +#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_iommuuint32_t flags;
xen/include/xen/sched.h +5 -0
@@ -983,6 +983,11 @@ static inline bool is_xenstore_domain(const struct domain *d)return d->options & XEN_DOMCTL_CDF_xs_domain; } +static inline bool is_iommu_enabled (const struct domain *d) +{ +return evaluate_nospec (d->options & XEN_DOMCTL_CDF_iommu); +} +extern bool sched_smt_power_savings; extern enum cpufreq_controller {
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v10 2/6 use is_iommu_enabled() where appropriate...
In reply to Paul Durrant...rather than testing the global iommu_enabled flag and ops pointer.
Now that there is a per-domain flag indicating whether the domain is permitted to use the IOMMU (which determines whether the ops pointer will be set), many tests of the global iommu_enabled flag and ops pointer can be translated into tests of the per-domain flag. Some of the other tests of purely the global iommu_enabled flag can also be translated into tests of the per-domain flag.
NOTE: The comment in iommu_share_p2m_table() is also fixed; need_iommu()
disappeared some time ago. Also, whilst the style of the 'if' in flask_iommu_resource_use_perm() is fixed, I have not translated any instances of u32 into uint32_t to keep consistency. IMO such a translation would be better done globally for the source module in a separate patch.
The change to the definition of iommu_call() is to keep the PV shim build happy. Without this change it will fail to compile with errors of the form:
iommu.c:361:32: error: unused variable ‘hd’ [-Werror=unused-variable]
const struct domain_iommu *hd = dom_iommu(d);
^~---
Cc: Stefano Stabellini <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Jun Nakajima <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Previously part of series https://lists.xenproject.org/archives/html/xen-devel/2019-07/msg02267.html
v7:
- Fix iommu_call() rather than messing with the initializtion of 'hd'
- Constify domain pointer passed to flask_iommu_resource_use_perm()
v5:
- Fix logic in ARM p2m_init()
- Make iommu_do_domctl() return -EOPNOTSUPP rather than -ENOSYS if the IOMMU is not enabled
- Fix test in pci_enable_acs()
- Fix test in flask_iommu_resource_use_perm()
--- xen/arch/arm/p2m.c | 2 +- xen/arch/x86/dom0_build.c | 2 +- xen/arch/x86/domctl.c | 4 +-- xen/arch/x86/hvm/hvm.c | 6 ++--- xen/arch/x86/hvm/vioapic.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/mm/p2m-ept.c | 4 +-- xen/drivers/passthrough/amd/iommu_guest.c | 2 +- xen/drivers/passthrough/device_tree.c | 4 +-- xen/drivers/passthrough/io.c | 8 +++--- xen/drivers/passthrough/iommu.c | 31 ++++++++++------------- xen/drivers/passthrough/pci.c | 16 ++++++------ xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/drivers/passthrough/vtd/x86/hvm.c | 2 +- xen/drivers/passthrough/x86/iommu.c | 2 +- xen/include/asm-x86/iommu.h | 11 ++++++-- xen/xsm/flask/hooks.c | 18 ++++++------- 18 files changed, 62 insertions(+), 58 deletions(-)
xen/arch/arm/p2m.c +1 -1
@@ -1531,7 +1531,7 @@ int p2m_init(struct domain *d)* shared with the CPU, Xen has to make sure that the PT changes have * reached the memory */ - p2m->clean_pte = iommu_enabled && + p2m->clean_pte =is_iommu_enabled (d) && !iommu_has_feature (d,IOMMU_FEAT_COHERENT_WALK ); rc =p2m_alloc_table (d);
xen/arch/x86/dom0_build.c +1 -1
@@ -356,7 +356,7 @@ unsigned long __init dom0_compute_nr_pages( avail -= d->max_vcpus -1 ;/* Reserve memory for iommu_dom0_init() (rough estimate). */ -if ( iommu_enabled ) +if (is_iommu_enabled (d) ) {unsigned int s;
xen/arch/x86/domctl.c +2 -2
@@ -708,7 +708,7 @@ long arch_do_domctl(break ; ret = -ESRCH ; -if ( iommu_enabled ) +if (is_iommu_enabled (d) ) {pcidevs_lock (); ret =pt_irq_create_bind (d, bind);
@@ -737,7 +737,7 @@ long arch_do_domctl(if ( ret )break ; -if ( iommu_enabled ) +if (is_iommu_enabled (d) ) {pcidevs_lock (); ret =pt_irq_destroy_bind (d, bind);
xen/arch/x86/hvm/hvm.c +3 -3
@@ -465,7 +465,7 @@ void hvm_migrate_timers(struct vcpu *v)void hvm_migrate_pirq (struct hvm_pirq_dpci *pirq_dpci,const struct vcpu *v) { -ASSERT (iommu_enabled && +ASSERT (is_iommu_enabled (v->domain) && (is_hardware_domain (v->domain) ||hvm_domain_irq (v->domain)->dpci)); if ( (pirq_dpci->flags & HVM_IRQ_DPCI_MACH_MSI) &&
@@ -496,7 +496,7 @@ void hvm_migrate_pirqs(struct vcpu *v) {struct domain *d = v->domain; -if ( !iommu_enabled || !hvm_domain_irq (d)->dpci ) +if ( !is_iommu_enabled (d) || !hvm_domain_irq (d)->dpci )return ;spin_lock (&d->event_lock);
@@ -2264,7 +2264,7 @@ int hvm_set_cr0(unsigned long value, bool may_defer) }if ( ((value ^ old_value) &X86_CR0_CD ) && - iommu_enabled && hvm_funcs.handle_cd && +is_iommu_enabled (d) && hvm_funcs.handle_cd && (!rangeset_is_empty (d->iomem_caps) || !rangeset_is_empty (d->arch.ioport_caps) ||has_arch_pdevs (d)) )
xen/arch/x86/hvm/vioapic.c +1 -1
@@ -536,7 +536,7 @@ void vioapic_update_EOI(struct domain *d, u8 vector) ent->fields.remote_irr =0 ; -if ( iommu_enabled ) +if (is_iommu_enabled (d) ) {spin_unlock (&d->arch.hvm.irq_lock);hvm_dpci_eoi (d, vioapic->base_gsi + pin, ent);
xen/arch/x86/hvm/vmx/vmcs.c +1 -1
@@ -1087,7 +1087,7 @@ static int construct_vmcs(struct vcpu *v)vmx_clear_msr_intercept (v,MSR_IA32_SYSENTER_CS ,VMX_MSR_RW );vmx_clear_msr_intercept (v,MSR_IA32_SYSENTER_ESP ,VMX_MSR_RW );vmx_clear_msr_intercept (v,MSR_IA32_SYSENTER_EIP ,VMX_MSR_RW ); -if (paging_mode_hap (d) && (!iommu_enabled || iommu_snoop) ) +if (paging_mode_hap (d) && (!is_iommu_enabled (d) || iommu_snoop) )vmx_clear_msr_intercept (v,MSR_IA32_CR_PAT ,VMX_MSR_RW );if ( (vmexit_ctl &VM_EXIT_CLEAR_BNDCFGS ) && (vmentry_ctl &VM_ENTRY_LOAD_BNDCFGS ) )
xen/arch/x86/hvm/vmx/vmx.c +1 -1
@@ -1210,7 +1210,7 @@ static void vmx_handle_cd(struct vcpu *v, unsigned long value) { v->arch.hvm.cache_mode =NORMAL_CACHE_MODE ;vmx_set_guest_pat (v, *pat); -if ( !iommu_enabled || iommu_snoop ) +if ( !is_iommu_enabled (v->domain) || iommu_snoop )vmx_clear_msr_intercept (v,MSR_IA32_CR_PAT ,VMX_MSR_RW );hvm_asid_flush_vcpu (v);/* no need to flush cache */ }
xen/arch/x86/mm/p2m-ept.c +2 -2
@@ -260,7 +260,7 @@ static bool_t ept_split_super_page(struct p2m_domain *p2m, *epte = *ept_entry; epte->sp = (level >1 ); epte->mfn += i * trunk; - epte->snp = (iommu_enabled && iommu_snoop); + epte->snp =is_iommu_enabled (p2m->domain) && iommu_snoop; epte->suppress_ve =1 ;ept_p2m_type_to_flags (p2m, epte, epte->sa_p2mt, epte->access);
@@ -772,7 +772,7 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, new_entry.sp = !!i; new_entry.sa_p2mt = p2mt; new_entry.access = p2ma; - new_entry.snp = (iommu_enabled && iommu_snoop); + new_entry.snp =is_iommu_enabled (d) && iommu_snoop;/* the caller should take care of the previous page */ new_entry.mfn =mfn_x (mfn);
xen/drivers/passthrough/amd/iommu_guest.c +1 -1
@@ -821,7 +821,7 @@ int guest_iommu_init(struct domain* d)struct guest_iommu *iommu;struct domain_iommu *hd =dom_iommu (d); -if ( !is_hvm_domain (d) || !iommu_enabled || !iommuv2_enabled || +if ( !is_hvm_domain (d) || !is_iommu_enabled (d) || !iommuv2_enabled || !has_viommu (d) )return 0 ;
xen/drivers/passthrough/device_tree.c +2 -2
@@ -29,7 +29,7 @@ int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev)int rc = -EBUSY ;struct domain_iommu *hd =dom_iommu (d); -if ( !iommu_enabled || !hd->platform_ops ) +if ( !is_iommu_enabled (d) )return -EINVAL ;if ( !dt_device_is_protected (dev) )
@@ -71,7 +71,7 @@ int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev)const struct domain_iommu *hd =dom_iommu (d);int rc; -if ( !iommu_enabled || !hd->platform_ops ) +if ( !is_iommu_enabled (d) )return -EINVAL ;if ( !dt_device_is_protected (dev) )
xen/drivers/passthrough/io.c +4 -4
@@ -434,7 +434,7 @@ int pt_irq_create_bind(if ( vcpu ) pirq_dpci->gmsi.posted = true; } -if ( vcpu && iommu_enabled ) +if ( vcpu &&is_iommu_enabled (d) )hvm_migrate_pirq (pirq_dpci, vcpu);/* Use interrupt posting if it is supported. */
@@ -817,7 +817,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq)ASSERT (is_hvm_domain (d)); -if ( !iommu_enabled || (!is_hardware_domain (d) && !dpci) || +if ( !is_iommu_enabled (d) || (!is_hardware_domain (d) && !dpci) || !pirq_dpci || !(pirq_dpci->flags &HVM_IRQ_DPCI_MAPPED ) )return 0 ;
@@ -869,7 +869,7 @@ static int _hvm_dpci_msi_eoi(struct domain *d,void hvm_dpci_msi_eoi (struct domain *d,int vector) { -if ( !iommu_enabled || +if ( !is_iommu_enabled (d) || (!hvm_domain_irq (d)->dpci && !is_hardware_domain (d)) )return ;
@@ -1001,7 +1001,7 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi,const struct hvm_irq_dpci *hvm_irq_dpci;const struct hvm_girq_dpci_mapping *girq; -if ( !iommu_enabled ) +if ( !is_iommu_enabled (d) )return ;if (is_hardware_domain (d) )
xen/drivers/passthrough/iommu.c +14 -17
@@ -183,7 +183,7 @@ void __hwdom_init iommu_hwdom_init(struct domain *d)check_hwdom_reqs (d); -if ( !iommu_enabled ) +if ( !is_iommu_enabled (d) )return ;register_keyhandler ('o' , &iommu_dump_p2m_table,"dump iommu p2m table" ,0 );
@@ -288,7 +288,7 @@ int iommu_construct(struct domain *d)void iommu_domain_destroy (struct domain *d) { -if ( !iommu_enabled || !dom_iommu (d)->platform_ops ) +if ( !is_iommu_enabled (d) )return ;iommu_teardown (d);
@@ -304,7 +304,7 @@ int iommu_map(struct domain *d, dfn_t dfn, mfn_t mfn,unsigned long i;int rc =0 ; -if ( !iommu_enabled || !hd->platform_ops ) +if ( !is_iommu_enabled (d) )return 0 ;ASSERT (IS_ALIGNED (dfn_x (dfn), (1ul << page_order)));
@@ -364,7 +364,7 @@ int iommu_unmap(struct domain *d, dfn_t dfn, unsigned int page_order,unsigned long i;int rc =0 ; -if ( !iommu_enabled || !hd->platform_ops ) +if ( !is_iommu_enabled (d) )return 0 ;ASSERT (IS_ALIGNED (dfn_x (dfn), (1ul << page_order)));
@@ -417,7 +417,7 @@ int iommu_lookup_page(struct domain *d, dfn_t dfn, mfn_t *mfn, {const struct domain_iommu *hd =dom_iommu (d); -if ( !iommu_enabled || !hd->platform_ops || !hd->platform_ops->lookup_page ) +if ( !is_iommu_enabled (d) || !hd->platform_ops->lookup_page )return -EOPNOTSUPP ;return iommu_call (hd->platform_ops, lookup_page, d, dfn, mfn, flags);
@@ -446,8 +446,8 @@ int iommu_iotlb_flush(struct domain *d, dfn_t dfn, unsigned int page_count,const struct domain_iommu *hd =dom_iommu (d);int rc; -if ( !iommu_enabled || !hd->platform_ops || - !hd->platform_ops->iotlb_flush || !page_count || !flush_flags ) +if ( !is_iommu_enabled (d) || !hd->platform_ops->iotlb_flush || + !page_count || !flush_flags )return 0 ;if (dfn_eq (dfn,INVALID_DFN ) )
@@ -474,8 +474,8 @@ int iommu_iotlb_flush_all(struct domain *d, unsigned int flush_flags)const struct domain_iommu *hd =dom_iommu (d);int rc; -if ( !iommu_enabled || !hd->platform_ops || - !hd->platform_ops->iotlb_flush_all || !flush_flags ) +if ( !is_iommu_enabled (d) || !hd->platform_ops->iotlb_flush_all || + !flush_flags )return 0 ;/*
@@ -560,8 +560,8 @@ int iommu_do_domctl( {int ret = -ENODEV ; -if ( !iommu_enabled ) -return -ENOSYS ; +if ( !is_iommu_enabled (d) ) +return -EOPNOTSUPP ;#ifdef CONFIG_HAS_PCI ret =iommu_do_pci_domctl (domctl, d, u_domctl);
@@ -580,9 +580,9 @@ void iommu_share_p2m_table(struct domain* d)ASSERT (hap_enabled (d));/* * iommu_use_hap_pt(d) cannot be used here because during domain -* construction need_iommu(d) will always return false here. +* construction has_iommu_pt(d) will always return false here. */ -if ( iommu_enabled && iommu_hap_pt_share ) +if (is_iommu_enabled (d) && iommu_hap_pt_share )iommu_get_ops ()->share_p2m (d); }
@@ -612,10 +612,7 @@ int iommu_get_reserved_device_memory(iommu_grdm_t *func, void *ctxt)bool_t iommu_has_feature (struct domain *d,enum iommu_feature feature) { -if ( !iommu_enabled ) -return 0 ; - -return test_bit (feature,dom_iommu (d)->features); +return is_iommu_enabled (d) &&test_bit (feature,dom_iommu (d)->features); }static void iommu_dump_p2m_table (unsigned char key)
xen/drivers/passthrough/pci.c +8 -8
@@ -595,7 +595,7 @@ static void pci_enable_acs(struct pci_dev *pdev)u16 cap, ctrl, seg = pdev->seg;u8 bus = pdev->bus; -if ( !iommu_enabled ) +if ( !is_iommu_enabled (pdev->domain) )return ; pos =pci_find_ext_capability (seg, bus, pdev->devfn,PCI_EXT_CAP_ID_ACS );
@@ -864,7 +864,7 @@ static int pci_clean_dpci_irqs(struct domain *d) {struct hvm_irq_dpci *hvm_irq_dpci =NULL ; -if ( !iommu_enabled ) +if ( !is_iommu_enabled (d) )return 0 ;if ( !is_hvm_domain (d) )
@@ -897,7 +897,7 @@ static int deassign_device(struct domain *d, uint16_t seg, uint8_t bus,struct pci_dev *pdev;int ret =0 ; -if ( !iommu_enabled || !hd->platform_ops ) +if ( !is_iommu_enabled (d) )return -EINVAL ;ASSERT (pcidevs_locked ());
@@ -1383,7 +1383,7 @@ static int iommu_add_device(struct pci_dev *pdev)ASSERT (pcidevs_locked ()); hd =dom_iommu (pdev->domain); -if ( !iommu_enabled || !hd->platform_ops ) +if ( !is_iommu_enabled (pdev->domain) )return 0 ; rc = hd->platform_ops->add_device (pdev->devfn,pci_to_dev (pdev));
@@ -1412,7 +1412,7 @@ static int iommu_enable_device(struct pci_dev *pdev)ASSERT (pcidevs_locked ()); hd =dom_iommu (pdev->domain); -if ( !iommu_enabled || !hd->platform_ops || +if ( !is_iommu_enabled (pdev->domain) || !hd->platform_ops->enable_device )return 0 ;
@@ -1428,7 +1428,7 @@ static int iommu_remove_device(struct pci_dev *pdev)return -EINVAL ; hd =dom_iommu (pdev->domain); -if ( !iommu_enabled || !hd->platform_ops ) +if ( !is_iommu_enabled (pdev->domain) )return 0 ;for ( devfn = pdev->devfn ; pdev->phantom_stride; )
@@ -1471,7 +1471,7 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)struct pci_dev *pdev;int rc =0 ; -if ( !iommu_enabled || !hd->platform_ops ) +if ( !is_iommu_enabled (d) )return 0 ;/* Prevent device assign if mem paging or mem sharing have been
@@ -1537,7 +1537,7 @@ static int iommu_get_device_group(int i =0 ;const struct iommu_ops *ops = hd->platform_ops; -if ( !iommu_enabled || !ops || !ops->get_device_group_id ) +if ( !is_iommu_enabled (d) || !ops->get_device_group_id )return 0 ; group_id = ops->get_device_group_id (seg, bus, devfn);
xen/drivers/passthrough/vtd/iommu.c +1 -1
@@ -1719,7 +1719,7 @@ static void iommu_domain_teardown(struct domain *d)xfree (mrmrr); } -ASSERT (iommu_enabled); +ASSERT (is_iommu_enabled (d));/* * We can't use iommu_use_hap_pt here because either IOMMU state
xen/drivers/passthrough/vtd/x86/hvm.c +1 -1
@@ -51,7 +51,7 @@ void hvm_dpci_isairq_eoi(struct domain *d, unsigned int isairq)struct hvm_irq_dpci *dpci =NULL ;ASSERT (isairq <NR_ISAIRQS ); -if ( !iommu_enabled ) +if ( !is_iommu_enabled (d) )return ;spin_lock (&d->event_lock);
xen/drivers/passthrough/x86/iommu.c +1 -1
@@ -180,7 +180,7 @@ int arch_iommu_populate_page_table(struct domain *d) void __hwdom_init arch_iommu_check_autotranslated_hwdom(struct domain *d) { -if ( !iommu_enabled ) +if ( !is_iommu_enabled (d) )panic ("Presently, iommu must be enabled for PVH hardware domain\n" ); }
xen/include/asm-x86/iommu.h +9 -2
@@ -61,8 +61,15 @@ extern struct iommu_ops iommu_ops;#ifdef NDEBUG # include <asm/alternative.h> -# define iommu_call(ops, fn, args...) alternative_call(iommu_ops.fn, ## args) -# define iommu_vcall(ops, fn, args...) alternative_vcall(iommu_ops.fn, ## args) +# define iommu_call(ops, fn, args...) ({ \ + (void)(ops); \ + alternative_call(iommu_ops.fn, ## args); \ +}) + +# define iommu_vcall(ops, fn, args...) ({ \ + (void)(ops); \ + alternative_vcall(iommu_ops.fn, ## args); \ +})#endif static inline const struct iommu_ops *iommu_get_ops (void )
xen/xsm/flask/hooks.c +9 -9
@@ -883,7 +883,7 @@ static int flask_map_domain_msi (struct domain *d, int irq, const void *data,#endif } -static u32 flask_iommu_resource_use_perm (void ) +static u32 flask_iommu_resource_use_perm (const struct domain *d) {/* Obtain the permission level required for allowing a domain * to use an assigned device.
@@ -896,7 +896,7 @@ static u32 flask_iommu_resource_use_perm(void)*/ u32 perm =RESOURCE__USE_NOIOMMU ; -if (iommu_enabled) +if (is_iommu_enabled (d) ) perm = ( iommu_intremap ?RESOURCE__USE_IOMMU :RESOURCE__USE_IOMMU_NOINTREMAP );return perm;
@@ -907,7 +907,7 @@ static int flask_map_domain_irq (struct domain *d, int irq, const void *data)u32 sid, dsid;int rc = -EPERM ;struct avc_audit_data ad; -u32 dperm =flask_iommu_resource_use_perm (); +u32 dperm =flask_iommu_resource_use_perm (d);if ( irq >= nr_static_irqs && data ) { rc =flask_map_domain_msi (d, irq, data, &sid, &ad);
@@ -973,7 +973,7 @@ static int flask_bind_pt_irq (struct domain *d, struct xen_domctl_bind_pt_irq *bint rc = -EPERM ;int irq;struct avc_audit_data ad; -u32 dperm =flask_iommu_resource_use_perm (); +u32 dperm =flask_iommu_resource_use_perm (d); rc =current_has_perm (d,SECCLASS_RESOURCE ,RESOURCE__ADD );if ( rc )
@@ -1046,7 +1046,7 @@ static int flask_iomem_permission(struct domain *d, uint64_t start, uint64_t end data.ssid =domain_sid (current->domain); data.dsid =domain_sid (d); - data.use_perm =flask_iommu_resource_use_perm (); + data.use_perm =flask_iommu_resource_use_perm (d);return security_iterate_iomem_sids (start, end, _iomem_has_perm, &data); }
@@ -1071,7 +1071,7 @@ static int flask_pci_config_permission(struct domain *d, uint32_t machine_bdf, uif ( access && (end >=0x10 && start <0x28 ) ) perm =RESOURCE__SETUP ;else - perm =flask_iommu_resource_use_perm (); + perm =flask_iommu_resource_use_perm (d);AVC_AUDIT_DATA_INIT (&ad,DEV ); ad.device = (unsigned long ) machine_bdf;
@@ -1296,7 +1296,7 @@ static int flask_assign_device(struct domain *d, uint32_t machine_bdf)u32 dsid, rsid;int rc = -EPERM ;struct avc_audit_data ad; -u32 dperm =flask_iommu_resource_use_perm (); +u32 dperm =flask_iommu_resource_use_perm (d);if ( !d )return flask_test_assign_device (machine_bdf);
@@ -1355,7 +1355,7 @@ static int flask_assign_dtdevice(struct domain *d, const char *dtpath)u32 dsid, rsid;int rc = -EPERM ;struct avc_audit_data ad; -u32 dperm =flask_iommu_resource_use_perm (); +u32 dperm =flask_iommu_resource_use_perm (d);if ( !d )return flask_test_assign_dtdevice (dtpath);
@@ -1540,7 +1540,7 @@ static int flask_ioport_permission(struct domain *d, uint32_t start, uint32_t en data.ssid =domain_sid (current->domain); data.dsid =domain_sid (d); - data.use_perm =flask_iommu_resource_use_perm (); + data.use_perm =flask_iommu_resource_use_perm (d);return security_iterate_ioport_sids (start, end, _ioport_has_perm, &data); }
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v10 3/6 sysctl / libxl: report whether IOMMU/HAP page table sharing is supported
In reply to Paul DurrantThis patch defines a new bit reported in the hw_cap field of struct xen_sysctl_physinfo to indicate whether the platform supports sharing of HAP page tables (i.e. the P2M) with the IOMMU. This informs the toolstack whether the domain needs extra memory to store discrete IOMMU page tables or not.
NOTE: This patch makes sure iommu_hap_pt_shared is clear if HAP is not
supported or the IOMMU is disabled, and defines it to false if !CONFIG_HVM.
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Christian Lindig <[email protected]>
Cc: David Scott <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Kevin Tian <[email protected]>
v10:
- Set flag in common code (which means clearing iommu_hap_pt_share if HAP cannot be enabled or is configured out).
v9:
- New in v9
--- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl.h | 7 +++++++ tools/libxl/libxl_types.idl | 1 + tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 3 ++- tools/xl/xl_info.c | 5 +++-- xen/arch/x86/hvm/hvm.c | 25 +++++++++++++++++------- xen/common/sysctl.c | 2 ++ xen/drivers/passthrough/amd/iommu_init.c | 5 ++++- xen/drivers/passthrough/iommu.c | 18 ++++++++++++++++- xen/drivers/passthrough/vtd/iommu.c | 6 +++++- xen/include/public/sysctl.h | 6 +++++- xen/include/xen/iommu.h | 8 +++++++- 13 files changed, 74 insertions(+), 15 deletions(-)
tools/libxl/libxl.c +2 -0
@@ -402,6 +402,8 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo) physinfo->cap_hap = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_hap); physinfo->cap_shadow = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_shadow); + physinfo->cap_iommu_hap_pt_share = + !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share);GC_FREE ;return 0 ;
tools/libxl/libxl.h +7 -0
@@ -401,6 +401,13 @@*/ #define LIBXL_HAVE_PHYSINFO_CAP_HAP_SHADOW 1 +/* +* LIBXL_HAVE_PHYSINFO_CAP_IOMMU_HAP_PT_SHARE indicates that libxl_physinfo +* has a cap_iommu_hap_pt_share field that indicates whether the hardware +* supports sharing the IOMMU and HAP page tables. +*/ +#define LIBXL_HAVE_PHYSINFO_CAP_IOMMU_HAP_PT_SHARE 1 +/* * libxl ABI compatibility *
tools/libxl/libxl_types.idl +1 -0
@@ -1027,6 +1027,7 @@ libxl_physinfo = Struct("physinfo", [ ("cap_hvm_directio", bool), # No longer HVM specific ("cap_hap", bool), ("cap_shadow", bool), + ("cap_iommu_hap_pt_share", bool), ], dir=DIR_OUT) libxl_connectorinfo = Struct("connectorinfo", [
tools/ocaml/libs/xc/xenctrl.ml +1 -0
@@ -110,6 +110,7 @@ type physinfo_cap_flag = | CAP_DirectIO | CAP_HAP | CAP_Shadow + | CAP_IOMMU_HAP_PT_SHARE type physinfo = {
tools/ocaml/libs/xc/xenctrl.mli +2 -1
@@ -57,7 +57,6 @@ type domain_create_flag = | CDF_OOS_OFF | CDF_XS_DOMAIN | CDF_IOMMU - type domctl_create_config = { ssidref: int32; handle: string;
@@ -95,6 +94,8 @@ type physinfo_cap_flag = | CAP_DirectIO | CAP_HAP | CAP_Shadow + | CAP_IOMMU_HAP_PT_SHARE + type physinfo = { threads_per_core : int; cores_per_socket : int;
tools/xl/xl_info.c +3 -2
@@ -210,13 +210,14 @@ 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\n" , +maybe_printf ("virt_caps :%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" :"" , info.cap_pv && info.cap_hvm_directio ?" pv_directio" :"" , info.cap_hap ?" hap" :"" , - info.cap_shadow ?" shadow" :"" + info.cap_shadow ?" shadow" :"" , + info.cap_iommu_hap_pt_share ?" iommu_hap_pt_share" :"" ); vinfo =libxl_get_version_info (ctx);
xen/arch/x86/hvm/hvm.c +18 -7
@@ -142,6 +142,22 @@ static struct notifier_block cpu_nfb = { .notifier_call = cpu_callback }; +static bool __init hap_supported (const struct hvm_function_table *fns) +{ +if ( !fns->hap_supported ) + { +printk ("HVM: Hardware Assisted Paging (HAP) not detected\n" ); +return false; + } +else if ( !opt_hap_enabled ) + { +printk ("HVM: Hardware Assisted Paging (HAP) detected but disabled\n" ); +return false; + } + +return true; +} +static int __init hvm_enable (void ) {const struct hvm_function_table *fns =NULL ;
@@ -158,13 +174,8 @@ static int __init hvm_enable(void) hvm_enabled =1 ;printk ("HVM: %s enabled\n" , fns->name); -if ( !fns->hap_supported ) -printk ("HVM: Hardware Assisted Paging (HAP) not detected\n" ); -else if ( !opt_hap_enabled ) - { - hvm_funcs.hap_supported =0 ; -printk ("HVM: Hardware Assisted Paging (HAP) detected but disabled\n" ); - } +if ( !hap_supported (fns) ) + iommu_hap_pt_share = false;else {printk ("HVM: Hardware Assisted Paging (HAP) detected\n" );
xen/common/sysctl.c +2 -0
@@ -269,6 +269,8 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)arch_do_physinfo (pi);if ( iommu_enabled ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_directio; +if ( iommu_hap_pt_share ) + pi->capabilities |= XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share;if (copy_to_guest (u_sysctl, op,1 ) ) ret = -EFAULT ;
xen/drivers/passthrough/amd/iommu_init.c +4 -1
@@ -1401,12 +1401,15 @@ int __init amd_iommu_init(bool xt)if ( rc ) goto error_out; +#ifndef iommu_hap_pt_share/* * Disable sharing HAP page tables with AMD IOMMU, * since it only supports p2m_ram_rw, and this would * prevent doing IO to/from mapped grant frames. */ - iommu_hap_pt_share =0 ; + iommu_hap_pt_share = false; +#endif +printk (XENLOG_DEBUG "AMD-Vi: Disabled HAP memory map sharing with IOMMU\n" );/* per iommu initialization */
xen/drivers/passthrough/iommu.c +17 -1
@@ -49,7 +49,11 @@ int8_t __hwdom_initdata iommu_hwdom_reserved = -1;* default until we find a good solution to resolve it. */ bool_t __read_mostly iommu_intpost; -bool_t __read_mostly iommu_hap_pt_share =1 ; + +#ifndef iommu_hap_pt_share +bool __read_mostly iommu_hap_pt_share = true; +#endif +bool_t __read_mostly iommu_debug;bool_t __read_mostly amd_iommu_perdev_intremap =1 ;
@@ -103,7 +107,14 @@ static int __init parse_iommu_param(const char *s)else if ( (val =parse_boolean ("dom0-strict" , s, ss)) >=0 ) iommu_hwdom_strict = val;else if ( (val =parse_boolean ("sharept" , s, ss)) >=0 ) + { +#ifndef iommu_hap_pt_share iommu_hap_pt_share = val; +#else +if (val != iommu_hap_pt_share) + rc = -EINVAL ; +#endif + }else rc = -EINVAL ;
@@ -511,7 +522,12 @@ int __init iommu_setup(void) iommu_enabled = (rc ==0 ); }if ( !iommu_enabled ) + { iommu_intremap =0 ; +#ifndef iommu_hap_pt_share + iommu_hap_pt_share = false; +#endif + }if ( (force_iommu && !iommu_enabled) || (force_intremap && !iommu_intremap) )
xen/drivers/passthrough/vtd/iommu.c +5 -1
@@ -1898,6 +1898,7 @@ int iommu_pte_flush(struct domain *d, uint64_t dfn, uint64_t *pte,return rc; } +#ifndef iommu_hap_pt_sharestatic int __init vtd_ept_page_compatible (struct vtd_iommu *iommu) {u64 ept_cap, vtd_cap = iommu->cap;
@@ -1910,6 +1911,7 @@ static int __init vtd_ept_page_compatible(struct vtd_iommu *iommu)return (ept_has_2mb (ept_cap) && opt_hap_2mb) ==cap_sps_2mb (vtd_cap) && (ept_has_1gb(ept_cap) && opt_hap_1gb) == cap_sps_1gb(vtd_cap); } +#endif /* * set VT-d page table directory to EPT table if allowed
@@ -2309,8 +2311,10 @@ static int __init vtd_setup(void)if ( !cap_intr_post (iommu->cap) || !iommu_intremap || !cpu_has_cx16 ) iommu_intpost =0 ; +#ifndef iommu_hap_pt_shareif ( !vtd_ept_page_compatible (iommu) ) - iommu_hap_pt_share =0 ; + iommu_hap_pt_share = false; +#endif ret =iommu_set_interrupt (drhd);if ( ret )
xen/include/public/sysctl.h +5 -1
@@ -96,9 +96,13 @@ struct xen_sysctl_tbuf_op {/* The platform supports software paging. */ #define _XEN_SYSCTL_PHYSCAP_shadow 4#define XEN_SYSCTL_PHYSCAP_shadow (1u<<_XEN_SYSCTL_PHYSCAP_shadow) +/* The platform supports sharing of HAP page tables with the IOMMU. */ +#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)/* Max XEN_SYSCTL_PHYSCAP_* constant. Used for ABI checking. */ -#define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_shadow +#define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_hap_pt_sharestruct xen_sysctl_physinfo {uint32_t threads_per_core;
xen/include/xen/iommu.h +7 -1
@@ -55,7 +55,13 @@ static inline bool_t dfn_eq(dfn_t x, dfn_t y)extern bool_t iommu_enable, iommu_enabled;extern bool_t force_iommu, iommu_verbose, iommu_igfx;extern bool_t iommu_snoop, iommu_qinval, iommu_intremap, iommu_intpost; -extern bool_t iommu_hap_pt_share; + +#ifdef CONFIG_HVM +extern bool iommu_hap_pt_share; +#else +#define iommu_hap_pt_share false +#endif +extern bool_t iommu_debug;extern bool_t amd_iommu_perdev_intremap;
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v10 3/6] sysctl / libxl: report whether IOMMU/HAP page table sharing is supported
Quoted 33 lines · Paul Durrant
This patch defines a new bit reported in the
hw_capfield of structxen_sysctl_physinfoto indicate whether the platform supports sharing of HAP page tables (i.e. the P2M) with the IOMMU. This informs the toolstack whether the domain needs extra memory to store discrete IOMMU page tables or not.NOTE: This patch makes sure
iommu_hap_pt_sharedis clear if HAP is not
supported or the IOMMU is disabled, and defines it to false if !CONFIG_HVM.Signed-off-by Paul Durrant <[email protected]>Acked-by Christian Lindig <[email protected]>---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Anthony PERARD <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Christian Lindig <[email protected]>
Cc: David Scott <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Kevin Tian <[email protected]>v10:
- Set flag in common code (which means clearingiommu_hap_pt_shareif HAP cannot be enabled or is configured out).
Quoted 6 lines
v9:
- New in v9--- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl.h | 7 +++++++ tools/libxl/libxl_types.idl | 1 +
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v10 4/6 remove late (on-demand) construction of IOMMU page tables
In reply to Paul DurrantNow that there is a per-domain IOMMU-enable flag, which should be set if any device is going to be passed through, stop deferring page table construction until the assignment is done. Also don't tear down the tables again when the last device is de-assigned; defer that task until domain destruction.
This allows the has_iommu_pt() helper and iommu_status enumeration to be removed. Calls to has_iommu_pt() are simply replaced by calls to is_iommu_enabled(). Remaining open-coded tests of iommu_hap_pt_share can also be replaced by calls to iommu_use_hap_pt().
The arch_iommu_populate_page_table() and iommu_construct() functions become redundant, as does the 'strict mode' dom0 page_list mapping code in iommu_hwdom_init(), and iommu_teardown() can be made static is its only remaining caller, iommu_domain_destroy(), is within the same source module.
All in all, about 220 lines of code are removed from the hypervisor (at the expense of some additions in the toolstack).
NOTE: This patch will cause a small amount of extra resource to be used
to accommodate IOMMU page tables that may never be used, since the per-domain IOMMU-enable flag is currently set to the value of the global iommu_enable flag. A subsequent patch will add an option to the toolstack to allow it to be turned off if there is no intention to assign passthrough hardware to the domain.
To account for the extra resource, 'iommu_memkb' has been added to domain_build_info. This patch sets it to a value calculated based on the domain's maximum memory when the P2M sharing is either not supported or globally disabled, or zero otherwise. However, when the toolstack option mentioned above is added, it will also be zero if the per-domain IOMMU-enable flag is turned off.
---
Cc: Stefano Stabellini <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: Tamas K Lengyel <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Petre Pircalabu <[email protected]>
Previously part of series https://lists.xenproject.org/archives/html/xen-devel/2019-07/msg02267.html
v9:
- Avoid the iommu_memkb overhead if the IOMMU is disable or page tables are shared
v7:
- Add toolstack memory reservation for IOMMU page tables... Re-use of shadow calculation didn't seem appropriate so a new helper function is added
v5:
- Minor style fixes
--- tools/libxl/libxl.h | 7 ++ tools/libxl/libxl_mem.c | 6 +- tools/libxl/libxl_types.idl | 1 + tools/libxl/libxl_utils.c | 15 +++ tools/libxl/libxl_utils.h | 1 + tools/xl/xl_parse.c | 24 ++++- xen/arch/arm/p2m.c | 2 +- xen/arch/x86/dom0_build.c | 2 +- xen/arch/x86/hvm/mtrr.c | 5 +- xen/arch/x86/mm/mem_sharing.c | 2 +- xen/arch/x86/mm/p2m.c | 4 +- xen/arch/x86/mm/paging.c | 2 +- xen/arch/x86/x86_64/mm.c | 2 +- xen/common/memory.c | 4 +- xen/common/vm_event.c | 2 +- xen/drivers/passthrough/device_tree.c | 11 --- xen/drivers/passthrough/iommu.c | 134 ++++++-------------------- xen/drivers/passthrough/pci.c | 12 --- xen/drivers/passthrough/vtd/iommu.c | 10 +- xen/drivers/passthrough/x86/iommu.c | 97 ------------------- xen/include/asm-arm/iommu.h | 2 +- xen/include/asm-x86/iommu.h | 2 +- xen/include/xen/iommu.h | 16 --- xen/include/xen/sched.h | 2 - 24 files changed, 94 insertions(+), 271 deletions(-)
tools/libxl/libxl.h +7 -0
@@ -408,6 +408,13 @@*/ #define LIBXL_HAVE_PHYSINFO_CAP_IOMMU_HAP_PT_SHARE 1 +/* +* LIBXL_HAVE_BUILDINFO_IOMMU_MEMKB indicates thate libxl_domain_build_info +* has an iommu_memkb field which should be set with the amount of memory +* overhead needed by the domain for populating IOMMU page tables. +*/ +#define LIBXL_HAVE_BUILDINFO_IOMMU_MEMKB 1 +/* * libxl ABI compatibility *
tools/libxl/libxl_mem.c +4 -2
@@ -461,15 +461,17 @@ int libxl_domain_need_memory(libxl_ctx *ctx,if (rc) goto out; *need_memkb = b_info->target_memkb; + *need_memkb += b_info->shadow_memkb + b_info->iommu_memkb; +switch (b_info->type) {case LIBXL_DOMAIN_TYPE_PVH :case LIBXL_DOMAIN_TYPE_HVM : - *need_memkb += b_info->shadow_memkb +LIBXL_HVM_EXTRA_MEMORY ; + *need_memkb +=LIBXL_HVM_EXTRA_MEMORY ;if (libxl_defbool_val (b_info->device_model_stubdomain)) *need_memkb +=32 *1024 ;break ;case LIBXL_DOMAIN_TYPE_PV : - *need_memkb += b_info->shadow_memkb +LIBXL_PV_EXTRA_MEMORY ; + *need_memkb +=LIBXL_PV_EXTRA_MEMORY ;break ;default : rc =ERROR_INVAL ;
tools/libxl/libxl_types.idl +1 -0
@@ -486,6 +486,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("target_memkb", MemKB), ("video_memkb", MemKB), ("shadow_memkb", MemKB), + ("iommu_memkb", MemKB), ("rtc_timeoffset", uint32), ("exec_ssidref", uint32), ("exec_ssid_label", string),
tools/libxl/libxl_utils.c +15 -0
@@ -48,6 +48,21 @@ unsigned long libxl_get_required_shadow_memory(unsigned long maxmem_kb, unsignedreturn 4 * (256 * smp_cpus +2 * (maxmem_kb /1024 )); } +unsigned long libxl_get_required_iommu_memory (unsigned long maxmem_kb) +{ +unsigned long iommu_pages =0 , mem_pages = maxmem_kb /4 ; +unsigned int level; + +/* Assume a 4 level page table with 512 entries per level */ +for (level =0 ; level <4 ; level++) + { + mem_pages =DIV_ROUNDUP (mem_pages,512 ); + iommu_pages += mem_pages; + } + +return iommu_pages *4 ; +} +char *libxl_domid_to_name (libxl_ctx *ctx,uint32_t domid) {unsigned int len;
tools/libxl/libxl_utils.h +1 -0
@@ -24,6 +24,7 @@ constchar *libxl_basename (const char *name);/* returns string from strdup */ unsigned long libxl_get_required_shadow_memory (unsigned long maxmem_kb,unsigned int smp_cpus); +unsigned long libxl_get_required_iommu_memory (unsigned long maxmem_kb);int libxl_name_to_domid (libxl_ctx *ctx,const char *name,uint32_t *domid);int libxl_domain_qualifier_to_domid (libxl_ctx *ctx,const char *name,uint32_t *domid);char *libxl_domid_to_name (libxl_ctx *ctx,uint32_t domid);
tools/xl/xl_parse.c +22 -2
@@ -1207,6 +1207,7 @@ void parse_config_data(const char *config_source,int config_len, libxl_domain_config *d_config) { + libxl_physinfo physinfo;const char *buf;long l, vcpus =0 ;XLU_Config *config;
@@ -1221,10 +1222,22 @@ void parse_config_data(const char *config_source,int pci_seize =0 ;int i, e;char *kernel_basename; +bool iommu_enabled, iommu_hap_pt_share;libxl_domain_create_info *c_info = &d_config->c_info;libxl_domain_build_info *b_info = &d_config->b_info; +libxl_physinfo_init (&physinfo); +if (libxl_get_physinfo (ctx, &physinfo) !=0 ) { +libxl_physinfo_dispose (&physinfo); +fprintf (stderr,"libxl_get_physinfo failed\n" ); +exit (EXIT_FAILURE ); + } + + iommu_enabled = physinfo.cap_hvm_directio; + iommu_hap_pt_share = physinfo.cap_iommu_hap_pt_share; +libxl_physinfo_dispose (&physinfo); + config=xlu_cfg_init (stderr, config_source);if (!config) {fprintf (stderr,"Failed to allocate for configuration\n" );
@@ -1448,14 +1461,21 @@ void parse_config_data(const char *config_source,exit (1 ); } -/* libxl_get_required_shadow_memory() must be called after final values +/* libxl_get_required_shadow_memory() and +* libxl_get_required_iommu_memory() must be called after final values * (default or specified) for vcpus and memory are set, because the -* calculation depends on those values. */ +* calculations depend on those values. */ b_info->shadow_memkb = !xlu_cfg_get_long (config,"shadow_memory" , &l,0 ) ? l *1024 :libxl_get_required_shadow_memory (b_info->max_memkb, b_info->max_vcpus); +/* No IOMMU reservation is needed if either the IOMMU is disabled or it +* can share the P2M. */ + b_info->iommu_memkb = (!iommu_enabled || iommu_hap_pt_share) + ?0 + :libxl_get_required_iommu_memory (b_info->max_memkb); +xlu_cfg_get_defbool (config,"nomigrate" , &b_info->disable_migrate,0 );if (!xlu_cfg_get_long (config,"tsc_mode" , &l,1 )) {
xen/arch/arm/p2m.c +1 -1
@@ -1056,7 +1056,7 @@ static int __p2m_set_entry(struct p2m_domain *p2m, !mfn_eq(lpae_get_mfn(*entry), lpae_get_mfn(orig_pte)) )p2m_free_entry (p2m, orig_pte, level); -if (has_iommu_pt (p2m->domain) && +if (is_iommu_enabled (p2m->domain) && (lpae_is_valid (orig_pte) ||lpae_is_valid (*entry)) ) {unsigned int flush_flags =0 ;
xen/arch/x86/dom0_build.c +1 -1
@@ -365,7 +365,7 @@ unsigned long __init dom0_compute_nr_pages( } need_paging =is_hvm_domain (d) && - (!iommu_hap_pt_share || !paging_mode_hap (d)); + (!iommu_use_hap_pt (d) || !paging_mode_hap (d));for ( ; ; need_paging = false ) { nr_pages =get_memsize (&dom0_size, avail);
xen/arch/x86/hvm/mtrr.c +3 -2
@@ -783,7 +783,8 @@ HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr, hvm_load_mtrr_msr, 1,void memory_type_changed (struct domain *d) { -if ( (has_iommu_pt (d) ||cache_flush_permitted (d)) && d->vcpu && d->vcpu[0 ] ) +if ( (is_iommu_enabled (d) ||cache_flush_permitted (d)) && + d->vcpu && d->vcpu[0 ] ) {p2m_memory_type_changed (d);flush_all (FLUSH_CACHE );
@@ -831,7 +832,7 @@ int epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn,return MTRR_TYPE_UNCACHABLE ; } -if ( !has_iommu_pt (d) && !cache_flush_permitted (d) ) +if ( !is_iommu_enabled (d) && !cache_flush_permitted (d) ) { *ipat =1 ;return MTRR_TYPE_WRBACK ;
xen/arch/x86/mm/mem_sharing.c +1 -1
@@ -1664,7 +1664,7 @@ int mem_sharing_domctl(struct domain *d, struct xen_domctl_mem_sharing_op *mec)case XEN_DOMCTL_MEM_SHARING_CONTROL : { rc =0 ; -if (unlikely (has_iommu_pt (d) && mec->u.enable) ) +if (unlikely (is_iommu_enabled (d) && mec->u.enable) ) rc = -EXDEV ;else d->arch.hvm.mem_sharing_enabled = mec->u.enable;
xen/arch/x86/mm/p2m.c +2 -2
@@ -1341,7 +1341,7 @@ int set_identity_p2m_entry(struct domain *d, unsigned long gfn_l,if ( !paging_mode_translate (p2m->domain) ) { -if ( !has_iommu_pt (d) ) +if ( !is_iommu_enabled (d) )return 0 ;return iommu_legacy_map (d,_dfn (gfn_l),_mfn (gfn_l),PAGE_ORDER_4K , IOMMUF_readable | IOMMUF_writable);
@@ -1432,7 +1432,7 @@ int clear_identity_p2m_entry(struct domain *d, unsigned long gfn_l)if ( !paging_mode_translate (d) ) { -if ( !has_iommu_pt (d) ) +if ( !is_iommu_enabled (d) )return 0 ;return iommu_legacy_unmap (d,_dfn (gfn_l),PAGE_ORDER_4K ); }
xen/arch/x86/mm/paging.c +1 -1
@@ -213,7 +213,7 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) {int ret; -if (has_iommu_pt (d) && log_global ) +if (is_iommu_enabled (d) && log_global ) {/* * Refuse to turn on global log-dirty mode
xen/arch/x86/x86_64/mm.c +1 -1
@@ -1434,7 +1434,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm)* shared or being kept in sync then newly added memory needs to be * mapped here. */ -if (has_iommu_pt (hardware_domain) && +if (is_iommu_enabled (hardware_domain) && !iommu_use_hap_pt (hardware_domain) && !need_iommu_pt_sync (hardware_domain) ) {
xen/common/memory.c +2 -2
@@ -823,7 +823,7 @@ int xenmem_add_to_physmap(struct domain *d, struct xen_add_to_physmap *xatp, xatp->gpfn += start; xatp->size -= start; -if (has_iommu_pt (d) ) +if (is_iommu_enabled (d) )this_cpu (iommu_dont_flush_iotlb) =1 ;while ( xatp->size > done )
@@ -844,7 +844,7 @@ int xenmem_add_to_physmap(struct domain *d, struct xen_add_to_physmap *xatp, } } -if (has_iommu_pt (d) ) +if (is_iommu_enabled (d) ) {int ret;
xen/common/vm_event.c +1 -1
@@ -630,7 +630,7 @@ int vm_event_domctl(struct domain *d, struct xen_domctl_vm_event_op *vec)/* No paging if iommu is used */ rc = -EMLINK ; -if (unlikely (has_iommu_pt (d)) ) +if (unlikely (is_iommu_enabled (d)) )break ; rc = -EXDEV ;
xen/drivers/passthrough/device_tree.c +0 -11
@@ -40,17 +40,6 @@ int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev)if ( !list_empty (&dev->domain_list) ) goto fail; -/* -* The hwdom is forced to use IOMMU for protecting assigned -* device. Therefore the IOMMU data is already set up. -*/ -ASSERT (!is_hardware_domain (d) || - hd->status == IOMMU_STATUS_initialized); - - rc =iommu_construct (d); -if ( rc ) - goto fail; -/* The flag field doesn't matter to DT device. */ rc = hd->platform_ops->assign_device (d,0 ,dt_to_dev (dev),0 );
xen/drivers/passthrough/iommu.c +28 -106
182 lines not on this page · raw message
xen/drivers/passthrough/pci.c +0 -12
@@ -933,9 +933,6 @@ static int deassign_device(struct domain *d, uint16_t seg, uint8_t bus, pdev->fault.count =0 ; -if ( !has_arch_pdevs (d) &&has_iommu_pt (d) ) -iommu_teardown (d); -return ret; }
@@ -1484,13 +1481,6 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)if ( !pcidevs_trylock () )return -ERESTART ; - rc =iommu_construct (d); -if ( rc ) - { -pcidevs_unlock (); -return rc; - } - pdev =pci_get_pdev_by_domain (hardware_domain, seg, bus, devfn);if ( !pdev ) {
@@ -1519,8 +1509,6 @@ static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag) } done: -if ( !has_arch_pdevs (d) &&has_iommu_pt (d) ) -iommu_teardown (d);pcidevs_unlock ();return rc;
xen/drivers/passthrough/vtd/iommu.c +1 -9
@@ -1721,15 +1721,7 @@ static void iommu_domain_teardown(struct domain *d)ASSERT (is_iommu_enabled (d)); -/* -* We can't use iommu_use_hap_pt here because either IOMMU state -* is already changed to IOMMU_STATUS_disabled at this point or -* has always been IOMMU_STATUS_disabled. -* -* We also need to test if HAP is enabled because PV guests can -* enter this path too. -*/ -if (hap_enabled (d) && iommu_hap_pt_share ) +if (iommu_use_hap_pt (d) )return ;spin_lock (&hd->arch.mapping_lock);
xen/drivers/passthrough/x86/iommu.c +0 -97
103 lines not on this page · raw message
xen/include/asm-arm/iommu.h +1 -1
@@ -21,7 +21,7 @@ struct arch_iommu };/* Always share P2M Table between the CPU and the IOMMU */ -#define iommu_use_hap_pt (d) (has_iommu_pt(d)) +#define iommu_use_hap_pt (d) is_iommu_enabled(d)const struct iommu_ops *iommu_get_ops (void );void iommu_set_ops (const struct iommu_ops *ops);
xen/include/asm-x86/iommu.h +1 -1
@@ -88,7 +88,7 @@ extern const struct iommu_init_ops *iommu_init_ops;/* Are we using the domain P2M table as its IOMMU pagetable? */ #define iommu_use_hap_pt (d) \ - (hap_enabled(d) && has_iommu_pt(d) && iommu_hap_pt_share) + (hap_enabled(d) && is_iommu_enabled(d) && iommu_hap_pt_share)void iommu_update_ire_from_apic (unsigned int apic,unsigned int reg,unsigned int value);unsigned int iommu_read_apic_from_ire (unsigned int apic,unsigned int reg);
xen/include/xen/iommu.h +0 -16
@@ -79,15 +79,9 @@ void iommu_domain_destroy(struct domain *d);void arch_iommu_domain_destroy (struct domain *d);int arch_iommu_domain_init (struct domain *d); -int arch_iommu_populate_page_table (struct domain *d);void arch_iommu_check_autotranslated_hwdom (struct domain *d);void arch_iommu_hwdom_init (struct domain *d); -int iommu_construct (struct domain *d); - -/* Function used internally, use iommu_domain_destroy */ -void iommu_teardown (struct domain *d); -/* * The following flags are passed to map operations and passed by lookup * operations.
@@ -254,13 +248,6 @@ struct iommu_ops {# define iommu_vcall iommu_call#endif -enum iommu_status -{ - IOMMU_STATUS_disabled, - IOMMU_STATUS_initializing, - IOMMU_STATUS_initialized -}; -struct domain_iommu {struct arch_iommu arch;
@@ -280,9 +267,6 @@ struct domain_iommu {/* Features supported by the IOMMU */ DECLARE_BITMAP (features, IOMMU_FEAT_count); -/* Status of guest IOMMU mappings */ -enum iommu_status status; -/* * Does the guest reqire mappings to be synchonized, to maintain * the default dfn == pfn map. (See comment on dfn at the top of
xen/include/xen/sched.h +0 -2
@@ -966,10 +966,8 @@ static inline bool is_hwdom_pinned_vcpu(const struct vcpu *v) }#ifdef CONFIG_HAS_PASSTHROUGH -#define has_iommu_pt (d) (dom_iommu(d)->status != IOMMU_STATUS_disabled)#define need_iommu_pt_sync (d) (dom_iommu(d)->need_sync)#else -#define has_iommu_pt (d) false#define need_iommu_pt_sync (d) false#endif
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v10 5/6 iommu: tidy up iommu_use_hap_pt() and need_iommu_pt_sync() macros
In reply to Paul DurrantThes macros really ought to live in the common xen/iommu.h header rather then being distributed amongst architecture specific iommu headers and xen/sched.h. This patch moves them there.
NOTE: Disabling 'sharept' in the command line iommu options should really
be hard error on ARM (as opposed to just being ignored), so define 'iommu_hap_pt_share' to be true for ARM (via ARM-selected CONFIG_IOMMU_FORCE_PT_SHARE).
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Previously part of https://lists.xenproject.org/archives/html/xen-devel/2019-07/msg02267.html
v9:
- Add new Kconfig option to cause 'iommu_hap_pt_share' to be defined to true, rather than using CONFIG_ARM, as requested by Julien
- Assuming Jan's R-b stands since this is a mainly a cosmetic change directly requested by another maintainer
v7:
- Re-work the ARM handling of 'sharept' as suggested by Jan
- Make sure that need_iommu_pt_sync() always evaluates its argument
--- xen/arch/arm/Kconfig | 1 + xen/drivers/passthrough/Kconfig | 3 +++ xen/include/asm-arm/iommu.h | 3 --- xen/include/asm-x86/iommu.h | 4 ---- xen/include/xen/iommu.h | 15 ++++++++++++++- xen/include/xen/sched.h | 6 ------ 6 files changed, 18 insertions(+), 14 deletions(-)
xen/arch/arm/Kconfig +1 -0
@@ -20,6 +20,7 @@ config ARM select HAS_DEVICE_TREE select HAS_PASSTHROUGH select HAS_PDX + select IOMMU_FORCE_PT_SHARE config ARCH_DEFCONFIG string
xen/drivers/passthrough/Kconfig +3 -0
@@ -13,3 +13,6 @@ config ARM_SMMU Say Y here if your SoC includes an IOMMU device implementing the ARM SMMU architecture. endif + +config IOMMU_FORCE_PT_SHARE + bool
xen/include/asm-arm/iommu.h +0 -3
@@ -20,9 +20,6 @@ struct arch_iommuvoid *priv; }; -/* Always share P2M Table between the CPU and the IOMMU */ -#define iommu_use_hap_pt (d) is_iommu_enabled(d) -const struct iommu_ops *iommu_get_ops (void );void iommu_set_ops (const struct iommu_ops *ops);
xen/include/asm-x86/iommu.h +0 -4
@@ -86,10 +86,6 @@ struct iommu_init_ops {extern const struct iommu_init_ops *iommu_init_ops; -/* Are we using the domain P2M table as its IOMMU pagetable? */ -#define iommu_use_hap_pt (d) \ - (hap_enabled(d) && is_iommu_enabled(d) && iommu_hap_pt_share) -void iommu_update_ire_from_apic (unsigned int apic,unsigned int reg,unsigned int value);unsigned int iommu_read_apic_from_ire (unsigned int apic,unsigned int reg);int iommu_setup_hpet_msi (struct msi_desc *);
xen/include/xen/iommu.h +14 -1
@@ -56,8 +56,10 @@ extern bool_t iommu_enable, iommu_enabled;extern bool_t force_iommu, iommu_verbose, iommu_igfx;extern bool_t iommu_snoop, iommu_qinval, iommu_intremap, iommu_intpost; -#ifdef CONFIG_HVM +#if defined(CONFIG_HVM )extern bool iommu_hap_pt_share; +#elif defined(CONFIG_IOMMU_FORCE_PT_SHARE ) +#define iommu_hap_pt_share true#else #define iommu_hap_pt_share false#endif
@@ -279,6 +281,17 @@ struct domain_iommu {#define iommu_set_feature (d, f) set_bit(f, dom_iommu(d)->features)#define iommu_clear_feature (d, f) clear_bit(f, dom_iommu(d)->features) +/* Are we using the domain P2M table as its IOMMU pagetable? */ +#define iommu_use_hap_pt (d) \ + (hap_enabled(d) && is_iommu_enabled(d) && iommu_hap_pt_share) + +/* Does the IOMMU pagetable need to be kept synchronized with the P2M */ +#ifdef CONFIG_HAS_PASSTHROUGH +#define need_iommu_pt_sync (d) (dom_iommu(d)->need_sync) +#else +#define need_iommu_pt_sync (d) ({ (void)(d); false; }) +#endif +int __must_check iommu_suspend (void );void iommu_resume (void );void iommu_crash_shutdown (void );
xen/include/xen/sched.h +0 -6
@@ -965,12 +965,6 @@ static inline bool is_hwdom_pinned_vcpu(const struct vcpu *v) cpumask_weight(v->cpu_hard_affinity) == 1); } -#ifdef CONFIG_HAS_PASSTHROUGH -#define need_iommu_pt_sync (d) (dom_iommu(d)->need_sync) -#else -#define need_iommu_pt_sync (d) false -#endif -static inline bool is_vcpu_online (const struct vcpu *v) {return !test_bit (_VPF_down, &v->pause_flags);
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v10 5/6] iommu: tidy up iommu_use_hap_pt() and need_iommu_pt_sync() macros
Quoted 4 lines · Paul Durrant
xen/include/xen/iommu.h +0
-0@@ -56,8 +56,10 @@ extern bool_t iommu_enable, iommu_enabled;extern bool_t force_iommu, iommu_verbose, iommu_igfx;
xen/include/xen/iommu.h extern bool_t iommu_enable, iommu_enabled; · line 65
Quoted 10 lines
xen/include/xen/iommu.h +3
-1extern bool_t iommu_snoop, iommu_qinval, iommu_intremap, iommu_intpost; -#ifdef CONFIG_HVM +#if defined(CONFIG_HVM )extern bool iommu_hap_pt_share; +#elif defined(CONFIG_IOMMU_FORCE_PT_SHARE ) +#define iommu_hap_pt_share true#else #define iommu_hap_pt_share false#endif
The ordering is wrong here - Arm unconditionally defines HVM, and hence it now also setting IOMMU_FORCE_PT_SHARE won't be accounted for this way. I'd be happy to adjust this on commit, but I'm afraid I'm still unhappy about patch 3 (but I guess at this point I'll better propose a replacement than ask you for going through another round).
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v10 5/6] iommu: tidy up iommu_use_hap_pt() and need_iommu_pt_sync() macros
Quoted 18 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 13 September 2019 11:05
To: Paul Durrant <[email protected]>
Cc: [email protected]; Julien Grall <[email protected]>; Andrew Cooper <[email protected]>; Roger Pau Monne <[email protected]>; Volodymyr Babchuk <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Stefano Stabellini <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Tim (Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: Re: [PATCH v10 5/6] iommu: tidy upiommu_use_hap_pt()andneed_iommu_pt_sync()macrosQuoted 6 lines · Paul Durrant
xen/include/xen/iommu.h +0
-0@@ -56,8 +56,10 @@ extern bool_t iommu_enable, iommu_enabled;extern bool_t force_iommu, iommu_verbose, iommu_igfx;extern bool_t iommu_snoop, iommu_qinval, iommu_intremap, iommu_intpost;
Quoted 12 lines
xen/include/xen/iommu.h extern bool_t iommu_enable, iommu_enabled; · line 65
Quoted 8 lines
xen/include/xen/iommu.h +3
-1-#ifdef CONFIG_HVM +#if defined(CONFIG_HVM )extern bool iommu_hap_pt_share; +#elif defined(CONFIG_IOMMU_FORCE_PT_SHARE ) +#define iommu_hap_pt_share true#else #define iommu_hap_pt_share false#endif The ordering is wrong here - Arm unconditionally defines HVM, and hence it now also setting
IOMMU_FORCE_PT_SHAREwon't be accounted for this way.
Ah yes, good point.
Quoted 5 lines
I'd be happy to adjust this on commit, but I'm afraid I'm still unhappy about patch 3 (but I guess at this point I'll better propose a replacement than ask you for going through another round).
That would be helpful.
Paul
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v10 5/6] iommu: tidy up iommu_use_hap_pt() and need_iommu_pt_sync() macros
In reply to Jan BeulichQuoted 18 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 13 September 2019 11:05
To: Paul Durrant <[email protected]>
Cc: [email protected]; Julien Grall <[email protected]>; Andrew Cooper <[email protected]>; Roger Pau Monne <[email protected]>; Volodymyr Babchuk <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Stefano Stabellini <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Tim (Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: Re: [PATCH v10 5/6] iommu: tidy upiommu_use_hap_pt()andneed_iommu_pt_sync()macrosQuoted 6 lines · Paul Durrant
xen/include/xen/iommu.h +0
-0@@ -56,8 +56,10 @@ extern bool_t iommu_enable, iommu_enabled;extern bool_t force_iommu, iommu_verbose, iommu_igfx;extern bool_t iommu_snoop, iommu_qinval, iommu_intremap, iommu_intpost;
Quoted 16 lines
xen/include/xen/iommu.h extern bool_t iommu_enable, iommu_enabled; · line 65
Quoted 8 lines
xen/include/xen/iommu.h +3
-1-#ifdef CONFIG_HVM +#if defined(CONFIG_HVM )extern bool iommu_hap_pt_share; +#elif defined(CONFIG_IOMMU_FORCE_PT_SHARE ) +#define iommu_hap_pt_share true#else #define iommu_hap_pt_share false#endif The ordering is wrong here - Arm unconditionally defines HVM, and hence it now also setting
IOMMU_FORCE_PT_SHAREwon't be accounted for this way. I'd be happy to adjust this on commit, but I'm afraid I'm still unhappy about patch 3 (but I guess at this point I'll better propose a replacement than ask you for going through another round).
Actually I'm going to send a v11 anyway, as there are issues with the abi-check (now that Ian has fixed the script).
Paul
Quoted 1 line
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v10 6/6 introduce a 'passthrough' configuration option to xl.cfg...
In reply to Paul Durrant...and hence the ability to disable IOMMU mappings, and control EPT sharing.
This patch introduces a new 'libxl_passthrough' enumeration into libxl_domain_create_info. The value will be set by xl either when it parses a new 'passthrough' option in xl.cfg, or implicitly if there is passthrough hardware specified for the domain.
If the value of the passthrough configuration option is 'disabled' then the XEN_DOMCTL_CDF_iommu flag will be clear in the xen_domctl_createdomain flags, thus allowing the toolstack to control whether the domain gets IOMMU mappings or not (where previously they were globally set).
If the value of the passthrough configuration option is 'sync_pt' then a new 'iommu_opts' field in xen_domctl_createdomain will be set with the value XEN_DOMCTL_IOMMU_no_sharept. This will override the global default set in iommu_hap_pt_share, thus allowing the toolstack to control whether EPT sharing is used for the domain.
If the value of passthrough is 'enabled' then xl will choose an appropriate default according to the type of domain and hardware support.
NOTE: The 'iommu_memkb' overhead in libxl_domain_build_info will now only
be set if passthrough is 'sync_pt' (or xl has chosen this mode as a default).
---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Anthony PERARD <[email protected]>
Cc: David Scott <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Previously part of series https://lists.xenproject.org/archives/html/xen-devel/2019-07/msg02267.html
v10:
- Added abi-check runes
v9:
- Added the passthrough='enabled' option to xl
- One cosmetic change in xen
- Assume Jan's R-b stands since non-cosmetic changes are only in the toolstack
v7:
- Added missing breaks
- Added missing ocaml binding changes
v6:
- Remove the libxl_physinfo() call since it's usefulness is limited to x86
v5:
- Expand xen_domctl_createdomain flags field and hence bump interface version
- Fix spelling mistakes in context line
--- docs/man/xl.cfg.5.pod.in | 56 ++++++++++ tools/libxl/libxl.h | 9 ++ tools/libxl/libxl_create.c | 9 ++ tools/libxl/libxl_types.idl | 7 ++ tools/ocaml/libs/xc/xenctrl.ml | 4 + tools/ocaml/libs/xc/xenctrl.mli | 5 + tools/ocaml/libs/xc/xenctrl_stubs.c | 17 ++- tools/xl/xl_parse.c | 158 ++++++++++++++++++---------- xen/arch/arm/domain.c | 10 +- xen/arch/x86/domain.c | 2 +- xen/common/domain.c | 7 ++ xen/common/domctl.c | 13 --- xen/drivers/passthrough/iommu.c | 13 ++- xen/include/public/domctl.h | 10 +- xen/include/xen/iommu.h | 15 +-- 15 files changed, 254 insertions(+), 81 deletions(-)
docs/man/xl.cfg.5.pod.in +56 -0
@@ -605,6 +605,62 @@ option should only be used with a trusted device tree. Note that the partial device tree should avoid using the phandle 65000 which is reserved by the toolstack. +=item B<passthrough="STRING"> + +Specify whether IOMMU mappings are enabled for the domain and hence whether +it will be enabled for passthrough hardware. Valid values for this option +are: + +=over 4 + +=item B<disabled> + +IOMMU mappings are disabled for the domain and so hardware may not be +passed through. + +This option is the default if no passthrough hardware is specified in the +domain's configuration. + +=item B<sync_pt> + +This option means that IOMMU mappings will be synchronized with the +domain's P2M table as follows: + +For a PV domain, all writable pages assigned to the domain are identity +mapped by MFN in the IOMMU page table. Thus a device driver running in the +domain may program passthrough hardware for DMA using MFN values +(i.e. host/machine frame numbers) looked up in its P2M. + +For an HVM domain, all non-foreign RAM pages present in its P2M will be +mapped by GFN in the IOMMU page table. Thus a device driver running in the +domain may program passthrough hardware using GFN values (i.e. guest +physical frame numbers) without any further translation. + +This option is not currently available on Arm. + +=item B<share_pt> + +This option is unavailable for a PV domain. For an HVM domain, this option +means that the IOMMU will be programmed to directly reference the domain's +P2M table as its page table. From the point of view of a device driver +running in the domain this is functionally equivalent to B<sync_pt> but +places less load on the hypervisor and so should generally be selected in +preference. However, the availability of this option is hardware specific. +If B<xl info> reports B<virt_caps> containing B<iommu_hap_pt_share> then +this option may be used. + +=item B<enabled> + +This option enables IOMMU mappings and selects an appropriate default +operating mode. For HVM domains running on platforms where the option is +available, this is equivalent to B<share_pt>. Otherwise, and also for PV +domains, this options is equivalent to B<sync_pt>. + +This option is the default if passthrough hardware is specified in the +domain's configuration. + +=back + =back =head2 Devices
tools/libxl/libxl.h +9 -0
@@ -415,6 +415,15 @@*/ #define LIBXL_HAVE_BUILDINFO_IOMMU_MEMKB 1 +/* +* LIBXL_HAVE_CREATEINFO_PASSTHROUGH indicates that +* libxl_domain_create_info has a passthrough field (which is a +* libxl_passthrough enumeration) that indicates whether device pass- +* through is enabled for the domain and, if so, whether the IOMMU and +* HAP page tables may be shared or not. +*/ +#define LIBXL_HAVE_CREATEINFO_PASSTHROUGH 1 +/* * libxl ABI compatibility *
tools/libxl/libxl_create.c +9 -0
@@ -578,6 +578,15 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config,libxl_defbool_val (info->oos) ?0 : XEN_DOMCTL_CDF_oos_off; } +LOG (DETAIL ,"passthrough: %s" , +libxl_passthrough_to_string (info->passthrough)); + +if (info->passthrough !=LIBXL_PASSTHROUGH_DISABLED ) + create.flags |= XEN_DOMCTL_CDF_iommu; + +if (info->passthrough ==LIBXL_PASSTHROUGH_SYNC_PT ) + create.iommu_opts |= XEN_DOMCTL_IOMMU_no_sharept; +/* Ultimately, handle is an array of 16 uint8_t, same as uuid */ libxl_uuid_copy (ctx, (libxl_uuid *)&create.handle, &info->uuid);
tools/libxl/libxl_types.idl +7 -0
@@ -263,6 +263,12 @@ libxl_vkb_backend = Enumeration("vkb_backend", [ (2, "LINUX") ]) +libxl_passthrough = Enumeration("passthrough", [ + (0, "disabled"), + (1, "sync_pt"), + (2, "share_pt"), + ]) + # # Complex libxl types #
@@ -408,6 +414,7 @@ libxl_domain_create_info = Struct("domain_create_info",[ ("pool_name", string), ("run_hotplug_scripts",libxl_defbool), ("driver_domain",libxl_defbool), + ("passthrough", libxl_passthrough), ], dir=DIR_IN) libxl_domain_restore_params = Struct("domain_restore_params", [
tools/ocaml/libs/xc/xenctrl.ml +4 -0
@@ -65,11 +65,15 @@ type domain_create_flag = | CDF_XS_DOMAIN | CDF_IOMMU +type domain_create_iommu_opts = + | IOMMU_NO_SHAREPT + type domctl_create_config = { ssidref: int32; handle: string; flags: domain_create_flag list; + iommu_opts: domain_create_iommu_opts list; max_vcpus: int; max_evtchn_port: int; max_grant_frames: int;
tools/ocaml/libs/xc/xenctrl.mli +5 -0
@@ -57,10 +57,15 @@ type domain_create_flag = | CDF_OOS_OFF | CDF_XS_DOMAIN | CDF_IOMMU + +type domain_create_iommu_opts = + | IOMMU_NO_SHAREPT + type domctl_create_config = { ssidref: int32; handle: string; flags: domain_create_flag list; + iommu_opts: domain_create_iommu_opts list; max_vcpus: int; max_evtchn_port: int; max_grant_frames: int;
tools/ocaml/libs/xc/xenctrl_stubs.c +12 -5
@@ -190,11 +190,12 @@ CAMLprim value stub_xc_domain_create(value xch, value config)#define VAL_SSIDREF Field(config, 0)#define VAL_HANDLE Field(config, 1)#define VAL_FLAGS Field(config, 2) -#define VAL_MAX_VCPUS Field(config, 3) -#define VAL_MAX_EVTCHN_PORT Field(config, 4) -#define VAL_MAX_GRANT_FRAMES Field(config, 5) -#define VAL_MAX_MAPTRACK_FRAMES Field(config, 6) -#define VAL_ARCH Field(config, 7) +#define VAL_IOMMU_OPTS Field(config, 3) +#define VAL_MAX_VCPUS Field(config, 4) +#define VAL_MAX_EVTCHN_PORT Field(config, 5) +#define VAL_MAX_GRANT_FRAMES Field(config, 6) +#define VAL_MAX_MAPTRACK_FRAMES Field(config, 7) +#define VAL_ARCH Field(config, 8)uint32_t domid =0 ;int result;
@@ -213,6 +214,11 @@ CAMLprim value stub_xc_domain_create(value xch, value config)/* ! XEN_DOMCTL_CDF_ XEN_DOMCTL_CDF_MAX max */ (VAL_FLAGS ); + cfg.iommu_opts =ocaml_list_to_c_bitmap +/* ! domain_create_iommu_opts IOMMU_ none */ +/* ! XEN_DOMCTL_IOMMU_ XEN_DOMCTL_IOMMU_MAX max */ + (VAL_IOMMU_OPTS ); + arch_domconfig =Field (VAL_ARCH ,0 );switch (Tag_val (VAL_ARCH ) ) {
@@ -247,6 +253,7 @@ CAMLprim value stub_xc_domain_create(value xch, value config)#undef VAL_MAX_GRANT_FRAMES#undef VAL_MAX_EVTCHN_PORT#undef VAL_MAX_VCPUS +#undef VAL_IOMMU_OPTS#undef VAL_FLAGS#undef VAL_HANDLE#undef VAL_SSIDREF
tools/xl/xl_parse.c +105 -53
176 lines not on this page · raw message
xen/arch/arm/domain.c +9 -1
@@ -617,6 +617,14 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config)return -EINVAL ; } +/* The P2M table must always be shared between the CPU and the IOMMU */ +if ( config->iommu_opts & XEN_DOMCTL_IOMMU_no_sharept ) + { +dprintk (XENLOG_INFO , +"Unsupported iommu option: XEN_DOMCTL_IOMMU_no_sharept\n" ); +return -EINVAL ; + } +/* Fill in the native GIC version, passed back to the toolstack. */ if ( config->arch.gic_version ==XEN_DOMCTL_CONFIG_GIC_NATIVE ) {
@@ -677,7 +685,7 @@ int arch_domain_create(struct domain *d,ASSERT (config !=NULL );/* p2m_init relies on some value initialized by the IOMMU subsystem */ -if ( (rc =iommu_domain_init (d)) !=0 ) +if ( (rc =iommu_domain_init (d, config->iommu_opts)) !=0 ) goto fail;if ( (rc =p2m_init (d)) !=0 )
xen/arch/x86/domain.c +1 -1
@@ -611,7 +611,7 @@ int arch_domain_create(struct domain *d,if ( (rc =init_domain_irq_mapping (d)) !=0 ) goto fail; -if ( (rc =iommu_domain_init (d)) !=0 ) +if ( (rc =iommu_domain_init (d, config->iommu_opts)) !=0 ) goto fail;psr_domain_init (d);
xen/common/domain.c +7 -0
@@ -308,6 +308,13 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config)return -EINVAL ; } +if ( !(config->flags & XEN_DOMCTL_CDF_iommu) && config->iommu_opts ) + { +dprintk (XENLOG_INFO , +"IOMMU options specified but IOMMU not enabled\n" ); +return -EINVAL ; + } +if ( config->max_vcpus <1 ) {dprintk (XENLOG_INFO ,"No vCPUS\n" );
xen/common/domctl.c +0 -13
@@ -515,19 +515,6 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) rover = dom; } -/* -* For now, make sure the createdomain IOMMU flag is set if the -* IOMMU is enabled. When the flag comes under toolstack control -* this can go away. -*/ -if ( op->u.createdomain.flags & XEN_DOMCTL_CDF_iommu ) - { -ASSERT_UNREACHABLE (); -return -EINVAL ; - } -if ( iommu_enabled ) - op->u.createdomain.flags |= XEN_DOMCTL_CDF_iommu; - d =domain_create (dom, &op->u.createdomain, false);if (IS_ERR (d) ) {
xen/drivers/passthrough/iommu.c +12 -1
@@ -168,7 +168,7 @@ static void __hwdom_init check_hwdom_reqs(struct domain *d) iommu_hwdom_strict = true; } -int iommu_domain_init (struct domain *d) +int iommu_domain_init (struct domain *d,unsigned int opts) {struct domain_iommu *hd =dom_iommu (d);int ret =0 ;
@@ -192,6 +192,15 @@ int iommu_domain_init(struct domain *d)if (is_hardware_domain (d) )check_hwdom_reqs (d);/* may modify iommu_hwdom_strict */ +/* +* Use shared page tables for HAP and IOMMU if the global option +* is enabled (from which we can infer the h/w is capable) and +* the domain options do not disallow it. HAP must, of course, also +* be enabled. +*/ + hd->hap_pt_share =hap_enabled (d) && iommu_hap_pt_share && + !(opts & XEN_DOMCTL_IOMMU_no_sharept); +/* * NB: 'relaxed' h/w domains don't need the IOMMU mappings to be kept * in-sync with their assigned pages because all host RAM will be
@@ -200,6 +209,8 @@ int iommu_domain_init(struct domain *d)if ( !is_hardware_domain (d) || iommu_hwdom_strict ) hd->need_sync = !iommu_use_hap_pt (d); +ASSERT (!(hd->need_sync && hd->hap_pt_share)); +return 0 ; }
xen/include/public/domctl.h +9 -1
@@ -38,7 +38,7 @@#include "hvm/save.h" #include "memory.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000011 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000012/* * NB. xen_domctl.domain is an IN/OUT parameter for this operation.
@@ -73,6 +73,14 @@ struct xen_domctl_createdomain {uint32_t flags; +#define _XEN_DOMCTL_IOMMU_no_sharept 0 +#define XEN_DOMCTL_IOMMU_no_sharept (1U << _XEN_DOMCTL_IOMMU_no_sharept) + +/* Max XEN_DOMCTL_IOMMU_* constant. Used for ABI checking. */ +#define XEN_DOMCTL_IOMMU_MAX XEN_DOMCTL_IOMMU_no_sharept + +uint32_t iommu_opts; +/* * Various domain limits, which impact the quantity of resources (global * mapping space, xenheap, etc) a guest may consume.
xen/include/xen/iommu.h +9 -6
@@ -75,7 +75,7 @@ extern unsigned int iommu_dev_iotlb_timeout;int iommu_setup (void );int iommu_hardware_setup (void ); -int iommu_domain_init (struct domain *d); +int iommu_domain_init (struct domain *d,unsigned int opts);void iommu_hwdom_init (struct domain *d);void iommu_domain_destroy (struct domain *d);
@@ -269,10 +269,14 @@ struct domain_iommu {/* Features supported by the IOMMU */ DECLARE_BITMAP (features, IOMMU_FEAT_count); +/* Does the guest share HAP mapping with the IOMMU? */ +bool hap_pt_share; +/* -* Does the guest reqire mappings to be synchonized, to maintain -* the default dfn == pfn map. (See comment on dfn at the top of -* include/xen/mm.h). +* Does the guest require mappings to be synchronized, to maintain +* the default dfn == pfn map? (See comment on dfn at the top of +* include/xen/mm.h). Note that hap_pt_share == false does not +* necessarily imply this is true. */ bool need_sync; };
@@ -282,8 +286,7 @@ struct domain_iommu {#define iommu_clear_feature (d, f) clear_bit(f, dom_iommu(d)->features)/* Are we using the domain P2M table as its IOMMU pagetable? */ -#define iommu_use_hap_pt (d) \ - (hap_enabled(d) && is_iommu_enabled(d) && iommu_hap_pt_share) +#define iommu_use_hap_pt (d) (dom_iommu(d)->hap_pt_share)/* Does the IOMMU pagetable need to be kept synchronized with the P2M */ #ifdef CONFIG_HAS_PASSTHROUGH
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 1/1 tools/ocaml: abi check: Cope with consecutive relevant enums
If the end of one enum is the `type' line for the next enum, we would not notice it.
Fix this by reordering the code, and getting rid of the else: now if the "we are within an enum" branch decides that it's the end of the enum, it unsets $ei and we then immediately process the line as a "not within an enum" line - ie as the start of the next one.
--- tools/ocaml/libs/xc/abi-check | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
tools/ocaml/libs/xc/abi-check +9 -8
@@ -70,14 +70,7 @@ my $cval; $ei = undef; my $bitnum = 0; while (<OCAML_FILE>) { - if (!$ei) { - if (m{^type \s+ (\w+) \s* \= \s* $}x && $enums{$1}) { - print "// found ocaml type $1 at $o:$.\n" or die $!; - $ei = $enums{$1}; - $cval = ''; - $bitnum = 0; - } - } else { + if ($ei) { if (m{^\s+ \| \s* $ei->{OPrefix} (\w+) \s*$}x) { $cval = $1; if ($ei->{Mangle} eq 'lc') {
@@ -104,6 +97,14 @@ while (<OCAML_FILE>) { die "$_ ?"; } } + if (!$ei) { + if (m{^type \s+ (\w+) \s* \= \s* $}x && $enums{$1}) { + print "// found ocaml type $1 at $o:$.\n" or die $!; + $ei = $enums{$1}; + $cval = ''; + $bitnum = 0; + } + } } foreach $ei (values %enums) {
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel