From patchwork Tue Feb 23 16:05:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 8394021 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EA259C0554 for ; Tue, 23 Feb 2016 16:06:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C30E20328 for ; Tue, 23 Feb 2016 16:06:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75945202EC for ; Tue, 23 Feb 2016 16:06:37 +0000 (UTC) Received: from localhost ([::1]:58097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYFTw-0004my-PB for patchwork-qemu-devel@patchwork.kernel.org; Tue, 23 Feb 2016 11:06:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYFTf-0004jb-Sh for qemu-devel@nongnu.org; Tue, 23 Feb 2016 11:06:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYFTa-00035X-68 for qemu-devel@nongnu.org; Tue, 23 Feb 2016 11:06:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYFTa-00034q-1H for qemu-devel@nongnu.org; Tue, 23 Feb 2016 11:06:14 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id B74B5AAA; Tue, 23 Feb 2016 16:06:13 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1NG63qR019433; Tue, 23 Feb 2016 11:06:12 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 23 Feb 2016 17:05:56 +0100 Message-Id: <1456243560-67516-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1456243560-67516-1-git-send-email-imammedo@redhat.com> References: <1456243560-67516-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: ehabkost@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, Paolo Bonzini , Igor Mammedov , Richard Henderson Subject: [Qemu-devel] [PATCH v3 4/8] pc: acpi: SRAT: create only valid processor lapic entries X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When APIC IDs are sparse*, in addition to valid LAPIC entries the SRAT is also filled invalid ones for non possible APIC IDs. Fix it by asking machine for all possible APIC IDs instead of wrongly assuming that all APIC IDs in range 0..apic_id_limit are possible. * sparse lapic topology CLI: -smp x,sockets=2,cores=3,maxcpus=6 Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- hw/i386/acpi-build.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 3b4468e..69e1324 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2376,6 +2376,9 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) uint64_t curnode; int srat_start, numa_start, slots; uint64_t mem_len, mem_base, next_base; + PossibleCpusClass *psc = POSSIBLE_CPUS_GET_CLASS(machine); + CPUArchIdList *apic_ids = + psc->get_possible_cpus_list(POSSIBLE_CPUS(machine)); PCMachineState *pcms = PC_MACHINE(machine); ram_addr_t hotplugabble_address_space_size = object_property_get_int(OBJECT(pcms), PC_MACHINE_MEMHP_REGION_SIZE, @@ -2387,12 +2390,14 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) srat->reserved1 = cpu_to_le32(1); core = (void *)(srat + 1); - for (i = 0; i < pcms->apic_id_limit; ++i) { + for (i = 0; i < apic_ids->len; i++) { + int apic_id = apic_ids->cpus[i].arch_id; + core = acpi_data_push(table_data, sizeof *core); core->type = ACPI_SRAT_PROCESSOR; core->length = sizeof(*core); - core->local_apic_id = i; - curnode = pcms->node_cpu[i]; + core->local_apic_id = apic_id; + curnode = pcms->node_cpu[apic_id]; core->proximity_lo = curnode; memset(core->proximity_hi, 0, 3); core->local_sapic_eid = 0; @@ -2457,6 +2462,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) (void *)(table_data->data + srat_start), "SRAT", table_data->len - srat_start, 1, NULL, NULL); + g_free(apic_ids); } static void