Skip to content

virtio pci support VIRTIO_F_RING_RESET

Xuan Zhuo bpf kvm linux-remoteproc linux-s390 linux-um netdev platform-driver-x86 virtualization 14 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v14 Latest42 patches 13 repliesIn review
  2. v1342 patches 24 repliesSuperseded
  3. v1240 patches 19 repliesSuperseded
Earlier versions · 11
VersionPostedPatchesRepliesStatus
v1140 patches41 repliesSuperseded
v1041 patches16 repliesSuperseded
v932 patches52 repliesSuperseded
v816 patches25 repliesSuperseded
v726 patches46 repliesSuperseded
v626 patches4 repliesSuperseded
v522 patches19 repliesSuperseded
v414 patches11 repliesSuperseded
v317 patches26 repliesSuperseded
v212 patches13 repliesSuperseded
v16 patches10 repliesSuperseded

Changes in v14 from the cover letter

1. remove unnecessary memset from virtqueue_reinit_{split,packed}
2. move free_head = 0 into virtqueue_vring_attach_{split,packed}

Patches in v14 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/42virtio: record the maximum queue num supported by the device.arch/um/drivers/virtio_uml.c drivers/platform/mellanox/mlxbf-tmfifo.c drivers/remoteproc/remoteproc_virtio.c +6 more+18 -00 replies
2/42virtio: struct virtio_config_ops add callbacks for queue_resetinclude/linux/virtio_config.h+14 -00 replies
3/42virtio_ring: update the document of the virtqueue_detach_unused_buf for queue resetdrivers/virtio/virtio_ring.c+2 -20 replies
4/42virtio_ring: extract the logic of freeing vringdrivers/virtio/virtio_ring.c+13 -50 replies
5/42virtio_ring: split vring_virtqueuedrivers/virtio/virtio_ring.c+60 -560 replies
6/42virtio_ring: introduce virtqueue_init()drivers/virtio/virtio_ring.c+22 -160 replies
7/42virtio_ring: split: stop __vring_new_virtqueue as export symboldrivers/virtio/virtio_ring.c include/linux/virtio_ring.h tools/virtio/virtio_test.c+18 -210 replies
8/42virtio_ring: split: __vring_new_virtqueue() accept struct vring_virtqueue_splitdrivers/virtio/virtio_ring.c+15 -140 replies
9/42virtio_ring: split: introduce vring_free_split()drivers/virtio/virtio_ring.c+11 -00 replies
10/42virtio_ring: split: extract the logic of alloc queuedrivers/virtio/virtio_ring.c+40 -250 replies
11/42virtio_ring: split: extract the logic of alloc state and extradrivers/virtio/virtio_ring.c+36 -160 replies
12/42virtio_ring: split: extract the logic of vring initdrivers/virtio/virtio_ring.c+21 -100 replies
13/42virtio_ring: split: extract the logic of attach vringdrivers/virtio/virtio_ring.c+10 -130 replies
14/42virtio_ring: split: introduce virtqueue_reinit_split()drivers/virtio/virtio_ring.c+23 -00 replies
15/42virtio_ring: split: reserve vring_align, may_reduce_numdrivers/virtio/virtio_ring.c+10 -00 replies
16/42virtio_ring: split: introduce virtqueue_resize_split()drivers/virtio/virtio_ring.c+34 -00 replies
17/42virtio_ring: packed: introduce vring_free_packeddrivers/virtio/virtio_ring.c+22 -00 replies
18/42virtio_ring: packed: extract the logic of alloc queuedrivers/virtio/virtio_ring.c+51 -290 replies
19/42virtio_ring: packed: extract the logic of alloc state and extradrivers/virtio/virtio_ring.c+34 -140 replies
20/42virtio_ring: packed: extract the logic of vring initdrivers/virtio/virtio_ring.c+17 -110 replies
21/42virtio_ring: packed: extract the logic of attach vringdrivers/virtio/virtio_ring.c+10 -150 replies
22/42virtio_ring: packed: introduce virtqueue_reinit_packed()drivers/virtio/virtio_ring.c+12 -00 replies
23/42virtio_ring: packed: introduce virtqueue_resize_packed()drivers/virtio/virtio_ring.c+30 -00 replies
24/42virtio_ring: introduce virtqueue_resize()drivers/virtio/virtio_ring.c include/linux/virtio.h+72 -00 replies
25/42virtio_pci: struct virtio_pci_common_cfg add queue_notify_datainclude/linux/virtio_pci_modern.h include/uapi/linux/virtio_pci.h+8 -00 replies
26/42virtio: allow to unbreak/break virtqueue individuallydrivers/virtio/virtio_ring.c include/linux/virtio.h+27 -00 replies
27/42virtio: queue_reset: add VIRTIO_F_RING_RESETinclude/uapi/linux/virtio_config.h+6 -10 replies
28/42virtio_ring: struct virtqueue introduce resetdrivers/virtio/virtio_ring.c include/linux/virtio.h+4 -00 replies
29/42virtio_pci: struct virtio_pci_common_cfg add queue_resetinclude/linux/virtio_pci_modern.h include/uapi/linux/virtio_pci.h+2 -10 replies
30/42virtio_pci: introduce helper to get/set queue resetdrivers/virtio/virtio_pci_modern_dev.c include/linux/virtio_pci_modern.h+41 -05 replies
31/42virtio_pci: extract the logic of active vq for modern pcidrivers/virtio/virtio_pci_modern.c+28 -180 replies
32/42virtio_pci: support VIRTIO_F_RING_RESETdrivers/virtio/virtio_pci_common.c drivers/virtio/virtio_pci_modern.c+97 -30 replies
33/42virtio: find_vqs() add arg sizesarch/um/drivers/virtio_uml.c drivers/platform/mellanox/mlxbf-tmfifo.c drivers/remoteproc/remoteproc_virtio.c +7 more+22 -100 replies
34/42virtio_pci: support the arg sizes of find_vqs()drivers/virtio/virtio_pci_common.c drivers/virtio/virtio_pci_common.h drivers/virtio/virtio_pci_legacy.c +1 more+23 -120 replies
35/42virtio_mmio: support the arg sizes of find_vqs()drivers/virtio/virtio_mmio.c+6 -20 replies
36/42virtio: add helper virtio_find_vqs_ctx_size()include/linux/virtio_config.h+12 -00 replies
37/42virtio_net: set the default max ring size by find_vqs()drivers/net/virtio_net.c+38 -45 replies
38/42virtio_net: get ringparam by virtqueue_get_vring_max_size()drivers/net/virtio_net.c+4 -40 replies
39/42virtio_net: split free_unused_bufs()drivers/net/virtio_net.c+25 -160 replies
40/42virtio_net: support rx queue resizedrivers/net/virtio_net.c+22 -00 replies
41/42virtio_net: support tx queue resizedrivers/net/virtio_net.c+47 -00 replies
42/42virtio_net: support set_ringparamdrivers/net/virtio_net.c+48 -00 replies

