From: Marcel Apfelbaum <marcel@redhat.com>
To: Alexey Kardashevskiy <aik@ozlabs.ru>, qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
John Snow <jsnow@redhat.com>, Max Reitz <mreitz@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [Qemu-devel] [PATCH qemu] pci: Only unmap bus_master_enabled_region if was added previously
Date: Fri, 31 Mar 2017 15:08:49 +0300 [thread overview]
Message-ID: <fa70d4f5-dd30-aa83-b853-7504c2350023@redhat.com> (raw)
In-Reply-To: <20170331044711.21749-1-aik@ozlabs.ru>
On 03/31/2017 07:47 AM, Alexey Kardashevskiy wrote:
> Normally pci_init_bus_master() would be called either via
> bus->machine_done.notify or directly from do_pci_register_device().
>
> However if a device's realize() failed, pci_init_bus_master() is not
> called, and do_pci_unregister_device() fails on
> memory_region_del_subregion() as it was not mapped.
>
> This adds a check that subregion was mapped before unmapping it.
>
> Fixes: c53598ed18e4 ("pci: Add missing drop of bus master AS reference")
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> This is to pass iotest 051 which does run QEMU like this:
>
> ppc64-softmmu/qemu-system-ppc64 -nodefaults -machine accel=qtest -nographic -monitor stdio -serial none -drive if=virtio
>
> which normally fails with:
>
> qemu-system-ppc64: -drive if=virtio: Device needs media, but drive is empty
>
> or asserts (without this patch):
>
> qemu-system-ppc64: /home/aik/p/qemu-kvm/memory.c:2118: memory_region_del_subregion: Assertion `subregion->container == mr' failed.
> ---
> hw/pci/pci.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index bd8043c460..259483b1c0 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -869,8 +869,10 @@ static void do_pci_unregister_device(PCIDevice *pci_dev)
> pci_dev->bus->devices[pci_dev->devfn] = NULL;
> pci_config_free(pci_dev);
>
> - memory_region_del_subregion(&pci_dev->bus_master_container_region,
> - &pci_dev->bus_master_enable_region);
> + if (memory_region_is_mapped(&pci_dev->bus_master_enable_region)) {
> + memory_region_del_subregion(&pci_dev->bus_master_container_region,
> + &pci_dev->bus_master_enable_region);
> + }
> address_space_destroy(&pci_dev->bus_master_as);
> }
>
>
Hi,
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Thanks,
Marcel
next prev parent reply other threads:[~2017-03-31 12:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 4:47 [Qemu-devel] [PATCH qemu] pci: Only unmap bus_master_enabled_region if was added previously Alexey Kardashevskiy
2017-03-31 10:33 ` Max Reitz
2017-03-31 11:56 ` Alexey Kardashevskiy
2017-03-31 12:08 ` Marcel Apfelbaum [this message]
2017-03-31 17:44 ` John Snow
2017-03-31 19:49 ` Paolo Bonzini
2017-03-31 21:40 ` Michael S. Tsirkin
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=fa70d4f5-dd30-aa83-b853-7504c2350023@redhat.com \
--to=marcel@redhat.com \
--cc=aik@ozlabs.ru \
--cc=jsnow@redhat.com \
--cc=mreitz@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.