Skip to contentSkip to conversation

iommu/vt-d: Remove use of private data field

PATCH In review Jingqi Liu 2 participants 4 messages Mar 8, 2024 – Apr 24, 2024

Subsystems (2)
lore
Share & tools
lore

Jingqi Liu

author
#0 lore raw

cover iommu/vt-d: Remove use of private data field

"Private Data" field has been removed from Page Request/Response in Intel VT-d specification revision 4.0.

Since the private data field has been removed, it's fine to remove the entire private data handling from the driver as the specification has been deprecated and Intel hasn't shipped any products which support private data in the page request message.

Jingqi Liu (2):
iommu/vt-d: Remove debugfs use of private data field iommu/vt-d: Remove private data use in fault message

 drivers/iommu/intel/debugfs.c |  7 ---
 drivers/iommu/intel/iommu.h   |  1 -
 drivers/iommu/intel/perf.h    |  1 -
 drivers/iommu/intel/svm.c     | 84 +++++++----------------------------
 include/linux/iommu.h         |  3 +-
 5 files changed, 16 insertions(+), 80 deletions(-)
Signature · 1 line
2.21.3
author
#1 lore raw

PATCH 1/2 iommu/vt-d: Remove debugfs use of private data field

Since the page fault report and response have been tracked by ftrace, the users can easily calculate the time used for a page fault handling. There's no need to expose the similar functionality in debugfs. Hence, remove the corresponding operations in debugfs.

---
 drivers/iommu/intel/debugfs.c | 7 -------
 drivers/iommu/intel/perf.h    | 1 -
 drivers/iommu/intel/svm.c     | 9 ---------
 3 files changed, 17 deletions(-)
drivers/iommu/intel/debugfs.c +0 -7
index 86b506af7daa..affbf4a1558d 100644
@@ -706,7 +706,6 @@ static ssize_t dmar_perf_latency_write(struct file *filp,
 			dmar_latency_disable(iommu, DMAR_LATENCY_INV_IOTLB);
 			dmar_latency_disable(iommu, DMAR_LATENCY_INV_DEVTLB);
 			dmar_latency_disable(iommu, DMAR_LATENCY_INV_IEC);
-			dmar_latency_disable(iommu, DMAR_LATENCY_PRQ);
 		}
 		rcu_read_unlock();
 		break;
@@ -728,12 +727,6 @@ static ssize_t dmar_perf_latency_write(struct file *filp,
 			dmar_latency_enable(iommu, DMAR_LATENCY_INV_IEC);
 		rcu_read_unlock();
 		break;
-	case 4:
-		rcu_read_lock();
-		for_each_active_iommu(iommu, drhd)
-			dmar_latency_enable(iommu, DMAR_LATENCY_PRQ);
-		rcu_read_unlock();
-		break;
 	default:
 		return -EINVAL;
 	}
drivers/iommu/intel/perf.h +0 -1
index fd6db8049d1a..df9a36942d64 100644
@@ -11,7 +11,6 @@ enum latency_type {
 	DMAR_LATENCY_INV_IOTLB = 0,
 	DMAR_LATENCY_INV_DEVTLB,
 	DMAR_LATENCY_INV_IEC,
-	DMAR_LATENCY_PRQ,
 	DMAR_LATENCY_NUM
 };
 
drivers/iommu/intel/svm.c +0 -9
index c1bed89b1026..4b2eeb55489d 100644
@@ -583,12 +583,6 @@ static void intel_svm_prq_report(struct intel_iommu *iommu, struct device *dev,
 		event.fault.prm.flags |= IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA;
 		event.fault.prm.private_data[0] = desc->priv_data[0];
 		event.fault.prm.private_data[1] = desc->priv_data[1];
-	} else if (dmar_latency_enabled(iommu, DMAR_LATENCY_PRQ)) {
-		/*
-		 * If the private data fields are not used by hardware, use it
-		 * to monitor the prq handle latency.
-		 */
-		event.fault.prm.private_data[0] = ktime_to_ns(ktime_get());
 	}
 
 	iommu_report_device_fault(dev, &event);
@@ -768,9 +762,6 @@ void intel_svm_page_response(struct device *dev, struct iopf_fault *evt,
 		if (private_present) {
 			desc.qw2 = prm->private_data[0];
 			desc.qw3 = prm->private_data[1];
-		} else if (prm->private_data[0]) {
-			dmar_latency_update(iommu, DMAR_LATENCY_PRQ,
-				ktime_to_ns(ktime_get()) - prm->private_data[0]);
 		}
 
 		qi_submit_sync(iommu, &desc, 1, 0);
Signature · 1 line
2.21.3
author
#2 lore raw

PATCH 2/2 iommu/vt-d: Remove private data use in fault message

In reply to Jingqi Liu

According to Intel VT-d specification revision 4.0, "Private Data" field has been removed from Page Request/Response.

Since the private data field is not used in fault message, remove the related definitions in page request descriptor and remove the related code in page request/response handler, as Intel hasn't shipped any products which support private data in the page request message.

---
 drivers/iommu/intel/iommu.h |  1 -
 drivers/iommu/intel/svm.c   | 75 ++++++++-----------------------------
 include/linux/iommu.h       |  3 +-
 3 files changed, 16 insertions(+), 63 deletions(-)
drivers/iommu/intel/iommu.h +0 -1
index 404d2476a877..9ee326f7bf62 100644
@@ -455,7 +455,6 @@ enum {
 
 /* Page group response descriptor QW0 */
 #define QI_PGRP_PASID_P(p)	(((u64)(p)) << 4)
-#define QI_PGRP_PDP(p)		(((u64)(p)) << 5)
 #define QI_PGRP_RESP_CODE(res)	(((u64)(res)) << 12)
 #define QI_PGRP_DID(rid)	(((u64)(rid)) << 16)
 #define QI_PGRP_PASID(pasid)	(((u64)(pasid)) << 32)
drivers/iommu/intel/svm.c +15 -60

135 lines not on this page · raw message

include/linux/iommu.h +1 -2
index af6c367ed673..523bcb672efe 100644
@@ -69,8 +69,7 @@ enum iommu_fault_type {
 struct iommu_fault_page_request {
 #define IOMMU_FAULT_PAGE_REQUEST_PASID_VALID	(1 << 0)
 #define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE	(1 << 1)
-#define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA	(1 << 2)
-#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID	(1 << 3)
+#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID	(1 << 2)
 	u32	flags;
 	u32	pasid;
 	u32	grpid;
Signature · 1 line
2.21.3
maintainer
#3 lore raw
In reply to Jingqi Liu
Quoted 11 lines · Jingqi Liu

"Private Data" field has been removed from Page Request/Response in Intel VT-d specification revision 4.0.

Since the private data field has been removed, it's fine to remove the entire private data handling from the driver as the specification has been deprecated and Intel hasn't shipped any products which support private data in the page request message.

Jingqi Liu (2):
iommu/vt-d: Remove debugfs use of private data field iommu/vt-d: Remove private data use in fault message

Patches have been queued for iommu/vt-d.

Best regards,
baolu