From nobody Mon Feb 9 23:01:32 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=1560528846; cv=none; d=zoho.com; s=zohoarc; b=YYP7DAwqGdRTUHbErcjbhMM7k5ftqLHagGMiLqDIabpXdwf5ohx2dB0rpt1eyzk6uNc7Tp2+BFgyJCRY8H0cyiTvPKQL/izrNRtAUQwQra+bcGmAFomV2+FCTabACUtihg3dA/a25/+NQyU3XZnrTRR8GLr14WWxeQaRUWHmKfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560528846; 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=qxH+K88VCk8wZODQ7W66TFIwQj1QlLVmxp/Yv/D6gxo=; b=jCVgbK64zwv2OAA7oFEHD96kEidYlfgRiSqauh+r7+ij0789W5MoB1NFYsVO/WJ0JFZa2bHWKdk1xDXNO9RIU7NGe/OU8o35Os6s+BWS6eJBAPDTJ/0N4/i/z4hyjk0ziVtMPe6tJIccmBCikovg05/hdlq8EJ6hQmwO68Xaez8= 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 1560528846162889.1234490108508; Fri, 14 Jun 2019 09:14:06 -0700 (PDT) Received: from localhost ([::1]:53068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hboq5-0003Os-40 for importer@patchew.org; Fri, 14 Jun 2019 12:14:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33926) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbobo-0001CF-NV for qemu-devel@nongnu.org; Fri, 14 Jun 2019 11:59:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbobm-0005uv-3s for qemu-devel@nongnu.org; Fri, 14 Jun 2019 11:59:20 -0400 Received: from mga18.intel.com ([134.134.136.126]:2024) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbobl-0005Pa-Ka for qemu-devel@nongnu.org; Fri, 14 Jun 2019 11:59:17 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jun 2019 08:59:10 -0700 Received: from tao-optiplex-7060.sh.intel.com ([10.239.13.104]) by orsmga008.jf.intel.com with ESMTP; 14 Jun 2019 08:59:08 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Tao Xu To: imammedo@redhat.com, eblake@redhat.com, ehabkost@redhat.com Date: Fri, 14 Jun 2019 23:56:22 +0800 Message-Id: <20190614155626.27932-5-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614155626.27932-1-tao3.xu@intel.com> References: <20190614155626.27932-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.126 Subject: [Qemu-devel] [PATCH v5 4/8] 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 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. Reviewed-by: Liu Jingqi Suggested-by: Igor Mammedov Suggested-by: Eduardo Habkost Signed-off-by: Tao Xu --- Changes in v5 -> v4: - Directly use ms->numa_state->nodes and not dereferencing ms->numa_state in the first place when ms->numa_state is possible NULL (Igor) --- 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 | 4 ++-- hw/ppc/spapr.c | 4 +++- hw/ppc/spapr_pci.c | 1 + include/sysemu/numa.h | 3 +++ numa.c | 15 +++++++++------ 10 files changed, 29 insertions(+), 16 deletions(-) diff --git a/exec.c b/exec.c index c7eb4af42d..0e30926588 100644 --- a/exec.c +++ b/exec.c @@ -1763,7 +1763,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 2af881e0f4..0c1572d118 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -600,7 +600,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/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 9d2edd8023..422bbed2d3 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -536,11 +536,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->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 d147cceab6..d3904d74dc 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -233,6 +233,7 @@ static void create_fdt(VirtMachineState *vms) int size =3D nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t); uint32_t *matrix =3D g_malloc0(size); int idx, i, j; + NodeInfo *numa_info =3D ms->numa_state->nodes; =20 for (i =3D 0; i < nb_numa_nodes; i++) { for (j =3D 0; j < nb_numa_nodes; j++) { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5bab78e137..4cc84c5050 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1041,7 +1041,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) * @@ -1683,7 +1683,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 < nb_numa_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 07a02db99e..3f2e6e0f5f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -349,6 +349,7 @@ static hwaddr spapr_node0_size(MachineState *machine) int nb_numa_nodes =3D machine->numa_state->num_nodes; if (nb_numa_nodes) { int i; + NodeInfo *numa_info =3D machine->numa_state->nodes; for (i =3D 0; i < nb_numa_nodes; ++i) { if (numa_info[i].node_mem) { return MIN(pow2floor(numa_info[i].node_mem), @@ -395,7 +396,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 */ @@ -2521,6 +2522,7 @@ static void spapr_validate_node_memory(MachineState *= machine, Error **errp) { int i; int nb_numa_nodes =3D machine->numa_state->num_nodes; + NodeInfo *numa_info =3D machine->numa_state->nodes; =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 d6fd018dd4..9d4ebd60de 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1639,6 +1639,7 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) 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->nodes; char *namebuf; int i; PCIBus *bus; diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 08a86080c4..437eb21fef 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -26,6 +26,9 @@ struct NumaState { =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 diff --git a/numa.c b/numa.c index 9432d42ad0..d23e130bce 100644 --- a/numa.c +++ b/numa.c @@ -52,9 +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 static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, Error **errp) @@ -63,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->nodes; =20 if (node->has_nodeid) { nodenr =3D node->nodeid; @@ -144,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->nodes; =20 if (src >=3D MAX_NODES || dst >=3D MAX_NODES) { error_setg(errp, "Parameter '%s' expects an integer between 0 and = %d", @@ -203,7 +202,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); @@ -263,6 +262,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++) { @@ -304,6 +304,7 @@ static void complete_init_numa_distance(MachineState *m= s) { int src, dst; int nb_numa_nodes =3D ms->numa_state->num_nodes; + 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 @@ -363,6 +364,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' @@ -534,8 +536,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; } @@ -594,6 +596,7 @@ static void numa_stat_memory_devices(NumaNodeMem node_m= em[]) void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms) { int i; + NodeInfo *numa_info =3D ms->numa_state->nodes; =20 if (ms->numa_state =3D=3D NULL || ms->numa_state->num_nodes <=3D 0) { return; --=20 2.20.1