Skip to content

linux: towards virtio-1 guest support

Michael S. Tsirkin kvm linux-api linux-s390 linux-scsi lkml netdev virtualization 9 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest50 patches 15 repliesIn review
  2. v746 patches 57 repliesSuperseded
  3. v60 of 45 patches 0 repliesSuperseded
Earlier versions · 6
VersionPostedPatchesRepliesStatus
v545 patches4 repliesSuperseded
v4 posting 2/242 patches44 repliesSuperseded
v3 posting 2/241 patches14 repliesSuperseded
v4 RFC posting 1/217 patches4 repliesSuperseded
v3 RFC posting 1/216 patches11 repliesSuperseded
v2 RFC16 patches2 repliesSuperseded

Changes in v8 from the cover letter · 16 lines

all drivers have been converted now.
new patches:
virtio_console: virtio 1.0 support
virtio_balloon: add legacy_only flag
virtio: make VIRTIO_F_VERSION_1 a transport bit
virtio: drop VIRTIO_F_VERSION_1 from drivers
vhost: make features 64 bit
fix bug noted by Sergei Shtylyov, bugfix suggested by Ben Hutchings
virtio_net: disable mac write for virtio 1.0
moved earlier in the series
vhost/net: force len for TX to host endian
commit log reworded
vhost: virtio 1.0 endian-ness support
simplify error printing code sligthly
vhost/net: suppress compiler warning
smashed into code introducing the warning, added a comment

