From: Jacob Pan <jacob.jun.pan@linux.intel.com> To: iommu@lists.linux-foundation.org, LKML <linux-kernel@vger.kernel.org>, Joerg Roedel <joro@8bytes.org>, David Woodhouse <dwmw2@infradead.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Alex Williamson <alex.williamson@redhat.com>, Jean-Philippe Brucker <jean-philippe.brucker@arm.com> Cc: Rafael Wysocki <rafael.j.wysocki@intel.com>, "Liu, Yi L" <yi.l.liu@intel.com>, "Tian, Kevin" <kevin.tian@intel.com>, Raj Ashok <ashok.raj@intel.com>, Jean Delvare <khali@linux-fr.org>, "Christoph Hellwig" <hch@infradead.org>, "Lu Baolu" <baolu.lu@linux.intel.com>, Jacob Pan <jacob.jun.pan@linux.intel.com> Subject: [PATCH v4 17/22] iommu/intel-svm: report device page request Date: Mon, 16 Apr 2018 14:49:06 -0700 [thread overview] Message-ID: <1523915351-54415-18-git-send-email-jacob.jun.pan@linux.intel.com> (raw) In-Reply-To: <1523915351-54415-1-git-send-email-jacob.jun.pan@linux.intel.com> If the source device of a page request has its PASID table pointer bound to a guest, the first level page tables are owned by the guest. In this case, we shall let guest OS to manage page fault. This patch uses the IOMMU fault reporting API to send fault events, possibly via VFIO, to the guest OS. Once guest pages are fault in, guest will issue page response which will be passed down via the invalidation passdown APIs. Recoverable faults, such as page request reporting is not limitted to guest use. In kernel driver can also request a chance to receive fault notifications. Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Signed-off-by: Ashok Raj <ashok.raj@intel.com> --- drivers/iommu/intel-svm.c | 73 ++++++++++++++++++++++++++++++++++++++++------- include/linux/iommu.h | 1 + 2 files changed, 64 insertions(+), 10 deletions(-) diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c index e8cd984..a8186f8 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel-svm.c @@ -577,6 +577,58 @@ static bool is_canonical_address(u64 addr) return (((saddr << shift) >> shift) == saddr); } +static int prq_to_iommu_prot(struct page_req_dsc *req) +{ + int prot = 0; + + if (req->rd_req) + prot |= IOMMU_FAULT_READ; + if (req->wr_req) + prot |= IOMMU_FAULT_WRITE; + if (req->exe_req) + prot |= IOMMU_FAULT_EXEC; + if (req->priv_req) + prot |= IOMMU_FAULT_PRIV; + + return prot; +} + +static int intel_svm_prq_report(struct intel_iommu *iommu, + struct page_req_dsc *desc) +{ + int ret = 0; + struct iommu_fault_event event; + struct pci_dev *pdev; + + memset(&event, 0, sizeof(struct iommu_fault_event)); + pdev = pci_get_domain_bus_and_slot(iommu->segment, + desc->bus, desc->devfn); + if (!pdev) { + pr_err("No PCI device found for PRQ [%02x:%02x.%d]\n", + desc->bus, PCI_SLOT(desc->devfn), + PCI_FUNC(desc->devfn)); + return -ENODEV; + } + + /* Fill in event data for device specific processing */ + event.type = IOMMU_FAULT_PAGE_REQ; + event.addr = (u64)desc->addr << VTD_PAGE_SHIFT; + event.pasid = desc->pasid; + event.page_req_group_id = desc->prg_index; + event.prot = prq_to_iommu_prot(desc); + event.last_req = desc->lpig; + event.pasid_valid = 1; + /* keep track of PRQ so that when the response comes back, we know + * whether we do group response or stream response. SRR[0] and + * private[54:32] bits in the descriptor are stored. + */ + event.iommu_private = *(u64 *)desc; + 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; @@ -625,6 +677,16 @@ static irqreturn_t prq_event_thread(int irq, void *d) goto no_pasid; } } + /* If address is not canonical, return invalid response */ + 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 (!intel_svm_prq_report(iommu, req)) + goto prq_advance; result = QI_RESP_INVALID; /* Since we're using init_mm.pgd directly, we should never take @@ -635,9 +697,6 @@ static irqreturn_t prq_event_thread(int irq, void *d) if (!mmget_not_zero(svm->mm)) goto bad_req; - /* If address is not canonical, return invalid response */ - if (!is_canonical_address(address)) - goto bad_req; down_read(&svm->mm->mmap_sem); vma = find_extend_vma(svm->mm, address); @@ -670,12 +729,6 @@ static irqreturn_t prq_event_thread(int irq, void *d) if (WARN_ON(&sdev->list == &svm->devs)) sdev = NULL; - - if (sdev && sdev->ops && sdev->ops->fault_cb) { - int rwxp = (req->rd_req << 3) | (req->wr_req << 2) | - (req->exe_req << 1) | (req->priv_req); - sdev->ops->fault_cb(sdev->dev, req->pasid, req->addr, req->private, rwxp, result); - } /* We get here in the error case where the PASID lookup failed, and these can be NULL. Do not use them below this point! */ sdev = NULL; @@ -701,7 +754,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) qi_submit_sync(&resp, iommu); } - + prq_advance: head = (head + sizeof(*req)) & PRQ_RING_MASK; } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 40088d6..0933f72 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -42,6 +42,7 @@ * if the IOMMU page table format is equivalent. */ #define IOMMU_PRIV (1 << 5) +#define IOMMU_EXEC (1 << 6) struct iommu_ops; struct iommu_group; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Jacob Pan <jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>, David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>, Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>, Alex Williamson <alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, Jean-Philippe Brucker <jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org> Cc: Raj Ashok <ashok.raj-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>, Rafael Wysocki <rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>, Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> Subject: [PATCH v4 17/22] iommu/intel-svm: report device page request Date: Mon, 16 Apr 2018 14:49:06 -0700 [thread overview] Message-ID: <1523915351-54415-18-git-send-email-jacob.jun.pan@linux.intel.com> (raw) In-Reply-To: <1523915351-54415-1-git-send-email-jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> If the source device of a page request has its PASID table pointer bound to a guest, the first level page tables are owned by the guest. In this case, we shall let guest OS to manage page fault. This patch uses the IOMMU fault reporting API to send fault events, possibly via VFIO, to the guest OS. Once guest pages are fault in, guest will issue page response which will be passed down via the invalidation passdown APIs. Recoverable faults, such as page request reporting is not limitted to guest use. In kernel driver can also request a chance to receive fault notifications. Signed-off-by: Jacob Pan <jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Signed-off-by: Ashok Raj <ashok.raj-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> --- drivers/iommu/intel-svm.c | 73 ++++++++++++++++++++++++++++++++++++++++------- include/linux/iommu.h | 1 + 2 files changed, 64 insertions(+), 10 deletions(-) diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c index e8cd984..a8186f8 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel-svm.c @@ -577,6 +577,58 @@ static bool is_canonical_address(u64 addr) return (((saddr << shift) >> shift) == saddr); } +static int prq_to_iommu_prot(struct page_req_dsc *req) +{ + int prot = 0; + + if (req->rd_req) + prot |= IOMMU_FAULT_READ; + if (req->wr_req) + prot |= IOMMU_FAULT_WRITE; + if (req->exe_req) + prot |= IOMMU_FAULT_EXEC; + if (req->priv_req) + prot |= IOMMU_FAULT_PRIV; + + return prot; +} + +static int intel_svm_prq_report(struct intel_iommu *iommu, + struct page_req_dsc *desc) +{ + int ret = 0; + struct iommu_fault_event event; + struct pci_dev *pdev; + + memset(&event, 0, sizeof(struct iommu_fault_event)); + pdev = pci_get_domain_bus_and_slot(iommu->segment, + desc->bus, desc->devfn); + if (!pdev) { + pr_err("No PCI device found for PRQ [%02x:%02x.%d]\n", + desc->bus, PCI_SLOT(desc->devfn), + PCI_FUNC(desc->devfn)); + return -ENODEV; + } + + /* Fill in event data for device specific processing */ + event.type = IOMMU_FAULT_PAGE_REQ; + event.addr = (u64)desc->addr << VTD_PAGE_SHIFT; + event.pasid = desc->pasid; + event.page_req_group_id = desc->prg_index; + event.prot = prq_to_iommu_prot(desc); + event.last_req = desc->lpig; + event.pasid_valid = 1; + /* keep track of PRQ so that when the response comes back, we know + * whether we do group response or stream response. SRR[0] and + * private[54:32] bits in the descriptor are stored. + */ + event.iommu_private = *(u64 *)desc; + 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; @@ -625,6 +677,16 @@ static irqreturn_t prq_event_thread(int irq, void *d) goto no_pasid; } } + /* If address is not canonical, return invalid response */ + 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 (!intel_svm_prq_report(iommu, req)) + goto prq_advance; result = QI_RESP_INVALID; /* Since we're using init_mm.pgd directly, we should never take @@ -635,9 +697,6 @@ static irqreturn_t prq_event_thread(int irq, void *d) if (!mmget_not_zero(svm->mm)) goto bad_req; - /* If address is not canonical, return invalid response */ - if (!is_canonical_address(address)) - goto bad_req; down_read(&svm->mm->mmap_sem); vma = find_extend_vma(svm->mm, address); @@ -670,12 +729,6 @@ static irqreturn_t prq_event_thread(int irq, void *d) if (WARN_ON(&sdev->list == &svm->devs)) sdev = NULL; - - if (sdev && sdev->ops && sdev->ops->fault_cb) { - int rwxp = (req->rd_req << 3) | (req->wr_req << 2) | - (req->exe_req << 1) | (req->priv_req); - sdev->ops->fault_cb(sdev->dev, req->pasid, req->addr, req->private, rwxp, result); - } /* We get here in the error case where the PASID lookup failed, and these can be NULL. Do not use them below this point! */ sdev = NULL; @@ -701,7 +754,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) qi_submit_sync(&resp, iommu); } - + prq_advance: head = (head + sizeof(*req)) & PRQ_RING_MASK; } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 40088d6..0933f72 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -42,6 +42,7 @@ * if the IOMMU page table format is equivalent. */ #define IOMMU_PRIV (1 << 5) +#define IOMMU_EXEC (1 << 6) struct iommu_ops; struct iommu_group; -- 2.7.4
next prev parent reply other threads:[~2018-04-16 21:49 UTC|newest] Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-16 21:48 [PATCH v4 00/22] IOMMU and VT-d driver support for Shared Virtual Address (SVA) Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 01/22] iommu: introduce bind_pasid_table API function Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 02/22] iommu/vt-d: move device_domain_info to header Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 03/22] iommu/vt-d: add a flag for pasid table bound status Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 04/22] iommu/vt-d: add bind_pasid_table function Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-17 19:10 ` Alex Williamson 2018-04-17 19:10 ` Alex Williamson 2018-04-20 18:25 ` Jean-Philippe Brucker 2018-04-20 18:25 ` Jean-Philippe Brucker 2018-04-20 23:42 ` Jacob Pan 2018-04-20 23:42 ` Jacob Pan 2018-05-29 20:09 ` Alex Williamson 2018-05-29 20:09 ` Alex Williamson 2018-05-30 1:41 ` Tian, Kevin 2018-05-30 1:41 ` Tian, Kevin 2018-05-30 3:17 ` Alex Williamson 2018-05-30 3:17 ` Alex Williamson 2018-05-30 3:45 ` Tian, Kevin 2018-05-30 3:45 ` Tian, Kevin 2018-05-30 11:53 ` Jean-Philippe Brucker 2018-05-30 11:53 ` Jean-Philippe Brucker 2018-05-30 19:52 ` Jacob Pan 2018-05-30 19:52 ` Jacob Pan 2018-05-31 9:09 ` Jean-Philippe Brucker 2018-05-31 9:09 ` Jean-Philippe Brucker 2018-06-05 17:32 ` Jacob Pan 2018-06-06 11:20 ` Jean-Philippe Brucker 2018-06-06 11:20 ` Jean-Philippe Brucker 2018-06-06 21:22 ` Jacob Pan 2018-06-07 13:21 ` Jean-Philippe Brucker 2018-04-20 23:22 ` Jacob Pan 2018-04-20 23:22 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 05/22] iommu: introduce iommu invalidate API function Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-20 18:19 ` Jean-Philippe Brucker 2018-04-20 18:19 ` Jean-Philippe Brucker 2018-04-23 20:43 ` Jacob Pan 2018-04-23 20:43 ` Jacob Pan 2018-04-27 18:07 ` Jean-Philippe Brucker 2018-04-27 18:07 ` Jean-Philippe Brucker 2018-04-28 2:41 ` Tian, Kevin 2018-04-28 2:41 ` Tian, Kevin 2018-05-01 22:58 ` Jacob Pan 2018-05-01 22:58 ` Jacob Pan 2018-05-02 9:31 ` Jean-Philippe Brucker 2018-05-02 9:31 ` Jean-Philippe Brucker 2018-05-04 4:46 ` Jacob Pan 2018-05-04 4:46 ` Jacob Pan 2018-05-04 18:07 ` Jacob Pan 2018-05-04 18:07 ` Jacob Pan 2018-05-08 10:35 ` Jean-Philippe Brucker 2018-05-08 10:35 ` Jean-Philippe Brucker 2018-05-09 12:55 ` Jacob Pan 2018-05-09 12:55 ` Jacob Pan 2018-05-05 22:19 ` Jerry Snitselaar 2018-05-05 22:19 ` Jerry Snitselaar 2018-05-07 15:41 ` Jacob Pan 2018-05-07 15:41 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 06/22] iommu/vt-d: add definitions for PFSID Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 07/22] iommu/vt-d: fix dev iotlb pfsid use Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 08/22] iommu/vt-d: support flushing more translation cache types Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 09/22] iommu/vt-d: add svm/sva invalidate function Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-17 19:10 ` Alex Williamson 2018-04-17 19:10 ` Alex Williamson 2018-04-20 22:36 ` Jacob Pan 2018-04-20 22:36 ` Jacob Pan 2018-04-16 21:48 ` [PATCH v4 10/22] iommu: introduce device fault data Jacob Pan 2018-04-16 21:48 ` Jacob Pan 2018-04-23 10:11 ` Jean-Philippe Brucker 2018-04-23 10:11 ` Jean-Philippe Brucker 2018-04-23 11:54 ` Jacob Pan 2018-04-23 11:54 ` Jacob Pan 2018-05-20 8:17 ` Liu, Yi L 2018-05-21 23:16 ` Jacob Pan 2018-05-21 23:16 ` Jacob Pan 2018-04-16 21:49 ` [PATCH v4 11/22] driver core: add per device iommu param Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-23 10:26 ` Greg Kroah-Hartman 2018-04-23 10:26 ` Greg Kroah-Hartman 2018-04-16 21:49 ` [PATCH v4 12/22] iommu: introduce device fault report API Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-23 11:30 ` Jean-Philippe Brucker 2018-04-23 11:30 ` Jean-Philippe Brucker 2018-04-24 18:29 ` Jacob Pan 2018-04-24 18:29 ` Jacob Pan 2018-04-30 16:53 ` Jean-Philippe Brucker 2018-04-30 16:53 ` Jean-Philippe Brucker 2018-04-30 18:54 ` Jacob Pan 2018-04-16 21:49 ` [PATCH v4 13/22] iommu: introduce page response function Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-23 11:47 ` Jean-Philippe Brucker 2018-04-23 11:47 ` Jean-Philippe Brucker 2018-04-23 12:16 ` Jacob Pan 2018-04-23 12:16 ` Jacob Pan 2018-04-23 15:50 ` Jean-Philippe Brucker 2018-04-23 15:50 ` Jean-Philippe Brucker 2018-04-16 21:49 ` [PATCH v4 14/22] iommu: handle page response timeout Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-23 15:36 ` Jean-Philippe Brucker 2018-04-25 15:37 ` Jacob Pan 2018-04-25 15:37 ` Jacob Pan 2018-04-30 10:58 ` Jean-Philippe Brucker 2018-04-30 10:58 ` Jean-Philippe Brucker 2018-04-30 17:54 ` Jacob Pan 2018-04-30 17:54 ` Jacob Pan 2018-04-16 21:49 ` [PATCH v4 15/22] iommu/config: add build dependency for dmar Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-16 21:49 ` [PATCH v4 16/22] iommu/vt-d: report non-recoverable faults to device Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-16 21:49 ` Jacob Pan [this message] 2018-04-16 21:49 ` [PATCH v4 17/22] iommu/intel-svm: report device page request Jacob Pan 2018-04-16 21:49 ` [PATCH v4 18/22] iommu/intel-svm: replace dev ops with fault report API Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-16 21:49 ` [PATCH v4 19/22] iommu/intel-svm: do not flush iotlb for viommu Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-16 21:49 ` [PATCH v4 20/22] iommu/vt-d: add intel iommu page response function Jacob Pan 2018-04-16 21:49 ` Jacob Pan 2018-04-16 21:49 ` [PATCH v4 21/22] trace/iommu: add sva trace events Jacob Pan 2018-04-16 21:49 ` [PATCH v4 22/22] iommu: use sva invalidate and device fault trace event Jacob Pan -- strict thread matches above, loose matches on Subject: below -- 2018-03-23 3:11 [PATCH v4 00/22] IOMMU and VT-d driver support for Shared Virtual Address (SVA) Jacob Pan 2018-03-23 3:12 ` [PATCH v4 17/22] iommu/intel-svm: report device page request Jacob Pan 2018-03-23 3:12 ` Jacob Pan 2018-05-14 6:56 ` Liu, Yi L 2018-05-14 6:56 ` Liu, Yi L 2018-05-14 18:30 ` Jacob Pan 2018-05-14 18:30 ` Jacob Pan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1523915351-54415-18-git-send-email-jacob.jun.pan@linux.intel.com \ --to=jacob.jun.pan@linux.intel.com \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=baolu.lu@linux.intel.com \ --cc=dwmw2@infradead.org \ --cc=gregkh@linuxfoundation.org \ --cc=hch@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jean-philippe.brucker@arm.com \ --cc=joro@8bytes.org \ --cc=kevin.tian@intel.com \ --cc=khali@linux-fr.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rafael.j.wysocki@intel.com \ --cc=yi.l.liu@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.