All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: "Lu Baolu" <baolu.lu@linux.intel.com>,
	iommu@lists.linux-foundation.org,
	LKML <linux-kernel@vger.kernel.org>,
	Joerg Roedel <joro@8bytes.org>,
	David Woodhouse <dwmw2@infradead.org>,
	Jean-Philippe Brucker <jean-philippe@linaro.com>,
	Eric Auger <eric.auger@redhat.com>
Cc: "Yi Liu" <yi.l.liu@intel.com>,
	"Tian, Kevin" <kevin.tian@intel.com>,
	Raj Ashok <ashok.raj@intel.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	"Christoph Hellwig" <hch@infradead.org>,
	Jonathan Cameron <jic23@kernel.org>,
	Jacob Pan <jacob.jun.pan@linux.intel.com>
Subject: [PATCH v11 08/10] iommu/vt-d: Cache virtual command capability register
Date: Fri,  3 Apr 2020 11:42:12 -0700	[thread overview]
Message-ID: <1585939334-21396-9-git-send-email-jacob.jun.pan@linux.intel.com> (raw)
In-Reply-To: <1585939334-21396-1-git-send-email-jacob.jun.pan@linux.intel.com>

Virtual command registers are used in the guest only, to prevent
vmexit cost, we cache the capability and store it during initialization.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

---
v7 Reviewed by Eric & Baolu
---

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/iommu/dmar.c        | 1 +
 include/linux/intel-iommu.h | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 4d6b7b5b37ee..3b36491c8bbb 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -963,6 +963,7 @@ static int map_iommu(struct intel_iommu *iommu, u64 phys_addr)
 		warn_invalid_dmar(phys_addr, " returns all ones");
 		goto unmap;
 	}
