From nobody Tue Feb 10 11:23:50 2026 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=1563288905; cv=none; d=zoho.com; s=zohoarc; b=GN98uvZHIqtIGkMjvbqtg1YejO7DTcNDnns0M8OcmZjAOoSvdwWTcPQnLxO7eqd23Yc6z1euMk6rUZhKLSIspTh+s75AJiMPflriXw5vHWCLS3hPMezIGLdsUXNv0oou7tPXucJYD3tQ0Vdjr3nehrFeWfJOkc6yzT+nbNjC/aE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563288905; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1SRRxWBuEp+bXLumXYaR4eB/22cOeE0LN8EuH0PNOq4=; b=VKSGuHa5qXaCvl/90gfDhn4mGep2Hg8HAkDzgPriQey8f1Ql56AjRlM4P8GdkOGTYHIaz7YcV0Mx5NGKnADdUzqt7oydB9vatOO545lBHRdoIEMeo1akvk3OogHWme8qMxsFFZwn7lna/Zat3w99R9sPnS5lFy8hhFxGSQaaOOQ= 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 1563288905178999.6177326615973; Tue, 16 Jul 2019 07:55:05 -0700 (PDT) Received: from localhost ([::1]:49742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnOr7-0006bj-E7 for importer@patchew.org; Tue, 16 Jul 2019 10:55:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49766) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnOqW-0004hB-7E for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:54:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnOqU-00011p-D7 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:54:24 -0400 Received: from mga03.intel.com ([134.134.136.65]:20995) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnOqU-0000za-0S for qemu-devel@nongnu.org; Tue, 16 Jul 2019 10:54:22 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jul 2019 07:54:21 -0700 Received: from tao-optiplex-7060.sh.intel.com ([10.239.13.104]) by orsmga004.jf.intel.com with ESMTP; 16 Jul 2019 07:54:19 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,498,1557212400"; d="scan'208";a="319014770" From: Tao Xu To: imammedo@redhat.com, eblake@redhat.com, ehabkost@redhat.com Date: Tue, 16 Jul 2019 22:51:14 +0800 Message-Id: <20190716145121.19578-5-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716145121.19578-1-tao3.xu@intel.com> References: <20190716145121.19578-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH v7 04/11] numa: move numa global variable numa_info into MachineState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jingqi.liu@intel.com, tao3.xu@intel.com, fan.du@intel.com, qemu-devel@nongnu.org, jonathan.cameron@huawei.com, dan.j.williams@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Move existing numa global numa_info (renamed as "nodes") into NumaState. Suggested-by: Igor Mammedov Suggested-by: Eduardo Habkost Signed-off-by: Tao Xu Reviewed-by: Igor Mammedov --- No changes in v7. Changes in v6: - Rebase to upstream, move globals in arm/sbsa-ref - Correct some mistake(Igor) - Use ms->numa_state->nodes directly, when use it once or twice(Igor) --- exec.c | 2 +- hw/acpi/aml-build.c | 6 ++++-- hw/arm/boot.c | 2 +- hw/arm/sbsa-ref.c | 3 ++- hw/arm/virt-acpi-build.c | 7 ++++--- hw/arm/virt.c | 3 ++- hw/core/numa.c | 15 +++++++++------ hw/i386/pc.c | 4 ++-- hw/ppc/spapr.c | 10 +++++----- hw/ppc/spapr_pci.c | 4 +++- include/sysemu/numa.h | 5 +++-- 11 files changed, 36 insertions(+), 25 deletions(-) diff --git a/exec.c b/exec.c index b6b75d2ad5..26dd7676c0 100644 --- a/exec.c +++ b/exec.c @@ -1766,7 +1766,7 @@ long qemu_minrampagesize(void) if (hpsize > mainrampagesize && (ms->numa_state =3D=3D NULL || ms->numa_state->num_nodes =3D=3D 0 || - numa_info[0].node_memdev =3D=3D NULL)) { + ms->numa_state->nodes[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 63c1cae8c9..26ccc1a3e2 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->nodes[i].distance[j]); + build_append_int_noprefix(table_data, + ms->numa_state->nodes[i].distance[j], + 1); } } =20 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e28daa5278..da228919dc 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -601,7 +601,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_inf= o *binfo, if (ms->numa_state !=3D NULL && ms->numa_state->num_nodes > 0) { mem_base =3D binfo->loader_start; for (i =3D 0; i < ms->numa_state->num_nodes; i++) { - mem_len =3D numa_info[i].node_mem; + mem_len =3D ms->numa_state->nodes[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/sbsa-ref.c b/hw/arm/sbsa-ref.c index 7e4c471717..3a243e6a53 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -168,7 +168,8 @@ static void create_fdt(SBSAMachineState *sms) idx =3D (i * nb_numa_nodes + j) * 3; matrix[idx + 0] =3D cpu_to_be32(i); matrix[idx + 1] =3D cpu_to_be32(j); - matrix[idx + 2] =3D cpu_to_be32(numa_info[i].distance[j]); + matrix[idx + 2] =3D + cpu_to_be32(ms->numa_state->nodes[i].distance[j]); } } =20 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 461a44b5b0..89899ec4c1 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -534,11 +534,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 < ms->numa_state->num_nodes; ++i) { - if (numa_info[i].node_mem > 0) { + if (ms->numa_state->nodes[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->nodes[i].node_mem, i, MEM_AFFINITY_ENABLED); - mem_base +=3D numa_info[i].node_mem; + mem_base +=3D ms->numa_state->nodes[i].node_mem; } } =20 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 984f162531..174e81a3de 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -242,7 +242,8 @@ static void create_fdt(VirtMachineState *vms) idx =3D (i * nb_numa_nodes + j) * 3; matrix[idx + 0] =3D cpu_to_be32(i); matrix[idx + 1] =3D cpu_to_be32(j); - matrix[idx + 2] =3D cpu_to_be32(numa_info[i].distance[j]); + matrix[idx + 2] =3D + cpu_to_be32(ms->numa_state->nodes[i].distance[j]); } } =20 diff --git a/hw/core/numa.c b/hw/core/numa.c index 2142ec29e8..8fcbba05d6 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -50,8 +50,6 @@ static int have_mem; 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) @@ -61,6 +59,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOpt= ions *node, uint16List *cpus =3D NULL; MachineClass *mc =3D MACHINE_GET_CLASS(ms); unsigned int max_cpus =3D ms->smp.max_cpus; + NodeInfo *numa_info =3D ms->numa_state->nodes; =20 if (node->has_nodeid) { nodenr =3D node->nodeid; @@ -140,6 +139,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->nodes; =20 if (src >=3D MAX_NODES || dst >=3D MAX_NODES) { error_setg(errp, "Parameter '%s' expects an integer between 0 and = %d", @@ -198,7 +198,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->nodes[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); @@ -258,6 +258,7 @@ static void validate_numa_distance(MachineState *ms) int src, dst; bool is_asymmetrical =3D false; int nb_numa_nodes =3D ms->numa_state->num_nodes; + NodeInfo *numa_info =3D ms->numa_state->nodes; =20 for (src =3D 0; src < nb_numa_nodes; src++) { for (dst =3D src; dst < nb_numa_nodes; dst++) { @@ -298,6 +299,7 @@ static void validate_numa_distance(MachineState *ms) static void complete_init_numa_distance(MachineState *ms) { int src, dst; + NodeInfo *numa_info =3D ms->numa_state->nodes; =20 /* Fixup NUMA distance by symmetric policy because if it is an * asymmetric distance table, it should be a complete table and @@ -357,6 +359,7 @@ void numa_complete_configuration(MachineState *ms) { int i; MachineClass *mc =3D MACHINE_GET_CLASS(ms); + NodeInfo *numa_info =3D ms->numa_state->nodes; =20 /* * If memory hotplug is enabled (slots > 0) but without '-numa' @@ -522,8 +525,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 < ms->numa_state->num_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->nodes[i].node_mem; + HostMemoryBackend *backend =3D ms->numa_state->nodes[i].node_memde= v; if (!backend) { continue; } @@ -589,7 +592,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->num_nodes; i++) { - node_mem[i].node_mem +=3D numa_info[i].node_mem; + node_mem[i].node_mem +=3D ms->numa_state->nodes[i].node_mem; } } =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6d87fad739..5122f49973 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1039,7 +1039,7 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, = PCMachineState *pcms) } for (i =3D 0; i < nb_numa_nodes; i++) { numa_fw_cfg[pcms->apic_id_limit + 1 + i] =3D - cpu_to_le64(numa_info[i].node_mem); + cpu_to_le64(ms->numa_state->nodes[i].node_mem); } fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, numa_fw_cfg, (1 + pcms->apic_id_limit + nb_numa_nodes) * @@ -1767,7 +1767,7 @@ void pc_guest_info_init(PCMachineState *pcms) pcms->node_mem =3D g_malloc0(pcms->numa_nodes * sizeof *pcms->node_mem); for (i =3D 0; i < ms->numa_state->num_nodes; i++) { - pcms->node_mem[i] =3D numa_info[i].node_mem; + pcms->node_mem[i] =3D ms->numa_state->nodes[i].node_mem; } =20 pcms->machine_done.notify =3D pc_machine_done; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2aec966616..5a9128f07e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -354,8 +354,8 @@ static hwaddr spapr_node0_size(MachineState *machine) if (machine->numa_state->num_nodes) { int i; for (i =3D 0; i < machine->numa_state->num_nodes; ++i) { - if (numa_info[i].node_mem) { - return MIN(pow2floor(numa_info[i].node_mem), + if (machine->numa_state->nodes[i].node_mem) { + return MIN(pow2floor(machine->numa_state->nodes[i].node_me= m), machine->ram_size); } } @@ -399,7 +399,7 @@ static int spapr_populate_memory(SpaprMachineState *spa= pr, void *fdt) MachineState *machine =3D MACHINE(spapr); hwaddr mem_start, node_size; int i; - NodeInfo *nodes =3D numa_info; + NodeInfo *nodes =3D machine->numa_state->nodes; NodeInfo ramnode; =20 /* No NUMA nodes, assume there is just one node with whole RAM */ @@ -2539,11 +2539,11 @@ static void spapr_validate_node_memory(MachineState= *machine, Error **errp) } =20 for (i =3D 0; i < machine->numa_state->num_nodes; i++) { - if (numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) { + if (machine->numa_state->nodes[i].node_mem % SPAPR_MEMORY_BLOCK_SI= ZE) { error_setg(errp, "Node %d memory size 0x%" PRIx64 " is not aligned to %" PRIu64 " MiB", - i, numa_info[i].node_mem, + i, machine->numa_state->nodes[i].node_mem, SPAPR_MEMORY_BLOCK_SIZE / MiB); return; } diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 9003fe9010..f05d82eee7 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1818,6 +1818,7 @@ 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); char *namebuf; int i; PCIBus *bus; @@ -1870,7 +1871,8 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) } =20 if (sphb->numa_node !=3D -1 && - (sphb->numa_node >=3D MAX_NODES || !numa_info[sphb->numa_node].pre= sent)) { + (sphb->numa_node >=3D MAX_NODES || + !ms->numa_state->nodes[sphb->numa_node].present)) { error_setg(errp, "Invalid NUMA node ID for PCI host bridge"); return; } diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 2e5e998adb..76da3016db 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -18,14 +18,15 @@ struct NumaNodeMem { uint64_t node_plugged_mem; }; =20 -extern NodeInfo numa_info[MAX_NODES]; - struct NumaState { /* Number of NUMA nodes */ int num_nodes; =20 /* Allow setting NUMA distance for different NUMA nodes */ bool have_numa_distance; + + /* NUMA nodes information */ + NodeInfo nodes[MAX_NODES]; }; typedef struct NumaState NumaState; =20 --=20 2.20.1