From: Alex Williamson <alex.williamson@redhat.com>
To: Ido Yariv <ido@wizery.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] vfio/pci: fix out-of-sync BAR information on reset
Date: Fri, 21 Oct 2016 12:03:21 -0600 [thread overview]
Message-ID: <20161021120321.46bf6f44@t450s.home> (raw)
In-Reply-To: <1477069233-19180-1-git-send-email-ido@wizery.com>
On Fri, 21 Oct 2016 13:00:33 -0400
Ido Yariv <ido@wizery.com> wrote:
> When a PCI device is reset, pci_do_device_reset resets all BAR addresses
> in the relevant PCIDevice's config buffer.
>
> The VFIO configuration space stays untouched, so the guest OS may choose
> to skip restoring the BAR addresses as they would seem intact. The PCI
> device may be left non-operational.
> One example of such a scenario is when the guest exits S3.
>
> Fix this by resetting the BAR addresses in the VFIO configuration space
> as well.
>
> Signed-off-by: Ido Yariv <ido@wizery.com>
> ---
> hw/vfio/pci.c | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index 65d30fd..9e1dee0 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -1922,11 +1922,41 @@ static void vfio_pci_pre_reset(VFIOPCIDevice *vdev)
> static void vfio_pci_post_reset(VFIOPCIDevice *vdev)
> {
> Error *err = NULL;
> + int nr;
>
> vfio_intx_enable(vdev, &err);
> if (err) {
> error_reportf_err(err, ERR_PREFIX, vdev->vbasedev.name);
> }
> +
> + for (nr = 0; nr < PCI_NUM_REGIONS - 1; ++nr) {
> + VFIOBAR *bar = &vdev->bars[nr];
> + off_t addr = vdev->config_offset + PCI_BASE_ADDRESS_0 + (4 * nr);
> + uint32_t org = 0;
> + uint64_t val = 0;
> + uint32_t len;
> +
> + if (!bar->region.size) {
> + continue;
> + }
> +
> + if (pread(vdev->vbasedev.fd, &org, sizeof(org), addr) < 0) {
> + error_report("%s(%s) read bar %d failed: %m", __func__,
> + vdev->vbasedev.name, nr);
> + continue;
> + }
> +
> + val = le32_to_cpu(org);
> + val &= (bar->ioport ? ~PCI_BASE_ADDRESS_IO_MASK :
> + ~PCI_BASE_ADDRESS_MEM_MASK);
> + val = cpu_to_le64(val);
> +
> + len = bar->mem64 ? sizeof(uint64_t) : sizeof(uint32_t);
> + if (pwrite(vdev->vbasedev.fd, &val, len, addr) != len) {
> + error_report("%s(%s) reset bar %d failed: %m", __func__,
> + vdev->vbasedev.name, nr);
> + }
> + }
Why do we care to be so precise, can't we just blindly do 4-byte writes
of zero to each of the 6 BAR registers? The bits you're trying to
preserve should be read-only anyway. Nothing is saved by trying to do
an 8-byte write for 64-bit BARs. Thanks,
Alex
> }
>
> static bool vfio_pci_host_match(PCIHostDeviceAddress *addr, const char *name)
next prev parent reply other threads:[~2016-10-21 18:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-21 17:00 [Qemu-devel] [PATCH] vfio/pci: fix out-of-sync BAR information on reset Ido Yariv
2016-10-21 18:03 ` Alex Williamson [this message]
2016-10-21 18:35 ` Ido Yariv
2016-10-21 18:41 ` [Qemu-devel] [PATCH v2] " Ido Yariv
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=20161021120321.46bf6f44@t450s.home \
--to=alex.williamson@redhat.com \
--cc=ido@wizery.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).