From patchwork Thu Apr 18 06:46:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Xu X-Patchwork-Id: 1087410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44l92q6HDNz9s3l for ; Thu, 18 Apr 2019 16:59:46 +1000 (AEST) Received: from localhost ([127.0.0.1]:36770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hH11M-0007LM-4n for incoming@patchwork.ozlabs.org; Thu, 18 Apr 2019 02:59:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hH10R-00075Q-FP for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:58:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hH0qT-00061K-Gi for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:48:31 -0400 Received: from mga01.intel.com ([192.55.52.88]:17087) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hH0qT-0005vB-5r for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:48:29 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Apr 2019 23:48:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,364,1549958400"; d="scan'208";a="136790454" Received: from vmmtaopc.sh.intel.com ([10.239.13.92]) by orsmga006.jf.intel.com with ESMTP; 17 Apr 2019 23:48:24 -0700 From: Tao Xu To: imammedo@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com Date: Thu, 18 Apr 2019 14:46:02 +0800 Message-Id: <20190418064602.24558-4-tao3.xu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190418064602.24558-1-tao3.xu@intel.com> References: <20190418064602.24558-1-tao3.xu@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH v2 3/3] numa: move numa global variable numa_info into MachineState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jingqi.liu@intel.com, tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The aim of this patch is to move existing numa global numa_info into NumaState. Suggested-by: Igor Mammedov Suggested-by: Eduardo Habkost Signed-off-by: Tao Xu --- exec.c | 2 +- hw/acpi/aml-build.c | 6 ++++-- hw/arm/boot.c | 2 +- hw/arm/virt-acpi-build.c | 7 ++++--- hw/arm/virt.c | 1 + hw/i386/pc.c | 2 ++ hw/ppc/spapr.c | 11 ++++++++++- hw/ppc/spapr_pci.c | 2 ++ include/hw/boards.h | 9 +++++++++ include/sysemu/numa.h | 8 -------- numa.c | 15 +++++++++------ 11 files changed, 43 insertions(+), 22 deletions(-) diff --git a/exec.c b/exec.c index d0b59a4ae0..1967e4258e 100644 --- a/exec.c +++ b/exec.c @@ -1738,7 +1738,7 @@ long qemu_getrampagesize(void) if (hpsize > mainrampagesize && (ms->numa_state == NULL || ms->numa_state->nb_numa_nodes == 0 || - numa_info[0].node_memdev == NULL)) { + ms->numa_state->numa_info[0].node_memdev == NULL)) { static bool warned; if (!warned) { error_report("Huge page support disabled (n/a for main memory)."); diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index f1e50742cd..9e20347fe5 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1737,8 +1737,10 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms) build_append_int_noprefix(table_data, nb_numa_nodes, 8); for (i = 0; i < nb_numa_nodes; i++) { for (j = 0; j < nb_numa_nodes; j++) { - assert(numa_info[i].distance[j]); - build_append_int_noprefix(table_data, numa_info[i].distance[j], 1); + assert(ms->numa_state->numa_info[i].distance[j]); + build_append_int_noprefix(table_data, + ms->numa_state->numa_info[i].distance[j], + 1); } } diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 2745880bd1..45ffcaf8c5 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -602,7 +602,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, if (nb_numa_nodes > 0) { mem_base = binfo->loader_start; for (i = 0; i < nb_numa_nodes; i++) { - mem_len = numa_info[i].node_mem; + mem_len = ms->numa_state->numa_info[i].node_mem; rc = fdt_add_memory_node(fdt, acells, mem_base, scells, mem_len, i); if (rc < 0) { diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 76316f13fd..8a3dd61525 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -535,11 +535,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) mem_base = vms->memmap[VIRT_MEM].base; for (i = 0; i < nb_numa_nodes; ++i) { - if (numa_info[i].node_mem > 0) { + if (ms->numa_state->numa_info[i].node_mem > 0) { numamem = acpi_data_push(table_data, sizeof(*numamem)); - build_srat_memory(numamem, mem_base, numa_info[i].node_mem, i, + build_srat_memory(numamem, mem_base, + ms->numa_state->numa_info[i].node_mem, i, MEM_AFFINITY_ENABLED); - mem_base += numa_info[i].node_mem; + mem_base += ms->numa_state->numa_info[i].node_mem; } } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 8a07f0442f..3135c54c8a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -198,6 +198,7 @@ static void create_fdt(VirtMachineState *vms) MachineState *ms = MACHINE(vms); int nb_numa_nodes = ms->numa_state->nb_numa_nodes; bool have_numa_distance = ms->numa_state->have_numa_distance; + NodeInfo *numa_info = ms->numa_state->numa_info; void *fdt = create_device_tree(&vms->fdt_size); if (!fdt) { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b3b7e96090..2b68de1beb 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -998,6 +998,7 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms) MachineClass *mc = MACHINE_GET_CLASS(pcms); MachineState *ms = MACHINE(pcms); int nb_numa_nodes = ms->numa_state->nb_numa_nodes; + NodeInfo *numa_info = ms->numa_state->numa_info; fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, as); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus); @@ -1676,6 +1677,7 @@ void pc_guest_info_init(PCMachineState *pcms) int i; MachineState *ms = MACHINE(pcms); int nb_numa_nodes = ms->numa_state->nb_numa_nodes; + NodeInfo *numa_info = ms->numa_state->numa_info; pcms->apic_xrupt_override = kvm_allows_irq0_override(); pcms->numa_nodes = nb_numa_nodes; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e2825523fd..3c7069b9f8 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -349,6 +349,10 @@ static hwaddr spapr_node0_size(MachineState *machine) int nb_numa_nodes = machine->numa_state ? machine->numa_state->nb_numa_nodes : 0; + NodeInfo *numa_info = machine->numa_state ? + machine->numa_state->numa_info : + NULL; + if (nb_numa_nodes) { int i; for (i = 0; i < nb_numa_nodes; ++i) { @@ -400,7 +404,9 @@ static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt) 0; hwaddr mem_start, node_size; int i, nb_nodes = nb_numa_nodes; - NodeInfo *nodes = numa_info; + NodeInfo *nodes = machine->numa_state ? + machine->numa_state->numa_info : + NULL; NodeInfo ramnode; /* No NUMA nodes, assume there is just one node with whole RAM */ @@ -2484,6 +2490,9 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) int nb_numa_nodes = machine->numa_state ? machine->numa_state->nb_numa_nodes : 0; + NodeInfo *numa_info = machine->numa_state ? + machine->numa_state->numa_info : + NULL; if (machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Memory size 0x" RAM_ADDR_FMT diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index f62e6833b8..c7748529fa 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1672,6 +1672,8 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) SysBusDevice *s = SYS_BUS_DEVICE(dev); SpaprPhbState *sphb = SPAPR_PCI_HOST_BRIDGE(s); PCIHostState *phb = PCI_HOST_BRIDGE(s); + MachineState *ms = MACHINE(spapr); + NodeInfo *numa_info = ms->numa_state ? ms->numa_state->numa_info : NULL; char *namebuf; int i; PCIBus *bus; diff --git a/include/hw/boards.h b/include/hw/boards.h index 5737275775..0e42a13ae2 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -233,6 +233,13 @@ typedef struct DeviceMemoryState { MemoryRegion mr; } DeviceMemoryState; +struct NodeInfo { + uint64_t node_mem; + struct HostMemoryBackend *node_memdev; + bool present; + uint8_t distance[MAX_NODES]; +}; + typedef struct NumaState { /* Number of NUMA nodes */ int nb_numa_nodes; @@ -240,6 +247,8 @@ typedef struct NumaState { /* Allow setting NUMA distance for different NUMA nodes */ bool have_numa_distance; + /* NUMA nodes information */ + NodeInfo numa_info[MAX_NODES]; } NumaState; /** diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 1a29408db9..7b8011f9ea 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -6,19 +6,11 @@ #include "sysemu/hostmem.h" #include "hw/boards.h" -struct NodeInfo { - uint64_t node_mem; - struct HostMemoryBackend *node_memdev; - bool present; - uint8_t distance[MAX_NODES]; -}; - struct NumaNodeMem { uint64_t node_mem; uint64_t node_plugged_mem; }; -extern NodeInfo numa_info[MAX_NODES]; void parse_numa_opts(MachineState *ms); void numa_complete_configuration(MachineState *ms); void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms); diff --git a/numa.c b/numa.c index 57aa8abf42..6309855063 100644 --- a/numa.c +++ b/numa.c @@ -52,8 +52,6 @@ static int have_memdevs = -1; static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one. * For all nodes, nodeid < max_numa_nodeid */ -NodeInfo numa_info[MAX_NODES]; - static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, Error **errp) @@ -62,6 +60,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, uint16_t nodenr; uint16List *cpus = NULL; MachineClass *mc = MACHINE_GET_CLASS(ms); + NodeInfo *numa_info = ms->numa_state->numa_info; if (node->has_nodeid) { nodenr = node->nodeid; @@ -143,6 +142,7 @@ void parse_numa_distance(MachineState *ms, NumaDistOptions *dist, Error **errp) uint16_t src = dist->src; uint16_t dst = dist->dst; uint8_t val = dist->val; + NodeInfo *numa_info = ms->numa_state->numa_info; if (src >= MAX_NODES || dst >= MAX_NODES) { error_setg(errp, "Parameter '%s' expects an integer between 0 and %d", @@ -196,7 +196,7 @@ void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp) error_setg(&err, "Missing mandatory node-id property"); goto end; } - if (!numa_info[object->u.cpu.node_id].present) { + if (!ms->numa_state->numa_info[object->u.cpu.node_id].present) { error_setg(&err, "Invalid node-id=%" PRId64 ", NUMA node must be " "defined with -numa node,nodeid=ID before it's used with " "-numa cpu,node-id=ID", object->u.cpu.node_id); @@ -256,6 +256,7 @@ static void validate_numa_distance(MachineState *ms) int src, dst; bool is_asymmetrical = false; int nb_numa_nodes = ms->numa_state->nb_numa_nodes; + NodeInfo *numa_info = ms->numa_state->numa_info; for (src = 0; src < nb_numa_nodes; src++) { for (dst = src; dst < nb_numa_nodes; dst++) { @@ -297,6 +298,7 @@ static void complete_init_numa_distance(MachineState *ms) { int src, dst; int nb_numa_nodes = ms->numa_state->nb_numa_nodes; + NodeInfo *numa_info = ms->numa_state->numa_info; /* Fixup NUMA distance by symmetric policy because if it is an * asymmetric distance table, it should be a complete table and @@ -356,6 +358,7 @@ void numa_complete_configuration(MachineState *ms) { int i; MachineClass *mc = MACHINE_GET_CLASS(ms); + NodeInfo *numa_info = ms->numa_state->numa_info; /* * If memory hotplug is enabled (slots > 0) but without '-numa' @@ -527,8 +530,8 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, memory_region_init(mr, owner, name, ram_size); for (i = 0; i < nb_numa_nodes; i++) { - uint64_t size = numa_info[i].node_mem; - HostMemoryBackend *backend = numa_info[i].node_memdev; + uint64_t size = ms->numa_state->numa_info[i].node_mem; + HostMemoryBackend *backend = ms->numa_state->numa_info[i].node_memdev; if (!backend) { continue; } @@ -594,7 +597,7 @@ void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms) numa_stat_memory_devices(node_mem); for (i = 0; i < ms->numa_state->nb_numa_nodes; i++) { - node_mem[i].node_mem += numa_info[i].node_mem; + node_mem[i].node_mem += ms->numa_state->numa_info[i].node_mem; } }