From: Lu Baolu <baolu.lu@linux.intel.com>
To: Jon Derrick <jonathan.derrick@intel.com>,
iommu@lists.linux-foundation.org
Cc: baolu.lu@linux.intel.com, linux-pci@vger.kernel.org,
Joerg Roedel <joro@8bytes.org>,
Jacob Pan <jacob.jun.pan@linux.intel.com>,
Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>,
Ashok Raj <ashok.raj@intel.com>
Subject: Re: [PATCH v1 2/3] iommu/vt-d: Allocate domain info for real DMA sub-devices
Date: Thu, 28 May 2020 15:01:49 +0800 [thread overview]
Message-ID: <fd4b5313-efd0-90bf-5841-80a97ce5f652@linux.intel.com> (raw)
In-Reply-To: <20200527165617.297470-3-jonathan.derrick@intel.com>
On 2020/5/28 0:56, Jon Derrick wrote:
> Sub-devices of a real DMA device might exist on a separate segment than
> the real DMA device and its IOMMU. These devices should still have a
> valid device_domain_info, but the current dma alias model won't
> allocate info for the subdevice.
>
> This patch adds a segment member to struct device_domain_info and uses
> the sub-device's BDF so that these sub-devices won't alias to other
> devices.
>
> Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Best regards,
baolu
> ---
> drivers/iommu/intel-iommu.c | 19 +++++++++++++++----
> include/linux/intel-iommu.h | 1 +
> 2 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 1ff45b2..6d39b9b 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -2463,7 +2463,7 @@ static void do_deferred_attach(struct device *dev)
> struct device_domain_info *info;
>
> list_for_each_entry(info, &device_domain_list, global)
> - if (info->iommu->segment == segment && info->bus == bus &&
> + if (info->segment == segment && info->bus == bus &&
> info->devfn == devfn)
> return info;
>
> @@ -2520,8 +2520,18 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
> if (!info)
> return NULL;
>
> - info->bus = bus;
> - info->devfn = devfn;
> + if (!dev_is_real_dma_subdevice(dev)) {
> + info->bus = bus;
> + info->devfn = devfn;
> + info->segment = iommu->segment;
> + } else {
> + struct pci_dev *pdev = to_pci_dev(dev);
> +
> + info->bus = pdev->bus->number;
> + info->devfn = pdev->devfn;
> + info->segment = pci_domain_nr(pdev->bus);
> + }
> +
> info->ats_supported = info->pasid_supported = info->pri_supported = 0;
> info->ats_enabled = info->pasid_enabled = info->pri_enabled = 0;
> info->ats_qdep = 0;
> @@ -2561,7 +2571,8 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
>
> if (!found) {
> struct device_domain_info *info2;
> - info2 = dmar_search_domain_by_dev_info(iommu->segment, bus, devfn);
> + info2 = dmar_search_domain_by_dev_info(info->segment, info->bus,
> + info->devfn);
> if (info2) {
> found = info2->domain;
> info2->dev = dev;
> diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
> index 21633ce..4100bd2 100644
> --- a/include/linux/intel-iommu.h
> +++ b/include/linux/intel-iommu.h
> @@ -609,6 +609,7 @@ struct device_domain_info {
> struct list_head auxiliary_domains; /* auxiliary domains
> * attached to this device
> */
> + u32 segment; /* PCI segment number */
> u8 bus; /* PCI bus number */
> u8 devfn; /* PCI devfn number */
> u16 pfsid; /* SRIOV physical function source ID */
>
next prev parent reply other threads:[~2020-05-28 7:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 16:56 [PATCH v1 0/3] iommu/vt-d: real DMA sub-device info allocation Jon Derrick
2020-05-27 16:56 ` [PATCH v1 1/3] iommu/vt-d: Only clear real DMA device's context entries Jon Derrick
2020-05-28 6:59 ` Lu Baolu
2020-05-27 16:56 ` [PATCH v1 2/3] iommu/vt-d: Allocate domain info for real DMA sub-devices Jon Derrick
2020-05-28 7:01 ` Lu Baolu [this message]
2020-05-28 7:14 ` Lu Baolu
2020-05-27 16:56 ` [PATCH v1 3/3] iommu/vt-d: Remove real DMA lookup in find_domain Jon Derrick
2020-05-28 7:02 ` Lu Baolu
2020-05-29 13:12 ` [PATCH v1 0/3] iommu/vt-d: real DMA sub-device info allocation Joerg Roedel
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=fd4b5313-efd0-90bf-5841-80a97ce5f652@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=ashok.raj@intel.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jacob.jun.pan@linux.intel.com \
--cc=jonathan.derrick@intel.com \
--cc=joro@8bytes.org \
--cc=linux-pci@vger.kernel.org \
--cc=sai.praneeth.prakhya@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 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).