+	iommu->vccap = dmar_readq(iommu->reg + DMAR_VCCAP_REG);
 
 	/* the registers might be more than one page */
 	map_size = max_t(int, ecap_max_iotlb_offset(iommu->ecap),
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index f775bb825343..e02a96848586 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -194,6 +194,9 @@
 #define ecap_max_handle_mask(e) ((e >> 20) & 0xf)
 #define ecap_sc_support(e)	((e >> 7) & 0x1) /* Snooping Control */
 
+/* Virtual command interface capability */
+#define vccap_pasid(v)		((v & DMA_VCS_PAS)) /* PASID allocation */
+
 /* IOTLB_REG */
 #define DMA_TLB_FLUSH_GRANU_OFFSET  60
 #define DMA_TLB_GLOBAL_FLUSH (((u64)1) << 60)
@@ -287,6 +290,7 @@
 
 /* PRS_REG */
 #define DMA_PRS_PPR	((u32)1)
+#define DMA_VCS_PAS	((u64)1)
 
 #define IOMMU_WAIT_OP(iommu, offset, op, cond, sts)			\
 do {									\
@@ -562,6 +566,7 @@ struct intel_iommu {
 	u64		reg_size; /* size of hw register set */
 	u64		cap;
 	u64		ecap;
+	u64		vccap;
 	u32		gcmd; /* Holds TE, EAFL. Don't need SRTP, SFL, WBF */
 	raw_spinlock_t	register_lock; /* protect register handling */
 	int		seq_id;	/* sequence id of the iommu */
-- 
2.7.4


WARNING: multiple messages have this Message-ID (diff)
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: "Lu Baolu" <baolu.lu@linux.intel.com>,
	iommu@lists.linux-foundation.org,
	LKML <linux-kernel@vger.kernel.org>,
	Joerg Roedel <joro@8bytes.org>,
	David Woodhouse <dwmw2@infradead.org>,
	Jean-Philippe Brucker <jean-philippe@linaro.com>,
	Eric Auger <eric.auger@redhat.com>
Cc: "Tian, Kevin" <kevin.tian@intel.com>,
	Raj Ashok <ashok.raj@intel.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	Jonathan Cameron <jic23@kernel.org>
Subject: [PATCH v11 08/10] iommu/vt-d: Cache virtual command capability register
Date: Fri,  3 Apr 2020 11:42:12 -0700	[thread overview]
Message-ID: <1585939334-21396-9-git-send-email-jacob.jun.pan@linux.intel.com> (raw)
In-Reply-To: <1585939334-21396-1-git-send-email-jacob.jun.pan@linux.intel.com>

Virtual command registers are used in the guest only, to prevent
vmexit cost, we cache the capability and store it during initialization.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

---
v7 Reviewed by Eric & Baolu
---

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/iommu/dmar.c        | 1 +
 include/linux/intel-iommu.h | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 4d6b7b5b37ee..3b36491c8bbb 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -963,6 +963,7 @@ static int map_iommu(struct intel_iommu *iommu, u64 phys_addr)
 		warn_invalid_dmar(phys_addr, " returns all ones");
 		goto unmap;
 	}
+	iommu->vccap = dmar_readq(iommu->reg + DMAR_VCCAP_REG);
 
 	/* the registers might be more than one page */
 	map_size = max_t(int, ecap_max_iotlb_offset(iommu->ecap),
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index f775bb825343..e02a96848586 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -194,6 +194,9 @@
 #define ecap_max_handle_mask(e) ((e >> 20) & 0xf)
 #define ecap_sc_support(e)	((e >> 7) & 0x1) /* Snooping Control */
 
+/* Virtual command interface capability */
+#define vccap_pasid(v)		((v & DMA_VCS_PAS)) /* PASID allocation */
+
 /* IOTLB_REG */
 #define DMA_TLB_FLUSH_GRANU_OFFSET  60
 #define DMA_TLB_GLOBAL_FLUSH (((u64)1) << 60)
@@ -287,6 +290,7 @@
 
 /* PRS_REG */
 #define DMA_PRS_PPR	((u32)1)
+#define DMA_VCS_PAS	((u64)1)
 
 #define IOMMU_WAIT_OP(iommu, offset, op, cond, sts)			\
 do {									\
@@ -562,6 +566,7 @@ struct intel_iommu {
 	u64		reg_size; /* size of hw register set */
 	u64		cap;
 	u64		ecap;
+	u64		vccap;
 	u32		gcmd; /* Holds TE, EAFL. Don't need SRTP, SFL, WBF */
 	raw_spinlock_t	register_lock; /* protect register handling */
 	int		seq_id;	/* sequence id of the iommu */
-- 
2.7.4

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  parent reply	other threads:[~2020-04-03 18:36 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-03 18:42 [PATCH v11 00/10] Nested Shared Virtual Address (SVA) VT-d support Jacob Pan
2020-04-03 18:42 ` Jacob Pan
2020-04-03 18:42 ` [PATCH v11 01/10] iommu/vt-d: Move domain helper to header Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-03 18:42 ` [PATCH v11 02/10] iommu/uapi: Define a mask for bind data Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-08 13:07   ` Joerg Roedel
2020-04-08 13:07     ` Joerg Roedel
2020-04-08 16:11     ` Jacob Pan
2020-04-08 16:11       ` Jacob Pan
2020-04-03 18:42 ` [PATCH v11 03/10] iommu/vt-d: Use a helper function to skip agaw for SL Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-05  6:37   ` Auger Eric
2020-04-05  6:37     ` Auger Eric
2020-04-03 18:42 ` [PATCH v11 04/10] iommu/vt-d: Add nested translation helper function Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-08 13:33   ` Auger Eric
2020-04-08 13:33     ` Auger Eric
2020-04-10 23:54   ` kbuild test robot
2020-04-03 18:42 ` [PATCH v11 05/10] iommu/vt-d: Add bind guest PASID support Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-09  7:41   ` Auger Eric
2020-04-09  7:41     ` Auger Eric
2020-04-10 19:45     ` Jacob Pan
2020-04-10 19:45       ` Jacob Pan
2020-04-16 10:43       ` Auger Eric
2020-04-16 10:43         ` Auger Eric
2020-04-17  2:45         ` Tian, Kevin
2020-04-17  2:45           ` Tian, Kevin
2020-04-17  7:46           ` Auger Eric
2020-04-17  7:46             ` Auger Eric
2020-04-17 15:28             ` Jacob Pan
2020-04-17 15:28               ` Jacob Pan
2020-04-17 23:46               ` Tian, Kevin
2020-04-17 23:46                 ` Tian, Kevin
2020-04-27 17:28                 ` Jacob Pan
2020-04-27 17:28                   ` Jacob Pan
2020-04-10 21:06     ` Jacob Pan
2020-04-10 21:06       ` Jacob Pan
2020-04-16 10:46       ` Auger Eric
2020-04-16 10:46         ` Auger Eric
2020-04-03 18:42 ` [PATCH v11 06/10] iommu/vt-d: Support flushing more translation cache types Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-05  6:37   ` Auger Eric
2020-04-05  6:37     ` Auger Eric
2020-04-03 18:42 ` [PATCH v11 07/10] iommu/vt-d: Add svm/sva invalidate function Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-09  8:50   ` Auger Eric
2020-04-09  8:50     ` Auger Eric
2020-04-10 21:56     ` Jacob Pan
2020-04-10 21:56       ` Jacob Pan
2020-04-16 10:59       ` Auger Eric
2020-04-16 10:59         ` Auger Eric
2020-04-17 16:14         ` Jacob Pan
2020-04-17 16:14           ` Jacob Pan
2020-04-03 18:42 ` Jacob Pan [this message]
2020-04-03 18:42   ` [PATCH v11 08/10] iommu/vt-d: Cache virtual command capability register Jacob Pan
2020-04-09 10:14   ` Auger Eric
2020-04-09 10:14     ` Auger Eric
2020-04-03 18:42 ` [PATCH v11 09/10] iommu/vt-d: Enlightened PASID allocation Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-03 18:42 ` [PATCH v11 10/10] iommu/vt-d: Add custom allocator for IOASID Jacob Pan
2020-04-03 18:42   ` Jacob Pan
2020-04-09 10:31   ` Auger Eric
2020-04-09 10:31     ` Auger Eric
2020-04-05  8:28 ` [PATCH v11 00/10] Nested Shared Virtual Address (SVA) VT-d support Lu Baolu
2020-04-05  8:28   ` Lu Baolu

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=1585939334-21396-9-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=eric.auger@redhat.com \
    --cc=hch@infradead.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jean-philippe@linaro.com \
    --cc=jic23@kernel.org \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --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: link
Be 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.