[ovs-dev] [PATCH] system-dpdk: Negotiation Tests for TSO

Meher Chinwala mchinwal at redhat.com
Thu Jun 17 06:26:22 UTC 2021


This patch is based on this original patch 
https://patchwork.ozlabs.org/project/openvswitch/patch/3c2f1fc66cb1d3281db9001c6a0babb6d162c27a.1594312857.git.gmuthukr@redhat.com/ 
which was not merged.
I have addressed the review comments and made the required changes.

On 6/15/21 3:20 PM, root wrote:
> From: Meher Chinwala <mchinwal at redhat.com>
> 
> system-dpdk: Negotiation Tests for TSO
> 
> This patch adds negotiation tests for checking whether TSO is enabled or not in OVS and in TestPMD for 4 diferent scenarios.
> 
> Signed-off-by: Meher Chinwala <mchinwal at redhat.com>
> ---
>   tests/system-dpdk-macros.at | 43 ++++++++++++++++++++++
>   tests/system-dpdk.at        | 71 +++++++++++++++++++++++++++++++++++++
>   2 files changed, 114 insertions(+)
> 
> diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at
> index c6708caaf..bdfdac1b0 100644
> --- a/tests/system-dpdk-macros.at
> +++ b/tests/system-dpdk-macros.at
> @@ -63,3 +63,46 @@ m4_define([OVS_DPDK_START],
>      AT_CAPTURE_FILE([ovs-vswitchd.log])
>      on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
>   ])
> +
> +
> +# NEGOTIATION_TEST_TSO([testpmd], [ovs])
> +#
> +# Test whether TSO is being enabled for OVS and TestPMD. The arguments denote whether
> +# TSO is enabled for testpmd and ovs or not, respectively.
> +#
> +m4_define([NEGOTIATION_TEST_TSO],
> +  [
> +   OVS_DPDK_START()
> +   AS_IF([test $1 -eq 1], [AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:userspace-tso-enable=true])], [AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:userspace-tso-enable=false])])
> +   AS_IF([test $1 -eq 1], [OVS_WAIT_UNTIL([grep 'Userspace TCP Segmentation Offloading support enabled' ovs-vswitchd.log])], [])
> +   AT_CHECK([ovs-vsctl add-br br10 -- set bridge br10 datapath_type=netdev])
> +   AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuserclient0 -- set Interface dpdkvhostuserclient0 type=dpdkvhostuserclient options:vhost-server-path=$OVS_RUNDIR/dpdkvhostclient0], [], [stdout], [stderr])
> +   AT_CHECK([ovs-vsctl show], [], [stdout])
> +   on_exit "pkill -f -x -9 'tail -f /dev/null'"
> +   AT_CHECK([echo "show device info all" > CMDFILE])
> +   AT_CHECK([echo "stop" >> CMDFILE])
> +   AT_CHECK([echo "port stop 0" >> CMDFILE])
> +   AS_IF([test $2 -eq 1], [AT_CHECK([echo "tso set 1500 0" >> CMDFILE], [])], [])
> +   AS_IF([test $2 -eq 1], [AT_CHECK([echo "csum set tcp hw 0" >> CMDFILE], [])], [])
> +   AT_CHECK([echo "port start 0" >> CMDFILE])
> +   AT_CHECK([echo "start" >> CMDFILE])
> +   AT_CHECK([echo "show port 0 tx_offload capabilities" >> CMDFILE])
> +   AT_CHECK([echo "show port 0 tx_offload configuration" >> CMDFILE])
> +   AT_CHECK([lscpu], [], [stdout])
> +   AT_CHECK([cat stdout | grep "NUMA node(s)" | awk '{c=1; while (c++<$(3)) {printf "512,"}; print "512"}' > NUMA_NODE])
> +   tail -f /dev/null | dpdk-testpmd --socket-mem="$(cat NUMA_NODE)" --no-pci\
> +   --vdev="net_virtio_user,path=$OVS_RUNDIR/dpdkvhostclient0,server=1" \
> +   --vdev="net_tap0,iface=tap0" --file-prefix page0 \
> +   --single-file-segments -- --cmdline-file=CMDFILE \
> +   -a >$OVS_RUNDIR/testpmd-dpdkvhostuserclient0.log 2>&1 &
> +
> +   sleep 10
> +   pkill -f -x -9 'tail -f /dev/null'
> +
> +   sleep 1
> +   AT_CHECK([awk '/negotiated Virtio features/ {a=$NF} END{print a}' ovs-vswitchd.log],[],[stdout])
> +
> +   AS_IF([test $1 -eq 1 && test $2 -eq 1], [AT_CHECK([printf "%X" $(( $(cat stdout) & ((1<<0)|(1<<11)|(1<<12)) ))],[],[1801])], [AT_CHECK([printf "%X" $(( $(cat stdout) & ((1<<0)|(1<<11)|(1<<12)) ))],[],[0])])
> +   AS_IF([test $2 -eq 1], [AT_CHECK([grep "Port : TCP_CKSUM TCP_TSO" $OVS_RUNDIR/testpmd-dpdkvhostuserclient0.log], [0], [stdout], [stderr])], [])
> +   AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr])
> +   ])
> diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at
> index 802895488..d9399ecb9 100644
> --- a/tests/system-dpdk.at
> +++ b/tests/system-dpdk.at
> @@ -232,3 +232,74 @@ OVS_VSWITCHD_STOP(["\@does not exist. The Open vSwitch kernel module is probably
>   \@EAL: No free hugepages reported in hugepages-1048576kB at d"])
>   AT_CLEANUP
>   dnl --------------------------------------------------------------------------
> +
> +
> +dnl --------------------------------------------------------------------------
> +dnl Negotiation tests for TSO - both OVS and TestPMD have TSO turned on
> +
> +AT_SETUP([NEGOTIATION TEST FOR TSO ENABLED FOR TESTPMD AND OVS])
> +AT_KEYWORDS([dpdk])
> +OVS_DPDK_PRE_CHECK()
> +OVS_DB_START()
> +NEGOTIATION_TEST_TSO([1],[1])
> +OVS_VSWITCHD_STOP(["
> +\@EAL: No available hugepages reported in hugepages-1048576kB at d
> +\@EAL:   Invalid NUMA socket, default to 0 at d
> +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory at d"])
> +AT_CLEANUP
> +
> +dnl --------------------------------------------------------------------------
> +
> +
> +
> +dnl --------------------------------------------------------------------------
> +dnl Negotiation tests - TSO enabled for OVS, disabled for TestPMD
> +
> +AT_SETUP([NEGOTIATION TEST FOR TSO ENABLED FOR OVS, DISABLED FOR TESTPMD])
> +AT_KEYWORDS([dpdk])
> +OVS_DPDK_PRE_CHECK()
> +OVS_DB_START()
> +NEGOTIATION_TEST_TSO([1],[0])
> +OVS_VSWITCHD_STOP(["
> +\@EAL: No available hugepages reported in hugepages-1048576kB at d
> +\@EAL:   Invalid NUMA socket, default to 0 at d
> +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory at d"])
> +AT_CLEANUP
> +
> +dnl --------------------------------------------------------------------------
> +
> +
> +
> +dnl --------------------------------------------------------------------------
> +dnl Negotiation tests - TSO enabled for TestPMD, disabled for OVS
> +
> +AT_SETUP([NEGOTIATION TEST FOR TSO ENABLED FOR TESTPMD, DISABLED FOR OVS])
> +AT_KEYWORDS([dpdk])
> +OVS_DPDK_PRE_CHECK()
> +OVS_DB_START()
> +NEGOTIATION_TEST_TSO([0],[1])
> +OVS_VSWITCHD_STOP(["
> +\@EAL: No available hugepages reported in hugepages-1048576kB at d
> +\@EAL:   Invalid NUMA socket, default to 0 at d
> +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory at d"])
> +AT_CLEANUP
> +
> +dnl --------------------------------------------------------------------------
> +
> +
> +
> +dnl --------------------------------------------------------------------------
> +dnl Negotiation tests - both OVS and TestPMD have TSO turned off
> +
> +AT_SETUP([NEGOTIATION TEST FOR TSO DISABLED FOR BOTH OVS AND TESTPMD])
> +AT_KEYWORDS([dpdk])
> +OVS_DPDK_PRE_CHECK()
> +OVS_DB_START()
> +NEGOTIATION_TEST_TSO([0],[0])
> +OVS_VSWITCHD_STOP(["
> +\@EAL: No available hugepages reported in hugepages-1048576kB at d
> +\@EAL:   Invalid NUMA socket, default to 0 at d
> +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory at d"])
> +AT_CLEANUP
> +
> +dnl --------------------------------------------------------------------------
> 



More information about the dev mailing list