On Tue, Dec 13, 2016 at 03:18:10PM -0600, Bjorn Helgaas wrote:
> On Fri, Oct 28, 2016 at 06:58:17PM -0400, Keith Busch wrote:
> > @@ -1017,6 +1017,11 @@ void pci_msix_shutdown(struct pci_dev *dev)
> > if (!pci_msi_enable || !dev || !dev->msix_enabled)
> > return;
> >
> > + if (dev->is_removed) {
> > + dev->msix_enabled = 0;
> > + return;
> > + }
> > +
> > /* Return the device with MSI-X masked as initial states */
> > for_each_pci_msi_entry(entry, dev) {
> > /* Keep cached states to be restored */
>
> Do we need the same thing in pci_msi_shutdown()?
We get MSI automatically from the previous two patches since MSI masking
is config access. MSIx is MMIO so it needs to explicitly check the
removed flag to fence off those unnecessary read-modify-writes.
> It's too bad we have the data structure maintenance stuff all
> intermingled with the hardware-touching code. I don't know how they
> could really be disentangled, but it feels a little ad hoc to sprinkle
> is_removed checks in random places where we observe problems.
Yeah, I unfortunately don't see a better way to do it either. It may
look a bit arbitrary considering there's plenty of other places we
could possibly check for removed, but this is the one we observe to
be the highest contributor. I'm mainly interested in NVM-Express where
controllers have dozens to hundreds of vectors, so this is potentially
shaving off another ~100 non-posted commands.
I have heard interest in leveraging this flag for other device drivers,
though, and suspect new usage may come later.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
