Add VT-d IO page table support to ATTACH_TABLE request.
Signed-off-by: Tina Zhang <tina.zhang@xxxxxxxxx>
---
drivers/iommu/virtio-iommu.c | 23 +++++++++++++++++++++++
include/uapi/linux/virtio_iommu.h | 26 ++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index b1ceaac974e2..b02eeb1d27a4 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -991,12 +991,25 @@ static int viommu_attach_pgtable(struct viommu_domain *vdomain,
};
/* TODO: bypass flag? */
+ if (vdomain->bypass == true)
+ return 0;
switch (fmt) {
case VIRT_IO_PGTABLE:
req.format = cpu_to_le16(VIRTIO_IOMMU_FORMAT_PGTF_VIRT);
req.pgd = cpu_to_le64((u64)cfg->virt.pgd);
break;
+ case INTEL_IOMMU: {
+ struct virtio_iommu_req_attach_pgt_vtd *vtd_req =
+ (struct virtio_iommu_req_attach_pgt_vtd *)&req;
+
+ vtd_req->format = cpu_to_le16(VIRTIO_IOMMU_FORMAT_PGTF_VTD);
+ vtd_req->pgd = cpu_to_le64((u64)cfg->virt.pgd);
+ vtd_req->addr_width = cpu_to_le32(cfg->oas);
+ vtd_req->pasid = IOMMU_NO_PASID;
+ break;
+ }
+
default:
return -EINVAL;
};
@@ -1034,6 +1047,16 @@ static int viommu_setup_pgtable(struct viommu_domain *vdomain,
case VIRTIO_IOMMU_FORMAT_PGTF_VIRT:
fmt = VIRT_IO_PGTABLE;
break;
+ case VIRTIO_IOMMU_FORMAT_PGTF_VTD:
+ {
+ struct virtio_iommu_probe_pgt_vtd *vtd_desc =
+ (struct virtio_iommu_probe_pgt_vtd *)desc;
+
+ cfg.vtd_cfg.cap_reg = le64_to_cpu(vtd_desc->cap_reg);
+ cfg.vtd_cfg.ecap_reg = le64_to_cpu(vtd_desc->ecap_reg);
+ fmt = INTEL_IOMMU;
+ break;
+ }
default:
dev_warn(vdev->dev, "unsupported page table format 0x%x\n",
le16_to_cpu(desc->format));
diff --git a/include/uapi/linux/virtio_iommu.h b/include/uapi/linux/virtio_iommu.h
index 656be1f3d926..17e0d5fcdd54 100644
--- a/include/uapi/linux/virtio_iommu.h
+++ b/include/uapi/linux/virtio_iommu.h
@@ -139,6 +139,22 @@ struct virtio_iommu_req_attach_pgt_virt {
struct virtio_iommu_req_tail tail;
};
+/* Vt-d I/O Page Table Descriptor */
+struct virtio_iommu_req_attach_pgt_vtd {
+ struct virtio_iommu_req_head head;
+ __le32 domain;
+ __le32 endpoint;
+ __le32 flags;
+ __le16 format;
+ __u8 reserved[2];
+ __le32 pasid;
+ __le64 pgd;
+ __le64 fl_flags;
+ __le32 addr_width;
+ __u8 reserved2[36];
+ struct virtio_iommu_req_tail tail;
+};
+
#define VIRTIO_IOMMU_MAP_F_READ (1 << 0)
#define VIRTIO_IOMMU_MAP_F_WRITE (1 << 1)
#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 2)
@@ -224,6 +240,8 @@ struct virtio_iommu_probe_pasid_size {
#define VIRTIO_IOMMU_FORMAT_PSTF_ARM_SMMU_V3 2
/* Virt I/O page table format */
#define VIRTIO_IOMMU_FORMAT_PGTF_VIRT 3
+/* VT-d I/O page table format */
+#define VIRTIO_IOMMU_FORMAT_PGTF_VTD 4
struct virtio_iommu_probe_table_format {
struct virtio_iommu_probe_property head;
@@ -231,6 +249,14 @@ struct virtio_iommu_probe_table_format {
__u8 reserved[2];
};
+struct virtio_iommu_probe_pgt_vtd {
+ struct virtio_iommu_probe_property head;
+ __le16 format;
+ __u8 reserved[2];
+ __le64 cap_reg;
+ __le64 ecap_reg;
+};
+
struct virtio_iommu_req_probe {
struct virtio_iommu_req_head head;
__le32 endpoint;
--
2.39.3
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