Patches in v8 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/50virtio: add low-level APIs for feature bitsinclude/linux/virtio_config.h+50 -30 replies
1/50virtio: add low-level APIs for feature bitsinclude/linux/virtio_config.h+50 -30 replies
2/50virtio: use u32, not bitmap for featuresdrivers/char/virtio_console.c drivers/lguest/lguest_device.c drivers/misc/mic/card/mic_virtio.c +13 more+42 -740 replies
3/50mic_virtio: robust feature array size calculationdrivers/misc/mic/card/mic_virtio.c+1 -21 reply
4/50virtio: add support for 64 bit features.drivers/lguest/lguest_device.c drivers/misc/mic/card/mic_virtio.c drivers/remoteproc/remoteproc_virtio.c +8 more+23 -230 replies
5/50virtio: assert 32 bit features in transportsdrivers/lguest/lguest_device.c drivers/misc/mic/card/mic_virtio.c drivers/remoteproc/remoteproc_virtio.c +4 more+21 -00 replies
5/50virtio: assert 32 bit features in transportsdrivers/lguest/lguest_device.c drivers/misc/mic/card/mic_virtio.c drivers/remoteproc/remoteproc_virtio.c +4 more+21 -00 replies
6/50virtio_ccw: add support for 64 bit features.drivers/s390/kvm/virtio_ccw.c+23 -71 reply
7/50virtio: add virtio 1.0 feature bitinclude/uapi/linux/virtio_config.h+3 -00 replies
8/50virtio: memory access APIsinclude/linux/virtio_byteorder.h include/linux/virtio_config.h include/uapi/linux/Kbuild +2 more+161 -221 reply
9/50virtio_ring: switch to new memory access APIsdrivers/virtio/virtio_ring.c+45 -440 replies
10/50virtio_config: endian conversion for v1.0include/linux/virtio_config.h+6 -30 replies
11/50virtio: allow transports to get avail/used addressesdrivers/virtio/virtio_ring.c include/linux/virtio.h+19 -00 replies
11/50virtio: allow transports to get avail/used addressesdrivers/virtio/virtio_ring.c include/linux/virtio.h+19 -00 replies
12/50virtio: set FEATURES_OKdrivers/virtio/virtio.c include/uapi/linux/virtio_config.h+24 -70 replies
13/50virtio: simplify feature bit handlingdrivers/virtio/virtio.c+6 -40 replies
14/50virtio: add legacy feature table supportdrivers/virtio/virtio.c include/linux/virtio.h+28 -10 replies
14/50virtio: add legacy feature table supportdrivers/virtio/virtio.c include/linux/virtio.h+28 -10 replies
15/50virtio_net: v1.0 endiannessdrivers/net/virtio_net.c include/uapi/linux/virtio_net.h+28 -200 replies
16/50virtio_blk: v1.0 supportdrivers/block/virtio_blk.c include/uapi/linux/virtio_blk.h+49 -360 replies
16/50virtio_blk: v1.0 supportdrivers/block/virtio_blk.c include/uapi/linux/virtio_blk.h+49 -360 replies
17/50KVM: s390: Set virtio-ccw transport revisiondrivers/s390/kvm/virtio_ccw.c+63 -02 replies
18/50KVM: s390: virtio-ccw revision 1 SET_VQdrivers/s390/kvm/virtio_ccw.c+42 -120 replies
19/50KVM: s390 allow virtio_ccw status writes to faildrivers/s390/kvm/virtio_ccw.c+6 -10 replies
20/50KVM: s390: enable virtio-ccw revision 1drivers/s390/kvm/virtio_ccw.c+1 -10 replies
21/50virtio_blk: make serial attribute staticdrivers/block/virtio_blk.c+2 -10 replies
22/50virtio_blk: fix race at module removaldrivers/block/virtio_blk.c+1 -10 replies
23/50virtio_net: pass vi arounddrivers/net/virtio_net.c+20 -180 replies
24/50virtio_net: get rid of virtio_net_hdr/skb_vnet_hdrdrivers/net/virtio_net.c+41 -490 replies
25/50virtio_net: stricter short buffer length checksdrivers/net/virtio_net.c+1 -10 replies
25/50virtio_net: stricter short buffer length checksdrivers/net/virtio_net.c+1 -10 replies
26/50virtio_net: bigger header when VERSION_1 is setdrivers/net/virtio_net.c+2 -10 replies
27/50virtio_net: disable mac write for virtio 1.0drivers/net/virtio_net.c+2 -10 replies
28/50virtio_net: enable v1.0 supportdrivers/net/virtio_net.c+1 -00 replies
29/50vhost: make features 64 bitdrivers/vhost/vhost.h+3 -30 replies
29/50vhost: make features 64 bitdrivers/vhost/vhost.h+3 -30 replies
30/50vhost: add memory access wrappersdrivers/vhost/vhost.h+31 -00 replies
31/50vhost/net: force len for TX to host endiandrivers/vhost/net.c+5 -50 replies
32/50vhost: switch to __get/__put_user exclusivelydrivers/vhost/vhost.c+10 -30 replies
32/50vhost: switch to __get/__put_user exclusivelydrivers/vhost/vhost.c+10 -30 replies
33/50vhost: virtio 1.0 endian-ness supportdrivers/vhost/vhost.c+49 -370 replies
34/50vhost/net: virtio 1.0 byte swapdrivers/vhost/net.c+10 -55 replies
35/50vhost/net: larger header for virtio 1.0drivers/vhost/net.c+2 -10 replies
36/50vhost/net: enable virtio 1.0drivers/vhost/net.c+2 -10 replies
37/50tun: move internal flag defines out of uapidrivers/net/tun.c include/uapi/linux/if_tun.h+24 -640 replies
38/50tun: drop most type definesdrivers/net/tun.c+28 -340 replies
39/50tun: add VNET_LE flaginclude/uapi/linux/if_tun.h+1 -00 replies
40/50tun: TUN_VNET_LE support, fix sparse warnings for virtio headersdrivers/net/tun.c+29 -190 replies
41/50macvtap: TUN_VNET_LE supportdrivers/net/macvtap.c+43 -250 replies
42/50virtio_scsi: v1.0 supportdrivers/scsi/virtio_scsi.c include/linux/virtio_scsi.h+49 -340 replies
43/50virtio_scsi: move to uapiinclude/uapi/linux/virtio_scsi.h+0 -00 replies
44/50virtio_scsi: export to userspaceinclude/uapi/linux/Kbuild include/uapi/linux/virtio_scsi.h+38 -370 replies
45/50vhost/scsi: partial virtio 1.0 supportdrivers/vhost/scsi.c+12 -100 replies
45/50vhost/scsi: partial virtio 1.0 supportdrivers/vhost/scsi.c+12 -100 replies
46/50af_packet: virtio 1.0 stubsnet/packet/af_packet.c+22 -130 replies
47/50virtio_console: virtio 1.0 supportdrivers/char/virtio_console.c include/uapi/linux/virtio_console.h+21 -150 replies
48/50virtio_balloon: add legacy_only flagdrivers/virtio/virtio_balloon.c include/linux/virtio.h+3 -00 replies
49/50virtio: make VIRTIO_F_VERSION_1 a transport bitdrivers/virtio/virtio.c drivers/virtio/virtio_ring.c include/uapi/linux/virtio_config.h+9 -30 replies
50/50virtio: drop VIRTIO_F_VERSION_1 from driversdrivers/block/virtio_blk.c drivers/char/virtio_console.c drivers/net/virtio_net.c +1 more+0 -40 replies
50/50virtio: drop VIRTIO_F_VERSION_1 from driversdrivers/block/virtio_blk.c drivers/char/virtio_console.c drivers/net/virtio_net.c +1 more+0 -40 replies

