pds vfio driver
Subsystems (9)
Brett Creeley
maintainerv2 cover pds vfio driver
This is a first draft patchset for a new vendor specific VFIO driver for use with the AMD/Pensando Distributed Services Card (DSC). This driver (pds_vfio) is a client of the newly introduced pds_core driver.
Reference to the pds_core patchset:
https://lore.kernel.org/netdev/[email protected]/
AMD/Pensando already supports a NVMe VF device (1dd8:1006) in the Distributed Services Card (DSC). This patchset adds the new pds_vfio driver in order to support NVMe VF live migration.
This driver will use the pds_core device and auxiliary_bus as the VFIO control path to the DSC. The pds_core device creates auxiliary_bus devices for each live migratable VF. The devices are named by their feature plus the VF PCI BDF so the auxiliary_bus driver implemented by pds_vfio can find its related VF PCI driver instance. Once this auxiliary bus connection is configured, the pds_vfio driver can send admin queue commands to the device and receive events from pds_core.
An ASCII diagram of a VFIO instance looks something like this and can be used with the VFIO subsystem to provide devices VFIO and live migration support.
.------. .--------------------------.
| QEMU |--| VM .-------------. |
'......' | | nvme driver | |
| | .-------------. |
| | | SR-IOV VF | |
| | '-------------' |
| '---------------||---------'
.--------------. ||
|/dev/<vfio_fd>| ||
'--------------' ||
Host Userspace | ||
=================================================== ||
Host Kernel | ||
| ||
pds_core.LM.2305 <--+ .--------. ||
| | |vfio-pci| ||
| | '--------' ||
| | | ||
.------------. .-------------. ||
| pds_core | | pds_vfio | ||
'------------' '-------------' ||
|| || ||
09:00.0 09:00.1 ||
== PCI ==================================================||=====
|| || ||
.----------. .----------. ||
,-----| PF |---------| VF |-------------------,
| '----------' '----------' | nvme |
| DSC | data/control |
| | path |
-----------------------------------------------------------The pds_vfio driver is targeted to reside in drivers/vfio/pci/pds. It makes use of and introduces new files in the common include/linux/pds include directory.
Changes:
v2:
- Implement state transitions for VFIO_MIGRATION_P2P flag
- Improve auxiliary driver probe by returning EPROBE_DEFER when the PCI driver is not set up correctly
- Add pointer to docs in Documentation/networking/device_drivers/ethernet/index.rst
Brett Creeley (7):
pds_vfio: Initial support for pds_vfio VFIO driver
pds_vfio: Add support to register as PDS client
pds_vfio: Add VFIO live migration support
vfio: Commonize combine_ranges for use in other VFIO drivers
pds_vfio: Add support for dirty page tracking
pds_vfio: Add support for firmware recovery
pds_vfio: Add documentation files
.../ethernet/pensando/pds_vfio.rst | 88 +++ drivers/vfio/pci/Kconfig | 2 + drivers/vfio/pci/mlx5/cmd.c | 48 +- drivers/vfio/pci/pds/Kconfig | 10 + drivers/vfio/pci/pds/Makefile | 12 + drivers/vfio/pci/pds/aux_drv.c | 216 +++++++ drivers/vfio/pci/pds/aux_drv.h | 30 + drivers/vfio/pci/pds/cmds.c | 486 ++++++++++++++++ drivers/vfio/pci/pds/cmds.h | 44 ++ drivers/vfio/pci/pds/dirty.c | 541 ++++++++++++++++++ drivers/vfio/pci/pds/dirty.h | 49 ++ drivers/vfio/pci/pds/lm.c | 484 ++++++++++++++++ drivers/vfio/pci/pds/lm.h | 53 ++ drivers/vfio/pci/pds/pci_drv.c | 134 +++++ drivers/vfio/pci/pds/pci_drv.h | 9 + drivers/vfio/pci/pds/vfio_dev.c | 238 ++++++++ drivers/vfio/pci/pds/vfio_dev.h | 42 ++ drivers/vfio/vfio_main.c | 48 ++ include/linux/pds/pds_core_if.h | 1 + include/linux/pds/pds_lm.h | 356 ++++++++++++ include/linux/vfio.h | 3 + 21 files changed, 2847 insertions(+), 47 deletions(-) create mode 100644 Documentation/networking/device_drivers/ethernet/pensando/pds_vfio.rst create mode 100644 drivers/vfio/pci/pds/Kconfig create mode 100644 drivers/vfio/pci/pds/Makefile create mode 100644 drivers/vfio/pci/pds/aux_drv.c create mode 100644 drivers/vfio/pci/pds/aux_drv.h create mode 100644 drivers/vfio/pci/pds/cmds.c create mode 100644 drivers/vfio/pci/pds/cmds.h create mode 100644 drivers/vfio/pci/pds/dirty.c create mode 100644 drivers/vfio/pci/pds/dirty.h create mode 100644 drivers/vfio/pci/pds/lm.c create mode 100644 drivers/vfio/pci/pds/lm.h create mode 100644 drivers/vfio/pci/pds/pci_drv.c create mode 100644 drivers/vfio/pci/pds/pci_drv.h create mode 100644 drivers/vfio/pci/pds/vfio_dev.c create mode 100644 drivers/vfio/pci/pds/vfio_dev.h create mode 100644 include/linux/pds/pds_lm.h
--
2.17.1
Brett Creeley
maintainerRFC PATCH v2 1/7 vfio/pds: Initial support for pds_vfio VFIO driver
This is the initial framework for the new pds_vfio device driver. This does the very basics of registering the PCI device 1dd8:1006 and configuring as a VFIO PCI device.
With this change, the VF device can be bound to the pds_vfio driver on the host and presented to the VM as an NVMe VF.
--- drivers/vfio/pci/pds/Makefile | 6 ++ drivers/vfio/pci/pds/pci_drv.c | 102 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/vfio_dev.c | 74 +++++++++++++++++++++++ drivers/vfio/pci/pds/vfio_dev.h | 23 +++++++ include/linux/pds/pds_core_if.h | 1 + 5 files changed, 206 insertions(+) create mode 100644 drivers/vfio/pci/pds/Makefile create mode 100644 drivers/vfio/pci/pds/pci_drv.c create mode 100644 drivers/vfio/pci/pds/vfio_dev.c create mode 100644 drivers/vfio/pci/pds/vfio_dev.h
drivers/vfio/pci/pds/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o + +pds_vfio-y := \ + pci_drv.o \ + vfio_dev.o
drivers/vfio/pci/pds/pci_drv.c new file +102 -0
102 lines not on this page · raw message
drivers/vfio/pci/pds/vfio_dev.c new file +74 -0
74 lines not on this page · raw message
drivers/vfio/pci/pds/vfio_dev.h new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _VFIO_DEV_H_ +#define _VFIO_DEV_H_ + +#include <linux/pci.h> +#include <linux/vfio_pci_core.h> + +struct pds_vfio_pci_device { +struct vfio_pci_core_device vfio_coredev; +struct pci_dev *pdev; + +int vf_id; +int pci_id; +}; + +const struct vfio_device_ops * +pds_vfio_ops_info (void ); +struct pds_vfio_pci_device * +pds_vfio_pci_drvdata (struct pci_dev *pdev); + +#endif /* _VFIO_DEV_H_ */
include/linux/pds/pds_core_if.h +1 -0
@@ -9,6 +9,7 @@#define PCI_VENDOR_ID_PENSANDO 0x1dd8#define PCI_DEVICE_ID_PENSANDO_CORE_PF 0x100c#define PCI_DEVICE_ID_PENSANDO_VDPA_VF 0x100b +#define PCI_DEVICE_ID_PENSANDO_NVME_VF 0x1006#define PDS_CORE_BARS_MAX 4#define PDS_CORE_PCI_BAR_DBELL 1
Signature · 1 line
2.17.1
Re: [RFC PATCH v2 vfio 1/7] vfio/pds: Initial support for pds_vfio VFIO driver
Quoted 127 lines · Brett Creeley
This is the initial framework for the new
pds_vfiodevice driver. This does the very basics of registering the PCI device 1dd8:1006 and configuring as a VFIO PCI device.With this change, the VF device can be bound to the
pds_vfiodriver on the host and presented to the VM as an NVMe VF.Signed-off-by Brett Creeley <[email protected]>Signed-off-by Shannon Nelson <[email protected]>--- drivers/vfio/pci/pds/Makefile | 6 ++ drivers/vfio/pci/pds/pci_drv.c | 102 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/vfio_dev.c | 74 +++++++++++++++++++++++ drivers/vfio/pci/pds/vfio_dev.h | 23 +++++++ include/linux/pds/pds_core_if.h | 1 + 5 files changed, 206 insertions(+) create mode 100644 drivers/vfio/pci/pds/Makefile create mode 100644 drivers/vfio/pci/pds/pci_drv.c create mode 100644 drivers/vfio/pci/pds/vfio_dev.c create mode 100644 drivers/vfio/pci/pds/vfio_dev.hdrivers/vfio/pci/pds/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o + +pds_vfio-y := \ + pci_drv.o \ + vfio_dev.odrivers/vfio/pci/pds/pci_drv.c new file +88
-0@@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/types.h> +#include <linux/vfio.h> + +#include <linux/pds/pds_core_if.h> + +#include "vfio_dev.h" + +#define PDS_VFIO_DRV_NAME "pds_vfio" +#define PDS_VFIO_DRV_DESCRIPTION "Pensando VFIO Device Driver" +#define PCI_VENDOR_ID_PENSANDO 0x1dd8 + +static int +pds_vfio_pci_probe (struct pci_dev *pdev, +const struct pci_device_id *id) +{ +struct pds_vfio_pci_device *pds_vfio; +int err; + + pds_vfio =vfio_alloc_device (pds_vfio_pci_device, vfio_coredev.vdev, + &pdev->dev,pds_vfio_ops_info ()); +if (IS_ERR (pds_vfio)) +return PTR_ERR (pds_vfio); + +dev_set_drvdata (&pdev->dev, &pds_vfio->vfio_coredev); + pds_vfio->pdev = pdev; + + err =vfio_pci_core_register_device (&pds_vfio->vfio_coredev); +if (err) + goto out_put_vdev; + +return 0 ; + +out_put_vdev: +vfio_put_device (&pds_vfio->vfio_coredev.vdev); +return err; +} + +static void +pds_vfio_pci_remove (struct pci_dev *pdev) +{ +struct pds_vfio_pci_device *pds_vfio =pds_vfio_pci_drvdata (pdev); + +vfio_pci_core_unregister_device (&pds_vfio->vfio_coredev); +vfio_put_device (&pds_vfio->vfio_coredev.vdev); +} + +static const struct pci_device_id +pds_vfio_pci_table[] = { + { + .class =PCI_CLASS_STORAGE_EXPRESS , + .class_mask =0xffffff , + .vendor =PCI_VENDOR_ID_PENSANDO , + .device =PCI_DEVICE_ID_PENSANDO_NVME_VF , + .subvendor =PCI_ANY_ID , + .subdevice =PCI_ANY_ID , + .override_only =PCI_ID_F_VFIO_DRIVER_OVERRIDE , + }, + {0 , } +}; +MODULE_DEVICE_TABLE (pci, pds_vfio_pci_table); + +static struct pci_driver +pds_vfio_pci_driver = { + .name =PDS_VFIO_DRV_NAME , + .id_table = pds_vfio_pci_table, + .probe = pds_vfio_pci_probe, + .remove = pds_vfio_pci_remove, + .driver_managed_dma = true, +}; + +static void __exit +pds_vfio_pci_cleanup (void ) +{ +pci_unregister_driver (&pds_vfio_pci_driver); +} +module_exit (pds_vfio_pci_cleanup); + +static int __init +pds_vfio_pci_init (void ) +{ +int err;
drivers/vfio/pci/pds/pci_drv.c line 98
Quoted 10 lines
drivers/vfio/pci/pds/pci_drv.c new file +10
-0+ + err =pci_register_driver (&pds_vfio_pci_driver); +if (err) { +pr_err ("pci driver register failed: %pe\n" ,ERR_PTR (err)); +return err; + } + +return 0 ; +} +module_init (pds_vfio_pci_init);
It would be better to use module_pci_driver(pds_vfio_pci_driver) instead
Thanks,
Longfang.
Quoted 126 lines
drivers/vfio/pci/pds/pci_drv.c new file +4
-0+ +MODULE_DESCRIPTION (PDS_VFIO_DRV_DESCRIPTION ); +MODULE_AUTHOR ("Pensando Systems, Inc" ); +MODULE_LICENSE ("GPL" );drivers/vfio/pci/pds/vfio_dev.c new file +74
-0@@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#include <linux/vfio.h> +#include <linux/vfio_pci_core.h> + +#include "vfio_dev.h" + +struct pds_vfio_pci_device * +pds_vfio_pci_drvdata (struct pci_dev *pdev) +{ +struct vfio_pci_core_device *core_device =dev_get_drvdata (&pdev->dev); + + return container_of(core_device, struct pds_vfio_pci_device, + vfio_coredev); +} + +static int +pds_vfio_init_device (struct vfio_device *vdev) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); +struct pci_dev *pdev =to_pci_dev (vdev->dev); +int err; + + err =vfio_pci_core_init_dev (vdev); +if (err) +return err; + + pds_vfio->vf_id =pci_iov_vf_id (pdev); + pds_vfio->pci_id =PCI_DEVID (pdev->bus->number, pdev->devfn); + +return 0 ; +} + +static int +pds_vfio_open_device (struct vfio_device *vdev) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); +int err; + + err =vfio_pci_core_enable (&pds_vfio->vfio_coredev); +if (err) +return err; + +vfio_pci_core_finish_enable (&pds_vfio->vfio_coredev); + +return 0 ; +} + +static const struct vfio_device_ops +pds_vfio_ops = { + .name ="pds-vfio" , + .init = pds_vfio_init_device, + .release = vfio_pci_core_release_dev, + .open_device = pds_vfio_open_device, + .close_device = vfio_pci_core_close_device, + .ioctl = vfio_pci_core_ioctl, + .device_feature = vfio_pci_core_ioctl_feature, + .read = vfio_pci_core_read, + .write = vfio_pci_core_write, + .mmap = vfio_pci_core_mmap, + .request = vfio_pci_core_request, + .match = vfio_pci_core_match, +}; + +const struct vfio_device_ops * +pds_vfio_ops_info (void ) +{ +return &pds_vfio_ops; +}drivers/vfio/pci/pds/vfio_dev.h new file +23
-0@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _VFIO_DEV_H_ +#define _VFIO_DEV_H_ + +#include <linux/pci.h> +#include <linux/vfio_pci_core.h> + +struct pds_vfio_pci_device { +struct vfio_pci_core_device vfio_coredev; +struct pci_dev *pdev; + +int vf_id; +int pci_id; +}; + +const struct vfio_device_ops * +pds_vfio_ops_info (void ); +struct pds_vfio_pci_device * +pds_vfio_pci_drvdata (struct pci_dev *pdev); + +#endif /* _VFIO_DEV_H_ */ include/linux/pds/pds_core_if.h +1
-0@@ -9,6 +9,7 @@#define PCI_VENDOR_ID_PENSANDO 0x1dd8#define PCI_DEVICE_ID_PENSANDO_CORE_PF 0x100c#define PCI_DEVICE_ID_PENSANDO_VDPA_VF 0x100b +#define PCI_DEVICE_ID_PENSANDO_NVME_VF 0x1006#define PDS_CORE_BARS_MAX 4#define PDS_CORE_PCI_BAR_DBELL 1
Re: [RFC PATCH v2 vfio 1/7] vfio/pds: Initial support for pds_vfio VFIO driver
Quoted 132 lines · liulongfang
Quoted 131 lines · Brett Creeley
This is the initial framework for the new
pds_vfiodevice driver. This does the very basics of registering the PCI device 1dd8:1006 and configuring as a VFIO PCI device.With this change, the VF device can be bound to the
pds_vfiodriver on the host and presented to the VM as an NVMe VF.Signed-off-by Brett Creeley <[email protected]>Signed-off-by Shannon Nelson <[email protected]>--- drivers/vfio/pci/pds/Makefile | 6 ++ drivers/vfio/pci/pds/pci_drv.c | 102 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/vfio_dev.c | 74 +++++++++++++++++++++++ drivers/vfio/pci/pds/vfio_dev.h | 23 +++++++ include/linux/pds/pds_core_if.h | 1 + 5 files changed, 206 insertions(+)create mode 100644
drivers/vfio/pci/pds/Makefilecreate mode 100644drivers/vfio/pci/pds/pci_drv.ccreate mode 100644drivers/vfio/pci/pds/vfio_dev.ccreate mode 100644drivers/vfio/pci/pds/vfio_dev.hdrivers/vfio/pci/pds/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o + +pds_vfio-y := \ + pci_drv.o \ + vfio_dev.odrivers/vfio/pci/pds/pci_drv.c new file +92
-0@@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/types.h> +#include <linux/vfio.h> + +#include <linux/pds/pds_core_if.h> + +#include "vfio_dev.h" + +#define PDS_VFIO_DRV_NAME "pds_vfio" +#define PDS_VFIO_DRV_DESCRIPTION "Pensando VFIO Device Driver" +#define PCI_VENDOR_ID_PENSANDO 0x1dd8 + +static int +pds_vfio_pci_probe (struct pci_dev *pdev, +const struct pci_device_id *id) +{ +struct pds_vfio_pci_device *pds_vfio; +int err; + + pds_vfio =vfio_alloc_device (pds_vfio_pci_device, vfio_coredev.vdev, + &pdev->dev,pds_vfio_ops_info ()); +if (IS_ERR (pds_vfio)) +return PTR_ERR (pds_vfio); + +dev_set_drvdata (&pdev->dev, &pds_vfio->vfio_coredev); + pds_vfio->pdev = pdev; + + err =vfio_pci_core_register_device (&pds_vfio->vfio_coredev); +if (err) + goto out_put_vdev; + +return 0 ; + +out_put_vdev: +vfio_put_device (&pds_vfio->vfio_coredev.vdev); +return err; +} + +static void +pds_vfio_pci_remove (struct pci_dev *pdev) +{ +struct pds_vfio_pci_device *pds_vfio =pds_vfio_pci_drvdata (pdev); + +vfio_pci_core_unregister_device (&pds_vfio->vfio_coredev); +vfio_put_device (&pds_vfio->vfio_coredev.vdev); +} + +static const struct pci_device_id +pds_vfio_pci_table[] = { + { + .class =PCI_CLASS_STORAGE_EXPRESS , + .class_mask =0xffffff , + .vendor =PCI_VENDOR_ID_PENSANDO , + .device =PCI_DEVICE_ID_PENSANDO_NVME_VF , + .subvendor =PCI_ANY_ID , + .subdevice =PCI_ANY_ID , + .override_only =PCI_ID_F_VFIO_DRIVER_OVERRIDE , + }, + {0 , } +}; +MODULE_DEVICE_TABLE (pci, pds_vfio_pci_table); + +static struct pci_driver +pds_vfio_pci_driver = { + .name =PDS_VFIO_DRV_NAME , + .id_table = pds_vfio_pci_table, + .probe = pds_vfio_pci_probe, + .remove = pds_vfio_pci_remove, + .driver_managed_dma = true, +}; + +static void __exit +pds_vfio_pci_cleanup (void ) +{ +pci_unregister_driver (&pds_vfio_pci_driver); +} +module_exit (pds_vfio_pci_cleanup); + +static int __init +pds_vfio_pci_init (void ) +{ +int err; + + err =pci_register_driver (&pds_vfio_pci_driver); +if (err) { +pr_err ("pci driver register failed: %pe\n" ,ERR_PTR (err));
Quoted 8 lines
drivers/vfio/pci/pds/pci_drv.c line 98
Quoted 6 lines
drivers/vfio/pci/pds/pci_drv.c new file +6
-0+return err; + } + +return 0 ; +} +module_init (pds_vfio_pci_init);It would be better to use
module_pci_driver(pds_vfio_pci_driver)instead
Generally you are correct, but note that the next patch adds the auxiliary_driver registration so that it is no longer a simple PCI init.
sln
Quoted 130 lines
Thanks,
Longfang.Quoted 126 lines
drivers/vfio/pci/pds/pci_drv.c new file +4
-0+ +MODULE_DESCRIPTION (PDS_VFIO_DRV_DESCRIPTION ); +MODULE_AUTHOR ("Pensando Systems, Inc" ); +MODULE_LICENSE ("GPL" );drivers/vfio/pci/pds/vfio_dev.c new file +74
-0@@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#include <linux/vfio.h> +#include <linux/vfio_pci_core.h> + +#include "vfio_dev.h" + +struct pds_vfio_pci_device * +pds_vfio_pci_drvdata (struct pci_dev *pdev) +{ +struct vfio_pci_core_device *core_device =dev_get_drvdata (&pdev->dev); + + return container_of(core_device, struct pds_vfio_pci_device, + vfio_coredev); +} + +static int +pds_vfio_init_device (struct vfio_device *vdev) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); +struct pci_dev *pdev =to_pci_dev (vdev->dev); +int err; + + err =vfio_pci_core_init_dev (vdev); +if (err) +return err; + + pds_vfio->vf_id =pci_iov_vf_id (pdev); + pds_vfio->pci_id =PCI_DEVID (pdev->bus->number, pdev->devfn); + +return 0 ; +} + +static int +pds_vfio_open_device (struct vfio_device *vdev) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); +int err; + + err =vfio_pci_core_enable (&pds_vfio->vfio_coredev); +if (err) +return err; + +vfio_pci_core_finish_enable (&pds_vfio->vfio_coredev); + +return 0 ; +} + +static const struct vfio_device_ops +pds_vfio_ops = { + .name ="pds-vfio" , + .init = pds_vfio_init_device, + .release = vfio_pci_core_release_dev, + .open_device = pds_vfio_open_device, + .close_device = vfio_pci_core_close_device, + .ioctl = vfio_pci_core_ioctl, + .device_feature = vfio_pci_core_ioctl_feature, + .read = vfio_pci_core_read, + .write = vfio_pci_core_write, + .mmap = vfio_pci_core_mmap, + .request = vfio_pci_core_request, + .match = vfio_pci_core_match, +}; + +const struct vfio_device_ops * +pds_vfio_ops_info (void ) +{ +return &pds_vfio_ops; +}drivers/vfio/pci/pds/vfio_dev.h new file +23
-0@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _VFIO_DEV_H_ +#define _VFIO_DEV_H_ + +#include <linux/pci.h> +#include <linux/vfio_pci_core.h> + +struct pds_vfio_pci_device { +struct vfio_pci_core_device vfio_coredev; +struct pci_dev *pdev; + +int vf_id; +int pci_id; +}; + +const struct vfio_device_ops * +pds_vfio_ops_info (void ); +struct pds_vfio_pci_device * +pds_vfio_pci_drvdata (struct pci_dev *pdev); + +#endif /* _VFIO_DEV_H_ */ include/linux/pds/pds_core_if.h +1
-0@@ -9,6 +9,7 @@#define PCI_VENDOR_ID_PENSANDO 0x1dd8#define PCI_DEVICE_ID_PENSANDO_CORE_PF 0x100c#define PCI_DEVICE_ID_PENSANDO_VDPA_VF 0x100b +#define PCI_DEVICE_ID_PENSANDO_NVME_VF 0x1006#define PDS_CORE_BARS_MAX 4#define PDS_CORE_PCI_BAR_DBELL 1
Brett Creeley
maintainerRFC PATCH v2 2/7 vfio/pds: Add support to register as PDS client
In reply to Brett CreeleyThe pds_core driver will create auxiliary devices for each PCI device supported by pds_vfio. In order to communicate with the device, the pds_vfio driver needs to register as an auxiliary driver for the previously mentioned auxiliary device. Once the auxiliary device is probed, the pds_vfio driver can send admin queue commands and receive events from the device by way of pds_core.
Use the following commands to enable a VF and tell pds_core to create its corresponding auxiliary device:
echo 1 > /sys/bus/pci/drivers/pds_core/$PF_BDF/sriov_numvfs
devlink dev param set pci/$PF_BDF name enable_migration value true cmode runtime
This functionality is needed to support live migration commands, which are added later in the series.
--- drivers/vfio/pci/pds/Makefile | 2 + drivers/vfio/pci/pds/aux_drv.c | 154 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/aux_drv.h | 29 ++++++ drivers/vfio/pci/pds/cmds.c | 30 +++++++ drivers/vfio/pci/pds/cmds.h | 14 +++ drivers/vfio/pci/pds/pci_drv.c | 18 +++- drivers/vfio/pci/pds/pci_drv.h | 11 +++ drivers/vfio/pci/pds/vfio_dev.c | 8 ++ drivers/vfio/pci/pds/vfio_dev.h | 1 + include/linux/pds/pds_lm.h | 12 +++ 10 files changed, 278 insertions(+), 1 deletion(-) create mode 100644 drivers/vfio/pci/pds/aux_drv.c create mode 100644 drivers/vfio/pci/pds/aux_drv.h create mode 100644 drivers/vfio/pci/pds/cmds.c create mode 100644 drivers/vfio/pci/pds/cmds.h create mode 100644 drivers/vfio/pci/pds/pci_drv.h create mode 100644 include/linux/pds/pds_lm.h
drivers/vfio/pci/pds/Makefile +2 -0
@@ -2,5 +2,7 @@ obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o pds_vfio-y := \ + aux_drv.o \ + cmds.o \ pci_drv.o \ vfio_dev.o
drivers/vfio/pci/pds/aux_drv.c new file +154 -0
154 lines not on this page · raw message
drivers/vfio/pci/pds/aux_drv.h new file +29 -0
@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _AUX_DRV_H_ +#define _AUX_DRV_H_ + +#include <linux/auxiliary_bus.h> + +#include <linux/pds/pds_intr.h> +#include <linux/pds/pds_common.h> +#include <linux/pds/pds_adminq.h> +#include <linux/pds/pds_auxbus.h> + +struct pds_vfio_pci_device ; + +struct pds_vfio_aux { +struct pds_auxiliary_dev *padev; +struct pds_auxiliary_drv padrv; +struct pds_vfio_pci_device *pds_vfio; +}; + +struct auxiliary_driver * +pds_vfio_aux_driver_info (void ); +struct pds_vfio_aux * +pds_vfio_aux_get_drvdata (int vf_pci_id); +void +pds_vfio_put_aux_dev (struct pds_vfio_aux *vfio_aux); + +#endif /* _AUX_DRV_H_ */
drivers/vfio/pci/pds/cmds.c new file +30 -0
@@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#include <linux/io.h> +#include <linux/types.h> + +#include <linux/pds/pds_core_if.h> +#include <linux/pds/pds_adminq.h> +#include <linux/pds/pds_auxbus.h> + +#include "vfio_dev.h" +#include "aux_drv.h" +#include "cmds.h" + +int +pds_vfio_register_client_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_vfio_aux *vfio_aux = pds_vfio->vfio_aux; +struct pds_auxiliary_dev *padev = vfio_aux->padev; + +return padev->ops->register_client (padev, &vfio_aux->padrv); +} + +void +pds_vfio_unregister_client_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_auxiliary_dev *padev = pds_vfio->vfio_aux->padev; + + padev->ops->unregister_client (padev); +}
drivers/vfio/pci/pds/cmds.h new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _CMDS_H_ +#define _CMDS_H_ + +struct pds_vfio_pci_device ; + +int +pds_vfio_register_client_cmd (struct pds_vfio_pci_device *pds_vfio); +void +pds_vfio_unregister_client_cmd (struct pds_vfio_pci_device *pds_vfio); + +#endif /* _CMDS_H_ */
drivers/vfio/pci/pds/pci_drv.c +17 -1
@@ -11,8 +11,9 @@#include <linux/pds/pds_core_if.h> #include "vfio_dev.h" +#include "aux_drv.h" +#include "pci_drv.h" -#define PDS_VFIO_DRV_NAME "pds_vfio"#define PDS_VFIO_DRV_DESCRIPTION "Pensando VFIO Device Driver"#define PCI_VENDOR_ID_PENSANDO 0x1dd8
@@ -75,9 +76,17 @@ pds_vfio_pci_driver = { .driver_managed_dma = true, }; +bool +pds_vfio_is_vfio_pci_driver (struct pci_dev *pdev) +{ +return (to_pci_driver (pdev->dev.driver) == &pds_vfio_pci_driver); +} + static void __exitpds_vfio_pci_cleanup (void ) { +auxiliary_driver_unregister (pds_vfio_aux_driver_info ()); +pci_unregister_driver (&pds_vfio_pci_driver); }module_exit (pds_vfio_pci_cleanup);
@@ -93,6 +102,13 @@ pds_vfio_pci_init(void)return err; } + err =auxiliary_driver_register (pds_vfio_aux_driver_info ()); +if (err) { +pr_err ("aux driver register failed: %pe\n" ,ERR_PTR (err)); +pci_unregister_driver (&pds_vfio_pci_driver); +return err; + } +return 0 ; }module_init (pds_vfio_pci_init);
drivers/vfio/pci/pds/pci_drv.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef _PCI_DRV_H +#define _PCI_DRV_H + +#include <linux/pci.h> + +#define PDS_VFIO_DRV_NAME "pds_vfio" + +bool +pds_vfio_is_vfio_pci_driver (struct pci_dev *pdev); + +#endif /* _PCI_DRV_H */
drivers/vfio/pci/pds/vfio_dev.c +8 -0
@@ -5,6 +5,7 @@#include <linux/vfio_pci_core.h> #include "vfio_dev.h" +#include "aux_drv.h" struct pds_vfio_pci_device *pds_vfio_pci_drvdata (struct pci_dev *pdev)
@@ -22,6 +23,7 @@ pds_vfio_init_device(struct vfio_device *vdev) container_of(vdev, struct pds_vfio_pci_device, vfio_coredev.vdev);struct pci_dev *pdev =to_pci_dev (vdev->dev); +struct pds_vfio_aux *vfio_aux;int err; err =vfio_pci_core_init_dev (vdev);
@@ -30,6 +32,12 @@ pds_vfio_init_device(struct vfio_device *vdev) pds_vfio->vf_id =pci_iov_vf_id (pdev); pds_vfio->pci_id =PCI_DEVID (pdev->bus->number, pdev->devfn); + vfio_aux =pds_vfio_aux_get_drvdata (pds_vfio->pci_id); +if (vfio_aux) { + vfio_aux->pds_vfio = pds_vfio; + pds_vfio->vfio_aux = vfio_aux; +pds_vfio_put_aux_dev (vfio_aux); + }return 0 ; }
drivers/vfio/pci/pds/vfio_dev.h +1 -0
@@ -10,6 +10,7 @@struct pds_vfio_pci_device {struct vfio_pci_core_device vfio_coredev;struct pci_dev *pdev; +struct pds_vfio_aux *vfio_aux;int vf_id;int pci_id;
include/linux/pds/pds_lm.h new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _PDS_LM_H_ +#define _PDS_LM_H_ + +#include "pds_common.h" + +#define PDS_DEV_TYPE_LM_STR "LM" +#define PDS_LM_DEV_NAME PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_LM_STR + +#endif /* _PDS_LM_H_ */
Signature · 1 line
2.17.1
Brett Creeley
maintainerRFC PATCH v2 3/7 vfio/pds: Add VFIO live migration support
In reply to Brett CreeleyAdd live migration support via the VFIO subsystem. The migration implementation aligns with the definition from uapi/vfio.h and uses the auxiliary bus connection between pds_core/pds_vfio to communicate with the device.
The ability to suspend, resume, and transfer VF device state data is included along with the required admin queue command structures and implementations.
PDS_LM_CMD_SUSPEND and PDS_LM_CMD_SUSPEND_STATUS are added to support the VF device suspend operation.
PDS_LM_CMD_RESUME is added to support the VF device resume operation.
PDS_LM_CMD_STATUS is added to determine the exact size of the VF device state data.
PDS_LM_CMD_SAVE is added to get the VF device state data.
PDS_LM_CMD_RESTORE is added to restore the VF device with the previously saved data from PDS_LM_CMD_SAVE.
PDS_LM_CMD_HOST_VF_STATUS is added to notify the device when a migration is in/not-in progress from the host's perspective.
--- drivers/vfio/pci/pds/Makefile | 1 + drivers/vfio/pci/pds/aux_drv.c | 1 + drivers/vfio/pci/pds/cmds.c | 312 ++++++++++++++++++++ drivers/vfio/pci/pds/cmds.h | 15 + drivers/vfio/pci/pds/lm.c | 491 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/lm.h | 43 +++ drivers/vfio/pci/pds/pci_drv.c | 15 + drivers/vfio/pci/pds/vfio_dev.c | 119 +++++++- drivers/vfio/pci/pds/vfio_dev.h | 12 + include/linux/pds/pds_lm.h | 206 ++++++++++++++ 10 files changed, 1214 insertions(+), 1 deletion(-) create mode 100644 drivers/vfio/pci/pds/lm.c create mode 100644 drivers/vfio/pci/pds/lm.h
drivers/vfio/pci/pds/Makefile +1 -0
@@ -4,5 +4,6 @@ obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o pds_vfio-y := \ aux_drv.o \ cmds.o \ + lm.o \ pci_drv.o \ vfio_dev.o
drivers/vfio/pci/pds/aux_drv.c +1 -0
@@ -77,6 +77,7 @@ pds_vfio_aux_probe(struct auxiliary_device *aux_dev,dev_dbg (dev,"%s: id %#04x busnr %#x devfn %#x bus %p pds_vfio %p\n" , __func__, padev->id, busnr, devfn, bus, vfio_aux->pds_vfio); + vfio_aux->pds_vfio->coredev = aux_dev->dev.parent; vfio_aux->pds_vfio->vfio_aux = vfio_aux; vfio_aux->padrv.event_handler = pds_vfio_aux_notify_handler;
drivers/vfio/pci/pds/cmds.c +312 -0
324 lines not on this page · raw message
drivers/vfio/pci/pds/cmds.h +15 -0
@@ -4,11 +4,26 @@#ifndef _CMDS_H_#define _CMDS_H_ +#include <linux/pds/pds_lm.h> +struct pds_vfio_pci_device ;int pds_vfio_register_client_cmd (struct pds_vfio_pci_device *pds_vfio);void pds_vfio_unregister_client_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_suspend_device_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_resume_device_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_get_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio,u64 *size); +int +pds_vfio_get_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_set_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio); +void +pds_vfio_send_host_vf_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio, +enum pds_lm_host_vf_status vf_status);#endif /* _CMDS_H_ */
drivers/vfio/pci/pds/lm.c new file +491 -0
491 lines not on this page · raw message
drivers/vfio/pci/pds/lm.h new file +43 -0
43 lines not on this page · raw message
drivers/vfio/pci/pds/pci_drv.c +15 -0
@@ -67,12 +67,27 @@ pds_vfio_pci_table[] = { };MODULE_DEVICE_TABLE (pci, pds_vfio_pci_table); +static void +pds_vfio_pci_aer_reset_done (struct pci_dev *pdev) +{ +struct pds_vfio_pci_device *pds_vfio =pds_vfio_pci_drvdata (pdev); + +pds_vfio_reset (pds_vfio); +} + +static const struct +pci_error_handlers pds_vfio_pci_err_handlers = { + .reset_done = pds_vfio_pci_aer_reset_done, + .error_detected = vfio_pci_core_aer_err_detected, +}; +static struct pci_driver pds_vfio_pci_driver = { .name =PDS_VFIO_DRV_NAME , .id_table = pds_vfio_pci_table, .probe = pds_vfio_pci_probe, .remove = pds_vfio_pci_remove, + .err_handler = &pds_vfio_pci_err_handlers, .driver_managed_dma = true, };
drivers/vfio/pci/pds/vfio_dev.c +118 -1
158 lines not on this page · raw message
drivers/vfio/pci/pds/vfio_dev.h +12 -0
@@ -7,10 +7,20 @@#include <linux/pci.h> #include <linux/vfio_pci_core.h> +#include "lm.h" +struct pds_vfio_pci_device {struct vfio_pci_core_device vfio_coredev;struct pci_dev *pdev;struct pds_vfio_aux *vfio_aux; +struct device *coredev; + +struct pds_vfio_lm_file *save_file; +struct pds_vfio_lm_file *restore_file; +struct mutex state_mutex;/* protect migration state */ +enum vfio_device_mig_state state; +spinlock_t reset_lock;/* protect reset_done flow */ +u8 deferred_reset;int vf_id;int pci_id;
@@ -20,5 +30,7 @@ const struct vfio_device_ops *pds_vfio_ops_info (void);struct pds_vfio_pci_device *pds_vfio_pci_drvdata (struct pci_dev *pdev); +void +pds_vfio_reset (struct pds_vfio_pci_device *pds_vfio);#endif /* _VFIO_DEV_H_ */
include/linux/pds/pds_lm.h +206 -0
211 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [RFC PATCH v2 vfio 3/7] vfio/pds: Add VFIO live migration support
Quoted 12 lines · Brett Creeley
Add live migration support via the VFIO subsystem. The migration implementation aligns with the definition from
uapi/vfio.hand uses the auxiliary bus connection between pds_core/pds_vfio to communicate with the device.The ability to suspend, resume, and transfer VF device state data is included along with the required admin queue command structures and implementations.
PDS_LM_CMD_SUSPENDandPDS_LM_CMD_SUSPEND_STATUSare added to support the VF device suspend operation.
Quoted 7 lines
PDS_LM_CMD_RESUMEis added to support the VF device resume operation.
PDS_LM_CMD_STATUSis added to determine the exact size of the VF device state data.
PDS_LM_CMD_SAVEis added to get the VF device state data.
Hi, this PDS is an NVME storage disk. When it supports live migration, the amount of data stored on the disk is so large.
How do you realize the migration of a large amount of data in the disk in a short period of time?
Thanks,
Longfang.
Quoted 1,401 lines
PDS_LM_CMD_RESTOREis added to restore the VF device with the previously saved data fromPDS_LM_CMD_SAVE.
PDS_LM_CMD_HOST_VF_STATUSis added to notify the device when a migration is in/not-in progress from the host's perspective.Signed-off-by Brett Creeley <[email protected]>Signed-off-by Shannon Nelson <[email protected]>--- drivers/vfio/pci/pds/Makefile | 1 + drivers/vfio/pci/pds/aux_drv.c | 1 + drivers/vfio/pci/pds/cmds.c | 312 ++++++++++++++++++++ drivers/vfio/pci/pds/cmds.h | 15 + drivers/vfio/pci/pds/lm.c | 491 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/lm.h | 43 +++ drivers/vfio/pci/pds/pci_drv.c | 15 + drivers/vfio/pci/pds/vfio_dev.c | 119 +++++++- drivers/vfio/pci/pds/vfio_dev.h | 12 + include/linux/pds/pds_lm.h | 206 ++++++++++++++ 10 files changed, 1214 insertions(+), 1 deletion(-) create mode 100644 drivers/vfio/pci/pds/lm.c create mode 100644 drivers/vfio/pci/pds/lm.hdrivers/vfio/pci/pds/Makefile +1
-0@@ -4,5 +4,6 @@ obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o pds_vfio-y := \ aux_drv.o \ cmds.o \ + lm.o \ pci_drv.o \ vfio_dev.odrivers/vfio/pci/pds/aux_drv.c +1
-0@@ -77,6 +77,7 @@ pds_vfio_aux_probe(struct auxiliary_device *aux_dev,dev_dbg (dev,"%s: id %#04x busnr %#x devfn %#x bus %p pds_vfio %p\n" , __func__, padev->id, busnr, devfn, bus, vfio_aux->pds_vfio); + vfio_aux->pds_vfio->coredev = aux_dev->dev.parent; vfio_aux->pds_vfio->vfio_aux = vfio_aux; vfio_aux->padrv.event_handler = pds_vfio_aux_notify_handler;drivers/vfio/pci/pds/cmds.c +312
-0@@ -3,9 +3,11 @@#include <linux/io.h> #include <linux/types.h> +#include <linux/delay.h> #include <linux/pds/pds_core_if.h> #include <linux/pds/pds_adminq.h> +#include <linux/pds/pds_lm.h> #include <linux/pds/pds_auxbus.h> #include "vfio_dev.h" @@ -28,3 +30,313 @@ pds_vfio_unregister_client_cmd(struct pds_vfio_pci_device *pds_vfio) padev->ops->unregister_client (padev); } + +#define SUSPEND_TIMEOUT_S 5 +#define SUSPEND_CHECK_INTERVAL_MS 1 + +static int +pds_vfio_suspend_wait_device_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_suspend_status_cmd cmd = { + .opcode =PDS_LM_CMD_SUSPEND_STATUS , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_lm_comp comp = {0 }; +struct pds_auxiliary_dev *padev; +unsigned long time_limit; +unsigned long time_start; +unsigned long time_done; +int err; + + padev = pds_vfio->vfio_aux->padev; + + time_start = jiffies; + time_limit = time_start +HZ *SUSPEND_TIMEOUT_S ; +do { + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +PDS_AQ_FLAG_FASTPOLL ); +if (err != -EAGAIN ) +break ; + +msleep (SUSPEND_CHECK_INTERVAL_MS ); + }while (time_before (jiffies, time_limit)); + + time_done = jiffies; +dev_dbg (&pdev->dev,"%s: vf%u: Suspend comp received in %d msecs\n" , + __func__, pds_vfio->vf_id, +jiffies_to_msecs (time_done - time_start)); + +/* Check the results */ +if (time_after_eq (time_done, time_limit)) { +dev_err (&pdev->dev,"%s: vf%u: Suspend comp timeout\n" , __func__, + pds_vfio->vf_id); + err = -ETIMEDOUT ; + } + +return err; +} + +int +pds_vfio_suspend_device_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_suspend_cmd cmd = { + .opcode =PDS_LM_CMD_SUSPEND , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pds_lm_suspend_comp comp = {0 }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_auxiliary_dev *padev; +int err; + +dev_dbg (&pdev->dev,"vf%u: Suspend device\n" , pds_vfio->vf_id); + + padev = pds_vfio->vfio_aux->padev; + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +PDS_AQ_FLAG_FASTPOLL ); +if (err) { +dev_err (&pdev->dev,"vf%u: Suspend failed: %pe\n" , + pds_vfio->vf_id,ERR_PTR (err)); +return err; + } + +return pds_vfio_suspend_wait_device_cmd (pds_vfio); +} + +int +pds_vfio_resume_device_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_resume_cmd cmd = { + .opcode =PDS_LM_CMD_RESUME , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pds_auxiliary_dev *padev; +struct pds_lm_comp comp = {0 }; + +dev_dbg (&pds_vfio->pdev->dev,"vf%u: Resume device\n" , pds_vfio->vf_id); + + padev = pds_vfio->vfio_aux->padev; +return padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +} + +int +pds_vfio_get_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio,u64 *size) +{ +struct pds_lm_status_cmd cmd = { + .opcode =PDS_LM_CMD_STATUS , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pds_lm_status_comp comp = {0 }; +struct pds_auxiliary_dev *padev; +int err =0 ; + +dev_dbg (&pds_vfio->pdev->dev,"vf%u: Get migration status\n" , + pds_vfio->vf_id); + + padev = pds_vfio->vfio_aux->padev; + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +if (err) +return err; + + *size =le64_to_cpu (comp.size); +return 0 ; +} + +static int +pds_vfio_dma_map_lm_file (struct device *dev,enum dma_data_direction dir, +struct pds_vfio_lm_file *lm_file) +{ +struct pds_lm_sg_elem *sgl, *sge; +struct scatterlist *sg; +int err =0 ; +int i; + +if (!lm_file) +return -EINVAL ; + +/* dma map file pages */ + err =dma_map_sgtable (dev, &lm_file->sg_table, dir,0 ); +if (err) + goto err_dma_map_sg; + + lm_file->num_sge = lm_file->sg_table.nents; + +/* alloc sgl */ + sgl =dma_alloc_coherent (dev, lm_file->num_sge * +sizeof (struct pds_lm_sg_elem ), + &lm_file->sgl_addr,GFP_KERNEL ); +if (!sgl) { + err = -ENOMEM ; + goto err_alloc_sgl; + } + + lm_file->sgl = sgl; + +/* fill sgl */ + sge = sgl; +for_each_sgtable_dma_sg (&lm_file->sg_table, sg, i) { + sge->addr =cpu_to_le64 (sg_dma_address (sg)); + sge->len =cpu_to_le32 (sg_dma_len (sg)); +dev_dbg (dev,"addr = %llx, len = %u\n" , sge->addr, sge->len); + sge++; + } + +return 0 ; + +err_alloc_sgl: +dma_unmap_sgtable (dev, &lm_file->sg_table, dir,0 ); +err_dma_map_sg: +return err; +} + +static void +pds_vfio_dma_unmap_lm_file (struct device *dev,enum dma_data_direction dir, +struct pds_vfio_lm_file *lm_file) +{ +if (!lm_file) +return ; + +/* free sgl */ +if (lm_file->sgl) { +dma_free_coherent (dev, lm_file->num_sge * +sizeof (struct pds_lm_sg_elem ), + lm_file->sgl, lm_file->sgl_addr); + lm_file->sgl =NULL ; + lm_file->sgl_addr =DMA_MAPPING_ERROR ; + lm_file->num_sge =0 ; + } + +/* dma unmap file pages */ +dma_unmap_sgtable (dev, &lm_file->sg_table, dir,0 ); +} + +int +pds_vfio_get_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_save_cmd cmd = { + .opcode =PDS_LM_CMD_SAVE , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_vfio_lm_file *lm_file; +struct pds_auxiliary_dev *padev; +struct pds_lm_comp comp = {0 }; +int err; + +dev_dbg (&pdev->dev,"vf%u: Get migration state\n" , pds_vfio->vf_id); + + lm_file = pds_vfio->save_file; + + padev = pds_vfio->vfio_aux->padev; + err =pds_vfio_dma_map_lm_file (pds_vfio->coredev,DMA_FROM_DEVICE , lm_file); +if (err) { +dev_err (&pdev->dev,"failed to map save migration file: %pe\n" , +ERR_PTR (err)); +return err; + } + + cmd.sgl_addr =cpu_to_le64 (lm_file->sgl_addr); + cmd.num_sge =cpu_to_le32 (lm_file->num_sge); + + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +if (err) +dev_err (&pdev->dev,"failed to get migration state: %pe\n" , +ERR_PTR (err)); + +pds_vfio_dma_unmap_lm_file (pds_vfio->coredev,DMA_FROM_DEVICE , lm_file); + +return err; +} + +int +pds_vfio_set_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_restore_cmd cmd = { + .opcode =PDS_LM_CMD_RESTORE , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_vfio_lm_file *lm_file; +struct pds_auxiliary_dev *padev; +struct pds_lm_comp comp = {0 }; +int err; + +dev_dbg (&pdev->dev,"vf%u: Set migration state\n" , pds_vfio->vf_id); + + lm_file = pds_vfio->restore_file; + + padev = pds_vfio->vfio_aux->padev; + err =pds_vfio_dma_map_lm_file (pds_vfio->coredev,DMA_TO_DEVICE , lm_file); +if (err) { +dev_err (&pdev->dev,"failed to map restore migration file: %pe\n" , +ERR_PTR (err)); +return err; + } + + cmd.sgl_addr =cpu_to_le64 (lm_file->sgl_addr); + cmd.num_sge =cpu_to_le32 (lm_file->num_sge); + + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +if (err) +dev_err (&pdev->dev,"failed to set migration state: %pe\n" , +ERR_PTR (err)); + +pds_vfio_dma_unmap_lm_file (pds_vfio->coredev,DMA_TO_DEVICE , lm_file); + +return err; +} + +void +pds_vfio_send_host_vf_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio, +enum pds_lm_host_vf_status vf_status) +{ +struct pds_auxiliary_dev *padev = pds_vfio->vfio_aux->padev; +struct pds_lm_host_vf_status_cmd cmd = { + .opcode =PDS_LM_CMD_HOST_VF_STATUS , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + .status = vf_status, + }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_lm_comp comp = {0 }; +int err; + +dev_dbg (&pdev->dev,"vf%u: Set host VF LM status: %u" , + pds_vfio->vf_id, cmd.status); +if (vf_status !=PDS_LM_STA_IN_PROGRESS && + vf_status !=PDS_LM_STA_NONE ) { +dev_warn (&pdev->dev,"Invalid host VF migration status, %d\n" , + vf_status); +return ; + } + + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +if (err) +dev_warn (&pdev->dev,"failed to send host VF migration status: %pe\n" , +ERR_PTR (err)); +}drivers/vfio/pci/pds/cmds.h +15
-0@@ -4,11 +4,26 @@#ifndef _CMDS_H_#define _CMDS_H_ +#include <linux/pds/pds_lm.h> +struct pds_vfio_pci_device ;int pds_vfio_register_client_cmd (struct pds_vfio_pci_device *pds_vfio);void pds_vfio_unregister_client_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_suspend_device_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_resume_device_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_get_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio,u64 *size); +int +pds_vfio_get_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_set_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio); +void +pds_vfio_send_host_vf_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio, +enum pds_lm_host_vf_status vf_status);#endif /* _CMDS_H_ */ drivers/vfio/pci/pds/lm.c new file +491
-0@@ -0,0 +1,491 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#include <linux/anon_inodes.h> +#include <linux/file.h> +#include <linux/fs.h> +#include <linux/highmem.h> +#include <linux/vfio.h> +#include <linux/vfio_pci_core.h> + +#include "cmds.h" +#include "vfio_dev.h" + +#define PDS_VFIO_LM_FILENAME "pds_vfio_lm" + +const char * +pds_vfio_lm_state (enum vfio_device_mig_state state) +{ +switch (state) { +case VFIO_DEVICE_STATE_ERROR : +return "VFIO_DEVICE_STATE_ERROR" ; +case VFIO_DEVICE_STATE_STOP : +return "VFIO_DEVICE_STATE_STOP" ; +case VFIO_DEVICE_STATE_RUNNING : +return "VFIO_DEVICE_STATE_RUNNING" ; +case VFIO_DEVICE_STATE_STOP_COPY : +return "VFIO_DEVICE_STATE_STOP_COPY" ; +case VFIO_DEVICE_STATE_RESUMING : +return "VFIO_DEVICE_STATE_RESUMING" ; +case VFIO_DEVICE_STATE_RUNNING_P2P : +return "VFIO_DEVICE_STATE_RUNNING_P2P" ; +default : +return "VFIO_DEVICE_STATE_INVALID" ; + } + +return "VFIO_DEVICE_STATE_INVALID" ; +} + +static struct pds_vfio_lm_file * +pds_vfio_get_lm_file (const char *name,const struct file_operations *fops, +int flags,u64 size) +{ +struct pds_vfio_lm_file *lm_file =NULL ; +unsigned long long npages; +unsigned long long i; +struct page **pages; +int err =0 ; + +if (!size) +return NULL ; + +/* Alloc file structure */ + lm_file =kzalloc (sizeof (*lm_file),GFP_KERNEL ); +if (!lm_file) +return NULL ; + +/* Create file */ + lm_file->filep =anon_inode_getfile (name, fops, lm_file, flags); +if (!lm_file->filep) + goto err_get_file; + +stream_open (lm_file->filep->f_inode, lm_file->filep); +mutex_init (&lm_file->lock); + + lm_file->size = size; + +/* Allocate memory for file pages */ + npages =DIV_ROUND_UP_ULL (lm_file->size,PAGE_SIZE ); + + pages =kcalloc (npages,sizeof (*pages),GFP_KERNEL ); +if (!pages) + goto err_alloc_pages; + +for (i =0 ; i < npages; i++) { + pages[i] =alloc_page (GFP_KERNEL ); +if (!pages[i]) + goto err_alloc_page; + } + + lm_file->pages = pages; + lm_file->npages = npages; + lm_file->alloc_size = npages *PAGE_SIZE ; + +/* Create scatterlist of file pages to use for DMA mapping later */ + err =sg_alloc_table_from_pages (&lm_file->sg_table, pages, npages, +0 , size,GFP_KERNEL ); +if (err) + goto err_alloc_sg_table; + +return lm_file; + +err_alloc_sg_table: +err_alloc_page: +/* free allocated pages */ +for (i =0 ; i < npages && pages[i]; i++) +__free_page (pages[i]); +kfree (pages); +err_alloc_pages: +fput (lm_file->filep); +mutex_destroy (&lm_file->lock); +err_get_file: +kfree (lm_file); + +return NULL ; +} + +static void +pds_vfio_put_lm_file (struct pds_vfio_lm_file *lm_file) +{ +unsigned long long i; + +mutex_lock (&lm_file->lock); + + lm_file->size =0 ; + lm_file->alloc_size =0 ; + +/* Free scatter list of file pages*/ +sg_free_table (&lm_file->sg_table); + +/* Free allocated file pages */ +for (i =0 ; i < lm_file->npages && lm_file->pages[i]; i++) +__free_page (lm_file->pages[i]); +kfree (lm_file->pages); + lm_file->pages =NULL ; + +/* Delete file */ +fput (lm_file->filep); + lm_file->filep =NULL ; + +mutex_unlock (&lm_file->lock); + +mutex_destroy (&lm_file->lock); + +/* Free file structure */ +kfree (lm_file); +} + +void +pds_vfio_put_save_file (struct pds_vfio_pci_device *pds_vfio) +{ +if (!pds_vfio->save_file) +return ; + +pds_vfio_put_lm_file (pds_vfio->save_file); + pds_vfio->save_file =NULL ; +} + +void +pds_vfio_put_restore_file (struct pds_vfio_pci_device *pds_vfio) +{ +if (!pds_vfio->restore_file) +return ; + +pds_vfio_put_lm_file (pds_vfio->restore_file); + pds_vfio->restore_file =NULL ; +} + +static struct page * +pds_vfio_get_file_page (struct pds_vfio_lm_file *lm_file, +unsigned long offset) +{ +unsigned long cur_offset =0 ; +struct scatterlist *sg; +unsigned int i; + +/* All accesses are sequential */ +if (offset < lm_file->last_offset || !lm_file->last_offset_sg) { + lm_file->last_offset =0 ; + lm_file->last_offset_sg = lm_file->sg_table.sgl; + lm_file->sg_last_entry =0 ; + } + + cur_offset = lm_file->last_offset; + +for_each_sg (lm_file->last_offset_sg, sg, + lm_file->sg_table.orig_nents - lm_file->sg_last_entry, + i) { +if (offset < sg->length + cur_offset) { + lm_file->last_offset_sg = sg; + lm_file->sg_last_entry += i; + lm_file->last_offset = cur_offset; +return nth_page (sg_page (sg), + (offset - cur_offset) /PAGE_SIZE ); + } + cur_offset += sg->length; + } + +return NULL ; +} + +static int +pds_vfio_release_file (struct inode *inode,struct file *filp) +{ +struct pds_vfio_lm_file *lm_file = filp->private_data; + + lm_file->size =0 ; + +return 0 ; +} + +static ssize_t +pds_vfio_save_read (struct file *filp,char __user *buf,size_t len,loff_t *pos) +{ +struct pds_vfio_lm_file *lm_file = filp->private_data; +ssize_t done =0 ; + +if (pos) +return -ESPIPE ; + pos = &filp->f_pos; + +mutex_lock (&lm_file->lock); +if (*pos > lm_file->size) { + done = -EINVAL ; + goto out_unlock; + } + + len =min_t (size_t, lm_file->size - *pos, len); +while (len) { +size_t page_offset; +struct page *page; +size_t page_len; +u8 *from_buff; +int err; + + page_offset = (*pos) %PAGE_SIZE ; + page =pds_vfio_get_file_page (lm_file, *pos - page_offset); +if (!page) { +if (done ==0 ) + done = -EINVAL ; + goto out_unlock; + } + + page_len =min_t (size_t, len,PAGE_SIZE - page_offset); + from_buff =kmap_local_page (page); + err =copy_to_user (buf, from_buff + page_offset, page_len); +kunmap_local (from_buff); +if (err) { + done = -EFAULT ; + goto out_unlock; + } + *pos += page_len; + len -= page_len; + done += page_len; + buf += page_len; + } + +out_unlock: +mutex_unlock (&lm_file->lock); +return done; +} + +static const struct file_operations +pds_vfio_save_fops = { + .owner =THIS_MODULE , + .read = pds_vfio_save_read, + .release = pds_vfio_release_file, + .llseek = no_llseek, +}; + +static int +pds_vfio_get_save_file (struct pds_vfio_pci_device *pds_vfio) +{ +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_vfio_lm_file *lm_file; +int err =0 ; +u64 size; + +/* Get live migration state size in this state */ + err =pds_vfio_get_lm_status_cmd (pds_vfio, &size); +if (err) { +dev_err (&pdev->dev,"failed to get save status: %pe\n" , +ERR_PTR (err)); + goto err_get_lm_status; + } + +dev_dbg (&pdev->dev,"save status, size = %lld\n" , size); + +if (!size) { + err = -EIO ; +dev_err (&pdev->dev,"invalid state size\n" ); + goto err_get_lm_status; + } + + lm_file =pds_vfio_get_lm_file (PDS_VFIO_LM_FILENAME , + &pds_vfio_save_fops, +O_RDONLY , size); +if (!lm_file) { + err = -ENOENT ; +dev_err (&pdev->dev,"failed to create save file\n" ); + goto err_get_lm_file; + } + +dev_dbg (&pdev->dev,"size = %lld, alloc_size = %lld, npages = %lld\n" , + lm_file->size, lm_file->alloc_size, lm_file->npages); + + pds_vfio->save_file = lm_file; + +return 0 ; + +err_get_lm_file: +err_get_lm_status: +return err; +} + +static ssize_t +pds_vfio_restore_write (struct file *filp,const char __user *buf,size_t len,loff_t *pos) +{ +struct pds_vfio_lm_file *lm_file = filp->private_data; +loff_t requested_length; +ssize_t done =0 ; + +if (pos) +return -ESPIPE ; + + pos = &filp->f_pos; + +if (*pos <0 || +check_add_overflow ((loff_t )len, *pos, &requested_length)) +return -EINVAL ; + +mutex_lock (&lm_file->lock); + +while (len) { +size_t page_offset; +struct page *page; +size_t page_len; +u8 *to_buff; +int err; + + page_offset = (*pos) %PAGE_SIZE ; + page =pds_vfio_get_file_page (lm_file, *pos - page_offset); +if (!page) { +if (done ==0 ) + done = -EINVAL ; + goto out_unlock; + } + + page_len =min_t (size_t, len,PAGE_SIZE - page_offset); + to_buff =kmap_local_page (page); + err =copy_from_user (to_buff + page_offset, buf, page_len); +kunmap_local (to_buff); +if (err) { + done = -EFAULT ; + goto out_unlock; + } + *pos += page_len; + len -= page_len; + done += page_len; + buf += page_len; + lm_file->size += page_len; + } +out_unlock: +mutex_unlock (&lm_file->lock); +return done; +} + +static const struct file_operations +pds_vfio_restore_fops = { + .owner =THIS_MODULE , + .write = pds_vfio_restore_write, + .release = pds_vfio_release_file, + .llseek = no_llseek, +}; + +static int +pds_vfio_get_restore_file (struct pds_vfio_pci_device *pds_vfio) +{ +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_vfio_lm_file *lm_file; +int err =0 ; +u64 size; + + size =sizeof (union pds_lm_dev_state ); + +dev_dbg (&pdev->dev,"restore status, size = %lld\n" , size); + +if (!size) { + err = -EIO ; +dev_err (&pdev->dev,"invalid state size" ); + goto err_get_lm_status; + } + + lm_file =pds_vfio_get_lm_file (PDS_VFIO_LM_FILENAME , + &pds_vfio_restore_fops, +O_WRONLY , size); +if (!lm_file) { + err = -ENOENT ; +dev_err (&pdev->dev,"failed to create restore file" ); + goto err_get_lm_file; + } + pds_vfio->restore_file = lm_file; + +return 0 ; + +err_get_lm_file: +err_get_lm_status: +return err; +} + +struct file * +pds_vfio_step_device_state_locked (struct pds_vfio_pci_device *pds_vfio, +enum vfio_device_mig_state next) +{ +enum vfio_device_mig_state cur = pds_vfio->state; +struct device *dev = &pds_vfio->pdev->dev; +int err =0 ; + +dev_dbg (dev,"%s => %s\n" , +pds_vfio_lm_state (cur),pds_vfio_lm_state (next)); + +if (cur ==VFIO_DEVICE_STATE_STOP && next ==VFIO_DEVICE_STATE_STOP_COPY ) { +/* Device is already stopped +* create save device data file & get device state from firmware +*/ + err =pds_vfio_get_save_file (pds_vfio); +if (err) +return ERR_PTR (err); + +/* Get device state */ + err =pds_vfio_get_lm_state_cmd (pds_vfio); +if (err) { +pds_vfio_put_save_file (pds_vfio); +return ERR_PTR (err); + } + +return pds_vfio->save_file->filep; + } + +if (cur ==VFIO_DEVICE_STATE_STOP_COPY && next ==VFIO_DEVICE_STATE_STOP ) { +/* Device is already stopped +* delete the save device state file +*/ +pds_vfio_put_save_file (pds_vfio); +pds_vfio_send_host_vf_lm_status_cmd (pds_vfio, +PDS_LM_STA_NONE ); +return NULL ; + } + +if (cur ==VFIO_DEVICE_STATE_STOP && next ==VFIO_DEVICE_STATE_RESUMING ) { +/* create resume device data file */ + err =pds_vfio_get_restore_file (pds_vfio); +if (err) +return ERR_PTR (err); + +return pds_vfio->restore_file->filep; + } + +if (cur ==VFIO_DEVICE_STATE_RESUMING && next ==VFIO_DEVICE_STATE_STOP ) { +/* Set device state */ + err =pds_vfio_set_lm_state_cmd (pds_vfio); +if (err) +return ERR_PTR (err); + +/* delete resume device data file */ +pds_vfio_put_restore_file (pds_vfio); +return NULL ; + } + +if (cur ==VFIO_DEVICE_STATE_RUNNING && next ==VFIO_DEVICE_STATE_RUNNING_P2P ) { +pds_vfio_send_host_vf_lm_status_cmd (pds_vfio,PDS_LM_STA_IN_PROGRESS ); +/* Device should be stopped +* no interrupts, dma or change in internal state +*/ + err =pds_vfio_suspend_device_cmd (pds_vfio); +if (err) +return ERR_PTR (err); + +return NULL ; + } + +if (cur ==VFIO_DEVICE_STATE_RUNNING_P2P && next ==VFIO_DEVICE_STATE_RUNNING ) { +/* Device should be functional +* interrupts, dma, mmio or changes to internal state is allowed +*/ + err =pds_vfio_resume_device_cmd (pds_vfio); +if (err) +return ERR_PTR (err); + +pds_vfio_send_host_vf_lm_status_cmd (pds_vfio, +PDS_LM_STA_NONE ); +return NULL ; + } + +if (cur ==VFIO_DEVICE_STATE_STOP && next ==VFIO_DEVICE_STATE_RUNNING_P2P ) +return NULL ; + +if (cur ==VFIO_DEVICE_STATE_RUNNING_P2P && next ==VFIO_DEVICE_STATE_STOP ) +return NULL ; + +return ERR_PTR (-EINVAL ); +}drivers/vfio/pci/pds/lm.h new file +43
-0@@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _LM_H_ +#define _LM_H_ + +#include <linux/fs.h> +#include <linux/mutex.h> +#include <linux/scatterlist.h> +#include <linux/types.h> +#include <linux/vfio.h> + +#include <linux/pds/pds_lm.h> + +struct pds_vfio_lm_file { +struct file *filep; +struct mutex lock;/* protect live migration data file */ +u64 size;/* Size with valid data */ +u64 alloc_size;/* Total allocated size. Always >= len */ +struct page **pages;/* Backing pages for file */ +unsigned long long npages; +struct sg_table sg_table;/* SG table for backing pages */ +struct pds_lm_sg_elem *sgl;/* DMA mapping */ +dma_addr_t sgl_addr; +u16 num_sge; +struct scatterlist *last_offset_sg;/* Iterator */ +unsigned int sg_last_entry; +unsigned long last_offset; +}; + +struct pds_vfio_pci_device ; + +struct file * +pds_vfio_step_device_state_locked (struct pds_vfio_pci_device *pds_vfio, +enum vfio_device_mig_state next); +const char * +pds_vfio_lm_state (enum vfio_device_mig_state state); +void +pds_vfio_put_save_file (struct pds_vfio_pci_device *pds_vfio); +void +pds_vfio_put_restore_file (struct pds_vfio_pci_device *pds_vfio); + +#endif /* _LM_H_ */ drivers/vfio/pci/pds/pci_drv.c +15
-0@@ -67,12 +67,27 @@ pds_vfio_pci_table[] = { };MODULE_DEVICE_TABLE (pci, pds_vfio_pci_table); +static void +pds_vfio_pci_aer_reset_done (struct pci_dev *pdev) +{ +struct pds_vfio_pci_device *pds_vfio =pds_vfio_pci_drvdata (pdev); + +pds_vfio_reset (pds_vfio); +} + +static const struct +pci_error_handlers pds_vfio_pci_err_handlers = { + .reset_done = pds_vfio_pci_aer_reset_done, + .error_detected = vfio_pci_core_aer_err_detected, +}; +static struct pci_driver pds_vfio_pci_driver = { .name =PDS_VFIO_DRV_NAME , .id_table = pds_vfio_pci_table, .probe = pds_vfio_pci_probe, .remove = pds_vfio_pci_remove, + .err_handler = &pds_vfio_pci_err_handlers, .driver_managed_dma = true, };drivers/vfio/pci/pds/vfio_dev.c +118
-1@@ -4,6 +4,7 @@#include <linux/vfio.h> #include <linux/vfio_pci_core.h> +#include "lm.h" #include "vfio_dev.h" #include "aux_drv.h" @@ -16,6 +17,97 @@ pds_vfio_pci_drvdata(struct pci_dev *pdev) vfio_coredev); } +static void +pds_vfio_state_mutex_unlock (struct pds_vfio_pci_device *pds_vfio) +{ +again: +spin_lock (&pds_vfio->reset_lock); +if (pds_vfio->deferred_reset) { + pds_vfio->deferred_reset = false; +if (pds_vfio->state ==VFIO_DEVICE_STATE_ERROR ) { + pds_vfio->state =VFIO_DEVICE_STATE_RUNNING ; +pds_vfio_put_restore_file (pds_vfio); +pds_vfio_put_save_file (pds_vfio); + } +spin_unlock (&pds_vfio->reset_lock); + goto again; + } +mutex_unlock (&pds_vfio->state_mutex); +spin_unlock (&pds_vfio->reset_lock); +} + +void +pds_vfio_reset (struct pds_vfio_pci_device *pds_vfio) +{ +spin_lock (&pds_vfio->reset_lock); + pds_vfio->deferred_reset = true; +if (!mutex_trylock (&pds_vfio->state_mutex)) { +spin_unlock (&pds_vfio->reset_lock); +return ; + } +spin_unlock (&pds_vfio->reset_lock); +pds_vfio_state_mutex_unlock (pds_vfio); +} + +static struct file * +pds_vfio_set_device_state (struct vfio_device *vdev, +enum vfio_device_mig_state new_state) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); +struct file *res =NULL ; + +if (!pds_vfio->vfio_aux) +return ERR_PTR (-ENODEV ); + +mutex_lock (&pds_vfio->state_mutex); +while (new_state != pds_vfio->state) { +enum vfio_device_mig_state next_state; + +int err =vfio_mig_get_next_state (vdev, pds_vfio->state, + new_state, &next_state); +if (err) { + res =ERR_PTR (err); +break ; + } + + res =pds_vfio_step_device_state_locked (pds_vfio, next_state); +if (IS_ERR (res)) +break ; + + pds_vfio->state = next_state; + +if (WARN_ON (res && new_state != pds_vfio->state)) { + res =ERR_PTR (-EINVAL ); +break ; + } + } +pds_vfio_state_mutex_unlock (pds_vfio); + +return res; +} + +static int +pds_vfio_get_device_state (struct vfio_device *vdev, +enum vfio_device_mig_state *current_state) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); + +mutex_lock (&pds_vfio->state_mutex); + *current_state = pds_vfio->state; +pds_vfio_state_mutex_unlock (pds_vfio); +return 0 ; +} + +static const struct vfio_migration_ops +pds_vfio_lm_ops = { + .migration_set_state = pds_vfio_set_device_state, + .migration_get_state = pds_vfio_get_device_state +}; +static int pds_vfio_init_device (struct vfio_device *vdev) {@@ -35,10 +127,19 @@ pds_vfio_init_device(struct vfio_device *vdev) vfio_aux =pds_vfio_aux_get_drvdata (pds_vfio->pci_id);if (vfio_aux) { vfio_aux->pds_vfio = pds_vfio; + pds_vfio->coredev = vfio_aux->padev->aux_dev.dev.parent; pds_vfio->vfio_aux = vfio_aux;pds_vfio_put_aux_dev (vfio_aux); } + vdev->migration_flags =VFIO_MIGRATION_STOP_COPY |VFIO_MIGRATION_P2P ; + vdev->mig_ops = &pds_vfio_lm_ops; + +dev_dbg (&pdev->dev,"%s: PF %#04x VF %#04x (%d) vf_id %d domain %d vfio_aux %p pds_vfio %p\n" , + __func__,pci_dev_id (pdev->physfn), + pds_vfio->pci_id, pds_vfio->pci_id, pds_vfio->vf_id, +pci_domain_nr (pdev->bus), pds_vfio->vfio_aux, pds_vfio); +return 0 ; }@@ -54,18 +155,34 @@ pds_vfio_open_device(struct vfio_device *vdev)if (err)return err; +mutex_init (&pds_vfio->state_mutex); +dev_dbg (&pds_vfio->pdev->dev,"%s: %s => VFIO_DEVICE_STATE_RUNNING\n" , + __func__,pds_vfio_lm_state (pds_vfio->state)); + pds_vfio->state =VFIO_DEVICE_STATE_RUNNING ; +vfio_pci_core_finish_enable (&pds_vfio->vfio_coredev);return 0 ; } +static void +pds_vfio_close_device (struct vfio_device *vdev) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); + +mutex_destroy (&pds_vfio->state_mutex); +vfio_pci_core_close_device (vdev); +} +static const struct vfio_device_ops pds_vfio_ops = { .name ="pds-vfio" , .init = pds_vfio_init_device, .release = vfio_pci_core_release_dev, .open_device = pds_vfio_open_device, - .close_device = vfio_pci_core_close_device, + .close_device = pds_vfio_close_device, .ioctl = vfio_pci_core_ioctl, .device_feature = vfio_pci_core_ioctl_feature, .read = vfio_pci_core_read,drivers/vfio/pci/pds/vfio_dev.h +12
-0@@ -7,10 +7,20 @@#include <linux/pci.h> #include <linux/vfio_pci_core.h> +#include "lm.h" +struct pds_vfio_pci_device {struct vfio_pci_core_device vfio_coredev;struct pci_dev *pdev;struct pds_vfio_aux *vfio_aux; +struct device *coredev; + +struct pds_vfio_lm_file *save_file; +struct pds_vfio_lm_file *restore_file; +struct mutex state_mutex;/* protect migration state */ +enum vfio_device_mig_state state; +spinlock_t reset_lock;/* protect reset_done flow */ +u8 deferred_reset;int vf_id;int pci_id;@@ -20,5 +30,7 @@ const struct vfio_device_ops *pds_vfio_ops_info (void);struct pds_vfio_pci_device *pds_vfio_pci_drvdata (struct pci_dev *pdev); +void +pds_vfio_reset (struct pds_vfio_pci_device *pds_vfio);#endif /* _VFIO_DEV_H_ */ include/linux/pds/pds_lm.h +206
-0@@ -8,5 +8,211 @@#define PDS_DEV_TYPE_LM_STR "LM"#define PDS_LM_DEV_NAME PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_LM_STR +#define PDS_LM_DEVICE_STATE_LENGTH 65536 +#define PDS_LM_CHECK_DEVICE_STATE_LENGTH (X ) \ + PDS_CORE_SIZE_CHECK(union, PDS_LM_DEVICE_STATE_LENGTH, X) + +/* +* enum pds_lm_cmd_opcode - Live Migration Device commands +*/ +enum pds_lm_cmd_opcode { +PDS_LM_CMD_HOST_VF_STATUS =1 , + +/* Device state commands */ +PDS_LM_CMD_STATUS =16 , +PDS_LM_CMD_SUSPEND =18 , +PDS_LM_CMD_SUSPEND_STATUS =19 , +PDS_LM_CMD_RESUME =20 , +PDS_LM_CMD_SAVE =21 , +PDS_LM_CMD_RESTORE =22 , +}; + +/** +* struct pds_lm_cmd - generic command +* @opcode: Opcode +* @rsvd: Word boundary padding +* @vf_id: VF id +* @rsvd2: Structure padding to 60 Bytes +*/ +struct pds_lm_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +u8 rsvd2[56 ]; +}; + +/** +* struct pds_lm_comp - generic command completion +* @status: Status of the command (enum pds_core_status_code) +* @rsvd: Structure padding to 16 Bytes +*/ +struct pds_lm_comp { +u8 status; +u8 rsvd[15 ]; +}; + +/** +* struct pds_lm_status_cmd - STATUS command +* @opcode: Opcode +* @rsvd: Word boundary padding +* @vf_id: VF id +*/ +struct pds_lm_status_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +}; + +/** +* struct pds_lm_status_comp - STATUS command completion +* @status: Status of the command (enum pds_core_status_code) +* @rsvd: Word boundary padding +* @comp_index: Index in the desc ring for which this is the completion +* @size: Size of the device state +* @rsvd2: Word boundary padding +* @color: Color bit +*/ +struct pds_lm_status_comp { +u8 status; +u8 rsvd; +__le16 comp_index; +union { +__le64 size; +u8 rsvd2[11 ]; + } __packed; +u8 color; +}; + +/** +* struct pds_lm_suspend_cmd - SUSPEND command +* @opcode: Opcode PDS_LM_CMD_SUSPEND +* @rsvd: Word boundary padding +* @vf_id: VF id +*/ +struct pds_lm_suspend_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +}; + +/** +* struct pds_lm_suspend_comp - SUSPEND command completion +* @status: Status of the command (enum pds_core_status_code) +* @rsvd: Word boundary padding +* @comp_index: Index in the desc ring for which this is the completion +* @state_size: Size of the device state computed post suspend. +* @rsvd2: Word boundary padding +* @color: Color bit +*/ +struct pds_lm_suspend_comp { +u8 status; +u8 rsvd; +__le16 comp_index; +union { +__le64 state_size; +u8 rsvd2[11 ]; + } __packed; +u8 color; +}; + +/** +* struct pds_lm_suspend_status_cmd - SUSPEND status command +* @opcode: Opcode PDS_AQ_CMD_LM_SUSPEND_STATUS +* @rsvd: Word boundary padding +* @vf_id: VF id +*/ +struct pds_lm_suspend_status_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +}; + +/** +* struct pds_lm_resume_cmd - RESUME command +* @opcode: Opcode PDS_LM_CMD_RESUME +* @rsvd: Word boundary padding +* @vf_id: VF id +*/ +struct pds_lm_resume_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +}; + +/** +* struct pds_lm_sg_elem - Transmit scatter-gather (SG) descriptor element +* @addr: DMA address of SG element data buffer +* @len: Length of SG element data buffer, in bytes +* @rsvd: Word boundary padding +*/ +struct pds_lm_sg_elem { +__le64 addr; +__le32 len; +__le16 rsvd[2 ]; +}; + +/** +* struct pds_lm_save_cmd - SAVE command +* @opcode: Opcode PDS_LM_CMD_SAVE +* @rsvd: Word boundary padding +* @vf_id: VF id +* @rsvd2: Word boundary padding +* @sgl_addr: IOVA address of the SGL to dma the device state +* @num_sge: Total number of SG elements +*/ +struct pds_lm_save_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +u8 rsvd2[4 ]; +__le64 sgl_addr; +__le32 num_sge; +} __packed; + +/** +* struct pds_lm_restore_cmd - RESTORE command +* @opcode: Opcode PDS_LM_CMD_RESTORE +* @rsvd: Word boundary padding +* @vf_id: VF id +* @rsvd2: Word boundary padding +* @sgl_addr: IOVA address of the SGL to dma the device state +* @num_sge: Total number of SG elements +*/ +struct pds_lm_restore_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +u8 rsvd2[4 ]; +__le64 sgl_addr; +__le32 num_sge; +} __packed; + +/** +* union pds_lm_dev_state - device state information +* @words: Device state words +*/ +union pds_lm_dev_state { +__le32 words[PDS_LM_DEVICE_STATE_LENGTH /sizeof (__le32)]; +}; + +enum pds_lm_host_vf_status { +PDS_LM_STA_NONE =0 , +PDS_LM_STA_IN_PROGRESS , +PDS_LM_STA_MAX , +}; + +/** +* struct pds_lm_host_vf_status_cmd - HOST_VF_STATUS command +* @opcode: Opcode PDS_LM_CMD_HOST_VF_STATUS +* @rsvd: Word boundary padding +* @vf_id: VF id +* @status: Current LM status of host VF driver (enum pds_lm_host_status) +*/ +struct pds_lm_host_vf_status_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +u8 status; +};#endif /* _PDS_LM_H_ */
Re: [RFC PATCH v2 vfio 3/7] vfio/pds: Add VFIO live migration support
Quoted 18 lines · liulongfang
Quoted 17 lines · Brett Creeley
Add live migration support via the VFIO subsystem. The migration implementation aligns with the definition from
uapi/vfio.hand uses the auxiliary bus connection between pds_core/pds_vfio to communicate with the device.The ability to suspend, resume, and transfer VF device state data is included along with the required admin queue command structures and implementations.
PDS_LM_CMD_SUSPENDandPDS_LM_CMD_SUSPEND_STATUSare added to support the VF device suspend operation.
PDS_LM_CMD_RESUMEis added to support the VF device resume operation.
PDS_LM_CMD_STATUSis added to determine the exact size of the VF device state data.
Quoted 7 lines
Quoted 2 lines
PDS_LM_CMD_SAVEis added to get the VF device state data.Hi, this PDS is an NVME storage disk. When it supports live migration, the amount of data stored on the disk is so large.
How do you realize the migration of a large amount of data in the disk in a short period of time?
In our case we are not providing the actual storage, but a fabric initiator to a separate remote target that the migration target can also access.
sln
Quoted 1,405 lines
Thanks,
Longfang.Quoted 1,401 lines
PDS_LM_CMD_RESTOREis added to restore the VF device with the previously saved data fromPDS_LM_CMD_SAVE.
PDS_LM_CMD_HOST_VF_STATUSis added to notify the device when a migration is in/not-in progress from the host's perspective.Signed-off-by Brett Creeley <[email protected]>Signed-off-by Shannon Nelson <[email protected]>--- drivers/vfio/pci/pds/Makefile | 1 + drivers/vfio/pci/pds/aux_drv.c | 1 + drivers/vfio/pci/pds/cmds.c | 312 ++++++++++++++++++++ drivers/vfio/pci/pds/cmds.h | 15 + drivers/vfio/pci/pds/lm.c | 491 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/lm.h | 43 +++ drivers/vfio/pci/pds/pci_drv.c | 15 + drivers/vfio/pci/pds/vfio_dev.c | 119 +++++++- drivers/vfio/pci/pds/vfio_dev.h | 12 + include/linux/pds/pds_lm.h | 206 ++++++++++++++ 10 files changed, 1214 insertions(+), 1 deletion(-)create mode 100644
drivers/vfio/pci/pds/lm.c
create mode 100644drivers/vfio/pci/pds/lm.hdrivers/vfio/pci/pds/Makefile +1
-0@@ -4,5 +4,6 @@ obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o pds_vfio-y := \ aux_drv.o \ cmds.o \ + lm.o \ pci_drv.o \ vfio_dev.odrivers/vfio/pci/pds/aux_drv.c +1
-0@@ -77,6 +77,7 @@ pds_vfio_aux_probe(struct auxiliary_device *aux_dev,dev_dbg (dev,"%s: id %#04x busnr %#x devfn %#x bus %p pds_vfio %p\n" , __func__, padev->id, busnr, devfn, bus, vfio_aux->pds_vfio); + vfio_aux->pds_vfio->coredev = aux_dev->dev.parent; vfio_aux->pds_vfio->vfio_aux = vfio_aux; vfio_aux->padrv.event_handler = pds_vfio_aux_notify_handler;drivers/vfio/pci/pds/cmds.c +312
-0@@ -3,9 +3,11 @@#include <linux/io.h> #include <linux/types.h> +#include <linux/delay.h> #include <linux/pds/pds_core_if.h> #include <linux/pds/pds_adminq.h> +#include <linux/pds/pds_lm.h> #include <linux/pds/pds_auxbus.h> #include "vfio_dev.h" @@ -28,3 +30,313 @@ pds_vfio_unregister_client_cmd(struct pds_vfio_pci_device *pds_vfio) padev->ops->unregister_client (padev); } + +#define SUSPEND_TIMEOUT_S 5 +#define SUSPEND_CHECK_INTERVAL_MS 1 + +static int +pds_vfio_suspend_wait_device_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_suspend_status_cmd cmd = { + .opcode =PDS_LM_CMD_SUSPEND_STATUS , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_lm_comp comp = {0 }; +struct pds_auxiliary_dev *padev; +unsigned long time_limit; +unsigned long time_start; +unsigned long time_done; +int err; + + padev = pds_vfio->vfio_aux->padev; + + time_start = jiffies; + time_limit = time_start +HZ *SUSPEND_TIMEOUT_S ; +do { + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +PDS_AQ_FLAG_FASTPOLL ); +if (err != -EAGAIN ) +break ; + +msleep (SUSPEND_CHECK_INTERVAL_MS ); + }while (time_before (jiffies, time_limit)); + + time_done = jiffies; +dev_dbg (&pdev->dev,"%s: vf%u: Suspend comp received in %d msecs\n" , + __func__, pds_vfio->vf_id, +jiffies_to_msecs (time_done - time_start)); + +/* Check the results */ +if (time_after_eq (time_done, time_limit)) { +dev_err (&pdev->dev,"%s: vf%u: Suspend comp timeout\n" , __func__, + pds_vfio->vf_id); + err = -ETIMEDOUT ; + } + +return err; +} + +int +pds_vfio_suspend_device_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_suspend_cmd cmd = { + .opcode =PDS_LM_CMD_SUSPEND , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pds_lm_suspend_comp comp = {0 }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_auxiliary_dev *padev; +int err; + +dev_dbg (&pdev->dev,"vf%u: Suspend device\n" , pds_vfio->vf_id); + + padev = pds_vfio->vfio_aux->padev; + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +PDS_AQ_FLAG_FASTPOLL ); +if (err) { +dev_err (&pdev->dev,"vf%u: Suspend failed: %pe\n" , + pds_vfio->vf_id,ERR_PTR (err)); +return err; + } + +return pds_vfio_suspend_wait_device_cmd (pds_vfio); +} + +int +pds_vfio_resume_device_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_resume_cmd cmd = { + .opcode =PDS_LM_CMD_RESUME , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pds_auxiliary_dev *padev; +struct pds_lm_comp comp = {0 }; + +dev_dbg (&pds_vfio->pdev->dev,"vf%u: Resume device\n" , pds_vfio->vf_id); + + padev = pds_vfio->vfio_aux->padev; +return padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +} + +int +pds_vfio_get_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio,u64 *size) +{ +struct pds_lm_status_cmd cmd = { + .opcode =PDS_LM_CMD_STATUS , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pds_lm_status_comp comp = {0 }; +struct pds_auxiliary_dev *padev; +int err =0 ; + +dev_dbg (&pds_vfio->pdev->dev,"vf%u: Get migration status\n" , + pds_vfio->vf_id); + + padev = pds_vfio->vfio_aux->padev; + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +if (err) +return err; + + *size =le64_to_cpu (comp.size); +return 0 ; +} + +static int +pds_vfio_dma_map_lm_file (struct device *dev,enum dma_data_direction dir, +struct pds_vfio_lm_file *lm_file) +{ +struct pds_lm_sg_elem *sgl, *sge; +struct scatterlist *sg; +int err =0 ; +int i; + +if (!lm_file) +return -EINVAL ; + +/* dma map file pages */ + err =dma_map_sgtable (dev, &lm_file->sg_table, dir,0 ); +if (err) + goto err_dma_map_sg; + + lm_file->num_sge = lm_file->sg_table.nents; + +/* alloc sgl */ + sgl =dma_alloc_coherent (dev, lm_file->num_sge * +sizeof (struct pds_lm_sg_elem ), + &lm_file->sgl_addr,GFP_KERNEL ); +if (!sgl) { + err = -ENOMEM ; + goto err_alloc_sgl; + } + + lm_file->sgl = sgl; + +/* fill sgl */ + sge = sgl; +for_each_sgtable_dma_sg (&lm_file->sg_table, sg, i) { + sge->addr =cpu_to_le64 (sg_dma_address (sg)); + sge->len =cpu_to_le32 (sg_dma_len (sg)); +dev_dbg (dev,"addr = %llx, len = %u\n" , sge->addr, sge->len); + sge++; + } + +return 0 ; + +err_alloc_sgl: +dma_unmap_sgtable (dev, &lm_file->sg_table, dir,0 ); +err_dma_map_sg: +return err; +} + +static void +pds_vfio_dma_unmap_lm_file (struct device *dev,enum dma_data_direction dir, +struct pds_vfio_lm_file *lm_file) +{ +if (!lm_file) +return ; + +/* free sgl */ +if (lm_file->sgl) { +dma_free_coherent (dev, lm_file->num_sge * +sizeof (struct pds_lm_sg_elem ), + lm_file->sgl, lm_file->sgl_addr); + lm_file->sgl =NULL ; + lm_file->sgl_addr =DMA_MAPPING_ERROR ; + lm_file->num_sge =0 ; + } + +/* dma unmap file pages */ +dma_unmap_sgtable (dev, &lm_file->sg_table, dir,0 ); +} + +int +pds_vfio_get_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_save_cmd cmd = { + .opcode =PDS_LM_CMD_SAVE , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_vfio_lm_file *lm_file; +struct pds_auxiliary_dev *padev; +struct pds_lm_comp comp = {0 }; +int err; + +dev_dbg (&pdev->dev,"vf%u: Get migration state\n" , pds_vfio->vf_id); + + lm_file = pds_vfio->save_file; + + padev = pds_vfio->vfio_aux->padev; + err =pds_vfio_dma_map_lm_file (pds_vfio->coredev,DMA_FROM_DEVICE , lm_file); +if (err) { +dev_err (&pdev->dev,"failed to map save migration file: %pe\n" , +ERR_PTR (err)); +return err; + } + + cmd.sgl_addr =cpu_to_le64 (lm_file->sgl_addr); + cmd.num_sge =cpu_to_le32 (lm_file->num_sge); + + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +if (err) +dev_err (&pdev->dev,"failed to get migration state: %pe\n" , +ERR_PTR (err)); + +pds_vfio_dma_unmap_lm_file (pds_vfio->coredev,DMA_FROM_DEVICE , lm_file); + +return err; +} + +int +pds_vfio_set_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio) +{ +struct pds_lm_restore_cmd cmd = { + .opcode =PDS_LM_CMD_RESTORE , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_vfio_lm_file *lm_file; +struct pds_auxiliary_dev *padev; +struct pds_lm_comp comp = {0 }; +int err; + +dev_dbg (&pdev->dev,"vf%u: Set migration state\n" , pds_vfio->vf_id); + + lm_file = pds_vfio->restore_file; + + padev = pds_vfio->vfio_aux->padev; + err =pds_vfio_dma_map_lm_file (pds_vfio->coredev,DMA_TO_DEVICE , lm_file); +if (err) { +dev_err (&pdev->dev,"failed to map restore migration file: %pe\n" , +ERR_PTR (err)); +return err; + } + + cmd.sgl_addr =cpu_to_le64 (lm_file->sgl_addr); + cmd.num_sge =cpu_to_le32 (lm_file->num_sge); + + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +if (err) +dev_err (&pdev->dev,"failed to set migration state: %pe\n" , +ERR_PTR (err)); + +pds_vfio_dma_unmap_lm_file (pds_vfio->coredev,DMA_TO_DEVICE , lm_file); + +return err; +} + +void +pds_vfio_send_host_vf_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio, +enum pds_lm_host_vf_status vf_status) +{ +struct pds_auxiliary_dev *padev = pds_vfio->vfio_aux->padev; +struct pds_lm_host_vf_status_cmd cmd = { + .opcode =PDS_LM_CMD_HOST_VF_STATUS , + .vf_id =cpu_to_le16 (pds_vfio->vf_id), + .status = vf_status, + }; +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_lm_comp comp = {0 }; +int err; + +dev_dbg (&pdev->dev,"vf%u: Set host VF LM status: %u" , + pds_vfio->vf_id, cmd.status); +if (vf_status !=PDS_LM_STA_IN_PROGRESS && + vf_status !=PDS_LM_STA_NONE ) { +dev_warn (&pdev->dev,"Invalid host VF migration status, %d\n" , + vf_status); +return ; + } + + err = padev->ops->adminq_cmd (padev, + (union pds_core_adminq_cmd *)&cmd, +sizeof (cmd), + (union pds_core_adminq_comp *)&comp, +0 ); +if (err) +dev_warn (&pdev->dev,"failed to send host VF migration status: %pe\n" , +ERR_PTR (err)); +}drivers/vfio/pci/pds/cmds.h +15
-0@@ -4,11 +4,26 @@#ifndef _CMDS_H_#define _CMDS_H_ +#include <linux/pds/pds_lm.h> +struct pds_vfio_pci_device ;int pds_vfio_register_client_cmd (struct pds_vfio_pci_device *pds_vfio);void pds_vfio_unregister_client_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_suspend_device_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_resume_device_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_get_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio,u64 *size); +int +pds_vfio_get_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_set_lm_state_cmd (struct pds_vfio_pci_device *pds_vfio); +void +pds_vfio_send_host_vf_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio, +enum pds_lm_host_vf_status vf_status);#endif /* _CMDS_H_ */ drivers/vfio/pci/pds/lm.c new file +491
-0@@ -0,0 +1,491 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#include <linux/anon_inodes.h> +#include <linux/file.h> +#include <linux/fs.h> +#include <linux/highmem.h> +#include <linux/vfio.h> +#include <linux/vfio_pci_core.h> + +#include "cmds.h" +#include "vfio_dev.h" + +#define PDS_VFIO_LM_FILENAME "pds_vfio_lm" + +const char * +pds_vfio_lm_state (enum vfio_device_mig_state state) +{ +switch (state) { +case VFIO_DEVICE_STATE_ERROR : +return "VFIO_DEVICE_STATE_ERROR" ; +case VFIO_DEVICE_STATE_STOP : +return "VFIO_DEVICE_STATE_STOP" ; +case VFIO_DEVICE_STATE_RUNNING : +return "VFIO_DEVICE_STATE_RUNNING" ; +case VFIO_DEVICE_STATE_STOP_COPY : +return "VFIO_DEVICE_STATE_STOP_COPY" ; +case VFIO_DEVICE_STATE_RESUMING : +return "VFIO_DEVICE_STATE_RESUMING" ; +case VFIO_DEVICE_STATE_RUNNING_P2P : +return "VFIO_DEVICE_STATE_RUNNING_P2P" ; +default : +return "VFIO_DEVICE_STATE_INVALID" ; + } + +return "VFIO_DEVICE_STATE_INVALID" ; +} + +static struct pds_vfio_lm_file * +pds_vfio_get_lm_file (const char *name,const struct file_operations *fops, +int flags,u64 size) +{ +struct pds_vfio_lm_file *lm_file =NULL ; +unsigned long long npages; +unsigned long long i; +struct page **pages; +int err =0 ; + +if (!size) +return NULL ; + +/* Alloc file structure */ + lm_file =kzalloc (sizeof (*lm_file),GFP_KERNEL ); +if (!lm_file) +return NULL ; + +/* Create file */ + lm_file->filep =anon_inode_getfile (name, fops, lm_file, flags); +if (!lm_file->filep) + goto err_get_file; + +stream_open (lm_file->filep->f_inode, lm_file->filep); +mutex_init (&lm_file->lock); + + lm_file->size = size; + +/* Allocate memory for file pages */ + npages =DIV_ROUND_UP_ULL (lm_file->size,PAGE_SIZE ); + + pages =kcalloc (npages,sizeof (*pages),GFP_KERNEL ); +if (!pages) + goto err_alloc_pages; + +for (i =0 ; i < npages; i++) { + pages[i] =alloc_page (GFP_KERNEL ); +if (!pages[i]) + goto err_alloc_page; + } + + lm_file->pages = pages; + lm_file->npages = npages; + lm_file->alloc_size = npages *PAGE_SIZE ; + +/* Create scatterlist of file pages to use for DMA mapping later */ + err =sg_alloc_table_from_pages (&lm_file->sg_table, pages, npages, +0 , size,GFP_KERNEL ); +if (err) + goto err_alloc_sg_table; + +return lm_file; + +err_alloc_sg_table: +err_alloc_page: +/* free allocated pages */ +for (i =0 ; i < npages && pages[i]; i++) +__free_page (pages[i]); +kfree (pages); +err_alloc_pages: +fput (lm_file->filep); +mutex_destroy (&lm_file->lock); +err_get_file: +kfree (lm_file); + +return NULL ; +} + +static void +pds_vfio_put_lm_file (struct pds_vfio_lm_file *lm_file) +{ +unsigned long long i; + +mutex_lock (&lm_file->lock); + + lm_file->size =0 ; + lm_file->alloc_size =0 ; + +/* Free scatter list of file pages*/ +sg_free_table (&lm_file->sg_table); + +/* Free allocated file pages */ +for (i =0 ; i < lm_file->npages && lm_file->pages[i]; i++) +__free_page (lm_file->pages[i]); +kfree (lm_file->pages); + lm_file->pages =NULL ; + +/* Delete file */ +fput (lm_file->filep); + lm_file->filep =NULL ; + +mutex_unlock (&lm_file->lock); + +mutex_destroy (&lm_file->lock); + +/* Free file structure */ +kfree (lm_file); +} + +void +pds_vfio_put_save_file (struct pds_vfio_pci_device *pds_vfio) +{ +if (!pds_vfio->save_file) +return ; + +pds_vfio_put_lm_file (pds_vfio->save_file); + pds_vfio->save_file =NULL ; +} + +void +pds_vfio_put_restore_file (struct pds_vfio_pci_device *pds_vfio) +{ +if (!pds_vfio->restore_file) +return ; + +pds_vfio_put_lm_file (pds_vfio->restore_file); + pds_vfio->restore_file =NULL ; +} + +static struct page * +pds_vfio_get_file_page (struct pds_vfio_lm_file *lm_file, +unsigned long offset) +{ +unsigned long cur_offset =0 ; +struct scatterlist *sg; +unsigned int i; + +/* All accesses are sequential */ +if (offset < lm_file->last_offset || !lm_file->last_offset_sg) { + lm_file->last_offset =0 ; + lm_file->last_offset_sg = lm_file->sg_table.sgl; + lm_file->sg_last_entry =0 ; + } + + cur_offset = lm_file->last_offset; + +for_each_sg (lm_file->last_offset_sg, sg, + lm_file->sg_table.orig_nents - lm_file->sg_last_entry, + i) { +if (offset < sg->length + cur_offset) { + lm_file->last_offset_sg = sg; + lm_file->sg_last_entry += i; + lm_file->last_offset = cur_offset; +return nth_page (sg_page (sg), + (offset - cur_offset) /PAGE_SIZE ); + } + cur_offset += sg->length; + } + +return NULL ; +} + +static int +pds_vfio_release_file (struct inode *inode,struct file *filp) +{ +struct pds_vfio_lm_file *lm_file = filp->private_data; + + lm_file->size =0 ; + +return 0 ; +} + +static ssize_t +pds_vfio_save_read (struct file *filp,char __user *buf,size_t len,loff_t *pos) +{ +struct pds_vfio_lm_file *lm_file = filp->private_data; +ssize_t done =0 ; + +if (pos) +return -ESPIPE ; + pos = &filp->f_pos; + +mutex_lock (&lm_file->lock); +if (*pos > lm_file->size) { + done = -EINVAL ; + goto out_unlock; + } + + len =min_t (size_t, lm_file->size - *pos, len); +while (len) { +size_t page_offset; +struct page *page; +size_t page_len; +u8 *from_buff; +int err; + + page_offset = (*pos) %PAGE_SIZE ; + page =pds_vfio_get_file_page (lm_file, *pos - page_offset); +if (!page) { +if (done ==0 ) + done = -EINVAL ; + goto out_unlock; + } + + page_len =min_t (size_t, len,PAGE_SIZE - page_offset); + from_buff =kmap_local_page (page); + err =copy_to_user (buf, from_buff + page_offset, page_len); +kunmap_local (from_buff); +if (err) { + done = -EFAULT ; + goto out_unlock; + } + *pos += page_len; + len -= page_len; + done += page_len; + buf += page_len; + } + +out_unlock: +mutex_unlock (&lm_file->lock); +return done; +} + +static const struct file_operations +pds_vfio_save_fops = { + .owner =THIS_MODULE , + .read = pds_vfio_save_read, + .release = pds_vfio_release_file, + .llseek = no_llseek, +}; + +static int +pds_vfio_get_save_file (struct pds_vfio_pci_device *pds_vfio) +{ +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_vfio_lm_file *lm_file; +int err =0 ; +u64 size; + +/* Get live migration state size in this state */ + err =pds_vfio_get_lm_status_cmd (pds_vfio, &size); +if (err) { +dev_err (&pdev->dev,"failed to get save status: %pe\n" , +ERR_PTR (err)); + goto err_get_lm_status; + } + +dev_dbg (&pdev->dev,"save status, size = %lld\n" , size); + +if (!size) { + err = -EIO ; +dev_err (&pdev->dev,"invalid state size\n" ); + goto err_get_lm_status; + } + + lm_file =pds_vfio_get_lm_file (PDS_VFIO_LM_FILENAME , + &pds_vfio_save_fops, +O_RDONLY , size); +if (!lm_file) { + err = -ENOENT ; +dev_err (&pdev->dev,"failed to create save file\n" ); + goto err_get_lm_file; + } + +dev_dbg (&pdev->dev,"size = %lld, alloc_size = %lld, npages = %lld\n" , + lm_file->size, lm_file->alloc_size, lm_file->npages); + + pds_vfio->save_file = lm_file; + +return 0 ; + +err_get_lm_file: +err_get_lm_status: +return err; +} + +static ssize_t +pds_vfio_restore_write (struct file *filp,const char __user *buf,size_t len,loff_t *pos) +{ +struct pds_vfio_lm_file *lm_file = filp->private_data; +loff_t requested_length; +ssize_t done =0 ; + +if (pos) +return -ESPIPE ; + + pos = &filp->f_pos; + +if (*pos <0 || +check_add_overflow ((loff_t )len, *pos, &requested_length)) +return -EINVAL ; + +mutex_lock (&lm_file->lock); + +while (len) { +size_t page_offset; +struct page *page; +size_t page_len; +u8 *to_buff; +int err; + + page_offset = (*pos) %PAGE_SIZE ; + page =pds_vfio_get_file_page (lm_file, *pos - page_offset); +if (!page) { +if (done ==0 ) + done = -EINVAL ; + goto out_unlock; + } + + page_len =min_t (size_t, len,PAGE_SIZE - page_offset); + to_buff =kmap_local_page (page); + err =copy_from_user (to_buff + page_offset, buf, page_len); +kunmap_local (to_buff); +if (err) { + done = -EFAULT ; + goto out_unlock; + } + *pos += page_len; + len -= page_len; + done += page_len; + buf += page_len; + lm_file->size += page_len; + } +out_unlock: +mutex_unlock (&lm_file->lock); +return done; +} + +static const struct file_operations +pds_vfio_restore_fops = { + .owner =THIS_MODULE , + .write = pds_vfio_restore_write, + .release = pds_vfio_release_file, + .llseek = no_llseek, +}; + +static int +pds_vfio_get_restore_file (struct pds_vfio_pci_device *pds_vfio) +{ +struct pci_dev *pdev = pds_vfio->pdev; +struct pds_vfio_lm_file *lm_file; +int err =0 ; +u64 size; + + size =sizeof (union pds_lm_dev_state ); + +dev_dbg (&pdev->dev,"restore status, size = %lld\n" , size); + +if (!size) { + err = -EIO ; +dev_err (&pdev->dev,"invalid state size" ); + goto err_get_lm_status; + } + + lm_file =pds_vfio_get_lm_file (PDS_VFIO_LM_FILENAME , + &pds_vfio_restore_fops, +O_WRONLY , size); +if (!lm_file) { + err = -ENOENT ; +dev_err (&pdev->dev,"failed to create restore file" ); + goto err_get_lm_file; + } + pds_vfio->restore_file = lm_file; + +return 0 ; + +err_get_lm_file: +err_get_lm_status: +return err; +} + +struct file * +pds_vfio_step_device_state_locked (struct pds_vfio_pci_device *pds_vfio, +enum vfio_device_mig_state next) +{ +enum vfio_device_mig_state cur = pds_vfio->state; +struct device *dev = &pds_vfio->pdev->dev; +int err =0 ; + +dev_dbg (dev,"%s => %s\n" , +pds_vfio_lm_state (cur),pds_vfio_lm_state (next)); + +if (cur ==VFIO_DEVICE_STATE_STOP && next ==VFIO_DEVICE_STATE_STOP_COPY ) { +/* Device is already stopped +* create save device data file & get device state from firmware +*/ + err =pds_vfio_get_save_file (pds_vfio); +if (err) +return ERR_PTR (err); + +/* Get device state */ + err =pds_vfio_get_lm_state_cmd (pds_vfio); +if (err) { +pds_vfio_put_save_file (pds_vfio); +return ERR_PTR (err); + } + +return pds_vfio->save_file->filep; + } + +if (cur ==VFIO_DEVICE_STATE_STOP_COPY && next ==VFIO_DEVICE_STATE_STOP ) { +/* Device is already stopped +* delete the save device state file +*/ +pds_vfio_put_save_file (pds_vfio); +pds_vfio_send_host_vf_lm_status_cmd (pds_vfio, +PDS_LM_STA_NONE ); +return NULL ; + } + +if (cur ==VFIO_DEVICE_STATE_STOP && next ==VFIO_DEVICE_STATE_RESUMING ) { +/* create resume device data file */ + err =pds_vfio_get_restore_file (pds_vfio); +if (err) +return ERR_PTR (err); + +return pds_vfio->restore_file->filep; + } + +if (cur ==VFIO_DEVICE_STATE_RESUMING && next ==VFIO_DEVICE_STATE_STOP ) { +/* Set device state */ + err =pds_vfio_set_lm_state_cmd (pds_vfio); +if (err) +return ERR_PTR (err); + +/* delete resume device data file */ +pds_vfio_put_restore_file (pds_vfio); +return NULL ; + } + +if (cur ==VFIO_DEVICE_STATE_RUNNING && next ==VFIO_DEVICE_STATE_RUNNING_P2P ) { +pds_vfio_send_host_vf_lm_status_cmd (pds_vfio,PDS_LM_STA_IN_PROGRESS ); +/* Device should be stopped +* no interrupts, dma or change in internal state +*/ + err =pds_vfio_suspend_device_cmd (pds_vfio); +if (err) +return ERR_PTR (err); + +return NULL ; + } + +if (cur ==VFIO_DEVICE_STATE_RUNNING_P2P && next ==VFIO_DEVICE_STATE_RUNNING ) { +/* Device should be functional +* interrupts, dma, mmio or changes to internal state is allowed +*/ + err =pds_vfio_resume_device_cmd (pds_vfio); +if (err) +return ERR_PTR (err); + +pds_vfio_send_host_vf_lm_status_cmd (pds_vfio, +PDS_LM_STA_NONE ); +return NULL ; + } + +if (cur ==VFIO_DEVICE_STATE_STOP && next ==VFIO_DEVICE_STATE_RUNNING_P2P ) +return NULL ; + +if (cur ==VFIO_DEVICE_STATE_RUNNING_P2P && next ==VFIO_DEVICE_STATE_STOP ) +return NULL ; + +return ERR_PTR (-EINVAL ); +}drivers/vfio/pci/pds/lm.h new file +43
-0@@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _LM_H_ +#define _LM_H_ + +#include <linux/fs.h> +#include <linux/mutex.h> +#include <linux/scatterlist.h> +#include <linux/types.h> +#include <linux/vfio.h> + +#include <linux/pds/pds_lm.h> + +struct pds_vfio_lm_file { +struct file *filep; +struct mutex lock;/* protect live migration data file */ +u64 size;/* Size with valid data */ +u64 alloc_size;/* Total allocated size. Always >= len */ +struct page **pages;/* Backing pages for file */ +unsigned long long npages; +struct sg_table sg_table;/* SG table for backing pages */ +struct pds_lm_sg_elem *sgl;/* DMA mapping */ +dma_addr_t sgl_addr; +u16 num_sge; +struct scatterlist *last_offset_sg;/* Iterator */ +unsigned int sg_last_entry; +unsigned long last_offset; +}; + +struct pds_vfio_pci_device ; + +struct file * +pds_vfio_step_device_state_locked (struct pds_vfio_pci_device *pds_vfio, +enum vfio_device_mig_state next); +const char * +pds_vfio_lm_state (enum vfio_device_mig_state state); +void +pds_vfio_put_save_file (struct pds_vfio_pci_device *pds_vfio); +void +pds_vfio_put_restore_file (struct pds_vfio_pci_device *pds_vfio); + +#endif /* _LM_H_ */ drivers/vfio/pci/pds/pci_drv.c +15
-0@@ -67,12 +67,27 @@ pds_vfio_pci_table[] = { };MODULE_DEVICE_TABLE (pci, pds_vfio_pci_table); +static void +pds_vfio_pci_aer_reset_done (struct pci_dev *pdev) +{ +struct pds_vfio_pci_device *pds_vfio =pds_vfio_pci_drvdata (pdev); + +pds_vfio_reset (pds_vfio); +} + +static const struct +pci_error_handlers pds_vfio_pci_err_handlers = { + .reset_done = pds_vfio_pci_aer_reset_done, + .error_detected = vfio_pci_core_aer_err_detected, +}; +static struct pci_driver pds_vfio_pci_driver = { .name =PDS_VFIO_DRV_NAME , .id_table = pds_vfio_pci_table, .probe = pds_vfio_pci_probe, .remove = pds_vfio_pci_remove, + .err_handler = &pds_vfio_pci_err_handlers, .driver_managed_dma = true, };drivers/vfio/pci/pds/vfio_dev.c +118
-1@@ -4,6 +4,7 @@#include <linux/vfio.h> #include <linux/vfio_pci_core.h> +#include "lm.h" #include "vfio_dev.h" #include "aux_drv.h" @@ -16,6 +17,97 @@ pds_vfio_pci_drvdata(struct pci_dev *pdev) vfio_coredev); } +static void +pds_vfio_state_mutex_unlock (struct pds_vfio_pci_device *pds_vfio) +{ +again: +spin_lock (&pds_vfio->reset_lock); +if (pds_vfio->deferred_reset) { + pds_vfio->deferred_reset = false; +if (pds_vfio->state ==VFIO_DEVICE_STATE_ERROR ) { + pds_vfio->state =VFIO_DEVICE_STATE_RUNNING ; +pds_vfio_put_restore_file (pds_vfio); +pds_vfio_put_save_file (pds_vfio); + } +spin_unlock (&pds_vfio->reset_lock); + goto again; + } +mutex_unlock (&pds_vfio->state_mutex); +spin_unlock (&pds_vfio->reset_lock); +} + +void +pds_vfio_reset (struct pds_vfio_pci_device *pds_vfio) +{ +spin_lock (&pds_vfio->reset_lock); + pds_vfio->deferred_reset = true; +if (!mutex_trylock (&pds_vfio->state_mutex)) { +spin_unlock (&pds_vfio->reset_lock); +return ; + } +spin_unlock (&pds_vfio->reset_lock); +pds_vfio_state_mutex_unlock (pds_vfio); +} + +static struct file * +pds_vfio_set_device_state (struct vfio_device *vdev, +enum vfio_device_mig_state new_state) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); +struct file *res =NULL ; + +if (!pds_vfio->vfio_aux) +return ERR_PTR (-ENODEV ); + +mutex_lock (&pds_vfio->state_mutex); +while (new_state != pds_vfio->state) { +enum vfio_device_mig_state next_state; + +int err =vfio_mig_get_next_state (vdev, pds_vfio->state, + new_state, &next_state); +if (err) { + res =ERR_PTR (err); +break ; + } + + res =pds_vfio_step_device_state_locked (pds_vfio, next_state); +if (IS_ERR (res)) +break ; + + pds_vfio->state = next_state; + +if (WARN_ON (res && new_state != pds_vfio->state)) { + res =ERR_PTR (-EINVAL ); +break ; + } + } +pds_vfio_state_mutex_unlock (pds_vfio); + +return res; +} + +static int +pds_vfio_get_device_state (struct vfio_device *vdev, +enum vfio_device_mig_state *current_state) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); + +mutex_lock (&pds_vfio->state_mutex); + *current_state = pds_vfio->state; +pds_vfio_state_mutex_unlock (pds_vfio); +return 0 ; +} + +static const struct vfio_migration_ops +pds_vfio_lm_ops = { + .migration_set_state = pds_vfio_set_device_state, + .migration_get_state = pds_vfio_get_device_state +}; +static int pds_vfio_init_device (struct vfio_device *vdev) {@@ -35,10 +127,19 @@ pds_vfio_init_device(struct vfio_device *vdev) vfio_aux =pds_vfio_aux_get_drvdata (pds_vfio->pci_id);if (vfio_aux) { vfio_aux->pds_vfio = pds_vfio; + pds_vfio->coredev = vfio_aux->padev->aux_dev.dev.parent; pds_vfio->vfio_aux = vfio_aux;pds_vfio_put_aux_dev (vfio_aux); } + vdev->migration_flags =VFIO_MIGRATION_STOP_COPY |VFIO_MIGRATION_P2P ; + vdev->mig_ops = &pds_vfio_lm_ops; + +dev_dbg (&pdev->dev,"%s: PF %#04x VF %#04x (%d) vf_id %d domain %d vfio_aux %p pds_vfio %p\n" , + __func__,pci_dev_id (pdev->physfn), + pds_vfio->pci_id, pds_vfio->pci_id, pds_vfio->vf_id, +pci_domain_nr (pdev->bus), pds_vfio->vfio_aux, pds_vfio); +return 0 ; }@@ -54,18 +155,34 @@ pds_vfio_open_device(struct vfio_device *vdev)if (err)return err; +mutex_init (&pds_vfio->state_mutex); +dev_dbg (&pds_vfio->pdev->dev,"%s: %s => VFIO_DEVICE_STATE_RUNNING\n" , + __func__,pds_vfio_lm_state (pds_vfio->state)); + pds_vfio->state =VFIO_DEVICE_STATE_RUNNING ; +vfio_pci_core_finish_enable (&pds_vfio->vfio_coredev);return 0 ; } +static void +pds_vfio_close_device (struct vfio_device *vdev) +{ +struct pds_vfio_pci_device *pds_vfio = + container_of(vdev, struct pds_vfio_pci_device, + vfio_coredev.vdev); + +mutex_destroy (&pds_vfio->state_mutex); +vfio_pci_core_close_device (vdev); +} +static const struct vfio_device_ops pds_vfio_ops = { .name ="pds-vfio" , .init = pds_vfio_init_device, .release = vfio_pci_core_release_dev, .open_device = pds_vfio_open_device, - .close_device = vfio_pci_core_close_device, + .close_device = pds_vfio_close_device, .ioctl = vfio_pci_core_ioctl, .device_feature = vfio_pci_core_ioctl_feature, .read = vfio_pci_core_read,drivers/vfio/pci/pds/vfio_dev.h +12
-0@@ -7,10 +7,20 @@#include <linux/pci.h> #include <linux/vfio_pci_core.h> +#include "lm.h" +struct pds_vfio_pci_device {struct vfio_pci_core_device vfio_coredev;struct pci_dev *pdev;struct pds_vfio_aux *vfio_aux; +struct device *coredev; + +struct pds_vfio_lm_file *save_file; +struct pds_vfio_lm_file *restore_file; +struct mutex state_mutex;/* protect migration state */ +enum vfio_device_mig_state state; +spinlock_t reset_lock;/* protect reset_done flow */ +u8 deferred_reset;int vf_id;int pci_id;@@ -20,5 +30,7 @@ const struct vfio_device_ops *pds_vfio_ops_info (void);struct pds_vfio_pci_device *pds_vfio_pci_drvdata (struct pci_dev *pdev); +void +pds_vfio_reset (struct pds_vfio_pci_device *pds_vfio);#endif /* _VFIO_DEV_H_ */ include/linux/pds/pds_lm.h +206
-0@@ -8,5 +8,211 @@#define PDS_DEV_TYPE_LM_STR "LM"#define PDS_LM_DEV_NAME PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_LM_STR +#define PDS_LM_DEVICE_STATE_LENGTH 65536 +#define PDS_LM_CHECK_DEVICE_STATE_LENGTH (X ) \ + PDS_CORE_SIZE_CHECK(union, PDS_LM_DEVICE_STATE_LENGTH, X) + +/* +* enum pds_lm_cmd_opcode - Live Migration Device commands +*/ +enum pds_lm_cmd_opcode { +PDS_LM_CMD_HOST_VF_STATUS =1 , + +/* Device state commands */ +PDS_LM_CMD_STATUS =16 , +PDS_LM_CMD_SUSPEND =18 , +PDS_LM_CMD_SUSPEND_STATUS =19 , +PDS_LM_CMD_RESUME =20 , +PDS_LM_CMD_SAVE =21 , +PDS_LM_CMD_RESTORE =22 , +}; + +/** +* struct pds_lm_cmd - generic command +* @opcode: Opcode +* @rsvd: Word boundary padding +* @vf_id: VF id +* @rsvd2: Structure padding to 60 Bytes +*/ +struct pds_lm_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +u8 rsvd2[56 ]; +}; + +/** +* struct pds_lm_comp - generic command completion +* @status: Status of the command (enum pds_core_status_code) +* @rsvd: Structure padding to 16 Bytes +*/ +struct pds_lm_comp { +u8 status; +u8 rsvd[15 ]; +}; + +/** +* struct pds_lm_status_cmd - STATUS command +* @opcode: Opcode +* @rsvd: Word boundary padding +* @vf_id: VF id +*/ +struct pds_lm_status_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +}; + +/** +* struct pds_lm_status_comp - STATUS command completion +* @status: Status of the command (enum pds_core_status_code) +* @rsvd: Word boundary padding +* @comp_index: Index in the desc ring for which this is the completion +* @size: Size of the device state +* @rsvd2: Word boundary padding +* @color: Color bit +*/ +struct pds_lm_status_comp { +u8 status; +u8 rsvd; +__le16 comp_index; +union { +__le64 size; +u8 rsvd2[11 ]; + } __packed; +u8 color; +}; + +/** +* struct pds_lm_suspend_cmd - SUSPEND command +* @opcode: Opcode PDS_LM_CMD_SUSPEND +* @rsvd: Word boundary padding +* @vf_id: VF id +*/ +struct pds_lm_suspend_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +}; + +/** +* struct pds_lm_suspend_comp - SUSPEND command completion +* @status: Status of the command (enum pds_core_status_code) +* @rsvd: Word boundary padding +* @comp_index: Index in the desc ring for which this is the completion +* @state_size: Size of the device state computed post suspend. +* @rsvd2: Word boundary padding +* @color: Color bit +*/ +struct pds_lm_suspend_comp { +u8 status; +u8 rsvd; +__le16 comp_index; +union { +__le64 state_size; +u8 rsvd2[11 ]; + } __packed; +u8 color; +}; + +/** +* struct pds_lm_suspend_status_cmd - SUSPEND status command +* @opcode: Opcode PDS_AQ_CMD_LM_SUSPEND_STATUS +* @rsvd: Word boundary padding +* @vf_id: VF id +*/ +struct pds_lm_suspend_status_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +}; + +/** +* struct pds_lm_resume_cmd - RESUME command +* @opcode: Opcode PDS_LM_CMD_RESUME +* @rsvd: Word boundary padding +* @vf_id: VF id +*/ +struct pds_lm_resume_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +}; + +/** +* struct pds_lm_sg_elem - Transmit scatter-gather (SG) descriptor element +* @addr: DMA address of SG element data buffer +* @len: Length of SG element data buffer, in bytes +* @rsvd: Word boundary padding +*/ +struct pds_lm_sg_elem { +__le64 addr; +__le32 len; +__le16 rsvd[2 ]; +}; + +/** +* struct pds_lm_save_cmd - SAVE command +* @opcode: Opcode PDS_LM_CMD_SAVE +* @rsvd: Word boundary padding +* @vf_id: VF id +* @rsvd2: Word boundary padding +* @sgl_addr: IOVA address of the SGL to dma the device state +* @num_sge: Total number of SG elements +*/ +struct pds_lm_save_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +u8 rsvd2[4 ]; +__le64 sgl_addr; +__le32 num_sge; +} __packed; + +/** +* struct pds_lm_restore_cmd - RESTORE command +* @opcode: Opcode PDS_LM_CMD_RESTORE +* @rsvd: Word boundary padding +* @vf_id: VF id +* @rsvd2: Word boundary padding +* @sgl_addr: IOVA address of the SGL to dma the device state +* @num_sge: Total number of SG elements +*/ +struct pds_lm_restore_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +u8 rsvd2[4 ]; +__le64 sgl_addr; +__le32 num_sge; +} __packed; + +/** +* union pds_lm_dev_state - device state information +* @words: Device state words +*/ +union pds_lm_dev_state { +__le32 words[PDS_LM_DEVICE_STATE_LENGTH /sizeof (__le32)]; +}; + +enum pds_lm_host_vf_status { +PDS_LM_STA_NONE =0 , +PDS_LM_STA_IN_PROGRESS , +PDS_LM_STA_MAX , +}; + +/** +* struct pds_lm_host_vf_status_cmd - HOST_VF_STATUS command +* @opcode: Opcode PDS_LM_CMD_HOST_VF_STATUS +* @rsvd: Word boundary padding +* @vf_id: VF id +* @status: Current LM status of host VF driver (enum pds_lm_host_status) +*/ +struct pds_lm_host_vf_status_cmd { +u8 opcode; +u8 rsvd; +__le16 vf_id; +u8 status; +};#endif /* _PDS_LM_H_ */
Brett Creeley
maintainerRFC PATCH v2 4/7 vfio: Commonize combine_ranges for use in other VFIO drivers
In reply to Brett CreeleyCurrently only Mellanox uses the combine_ranges function. The new pds_vfio driver also needs this function. So, move it to a common location for other vendor drivers to use.
--- drivers/vfio/pci/mlx5/cmd.c | 48 +------------------------------------ drivers/vfio/vfio_main.c | 48 +++++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 3 +++ 3 files changed, 52 insertions(+), 47 deletions(-)
drivers/vfio/pci/mlx5/cmd.c +1 -47
@@ -425,52 +425,6 @@ int mlx5vf_cmd_load_vhca_state(struct mlx5vf_pci_core_device *mvdev,return err; } -static void combine_ranges (struct rb_root_cached *root,u32 cur_nodes, -u32 req_nodes) -{ -struct interval_tree_node *prev, *curr, *comb_start, *comb_end; -unsigned long min_gap; -unsigned long curr_gap; - -/* Special shortcut when a single range is required */ -if (req_nodes ==1 ) { -unsigned long last; - - curr = comb_start =interval_tree_iter_first (root,0 ,ULONG_MAX ); -while (curr) { - last = curr->last; - prev = curr; - curr =interval_tree_iter_next (curr,0 ,ULONG_MAX ); -if (prev != comb_start) -interval_tree_remove (prev, root); - } - comb_start->last = last; -return ; - } - -/* Combine ranges which have the smallest gap */ -while (cur_nodes > req_nodes) { - prev =NULL ; - min_gap =ULONG_MAX ; - curr =interval_tree_iter_first (root,0 ,ULONG_MAX ); -while (curr) { -if (prev) { - curr_gap = curr->start - prev->last; -if (curr_gap < min_gap) { - min_gap = curr_gap; - comb_start = prev; - comb_end = curr; - } - } - prev = curr; - curr =interval_tree_iter_next (curr,0 ,ULONG_MAX ); - } - comb_start->last = comb_end->last; -interval_tree_remove (comb_end, root); - cur_nodes--; - } -} -static int mlx5vf_create_tracker (struct mlx5_core_dev *mdev,struct mlx5vf_pci_core_device *mvdev,struct rb_root_cached *ranges,u32 nnodes)
@@ -493,7 +447,7 @@ static int mlx5vf_create_tracker(struct mlx5_core_dev *mdev,int i;if (num_ranges > max_num_range) { -combine_ranges (ranges, nnodes, max_num_range); +vfio_combine_iova_ranges (ranges, nnodes, max_num_range); num_ranges = max_num_range; }
drivers/vfio/vfio_main.c +48 -0
54 lines not on this page · raw message
include/linux/vfio.h +3 -0
@@ -196,6 +196,9 @@ int vfio_mig_get_next_state(struct vfio_device *device,enum vfio_device_mig_state new_fsm, enum vfio_device_mig_state *next_fsm); +void vfio_combine_iova_ranges (struct rb_root_cached *root,u32 cur_nodes, +u32 req_nodes); +/* * External user API */
Signature · 1 line
2.17.1
Brett Creeley
maintainerRFC PATCH v2 5/7 vfio/pds: Add support for dirty page tracking
In reply to Brett CreeleyIn order to support dirty page tracking, the driver has to implement the VFIO subsystem's vfio_log_ops. This includes log_start, log_stop, and log_read_and_clear.
All of the tracker resources are allocated and dirty tracking on the device is started during log_start. The resources are cleaned up and dirty tracking on the device is stopped during log_stop. The dirty pages are determined and reported during log_read_and_clear.
In order to support these callbacks admin queue commands are used. All of the adminq queue command structures and implementations are included as part of this patch.
PDS_LM_CMD_DIRTY_STATUS is added to query the current status of dirty tracking on the device. This includes if it's enabled (i.e. number of regions being tracked from the device's perspective) and the maximum number of regions supported from the device's perspective.
PDS_LM_CMD_DIRTY_ENABLE is added to enable dirty tracking on the specified number of regions and their iova ranges.
PDS_LM_CMD_DIRTY_DISABLE is added to disable dirty tracking for all regions on the device.
PDS_LM_CMD_READ_SEQ and PDS_LM_CMD_DIRTY_WRITE_ACK are added to support reading and acknowledging the currently dirtied pages.
--- drivers/vfio/pci/pds/Makefile | 1 + drivers/vfio/pci/pds/cmds.c | 143 +++++++++ drivers/vfio/pci/pds/cmds.h | 15 + drivers/vfio/pci/pds/dirty.c | 541 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/dirty.h | 48 +++ drivers/vfio/pci/pds/lm.h | 10 + drivers/vfio/pci/pds/vfio_dev.c | 9 + drivers/vfio/pci/pds/vfio_dev.h | 2 + include/linux/pds/pds_lm.h | 173 ++++++++++ 9 files changed, 942 insertions(+) create mode 100644 drivers/vfio/pci/pds/dirty.c create mode 100644 drivers/vfio/pci/pds/dirty.h
drivers/vfio/pci/pds/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o pds_vfio-y := \ aux_drv.o \ cmds.o \ + dirty.o \ lm.o \ pci_drv.o \ vfio_dev.o
drivers/vfio/pci/pds/cmds.c +143 -0
146 lines not on this page · raw message
drivers/vfio/pci/pds/cmds.h +15 -0
@@ -4,6 +4,8 @@#ifndef _CMDS_H_#define _CMDS_H_ +#include <linux/types.h> +#include <linux/pds/pds_lm.h> struct pds_vfio_pci_device ;
@@ -25,5 +27,18 @@ pds_vfio_set_lm_state_cmd(struct pds_vfio_pci_device *pds_vfio);void pds_vfio_send_host_vf_lm_status_cmd (struct pds_vfio_pci_device *pds_vfio,enum pds_lm_host_vf_status vf_status); +int +pds_vfio_dirty_status_cmd (struct pds_vfio_pci_device *pds_vfio, +u64 regions_dma,u8 *max_regions, +u8 *num_regions); +int +pds_vfio_dirty_enable_cmd (struct pds_vfio_pci_device *pds_vfio, +u64 regions_dma,u8 num_regions); +int +pds_vfio_dirty_disable_cmd (struct pds_vfio_pci_device *pds_vfio); +int +pds_vfio_dirty_seq_ack_cmd (struct pds_vfio_pci_device *pds_vfio, +u64 sgl_dma,u16 num_sge,u32 offset, +u32 total_len,bool read_seq);#endif /* _CMDS_H_ */
drivers/vfio/pci/pds/dirty.c new file +541 -0
541 lines not on this page · raw message
drivers/vfio/pci/pds/dirty.h new file +48 -0
48 lines not on this page · raw message
drivers/vfio/pci/pds/lm.h +10 -0
@@ -33,6 +33,16 @@ struct pds_vfio_pci_device;struct file *pds_vfio_step_device_state_locked (struct pds_vfio_pci_device *pds_vfio,enum vfio_device_mig_state next); +int +pds_vfio_dma_logging_report (struct vfio_device *vdev,unsigned long iova, +unsigned long length, +struct iova_bitmap *dirty); +int +pds_vfio_dma_logging_start (struct vfio_device *vdev, +struct rb_root_cached *ranges,u32 nnodes, +u64 *page_size); +int +pds_vfio_dma_logging_stop (struct vfio_device *vdev);const char *pds_vfio_lm_state (enum vfio_device_mig_state state);void
drivers/vfio/pci/pds/vfio_dev.c +9 -0
@@ -5,6 +5,7 @@#include <linux/vfio_pci_core.h> #include "lm.h" +#include "dirty.h" #include "vfio_dev.h" #include "aux_drv.h"
@@ -108,6 +109,13 @@ pds_vfio_lm_ops = { .migration_get_state = pds_vfio_get_device_state }; +static const struct vfio_log_ops +pds_vfio_log_ops = { + .log_start = pds_vfio_dma_logging_start, + .log_stop = pds_vfio_dma_logging_stop, + .log_read_and_clear = pds_vfio_dma_logging_report, +}; +static int pds_vfio_init_device (struct vfio_device *vdev) {
@@ -134,6 +142,7 @@ pds_vfio_init_device(struct vfio_device *vdev) vdev->migration_flags =VFIO_MIGRATION_STOP_COPY |VFIO_MIGRATION_P2P ; vdev->mig_ops = &pds_vfio_lm_ops; + vdev->log_ops = &pds_vfio_log_ops; dev_dbg(&pdev->dev, "%s: PF %#04x VF %#04x (%d) vf_id %d domain %d vfio_aux %p pds_vfio %p\n", __func__, pci_dev_id(pdev->physfn),
drivers/vfio/pci/pds/vfio_dev.h +2 -0
@@ -7,6 +7,7 @@#include <linux/pci.h> #include <linux/vfio_pci_core.h> +#include "dirty.h" #include "lm.h" struct pds_vfio_pci_device {
@@ -17,6 +18,7 @@ struct pds_vfio_pci_device {struct pds_vfio_lm_file *save_file;struct pds_vfio_lm_file *restore_file; +struct pds_vfio_dirty dirty;struct mutex state_mutex;/* protect migration state */ enum vfio_device_mig_state state;spinlock_t reset_lock;/* protect reset_done flow */
include/linux/pds/pds_lm.h +173 -0
183 lines not on this page · raw message
Signature · 1 line
2.17.1
Brett Creeley
maintainerRFC PATCH v2 6/7 vfio/pds: Add support for firmware recovery
In reply to Brett CreeleyIt's possible that the device firmware crashes and is able to recover due to some configuration and/or other issue. If a live migration is in progress while the firmware crashes, the live migration will fail. However, the VF PCI device should still be functional post crash recovery and subsequent migrations should go through as expected.
When the pds_core device notices that firmware crashes it sends an event to all its client drivers over auxiliary bus. When the pds_vfio driver receives this event while migration is in progress it will request a deferred reset on the next migration state transition. This state transition will report failure as well as any subsequent state transition requests from the VMM/VFIO. Based on uapi/vfio.h the only way out of VFIO_DEVICE_STATE_ERROR is by issuing VFIO_DEVICE_RESET. Once this reset is done, the migration state will be reset to VFIO_DEVICE_STATE_RUNNING and migration can be performed.
If the event is received while no migration is in progress (i.e. the VM is in normal operating mode), then no actions are taken and the migration state remains VFIO_DEVICE_STATE_RUNNING.
--- drivers/vfio/pci/pds/aux_drv.c | 61 +++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/aux_drv.h | 1 + drivers/vfio/pci/pds/vfio_dev.c | 34 ++++++++++++++++-- drivers/vfio/pci/pds/vfio_dev.h | 4 +++ 4 files changed, 98 insertions(+), 2 deletions(-)
drivers/vfio/pci/pds/aux_drv.c +61 -0
@@ -21,6 +21,46 @@ struct auxiliary_device_id pds_vfio_aux_id_table[] = { {}, }; +static void +pds_vfio_recovery_work (struct work_struct *work) +{ +struct pds_vfio_aux *vfio_aux = + container_of(work, struct pds_vfio_aux, work); +struct pds_vfio_pci_device *pds_vfio = vfio_aux->pds_vfio; +bool deferred_reset_needed = false; + +/* Documentation states that the kernel migration driver must not +* generate asynchronous device state transitions outside of +* manipulation by the user or the VFIO_DEVICE_RESET ioctl. +* +* Since recovery is an asynchronous event received from the device, +* initiate a deferred reset. Only issue the deferred reset if a +* migration is in progress, which will cause the next step of the +* migration to fail. Also, if the device is in a state that will +* be set to VFIO_DEVICE_STATE_RUNNING on the next action (i.e. VM is +* shutdown and device is in VFIO_DEVICE_STATE_STOP) as that will clear +* the VFIO_DEVICE_STATE_ERROR when the VM starts back up. +*/ +mutex_lock (&pds_vfio->state_mutex); +if ((pds_vfio->state !=VFIO_DEVICE_STATE_RUNNING && + pds_vfio->state !=VFIO_DEVICE_STATE_ERROR ) || + (pds_vfio->state ==VFIO_DEVICE_STATE_RUNNING && +pds_vfio_dirty_is_enabled (pds_vfio))) + deferred_reset_needed = true; +mutex_unlock (&pds_vfio->state_mutex); + +/* On the next user initiated state transition, the device will +* transition to the VFIO_DEVICE_STATE_ERROR. At this point it's the user's +* responsibility to reset the device. +* +* If a VFIO_DEVICE_RESET is requested post recovery and before the next +* state transition, then the deferred reset state will be set to +* VFIO_DEVICE_STATE_RUNNING. +*/ +if (deferred_reset_needed) +pds_vfio_deferred_reset (pds_vfio,VFIO_DEVICE_STATE_ERROR ); +} +static void pds_vfio_aux_notify_handler (struct pds_auxiliary_dev *padev,union pds_core_notifyq_comp *event)
@@ -29,6 +69,23 @@ pds_vfio_aux_notify_handler(struct pds_auxiliary_dev *padev,u16 ecode =le16_to_cpu (event->ecode);dev_dbg (dev,"%s: event code %d\n" , __func__, ecode); + +/* We don't need to do anything for RESET state==0 as there is no notify +* or feedback mechanism available, and it is possible that we won't +* even see a state==0 event. +* +* Any requests from VFIO while state==0 will fail, which will return +* error and may cause migration to fail. +*/ +if (ecode ==PDS_EVENT_RESET ) { +dev_info (dev,"%s: PDS_EVENT_RESET event received, state==%d\n" , + __func__, event->reset.state); +if (event->reset.state ==1 ) { +struct pds_vfio_aux *vfio_aux =auxiliary_get_drvdata (&padev->aux_dev); + +schedule_work (&vfio_aux->work); + } + } } static int
@@ -88,6 +145,8 @@ pds_vfio_aux_probe(struct auxiliary_device *aux_dev, goto err_out; } +INIT_WORK (&vfio_aux->work, pds_vfio_recovery_work); +return 0 ; err_out:
@@ -103,6 +162,8 @@ pds_vfio_aux_remove(struct auxiliary_device *aux_dev)struct pds_vfio_aux *vfio_aux =auxiliary_get_drvdata (aux_dev);struct pds_vfio_pci_device *pds_vfio = vfio_aux->pds_vfio; +cancel_work_sync (&vfio_aux->work); +if (pds_vfio) {pds_vfio_unregister_client_cmd (pds_vfio); vfio_aux->pds_vfio->vfio_aux =NULL ;
drivers/vfio/pci/pds/aux_drv.h +1 -0
@@ -17,6 +17,7 @@ struct pds_vfio_aux {struct pds_auxiliary_dev *padev;struct pds_auxiliary_drv padrv;struct pds_vfio_pci_device *pds_vfio; +struct work_struct work; }; struct auxiliary_driver *
drivers/vfio/pci/pds/vfio_dev.c +32 -2
@@ -26,10 +26,17 @@ pds_vfio_state_mutex_unlock(struct pds_vfio_pci_device *pds_vfio)if (pds_vfio->deferred_reset) { pds_vfio->deferred_reset = false;if (pds_vfio->state ==VFIO_DEVICE_STATE_ERROR ) { - pds_vfio->state =VFIO_DEVICE_STATE_RUNNING ; +dev_dbg (&pds_vfio->pdev->dev,"Transitioning from VFIO_DEVICE_STATE_ERROR to %s\n" , +pds_vfio_lm_state (pds_vfio->deferred_reset_state)); + pds_vfio->state = pds_vfio->deferred_reset_state;pds_vfio_put_restore_file (pds_vfio);pds_vfio_put_save_file (pds_vfio); + }else if (pds_vfio->deferred_reset_state ==VFIO_DEVICE_STATE_ERROR ) { +dev_dbg (&pds_vfio->pdev->dev,"Transitioning from %s to VFIO_DEVICE_STATE_ERROR based on deferred_reset request\n" , +pds_vfio_lm_state (pds_vfio->state)); + pds_vfio->state =VFIO_DEVICE_STATE_ERROR ; } + pds_vfio->deferred_reset_state =VFIO_DEVICE_STATE_RUNNING ;spin_unlock (&pds_vfio->reset_lock); goto again; }
@@ -42,6 +49,7 @@ pds_vfio_reset(struct pds_vfio_pci_device *pds_vfio) {spin_lock (&pds_vfio->reset_lock); pds_vfio->deferred_reset = true; + pds_vfio->deferred_reset_state =VFIO_DEVICE_STATE_RUNNING ;if (!mutex_trylock (&pds_vfio->state_mutex)) {spin_unlock (&pds_vfio->reset_lock);return ;
@@ -50,6 +58,18 @@ pds_vfio_reset(struct pds_vfio_pci_device *pds_vfio)pds_vfio_state_mutex_unlock (pds_vfio); } +void +pds_vfio_deferred_reset (struct pds_vfio_pci_device *pds_vfio, +enum vfio_device_mig_state reset_state) +{ +dev_info (&pds_vfio->pdev->dev,"Requesting deferred_reset to state %s\n" , +pds_vfio_lm_state (reset_state)); +spin_lock (&pds_vfio->reset_lock); + pds_vfio->deferred_reset = true; + pds_vfio->deferred_reset_state = reset_state; +spin_unlock (&pds_vfio->reset_lock); +} +static struct file *pds_vfio_set_device_state (struct vfio_device *vdev,enum vfio_device_mig_state new_state)
@@ -63,7 +83,13 @@ pds_vfio_set_device_state(struct vfio_device *vdev,return ERR_PTR (-ENODEV );mutex_lock (&pds_vfio->state_mutex); -while (new_state != pds_vfio->state) { +/* only way to transition out of VFIO_DEVICE_STATE_ERROR is via +* VFIO_DEVICE_RESET, so prevent the state machine from running since +* vfio_mig_get_next_state() will throw a WARN_ON() when transitioning +* from VFIO_DEVICE_STATE_ERROR to any other state +*/ +while (pds_vfio->state !=VFIO_DEVICE_STATE_ERROR && + new_state != pds_vfio->state) {enum vfio_device_mig_state next_state; int err = vfio_mig_get_next_state(vdev, pds_vfio->state,
@@ -85,6 +111,9 @@ pds_vfio_set_device_state(struct vfio_device *vdev, } }pds_vfio_state_mutex_unlock (pds_vfio); +/* still waiting on a deferred_reset */ +if (pds_vfio->state ==VFIO_DEVICE_STATE_ERROR ) + res =ERR_PTR (-EIO );return res; }
@@ -168,6 +197,7 @@ pds_vfio_open_device(struct vfio_device *vdev)dev_dbg (&pds_vfio->pdev->dev,"%s: %s => VFIO_DEVICE_STATE_RUNNING\n" , __func__,pds_vfio_lm_state (pds_vfio->state)); pds_vfio->state =VFIO_DEVICE_STATE_RUNNING ; + pds_vfio->deferred_reset_state =VFIO_DEVICE_STATE_RUNNING ;vfio_pci_core_finish_enable (&pds_vfio->vfio_coredev);
drivers/vfio/pci/pds/vfio_dev.h +4 -0
@@ -23,6 +23,7 @@ struct pds_vfio_pci_device {enum vfio_device_mig_state state;spinlock_t reset_lock;/* protect reset_done flow */ u8 deferred_reset; +enum vfio_device_mig_state deferred_reset_state;int vf_id;int pci_id;
@@ -34,5 +35,8 @@ struct pds_vfio_pci_device * pds_vfio_pci_drvdata(struct pci_dev *pdev);void pds_vfio_reset (struct pds_vfio_pci_device *pds_vfio); +void +pds_vfio_deferred_reset (struct pds_vfio_pci_device *pds_vfio, +enum vfio_device_mig_state reset_state);#endif /* _VFIO_DEV_H_ */
Signature · 1 line
2.17.1
Brett Creeley
maintainerRFC PATCH v2 7/7 vfio/pds: Add Kconfig and documentation
In reply to Brett CreeleyAdd Kconfig entries and pds_vfio.rst. Also, add an entry in the MAINTAINERS file for this new driver.
It's not clear where documentation for vendor specific VFIO drivers should live, so just re-use the current Pensando ethernet location.
--- .../device_drivers/ethernet/index.rst | 1 + .../ethernet/pensando/pds_vfio.rst | 88 +++++++++++++++++++ MAINTAINERS | 7 ++ drivers/vfio/pci/Kconfig | 2 + drivers/vfio/pci/pds/Kconfig | 17 ++++ 5 files changed, 115 insertions(+) create mode 100644 Documentation/networking/device_drivers/ethernet/pensando/pds_vfio.rst create mode 100644 drivers/vfio/pci/pds/Kconfig
Documentation/networking/device_drivers/ethernet/index.rst +1 -0
@@ -44,6 +44,7 @@ Contents: neterion/s2io netronome/nfp pensando/ionic + pensando/pds_vfio smsc/smc9 stmicro/stmmac ti/cpsw
Documentation/networking/device_drivers/ethernet/pensando/pds_vfio.rst new file +88 -0
88 lines not on this page · raw message
MAINTAINERS +7 -0
@@ -21623,6 +21623,13 @@ S: Maintained P: Documentation/driver-api/vfio-pci-device-specific-driver-acceptance.rst F: drivers/vfio/pci/*/ +VFIO PDS PCI DRIVER +M: Brett Creeley <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/networking/device_drivers/ethernet/pensando/pds_vfio.rst +F: drivers/vfio/pci/pds/ + VFIO PLATFORM DRIVER M: Eric Auger <[email protected]> L: [email protected]
drivers/vfio/pci/Kconfig +2 -0
@@ -59,4 +59,6 @@ source "drivers/vfio/pci/mlx5/Kconfig" source "drivers/vfio/pci/hisilicon/Kconfig" +source "drivers/vfio/pci/pds/Kconfig" + endif
drivers/vfio/pci/pds/Kconfig new file +17 -0
@@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0 +config PDS_VFIO_PCI + tristate "VFIO support for PDS PCI devices" + depends on PDS_CORE + depends on VFIO_PCI_CORE + help + This provides generic PCI support for PDS devices using the VFIO + framework. + + More specific information on this driver can be + found in + <file:Documentation/networking/device_drivers/ethernet/pensando/pds_vfio.rst>. + + To compile this driver as a module, choose M here. The module + will be called pds_vfio. + + If you don't know what to do here, say N.
Signature · 1 line
2.17.1
Quoted 3 lines · Brett Creeley
This is a first draft patchset for a new vendor specific VFIO driver for use with the AMD/Pensando Distributed Services Card (DSC). This driver (
pds_vfio) is a client of the newly introducedpds_coredriver.
Hi Brett,
just as said last time and completely ignored by you: any nvme live migration needs to be standardized in the NVMe technical working group before it can be merged in Linux.
Quoted 3 lines · Christoph Hellwig
just as said last time and completely ignored by you: any nvme live migration needs to be standardized in the NVMe technical working group before it can be merged in Linux.
Hey Christoph,
I'm not trying to ignore you and that's why this series is still marked RFC. I appreciate the feedback, regardless of the end result.
I am paying attention to the other thread on the KVM mailing list and do understand your stance on the topic.
Thanks,
Brett