Reviews trailers per patch

All 42 patches have a Reviewed-by or Acked-by.

PatchJason WangHans de GoedeMathieu Poirier
1/42A-b
2/42A-b
3/42A-b
4/42A-b
5/42A-b
6/42A-b
7/42A-b
8/42A-b
9/42A-b
10/42A-b
11/42A-b
12/42A-b
13/42A-b
14/42A-b
15/42A-b
16/42A-b
17/42A-b
18/42A-b
19/42A-b
20/42A-b
21/42A-b
22/42A-b
23/42A-b
24/42A-b
25/42A-b
26/42A-b
27/42A-b
28/42A-b
29/42A-b
30/42A-b
31/42A-b
32/42A-b
33/42A-b A-b R-b
34/42A-b
35/42A-b
36/42A-b
37/42A-b
38/42A-b
39/42A-b
40/42A-b
41/42A-b
42/42A-b

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

Read the v14 thread

Cover letter [PATCH v14 00/42] virtio pci support VIRTIO_F_RING_RESET

The virtio spec already supports the virtio queue reset function. This patch set is to add this function to the kernel. The relevant virtio spec information is here:

    https://github.com/oasis-tcs/virtio-spec/issues/124
    https://github.com/oasis-tcs/virtio-spec/issues/139

Also regarding MMIO support for queue reset, I plan to support it after this patch is passed.

This patch set implements the refactoring of vring. Finally, the virtuque_resize() interface is provided based on the reset function of the transport layer.

Test environment:
Host: 4.19.91
Qemu: QEMU emulator version 6.2.50 (with vq reset support) Test Cmd: ethtool -G eth1 rx $1 tx $2; ethtool -g eth1

The default is split mode, modify Qemu virtio-net to add PACKED feature to test packed mode.

Qemu code:

    https://github.com/fengidri/qemu/compare/89f3bfa3265554d1d591ee4d7f1197b6e3397e84...master

In order to simplify the review of this patch set, the function of reusing the old buffers after resize will be introduced in subsequent patch sets.

Please review. Thanks.

v14:
1. remove unnecessary memset from virtqueue_reinit_{split,packed}
2. move free_head = 0 into virtqueue_vring_attach_{split,packed}

v13:
1. virtqueue attached by vq->split = *vring_split / vq->packed = *vring_packed
2. call __virtqueue_break() unconditionally

v12:
1. access vq->num_max directly without helper
2. rename the vq reset callbacks:
int (*disable_vq_and_reset)(struct virtqueue *vq); int (*enable_vq_after_reset)(struct virtqueue *vq);

3. rename vring to vring_split, vring_packed
4. protect sq->reset by tx lock

v11:
1. struct virtio_pci_common_cfg to virtio_pci_modern.h
2. conflict resolution

v10:
1. on top of the harden vring IRQ
2. factor out split and packed from struct vring_virtqueue
3. some suggest from @Jason Wang