Reviews trailers per patch

43 of 60 patches have a Reviewed-by or Acked-by.

PatchCornelia HuckDavid HildenbrandJason WangPaolo BonziniThomas HuthLad, Prabhakar
1/50R-b R-b
1/50R-b R-b
2/50R-b
3/50R-b
4/50R-b R-b
5/50R-b R-b R-b R-b
5/50R-b R-b R-b R-b
6/50R-b R-b
7/50R-b
8/50R-b A-b
9/50R-b
10/50R-b
11/50R-b R-b
11/50R-b R-b
12/50R-b
13/50R-b R-b
14/50R-b R-b
14/50R-b R-b
15/50
16/50
16/50
17/50R-b
18/50R-b
19/50R-b
20/50R-b
21/50R-b
22/50R-b
23/50R-b
24/50R-b R-b
25/50R-b R-b R-b R-b
25/50R-b R-b R-b R-b
26/50R-b R-b
27/50R-b
28/50
29/50R-b R-b
29/50R-b R-b
30/50R-b R-b
31/50R-b
32/50
32/50
33/50
34/50R-b R-b R-b
35/50R-b R-b
36/50
37/50
38/50
39/50
40/50R-b
41/50R-b
42/50A-b
43/50A-b
44/50A-b
45/50A-b A-b
45/50A-b A-b
46/50
47/50
48/50
49/50
50/50
50/50

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v8 thread

Cover letter [PATCH v8 00/50] linux: towards virtio-1 guest support

David, assuming patches are acceptable, I'd like them all to be merged through virtio or vhost trees to avoid dependency headaches. Could you please ack doing that for net related patches, especially these:
tun: move internal flag defines out of uapi
tun: drop most type defines
tun: add VNET_LE flag
tun: TUN_VNET_LE support, fix sparse warnings for virtio headers
macvtap: TUN_VNET_HDR support
vhost/scsi: partial virtio 1.0 support
af_packet: virtio 1.0 stubs

Alternatively, I can prepare a tree with virtio changes and merge that into your net-next - if Rusty approves, or keeps silence :)

Could you comment on this please?

Up to half a hundred patches now. This is getting ridiculous.

Based on patches by Cornelia and others, but with an API that should allow better static checking of code, slightly more concervative changes in vring and drivers, and compatibility for existing drivers so that this series can be applied gradually.
At the end of series, all drivers are converted, and compatibility flags are dropped.

All drivers have been converted now, with the exception of the balloon driver which we plan to rewrite rather than convert.
All drivers now pass sparse without warnings.

net and blk patches have been tested on s390.
Other patches pass sparse so they are most likely
ok too, but haven't been through testing yet -
they can be dropped from patchset if necessary.

Please review, and consider for 3.19

