From nobody Sun Apr 28 21:50:22 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=1567672900; cv=none; d=zoho.com; s=zohoarc; b=B18m9B1lcwDMmhLlyMRI+WAiffTX35tWXL304EveO4J5Urc9NL2YEXLd7sSrQBoCygx/PYIcW7AX/LdeBpe1g1HI9hONH4Qk1xuoojVFZve2CMvNqe9aSHi+buRxbjavGWLesWwOEklz87SEUon+prLzz2BpUTXIITZXBi3+AGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567672900; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=U4b5ddzYgdFFtljbU2fpfJmv7kNphwxSdJa2whY3ljA=; b=RnguM7pOQmNTyDiRwE5MvIs2LBVZzrUOW7gbkIn//LTBbfgbhfoix0/x6cjpW5gJlRHou7cChttKEoKCzMaluR1MNGIEY5Iom/xAZnlq/YDMJrb0akPwbekIib2fVt0cMDy6D6aIFTYyXQUpXk/joZBUR50eq8xMPwFOVIx7+hs= 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 1567672900060518.1361125669191; Thu, 5 Sep 2019 01:41:40 -0700 (PDT) Received: from localhost ([::1]:43304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5nKk-0001tw-Uh for importer@patchew.org; Thu, 05 Sep 2019 04:41:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33582) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5nCH-0000fL-Lz for qemu-devel@nongnu.org; Thu, 05 Sep 2019 04:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5nCG-0006r8-7y for qemu-devel@nongnu.org; Thu, 05 Sep 2019 04:32:53 -0400 Received: from mga05.intel.com ([192.55.52.43]:57318) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i5nCC-0006jl-Op; Thu, 05 Sep 2019 04:32:48 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Sep 2019 01:32:43 -0700 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by orsmga004.jf.intel.com with ESMTP; 05 Sep 2019 01:32:42 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,470,1559545200"; d="scan'208";a="334488011" From: Tao Xu To: ehabkost@redhat.com, marcel.apfelbaum@gmail.com, david@gibson.dropbear.id.au Date: Thu, 5 Sep 2019 16:32:38 +0800 Message-Id: <20190905083238.1799-1-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 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: 192.55.52.43 Subject: [Qemu-devel] [PATCH v2] numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node 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: Igor Mammedov , Tao Xu , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add MachineClass::auto_enable_numa field. When it is true, a NUMA node is expected to be created implicitly. Acked-by: David Gibson Suggested-by: Igor Mammedov Suggested-by: Eduardo Habkost Reviewed-by: Igor Mammedov Signed-off-by: Tao Xu --- Note: Parameter -numa node,mem is deprecated too. So I set "numa_info[0].node_mem =3D ram_size" instead of "NumaNodeOptions node =3D { .mem =3D ram_size }". Changes in v2: - Fix the qtest error, avoid using numa_auto_assign_ram. --- hw/core/numa.c | 10 ++++++++-- hw/ppc/spapr.c | 9 +-------- include/hw/boards.h | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index 4dfec5c95b..038c96d4ab 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -378,11 +378,17 @@ void numa_complete_configuration(MachineState *ms) * guest tries to use it with that drivers. * * Enable NUMA implicitly by adding a new NUMA node automatically. + * + * Or if MachineClass::auto_enable_numa is true and no NUMA nodes, + * assume there is just one node with whole RAM. */ - if (ms->ram_slots > 0 && ms->numa_state->num_nodes =3D=3D 0 && - mc->auto_enable_numa_with_memhp) { + if (ms->numa_state->num_nodes =3D=3D 0 && + ((ms->ram_slots > 0 && + mc->auto_enable_numa_with_memhp) || + mc->auto_enable_numa)) { NumaNodeOptions node =3D { }; parse_numa_node(ms, &node, &error_abort); + numa_info[0].node_mem =3D ram_size; } =20 assert(max_numa_nodeid <=3D MAX_NODES); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 222a325056..f760e0f5d7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -405,14 +405,6 @@ static int spapr_populate_memory(SpaprMachineState *sp= apr, void *fdt) hwaddr mem_start, node_size; int i, nb_nodes =3D machine->numa_state->num_nodes; NodeInfo *nodes =3D machine->numa_state->nodes; - NodeInfo ramnode; - - /* No NUMA nodes, assume there is just one node with whole RAM */ - if (!nb_nodes) { - nb_nodes =3D 1; - ramnode.node_mem =3D machine->ram_size; - nodes =3D &ramnode; - } =20 for (i =3D 0, mem_start =3D 0; i < nb_nodes; ++i) { if (!nodes[i].node_mem) { @@ -4477,6 +4469,7 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) */ mc->numa_mem_align_shift =3D 28; mc->numa_mem_supported =3D true; + mc->auto_enable_numa =3D true; =20 smc->default_caps.caps[SPAPR_CAP_HTM] =3D SPAPR_CAP_OFF; smc->default_caps.caps[SPAPR_CAP_VSX] =3D SPAPR_CAP_ON; diff --git a/include/hw/boards.h b/include/hw/boards.h index 2289536e48..481e69388e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -221,6 +221,7 @@ struct MachineClass { bool smbus_no_migration_support; bool nvdimm_supported; bool numa_mem_supported; + bool auto_enable_numa; =20 HotplugHandler *(*get_hotplug_handler)(MachineState *machine, DeviceState *dev); --=20 2.20.1