From: Lu Baolu <baolu.lu@linux.intel.com> To: tglx@linutronix.de, ashok.raj@intel.com, kevin.tian@intel.com, dave.jiang@intel.com, megha.dey@intel.com, dwmw2@infradead.org Cc: alex.williamson@redhat.com, bhelgaas@google.com, dan.j.williams@intel.com, will@kernel.org, joro@8bytes.org, dmaengine@vger.kernel.org, eric.auger@redhat.com, jacob.jun.pan@intel.com, jgg@mellanox.com, kvm@vger.kernel.org, kwankhede@nvidia.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, iommu@lists.linux-foundation.org, maz@kernel.org, mona.hossain@intel.com, netanelg@mellanox.com, parav@mellanox.com, pbonzini@redhat.com, rafael@kernel.org, samuel.ortiz@intel.com, sanjay.k.kumar@intel.com, shahafs@mellanox.com, tony.luck@intel.com, vkoul@kernel.org, yan.y.zhao@linux.intel.com, yi.l.liu@intel.com, leon@kernel.org, Lu Baolu <baolu.lu@linux.intel.com> Subject: [RFC PATCH v3 1/2] iommu: Add capability IOMMU_CAP_VIOMMU Date: Thu, 14 Jan 2021 09:30:02 +0800 [thread overview] Message-ID: <20210114013003.297050-2-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20210114013003.297050-1-baolu.lu@linux.intel.com> Some vendor IOMMU drivers are able to declare that it is running in a VM context. This is very valuable for the features that only want to be supported on bare metal. Add a capability bit so that it could be used. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- drivers/iommu/intel/iommu.c | 20 ++++++++++++++++++++ drivers/iommu/virtio-iommu.c | 9 +++++++++ include/linux/iommu.h | 1 + 3 files changed, 30 insertions(+) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index cb205a04fe4c..8eb022d0e8aa 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -5738,12 +5738,32 @@ static inline bool nested_mode_support(void) return ret; } +static inline bool caching_mode_enabled(void) +{ + struct dmar_drhd_unit *drhd; + struct intel_iommu *iommu; + bool ret = false; + + rcu_read_lock(); + for_each_active_iommu(iommu, drhd) { + if (cap_caching_mode(iommu->cap)) { + ret = true; + break; + } + } + rcu_read_unlock(); + + return ret; +} + static bool intel_iommu_capable(enum iommu_cap cap) { if (cap == IOMMU_CAP_CACHE_COHERENCY) return domain_update_iommu_snooping(NULL) == 1; if (cap == IOMMU_CAP_INTR_REMAP) return irq_remapping_enabled == 1; + if (cap == IOMMU_CAP_VIOMMU) + return caching_mode_enabled(); return false; } diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index 2bfdd5734844..719793e103db 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -931,7 +931,16 @@ static int viommu_of_xlate(struct device *dev, struct of_phandle_args *args) return iommu_fwspec_add_ids(dev, args->args, 1); } +static bool viommu_capable(enum iommu_cap cap) +{ + if (cap == IOMMU_CAP_VIOMMU) + return true; + + return false; +} + static struct iommu_ops viommu_ops = { + .capable = viommu_capable, .domain_alloc = viommu_domain_alloc, .domain_free = viommu_domain_free, .attach_dev = viommu_attach_dev, diff --git a/include/linux/iommu.h b/include/linux/iommu.h index b95a6f8db6ff..1d24be667a03 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -94,6 +94,7 @@ enum iommu_cap { transactions */ IOMMU_CAP_INTR_REMAP, /* IOMMU supports interrupt isolation */ IOMMU_CAP_NOEXEC, /* IOMMU_NOEXEC flag */ + IOMMU_CAP_VIOMMU, /* IOMMU can declar running in a VM */ }; /* -- 2.25.1
next prev parent reply other threads:[~2021-01-14 1:42 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-14 1:30 [RFC PATCH v3 0/2] Add platform check for subdevice irq domain Lu Baolu 2021-01-14 1:30 ` Lu Baolu [this message] 2021-01-14 13:26 ` [RFC PATCH v3 1/2] iommu: Add capability IOMMU_CAP_VIOMMU Leon Romanovsky 2021-01-14 23:49 ` Lu Baolu 2021-01-15 6:31 ` Leon Romanovsky 2021-01-16 1:20 ` Lu Baolu 2021-01-16 8:39 ` Leon Romanovsky 2021-01-16 8:47 ` Lu Baolu 2021-01-17 5:30 ` Leon Romanovsky 2021-01-15 4:46 ` Jason Wang 2021-01-14 1:30 ` [RFC PATCH v3 2/2] platform-msi: Add platform check for subdevice irq domain Lu Baolu 2021-01-14 3:03 ` Tian, Kevin
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=20210114013003.297050-2-baolu.lu@linux.intel.com \ --to=baolu.lu@linux.intel.com \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=bhelgaas@google.com \ --cc=dan.j.williams@intel.com \ --cc=dave.jiang@intel.com \ --cc=dmaengine@vger.kernel.org \ --cc=dwmw2@infradead.org \ --cc=eric.auger@redhat.com \ --cc=iommu@lists.linux-foundation.org \ --cc=jacob.jun.pan@intel.com \ --cc=jgg@mellanox.com \ --cc=joro@8bytes.org \ --cc=kevin.tian@intel.com \ --cc=kvm@vger.kernel.org \ --cc=kwankhede@nvidia.com \ --cc=leon@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=maz@kernel.org \ --cc=megha.dey@intel.com \ --cc=mona.hossain@intel.com \ --cc=netanelg@mellanox.com \ --cc=parav@mellanox.com \ --cc=pbonzini@redhat.com \ --cc=rafael@kernel.org \ --cc=samuel.ortiz@intel.com \ --cc=sanjay.k.kumar@intel.com \ --cc=shahafs@mellanox.com \ --cc=tglx@linutronix.de \ --cc=tony.luck@intel.com \ --cc=vkoul@kernel.org \ --cc=will@kernel.org \ --cc=yan.y.zhao@linux.intel.com \ --cc=yi.l.liu@intel.com \ --subject='Re: [RFC PATCH v3 1/2] iommu: Add capability IOMMU_CAP_VIOMMU' \ /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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).