changes since v7:
all drivers have been converted now.
new patches:
virtio_console: virtio 1.0 support
virtio_balloon: add legacy_only flag
virtio: make VIRTIO_F_VERSION_1 a transport bit
virtio: drop VIRTIO_F_VERSION_1 from drivers
vhost: make features 64 bit
fix bug noted by Sergei Shtylyov, bugfix suggested by Ben Hutchings
virtio_net: disable mac write for virtio 1.0
moved earlier in the series
vhost/net: force len for TX to host endian
commit log reworded
vhost: virtio 1.0 endian-ness support
simplify error printing code sligthly
vhost/net: suppress compiler warning
smashed into code introducing the warning, added a comment

changes since v6:
tun: move internal flag defines out of uapi
document reasons for patch split
macvtap: TUN_VNET_LE support
fix patch subject
virtio: add low-level APIs for feature bits
fix comment in code s/set/clear/ document reasons for names selected
KVM: s390: enable virtio-ccw revision 1
fix up comment
virtio: use u32, not bitmap for features
fix whitespace
virtio_ccw: add support for 64 bit features
tweak comment in code

included reviewed-by tags by Cornelia David and Jason

Changes since v5:
rewritten feature bit handling, based on suggestion by David:
changes are now smaller and easier to review.
new patch:
virtio: add low-level APIs for feature bits
rewritten patches:
virtio: use u32, not bitmap for features
virtio: add support for 64 bit features.

Changes since v4:
I have dropped 64 bit feature negotiation from
most transports (except ccw).
For symmetry, I split out ccw bits:
virtio: add support for 64 bit features.
adds core and device support for 64 bit features
virtio_ccw: add support for 64 bit features.
actually enables 64 bit features in ccw.
detail below.

this is still really a cosmetic change: just reordering/splitting patches, and dropping code changes that aren't needed.

new patches:
mic_virtio: robust feature array size calculation
virtio: assert 32 bit features in transports

addressed comments by Cornelia:
virtio: disable virtio 1.0 in transports:
patch dropped
virtio: memory access APIs
tweaked comments as suggested by Cornelia
virtio_config: endian conversion for v1.0
dropped reviewed-by tags -
they applied to a very old version of patch
virtio: set FEATURES_OK
replaced printk by dev_err
virtio: add legacy feature table support
comment changes suggested by Cornelia
virtio_blk: v1.0 support
dropped reviewed-by tags -
they applied to a very old version of patch
virtio_net: enable v1.0 support
only write mac for legacy devices
vhost: add memory access wrappers
move chunk to vhost: make features 64 bit better patch description
vhost: make features 64 bit
moved this patch earlier in series
vhost/net: force len for TX to host endian
better patch description
virtio_scsi: v1.0 support
fix bug: use high level, not low level wrappers

included reviewed-by tags for patches:
KVM: s390 allow virtio_ccw status writes to fail
added reviewed-by tag by Cornelia
virtio_scsi: v1.0 support
virtio_scsi: move to uapi
virtio_scsi: export to userspace vhost/scsi: partial virtio 1.0 support
added reviewed-by tag by Paolo

Changes since v3:
- move virtio 1.0 feature bit out of transport bits:
for now it's managed by drivers
- disable virtio 1.0 feature bit explicitly - for transports that don't support it

Cornelia Huck (3):
virtio: allow transports to get avail/used addresses
KVM: s390: virtio-ccw revision 1 SET_VQ
KVM: s390: enable virtio-ccw revision 1

