Skip to content

Commit 0a701aa

Browse files
YongjiXiebjorn-helgaas
authored andcommitted
PCI: Add pcibios_default_alignment() for arch-specific alignment control
When VFIO passes through a PCI device to a guest, it does not allow the guest to mmap BARs that are smaller than PAGE_SIZE unless it can reserve the rest of the page (see vfio_pci_probe_mmaps()). This is because a page might contain several small BARs for unrelated devices and a guest should not be able to access all of them. VFIO emulates guest accesses to non-mappable BARs, which is functional but slow. On systems with large page sizes, e.g., PowerNV with 64K pages, BARs are more likely to share a page and performance is more likely to be a problem. Add a weak function to set default alignment for all PCI devices. An arch can override it to force the PCI core to place memory BARs on their own pages. Signed-off-by: Yongji Xie <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent c9c7514 commit 0a701aa

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/pci/pci.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4947,6 +4947,11 @@ void pci_ignore_hotplug(struct pci_dev *dev)
49474947
}
49484948
EXPORT_SYMBOL_GPL(pci_ignore_hotplug);
49494949

4950+
resource_size_t __weak pcibios_default_alignment(void)
4951+
{
4952+
return 0;
4953+
}
4954+
49504955
#define RESOURCE_ALIGNMENT_PARAM_SIZE COMMAND_LINE_SIZE
49514956
static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0};
49524957
static DEFINE_SPINLOCK(resource_alignment_lock);
@@ -4962,14 +4967,15 @@ static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
49624967
{
49634968
int seg, bus, slot, func, align_order, count;
49644969
unsigned short vendor, device, subsystem_vendor, subsystem_device;
4965-
resource_size_t align = 0;
4970+
resource_size_t align = pcibios_default_alignment();
49664971
char *p;
49674972

49684973
spin_lock(&resource_alignment_lock);
49694974
p = resource_alignment_param;
4970-
if (!*p)
4975+
if (!*p && !align)
49714976
goto out;
49724977
if (pci_has_flag(PCI_PROBE_ONLY)) {
4978+
align = 0;
49734979
pr_info_once("PCI: Ignoring requested alignments (PCI_PROBE_ONLY)\n");
49744980
goto out;
49754981
}

0 commit comments

Comments
 (0)