From: Eduardo Habkost <ehabkost@redhat.com>
To: Igor Mammedov <imammedo@redhat.com>
Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, mst@redhat.com
Subject: Re: [Qemu-devel] [PATCH 6/9] pc: acpi: create MADT.lapic entries only for valid lapics
Date: Fri, 5 Feb 2016 13:28:31 -0200 [thread overview]
Message-ID: <20160205152831.GR26314@thinpad.lan.raisama.net> (raw)
In-Reply-To: <1454586455-10202-6-git-send-email-imammedo@redhat.com>
On Thu, Feb 04, 2016 at 12:47:32PM +0100, Igor Mammedov wrote:
> do not assume that all lapics in range 0..apic_id_limit
> are valid and do not create lapic entries for not
> possible lapics in MADT.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
But there's one minor suggestion below:
> ---
> hw/i386/acpi-build.c | 21 ++++++++++++++-------
> 1 file changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index df13c7d..9eeeffa 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -361,9 +361,11 @@ build_fadt(GArray *table_data, GArray *linker, AcpiPmInfo *pm,
> }
>
> static void
> -build_madt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu,
> - PcGuestInfo *guest_info)
> +build_madt(GArray *table_data, GArray *linker,
> + MachineState *machine, PcGuestInfo *guest_info)
> {
> + MachineClass *mc = MACHINE_GET_CLASS(machine);
> + GArray *apic_id_list = mc->possible_cpu_arch_ids();
> int madt_start = table_data->len;
>
> AcpiMultipleApicTable *madt;
> @@ -376,18 +378,23 @@ build_madt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu,
> madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS);
> madt->flags = cpu_to_le32(1);
>
> - for (i = 0; i < guest_info->apic_id_limit; i++) {
> + for (i = 0; i < apic_id_list->len; i++) {
> AcpiMadtProcessorApic *apic = acpi_data_push(table_data, sizeof *apic);
> + CPUArchId id = FETCH_CPU_ARCH_ID(apic_id_list, i);
> + int apic_id = id.arch_id;
> +
> apic->type = ACPI_APIC_PROCESSOR;
> apic->length = sizeof(*apic);
> - apic->processor_id = i;
> - apic->local_apic_id = i;
> - if (test_bit(i, cpu->found_cpus)) {
> + apic->processor_id = apic_id;
> + apic->local_apic_id = apic_id;
> + if (id.cpu != NULL) {
This seems to be the only place where CPUArchId.cpu is being used
(see my previous suggestion about making possible_cpu_arch_ids()
return just an uint64_t list).
Also, using the existing found_cpus bitmap is more efficient than
making multiple calls to qemu_get_cpu_by_arch_id(). I wouldn't
mind keeping the bitmap.
> apic->flags = cpu_to_le32(1);
> } else {
> apic->flags = cpu_to_le32(0);
> }
> }
> + g_array_free(apic_id_list, true);
> +
> io_apic = acpi_data_push(table_data, sizeof *io_apic);
> io_apic->type = ACPI_APIC_IO;
> io_apic->length = sizeof(*io_apic);
> @@ -2659,7 +2666,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
> aml_len += tables_blob->len - fadt;
>
> acpi_add_table(table_offsets, tables_blob);
> - build_madt(tables_blob, tables->linker, &cpu, guest_info);
> + build_madt(tables_blob, tables->linker, machine, guest_info);
>
> if (misc.has_hpet) {
> acpi_add_table(table_offsets, tables_blob);
> --
> 1.8.3.1
>
--
Eduardo
next prev parent reply other threads:[~2016-02-05 15:28 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-04 11:47 [Qemu-devel] [PATCH 0/9] pc: do not create invalid MADT.LAPIC/Processor entries Igor Mammedov
2016-02-04 11:47 ` [Qemu-devel] [PATCH 2/9] machine: introduce MachineClass.possible_cpu_arch_ids() hook Igor Mammedov
2016-02-04 12:18 ` Marcel Apfelbaum
2016-02-04 13:36 ` Igor Mammedov
2016-02-05 14:13 ` Eduardo Habkost
2016-02-05 14:49 ` Igor Mammedov
2016-02-05 15:04 ` Eduardo Habkost
2016-02-05 15:39 ` Igor Mammedov
2016-02-05 15:50 ` Eduardo Habkost
2016-02-05 16:29 ` Igor Mammedov
2016-02-04 11:47 ` [Qemu-devel] [PATCH 3/9] pc: acpi: cleanup qdev_get_machine() calls Igor Mammedov
2016-02-04 12:21 ` Marcel Apfelbaum
2016-02-04 11:47 ` [Qemu-devel] [PATCH 4/9] pc: acpi: SRAT: create only valid processor lapic entries Igor Mammedov
2016-02-05 15:07 ` Eduardo Habkost
2016-02-04 11:47 ` [Qemu-devel] [PATCH 5/9] pc: acpi: create Processor and Notify objects only for valid lapics Igor Mammedov
2016-02-05 15:17 ` Eduardo Habkost
2016-02-05 15:43 ` Igor Mammedov
2016-02-04 11:47 ` [Qemu-devel] [PATCH 6/9] pc: acpi: create MADT.lapic entries " Igor Mammedov
2016-02-05 15:28 ` Eduardo Habkost [this message]
2016-02-05 16:14 ` Igor Mammedov
2016-02-11 16:11 ` Eduardo Habkost
2016-02-12 10:04 ` Igor Mammedov
2016-02-04 11:47 ` [Qemu-devel] [PATCH 7/9] pc: acpi: drop not needed intermediate bitmap cpu->found_cpus Igor Mammedov
2016-02-05 15:39 ` Eduardo Habkost
2016-02-05 16:19 ` Igor Mammedov
2016-02-05 16:44 ` Igor Mammedov
2016-02-11 15:59 ` Eduardo Habkost
2016-02-12 10:05 ` Igor Mammedov
2016-02-04 11:47 ` [Qemu-devel] [PATCH 8/9] pc: move apic_id_limit to PCMachineState Igor Mammedov
[not found] ` <56B348BA.40502@gmail.com>
2016-02-04 17:08 ` Igor Mammedov
2016-02-04 18:18 ` Michael S. Tsirkin
2016-02-04 18:24 ` Igor Mammedov
2016-02-04 11:47 ` [Qemu-devel] [PATCH 9/9] pc: acpi: clarify why possible LAPIC entries must be present in MADT Igor Mammedov
2016-02-05 15:39 ` Eduardo Habkost
2016-02-04 11:49 ` [Qemu-devel] [PATCH 1/9] cpu: rename cpu_exists() to qemu_get_cpu_by_arch_id() Igor Mammedov
2016-02-05 14:20 ` Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160205152831.GR26314@thinpad.lan.raisama.net \
--to=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).