Message ID | 1423490395-22054-2-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
On 02/09/2015 03:59 PM, Igor Mammedov wrote: > From: "Michael S. Tsirkin" <mst@redhat.com> > > RSDT offset can change across reboots and that makes > immutable RSDP, which is build at startup, point to > incorrect place in ACPI table blob. That results in > BIOS corrupting tables and guest OS failing to find > ACPI tables. > We really should have put it in a ROM region, but > we can't change that for old machine types, > let's just set the callback and update it explicitly. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > v2: > * do not forget to pass build_state to callback > otherwise it's NOP. > --- > hw/i386/acpi-build.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 4944249..5b2b017 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1526,6 +1526,7 @@ struct AcpiBuildState { > /* Is table patched? */ > uint8_t patched; > PcGuestInfo *guest_info; > + void *rsdp; > } AcpiBuildState; > > static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) > @@ -1660,8 +1661,6 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) > > /* We'll expose it all to Guest so we want to reduce > * chance of size changes. > - * RSDP is small so it's easy to keep it immutable, no need to > - * bother with alignment. > * > * We used to align the tables to 4k, but of course this would > * too simple to be enough. 4k turned out to be too small an > @@ -1733,6 +1732,7 @@ static void acpi_build_update(void *build_opaque, uint32_t offset) > > memcpy(qemu_get_ram_ptr(build_state->table_ram), tables.table_data->data, > build_state->table_size); > + memcpy(build_state->rsdp, tables.rsdp->data, acpi_data_len(tables.rsdp)); > > cpu_physical_memory_set_dirty_range_nocode(build_state->table_ram, > build_state->table_size); > @@ -1805,11 +1805,14 @@ void acpi_setup(PcGuestInfo *guest_info) > tables.tcpalog->data, acpi_data_len(tables.tcpalog)); > > /* > - * RSDP is small so it's easy to keep it immutable, no need to > - * bother with ROM blobs. > + * Though RSDP is small, its contents isn't immutable, so > + * update it along with the rest of tables on guest access. > */ > - fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, > - tables.rsdp->data, acpi_data_len(tables.rsdp)); > + fw_cfg_add_file_callback(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, > + acpi_build_update, build_state, > + tables.rsdp->data, acpi_data_len(tables.rsdp)); > + > + build_state->rsdp = tables.rsdp->data; > > qemu_register_reset(acpi_build_reset, build_state); > acpi_build_reset(build_state); > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4944249..5b2b017 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1526,6 +1526,7 @@ struct AcpiBuildState { /* Is table patched? */ uint8_t patched; PcGuestInfo *guest_info; + void *rsdp; } AcpiBuildState; static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) @@ -1660,8 +1661,6 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) /* We'll expose it all to Guest so we want to reduce * chance of size changes. - * RSDP is small so it's easy to keep it immutable, no need to - * bother with alignment. * * We used to align the tables to 4k, but of course this would * too simple to be enough. 4k turned out to be too small an @@ -1733,6 +1732,7 @@ static void acpi_build_update(void *build_opaque, uint32_t offset) memcpy(qemu_get_ram_ptr(build_state->table_ram), tables.table_data->data, build_state->table_size); + memcpy(build_state->rsdp, tables.rsdp->data, acpi_data_len(tables.rsdp)); cpu_physical_memory_set_dirty_range_nocode(build_state->table_ram, build_state->table_size); @@ -1805,11 +1805,14 @@ void acpi_setup(PcGuestInfo *guest_info) tables.tcpalog->data, acpi_data_len(tables.tcpalog)); /* - * RSDP is small so it's easy to keep it immutable, no need to - * bother with ROM blobs. + * Though RSDP is small, its contents isn't immutable, so + * update it along with the rest of tables on guest access. */ - fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, - tables.rsdp->data, acpi_data_len(tables.rsdp)); + fw_cfg_add_file_callback(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, + acpi_build_update, build_state, + tables.rsdp->data, acpi_data_len(tables.rsdp)); + + build_state->rsdp = tables.rsdp->data; qemu_register_reset(acpi_build_reset, build_state); acpi_build_reset(build_state);