* [Qemu-devel] [PATCH] pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice
@ 2016-08-03 8:04 Igor Mammedov
2016-08-03 8:17 ` Marcel Apfelbaum
2016-08-03 12:06 ` Marc-André Lureau
0 siblings, 2 replies; 4+ messages in thread
From: Igor Mammedov @ 2016-08-03 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: marcandre.lureau, marcel, Michael S. Tsirkin, Paolo Bonzini,
Richard Henderson, Eduardo Habkost
PCI hotplug for bridges was introduced only since 2.0 however
acpi_set_bsel()->object_property_add_uint32_ptr(bus, ACPI_PCIHP_PROP_BSEL)
didn't take in account that for legacy mode (1.7) when
PCI hotplug for bridges is unavailable and ACPI_PCIHP_PROP_BSEL property
the only bus "PCI.0' has been created earlier at acpi_pcihp_init() time.
We managed to live with it only because of error rised by adding
a duplicate property in acpi_set_bsel() has been ignored which
resulted in useless leaking of just allocated (int)bus_bsel.
Issue affects only 1.7 machine type as ACPI tables supported by
QEMU were introduced at that time, but there wasn't PCI hotplug
for bridges till the next release (2.0).
Fix it by removing duplicate ACPI_PCIHP_PROP_BSEL intialization
in acpi_pcihp_init() and doing it only in one place acpi_set_pci_info().
PS:
do not ignore error returned by object_property_add_uint32_ptr()
and abort QEMU since it's programming error which should be fixed
instead of being ignored.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reported-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/acpi/pcihp.c | 10 ----------
hw/i386/acpi-build.c | 4 ++--
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index d957d1e..3298d94 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -302,16 +302,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus,
s->root= root_bus;
s->legacy_piix = !bridges_enabled;
- if (s->legacy_piix) {
- unsigned *bus_bsel = g_malloc(sizeof *bus_bsel);
-
- s->io_len = ACPI_PCIHP_LEGACY_SIZE;
-
- *bus_bsel = ACPI_PCIHP_BSEL_DEFAULT;
- object_property_add_uint32_ptr(OBJECT(root_bus), ACPI_PCIHP_PROP_BSEL,
- bus_bsel, NULL);
- }
-
memory_region_init_io(&s->io, owner, &acpi_pcihp_io_ops, s,
"acpi-pci-hotplug", s->io_len);
memory_region_add_subregion(address_space_io, s->io_base, &s->io);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a26a4bb..7174933 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -438,7 +438,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
*bus_bsel = (*bsel_alloc)++;
object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
- bus_bsel, NULL);
+ bus_bsel, &error_abort);
}
return bsel_alloc;
@@ -447,7 +447,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
static void acpi_set_pci_info(void)
{
PCIBus *bus = find_i440fx(); /* TODO: Q35 support */
- unsigned bsel_alloc = 0;
+ unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;
if (bus) {
/* Scan all PCI buses. Set property to enable acpi based hotplug. */
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice
2016-08-03 8:04 [Qemu-devel] [PATCH] pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice Igor Mammedov
@ 2016-08-03 8:17 ` Marcel Apfelbaum
2016-08-03 8:47 ` Igor Mammedov
2016-08-03 12:06 ` Marc-André Lureau
1 sibling, 1 reply; 4+ messages in thread
From: Marcel Apfelbaum @ 2016-08-03 8:17 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: marcandre.lureau, Michael S. Tsirkin, Paolo Bonzini,
Richard Henderson, Eduardo Habkost
On 08/03/2016 11:04 AM, Igor Mammedov wrote:
> PCI hotplug for bridges was introduced only since 2.0 however
> acpi_set_bsel()->object_property_add_uint32_ptr(bus, ACPI_PCIHP_PROP_BSEL)
> didn't take in account that for legacy mode (1.7) when
> PCI hotplug for bridges is unavailable and ACPI_PCIHP_PROP_BSEL property
> the only bus "PCI.0' has been created earlier at acpi_pcihp_init() time.
>
> We managed to live with it only because of error rised by adding
> a duplicate property in acpi_set_bsel() has been ignored which
> resulted in useless leaking of just allocated (int)bus_bsel.
>
> Issue affects only 1.7 machine type as ACPI tables supported by
> QEMU were introduced at that time, but there wasn't PCI hotplug
> for bridges till the next release (2.0).
>
> Fix it by removing duplicate ACPI_PCIHP_PROP_BSEL intialization
> in acpi_pcihp_init() and doing it only in one place acpi_set_pci_info().
>
> PS:
> do not ignore error returned by object_property_add_uint32_ptr()
> and abort QEMU since it's programming error which should be fixed
> instead of being ignored.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reported-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> hw/acpi/pcihp.c | 10 ----------
> hw/i386/acpi-build.c | 4 ++--
> 2 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
> index d957d1e..3298d94 100644
> --- a/hw/acpi/pcihp.c
> +++ b/hw/acpi/pcihp.c
> @@ -302,16 +302,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus,
> s->root= root_bus;
> s->legacy_piix = !bridges_enabled;
>
> - if (s->legacy_piix) {
> - unsigned *bus_bsel = g_malloc(sizeof *bus_bsel);
> -
> - s->io_len = ACPI_PCIHP_LEGACY_SIZE;
> -
> - *bus_bsel = ACPI_PCIHP_BSEL_DEFAULT;
> - object_property_add_uint32_ptr(OBJECT(root_bus), ACPI_PCIHP_PROP_BSEL,
> - bus_bsel, NULL);
> - }
> -
> memory_region_init_io(&s->io, owner, &acpi_pcihp_io_ops, s,
> "acpi-pci-hotplug", s->io_len);
> memory_region_add_subregion(address_space_io, s->io_base, &s->io);
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index a26a4bb..7174933 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -438,7 +438,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
>
> *bus_bsel = (*bsel_alloc)++;
> object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
> - bus_bsel, NULL);
> + bus_bsel, &error_abort);
Hi Igor,
I think the above hunk should be in a separate patch, but
since the patch itself is small enough I am OK with it.
> }
>
> return bsel_alloc;
> @@ -447,7 +447,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
> static void acpi_set_pci_info(void)
> {
> PCIBus *bus = find_i440fx(); /* TODO: Q35 support */
> - unsigned bsel_alloc = 0;
> + unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;
>
> if (bus) {
> /* Scan all PCI buses. Set property to enable acpi based hotplug. */
>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Thanks,
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice
2016-08-03 8:17 ` Marcel Apfelbaum
@ 2016-08-03 8:47 ` Igor Mammedov
0 siblings, 0 replies; 4+ messages in thread
From: Igor Mammedov @ 2016-08-03 8:47 UTC (permalink / raw)
To: Marcel Apfelbaum
Cc: qemu-devel, marcandre.lureau, Michael S. Tsirkin, Paolo Bonzini,
Richard Henderson, Eduardo Habkost
On Wed, 3 Aug 2016 11:17:11 +0300
Marcel Apfelbaum <marcel@redhat.com> wrote:
> On 08/03/2016 11:04 AM, Igor Mammedov wrote:
> > PCI hotplug for bridges was introduced only since 2.0 however
> > acpi_set_bsel()->object_property_add_uint32_ptr(bus, ACPI_PCIHP_PROP_BSEL)
> > didn't take in account that for legacy mode (1.7) when
> > PCI hotplug for bridges is unavailable and ACPI_PCIHP_PROP_BSEL property
> > the only bus "PCI.0' has been created earlier at acpi_pcihp_init() time.
> >
> > We managed to live with it only because of error rised by adding
> > a duplicate property in acpi_set_bsel() has been ignored which
> > resulted in useless leaking of just allocated (int)bus_bsel.
> >
> > Issue affects only 1.7 machine type as ACPI tables supported by
> > QEMU were introduced at that time, but there wasn't PCI hotplug
> > for bridges till the next release (2.0).
> >
> > Fix it by removing duplicate ACPI_PCIHP_PROP_BSEL intialization
> > in acpi_pcihp_init() and doing it only in one place acpi_set_pci_info().
> >
> > PS:
> > do not ignore error returned by object_property_add_uint32_ptr()
> > and abort QEMU since it's programming error which should be fixed
> > instead of being ignored.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reported-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> > hw/acpi/pcihp.c | 10 ----------
> > hw/i386/acpi-build.c | 4 ++--
> > 2 files changed, 2 insertions(+), 12 deletions(-)
> >
> > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
> > index d957d1e..3298d94 100644
> > --- a/hw/acpi/pcihp.c
> > +++ b/hw/acpi/pcihp.c
> > @@ -302,16 +302,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus,
> > s->root= root_bus;
> > s->legacy_piix = !bridges_enabled;
> >
> > - if (s->legacy_piix) {
> > - unsigned *bus_bsel = g_malloc(sizeof *bus_bsel);
> > -
> > - s->io_len = ACPI_PCIHP_LEGACY_SIZE;
> > -
> > - *bus_bsel = ACPI_PCIHP_BSEL_DEFAULT;
> > - object_property_add_uint32_ptr(OBJECT(root_bus), ACPI_PCIHP_PROP_BSEL,
> > - bus_bsel, NULL);
> > - }
> > -
> > memory_region_init_io(&s->io, owner, &acpi_pcihp_io_ops, s,
> > "acpi-pci-hotplug", s->io_len);
> > memory_region_add_subregion(address_space_io, s->io_base, &s->io);
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index a26a4bb..7174933 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -438,7 +438,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
> >
> > *bus_bsel = (*bsel_alloc)++;
> > object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
> > - bus_bsel, NULL);
> > + bus_bsel, &error_abort);
>
> Hi Igor,
>
> I think the above hunk should be in a separate patch, but
> since the patch itself is small enough I am OK with it.
I've been conflicted whether to split or not but decided not to
as it exposes issue that the patch fixes and splitting could lead
to bisection issues in case this part comes first.
>
>
> > }
> >
> > return bsel_alloc;
> > @@ -447,7 +447,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
> > static void acpi_set_pci_info(void)
> > {
> > PCIBus *bus = find_i440fx(); /* TODO: Q35 support */
> > - unsigned bsel_alloc = 0;
> > + unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;
> >
> > if (bus) {
> > /* Scan all PCI buses. Set property to enable acpi based hotplug. */
> >
>
>
>
> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Thanks!
>
> Thanks,
> Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice
2016-08-03 8:04 [Qemu-devel] [PATCH] pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice Igor Mammedov
2016-08-03 8:17 ` Marcel Apfelbaum
@ 2016-08-03 12:06 ` Marc-André Lureau
1 sibling, 0 replies; 4+ messages in thread
From: Marc-André Lureau @ 2016-08-03 12:06 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Eduardo Habkost, Michael S. Tsirkin, Paolo Bonzini, marcel,
Richard Henderson
Hi
On Wed, Aug 3, 2016 at 12:06 PM Igor Mammedov <imammedo@redhat.com> wrote:
> PCI hotplug for bridges was introduced only since 2.0 however
> acpi_set_bsel()->object_property_add_uint32_ptr(bus,
> ACPI_PCIHP_PROP_BSEL)
> didn't take in account that for legacy mode (1.7) when
> PCI hotplug for bridges is unavailable and ACPI_PCIHP_PROP_BSEL property
> the only bus "PCI.0' has been created earlier at acpi_pcihp_init() time.
>
> We managed to live with it only because of error rised by adding
> a duplicate property in acpi_set_bsel() has been ignored which
> resulted in useless leaking of just allocated (int)bus_bsel.
>
> Issue affects only 1.7 machine type as ACPI tables supported by
> QEMU were introduced at that time, but there wasn't PCI hotplug
> for bridges till the next release (2.0).
>
> Fix it by removing duplicate ACPI_PCIHP_PROP_BSEL intialization
> in acpi_pcihp_init() and doing it only in one place acpi_set_pci_info().
>
> PS:
> do not ignore error returned by object_property_add_uint32_ptr()
> and abort QEMU since it's programming error which should be fixed
> instead of being ignored.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reported-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> hw/acpi/pcihp.c | 10 ----------
> hw/i386/acpi-build.c | 4 ++--
> 2 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
> index d957d1e..3298d94 100644
> --- a/hw/acpi/pcihp.c
> +++ b/hw/acpi/pcihp.c
> @@ -302,16 +302,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState
> *s, PCIBus *root_bus,
> s->root= root_bus;
> s->legacy_piix = !bridges_enabled;
>
> - if (s->legacy_piix) {
> - unsigned *bus_bsel = g_malloc(sizeof *bus_bsel);
> -
> - s->io_len = ACPI_PCIHP_LEGACY_SIZE;
> -
> - *bus_bsel = ACPI_PCIHP_BSEL_DEFAULT;
> - object_property_add_uint32_ptr(OBJECT(root_bus),
> ACPI_PCIHP_PROP_BSEL,
> - bus_bsel, NULL);
> - }
>
After this patch, ACPI_PCIHP_LEGACY_SIZE is unused. I suggest to remove it
too.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
thanks
> -
> memory_region_init_io(&s->io, owner, &acpi_pcihp_io_ops, s,
> "acpi-pci-hotplug", s->io_len);
> memory_region_add_subregion(address_space_io, s->io_base, &s->io);
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index a26a4bb..7174933 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -438,7 +438,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
>
> *bus_bsel = (*bsel_alloc)++;
> object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
> - bus_bsel, NULL);
> + bus_bsel, &error_abort);
> }
>
> return bsel_alloc;
> @@ -447,7 +447,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
> static void acpi_set_pci_info(void)
> {
> PCIBus *bus = find_i440fx(); /* TODO: Q35 support */
> - unsigned bsel_alloc = 0;
> + unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;
>
> if (bus) {
> /* Scan all PCI buses. Set property to enable acpi based hotplug.
> */
> --
> 2.7.4
>
>
> --
Marc-André Lureau
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-03 12:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-03 8:04 [Qemu-devel] [PATCH] pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice Igor Mammedov
2016-08-03 8:17 ` Marcel Apfelbaum
2016-08-03 8:47 ` Igor Mammedov
2016-08-03 12:06 ` Marc-André Lureau
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).