Some fixes and doc updates for virtio-user
cover Some fixes and doc updates for virtio-user
This series consists of some fixes and doc updates for virtio-user.
Tiwei Bie (3):
net/virtio-user: fix multiple queue for vhost-kernel net/virtio: add the missing supported features
doc: update the doc for virtio-user
doc/guides/contributing/documentation.rst | 4 ++-- .../howto/virtio_user_as_exceptional_path.rst | 23 +++++++++++-------- .../virtio_user_for_container_networking.rst | 2 +- drivers/net/virtio/virtio_ethdev.h | 5 +++- .../net/virtio/virtio_user/virtio_user_dev.c | 4 +--- 5 files changed, 21 insertions(+), 17 deletions(-)
Signature · 1 line
2.18.0
PATCH 1/3 net/virtio-user: fix multiple queue for vhost-kernel
The multiple queue support in vhost-kernel is broken because the dev->vhostfd is only available for vhost-user. We should always try to enable queue pairs when it's not in server mode.
--- drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/virtio/virtio_user/virtio_user_dev.c +1 -3
@@ -549,13 +549,11 @@ virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs)/* Server mode can't enable queue pairs if vhostfd is invalid, * always return 0 in this case. */ -if (dev->vhostfd >=0 ) { +if (!dev->is_server || dev->vhostfd >=0 ) {for (i =0 ; i < q_pairs; ++i) ret |= dev->ops->enable_qp (dev, i,1 );for (i = q_pairs; i < dev->max_queue_pairs; ++i) ret |= dev->ops->enable_qp (dev, i,0 ); - }else if (!dev->is_server) { - ret = ~0 ; } dev->queue_pairs = q_pairs;
Signature · 1 line
2.18.0
Re: [PATCH 1/3] net/virtio-user: fix multiple queue for vhost-kernel
Quoted 4 lines · Tiwei Bie
The multiple queue support in vhost-kernel is broken because the
dev->vhostfdis only available for vhost-user. We should always try to enable queue pairs when it's not in server mode.
Quoted 8 lines
Fixes 201a41651715 ("net/virtio-user: fix multiple queues fail in server mode")Signed-off-by Tiwei Bie <[email protected]>--- drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
Thanks,
Maxime
PATCH 2/3 net/virtio: add the missing supported features
In reply to Tiwei BieThe virtio features VIRTIO_NET_F_CSUM, VIRTIO_NET_F_HOST_TSO4 and VIRTIO_NET_F_HOST_TSO6 are supported by the virtio PMD. But they are missing in the supported feature set. And since below commit:
commit 4174a7b59d05 ("net/virtio: improve Tx offload features negotiation")
Virtio PMD will announce the Tx offloading capabilities based on the features read from the device. And virtio-user won't report the features which are not in virtio-PMD's supported feature set. So since that commit, virtio-user won't announce the DEV_TX_OFFLOAD_UDP_CKSUM, DEV_TX_OFFLOAD_TCP_CKSUM and DEV_TX_OFFLOAD_TCP_TSO offloading capabilities even if the vhost backend supports them.
This patch adds these missing features, and virtio-user will report them if the backend supports them.
--- drivers/net/virtio/virtio_ethdev.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/virtio/virtio_ethdev.h +4 -1
@@ -40,7 +40,10 @@ (VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \1u <<VIRTIO_NET_F_GUEST_CSUM | \1u <<VIRTIO_NET_F_GUEST_TSO4 | \ -1u <<VIRTIO_NET_F_GUEST_TSO6 ) +1u <<VIRTIO_NET_F_GUEST_TSO6 | \ +1u <<VIRTIO_NET_F_CSUM | \ +1u <<VIRTIO_NET_F_HOST_TSO4 | \ +1u <<VIRTIO_NET_F_HOST_TSO6 )/* * CQ function prototype
Signature · 1 line
2.18.0
Re: [PATCH 2/3] net/virtio: add the missing supported features
Quoted 18 lines · Tiwei Bie
The virtio features
VIRTIO_NET_F_CSUM,VIRTIO_NET_F_HOST_TSO4andVIRTIO_NET_F_HOST_TSO6are supported by the virtio PMD. But they are missing in the supported feature set. And since below commit:commit
4174a7b59d05("net/virtio: improve Tx offload features negotiation")Virtio PMD will announce the Tx offloading capabilities based on the features read from the device. And virtio-user won't report the features which are not in virtio-PMD's supported feature set. So since that commit, virtio-user won't announce the
DEV_TX_OFFLOAD_UDP_CKSUM,DEV_TX_OFFLOAD_TCP_CKSUMandDEV_TX_OFFLOAD_TCP_TSOoffloading capabilities even if the vhost backend supports them.This patch adds these missing features, and virtio-user will report them if the backend supports them.
Quoted 7 lines
Fixes 142678d42959 ("net/virtio-user: fix wrongly get/set features")Signed-off-by Tiwei Bie <[email protected]>--- drivers/net/virtio/virtio_ethdev.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
PATCH 3/3 doc: update the doc for virtio-user
In reply to Tiwei BieUpdate the doc for virtio-user to use the latest testpmd parameters and commands.
--- doc/guides/contributing/documentation.rst | 4 ++-- .../howto/virtio_user_as_exceptional_path.rst | 23 +++++++++++-------- .../virtio_user_for_container_networking.rst | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-)
doc/guides/contributing/documentation.rst +2 -2
@@ -297,8 +297,8 @@ Line Length testpmd -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queues=2,queue_size=1024 \ - -- -i --txqflags=0x0 --enable-hw-vlan --enable-lro \ - --enable-rx-cksum --txq=2 --rxq=2 --rxd=1024 --txd=1024 + -- -i --tx-offloads=0x0000002c --enable-lro --txq=2 --rxq=2 \ + --txd=1024 --rxd=1024 Whitespace
doc/guides/howto/virtio_user_as_exceptional_path.rst +13 -10
@@ -57,8 +57,8 @@ compiling the kernel and those kernel modules should be inserted. $(testpmd) -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queue_size=1024 \ - -- -i --txqflags=0x0 --enable-lro \ - --enable-rx-cksum --rxd=1024 --txd=1024 + -- -i --tx-offloads=0x0000002c --enable-lro \ + --txd=1024 --rxd=1024 This command runs testpmd with two ports, one physical NIC to communicate with outside, and one virtio-user to communicate with kernel.
@@ -69,11 +69,6 @@ compiling the kernel and those kernel modules should be inserted. VIRTIO_NET_F_GUEST_TSO6 feature so that large packets from kernel can be transmitted to DPDK application and further TSOed by physical NIC. -* ``--enable-rx-cksum`` - - This is used to negotiate VIRTIO_NET_F_GUEST_CSUM so that packets from - kernel can be deemed as valid Rx checksumed. - * ``queue_size`` 256 by default. To avoid shortage of descriptors, we can increase it to 1024.
@@ -86,9 +81,17 @@ compiling the kernel and those kernel modules should be inserted. $(testpmd) -l 2-3 -n 4 \ --vdev=virtio_user0,path=/dev/vhost-net,queues=2,queue_size=1024 \ - -- -i --txqflags=0x0 --enable-lro \ - --enable-rx-cksum --txq=2 --rxq=2 --rxd=1024 \ - --txd=1024 + -- -i --tx-offloads=0x0000002c --enable-lro \ + --txq=2 --rxq=2 --txd=1024 --rxd=1024 + +#. Enable Rx checksum offloads in testpmd: + + .. code-block:: console + + (testpmd) port stop 0 + (testpmd) port config 0 rx_offload tcp_cksum on + (testpmd) port config 0 rx_offload udp_cksum on + (testpmd) port start 0 #. Start testpmd:
doc/guides/howto/virtio_user_for_container_networking.rst +1 -1
@@ -96,7 +96,7 @@ some minor changes. dpdk-app-testpmd testpmd -l 6-7 -n 4 -m 1024 --no-pci \ --vdev=virtio_user0,path=/var/run/usvhost \ --file-prefix=container \ - -- -i --txqflags=0xf00 --disable-hw-vlan + -- -i Note: If we run all above setup on the host, it's a shm-based IPC.
Signature · 1 line
2.18.0
Re: [PATCH 3/3] doc: update the doc for virtio-user
Quoted 10 lines · Tiwei Bie
Update the doc for virtio-user to use the latest testpmd parameters and commands.
Signed-off-by Tiwei Bie <[email protected]>--- doc/guides/contributing/documentation.rst | 4 ++-- .../howto/virtio_user_as_exceptional_path.rst | 23 +++++++++++-------- .../virtio_user_for_container_networking.rst | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-)
Thanks!
Maxime
Maxime Coquelin
AppliedQuoted 8 lines · Tiwei Bie
This series consists of some fixes and doc updates for virtio-user.
Tiwei Bie (3):
net/virtio-user: fix multiple queue for vhost-kernel net/virtio: add the missing supported features
doc: update the doc for virtio-user
Quoted 7 lines
doc/guides/contributing/documentation.rst | 4 ++-- .../howto/virtio_user_as_exceptional_path.rst | 23 +++++++++++-------- .../virtio_user_for_container_networking.rst | 2 +- drivers/net/virtio/virtio_ethdev.h | 5 +++- .../net/virtio/virtio_user/virtio_user_dev.c | 4 +--- 5 files changed, 21 insertions(+), 17 deletions(-)
Applied to dpdk-next-virtio/master.
Thanks,
Maxime