v9:
1. Provide a virtqueue_resize() interface directly
2. A patch set including vring resize, virtio pci reset, virtio-net resize
3. No more separate structs

v8:
1. Provide a virtqueue_reset() interface directly
2. Split the two patch sets, this is the first part
3. Add independent allocation helper for allocating state, extra

v7:
1. fix #6 subject typo
2. fix #6 ring_size_in_bytes is uninitialized
3. check by: make W=12

v6:
1. virtio_pci: use synchronize_irq(irq) to sync the irq callbacks
2. Introduce virtqueue_reset_vring() to implement the reset of vring during the reset process. May use the old vring if num of the vq not change.
3. find_vqs() support sizes to special the max size of each vq

v5:
1. add virtio-net support set_ringparam

v4:
1. just the code of virtio, without virtio-net
2. Performing reset on a queue is divided into these steps:
1. reset_vq: reset one vq
2. recycle the buffer from vq by virtqueue_detach_unused_buf()
3. release the ring of the vq by vring_release_virtqueue()
4. enable_reset_vq: re-enable the reset queue
3. Simplify the parameters of enable_reset_vq()
4. add container structures for virtio_pci_common_cfg

v3:
1. keep vq, irq unreleased

Xuan Zhuo (42):
virtio: record the maximum queue num supported by the device.
virtio: struct virtio_config_ops add callbacks for queue_reset
virtio_ring: update the document of the virtqueue_detach_unused_buf
for queue reset
virtio_ring: extract the logic of freeing vring
virtio_ring: split vring_virtqueue
virtio_ring: introduce virtqueue_init()
virtio_ring: split: stop __vring_new_virtqueue as export symbol
virtio_ring: split: __vring_new_virtqueue() accept struct
vring_virtqueue_split
virtio_ring: split: introduce vring_free_split()
virtio_ring: split: extract the logic of alloc queue
virtio_ring: split: extract the logic of alloc state and extra
virtio_ring: split: extract the logic of vring init
virtio_ring: split: extract the logic of attach vring
virtio_ring: split: introduce virtqueue_reinit_split()
virtio_ring: split: reserve vring_align, may_reduce_num
virtio_ring: split: introduce virtqueue_resize_split()
virtio_ring: packed: introduce vring_free_packed
virtio_ring: packed: extract the logic of alloc queue
virtio_ring: packed: extract the logic of alloc state and extra
virtio_ring: packed: extract the logic of vring init
virtio_ring: packed: extract the logic of attach vring
virtio_ring: packed: introduce virtqueue_reinit_packed()
virtio_ring: packed: introduce virtqueue_resize_packed()
virtio_ring: introduce virtqueue_resize()
virtio_pci: struct virtio_pci_common_cfg add queue_notify_data
virtio: allow to unbreak/break virtqueue individually
virtio: queue_reset: add VIRTIO_F_RING_RESET
virtio_ring: struct virtqueue introduce reset
virtio_pci: struct virtio_pci_common_cfg add queue_reset
virtio_pci: introduce helper to get/set queue reset
virtio_pci: extract the logic of active vq for modern pci
virtio_pci: support VIRTIO_F_RING_RESET
virtio: find_vqs() add arg sizes
virtio_pci: support the arg sizes of find_vqs()
virtio_mmio: support the arg sizes of find_vqs()
virtio: add helper virtio_find_vqs_ctx_size()
virtio_net: set the default max ring size by find_vqs()
virtio_net: get ringparam by virtqueue_get_vring_max_size()
virtio_net: split free_unused_bufs()
virtio_net: support rx queue resize
virtio_net: support tx queue resize
virtio_net: support set_ringparam

 arch/um/drivers/virtio_uml.c             |   3 +-
 drivers/net/virtio_net.c                 | 208 +++++-
 drivers/platform/mellanox/mlxbf-tmfifo.c |   3 +
 drivers/remoteproc/remoteproc_virtio.c   |   3 +
 drivers/s390/virtio/virtio_ccw.c         |   4 +
 drivers/virtio/virtio_mmio.c             |  11 +-
 drivers/virtio/virtio_pci_common.c       |  32 +-
 drivers/virtio/virtio_pci_common.h       |   3 +-
 drivers/virtio/virtio_pci_legacy.c       |   8 +-
 drivers/virtio/virtio_pci_modern.c       | 153 ++++-
 drivers/virtio/virtio_pci_modern_dev.c   |  39 ++
 drivers/virtio/virtio_ring.c             | 767 +++++++++++++++++------
 drivers/virtio/virtio_vdpa.c             |   3 +
 include/linux/virtio.h                   |  10 +
 include/linux/virtio_config.h            |  40 +-
 include/linux/virtio_pci_modern.h        |   9 +
 include/linux/virtio_ring.h              |  10 -
 include/uapi/linux/virtio_config.h       |   7 +-
 include/uapi/linux/virtio_pci.h          |   2 +
 tools/virtio/virtio_test.c               |   4 +-
 20 files changed, 1028 insertions(+), 291 deletions(-)

--
2.31.0