Michael S. Tsirkin (46):
virtio: add low-level APIs for feature bits
virtio: use u32, not bitmap for features
mic_virtio: robust feature array size calculation
virtio: add support for 64 bit features.
virtio: assert 32 bit features in transports
virtio_ccw: add support for 64 bit features.
virtio: add virtio 1.0 feature bit
virtio: memory access APIs
virtio_ring: switch to new memory access APIs
virtio_config: endian conversion for v1.0
virtio: set FEATURES_OK
virtio: simplify feature bit handling
virtio: add legacy feature table support
virtio_net: v1.0 endianness
virtio_blk: v1.0 support
KVM: s390 allow virtio_ccw status writes to fail
virtio_blk: make serial attribute static
virtio_blk: fix race at module removal
virtio_net: pass vi around
virtio_net: get rid of virtio_net_hdr/skb_vnet_hdr
virtio_net: stricter short buffer length checks
virtio_net: bigger header when VERSION_1 is set
virtio_net: disable mac write for virtio 1.0
virtio_net: enable v1.0 support
vhost: make features 64 bit
vhost: add memory access wrappers
vhost/net: force len for TX to host endian
vhost: switch to __get/__put_user exclusively
vhost: virtio 1.0 endian-ness support
vhost/net: virtio 1.0 byte swap
vhost/net: larger header for virtio 1.0
vhost/net: enable virtio 1.0
tun: move internal flag defines out of uapi
tun: drop most type defines
tun: add VNET_LE flag
tun: TUN_VNET_LE support, fix sparse warnings for virtio headers
macvtap: TUN_VNET_LE support
virtio_scsi: v1.0 support
virtio_scsi: move to uapi
virtio_scsi: export to userspace
vhost/scsi: partial virtio 1.0 support
af_packet: virtio 1.0 stubs
virtio_console: virtio 1.0 support
virtio_balloon: add legacy_only flag
virtio: make VIRTIO_F_VERSION_1 a transport bit
virtio: drop VIRTIO_F_VERSION_1 from drivers

Thomas Huth (1):
KVM: s390: Set virtio-ccw transport revision

 drivers/vhost/vhost.h                  |  37 ++++++-
 include/linux/virtio.h                 |  12 ++-
 include/linux/virtio_byteorder.h       |  59 +++++++++++
 include/linux/virtio_config.h          | 100 +++++++++++++++++--
 include/uapi/linux/if_tun.h            |  17 +---
 include/uapi/linux/virtio_blk.h        |  15 +--
 include/uapi/linux/virtio_config.h     |   9 +-
 include/uapi/linux/virtio_console.h    |   7 +-
 include/uapi/linux/virtio_net.h        |  15 +--
 include/uapi/linux/virtio_ring.h       |  45 ++++-----
 include/{ => uapi}/linux/virtio_scsi.h | 106 ++++++++++----------
 include/uapi/linux/virtio_types.h      |  46 +++++++++
 tools/virtio/linux/virtio.h            |  22 +----
 tools/virtio/linux/virtio_config.h     |   2 +-
 drivers/block/virtio_blk.c             |  74 ++++++++------
 drivers/char/virtio_console.c          |  30 +++---
 drivers/lguest/lguest_device.c         |  13 ++-
 drivers/misc/mic/card/mic_virtio.c     |  10 +-
 drivers/net/macvtap.c                  |  68 ++++++++-----
 drivers/net/tun.c                      | 168 ++++++++++++++------------------
 drivers/net/virtio_net.c               | 161 +++++++++++++++---------------
 drivers/remoteproc/remoteproc_virtio.c |   7 +-
 drivers/s390/kvm/kvm_virtio.c          |   7 +-
 drivers/s390/kvm/virtio_ccw.c          | 172 +++++++++++++++++++++++++++------
 drivers/scsi/virtio_scsi.c             |  50 ++++++----
 drivers/vhost/net.c                    |  31 +++---
 drivers/vhost/scsi.c                   |  22 +++--
 drivers/vhost/vhost.c                  |  93 +++++++++++-------
 drivers/virtio/virtio.c                |  78 +++++++++++----
 drivers/virtio/virtio_balloon.c        |   1 +
 drivers/virtio/virtio_mmio.c           |  13 ++-
 drivers/virtio/virtio_pci.c            |   8 +-
 drivers/virtio/virtio_ring.c           | 109 ++++++++++++---------
 net/packet/af_packet.c                 |  35 ++++---
 tools/virtio/virtio_test.c             |   5 +-
 tools/virtio/vringh_test.c             |  16 +--
 include/uapi/linux/Kbuild              |   2 +
 37 files changed, 1061 insertions(+), 604 deletions(-)
 create mode 100644 include/linux/virtio_byteorder.h
 rename include/{ => uapi}/linux/virtio_scsi.h (73%)
 create mode 100644 include/uapi/linux/virtio_types.h
Signature · 1 line
MST