Skip to content

virtio: s4 support

Amit Shah lkml netdev virtualization 5 versions – Applied

Status from this message: Applied,

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest11 patches 6 repliesApplied
  2. v511 patches 2 repliesSuperseded
  3. v412 patches 24 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v311 patches9 repliesSuperseded
v111 patches13 repliesSuperseded

Changes in v6 from the cover letter

- Based on top of block and net module remove race fix patches

Patches in v6 Applied

#Subject and filesSizeRepliesApplied
1/11virtio: pci: switch to new PM APIdrivers/virtio/virtio_pci.c+12 -40 replies
2/11virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroffdrivers/virtio/virtio_pci.c include/linux/virtio.h+97 -20 replies
3/11virtio: console: Move vq and vq buf removal into separate functionsdrivers/char/virtio_console.c+40 -280 replies
4/11virtio: console: Add freeze and restore handlers to support S4drivers/char/virtio_console.c+58 -00 replies
5/11virtio: blk: Move vq initialization to separate functiondrivers/block/virtio_blk.c+14 -50 replies
6/11virtio: blk: Add freeze, restore handlers to support S4drivers/block/virtio_blk.c+44 -00 replies
7/11virtio: net: Move vq initialization into separate functiondrivers/net/virtio_net.c+28 -190 replies
8/11virtio: net: Move vq and vq buf removal into separate functiondrivers/net/virtio_net.c+12 -80 replies
9/11virtio: net: Add freeze, restore handlers to support S4drivers/net/virtio_net.c+46 -05 replies
10/11virtio: balloon: Move vq initialization into separate functiondrivers/virtio/virtio_balloon.c+30 -180 replies
11/11virtio: balloon: Add freeze, restore handlers to support S4drivers/virtio/virtio_balloon.c+47 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v6 yet.

Read the v6 thread

Cover letter [PATCH v6 00/11] virtio: s4 support

Hi,

These patches add support for S4 to virtio (pci) and all drivers.

For each driver, all vqs are removed before hibernation, and then re-created after restore. Some driver-specific uninit and init work is also done in the freeze and restore functions.

All the drivers in testing work fine:

* virtio-blk is used for the only disk in the VM, IO works fine before and after. 'dd if=/dev/zero of=/tmp/bigfile bs=1024 count=200000' across S4 gives same sha1sum for the file in the guest as well as one that's created without invoking S4.

* virtio-console: port IO keeps working fine before and after.
* If a port is waiting for data from the host (blocking read(2) call), this works fine in both the cases: host-side connection is available or unavailable after resume. In case the host-side connection isn't available, the blocking call is terminated. If it is available, the call continues to remain in blocked state till further data arrives.

* virtio-net: ping remains active across S4.

* virtio-balloon: Works fine before and after. Forgets the ballooned value across S4 (see details in commit log). Maintains ballooned value on failed freeze.

All of these tests are run in parallel.

v6:
- Based on top of block and net module remove race fix patches

v5:
- Enable virtio device after the driver-specific restore/thaw callbacks are completed.
- Balloon: Don't exit kthread on freeze. It's already frozen by the PM API before invoking the freeze callback, so exiting is pointless.

v4:
- Disable / enable napi across S4 (Michael S. Tsirkin)
- Balloon: lots of improvements (I had neglected this driver thinking it was a simple one, but this one needed the most thought! Check the commit log for patch 12 for details.)
- Net, Blk: Reset device as the first operation on freeze

v3:
- Reset vqs before deleting them (Sasha Levin)
- Flush block queue before freeze (Rusty)
- Detach netdev before freeze (Michael S. Tsirkin)

v2:
- fix checkpatch errors/warnings

Amit Shah (11):
virtio: pci: switch to new PM API
virtio: pci: add PM notification handlers for restore, freeze, thaw,
poweroff
virtio: console: Move vq and vq buf removal into separate functions
virtio: console: Add freeze and restore handlers to support S4
virtio: blk: Move vq initialization to separate function
virtio: blk: Add freeze, restore handlers to support S4
virtio: net: Move vq initialization into separate function
virtio: net: Move vq and vq buf removal into separate function
virtio: net: Add freeze, restore handlers to support S4
virtio: balloon: Move vq initialization into separate function
virtio: balloon: Add freeze, restore handlers to support S4

 drivers/block/virtio_blk.c      |   63 ++++++++++++++++++--
 drivers/char/virtio_console.c   |  126 ++++++++++++++++++++++++++++++---------
 drivers/net/virtio_net.c        |  113 ++++++++++++++++++++++++++--------
 drivers/virtio/virtio_balloon.c |   95 ++++++++++++++++++++++++------
 drivers/virtio/virtio_pci.c     |  106 +++++++++++++++++++++++++++++++-
 include/linux/virtio.h          |    5 ++
 6 files changed, 426 insertions(+), 82 deletions(-)
Signature · 1 line
1.7.7.4