Skip to content

Commit

Permalink
PCI/IOV: Use VF0 cached config space size for other VFs
Browse files Browse the repository at this point in the history
Cache the config space size from VF0 and use it for all other VFs instead
of reading it from the config space of each VF.  We assume that it will be
the same across all associated VFs.

This is an optimization when enabling SR-IOV on a device with many VFs.

Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de>
[bhelgaas: use CONFIG_PCI_IOV (not CONFIG_PCI_ATS)]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
KarimAllah Ahmed authored and Bjorn Helgaas committed Oct 11, 2018
1 parent 7876320 commit 975bb8b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/pci/iov.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ static void pci_read_vf_config_common(struct pci_dev *virtfn)
&physfn->sriov->subsystem_vendor);
pci_read_config_word(virtfn, PCI_SUBSYSTEM_ID,
&physfn->sriov->subsystem_device);

physfn->sriov->cfg_size = pci_cfg_space_size(virtfn);
}

int pci_iov_add_virtfn(struct pci_dev *dev, int id)
Expand Down
1 change: 1 addition & 0 deletions drivers/pci/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ struct pci_sriov {
u16 driver_max_VFs; /* Max num VFs driver supports */
struct pci_dev *dev; /* Lowest numbered PF */
struct pci_dev *self; /* This PF */
u32 cfg_size; /* VF config space size */
u32 class; /* VF device */
u8 hdr_type; /* VF header type */
u16 subsystem_vendor; /* VF subsystem vendor */
Expand Down
17 changes: 17 additions & 0 deletions drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1438,12 +1438,29 @@ static int pci_cfg_space_size_ext(struct pci_dev *dev)
return PCI_CFG_SPACE_EXP_SIZE;
}

#ifdef CONFIG_PCI_IOV
static bool is_vf0(struct pci_dev *dev)
{
if (pci_iov_virtfn_devfn(dev->physfn, 0) == dev->devfn &&
pci_iov_virtfn_bus(dev->physfn, 0) == dev->bus->number)
return true;

return false;
}
#endif

int pci_cfg_space_size(struct pci_dev *dev)
{
int pos;
u32 status;
u16 class;

#ifdef CONFIG_PCI_IOV
/* Read cached value for all VFs except for VF0 */
if (dev->is_virtfn && !is_vf0(dev))
return dev->physfn->sriov->cfg_size;
#endif

if (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_EXTCFG)
return PCI_CFG_SPACE_SIZE;

Expand Down

0 comments on commit 975bb8b

Please sign in to comment.