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 20/22] iommu/vt-d: add intel iommu page response function Date: Mon, 16 Apr 2018 14:49:09 -0700 [thread overview] Message-ID: <1523915351-54415-21-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> This patch adds page response support for Intel VT-d. Generic response data is taken from the IOMMU API then parsed into VT-d specific response descriptor format. Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> --- drivers/iommu/intel-iommu.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 3 +++ 2 files changed, 50 insertions(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index a6ea67d..38f76d4 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5142,6 +5142,52 @@ static int intel_iommu_sva_invalidate(struct iommu_domain *domain, return ret; } +static int intel_iommu_page_response(struct device *dev, struct page_response_msg *msg) +{ + struct qi_desc resp; + struct intel_iommu *iommu; + struct pci_dev *pdev; + u8 bus, devfn; + u16 rid; + u64 desc; + + pdev = to_pci_dev(dev); + iommu = device_to_iommu(dev, &bus, &devfn); + if (!iommu) { + dev_err(dev, "No IOMMU for device to unbind PASID table\n"); + return -ENODEV; + } + + pci_dev_get(pdev); + rid = ((u16)bus << 8) | devfn; + /* Iommu private data contains preserved page request descriptor, so we + * inspect the SRR bit for response type then queue response with only + * the private data [54:32]. + */ + desc = msg->private_data; + if (desc & QI_PRQ_SRR) { + /* Page Stream Response */ + resp.low = QI_PSTRM_IDX(msg->page_req_group_id) | + (desc & QI_PRQ_PRIV) | QI_PSTRM_BUS(PCI_BUS_NUM(pdev->bus->number)) | + QI_PSTRM_PASID(msg->pasid) | QI_PSTRM_RESP_TYPE; + resp.high = QI_PSTRM_ADDR(msg->addr) | QI_PSTRM_DEVFN(pdev->devfn & 0xff) | + QI_PSTRM_RESP_CODE(msg->resp_code); + } else { + /* Page Group Response */ + resp.low = QI_PGRP_PASID(msg->pasid) | + QI_PGRP_DID(rid) | + QI_PGRP_PASID_P(msg->pasid_present) | + QI_PGRP_RESP_TYPE; + resp.high = QI_PGRP_IDX(msg->page_req_group_id) | + (desc & QI_PRQ_PRIV) | QI_PGRP_RESP_CODE(msg->resp_code); + + } + qi_submit_sync(&resp, iommu); + pci_dev_put(pdev); + + return 0; +} + static int intel_iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t hpa, size_t size, int iommu_prot) @@ -5568,6 +5614,7 @@ const struct iommu_ops intel_iommu_ops = { .bind_pasid_table = intel_iommu_bind_pasid_table, .unbind_pasid_table = intel_iommu_unbind_pasid_table, .sva_invalidate = intel_iommu_sva_invalidate, + .page_response = intel_iommu_page_response, #endif .map = intel_iommu_map, .unmap = intel_iommu_unmap, diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index dbe8c93..ed2883a 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -337,6 +337,9 @@ enum { #define QI_PSTRM_BUS(bus) (((u64)(bus)) << 24) #define QI_PSTRM_PASID(pasid) (((u64)(pasid)) << 4) +#define QI_PRQ_SRR BIT_ULL(0) +#define QI_PRQ_PRIV GENMASK_ULL(54, 32) + #define QI_RESP_SUCCESS 0x0 #define QI_RESP_INVALID 0x1 #define QI_RESP_FAILURE 0xf -- 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 20/22] iommu/vt-d: add intel iommu page response function Date: Mon, 16 Apr 2018 14:49:09 -0700 [thread overview] Message-ID: <1523915351-54415-21-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> This patch adds page response support for Intel VT-d. Generic response data is taken from the IOMMU API then parsed into VT-d specific response descriptor format. Signed-off-by: Jacob Pan <jacob.jun.pan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> --- drivers/iommu/intel-iommu.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 3 +++ 2 files changed, 50 insertions(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index a6ea67d..38f76d4 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5142,6 +5142,52 @@ static int intel_iommu_sva_invalidate(struct iommu_domain *domain, return ret; } +static int intel_iommu_page_response(struct device *dev, struct page_response_msg *msg) +{ + struct qi_desc resp; + struct intel_iommu *iommu; + struct pci_dev *pdev; + u8 bus, devfn; + u16 rid; + u64 desc; + + pdev = to_pci_dev(dev); + iommu = device_to_iommu(dev, &bus, &devfn); + if (!iommu) { + dev_err(dev, "No IOMMU for device to unbind PASID table\n"); + return -ENODEV; + } + + pci_dev_get(pdev); + rid = ((u16)bus << 8) | devfn; + /* Iommu private data contains preserved page request descriptor, so we + * inspect the SRR bit for response type then queue response with only + * the private data [54:32]. + */ + desc = msg->private_data; + if (desc & QI_PRQ_SRR) { + /* Page Stream Response */ + resp.low = QI_PSTRM_IDX(msg->page_req_group_id) | + (desc & QI_PRQ_PRIV) | QI_PSTRM_BUS(PCI_BUS_NUM(pdev->bus->number)) | + QI_PSTRM_PASID(msg->pasid) | QI_PSTRM_RESP_TYPE; + resp.high = QI_PSTRM_ADDR(msg->addr) | QI_PSTRM_DEVFN(pdev->devfn & 0xff) | + QI_PSTRM_RESP_CODE(msg->resp_code); + } else { + /* Page Group Response */ + resp.low = QI_PGRP_PASID(msg->pasid) | + QI_PGRP_DID(rid) | + QI_PGRP_PASID_P(msg->pasid_present) | + QI_PGRP_RESP_TYPE; + resp.high = QI_PGRP_IDX(msg->page_req_group_id) | + (desc & QI_PRQ_PRIV) | QI_PGRP_RESP_CODE(msg->resp_code); + + } + qi_submit_sync(&resp, iommu); + pci_dev_put(pdev); + + return 0; +} + static int intel_iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t hpa, size_t size, int iommu_prot) @@ -5568,6 +5614,7 @@ const struct iommu_ops intel_iommu_ops = { .bind_pasid_table = intel_iommu_bind_pasid_table, .unbind_pasid_table = intel_iommu_unbind_pasid_table, .sva_invalidate = intel_iommu_sva_invalidate, + .page_response = intel_iommu_page_response, #endif .map = intel_iommu_map, .unmap = intel_iommu_unmap, diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index dbe8c93..ed2883a 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -337,6 +337,9 @@ enum { #define QI_PSTRM_BUS(bus) (((u64)(bus)) << 24) #define QI_PSTRM_PASID(pasid) (((u64)(pasid)) << 4) +#define QI_PRQ_SRR BIT_ULL(0) +#define QI_PRQ_PRIV GENMASK_ULL(54, 32) + #define QI_RESP_SUCCESS 0x0 #define QI_RESP_INVALID 0x1 #define QI_RESP_FAILURE 0xf -- 2.7.4
next prev parent reply other threads:[~2018-04-16 21:49 UTC|newest] Thread overview: 132+ 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 ` [PATCH v4 17/22] iommu/intel-svm: report device page request Jacob Pan 2018-04-16 21:49 ` 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 ` Jacob Pan [this message] 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 ` [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 20/22] iommu/vt-d: add intel iommu page response function Jacob Pan 2018-03-23 3:12 ` Jacob Pan 2018-03-24 23:19 ` kbuild test robot 2018-03-24 23:19 ` kbuild test robot
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-21-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.