From: Zenghui Yu <yuzenghui@huawei.com>
To: Kirti Wankhede <kwankhede@nvidia.com>,
<alex.williamson@redhat.com>, <cjia@nvidia.com>
Cc: cohuck@redhat.com, aik@ozlabs.ru, Zhengxiao.zx@Alibaba-inc.com,
shuangtai.tst@alibaba-inc.com, qemu-devel@nongnu.org,
peterx@redhat.com, eauger@redhat.com, yi.l.liu@intel.com,
eskultet@redhat.com, ziye.yang@intel.com, armbru@redhat.com,
mlevitsk@redhat.com, pasic@linux.ibm.com, felipe@nutanix.com,
wanghaibin.wang@huawei.com, Ken.Xue@amd.com,
kevin.tian@intel.com, yan.y.zhao@intel.com, dgilbert@redhat.com,
changpeng.liu@intel.com, quintela@redhat.com,
zhi.a.wang@intel.com, jonathan.davies@nutanix.com,
pbonzini@redhat.com
Subject: Re: [PATCH v26 03/17] vfio: Add save and load functions for VFIO PCI devices
Date: Wed, 23 Sep 2020 14:38:27 +0800 [thread overview]
Message-ID: <75d17b56-e59e-8d70-de3e-2395635fa119@huawei.com> (raw)
In-Reply-To: <1600817059-26721-4-git-send-email-kwankhede@nvidia.com>
Hi Kirti,
A few trivial comments from the first read through.
On 2020/9/23 7:24, Kirti Wankhede wrote:
> These functions save and restore PCI device specific data - config
> space of PCI device.
> Used VMStateDescription to save and restore interrupt state.
>
> Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
> Reviewed-by: Neo Jia <cjia@nvidia.com>
> ---
> hw/vfio/pci.c | 134 ++++++++++++++++++++++++++++++++++++++++++
> hw/vfio/pci.h | 1 +
> include/hw/vfio/vfio-common.h | 2 +
> 3 files changed, 137 insertions(+)
>
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index bffd5bfe3b78..9968cc553391 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -41,6 +41,7 @@
> #include "trace.h"
> #include "qapi/error.h"
> #include "migration/blocker.h"
> +#include "migration/qemu-file.h"
>
> #define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
>
> @@ -2401,11 +2402,142 @@ static Object *vfio_pci_get_object(VFIODevice *vbasedev)
> return OBJECT(vdev);
> }
>
> +static int vfio_get_pci_irq_state(QEMUFile *f, void *pv, size_t size,
> + const VMStateField *field)
> +{
> + VFIOPCIDevice *vdev = container_of(pv, VFIOPCIDevice, vbasedev);
> + PCIDevice *pdev = &vdev->pdev;
> + uint32_t interrupt_type;
> +
> + interrupt_type = qemu_get_be32(f);
> +
> + if (interrupt_type == VFIO_INT_MSI) {
> + uint32_t msi_flags, msi_addr_lo, msi_addr_hi = 0, msi_data;
> + bool msi_64bit;
> +
> + /* restore msi configuration */
> + msi_flags = pci_default_read_config(pdev,
> + pdev->msi_cap + PCI_MSI_FLAGS, 2);
> + msi_64bit = (msi_flags & PCI_MSI_FLAGS_64BIT);
> +
> + vfio_pci_write_config(pdev, pdev->msi_cap + PCI_MSI_FLAGS,
> + msi_flags & ~PCI_MSI_FLAGS_ENABLE, 2);
> +
> + msi_addr_lo = pci_default_read_config(pdev,
> + pdev->msi_cap + PCI_MSI_ADDRESS_LO, 4);
> + vfio_pci_write_config(pdev, pdev->msi_cap + PCI_MSI_ADDRESS_LO,
> + msi_addr_lo, 4);
> +
> + if (msi_64bit) {
> + msi_addr_hi = pci_default_read_config(pdev,
> + pdev->msi_cap + PCI_MSI_ADDRESS_HI, 4);
> + vfio_pci_write_config(pdev, pdev->msi_cap + PCI_MSI_ADDRESS_HI,
> + msi_addr_hi, 4);
> + }
> +
> + msi_data = pci_default_read_config(pdev,
> + pdev->msi_cap + (msi_64bit ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32),
> + 2);
> +
> + vfio_pci_write_config(pdev,
> + pdev->msi_cap + (msi_64bit ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32),
> + msi_data, 2);
> +
> + vfio_pci_write_config(pdev, pdev->msi_cap + PCI_MSI_FLAGS,
> + msi_flags | PCI_MSI_FLAGS_ENABLE, 2);
> + } else if (interrupt_type == VFIO_INT_MSIX) {
> + uint16_t offset;
Maybe rename it to 'control' to match the PCI term?
> +
> + msix_load(pdev, f);
> + offset = pci_default_read_config(pdev,
> + pdev->msix_cap + PCI_MSIX_FLAGS + 1, 2);
> + /* load enable bit and maskall bit */
> + vfio_pci_write_config(pdev, pdev->msix_cap + PCI_MSIX_FLAGS + 1,
> + offset, 2);
> + }
> + return 0;
> +}
> +
> +static int vfio_put_pci_irq_state(QEMUFile *f, void *pv, size_t size,
> + const VMStateField *field, QJSON *vmdesc)
> +{
> + VFIOPCIDevice *vdev = container_of(pv, VFIOPCIDevice, vbasedev);
> + PCIDevice *pdev = &vdev->pdev;
> +
> + qemu_put_be32(f, vdev->interrupt);
> + if (vdev->interrupt == VFIO_INT_MSIX) {
> + msix_save(pdev, f);
> + }
> +
> + return 0;
> +}
> +
> +static const VMStateInfo vmstate_info_vfio_pci_irq_state = {
> + .name = "VFIO PCI irq state",
> + .get = vfio_get_pci_irq_state,
> + .put = vfio_put_pci_irq_state,
> +};
> +
> +const VMStateDescription vmstate_vfio_pci_config = {
> + .name = "VFIOPCIDevice",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_INT32_POSITIVE_LE(version_id, VFIOPCIDevice),
> + VMSTATE_BUFFER_UNSAFE_INFO(interrupt, VFIOPCIDevice, 1,
> + vmstate_info_vfio_pci_irq_state,
> + sizeof(int32_t)),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> +static void vfio_pci_save_config(VFIODevice *vbasedev, QEMUFile *f)
> +{
> + VFIOPCIDevice *vdev = container_of(vbasedev, VFIOPCIDevice, vbasedev);
> + PCIDevice *pdev = &vdev->pdev;
> +
> +
Two blank lines.
> + pci_device_save(pdev, f);
> + vmstate_save_state(f, &vmstate_vfio_pci_config, vbasedev, NULL);
> +}
> +
> +static int vfio_pci_load_config(VFIODevice *vbasedev, QEMUFile *f)
> +{
> + VFIOPCIDevice *vdev = container_of(vbasedev, VFIOPCIDevice, vbasedev);
> + PCIDevice *pdev = &vdev->pdev;
> + uint16_t pci_cmd;
> + int ret, i;
> +
> + ret = pci_device_load(pdev, f);
> + if (ret) {
> + return ret;
> + }
> +
> + /* retore pci bar configuration */
> + pci_cmd = pci_default_read_config(pdev, PCI_COMMAND, 2);
> + vfio_pci_write_config(pdev, PCI_COMMAND,
> + pci_cmd & ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY), 2);
> + for (i = 0; i < PCI_ROM_SLOT; i++) {
> + uint32_t bar = pci_default_read_config(pdev,
> + PCI_BASE_ADDRESS_0 + i * 4, 4);
> +
> + vfio_pci_write_config(pdev, PCI_BASE_ADDRESS_0 + i * 4, bar, 4);
> + }
> +
> + ret = vmstate_load_state(f, &vmstate_vfio_pci_config, vbasedev,
> + vdev->version_id);
> +
> + vfio_pci_write_config(pdev, PCI_COMMAND, pci_cmd, 2);
> + return ret;
> +}
> +
> static VFIODeviceOps vfio_pci_ops = {
> .vfio_compute_needs_reset = vfio_pci_compute_needs_reset,
> .vfio_hot_reset_multi = vfio_pci_hot_reset_multi,
> .vfio_eoi = vfio_intx_eoi,
> .vfio_get_object = vfio_pci_get_object,
> + .vfio_save_config = vfio_pci_save_config,
> + .vfio_load_config = vfio_pci_load_config,
> };
>
> int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
> @@ -2755,6 +2887,8 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
> vdev->vbasedev.ops = &vfio_pci_ops;
> vdev->vbasedev.type = VFIO_DEVICE_TYPE_PCI;
> vdev->vbasedev.dev = DEVICE(vdev);
> + vdev->vbasedev.device_state = 0;
This shouldn't belong to this patch.
Thanks,
Zenghui
next prev parent reply other threads:[~2020-09-23 6:39 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 23:24 [PATCH QEMU v25 00/17] Add migration support for VFIO devices Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 01/17] vfio: Add function to unmap VFIO region Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 02/17] vfio: Add vfio_get_object callback to VFIODeviceOps Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 03/17] vfio: Add save and load functions for VFIO PCI devices Kirti Wankhede
2020-09-23 6:38 ` Zenghui Yu [this message]
2020-09-24 22:49 ` Alex Williamson
2020-10-21 9:30 ` Zenghui Yu
2020-10-21 19:03 ` Alex Williamson
2020-09-22 23:24 ` [PATCH v26 04/17] vfio: Add migration region initialization and finalize function Kirti Wankhede
2020-09-24 14:08 ` Cornelia Huck
2020-10-17 20:14 ` Kirti Wankhede
2020-09-25 20:20 ` Alex Williamson
2020-09-28 9:39 ` Cornelia Huck
2020-10-17 20:17 ` Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 05/17] vfio: Add VM state change handler to know state of VM Kirti Wankhede
2020-09-24 15:02 ` Cornelia Huck
2020-09-29 11:03 ` Dr. David Alan Gilbert
2020-10-17 20:24 ` Kirti Wankhede
2020-10-20 10:51 ` Cornelia Huck
2020-10-21 5:33 ` Kirti Wankhede
2020-10-22 7:51 ` Cornelia Huck
2020-10-22 15:42 ` Kirti Wankhede
2020-10-22 15:49 ` Cornelia Huck
2020-09-25 20:20 ` Alex Williamson
2020-10-17 20:30 ` Kirti Wankhede
2020-10-17 23:44 ` Alex Williamson
2020-10-18 17:43 ` Kirti Wankhede
2020-10-19 17:51 ` Alex Williamson
2020-10-20 10:23 ` Cornelia Huck
2020-09-22 23:24 ` [PATCH v26 06/17] vfio: Add migration state change notifier Kirti Wankhede
2020-09-25 20:20 ` Alex Williamson
2020-10-17 20:35 ` Kirti Wankhede
2020-10-19 17:57 ` Alex Williamson
2020-10-20 10:55 ` Cornelia Huck
2020-09-22 23:24 ` [PATCH v26 07/17] vfio: Register SaveVMHandlers for VFIO device Kirti Wankhede
2020-09-24 15:15 ` Philippe Mathieu-Daudé
2020-09-29 10:19 ` Dr. David Alan Gilbert
2020-10-17 20:36 ` Kirti Wankhede
2020-09-25 11:53 ` Cornelia Huck
2020-10-18 20:55 ` Kirti Wankhede
2020-10-20 15:51 ` Cornelia Huck
2020-09-25 20:20 ` Alex Williamson
2020-10-18 17:40 ` Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 08/17] vfio: Add save state functions to SaveVMHandlers Kirti Wankhede
2020-09-23 11:42 ` Wang, Zhi A
2020-10-21 14:30 ` Kirti Wankhede
2020-09-25 21:02 ` Alex Williamson
2020-10-18 18:00 ` Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 09/17] vfio: Add load " Kirti Wankhede
2020-10-01 10:07 ` Cornelia Huck
2020-10-18 20:47 ` Kirti Wankhede
2020-10-20 16:25 ` Cornelia Huck
2020-09-22 23:24 ` [PATCH v26 10/17] memory: Set DIRTY_MEMORY_MIGRATION when IOMMU is enabled Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 11/17] vfio: Get migration capability flags for container Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 12/17] vfio: Add function to start and stop dirty pages tracking Kirti Wankhede
2020-09-25 21:55 ` Alex Williamson
2020-10-18 20:52 ` Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 13/17] vfio: create mapped iova list when vIOMMU is enabled Kirti Wankhede
2020-09-25 22:23 ` Alex Williamson
2020-10-19 6:01 ` Kirti Wankhede
2020-10-19 17:24 ` Alex Williamson
2020-10-19 19:15 ` Kirti Wankhede
2020-10-19 20:07 ` Alex Williamson
2020-09-22 23:24 ` [PATCH v26 14/17] vfio: Add vfio_listener_log_sync to mark dirty pages Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 15/17] vfio: Add ioctl to get dirty pages bitmap during dma unmap Kirti Wankhede
2020-09-22 23:24 ` [PATCH v26 16/17] vfio: Make vfio-pci device migration capable Kirti Wankhede
2020-09-25 12:17 ` Cornelia Huck
2020-09-22 23:24 ` [PATCH v26 17/17] qapi: Add VFIO devices migration stats in Migration stats Kirti Wankhede
2020-09-24 15:14 ` Eric Blake
2020-09-25 22:55 ` Alex Williamson
2020-09-29 10:40 ` Dr. David Alan Gilbert
2020-09-23 7:06 ` [PATCH QEMU v25 00/17] Add migration support for VFIO devices Zenghui Yu
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=75d17b56-e59e-8d70-de3e-2395635fa119@huawei.com \
--to=yuzenghui@huawei.com \
--cc=Ken.Xue@amd.com \
--cc=Zhengxiao.zx@Alibaba-inc.com \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=changpeng.liu@intel.com \
--cc=cjia@nvidia.com \
--cc=cohuck@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eauger@redhat.com \
--cc=eskultet@redhat.com \
--cc=felipe@nutanix.com \
--cc=jonathan.davies@nutanix.com \
--cc=kevin.tian@intel.com \
--cc=kwankhede@nvidia.com \
--cc=mlevitsk@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=shuangtai.tst@alibaba-inc.com \
--cc=wanghaibin.wang@huawei.com \
--cc=yan.y.zhao@intel.com \
--cc=yi.l.liu@intel.com \
--cc=zhi.a.wang@intel.com \
--cc=ziye.yang@intel.com \
/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).