On Mon, May 18, 2015 at 05:00:37PM -0700, Mark D Rustad wrote: > Some devices have a problem with concurrent VPD access to different > functions of the same physical device, so move the protecting mutex > from the pci_vpd structure to the pci_bus structure. There are a > number of reports on support sites for a variety of devices from > various vendors getting the "vpd r/w failed" message. This is likely > to at least fix some of them. Thanks to Shannon Nelson for helping > to come up with this approach. > > Signed-off-by: Mark Rustad <mark.d.rustad@xxxxxxxxx> > Acked-by: Shannon Nelson <shannon.nelson@xxxxxxxxx> > Acked-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx> It sounds like there are real problems here that would be fixed by changing the mutex strategy and limiting VPD read lengths, but that we don't quite have consensus on how to solve them yet. VPD is a bit of a tar pit. We've talked about limiting VPD read length before (see links below), which requires interpreting the VPD contents (just the tags & sizes) the kernel. I think I'm OK with doing that, provided we should audit existing users and make sure we don't break them. http://lkml.kernel.org/r/c67cd7f4-8d8f-48fc-a63c-dbdafde873a2@xxxxxxxxxxxxxxxxxxxxxxxx http://lkml.kernel.org/r/1f6d7b6c-7189-4fe3-926b-42609724cab9@xxxxxxxxxxxxxxxxxxxxxxxx I'd also like to include specifics, e.g., bugzillas with complete dmesg and lspci information, for the problems we're fixing. Bjorn > --- > drivers/pci/access.c | 10 ++++------ > drivers/pci/probe.c | 1 + > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/access.c b/drivers/pci/access.c > index d9b64a175990..6a1c8d6f95f1 100644 > --- a/drivers/pci/access.c > +++ b/drivers/pci/access.c > @@ -281,7 +281,6 @@ PCI_USER_WRITE_CONFIG(dword, u32) > > struct pci_vpd_pci22 { > struct pci_vpd base; > - struct mutex lock; > u16 flag; > bool busy; > u8 cap; > @@ -340,7 +339,7 @@ static ssize_t pci_vpd_pci22_read(struct pci_dev *dev, loff_t pos, size_t count, > if (pos < 0 || pos > vpd->base.len || end > vpd->base.len) > return -EINVAL; > > - if (mutex_lock_killable(&vpd->lock)) > + if (mutex_lock_killable(&dev->bus->vpd_mutex)) > return -EINTR; > > ret = pci_vpd_pci22_wait(dev); > @@ -376,7 +375,7 @@ static ssize_t pci_vpd_pci22_read(struct pci_dev *dev, loff_t pos, size_t count, > } > } > out: > - mutex_unlock(&vpd->lock); > + mutex_unlock(&dev->bus->vpd_mutex); > return ret ? ret : count; > } > > @@ -392,7 +391,7 @@ static ssize_t pci_vpd_pci22_write(struct pci_dev *dev, loff_t pos, size_t count > if (pos < 0 || (pos & 3) || (count & 3) || end > vpd->base.len) > return -EINVAL; > > - if (mutex_lock_killable(&vpd->lock)) > + if (mutex_lock_killable(&dev->bus->vpd_mutex)) > return -EINTR; > > ret = pci_vpd_pci22_wait(dev); > @@ -424,7 +423,7 @@ static ssize_t pci_vpd_pci22_write(struct pci_dev *dev, loff_t pos, size_t count > pos += sizeof(u32); > } > out: > - mutex_unlock(&vpd->lock); > + mutex_unlock(&dev->bus->vpd_mutex); > return ret ? ret : count; > } > > @@ -453,7 +452,6 @@ int pci_vpd_pci22_init(struct pci_dev *dev) > > vpd->base.len = PCI_VPD_PCI22_SIZE; > vpd->base.ops = &pci_vpd_pci22_ops; > - mutex_init(&vpd->lock); > vpd->cap = cap; > vpd->busy = false; > dev->vpd = &vpd->base; > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 6675a7a1b9fc..40c2a5a751d0 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -494,6 +494,7 @@ static struct pci_bus *pci_alloc_bus(struct pci_bus *parent) > INIT_LIST_HEAD(&b->devices); > INIT_LIST_HEAD(&b->slots); > INIT_LIST_HEAD(&b->resources); > + mutex_init(&b->vpd_mutex); > b->max_bus_speed = PCI_SPEED_UNKNOWN; > b->cur_bus_speed = PCI_SPEED_UNKNOWN; > #ifdef CONFIG_PCI_DOMAINS_GENERIC > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 353db8dc4c6e..f8a51d172255 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -454,6 +454,7 @@ struct pci_bus { > struct msi_controller *msi; /* MSI controller */ > void *sysdata; /* hook for sys-specific extension */ > struct proc_dir_entry *procdir; /* directory entry in /proc/bus/pci */ > + struct mutex vpd_mutex; /* bus-wide VPD access mutex */ > > unsigned char number; /* bus number */ > unsigned char primary; /* number of primary bridge */ > -- 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
