Extend test suite to support multiqueue testing with vhost-user
backend. This change:
- Adds VHOST_USER_MQ environment variable to control queue count
- Passes --max-queues parameter to passt when VHOST_USER_MQ > 1
- Configures QEMU with queues= parameter for vhost-user netdev
- Updates setup scripts for passt, passt_in_ns, and two_guests setups
- Adds new test runs with 8 queues for comprehensive multiqueue testing.
Note that the guest kernel will not enable more queues than the number
of vCPUs.
The test infrastructure now validates multiqueue functionality across
all test scenarios including TCP, UDP, ICMP, DHCP, NDP, and performance
tests.
Signed-off-by: Laurent Vivier
---
test/lib/setup | 60 ++++++++++++++++++++++++++++++++++++++------------
test/run | 23 +++++++++++++++++++
2 files changed, 69 insertions(+), 14 deletions(-)
diff --git a/test/lib/setup b/test/lib/setup
index 5994598744a3..69433aa89adc 100755
--- a/test/lib/setup
+++ b/test/lib/setup
@@ -45,7 +45,8 @@ setup_passt() {
[ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
- [ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user"
+ [ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user" && \
+ [ ${VHOST_USER_MQ} -gt 1 ] && __opts="${__opts} --max-queues ${VHOST_USER_MQ}"
context_run passt "make clean"
context_run passt "make valgrind"
@@ -59,10 +60,18 @@ setup_passt() {
__vmem="$(((${__vmem} + 500) / 1000))G"
__qemu_netdev=" \
-chardev socket,id=c,path=${STATESETUP}/passt.socket \
- -netdev vhost-user,id=v,chardev=c \
- -device virtio-net,netdev=v \
-object memory-backend-memfd,id=m,share=on,size=${__vmem} \
-numa node,memdev=m"
+
+ if [ ${VHOST_USER_MQ} -qt 1 ]; then
+ __qemu_netdev="${__qemu_netdev} \
+ -device virtio-net,netdev=v,mq=true \
+ -netdev vhost-user,id=v,chardev=c,queues=${VHOST_USER_MQ}"
+ else
+ __qemu_netdev="${__qemu_netdev} \
+ -device virtio-net,netdev=v \
+ -netdev vhost-user,id=v,chardev=c"
+ fi
else
__qemu_netdev="-device virtio-net-pci,netdev=s \
-netdev stream,id=s,server=off,addr.type=unix,addr.path=${STATESETUP}/passt.socket"
@@ -155,7 +164,8 @@ setup_passt_in_ns() {
[ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_in_pasta.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
- [ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user"
+ [ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user" && \
+ [ ${VHOST_USER_MQ} -gt 1 ] && __opts="${__opts} --max-queues ${VHOST_USER_MQ}"
if [ ${VALGRIND} -eq 1 ]; then
context_run passt "make clean"
@@ -173,10 +183,18 @@ setup_passt_in_ns() {
__vmem="$(((${__vmem} + 500) / 1000))G"
__qemu_netdev=" \
-chardev socket,id=c,path=${STATESETUP}/passt.socket \
- -netdev vhost-user,id=v,chardev=c \
- -device virtio-net,netdev=v \
-object memory-backend-memfd,id=m,share=on,size=${__vmem} \
-numa node,memdev=m"
+
+ if [ ${VHOST_USER_MQ} -qt 1 ]; then
+ __qemu_netdev="${__qemu_netdev} \
+ -device virtio-net,netdev=v,mq=true \
+ -netdev vhost-user,id=v,chardev=c,queues=${VHOST_USER_MQ}"
+ else
+ __qemu_netdev="${__qemu_netdev} \
+ -device virtio-net,netdev=v \
+ -netdev vhost-user,id=v,chardev=c"
+ fi
else
__qemu_netdev="-device virtio-net-pci,netdev=s \
-netdev stream,id=s,server=off,addr.type=unix,addr.path=${STATESETUP}/passt.socket"
@@ -241,18 +259,20 @@ setup_two_guests() {
[ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_1.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
- [ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user"
+ [ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user" && \
+ [ ${VHOST_USER_MQ} -gt 1 ] && __opts="${__opts} --max-queues ${VHOST_USER_MQ}"
- context_run_bg passt_1 "./passt -s ${STATESETUP}/passt_1.socket -P ${STATESETUP}/passt_1.pid -f ${__opts} --fqdn fqdn1.passt.test -H hostname1 -t 10001 -u 10001"
+ context_run_bg passt_1 "./passt -s ${STATESETUP}/passt_1.socket -P ${STATESETUP}/passt_1.pid -f ${__opts} --fqdn fqdn1.passt.test -H hostname1 -t 10001 -u 10001 ${__passt_mq}"
wait_for [ -f "${STATESETUP}/passt_1.pid" ]
__opts=
[ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_2.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
- [ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user"
+ [ ${VHOST_USER} -eq 1 ] && __opts="${__opts} --vhost-user" && \
+ [ ${VHOST_USER_MQ} -gt 1 ] && __opts="${__opts} --max-queues ${VHOST_USER_MQ}"
- context_run_bg passt_2 "./passt -s ${STATESETUP}/passt_2.socket -P ${STATESETUP}/passt_2.pid -f ${__opts} --hostname hostname2 --fqdn fqdn2 -t 10004 -u 10004"
+ context_run_bg passt_2 "./passt -s ${STATESETUP}/passt_2.socket -P ${STATESETUP}/passt_2.pid -f ${__opts} --hostname hostname2 --fqdn fqdn2 -t 10004 -u 10004 ${__passt_mq}"
wait_for [ -f "${STATESETUP}/passt_2.pid" ]
__vmem="$((${MEM_KIB} / 1024 / 4))"
@@ -260,16 +280,28 @@ setup_two_guests() {
__vmem="$(((${__vmem} + 500) / 1000))G"
__qemu_netdev1=" \
-chardev socket,id=c,path=${STATESETUP}/passt_1.socket \
- -netdev vhost-user,id=v,chardev=c \
- -device virtio-net,netdev=v \
-object memory-backend-memfd,id=m,share=on,size=${__vmem} \
-numa node,memdev=m"
__qemu_netdev2=" \
-chardev socket,id=c,path=${STATESETUP}/passt_2.socket \
- -netdev vhost-user,id=v,chardev=c \
- -device virtio-net,netdev=v \
-object memory-backend-memfd,id=m,share=on,size=${__vmem} \
-numa node,memdev=m"
+
+ if [ ${VHOST_USER_MQ} -qt 1 ]; then
+ __qemu_netdev1="${__qemu_netdev1} \
+ -device virtio-net,netdev=v,mq=true \
+ -netdev vhost-user,id=v,chardev=c,queues=${VHOST_USER_MQ}"
+ __qemu_netdev2="${__qemu_netdev2} \
+ -device virtio-net,netdev=v,mq=true \
+ -netdev vhost-user,id=v,chardev=c,queues=${VHOST_USER_MQ}"
+ else
+ __qemu_netdev1="${__qemu_netdev1} \
+ -device virtio-net,netdev=v \
+ -netdev vhost-user,id=v,chardev=c"
+ __qemu_netdev2="${__qemu_netdev2} \
+ -device virtio-net,netdev=v \
+ -netdev vhost-user,id=v,chardev=c"
+ fi
else
__qemu_netdev1="-device virtio-net-pci,netdev=s \
-netdev stream,id=s,server=off,addr.type=unix,addr.path=${STATESETUP}/passt_1.socket"
diff --git a/test/run b/test/run
index f858e5586847..652cc12b1234 100755
--- a/test/run
+++ b/test/run
@@ -190,6 +190,29 @@ run() {
test passt_vu_in_ns/shutdown
teardown passt_in_ns
+ VHOST_USER=1
+ VHOST_USER_MQ=8
+ setup passt_in_ns
+ test passt_vu/ndp
+ test passt_vu_in_ns/dhcp
+ test passt_vu_in_ns/icmp
+ test passt_vu_in_ns/tcp
+ test passt_vu_in_ns/udp
+ test passt_vu_in_ns/shutdown
+ teardown passt_in_ns
+
+ setup two_guests
+ test two_guests_vu/basic
+ teardown two_guests
+
+ setup passt_in_ns
+ test passt_vu/ndp
+ test passt_vu_in_ns/dhcp
+ test perf/passt_vu_tcp
+ test perf/passt_vu_udp
+ test passt_vu_in_ns/shutdown
+ teardown passt_in_ns
+
# TODO: Make those faster by at least pre-installing gcc and make on
# non-x86 images, then re-enable.
skip_distro() {
--
2.51.0