From: Paul Durrant <Paul.Durrant@citrix.com>
To: Roger Pau Monne <roger.pau@citrix.com>
Cc: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>,
Jan Beulich <jbeulich@suse.com>
Subject: Re: [Xen-devel] [PATCH 5/5] iommu / pci: re-implement XEN_DOMCTL_get_device_group...
Date: Mon, 3 Jun 2019 09:58:31 +0000 [thread overview]
Message-ID: <e3c64e80f918475aab7109d2a5e51cf9@AMSPEX02CL03.citrite.net> (raw)
Message-ID: <20190603095831.1w9MN0NU-JIUhPtptT-fWtZ7gtuDijluqWVQ5Biz97Q@z> (raw)
In-Reply-To: <20190515090630.xz7yi4g67uc6hlnn@Air-de-Roger>
> -----Original Message-----
> From: Roger Pau Monne
> Sent: 15 May 2019 10:07
> To: Paul Durrant <Paul.Durrant@citrix.com>
> Cc: xen-devel@lists.xenproject.org; Jan Beulich <jbeulich@suse.com>
> Subject: Re: [Xen-devel] [PATCH 5/5] iommu / pci: re-implement XEN_DOMCTL_get_device_group...
>
> On Wed, May 08, 2019 at 02:24:03PM +0100, Paul Durrant wrote:
> > ... using the new iommu_group infrastructure.
> >
> > Because 'sibling' devices are now members of the same iommu_group,
> > implement the domctl by looking up the relevant iommu_group and walking
> > the membership list.
> >
> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > ---
> > Cc: Jan Beulich <jbeulich@suse.com>
> > ---
> > xen/drivers/passthrough/iommu.c | 65 +++++++++++++++++++++++++++++++++++++++++
> > xen/drivers/passthrough/pci.c | 47 -----------------------------
> > xen/include/xen/iommu.h | 2 ++
> > 3 files changed, 67 insertions(+), 47 deletions(-)
> >
> > diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
> > index 11319fbaae..49140c652e 100644
> > --- a/xen/drivers/passthrough/iommu.c
> > +++ b/xen/drivers/passthrough/iommu.c
> > @@ -729,6 +729,71 @@ int iommu_group_assign(struct pci_dev *pdev)
> > return 0;
> > }
> >
> > +static struct iommu_group *iommu_group_lookup(uint16_t seg, uint8_t bus,
> > + uint8_t devfn)
>
> Could you use pci_sbdf_t to pass the SBDF?
>
Probably, I'd not noticed its existence so I'll use it when I can.
> > +{
> > + unsigned int id = 0;
> > + struct iommu_group *grp;
> > +
> > + while ( radix_tree_gang_lookup(&iommu_groups, (void **)&grp, id, 1) )
> > + {
> > + struct pci_dev *pdev;
> > +
> > + list_for_each_entry ( pdev, &grp->devs_list, grpdevs_list )
> > + if ( pdev->seg == seg && pdev->bus == bus &&
> > + pdev->devfn == devfn )
> > + return grp;
> > +
> > + id = grp->id + 1;
> > + }
> > +
> > + return NULL;
> > +}
> > +
> > +int iommu_get_device_group(struct domain *d, u16 seg, u8 bus, u8 devfn,
>
> Using pci_sbdf_t would be better here to pass the SBDF IMO, or
> uint<size>_t, or just plain unsigned int.
>
> Also, I wonder about the usefulness of the domain parameter, shouldn't
> you do the ownership check somewhere else (if required) and have this
> function just check the IOMMU group of a given PCI device?
>
> (Note you probably want to constify the domain parameter if it needs to
> stay).
Yes and no. This is the implementation of an existing domctl so it's semantics are baked in. I think I can use pci_sbdf_t but the domain parameter needs to stay.
>
> > + XEN_GUEST_HANDLE_64(uint32) buf, int max_sdevs)
> > +{
> > + struct iommu_group *grp;
> > + struct pci_dev *pdev;
> > + int i = 0;
>
> It seems like this should be unsigned int?
>
Yes, I guess it could be.
> > +
> > + pcidevs_lock();
> > +
> > + grp = iommu_group_lookup(seg, bus, devfn);
> > + if ( !grp )
> > + {
> > + pcidevs_unlock();
> > + return 0;
> > + }
> > +
> > + list_for_each_entry ( pdev, &grp->devs_list, grpdevs_list )
> > + {
> > + uint32_t sbdf;
> > +
> > + if ( i >= max_sdevs )
> > + break;
> > +
> > + if ( pdev->domain != d )
> > + continue;
> > +
> > + sbdf = PCI_SBDF3(pdev->seg, pdev->bus, pdev->devfn);
> > +
> > + if ( xsm_get_device_group(XSM_HOOK, sbdf) )
> > + continue;
> > +
> > + if ( unlikely(copy_to_guest_offset(buf, i, &sbdf, 1)) )
> > + {
> > + pcidevs_unlock();
> > + return -1;
>
> -EFAULT?
>
Yes... then I can get rid of the override of the ret value in the calling code.
Paul
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-06-03 9:59 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-08 13:23 [PATCH 0/5] iommu groups + cleanup Paul Durrant
2019-05-08 13:23 ` [Xen-devel] " Paul Durrant
2019-05-08 13:23 ` [PATCH 1/5] iommu: trivial re-organisation to avoid unnecessary test Paul Durrant
2019-05-08 13:23 ` [Xen-devel] " Paul Durrant
2019-05-13 15:22 ` Jan Beulich
2019-05-13 15:22 ` [Xen-devel] " Jan Beulich
2019-05-08 13:24 ` [PATCH 2/5] iommu / x86: move call to scan_pci_devices() out of vendor code Paul Durrant
2019-05-08 13:24 ` [Xen-devel] " Paul Durrant
2019-05-13 15:35 ` Jan Beulich
2019-05-13 15:35 ` [Xen-devel] " Jan Beulich
2019-05-14 16:13 ` Paul Durrant
2019-05-14 16:13 ` [Xen-devel] " Paul Durrant
2019-05-15 6:29 ` Jan Beulich
2019-05-15 6:29 ` [Xen-devel] " Jan Beulich
2019-05-08 13:24 ` [PATCH 3/5] iommu: move iommu_get_ops() into common code Paul Durrant
2019-05-08 13:24 ` [Xen-devel] " Paul Durrant
2019-05-13 16:11 ` Jan Beulich
2019-05-13 16:11 ` [Xen-devel] " Jan Beulich
2019-05-14 16:19 ` Paul Durrant
2019-05-14 16:19 ` [Xen-devel] " Paul Durrant
2019-05-14 21:36 ` Julien Grall
2019-05-14 21:36 ` [Xen-devel] " Julien Grall
2019-05-15 6:32 ` Jan Beulich
2019-05-15 6:32 ` [Xen-devel] " Jan Beulich
2019-05-08 13:24 ` [PATCH 4/5] iommu: introduce iommu_groups Paul Durrant
2019-05-08 13:24 ` [Xen-devel] " Paul Durrant
2019-05-15 8:44 ` Roger Pau Monné
2019-05-15 8:44 ` [Xen-devel] " Roger Pau Monné
2019-05-31 13:48 ` Paul Durrant
2019-05-31 13:48 ` [Xen-devel] " Paul Durrant
2019-05-15 14:17 ` Jan Beulich
2019-05-15 14:17 ` [Xen-devel] " Jan Beulich
2019-05-31 13:55 ` Paul Durrant
2019-05-31 13:55 ` [Xen-devel] " Paul Durrant
2019-05-31 14:13 ` Jan Beulich
2019-05-31 14:13 ` [Xen-devel] " Jan Beulich
2019-05-31 14:21 ` Paul Durrant
2019-05-31 14:21 ` [Xen-devel] " Paul Durrant
2019-05-15 14:24 ` Jan Beulich
2019-05-15 14:24 ` [Xen-devel] " Jan Beulich
2019-05-08 13:24 ` [PATCH 5/5] iommu / pci: re-implement XEN_DOMCTL_get_device_group Paul Durrant
2019-05-08 13:24 ` [Xen-devel] " Paul Durrant
2019-05-15 9:06 ` Roger Pau Monné
2019-05-15 9:06 ` [Xen-devel] " Roger Pau Monné
2019-06-03 9:58 ` Paul Durrant [this message]
2019-06-03 9:58 ` Paul Durrant
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=e3c64e80f918475aab7109d2a5e51cf9@AMSPEX02CL03.citrite.net \
--to=paul.durrant@citrix.com \
--cc=jbeulich@suse.com \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/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).