From nobody Fri May 3 19:47:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1555570867; cv=none; d=zoho.com; s=zohoarc; b=WkqNZyf2i5I1L8vfI1tWmdlbG7UcitKNpQYKzIo2/uNBDqkA54r5LyOnFRPwtiIEiiDfFn+6oytp5anfdhpgWrDtSkVu8zri/4lJRWYWdakcmup829RAhwbZEkE2Vy0sziO4hgr+FrDZmZCF7WC2/iKCvER3R6FnpKcPycPpRNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555570867; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=SpzIgnAKqvaA+riCyU/1mk5P5Kx00Bhl+21xo0GLjBk=; b=OVuf/JqhZUqCIoOugo/XT/Tokk2ZOenF7km7huY53+/D6r3zh4cxYjFUx3KzaY18rIPIZ3/P6iaAP6bTyJbvoB9A8taQAGTaKyBri61Cgbyu6V8EmvDAWgHK0eqbLQeEZclzs+UAYYv0wYkvYm6DTWkfPqaRe+wUsQ+rb0wmMiY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555570867248385.1547556381511; Thu, 18 Apr 2019 00:01:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:36810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hH12g-0000Cn-5V for importer@patchew.org; Thu, 18 Apr 2019 03:01:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hH10Q-0007Gj-SL for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:58:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hH0qT-00060y-2J for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:48:31 -0400 Received: from mga01.intel.com ([192.55.52.88]:17089) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hH0qS-0005vo-Lm for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:48:29 -0400 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:22 -0700 Received: from vmmtaopc.sh.intel.com ([10.239.13.92]) by orsmga006.jf.intel.com with ESMTP; 17 Apr 2019 23:48:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,364,1549958400"; d="scan'208";a="136790435" From: Tao Xu To: imammedo@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com Date: Thu, 18 Apr 2019 14:46:00 +0800 Message-Id: <20190418064602.24558-2-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 1/3] numa: move numa global variable nb_numa_nodes 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The aim of this patch is to add struct NumaState in MachineState and move existing numa global nb_numa_nodes into NumaState. And add variable numa_support into MachineClass to decide which submachines support NUMA. Suggested-by: Igor Mammedov Suggested-by: Eduardo Habkost Signed-off-by: Tao Xu --- exec.c | 5 ++- hw/acpi/aml-build.c | 3 +- hw/arm/boot.c | 2 ++ hw/arm/virt-acpi-build.c | 8 +++-- hw/arm/virt.c | 5 ++- hw/core/machine.c | 16 +++++++--- hw/i386/acpi-build.c | 2 +- hw/i386/pc.c | 7 ++++- hw/mem/pc-dimm.c | 2 ++ hw/pci-bridge/pci_expander_bridge.c | 2 ++ hw/ppc/spapr.c | 26 +++++++++++++-- include/hw/acpi/aml-build.h | 2 +- include/hw/boards.h | 9 ++++++ include/sysemu/numa.h | 3 +- monitor.c | 4 ++- numa.c | 49 ++++++++++++++++------------- 16 files changed, 106 insertions(+), 39 deletions(-) diff --git a/exec.c b/exec.c index 6ab62f4eee..d0b59a4ae0 100644 --- a/exec.c +++ b/exec.c @@ -1708,6 +1708,7 @@ long qemu_getrampagesize(void) long hpsize =3D LONG_MAX; long mainrampagesize; Object *memdev_root; + MachineState *ms =3D MACHINE(qdev_get_machine()); =20 mainrampagesize =3D qemu_mempath_getpagesize(mem_path); =20 @@ -1735,7 +1736,9 @@ long qemu_getrampagesize(void) * so if its page size is smaller we have got to report that size inst= ead. */ if (hpsize > mainrampagesize && - (nb_numa_nodes =3D=3D 0 || numa_info[0].node_memdev =3D=3D NULL)) { + (ms->numa_state =3D=3D NULL || + ms->numa_state->nb_numa_nodes =3D=3D 0 || + numa_info[0].node_memdev =3D=3D 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 555c24f21d..f1e50742cd 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1726,10 +1726,11 @@ void build_srat_memory(AcpiSratMemoryAffinity *numa= mem, uint64_t base, * ACPI spec 5.2.17 System Locality Distance Information Table * (Revision 2.0 or later) */ -void build_slit(GArray *table_data, BIOSLinker *linker) +void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms) { int slit_start, i, j; slit_start =3D table_data->len; + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 acpi_data_push(table_data, sizeof(AcpiTableHeader)); =20 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index a830655e1a..2745880bd1 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -532,6 +532,8 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_inf= o *binfo, hwaddr mem_base, mem_len; char **node_path; Error *err =3D NULL; + MachineState *ms =3D MACHINE(qdev_get_machine()); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 if (binfo->dtb_filename) { char *filename; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index bf9c0bc2f4..88722e0746 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -516,7 +516,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) int i, srat_start; uint64_t mem_base; MachineClass *mc =3D MACHINE_GET_CLASS(vms); - const CPUArchIdList *cpu_list =3D mc->possible_cpu_arch_ids(MACHINE(vm= s)); + MachineState *ms =3D MACHINE(vms); + const CPUArchIdList *cpu_list =3D mc->possible_cpu_arch_ids(ms); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 srat_start =3D table_data->len; srat =3D acpi_data_push(table_data, sizeof(*srat)); @@ -780,6 +782,8 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTa= bles *tables) GArray *table_offsets; unsigned dsdt, xsdt; GArray *tables_blob =3D tables->table_data; + MachineState *ms =3D MACHINE(vms); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 table_offsets =3D g_array_new(false, true /* clear */, sizeof(uint32_t)); @@ -813,7 +817,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTa= bles *tables) build_srat(tables_blob, tables->linker, vms); if (have_numa_distance) { acpi_add_table(table_offsets, tables_blob); - build_slit(tables_blob, tables->linker); + build_slit(tables_blob, tables->linker, ms); } } =20 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ce2664a30b..430189af1a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -195,6 +195,8 @@ static bool cpu_type_valid(const char *cpu) =20 static void create_fdt(VirtMachineState *vms) { + MachineState *ms =3D MACHINE(vms); + int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; void *fdt =3D create_device_tree(&vms->fdt_size); =20 if (!fdt) { @@ -1780,7 +1782,7 @@ virt_cpu_index_to_props(MachineState *ms, unsigned cp= u_index) =20 static int64_t virt_get_default_cpu_node_id(const MachineState *ms, int id= x) { - return idx % nb_numa_nodes; + return idx % ms->numa_state->nb_numa_nodes; } =20 static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms) @@ -1886,6 +1888,7 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) mc->kvm_type =3D virt_kvm_type; assert(!mc->get_hotplug_handler); mc->get_hotplug_handler =3D virt_machine_get_hotplug_handler; + mc->numa_supported =3D true; hc->plug =3D virt_machine_device_plug_cb; } =20 diff --git a/hw/core/machine.c b/hw/core/machine.c index 743fef2898..99ad8dca83 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -854,6 +854,11 @@ static void machine_initfn(Object *obj) NULL); } =20 + if (mc->numa_supported) { + ms->numa_state =3D g_new0(NumaState, 1); + } else { + ms->numa_state =3D NULL; + } =20 /* Register notifier when init is done for sysbus sanity checks */ ms->sysbus_notifier.notify =3D machine_init_notify; @@ -874,6 +879,7 @@ static void machine_finalize(Object *obj) g_free(ms->firmware); g_free(ms->device_memory); g_free(ms->nvdimms_state); + g_free(ms->numa_state); } =20 bool machine_usb(MachineState *machine) @@ -945,7 +951,7 @@ static void machine_numa_finish_cpu_init(MachineState *= machine) MachineClass *mc =3D MACHINE_GET_CLASS(machine); const CPUArchIdList *possible_cpus =3D mc->possible_cpu_arch_ids(machi= ne); =20 - assert(nb_numa_nodes); + assert(machine->numa_state->nb_numa_nodes); for (i =3D 0; i < possible_cpus->len; i++) { if (possible_cpus->cpus[i].props.has_node_id) { break; @@ -991,9 +997,11 @@ void machine_run_board_init(MachineState *machine) { MachineClass *machine_class =3D MACHINE_GET_CLASS(machine); =20 - numa_complete_configuration(machine); - if (nb_numa_nodes) { - machine_numa_finish_cpu_init(machine); + if (machine_class->numa_supported) { + numa_complete_configuration(machine); + if (machine->numa_state->nb_numa_nodes) { + machine_numa_finish_cpu_init(machine); + } } =20 /* If the machine supports the valid_cpu_types check and the user diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 416da318ae..7d9bc88ac9 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2687,7 +2687,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState= *machine) build_srat(tables_blob, tables->linker, machine); if (have_numa_distance) { acpi_add_table(table_offsets, tables_blob); - build_slit(tables_blob, tables->linker); + build_slit(tables_blob, tables->linker, machine); } } if (acpi_get_mcfg(&mcfg)) { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f2c15bf1f2..b3b7e96090 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -996,6 +996,8 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PC= MachineState *pcms) int i; const CPUArchIdList *cpus; MachineClass *mc =3D MACHINE_GET_CLASS(pcms); + MachineState *ms =3D MACHINE(pcms); + int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; =20 fw_cfg =3D 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); @@ -1672,6 +1674,8 @@ void pc_machine_done(Notifier *notifier, void *data) void pc_guest_info_init(PCMachineState *pcms) { int i; + MachineState *ms =3D MACHINE(pcms); + int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; =20 pcms->apic_xrupt_override =3D kvm_allows_irq0_override(); pcms->numa_nodes =3D nb_numa_nodes; @@ -2655,7 +2659,7 @@ static int64_t pc_get_default_cpu_node_id(const Machi= neState *ms, int idx) assert(idx < ms->possible_cpus->len); x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id, smp_cores, smp_threads, &topo); - return topo.pkg_id % nb_numa_nodes; + return topo.pkg_id % ms->numa_state->nb_numa_nodes; } =20 static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) @@ -2749,6 +2753,7 @@ static void pc_machine_class_init(ObjectClass *oc, vo= id *data) nc->nmi_monitor_handler =3D x86_nmi; mc->default_cpu_type =3D TARGET_DEFAULT_CPU_TYPE; mc->nvdimm_supported =3D true; + mc->numa_supported =3D true; =20 object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int", pc_machine_get_device_memory_region_size, NULL, diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 152400b1fc..af25f4b568 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -160,6 +160,8 @@ static void pc_dimm_realize(DeviceState *dev, Error **e= rrp) { PCDIMMDevice *dimm =3D PC_DIMM(dev); PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); + MachineState *ms =3D MACHINE(qdev_get_machine()); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 if (!dimm->hostmem) { error_setg(errp, "'" PC_DIMM_MEMDEV_PROP "' property is not set"); diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index e62de4218f..b4a60de234 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -217,6 +217,8 @@ static void pxb_dev_realize_common(PCIDevice *dev, bool= pcie, Error **errp) PCIBus *bus; const char *dev_name =3D NULL; Error *local_err =3D NULL; + MachineState *ms =3D MACHINE(qdev_get_machine()); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 if (pxb->numa_node !=3D NUMA_NODE_UNASSIGNED && pxb->numa_node >=3D nb_numa_nodes) { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b52b82d298..e2825523fd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -290,6 +290,8 @@ static int spapr_fixup_cpu_dt(void *fdt, SpaprMachineSt= ate *spapr) CPUState *cs; char cpu_model[32]; uint32_t pft_size_prop[] =3D {0, cpu_to_be32(spapr->htab_shift)}; + MachineState *ms =3D MACHINE(spapr); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 CPU_FOREACH(cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -344,6 +346,9 @@ static int spapr_fixup_cpu_dt(void *fdt, SpaprMachineSt= ate *spapr) =20 static hwaddr spapr_node0_size(MachineState *machine) { + int nb_numa_nodes =3D machine->numa_state ? + machine->numa_state->nb_numa_nodes : + 0; if (nb_numa_nodes) { int i; for (i =3D 0; i < nb_numa_nodes; ++i) { @@ -390,6 +395,9 @@ static int spapr_populate_memory_node(void *fdt, int no= deid, hwaddr start, static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt) { MachineState *machine =3D MACHINE(spapr); + int nb_numa_nodes =3D machine->numa_state ? + machine->numa_state->nb_numa_nodes : + 0; hwaddr mem_start, node_size; int i, nb_nodes =3D nb_numa_nodes; NodeInfo *nodes =3D numa_info; @@ -444,6 +452,8 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *f= dt, int offset, PowerPCCPU *cpu =3D POWERPC_CPU(cs); CPUPPCState *env =3D &cpu->env; PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cs); + MachineState *ms =3D MACHINE(spapr); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; int index =3D spapr_get_vcpu_id(cpu); uint32_t segs[] =3D {cpu_to_be32(28), cpu_to_be32(40), 0xffffffff, 0xffffffff}; @@ -849,6 +859,9 @@ static int spapr_populate_drmem_v1(SpaprMachineState *s= papr, void *fdt, static int spapr_populate_drconf_memory(SpaprMachineState *spapr, void *fd= t) { MachineState *machine =3D MACHINE(spapr); + int nb_numa_nodes =3D machine->numa_state ? + machine->numa_state->nb_numa_nodes : + 0; int ret, i, offset; uint64_t lmb_size =3D SPAPR_MEMORY_BLOCK_SIZE; uint32_t prop_lmb_size[] =3D {0, cpu_to_be32(lmb_size)}; @@ -1023,11 +1036,13 @@ int spapr_h_cas_compose_response(SpaprMachineState = *spapr, static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt) { int rtas; + MachineState *ms =3D MACHINE(spapr); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; GString *hypertas =3D g_string_sized_new(256); GString *qemu_hypertas =3D g_string_sized_new(256); uint32_t refpoints[] =3D { cpu_to_be32(0x4), cpu_to_be32(0x4) }; - uint64_t max_device_addr =3D MACHINE(spapr)->device_memory->base + - memory_region_size(&MACHINE(spapr)->device_memory->mr); + uint64_t max_device_addr =3D ms->device_memory->base + + memory_region_size(&ms->device_memory->mr); uint32_t lrdr_capacity[] =3D { cpu_to_be32(max_device_addr >> 32), cpu_to_be32(max_device_addr & 0xffffffff), @@ -2466,6 +2481,9 @@ static void spapr_create_lmb_dr_connectors(SpaprMachi= neState *spapr) static void spapr_validate_node_memory(MachineState *machine, Error **errp) { int i; + int nb_numa_nodes =3D machine->numa_state ? + machine->numa_state->nb_numa_nodes : + 0; =20 if (machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Memory size 0x" RAM_ADDR_FMT @@ -4066,7 +4084,8 @@ spapr_cpu_index_to_props(MachineState *machine, unsig= ned cpu_index) =20 static int64_t spapr_get_default_cpu_node_id(const MachineState *ms, int i= dx) { - return idx / smp_cores % nb_numa_nodes; + return idx / smp_cores % + (ms->numa_state ? ms->numa_state->nb_numa_nodes : 0); } =20 static const CPUArchIdList *spapr_possible_cpu_arch_ids(MachineState *mach= ine) @@ -4266,6 +4285,7 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) smc->update_dt_enabled =3D true; mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power9_v2.0"); mc->has_hotpluggable_cpus =3D true; + mc->numa_supported =3D true; smc->resize_hpt_default =3D SPAPR_RESIZE_HPT_ENABLED; fwc->get_dev_path =3D spapr_get_fw_dev_path; nc->nmi_monitor_handler =3D spapr_nmi; diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 1a563ad756..991cf05134 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -414,7 +414,7 @@ build_append_gas_from_struct(GArray *table, const struc= t AcpiGenericAddress *s) void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, uint64_t len, int node, MemoryAffinityFlags flags); =20 -void build_slit(GArray *table_data, BIOSLinker *linker); +void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms); =20 void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, const char *oem_id, const char *oem_table_id); diff --git a/include/hw/boards.h b/include/hw/boards.h index e231860666..c4e8bb2437 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -5,6 +5,7 @@ =20 #include "sysemu/blockdev.h" #include "sysemu/accel.h" +#include "sysemu/sysemu.h" #include "hw/qdev.h" #include "qom/object.h" #include "qom/cpu.h" @@ -211,6 +212,7 @@ struct MachineClass { bool ignore_boot_device_suffixes; bool smbus_no_migration_support; bool nvdimm_supported; + bool numa_supported; =20 HotplugHandler *(*get_hotplug_handler)(MachineState *machine, DeviceState *dev); @@ -231,6 +233,12 @@ typedef struct DeviceMemoryState { MemoryRegion mr; } DeviceMemoryState; =20 +typedef struct NumaState { + /* Number of NUMA nodes */ + int nb_numa_nodes; + +} NumaState; + /** * MachineState: */ @@ -274,6 +282,7 @@ struct MachineState { AccelState *accelerator; CPUArchIdList *possible_cpus; struct NVDIMMState *nvdimms_state; + NumaState *numa_state; }; =20 #define DEFINE_MACHINE(namestr, machine_initfn) \ diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index b6ac7de43e..a55e2be563 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -6,7 +6,6 @@ #include "sysemu/hostmem.h" #include "hw/boards.h" =20 -extern int nb_numa_nodes; /* Number of NUMA nodes */ extern bool have_numa_distance; =20 struct NodeInfo { @@ -24,7 +23,7 @@ struct NumaNodeMem { 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[]); +void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms); extern QemuOptsList qemu_numa_opts; void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, int nb_nodes, ram_addr_t size); diff --git a/monitor.c b/monitor.c index 4807bbe811..fa5dbb589b 100644 --- a/monitor.c +++ b/monitor.c @@ -1908,11 +1908,13 @@ static void hmp_info_numa(Monitor *mon, const QDict= *qdict) int i; NumaNodeMem *node_mem; CpuInfoList *cpu_list, *cpu; + MachineState *ms =3D MACHINE(qdev_get_machine()); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 cpu_list =3D qmp_query_cpus(&error_abort); node_mem =3D g_new0(NumaNodeMem, nb_numa_nodes); =20 - query_numa_node_mem(node_mem); + query_numa_node_mem(node_mem, ms); monitor_printf(mon, "%d nodes\n", nb_numa_nodes); for (i =3D 0; i < nb_numa_nodes; i++) { monitor_printf(mon, "node %d cpus:", i); diff --git a/numa.c b/numa.c index 3875e1efda..4cc4d5ff5c 100644 --- a/numa.c +++ b/numa.c @@ -52,7 +52,6 @@ static int have_memdevs =3D -1; static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one. * For all nodes, nodeid < max_numa_nodeid */ -int nb_numa_nodes; bool have_numa_distance; NodeInfo numa_info[MAX_NODES]; =20 @@ -68,7 +67,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOpt= ions *node, if (node->has_nodeid) { nodenr =3D node->nodeid; } else { - nodenr =3D nb_numa_nodes; + nodenr =3D ms->numa_state->nb_numa_nodes; } =20 if (nodenr >=3D MAX_NODES) { @@ -136,10 +135,11 @@ static void parse_numa_node(MachineState *ms, NumaNod= eOptions *node, } numa_info[nodenr].present =3D true; max_numa_nodeid =3D MAX(max_numa_nodeid, nodenr + 1); - nb_numa_nodes++; + ms->numa_state->nb_numa_nodes++; } =20 -static void parse_numa_distance(NumaDistOptions *dist, Error **errp) +static +void parse_numa_distance(MachineState *ms, NumaDistOptions *dist, Error **= errp) { uint16_t src =3D dist->src; uint16_t dst =3D dist->dst; @@ -187,7 +187,7 @@ void set_numa_options(MachineState *ms, NumaOptions *ob= ject, Error **errp) } break; case NUMA_OPTIONS_TYPE_DIST: - parse_numa_distance(&object->u.dist, &err); + parse_numa_distance(ms, &object->u.dist, &err); if (err) { goto end; } @@ -252,10 +252,11 @@ end: * distance from a node to itself is always NUMA_DISTANCE_MIN, * so providing it is never necessary. */ -static void validate_numa_distance(void) +static void validate_numa_distance(MachineState *ms) { int src, dst; bool is_asymmetrical =3D false; + int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; =20 for (src =3D 0; src < nb_numa_nodes; src++) { for (dst =3D src; dst < nb_numa_nodes; dst++) { @@ -293,9 +294,10 @@ static void validate_numa_distance(void) } } =20 -static void complete_init_numa_distance(void) +static void complete_init_numa_distance(MachineState *ms) { int src, dst; + int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; =20 /* Fixup NUMA distance by symmetric policy because if it is an * asymmetric distance table, it should be a complete table and @@ -369,7 +371,7 @@ void numa_complete_configuration(MachineState *ms) * * Enable NUMA implicitly by adding a new NUMA node automatically. */ - if (ms->ram_slots > 0 && nb_numa_nodes =3D=3D 0 && + if (ms->ram_slots > 0 && ms->numa_state->nb_numa_nodes =3D=3D 0 && mc->auto_enable_numa_with_memhp) { NumaNodeOptions node =3D { }; parse_numa_node(ms, &node, &error_abort); @@ -387,30 +389,33 @@ void numa_complete_configuration(MachineState *ms) } =20 /* This must be always true if all nodes are present: */ - assert(nb_numa_nodes =3D=3D max_numa_nodeid); + assert(ms->numa_state->nb_numa_nodes =3D=3D max_numa_nodeid); =20 - if (nb_numa_nodes > 0) { + if (ms->numa_state->nb_numa_nodes > 0) { uint64_t numa_total; =20 - if (nb_numa_nodes > MAX_NODES) { - nb_numa_nodes =3D MAX_NODES; + if (ms->numa_state->nb_numa_nodes > MAX_NODES) { + ms->numa_state->nb_numa_nodes =3D MAX_NODES; } =20 /* If no memory size is given for any node, assume the default case * and distribute the available memory equally across all nodes */ - for (i =3D 0; i < nb_numa_nodes; i++) { + for (i =3D 0; i < ms->numa_state->nb_numa_nodes; i++) { if (numa_info[i].node_mem !=3D 0) { break; } } - if (i =3D=3D nb_numa_nodes) { + if (i =3D=3D ms->numa_state->nb_numa_nodes) { assert(mc->numa_auto_assign_ram); - mc->numa_auto_assign_ram(mc, numa_info, nb_numa_nodes, ram_siz= e); + mc->numa_auto_assign_ram(mc, + numa_info, + ms->numa_state->nb_numa_nodes, + ram_size); } =20 numa_total =3D 0; - for (i =3D 0; i < nb_numa_nodes; i++) { + for (i =3D 0; i < ms->numa_state->nb_numa_nodes; i++) { numa_total +=3D numa_info[i].node_mem; } if (numa_total !=3D ram_size) { @@ -434,10 +439,10 @@ void numa_complete_configuration(MachineState *ms) */ if (have_numa_distance) { /* Validate enough NUMA distance information was provided. */ - validate_numa_distance(); + validate_numa_distance(ms); =20 /* Validation succeeded, now fill in any missing distances. */ - complete_init_numa_distance(); + complete_init_numa_distance(ms); } } } @@ -513,6 +518,8 @@ void memory_region_allocate_system_memory(MemoryRegion = *mr, Object *owner, { uint64_t addr =3D 0; int i; + MachineState *ms =3D MACHINE(qdev_get_machine()); + int nb_numa_nodes =3D ms->numa_state ? ms->numa_state->nb_numa_nodes := 0; =20 if (nb_numa_nodes =3D=3D 0 || !have_memdevs) { allocate_system_memory_nonnuma(mr, owner, name, ram_size); @@ -578,16 +585,16 @@ static void numa_stat_memory_devices(NumaNodeMem node= _mem[]) qapi_free_MemoryDeviceInfoList(info_list); } =20 -void query_numa_node_mem(NumaNodeMem node_mem[]) +void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms) { int i; =20 - if (nb_numa_nodes <=3D 0) { + if (ms->numa_state =3D=3D NULL || ms->numa_state->nb_numa_nodes <=3D 0= ) { return; } =20 numa_stat_memory_devices(node_mem); - for (i =3D 0; i < nb_numa_nodes; i++) { + for (i =3D 0; i < ms->numa_state->nb_numa_nodes; i++) { node_mem[i].node_mem +=3D numa_info[i].node_mem; } } --=20 2.17.1 From nobody Fri May 3 19:47:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1555570866; cv=none; d=zoho.com; s=zohoarc; b=NVr4l9Gk7aQFYuCLsp/tSqU+PNaJPFgP19sYEcQ5RuATmBO5RbI3dMwIwpR0khSfkjiivA2wwbvjhL93lzRtqRjFB0GBSo2hMjOL0kVR5SaWQDvOK8eDAoqKVnUOWm0/ODiAq+0Ren+jjfgJPU/auOQX+aOfV5akbPqwQZXJWlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555570866; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=i+hbJVQEeUGjCv9BkoQ5L25hCdRXsimAG7EpZf8aKY4=; b=D24tVDSIa9NHw8NVKaQNZkkr/05shgM9RTLrXHjL4NWj3ehDQZZesSilNYAaWc1ZfDX2IA1MZGNYz4LGoRxhGE07ZCak3/DluRx+pRU9KUghpLOpy0Jh2KUX5u0giN1+SqSlcnzt4gxoVizf6U+FYeYoHzdbaO1JxWlI0FLzL7o= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555570866414256.5193585866044; Thu, 18 Apr 2019 00:01:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:36806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hH12a-00008Z-1Q for importer@patchew.org; Thu, 18 Apr 2019 03:01:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hH10R-0007Gi-Fh for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:58:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hH0qT-00060q-02 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:48:30 -0400 Received: from mga01.intel.com ([192.55.52.88]:17093) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hH0qS-0005wY-Lk for qemu-devel@nongnu.org; Thu, 18 Apr 2019 02:48:28 -0400 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:23 -0700 Received: from vmmtaopc.sh.intel.com ([10.239.13.92]) by orsmga006.jf.intel.com with ESMTP; 17 Apr 2019 23:48:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,364,1549958400"; d="scan'208";a="136790443" From: Tao Xu To: imammedo@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com Date: Thu, 18 Apr 2019 14:46:01 +0800 Message-Id: <20190418064602.24558-3-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 2/3] numa: move numa global variable have_numa_distance 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The aim of this patch is to move existing numa global have_numa_distance into NumaState. Suggested-by: Igor Mammedov Suggested-by: Eduardo Habkost Signed-off-by: Tao Xu --- hw/arm/virt-acpi-build.c | 2 +- hw/arm/virt.c | 1 + hw/i386/acpi-build.c | 2 +- include/hw/boards.h | 3 +++ include/sysemu/numa.h | 2 -- numa.c | 5 ++--- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 88722e0746..76316f13fd 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -815,7 +815,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTa= bles *tables) if (nb_numa_nodes > 0) { acpi_add_table(table_offsets, tables_blob); build_srat(tables_blob, tables->linker, vms); - if (have_numa_distance) { + if (ms->numa_state->have_numa_distance) { acpi_add_table(table_offsets, tables_blob); build_slit(tables_blob, tables->linker, ms); } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 430189af1a..8a07f0442f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -197,6 +197,7 @@ static void create_fdt(VirtMachineState *vms) { MachineState *ms =3D MACHINE(vms); int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; + bool have_numa_distance =3D ms->numa_state->have_numa_distance; void *fdt =3D create_device_tree(&vms->fdt_size); =20 if (!fdt) { diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 7d9bc88ac9..43a807c483 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2685,7 +2685,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState= *machine) if (pcms->numa_nodes) { acpi_add_table(table_offsets, tables_blob); build_srat(tables_blob, tables->linker, machine); - if (have_numa_distance) { + if (machine->numa_state->have_numa_distance) { acpi_add_table(table_offsets, tables_blob); build_slit(tables_blob, tables->linker, machine); } diff --git a/include/hw/boards.h b/include/hw/boards.h index c4e8bb2437..5737275775 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -237,6 +237,9 @@ typedef struct NumaState { /* Number of NUMA nodes */ int nb_numa_nodes; =20 + /* Allow setting NUMA distance for different NUMA nodes */ + bool have_numa_distance; + } NumaState; =20 /** diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index a55e2be563..1a29408db9 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -6,8 +6,6 @@ #include "sysemu/hostmem.h" #include "hw/boards.h" =20 -extern bool have_numa_distance; - struct NodeInfo { uint64_t node_mem; struct HostMemoryBackend *node_memdev; diff --git a/numa.c b/numa.c index 4cc4d5ff5c..57aa8abf42 100644 --- a/numa.c +++ b/numa.c @@ -52,7 +52,6 @@ static int have_memdevs =3D -1; static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one. * For all nodes, nodeid < max_numa_nodeid */ -bool have_numa_distance; NodeInfo numa_info[MAX_NODES]; =20 =20 @@ -171,7 +170,7 @@ void parse_numa_distance(MachineState *ms, NumaDistOpti= ons *dist, Error **errp) } =20 numa_info[src].distance[dst] =3D val; - have_numa_distance =3D true; + ms->numa_state->have_numa_distance =3D true; } =20 static @@ -437,7 +436,7 @@ void numa_complete_configuration(MachineState *ms) * asymmetric. In this case, the distances for both directions * of all node pairs are required. */ - if (have_numa_distance) { + if (ms->numa_state->have_numa_distance) { /* Validate enough NUMA distance information was provided. */ validate_numa_distance(ms); =20 --=20 2.17.1 From nobody Fri May 3 19:47:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1555570868; cv=none; d=zoho.com; s=zohoarc; b=Kxjvc6Z2mbYFtRiiZZUCxQNSEWpDB6NxOwCxxVvjk96p7Cb+JU+8mpq4jjDfLzD119v374X1se8nKkV1wgfkqeW2YAkt8sAruWANeY594yA8xBoAHUo1pOQdY+ZRXcBjpnL1spHm8Bk6mXZiN+zvoUFTA1m2dlE0ZJZxhdIBIWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555570868; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=r/NGCoWFOYIeq8726Cg1HZbjMAaQswK+aL5ncbkkEjw=; b=gmFgAd80xtndoBK2s046ObsAp2CoV2jt2juC3hNeVBxop8Em7LdPyxtvzqR7/f8anN7kPFK6mwKG8ZXICIU5PR5yReBelgfbbxXDW5PgObwHN2fyUMyken5fhEwxr7n1Z5edhciIP1hVKLug6D7ggMnQttTTkwSSQhxKOOmBy0I= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555570868111509.6763547132816; Thu, 18 Apr 2019 00:01:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:36808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hH12d-0000BK-Vm for importer@patchew.org; Thu, 18 Apr 2019 03:01:04 -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 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 Received: from vmmtaopc.sh.intel.com ([10.239.13.92]) by orsmga006.jf.intel.com with ESMTP; 17 Apr 2019 23:48:24 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,364,1549958400"; d="scan'208";a="136790454" 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D=3D NULL || ms->numa_state->nb_numa_nodes =3D=3D 0 || - numa_info[0].node_memdev =3D=3D NULL)) { + ms->numa_state->numa_info[0].node_memdev =3D=3D 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 *link= er, MachineState *ms) build_append_int_noprefix(table_data, nb_numa_nodes, 8); for (i =3D 0; i < nb_numa_nodes; i++) { for (j =3D 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].distanc= e[j], + 1); } } =20 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_inf= o *binfo, if (nb_numa_nodes > 0) { mem_base =3D binfo->loader_start; for (i =3D 0; i < nb_numa_nodes; i++) { - mem_len =3D numa_info[i].node_mem; + mem_len =3D ms->numa_state->numa_info[i].node_mem; rc =3D 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, Vi= rtMachineState *vms) =20 mem_base =3D vms->memmap[VIRT_MEM].base; for (i =3D 0; i < nb_numa_nodes; ++i) { - if (numa_info[i].node_mem > 0) { + if (ms->numa_state->numa_info[i].node_mem > 0) { numamem =3D 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 +=3D numa_info[i].node_mem; + mem_base +=3D ms->numa_state->numa_info[i].node_mem; } } =20 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 =3D MACHINE(vms); int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; bool have_numa_distance =3D ms->numa_state->have_numa_distance; + NodeInfo *numa_info =3D ms->numa_state->numa_info; void *fdt =3D create_device_tree(&vms->fdt_size); =20 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, PC= MachineState *pcms) MachineClass *mc =3D MACHINE_GET_CLASS(pcms); MachineState *ms =3D MACHINE(pcms); int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; + NodeInfo *numa_info =3D ms->numa_state->numa_info; =20 fw_cfg =3D 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 =3D MACHINE(pcms); int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; + NodeInfo *numa_info =3D ms->numa_state->numa_info; =20 pcms->apic_xrupt_override =3D kvm_allows_irq0_override(); pcms->numa_nodes =3D 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 =3D machine->numa_state ? machine->numa_state->nb_numa_nodes : 0; + NodeInfo *numa_info =3D machine->numa_state ? + machine->numa_state->numa_info : + NULL; + if (nb_numa_nodes) { int i; for (i =3D 0; i < nb_numa_nodes; ++i) { @@ -400,7 +404,9 @@ static int spapr_populate_memory(SpaprMachineState *spa= pr, void *fdt) 0; hwaddr mem_start, node_size; int i, nb_nodes =3D nb_numa_nodes; - NodeInfo *nodes =3D numa_info; + NodeInfo *nodes =3D machine->numa_state ? + machine->numa_state->numa_info : + NULL; NodeInfo ramnode; =20 /* 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 =3D machine->numa_state ? machine->numa_state->nb_numa_nodes : 0; + NodeInfo *numa_info =3D machine->numa_state ? + machine->numa_state->numa_info : + NULL; =20 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 =3D SYS_BUS_DEVICE(dev); SpaprPhbState *sphb =3D SPAPR_PCI_HOST_BRIDGE(s); PCIHostState *phb =3D PCI_HOST_BRIDGE(s); + MachineState *ms =3D MACHINE(spapr); + NodeInfo *numa_info =3D ms->numa_state ? ms->numa_state->numa_info : N= ULL; 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; =20 +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; =20 + /* NUMA nodes information */ + NodeInfo numa_info[MAX_NODES]; } NumaState; =20 /** 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" =20 -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; }; =20 -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 =3D -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]; - =20 static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, Error **errp) @@ -62,6 +60,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOpt= ions *node, uint16_t nodenr; uint16List *cpus =3D NULL; MachineClass *mc =3D MACHINE_GET_CLASS(ms); + NodeInfo *numa_info =3D ms->numa_state->numa_info; =20 if (node->has_nodeid) { nodenr =3D node->nodeid; @@ -143,6 +142,7 @@ void parse_numa_distance(MachineState *ms, NumaDistOpti= ons *dist, Error **errp) uint16_t src =3D dist->src; uint16_t dst =3D dist->dst; uint8_t val =3D dist->val; + NodeInfo *numa_info =3D ms->numa_state->numa_info; =20 if (src >=3D MAX_NODES || dst >=3D 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 *ob= ject, 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=3D%" PRId64 ", NUMA node mus= t be " "defined with -numa node,nodeid=3DID before it's used with= " "-numa cpu,node-id=3DID", object->u.cpu.node_id); @@ -256,6 +256,7 @@ static void validate_numa_distance(MachineState *ms) int src, dst; bool is_asymmetrical =3D false; int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; + NodeInfo *numa_info =3D ms->numa_state->numa_info; =20 for (src =3D 0; src < nb_numa_nodes; src++) { for (dst =3D src; dst < nb_numa_nodes; dst++) { @@ -297,6 +298,7 @@ static void complete_init_numa_distance(MachineState *m= s) { int src, dst; int nb_numa_nodes =3D ms->numa_state->nb_numa_nodes; + NodeInfo *numa_info =3D ms->numa_state->numa_info; =20 /* 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 =3D MACHINE_GET_CLASS(ms); + NodeInfo *numa_info =3D ms->numa_state->numa_info; =20 /* * If memory hotplug is enabled (slots > 0) but without '-numa' @@ -527,8 +530,8 @@ void memory_region_allocate_system_memory(MemoryRegion = *mr, Object *owner, =20 memory_region_init(mr, owner, name, ram_size); for (i =3D 0; i < nb_numa_nodes; i++) { - uint64_t size =3D numa_info[i].node_mem; - HostMemoryBackend *backend =3D numa_info[i].node_memdev; + uint64_t size =3D ms->numa_state->numa_info[i].node_mem; + HostMemoryBackend *backend =3D ms->numa_state->numa_info[i].node_m= emdev; if (!backend) { continue; } @@ -594,7 +597,7 @@ void query_numa_node_mem(NumaNodeMem node_mem[], Machin= eState *ms) =20 numa_stat_memory_devices(node_mem); for (i =3D 0; i < ms->numa_state->nb_numa_nodes; i++) { - node_mem[i].node_mem +=3D numa_info[i].node_mem; + node_mem[i].node_mem +=3D ms->numa_state->numa_info[i].node_mem; } } =20 --=20 2.17.1