From: jan.glauber@caviumnetworks.com (Jan Glauber)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/3] vfio/pci: Don't probe devices that can't be reset
Date: Fri, 18 Aug 2017 15:42:31 +0200 [thread overview]
Message-ID: <20170818134231.GA3464@hc> (raw)
In-Reply-To: <20170817070017.1e9c9456@w520.home>
On Thu, Aug 17, 2017 at 07:00:17AM -0600, Alex Williamson wrote:
> On Thu, 17 Aug 2017 10:14:23 +0200
> Jan Glauber <jglauber@cavium.com> wrote:
>
> > If a PCI device supports neither function-level reset, nor slot
> > or bus reset then refuse to probe it. A line is printed to inform
> > the user.
>
> But that's not what this does, this requires that the device is on a
> reset-able bus. This is a massive regression. With this we could no
> longer assign devices on the root complex or any device which doesn't
> return from bus reset and currently makes use of the NO_BUS_RESET flag
> and works happily otherwise. Full NAK. Thanks,
Looks like I missed the slot reset check. So how about this:
if (pci_probe_reset_slot(pdev->slot) && pci_probe_reset_bus(pdev->bus)) {
dev_warn(...);
return -ENODEV;
}
Or am I still missing something here?
thanks,
Jan
> Alex
>
> > Without this change starting qemu with a vfio-pci device can lead to
> > a kernel panic on some Cavium cn8xxx systems, depending on the used
> > device.
> >
> > Signed-off-by: Jan Glauber <jglauber@cavium.com>
> > ---
> > drivers/vfio/pci/vfio_pci.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> > index 063c1ce..029ba13 100644
> > --- a/drivers/vfio/pci/vfio_pci.c
> > +++ b/drivers/vfio/pci/vfio_pci.c
> > @@ -1196,6 +1196,12 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> > if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL)
> > return -EINVAL;
> >
> > + ret = pci_probe_reset_bus(pdev->bus);
> > + if (ret) {
> > + dev_warn(&pdev->dev, "Refusing to probe because reset is not possible.\n");
> > + return ret;
> > + }
> > +
> > group = vfio_iommu_group_get(&pdev->dev);
> > if (!group)
> > return -EINVAL;
next prev parent reply other threads:[~2017-08-18 13:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 8:14 [PATCH v2 0/3] Workaround for bus reset on Cavium cn8xxx root ports Jan Glauber
2017-08-17 8:14 ` [PATCH v2 1/3] PCI: Allow PCI_DEV_FLAGS_NO_BUS_RESET to be used on bus device Jan Glauber
2017-08-17 8:14 ` [PATCH v2 2/3] PCI: Avoid bus reset for Cavium cn8xxx root ports Jan Glauber
2017-08-17 8:14 ` [PATCH v2 3/3] vfio/pci: Don't probe devices that can't be reset Jan Glauber
2017-08-17 13:00 ` Alex Williamson
2017-08-18 13:42 ` Jan Glauber [this message]
2017-08-18 14:12 ` Alex Williamson
2017-08-18 15:57 ` David Daney
2017-08-19 3:55 ` Alex Williamson
2017-08-23 8:06 ` Jan Glauber
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=20170818134231.GA3464@hc \
--to=jan.glauber@caviumnetworks.com \
--cc=linux-arm-kernel@lists.infradead.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).