|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v2 03/17] xen: Add DOMAIN_CAPS_DEVICE_MODEL & XEN_DOMCTL_CDF_device_model
To add more flexibility in system configuration add the new
DOMAIN_CAPS_DEVICE_MODEL flag and XEN_DOMCTL_CDF_device_model.
Thie new flag corresponds to allowing XSM_DM_PRIV for the domain. This
will enable running device model emulators (QEMU) from the assigned
domain for multiple target domains.
Stubdoms assign target allowing the stubdom to serve as the device
model for a single domain. This new flag allows the single domain to
provide emulators for multiple guests.
The specific scenario is a disaggregated system with the hardware domain
providing device models for multiple guest domains.
This permission is also enough to run xenconsoled in the hardware
domain. This is a byproduct of getdomaininfo being available. The
grant permissions are also configured for the console page.
The OCaml code needs the flag added in as well.
Signed-off-by: Jason Andryuk <jason.andryuk@xxxxxxx>
Acked-by: Christian Lindig <christian.lindig@xxxxxxxxx>
---
v2:
Add Christian's Ack
XSM_DM_PRIV falls through to the is_control_domain() check - should this
be a return to make them into disjoint sets?
---
tools/ocaml/libs/xc/xenctrl.ml | 1 +
tools/ocaml/libs/xc/xenctrl.mli | 1 +
xen/arch/arm/domain.c | 3 ++-
xen/common/device-tree/dom0less-build.c | 3 +++
xen/common/domain.c | 3 ++-
xen/include/public/bootfdt.h | 12 ++++++++++--
xen/include/public/domctl.h | 4 +++-
xen/include/xen/sched.h | 9 +++++++++
xen/include/xsm/dummy.h | 2 ++
9 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml
index 7e1aabad6c..f5835e7d95 100644
--- a/tools/ocaml/libs/xc/xenctrl.ml
+++ b/tools/ocaml/libs/xc/xenctrl.ml
@@ -71,6 +71,7 @@ type domain_create_flag =
| CDF_NESTED_VIRT
| CDF_VPMU
| CDF_TRAP_UNMAPPED_ACCESSES
+ | CDF_DEVICE_MODEL
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 f44dba61ae..b9471a56a8 100644
--- a/tools/ocaml/libs/xc/xenctrl.mli
+++ b/tools/ocaml/libs/xc/xenctrl.mli
@@ -64,6 +64,7 @@ type domain_create_flag =
| CDF_NESTED_VIRT
| CDF_VPMU
| CDF_TRAP_UNMAPPED_ACCESSES
+ | CDF_DEVICE_MODEL
type domain_create_iommu_opts =
| IOMMU_NO_SHAREPT
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 79a144e61b..57eecbd250 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -613,7 +613,8 @@ int arch_sanitise_domain_config(struct
xen_domctl_createdomain *config)
unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap);
unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpmu |
XEN_DOMCTL_CDF_xs_domain |
- XEN_DOMCTL_CDF_trap_unmapped_accesses );
+ XEN_DOMCTL_CDF_trap_unmapped_accesses |
+ XEN_DOMCTL_CDF_device_model);
unsigned int sve_vl_bits = sve_decode_vl(config->arch.sve_vl);
if ( (config->flags & ~flags_optional) != flags_required )
diff --git a/xen/common/device-tree/dom0less-build.c
b/xen/common/device-tree/dom0less-build.c
index 221b875a2f..bb52291dfb 100644
--- a/xen/common/device-tree/dom0less-build.c
+++ b/xen/common/device-tree/dom0less-build.c
@@ -883,6 +883,9 @@ void __init create_domUs(void)
d_cfg.flags |= XEN_DOMCTL_CDF_xs_domain;
d_cfg.max_evtchn_port = -1;
}
+
+ if ( val & DOMAIN_CAPS_DEVICE_MODEL )
+ d_cfg.flags |= XEN_DOMCTL_CDF_device_model;
}
if ( dt_find_property(node, "xen,static-mem", NULL) )
diff --git a/xen/common/domain.c b/xen/common/domain.c
index 303c338ef2..42c590b8d7 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -722,7 +722,8 @@ static int sanitise_domain_config(struct
xen_domctl_createdomain *config)
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_vpmu |
- XEN_DOMCTL_CDF_trap_unmapped_accesses) )
+ XEN_DOMCTL_CDF_trap_unmapped_accesses |
+ XEN_DOMCTL_CDF_device_model) )
{
dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags);
return -EINVAL;
diff --git a/xen/include/public/bootfdt.h b/xen/include/public/bootfdt.h
index 86c46b42a9..c6b5afc76a 100644
--- a/xen/include/public/bootfdt.h
+++ b/xen/include/public/bootfdt.h
@@ -25,7 +25,15 @@
#define DOMAIN_CAPS_HARDWARE (1U << 1)
/* Xenstore domain. */
#define DOMAIN_CAPS_XENSTORE (1U << 2)
-#define DOMAIN_CAPS_MASK (DOMAIN_CAPS_CONTROL | DOMAIN_CAPS_HARDWARE | \
- DOMAIN_CAPS_XENSTORE)
+/*
+ * Device model capability allows the use of the dm_op hypercalls to provide
+ * the device model emulation (run QEMU) for other domains. This is a
+ * subset of the Control capability which can be granted to the
+ * Hardware domain for running QEMU.
+ */
+#define DOMAIN_CAPS_DEVICE_MODEL (1U << 3)
+
+#define DOMAIN_CAPS_MASK (DOMAIN_CAPS_CONTROL | DOMAIN_CAPS_HARDWARE | \
+ DOMAIN_CAPS_XENSTORE | DOMAIN_CAPS_DEVICE_MODEL )
#endif /* __XEN_PUBLIC_BOOTFDT_H__ */
diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h
index a69dd96084..88a294c5be 100644
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -68,9 +68,11 @@ struct xen_domctl_createdomain {
#define XEN_DOMCTL_CDF_vpmu (1U << 7)
/* Should we trap guest accesses to unmapped addresses? */
#define XEN_DOMCTL_CDF_trap_unmapped_accesses (1U << 8)
+/* Allow domain to provide device model for multiple other domains */
+#define XEN_DOMCTL_CDF_device_model (1U << 9)
/* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */
-#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_trap_unmapped_accesses
+#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_device_model
uint32_t flags;
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index fe53d4fab7..9863603d93 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -1148,6 +1148,15 @@ static always_inline bool is_control_domain(const struct
domain *d)
return evaluate_nospec(d->is_privileged);
}
+/* This check is for functionality specific to a device model domain */
+static always_inline bool is_dm_domain(const struct domain *d)
+{
+ if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+ return false;
+
+ return evaluate_nospec(d->options & XEN_DOMCTL_CDF_device_model);
+}
+
#define VM_ASSIST(d, t) (test_bit(VMASST_TYPE_ ## t, &(d)->vm_assist))
static always_inline bool is_pv_domain(const struct domain *d)
diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h
index 2b0ed25cc5..0b341efd18 100644
--- a/xen/include/xsm/dummy.h
+++ b/xen/include/xsm/dummy.h
@@ -91,6 +91,8 @@ static always_inline int xsm_default_action(
return 0;
fallthrough;
case XSM_DM_PRIV:
+ if ( is_dm_domain(src) )
+ return 0;
if ( target && evaluate_nospec(src->target == target) )
return 0;
fallthrough;
--
2.50.0
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |