This patch is to introduce create, destroy and query capabilities
command for vIOMMU. vIOMMU layer will deal with requests and call
arch vIOMMU ops.
Signed-off-by: Lan Tianyu <tianyu....@intel.com>
---
xen/common/domctl.c | 3 +++
xen/common/viommu.c | 35 +++++++++++++++++++++++++++++++++++
xen/include/public/domctl.h | 40 ++++++++++++++++++++++++++++++++++++++++
xen/include/xen/viommu.h | 8 +++++++-
4 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index 951a5dc..a178544 100644
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -1141,6 +1141,9 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t)
u_domctl)
if ( !ret )
copyback = 1;
break;
+ case XEN_DOMCTL_viommu_op:
+ ret = viommu_domctl(d, &op->u.viommu_op, ©back);
+ break;
default:
ret = arch_do_domctl(op, d, u_domctl);
diff --git a/xen/common/viommu.c b/xen/common/viommu.c
index eadcecb..74afbf5 100644
--- a/xen/common/viommu.c
+++ b/xen/common/viommu.c
@@ -30,6 +30,41 @@ struct viommu_type {
struct list_head node;
};
+int viommu_domctl(struct domain *d, struct xen_domctl_viommu_op *op,
+ bool_t *need_copy)
+{
+ int rc = -EINVAL;
+
+ switch ( op->cmd )
+ {
+ case XEN_DOMCTL_create_viommu:
+ rc = viommu_create(d, op->u.create_viommu.viommu_type,
+ op->u.create_viommu.base_address,
+ op->u.create_viommu.length,
+ op->u.create_viommu.capabilities);
+ if (rc >= 0) {
+ op->u.create_viommu.viommu_id = rc;
+ *need_copy = true;
+ }
+ break;
+
+ case XEN_DOMCTL_destroy_viommu:
+ rc = viommu_destroy(d, op->u.destroy_viommu.viommu_id);
+ break;
+
+ case XEN_DOMCTL_query_viommu_caps:
+ op->u.query_caps.caps
+ = viommu_query_caps(d, op->u.query_caps.viommu_type);
+ *need_copy = true;
+ break;
+
+ default:
+ break;
+ }
+
+ return rc;
+}
+
int viommu_init_domain(struct domain *d)
{
d->viommu.nr_viommu = 0;
diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h
index e6cf211..d499fc6 100644
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -1141,6 +1141,44 @@ struct xen_domctl_psr_cat_op {
typedef struct xen_domctl_psr_cat_op xen_domctl_psr_cat_op_t;
DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cat_op_t);
+struct xen_domctl_viommu_op {
+ uint32_t cmd;
+#define XEN_DOMCTL_create_viommu 0
+#define XEN_DOMCTL_destroy_viommu 1
+#define XEN_DOMCTL_query_viommu_caps 2
+ union {
+ struct {
+ /* IN - vIOMMU type */
+ uint64_t viommu_type;
+ /*
+ * IN - MMIO base address of vIOMMU. vIOMMU device models
+ * are in charge of to check base_address and length.
+ */
+ uint64_t base_address;
+ /* IN - Length of MMIO region */
+ uint64_t length;
+ /* IN - Capabilities with which we want to create */
+ uint64_t capabilities;
+ /* OUT - vIOMMU identity */
+ uint32_t viommu_id;
+ } create_viommu;
+
+ struct {
+ /* IN - vIOMMU identity */
+ uint32_t viommu_id;
+ } destroy_viommu;
+
+ struct {
+ /* IN - vIOMMU type */
+ uint64_t viommu_type;
+ /* OUT - vIOMMU Capabilities */
+ uint64_t caps;
+ } query_caps;
+ } u;
+};
+typedef struct xen_domctl_viommu_op xen_domctl_viommu_op;
+DEFINE_XEN_GUEST_HANDLE(xen_domctl_viommu_op);
+
struct xen_domctl {
uint32_t cmd;
#define XEN_DOMCTL_createdomain 1
@@ -1218,6 +1256,7 @@ struct xen_domctl {
#define XEN_DOMCTL_monitor_op 77
#define XEN_DOMCTL_psr_cat_op 78
#define XEN_DOMCTL_soft_reset 79
+#define XEN_DOMCTL_viommu_op 80
#define XEN_DOMCTL_gdbsx_guestmemio 1000
#define XEN_DOMCTL_gdbsx_pausevcpu 1001
#define XEN_DOMCTL_gdbsx_unpausevcpu 1002
@@ -1280,6 +1319,7 @@ struct xen_domctl {
struct xen_domctl_psr_cmt_op psr_cmt_op;
struct xen_domctl_monitor_op monitor_op;
struct xen_domctl_psr_cat_op psr_cat_op;
+ struct xen_domctl_viommu_op viommu_op;
uint8_t pad[128];
} u;
};
diff --git a/xen/include/xen/viommu.h b/xen/include/xen/viommu.h
index ae5f6af..5909800 100644
--- a/xen/include/xen/viommu.h
+++ b/xen/include/xen/viommu.h
@@ -52,6 +52,8 @@ int viommu_destroy(struct domain *d, u32 viommu_id);
int viommu_register_type(u64 type, struct viommu_ops * ops);
void viommu_unregister_type(u64 type);
u64 viommu_query_caps(struct domain *d, u64 viommu_type);
+int viommu_domctl(struct domain *d, struct xen_domctl_viommu_op *op,
+ bool_t *need_copy);
int viommu_setup(void);
#else
static inline int viommu_init_domain(struct domain *d) { return 0 };
@@ -62,8 +64,12 @@ static inline int viommu_register_type(u64 type, struct
viommu_ops * ops)
{ return 0; };
static inline void viommu_unregister_type(u64 type) { };
static inline u64 viommu_query_caps(struct domain *d, u64 viommu_type)
- { return -ENODEV };
+{ return -ENODEV };
static inline int __init viommu_setup(void) { return 0 };
+static inline int viommu_domctl(struct domain *d,
+ struct xen_domctl_viommu_op *op,
+ bool_t *need_copy)
+{ return -ENODEV };
#endif
#endif /* __XEN_VIOMMU_H__ */
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
