Commit 6a3042b2 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Michael S. Tsirkin
Browse files

hw/pci: add support for NUMA nodes 



PCI root buses can be attached to a specific NUMA node.
PCI buses are not attached by default to a NUMA node.

Signed-off-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarLaszlo Ersek <lersek@redhat.com>
parent 0639b00d

hw/pci/pci.c

+11 −0
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ static int pcibus_num(PCIBus *bus) 
    return bus->parent_dev->config[PCI_SECONDARY_BUS];

}



static uint16_t pcibus_numa_node(PCIBus *bus)

{

    return NUMA_NODE_UNASSIGNED;

}



static void pci_bus_class_init(ObjectClass *klass, void *data)

{

    BusClass *k = BUS_CLASS(klass);
@@ -115,6 +120,7 @@ static void pci_bus_class_init(ObjectClass *klass, void *data) 


    pbc->is_root = pcibus_is_root;

    pbc->bus_num = pcibus_num;

    pbc->numa_node = pcibus_numa_node;

}



static const TypeInfo pci_bus_info = {
@@ -402,6 +408,11 @@ int pci_bus_num(PCIBus *s) 
    return PCI_BUS_GET_CLASS(s)->bus_num(s);

}



int pci_bus_numa_node(PCIBus *bus)

{

    return PCI_BUS_GET_CLASS(bus)->numa_node(bus);

}



static int get_pci_config_device(QEMUFile *f, void *pv, size_t size)

{

    PCIDevice *s = container_of(pv, PCIDevice, config);

include/hw/pci/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, 
PCIDevice *pci_vga_init(PCIBus *bus);



int pci_bus_num(PCIBus *s);

int pci_bus_numa_node(PCIBus *bus);

void pci_for_each_device(PCIBus *bus, int bus_num,

                         void (*fn)(PCIBus *bus, PCIDevice *d, void *opaque),

                         void *opaque);

include/hw/pci/pci_bus.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ typedef struct PCIBusClass { 


    bool (*is_root)(PCIBus *bus);

    int (*bus_num)(PCIBus *bus);

    uint16_t (*numa_node)(PCIBus *bus);

} PCIBusClass;



struct PCIBus {

include/sysemu/sysemu.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ extern const char *mem_path; 
extern int mem_prealloc;



#define MAX_NODES 128

#define NUMA_NODE_UNASSIGNED MAX_NODES



/* The following shall be true for all CPUs:

 *   cpu->cpu_index < max_cpus <= MAX_CPUMASK_BITS