From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIc2P-0008MT-L9 for qemu-devel@nongnu.org; Thu, 30 Jun 2016 09:29:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIc2K-0000AO-L5 for qemu-devel@nongnu.org; Thu, 30 Jun 2016 09:29:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57856) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIc2K-0000AE-G4 for qemu-devel@nongnu.org; Thu, 30 Jun 2016 09:29:44 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 226DF7DCF9 for ; Thu, 30 Jun 2016 13:29:44 +0000 (UTC) From: Igor Mammedov Date: Thu, 30 Jun 2016 15:29:41 +0200 Message-Id: <1467293381-48397-1-git-send-email-imammedo@redhat.com> In-Reply-To: <1467289387-47575-4-git-send-email-imammedo@redhat.com> References: <1467289387-47575-4-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/4] acpi: provide _PXM method for CPU devices if QEMU is started numa enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, marcel@redhat.com Workaround for long standing issue where Linux kernel assings hotplugged CPU to 1st numa node as it discards proximity for possible CPUs from SRAT after it's parsed. _PXM method allows linux query proximity directly from hotplugged CPU object, which allows Linux to assing CPU to the correct numa node. Signed-off-by: Igor Mammedov Reviewed-by: Marcel Apfelbaum --- * ammended commit message --- hw/acpi/cpu.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index c13b65c..d9cf3ee 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -4,6 +4,7 @@ #include "qapi/error.h" #include "qapi-event.h" #include "trace.h" +#include "sysemu/numa.h" #define ACPI_CPU_HOTPLUG_REG_LEN 12 #define ACPI_CPU_SELECTOR_OFFSET_WR 0 @@ -503,6 +504,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, /* build Processor object for each processor */ for (i = 0; i < arch_ids->len; i++) { + int j; Aml *dev; Aml *uid = aml_int(i); GArray *madt_buf = g_array_new(0, 1, 1); @@ -546,6 +548,13 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, aml_arg(1), aml_arg(2)) ); aml_append(dev, method); + + for (j = 0; j < nb_numa_nodes; j++) { + if (test_bit(i, numa_info[j].node_cpu)) { + aml_append(dev, aml_name_decl("_PXM", aml_int(j))); + } + } + aml_append(cpus_dev, dev); } } -- 1.8.3.1