iommu/vt-d: Add prq report and response support
Subsystems (2)
Lu Baolu
maintainercover iommu/vt-d: Add prq report and response support
Hi,
This series adds page request event reporting and response support to the Intel IOMMU driver. This is necessary when the page requests must be processed by any component other than the vendor IOMMU driver. For example, when a guest page table was bound to a PASID through the iommu_ops->sva_bind_gpasid() api, the page requests should be routed to the guest, and after the page is served, the device should be responded with the result.
Your review comments are very appreciated.
Best regards,
baolu
Lu Baolu (4):
iommu/vt-d: Refactor device_to_iommu() helper iommu/vt-d: Add a helper to get svm and sdev for pasid iommu/vt-d: Report page request faults for guest SVA iommu/vt-d: Add page response ops support
drivers/iommu/intel/iommu.c | 56 +++---- drivers/iommu/intel/svm.c | 285 ++++++++++++++++++++++++++++-------- include/linux/intel-iommu.h | 6 +- 3 files changed, 246 insertions(+), 101 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 1/4 iommu/vt-d: Refactor device_to_iommu() helper
It is refactored in two ways:
- Make it global so that it could be used in other files.
- Make bus/devfn optional so that callers could ignore these two returned values when they only want to get the coresponding iommu pointer.
--- drivers/iommu/intel/iommu.c | 55 +++++++++++-------------------------- drivers/iommu/intel/svm.c | 8 +++--- include/linux/intel-iommu.h | 3 +- 3 files changed, 21 insertions(+), 45 deletions(-)
drivers/iommu/intel/iommu.c +16 -39
@@ -778,16 +778,16 @@ is_downstream_to_pci_bridge(struct device *dev, struct device *bridge)return false; } -static struct intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn) +struct intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn) {struct dmar_drhd_unit *drhd =NULL ; +struct pci_dev *pdev =NULL ;struct intel_iommu *iommu;struct device *tmp; -struct pci_dev *pdev =NULL ;u16 segment =0 ;int i; -if (iommu_dummy (dev)) +if (!dev ||iommu_dummy (dev))return NULL ;if (dev_is_pci (dev)) {
@@ -818,8 +818,10 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfif (pdev && pdev->is_virtfn) goto got_pdev; - *bus = drhd->devices[i].bus; - *devfn = drhd->devices[i].devfn; +if (bus && devfn) { + *bus = drhd->devices[i].bus; + *devfn = drhd->devices[i].devfn; + } goto out; }
@@ -829,8 +831,10 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfif (pdev && drhd->include_all) { got_pdev: - *bus = pdev->bus->number; - *devfn = pdev->devfn; +if (bus && devfn) { + *bus = pdev->bus->number; + *devfn = pdev->devfn; + } goto out; } }
@@ -5146,11 +5150,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain, struct device *dev) {int ret; -u8 bus, devfn;unsigned long flags;struct intel_iommu *iommu; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return -ENODEV ;
@@ -5236,9 +5239,8 @@ static int prepare_domain_attach_device(struct iommu_domain *domain,struct dmar_domain *dmar_domain =to_dmar_domain (domain);struct intel_iommu *iommu;int addr_width; -u8 bus, devfn; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return -ENODEV ;
@@ -5658,9 +5660,8 @@ static bool intel_iommu_capable(enum iommu_cap cap)static struct iommu_device *intel_iommu_probe_device (struct device *dev) {struct intel_iommu *iommu; -u8 bus, devfn; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return ERR_PTR (-ENODEV );
@@ -5673,9 +5674,8 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev)static void intel_iommu_release_device (struct device *dev) {struct intel_iommu *iommu; -u8 bus, devfn; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu)return ;
@@ -5825,37 +5825,14 @@ static struct iommu_group *intel_iommu_device_group(struct device *dev)return generic_device_group (dev); } -#ifdef CONFIG_INTEL_IOMMU_SVM -struct intel_iommu *intel_svm_device_to_iommu (struct device *dev) -{ -struct intel_iommu *iommu; -u8 bus, devfn; - -if (iommu_dummy (dev)) { -dev_warn (dev, -"No IOMMU translation for device; cannot enable SVM\n" ); -return NULL ; - } - - iommu =device_to_iommu (dev, &bus, &devfn); -if ((!iommu)) { -dev_err (dev,"No IOMMU for device; cannot enable SVM\n" ); -return NULL ; - } - -return iommu; -} -#endif /* CONFIG_INTEL_IOMMU_SVM */ -static int intel_iommu_enable_auxd (struct device *dev) {struct device_domain_info *info;struct intel_iommu *iommu;unsigned long flags; -u8 bus, devfn;int ret; - iommu =device_to_iommu (dev, &bus, &devfn); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu || dmar_disabled)return -EINVAL ;
drivers/iommu/intel/svm.c +4 -4
@@ -231,7 +231,7 @@ static LIST_HEAD(global_svm_list);int intel_svm_bind_gpasid (struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data) { -struct intel_iommu *iommu =intel_svm_device_to_iommu (dev); +struct intel_iommu *iommu =device_to_iommu (dev,NULL ,NULL );struct dmar_domain *dmar_domain;struct intel_svm_dev *sdev;struct intel_svm *svm;
@@ -373,7 +373,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,int intel_svm_unbind_gpasid (struct device *dev,int pasid) { -struct intel_iommu *iommu =intel_svm_device_to_iommu (dev); +struct intel_iommu *iommu =device_to_iommu (dev,NULL ,NULL );struct intel_svm_dev *sdev;struct intel_svm *svm;int ret = -EINVAL ;
@@ -430,7 +430,7 @@ static int intel_svm_bind_mm(struct device *dev, int flags, struct svm_dev_ops *ops, struct mm_struct *mm, struct intel_svm_dev **sd) { - struct intel_iommu *iommu = intel_svm_device_to_iommu(dev); + struct intel_iommu *iommu = device_to_iommu(dev, NULL, NULL);struct device_domain_info *info;struct intel_svm_dev *sdev;struct intel_svm *svm =NULL ;
@@ -608,7 +608,7 @@ static int intel_svm_unbind_mm(struct device *dev, int pasid)struct intel_svm *svm;int ret = -EINVAL ; - iommu =intel_svm_device_to_iommu (dev); + iommu =device_to_iommu (dev,NULL ,NULL );if (!iommu) goto out;
include/linux/intel-iommu.h +1 -2
@@ -728,6 +728,7 @@ void iommu_flush_write_buffer(struct intel_iommu *iommu);int intel_iommu_enable_pasid (struct intel_iommu *iommu,struct device *dev);struct dmar_domain *find_domain (struct device *dev);struct device_domain_info *get_domain_info (struct device *dev); +struct intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn);#ifdef CONFIG_INTEL_IOMMU_SVM extern void intel_svm_check (struct intel_iommu *iommu);
@@ -766,8 +767,6 @@ struct intel_svm {struct list_head devs; struct list_head list; }; - -extern struct intel_iommu *intel_svm_device_to_iommu (struct device *dev);#else static inline void intel_svm_check (struct intel_iommu *iommu) {}#endif
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 2/4 iommu/vt-d: Add a helper to get svm and sdev for pasid
In reply to Lu BaoluThere are several places in the code that need to get the pointers of svm and sdev according to a pasid and device. Add a helper to achieve this for code consolidation and readability.
--- drivers/iommu/intel/svm.c | 121 +++++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 53 deletions(-)
drivers/iommu/intel/svm.c +68 -53
@@ -228,6 +228,50 @@ static LIST_HEAD(global_svm_list); list_for_each_entry((sdev), &(svm)->devs, list) \if ((d) != (sdev)->dev) {}else +static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid, +struct intel_svm **rsvm, +struct intel_svm_dev **rsdev) +{ +struct intel_svm_dev *d, *sdev =NULL ; +struct intel_svm *svm; + +/* The caller should hold the pasid_mutex lock */ +if (WARN_ON (!mutex_is_locked (&pasid_mutex))) +return -EINVAL ; + +if (pasid ==INVALID_IOASID || pasid >=PASID_MAX ) +return -EINVAL ; + + svm =ioasid_find (NULL , pasid,NULL ); +if (IS_ERR (svm)) +return PTR_ERR (svm); + +if (!svm) + goto out; + +/* +* If we found svm for the PASID, there must be at least one device +* bond. +*/ +if (WARN_ON (list_empty (&svm->devs))) +return -EINVAL ; + +rcu_read_lock (); +list_for_each_entry_rcu (d, &svm->devs, list) { +if (d->dev == dev) { + sdev = d; +break ; + } + } +rcu_read_unlock (); + +out: + *rsvm = svm; + *rsdev = sdev; + +return 0 ; +} +int intel_svm_bind_gpasid (struct iommu_domain *domain,struct device *dev,struct iommu_gpasid_bind_data *data) {
@@ -261,39 +305,27 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev, dmar_domain =to_dmar_domain (domain);mutex_lock (&pasid_mutex); - svm =ioasid_find (NULL , data->hpasid,NULL ); -if (IS_ERR (svm)) { - ret =PTR_ERR (svm); + ret =pasid_to_svm_sdev (dev, data->hpasid, &svm, &sdev); +if (ret) goto out; - } -if (svm) { +if (sdev) {/* -* If we found svm for the PASID, there must be at -* least one device bond, otherwise svm should be freed. +* For devices with aux domains, we should allow +* multiple bind calls with the same PASID and pdev. */ -if (WARN_ON (list_empty (&svm->devs))) { - ret = -EINVAL ; - goto out; +if (iommu_dev_feature_enabled (dev,IOMMU_DEV_FEAT_AUX )) { + sdev->users++; + }else { +dev_warn_ratelimited (dev, +"Already bound with PASID %u\n" , + svm->pasid); + ret = -EBUSY ; } + goto out; + } -for_each_svm_dev (sdev, svm, dev) { -/* -* For devices with aux domains, we should allow -* multiple bind calls with the same PASID and pdev. -*/ -if (iommu_dev_feature_enabled (dev, -IOMMU_DEV_FEAT_AUX )) { - sdev->users++; - }else { -dev_warn_ratelimited (dev, -"Already bound with PASID %u\n" , - svm->pasid); - ret = -EBUSY ; - } - goto out; - } - }else { +if (!svm) {/* We come here when PASID has never been bond to a device. */ svm =kzalloc (sizeof (*svm),GFP_KERNEL );if (!svm) {
@@ -376,25 +408,17 @@ int intel_svm_unbind_gpasid(struct device *dev, int pasid)struct intel_iommu *iommu =device_to_iommu (dev,NULL ,NULL );struct intel_svm_dev *sdev;struct intel_svm *svm; -int ret = -EINVAL ; +int ret;if (WARN_ON (!iommu))return -EINVAL ;mutex_lock (&pasid_mutex); - svm =ioasid_find (NULL , pasid,NULL ); -if (!svm) { - ret = -EINVAL ; - goto out; - } - -if (IS_ERR (svm)) { - ret =PTR_ERR (svm); + ret =pasid_to_svm_sdev (dev, pasid, &svm, &sdev); +if (ret) goto out; - } -for_each_svm_dev (sdev, svm, dev) { - ret =0 ; +if (sdev) {if (iommu_dev_feature_enabled (dev,IOMMU_DEV_FEAT_AUX )) sdev->users--;if (!sdev->users) {
@@ -418,7 +442,6 @@ int intel_svm_unbind_gpasid(struct device *dev, int pasid)kfree (svm); } } -break ; } out:mutex_unlock (&pasid_mutex);
@@ -596,7 +619,7 @@ intel_svm_bind_mm(struct device *dev, int flags, struct svm_dev_ops *ops,if (sd) *sd = sdev; ret =0 ; - out: +out:return ret; }
@@ -612,17 +635,11 @@ static int intel_svm_unbind_mm(struct device *dev, int pasid)if (!iommu) goto out; - svm =ioasid_find (NULL , pasid,NULL ); -if (!svm) - goto out; - -if (IS_ERR (svm)) { - ret =PTR_ERR (svm); + ret =pasid_to_svm_sdev (dev, pasid, &svm, &sdev); +if (ret) goto out; - } -for_each_svm_dev (sdev, svm, dev) { - ret =0 ; +if (sdev) { sdev->users--;if (!sdev->users) {list_del_rcu (&sdev->list);
@@ -651,10 +668,8 @@ static int intel_svm_unbind_mm(struct device *dev, int pasid)kfree (svm); } } -break ; } - out: - +out:return ret; }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 3/4 iommu/vt-d: Report page request faults for guest SVA
In reply to Lu BaoluA pasid might be bound to a page table from a VM guest via the iommu ops.sva_bind_gpasid. In this case, when a DMA page fault is detected on the physical IOMMU, we need to inject the page fault request into the guest. After the guest completes handling the page fault, a page response need to be sent back via the iommu ops.page_response().
This adds support to report a page request fault. Any external module which is interested in handling this fault should regiester a notifier callback.
--- drivers/iommu/intel/svm.c | 83 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-)
drivers/iommu/intel/svm.c +80 -3
@@ -815,6 +815,69 @@ static void intel_svm_drain_prq(struct device *dev, int pasid) } } +static int prq_to_iommu_prot (struct page_req_dsc *req) +{ +int prot =0 ; + +if (req->rd_req) + prot |=IOMMU_FAULT_PERM_READ ; +if (req->wr_req) + prot |=IOMMU_FAULT_PERM_WRITE ; +if (req->exe_req) + prot |=IOMMU_FAULT_PERM_EXEC ; +if (req->pm_req) + prot |=IOMMU_FAULT_PERM_PRIV ; + +return prot; +} + +static int +intel_svm_prq_report (struct intel_iommu *iommu,struct page_req_dsc *desc) +{ +struct iommu_fault_event event; +struct pci_dev *pdev; +u8 bus, devfn; +int ret =0 ; + +memset (&event,0 ,sizeof (struct iommu_fault_event )); + bus =PCI_BUS_NUM (desc->rid); + devfn = desc->rid &0xff ; + pdev =pci_get_domain_bus_and_slot (iommu->segment, bus, devfn); + +if (!pdev) { +pr_err ("No PCI device found for PRQ [%02x:%02x.%d]\n" , + bus,PCI_SLOT (devfn),PCI_FUNC (devfn)); +return -ENODEV ; + } + +/* Fill in event data for device specific processing */ + event.fault.type =IOMMU_FAULT_PAGE_REQ ; + event.fault.prm.addr = desc->addr; + event.fault.prm.pasid = desc->pasid; + event.fault.prm.grpid = desc->prg_index; + event.fault.prm.perm =prq_to_iommu_prot (desc); + +/* +* Set last page in group bit if private data is present, +* page response is required as it does for LPIG. +*/ +if (desc->lpig) + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ; +if (desc->pasid_present) + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_PASID_VALID ; +if (desc->priv_data_present) { + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ; + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA ; +memcpy (event.fault.prm.private_data, desc->priv_data, +sizeof (desc->priv_data)); + } + + ret =iommu_report_device_fault (&pdev->dev, &event); +pci_dev_put (pdev); + +return ret; +} +static irqreturn_t prq_event_thread (int irq,void *d) {struct intel_iommu *iommu = d;
@@ -874,6 +937,19 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!is_canonical_address (address)) goto bad_req; +/* +* If prq is to be handled outside iommu driver via receiver of +* the fault notifiers, we skip the page response here. +*/ +if (svm->flags &SVM_FLAG_GUEST_MODE ) { +int res =intel_svm_prq_report (iommu, req); + +if (!res) + goto prq_advance; +else + goto bad_req; + } +/* If the mm is already defunct, don't handle faults. */ if (!mmget_not_zero (svm->mm)) goto bad_req;
@@ -892,10 +968,10 @@ static irqreturn_t prq_event_thread(int irq, void *d) goto invalid; result =QI_RESP_SUCCESS ; - invalid: +invalid:mmap_read_unlock (svm->mm);mmput (svm->mm); - bad_req: +bad_req:/* Accounting for major/minor faults? */ rcu_read_lock ();list_for_each_entry_rcu (sdev, &svm->devs, list) {
@@ -920,7 +996,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)and these can be NULL. Do not use them below this point! */ sdev =NULL ; svm =NULL ; - no_pasid: +no_pasid:if (req->lpig || req->priv_data_present) {/* * Per VT-d spec. v3.0 ch7.7, system software must
@@ -945,6 +1021,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) resp.qw3 =0 ;qi_submit_sync (iommu, &resp,1 ,0 ); } +prq_advance: head = (head +sizeof (*req)) &PRQ_RING_MASK ; }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH 3/4] iommu/vt-d: Report page request faults for guest SVA
Quoted 51 lines
From: Lu Baolu <[email protected]>
Sent: Sunday, June 28, 2020 8:34 AMA pasid might be bound to a page table from a VM guest via the iommu ops.sva_bind_gpasid. In this case, when a DMA page fault is detected on the physical IOMMU, we need to inject the page fault request into the guest. After the guest completes handling the page fault, a page response need to be sent back via the iommu
ops.page_response().This adds support to report a page request fault. Any external module which is interested in handling this fault should regiester a notifier callback.
Co-developed-by Jacob Pan <[email protected]>Signed-off-by Jacob Pan <[email protected]>Co-developed-by Liu Yi L <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/svm.c | 83 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-)drivers/iommu/intel/svm.c +18
-0@@ -815,6 +815,69 @@ static void intel_svm_drain_prq(struct device *dev, int pasid) } } +static int prq_to_iommu_prot (struct page_req_dsc *req) +{ +int prot =0 ; + +if (req->rd_req) + prot |=IOMMU_FAULT_PERM_READ ; +if (req->wr_req) + prot |=IOMMU_FAULT_PERM_WRITE ; +if (req->exe_req) + prot |=IOMMU_FAULT_PERM_EXEC ; +if (req->pm_req) + prot |=IOMMU_FAULT_PERM_PRIV ; + +return prot; +} + +static int +intel_svm_prq_report (struct intel_iommu *iommu,struct page_req_dsc *desc)
drivers/iommu/intel/svm.c static void intel_svm_drain_prq(struct device *dev, · line 847
Quoted 10 lines
drivers/iommu/intel/svm.c +10
-0+{ +struct iommu_fault_event event; +struct pci_dev *pdev; +u8 bus, devfn; +int ret =0 ; + +memset (&event,0 ,sizeof (struct iommu_fault_event )); + bus =PCI_BUS_NUM (desc->rid); + devfn = desc->rid &0xff ; + pdev =pci_get_domain_bus_and_slot (iommu->segment, bus, devfn);
Is this step necessary? dev can be passed in (based on sdev), and more importantly iommu_report_device_fault already handles the ref counting e.g. get_device(dev) when fault handler is valid...
Quoted 26 lines
drivers/iommu/intel/svm.c +22
-0+ +if (!pdev) { +pr_err ("No PCI device found for PRQ [%02x:%02x.%d]\n" , + bus,PCI_SLOT (devfn),PCI_FUNC (devfn)); +return -ENODEV ; + } + +/* Fill in event data for device specific processing */ + event.fault.type =IOMMU_FAULT_PAGE_REQ ; + event.fault.prm.addr = desc->addr; + event.fault.prm.pasid = desc->pasid; + event.fault.prm.grpid = desc->prg_index; + event.fault.prm.perm =prq_to_iommu_prot (desc); + +/* +* Set last page in group bit if private data is present, +* page response is required as it does for LPIG. +*/ +if (desc->lpig) + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ; +if (desc->pasid_present) + event.fault.prm.flags |=
IOMMU_FAULT_PAGE_REQUEST_PASID_VALID;drivers/iommu/intel/svm.c +2
-0+if (desc->priv_data_present) { + event.fault.prm.flags |=
Quoted 1 line
IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE;
why setting lpig under this condition?
Quoted 22 lines
drivers/iommu/intel/svm.c +1
-0+ event.fault.prm.flags |=
IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA;drivers/iommu/intel/svm.c +13
-0+memcpy (event.fault.prm.private_data, desc->priv_data, +sizeof (desc->priv_data)); + } + + ret =iommu_report_device_fault (&pdev->dev, &event); +pci_dev_put (pdev); + +return ret; +} +static irqreturn_t prq_event_thread (int irq,void *d) {struct intel_iommu *iommu = d;@@ -874,6 +937,19 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!is_canonical_address (address)) goto bad_req; +/* +* If prq is to be handled outside iommu driver via receiver of +* the fault notifiers, we skip the page response here.
drivers/iommu/intel/svm.c static irqreturn_t prq_event_thread(int irq, void *d) · line 952
Quoted 10 lines
drivers/iommu/intel/svm.c +10
-0+*/ +if (svm->flags &SVM_FLAG_GUEST_MODE ) { +int res =intel_svm_prq_report (iommu, req); + +if (!res) + goto prq_advance; +else + goto bad_req; + } +
I noted in bad_req there is another reporting logic:
if (sdev && sdev->ops && sdev->ops->fault_cb) {
int rwxp = (req->rd_req << 3) | (req->wr_req << 2) |
(req->exe_req << 1) | (req->pm_req);
sdev->ops->fault_cb(sdev->dev, req->pasid, req->addr,
req->priv_data, rwxp, result);
}It was introduced in the 1st version of svm.c. It might be unrelated to this patch, but I wonder whether that one should be replaced with iommu_report_device_fault too?
Thanks
Kevin
Quoted 35 lines
drivers/iommu/intel/svm.c +3
-3/* If the mm is already defunct, don't handle faults. */ if (!mmget_not_zero (svm->mm)) goto bad_req;@@ -892,10 +968,10 @@ static irqreturn_t prq_event_thread(int irq, void *d) goto invalid; result =QI_RESP_SUCCESS ; - invalid: +invalid:mmap_read_unlock (svm->mm);mmput (svm->mm); - bad_req: +bad_req:/* Accounting for major/minor faults? */ rcu_read_lock ();list_for_each_entry_rcu (sdev, &svm->devs, list) {@@ -920,7 +996,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)and these can be NULL. Do not use them below this point! */ sdev =NULL ; svm =NULL ; - no_pasid: +no_pasid:if (req->lpig || req->priv_data_present) {/* drivers/iommu/intel/svm.c +1
-1* Per VT-d spec. v3.0 ch7.7, system software must @@ -945,6 +1021,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) resp.qw3 =0 ;qi_submit_sync (iommu, &resp,1 ,0 ); } +prq_advance: head = (head +sizeof (*req)) &PRQ_RING_MASK ; } --
Quoted 1 line
2.17.1
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerRe: [PATCH 3/4] iommu/vt-d: Report page request faults for guest SVA
Hi Kevin,
Thanks a lot for reviewing my patches.
Quoted 57 lines · Kevin
Quoted 57 lines
From: Lu Baolu <[email protected]>
Sent: Sunday, June 28, 2020 8:34 AMA pasid might be bound to a page table from a VM guest via the iommu ops.sva_bind_gpasid. In this case, when a DMA page fault is detected on the physical IOMMU, we need to inject the page fault request into the guest. After the guest completes handling the page fault, a page response need to be sent back via the iommu
ops.page_response().This adds support to report a page request fault. Any external module which is interested in handling this fault should regiester a notifier callback.
Co-developed-by Jacob Pan <[email protected]>Signed-off-by Jacob Pan <[email protected]>Co-developed-by Liu Yi L <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/svm.c | 83 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-)drivers/iommu/intel/svm.c +24
-0@@ -815,6 +815,69 @@ static void intel_svm_drain_prq(struct device *dev, int pasid) } } +static int prq_to_iommu_prot (struct page_req_dsc *req) +{ +int prot =0 ; + +if (req->rd_req) + prot |=IOMMU_FAULT_PERM_READ ; +if (req->wr_req) + prot |=IOMMU_FAULT_PERM_WRITE ; +if (req->exe_req) + prot |=IOMMU_FAULT_PERM_EXEC ; +if (req->pm_req) + prot |=IOMMU_FAULT_PERM_PRIV ; + +return prot; +} + +static int +intel_svm_prq_report (struct intel_iommu *iommu,struct page_req_dsc *desc) +{ +struct iommu_fault_event event; +struct pci_dev *pdev; +u8 bus, devfn; +int ret =0 ; +
Quoted 8 lines
drivers/iommu/intel/svm.c static void intel_svm_drain_prq(struct device *dev, int pasid) · line 845
Quoted 4 lines
drivers/iommu/intel/svm.c +4
-0+memset (&event,0 ,sizeof (struct iommu_fault_event )); + bus =PCI_BUS_NUM (desc->rid); + devfn = desc->rid &0xff ; + pdev =pci_get_domain_bus_and_slot (iommu->segment, bus, devfn);Is this step necessary? dev can be passed in (based on sdev), and more importantly
iommu_report_device_faultalready handles the ref counting e.g.get_device(dev)when fault handler is valid...
Yes, agreed. I will pass device in instead.
Quoted 22 lines
Quoted 22 lines
drivers/iommu/intel/svm.c +20
-0+ +if (!pdev) { +pr_err ("No PCI device found for PRQ [%02x:%02x.%d]\n" , + bus,PCI_SLOT (devfn),PCI_FUNC (devfn)); +return -ENODEV ; + } + +/* Fill in event data for device specific processing */ + event.fault.type =IOMMU_FAULT_PAGE_REQ ; + event.fault.prm.addr = desc->addr; + event.fault.prm.pasid = desc->pasid; + event.fault.prm.grpid = desc->prg_index; + event.fault.prm.perm =prq_to_iommu_prot (desc); + +/* +* Set last page in group bit if private data is present, +* page response is required as it does for LPIG. +*/ +if (desc->lpig) + event.fault.prm.flags |=IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ;
Quoted 8 lines
Quoted 6 lines
drivers/iommu/intel/svm.c +2
-0+if (desc->pasid_present) + event.fault.prm.flags |=
IOMMU_FAULT_PAGE_REQUEST_PASID_VALID;drivers/iommu/intel/svm.c +2
-0+if (desc->priv_data_present) { + event.fault.prm.flags |=
IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE;why setting lpig under this condition?
/*
* Per VT-d spec. v3.0 ch7.7, system software must
* respond with page group response if private data
* is present (PDP) or last page in group (LPIG) bit
* is set. This is an additional VT-d feature beyond
* PCI ATS spec.
*/
Quoted 43 lines
Quoted 23 lines
drivers/iommu/intel/svm.c +1
-0+ event.fault.prm.flags |=
IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA;drivers/iommu/intel/svm.c +13
-0+memcpy (event.fault.prm.private_data, desc->priv_data, +sizeof (desc->priv_data)); + } + + ret =iommu_report_device_fault (&pdev->dev, &event); +pci_dev_put (pdev); + +return ret; +} +static irqreturn_t prq_event_thread (int irq,void *d) {struct intel_iommu *iommu = d;@@ -874,6 +937,19 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!is_canonical_address (address)) goto bad_req; +/* +* If prq is to be handled outside iommu driver via receiver of +* the fault notifiers, we skip the page response here. drivers/iommu/intel/svm.c static irqreturn_t prq_event_thread(int irq, void *d) · line 952
Quoted 10 lines
drivers/iommu/intel/svm.c +10
-0+*/ +if (svm->flags &SVM_FLAG_GUEST_MODE ) { +int res =intel_svm_prq_report (iommu, req); + +if (!res) + goto prq_advance; +else + goto bad_req; + } +I noted in
bad_reqthere is another reporting logic:if (sdev && sdev->ops && sdev->ops->fault_cb) { int rwxp = (req->rd_req << 3) | (req->wr_req << 2) | (req->exe_req << 1) | (req->pm_req); sdev->ops->fault_cb(sdev->dev, req->pasid, req->addr, req->priv_data, rwxp, result); }
Quoted 3 lines
It was introduced in the 1st version of
svm.c. It might be unrelated to this patch, but I wonder whether that one should be replaced withiommu_report_device_faulttoo?
This call back will be deprecated. The previous api in generic iommu has been removed.
https://www.spinics.net/lists/iommu/msg43657.html
I will make it in a separated patch.
Quoted 3 lines
Thanks
Kevin
Best regards,
baolu
Quoted 38 lines
Quoted 37 lines
drivers/iommu/intel/svm.c +3
-3/* If the mm is already defunct, don't handle faults. */ if (!mmget_not_zero (svm->mm)) goto bad_req;@@ -892,10 +968,10 @@ static irqreturn_t prq_event_thread(int irq, void *d) goto invalid; result =QI_RESP_SUCCESS ; - invalid: +invalid:mmap_read_unlock (svm->mm);mmput (svm->mm); - bad_req: +bad_req:/* Accounting for major/minor faults? */ rcu_read_lock ();list_for_each_entry_rcu (sdev, &svm->devs, list) {@@ -920,7 +996,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)and these can be NULL. Do not use them below this point! */ sdev =NULL ; svm =NULL ; - no_pasid: +no_pasid:if (req->lpig || req->priv_data_present) {/* * Per VT-d spec. v3.0 ch7.7, system software must
drivers/iommu/intel/svm.c +1
-1@@ -945,6 +1021,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) resp.qw3 =0 ;qi_submit_sync (iommu, &resp,1 ,0 ); } +prq_advance: head = (head +sizeof (*req)) &PRQ_RING_MASK ; } --2.17.1
Lu Baolu
maintainerPATCH 4/4 iommu/vt-d: Add page response ops support
In reply to Lu BaoluAfter a page request is handled, software must response the device which raised the page request with the handling result. This is done through the iommu ops.page_response if the request was reported to outside of vendor iommu driver through iommu_report_device_fault(). This adds the VT-d implementation of page_response ops.
--- drivers/iommu/intel/iommu.c | 1 + drivers/iommu/intel/svm.c | 73 +++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 3 ++ 3 files changed, 77 insertions(+)
drivers/iommu/intel/iommu.c +1 -0
@@ -6057,6 +6057,7 @@ const struct iommu_ops intel_iommu_ops = { .sva_bind = intel_svm_bind, .sva_unbind = intel_svm_unbind, .sva_get_pasid = intel_svm_get_pasid, + .page_response = intel_svm_page_response,#endif };
drivers/iommu/intel/svm.c +73 -0
76 lines not on this page · raw message
include/linux/intel-iommu.h +3 -0
@@ -741,6 +741,9 @@ struct iommu_sva *intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata);void intel_svm_unbind (struct iommu_sva *handle);int intel_svm_get_pasid (struct iommu_sva *handle); +int intel_svm_page_response (struct device *dev,struct iommu_fault_event *evt, +struct iommu_page_response *msg); +struct svm_dev_ops ;struct intel_svm_dev {
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH 4/4] iommu/vt-d: Add page response ops support
Quoted 53 lines
From: Lu Baolu <[email protected]>
Sent: Sunday, June 28, 2020 8:34 AMAfter a page request is handled, software must response the device which raised the page request with the handling result. This is done through the iommu ops.page_response if the request was reported to outside of vendor iommu driver through
iommu_report_device_fault(). This adds the VT-d implementation ofpage_responseops.Co-developed-by Jacob Pan <[email protected]>Signed-off-by Jacob Pan <[email protected]>Co-developed-by Liu Yi L <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/iommu.c | 1 + drivers/iommu/intel/svm.c | 73 +++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 3 ++ 3 files changed, 77 insertions(+)drivers/iommu/intel/iommu.c +1
-0@@ -6057,6 +6057,7 @@ const struct iommu_ops intel_iommu_ops = { .sva_bind = intel_svm_bind, .sva_unbind = intel_svm_unbind, .sva_get_pasid = intel_svm_get_pasid, + .page_response = intel_svm_page_response,#endif };drivers/iommu/intel/svm.c +12
-0@@ -1092,3 +1092,76 @@ int intel_svm_get_pasid(struct iommu_sva *sva)return pasid; } + +int intel_svm_page_response (struct device *dev, +struct iommu_fault_event *evt, +struct iommu_page_response *msg) +{ +struct iommu_fault_page_request *prm; +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +bool private_present; +bool pasid_present; +bool last_page;
drivers/iommu/intel/svm.c int intel_svm_get_pasid(struct iommu_sva *sva) · line 1116
Quoted 10 lines
drivers/iommu/intel/svm.c +10
-0+u8 bus, devfn; +int ret =0 ; +u16 sid; + +if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + + iommu =device_to_iommu (dev, &bus, &devfn); +if (!iommu) +return -ENODEV ;
move to the place when iommu is referenced. This place is too early.
Quoted 14 lines
drivers/iommu/intel/svm.c +9
-0+ +if (!msg || !evt) +return -EINVAL ; + +mutex_lock (&pasid_mutex); + + prm = &evt->fault.prm; + sid =PCI_DEVID (bus, devfn); + pasid_present = prm->flags &
IOMMU_FAULT_PAGE_REQUEST_PASID_VALID;drivers/iommu/intel/svm.c +1
-0+ private_present = prm->flags &
IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA;drivers/iommu/intel/svm.c +1
-0+ last_page = prm->flags &
IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE;
drivers/iommu/intel/svm.c int intel_svm_get_pasid(struct iommu_sva *sva) · line 1134
Quoted 7 lines
drivers/iommu/intel/svm.c +7
-0+ +if (pasid_present) { +/* VT-d supports devices with full 20 bit PASIDs only */ +if (pci_max_pasids (to_pci_dev (dev)) !=PASID_MAX ) { + ret = -EINVAL ; + goto out; + }
shouldn't we check prm->pasid here? Above is more reasonable to be checked when page request is reported.
drivers/iommu/intel/svm.c int intel_svm_get_pasid(struct iommu_sva *sva) · line 1137
Quoted 3 lines
drivers/iommu/intel/svm.c +3
-0+ + ret =pasid_to_svm_sdev (dev, prm->pasid, &svm, &sdev); +if (ret || !sdev)
if sdev==NULL, suppose an error (-ENODEV) should be returned here?
drivers/iommu/intel/svm.c int intel_svm_get_pasid(struct iommu_sva *sva) · line 1145
Quoted 8 lines
drivers/iommu/intel/svm.c +8
-0+ goto out; + } + +/* +* Per VT-d spec. v3.0 ch7.7, system software must respond +* with page group response if private data is present (PDP) +* or last page in group (LPIG) bit is set. This is an +* additional VT-d feature beyond PCI ATS spec.
feature->requirement
Thanks
Kevin
Quoted 42 lines
drivers/iommu/intel/svm.c +5
-0+*/ +if (last_page || private_present) { +struct qi_desc desc; + + desc.qw0 =QI_PGRP_PASID (prm->pasid) |QI_PGRP_DID (sid)|
drivers/iommu/intel/svm.c +5
-0+QI_PGRP_PASID_P (pasid_present) | +QI_PGRP_PDP (private_present) | +QI_PGRP_RESP_CODE (msg->code) | +QI_PGRP_RESP_TYPE ; + desc.qw1 = QI_PGRP_IDX(prm->grpid) |
QI_PGRP_LPIG(last_page);drivers/iommu/intel/svm.c +12
-0+ desc.qw2 =0 ; + desc.qw3 =0 ; +if (private_present) +memcpy (&desc.qw2, prm->private_data, +sizeof (prm->private_data)); + +qi_submit_sync (iommu, &desc,1 ,0 ); + } +out: +mutex_unlock (&pasid_mutex); +return ret; +}include/linux/intel-iommu.h +3
-0@@ -741,6 +741,9 @@ struct iommu_sva *intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata);void intel_svm_unbind (struct iommu_sva *handle);int intel_svm_get_pasid (struct iommu_sva *handle); +int intel_svm_page_response (struct device *dev,struct iommu_fault_event *evt, +struct iommu_page_response *msg); +struct svm_dev_ops ;struct
intel_svm_dev{
--
2.17.1
Lu Baolu
maintainerRe: [PATCH 4/4] iommu/vt-d: Add page response ops support
Hi Kevin,
Quoted 57 lines · Kevin
Quoted 57 lines
From: Lu Baolu <[email protected]>
Sent: Sunday, June 28, 2020 8:34 AMAfter a page request is handled, software must response the device which raised the page request with the handling result. This is done through the iommu ops.page_response if the request was reported to outside of vendor iommu driver through
iommu_report_device_fault(). This adds the VT-d implementation ofpage_responseops.Co-developed-by Jacob Pan <[email protected]>Signed-off-by Jacob Pan <[email protected]>Co-developed-by Liu Yi L <[email protected]>Signed-off-by Liu Yi L <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/iommu.c | 1 + drivers/iommu/intel/svm.c | 73 +++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 3 ++ 3 files changed, 77 insertions(+)drivers/iommu/intel/iommu.c +1
-0@@ -6057,6 +6057,7 @@ const struct iommu_ops intel_iommu_ops = { .sva_bind = intel_svm_bind, .sva_unbind = intel_svm_unbind, .sva_get_pasid = intel_svm_get_pasid, + .page_response = intel_svm_page_response,#endif };drivers/iommu/intel/svm.c +16
-0@@ -1092,3 +1092,76 @@ int intel_svm_get_pasid(struct iommu_sva *sva)return pasid; } + +int intel_svm_page_response (struct device *dev, +struct iommu_fault_event *evt, +struct iommu_page_response *msg) +{ +struct iommu_fault_page_request *prm; +struct intel_svm_dev *sdev; +struct intel_iommu *iommu; +struct intel_svm *svm; +bool private_present; +bool pasid_present; +bool last_page; +u8 bus, devfn; +int ret =0 ; +u16 sid; +
Quoted 8 lines
drivers/iommu/intel/svm.c int intel_svm_get_pasid(struct iommu_sva *sva) · line 1116
Quoted 6 lines
drivers/iommu/intel/svm.c +6
-0+if (!dev || !dev_is_pci (dev)) +return -ENODEV ; + + iommu =device_to_iommu (dev, &bus, &devfn); +if (!iommu) +return -ENODEV ;move to the place when iommu is referenced. This place is too early.
I took this as a sanity check. If the device has no iommu backed, we should consider it as an invalid input.
Quoted 17 lines
Quoted 17 lines
drivers/iommu/intel/svm.c +9
-0+ +if (!msg || !evt) +return -EINVAL ; + +mutex_lock (&pasid_mutex); + + prm = &evt->fault.prm; + sid =PCI_DEVID (bus, devfn); + pasid_present = prm->flags &
IOMMU_FAULT_PAGE_REQUEST_PASID_VALID;drivers/iommu/intel/svm.c +1
-0+ private_present = prm->flags &
IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA;drivers/iommu/intel/svm.c +1
-0+ last_page = prm->flags &
IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE;drivers/iommu/intel/svm.c +2
-0+ +if (pasid_present) {
Quoted 8 lines
drivers/iommu/intel/svm.c int intel_svm_get_pasid(struct iommu_sva *sva) · line 1134
Quoted 5 lines
drivers/iommu/intel/svm.c +5
-0+/* VT-d supports devices with full 20 bit PASIDs only */ +if (pci_max_pasids (to_pci_dev (dev)) !=PASID_MAX ) { + ret = -EINVAL ; + goto out; + }shouldn't we check
prm->pasidhere? Above is more reasonable to be checked when page request is reported.
Yes. I will check the pasid in both places.
Quoted 6 lines
drivers/iommu/intel/svm.c int intel_svm_get_pasid(struct iommu_sva *sva) · line 1137
Quoted 4 lines
drivers/iommu/intel/svm.c +3
-0+ + ret =pasid_to_svm_sdev (dev, prm->pasid, &svm, &sdev); +if (ret || !sdev)if sdev==NULL, suppose an error (
-ENODEV) should be returned here?
Yes. Good catch. I should return an error if sdev==NULL.
Quoted 11 lines
drivers/iommu/intel/svm.c int intel_svm_get_pasid(struct iommu_sva *sva) · line 1145
Quoted 9 lines
drivers/iommu/intel/svm.c +8
-0+ goto out; + } + +/* +* Per VT-d spec. v3.0 ch7.7, system software must respond +* with page group response if private data is present (PDP) +* or last page in group (LPIG) bit is set. This is an +* additional VT-d feature beyond PCI ATS spec.
feature->requirement
Agreed.
Quoted 3 lines
Thanks
Kevin
Best regards,
baolu
Quoted 44 lines
Quoted 43 lines
drivers/iommu/intel/svm.c +5
-0+*/ +if (last_page || private_present) { +struct qi_desc desc; + + desc.qw0 =QI_PGRP_PASID (prm->pasid) |QI_PGRP_DID (sid)|
drivers/iommu/intel/svm.c +5
-0+QI_PGRP_PASID_P (pasid_present) | +QI_PGRP_PDP (private_present) | +QI_PGRP_RESP_CODE (msg->code) | +QI_PGRP_RESP_TYPE ; + desc.qw1 = QI_PGRP_IDX(prm->grpid) |
QI_PGRP_LPIG(last_page);drivers/iommu/intel/svm.c +12
-0+ desc.qw2 =0 ; + desc.qw3 =0 ; +if (private_present) +memcpy (&desc.qw2, prm->private_data, +sizeof (prm->private_data)); + +qi_submit_sync (iommu, &desc,1 ,0 ); + } +out: +mutex_unlock (&pasid_mutex); +return ret; +}include/linux/intel-iommu.h +3
-0@@ -741,6 +741,9 @@ struct iommu_sva *intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata);void intel_svm_unbind (struct iommu_sva *handle);int intel_svm_get_pasid (struct iommu_sva *handle); +int intel_svm_page_response (struct device *dev,struct iommu_fault_event *evt, +struct iommu_page_response *msg); +struct svm_dev_ops ;struct
intel_svm_dev{
--
2.17.1