From patchwork Tue Jun 15 09:50:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meher Chinwala X-Patchwork-Id: 1492094 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=EHtazIgp; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G43VK34Nfz9sRK for ; Tue, 15 Jun 2021 19:51:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id ADDB440400; Tue, 15 Jun 2021 09:51:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fcxL4Rb6r1_N; Tue, 15 Jun 2021 09:50:59 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id C8CC040025; Tue, 15 Jun 2021 09:50:58 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9ADB6C000E; Tue, 15 Jun 2021 09:50:58 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 17919C000B for ; Tue, 15 Jun 2021 09:50:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EE009608D6 for ; Tue, 15 Jun 2021 09:50:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i3fk9liL59xZ for ; Tue, 15 Jun 2021 09:50:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id BBB8F60839 for ; Tue, 15 Jun 2021 09:50:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623750654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iasO4ckEiVVJNuR7G4I3if9FNtEGWWJcw0YVF4n8jYo=; b=EHtazIgpdd340HJ22Y5acNxSyVzvPOLtgbYdgnqcv5woCXje5MB+TyoReWVFaZZH2R7A0g NIxq4y3YSq7bHC4PNeS5YJzTGtPNBONYh/oTW+ZNQjyi+noY9IMx+TmJzYAtdvwS51VkXK bDJW9K1s86kSchxTb/an5yAHtWbZ9vA= Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-182-w3UCXNrSPFGERTmDg6pijg-1; Tue, 15 Jun 2021 05:50:53 -0400 X-MC-Unique: w3UCXNrSPFGERTmDg6pijg-1 Received: by mail-pj1-f70.google.com with SMTP id fu20-20020a17090ad194b0290163ff5d5867so1482186pjb.2 for ; Tue, 15 Jun 2021 02:50:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iasO4ckEiVVJNuR7G4I3if9FNtEGWWJcw0YVF4n8jYo=; b=LkdPyDonBguGqnL4xlAD2KQ07mNwwYU6UX90yB0mjPoTmpa9fzPXBhcDe8TfTQMMhg QlLXKSvqMKjDlKBbftz6WZwopmRMSw63QPeE7aJKaZ1SG4BVe3Q8x6ervA7JrJPiDu7Q 5Q4pDjoXQau1TabcI3XrhZhSxZEjWr7NTBVqKlMQgvkW9DrvuabZ2XIvj9nkExYRf5rS A+3lZhtRBBi3lKZyDkHILUfwoPQhnwfoD4VRdgvL5DpLYaKH4FM/TCeT738dpIvTwwez ItDtNFHYKZrAcF3PGgRgZ/NPmTNhL7J9havAa81UO1SxCg+2ZL4jDvE1BzJ+A/SAyOp2 l8HA== X-Gm-Message-State: AOAM530XmTQLpJuDKv8f9lJPjxR730EnYnnw4QT6QWDuwFE4S5u/TK4J WJIut1fYUKO2AHSODxYV+EXbM5OPhtEwWSzoQRQQExhSUDd19LyrMQKE/lE68QXjMHg0NLi7gtT QYlwqo9oMiHHvtu/yfELWuSyl0ozOcfHwIZQ4l5FgRE+wogTPDsGIYulGX3N7Rbs8B2l8xw== X-Received: by 2002:a17:90a:5403:: with SMTP id z3mr4108755pjh.215.1623750651694; Tue, 15 Jun 2021 02:50:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgdiOW146zeYqSLYuBFzjt2uN5NUUGPJ/tAHpgSoBoEk/z60vXIz6ux244A6T9qoNpJlzBXQ== X-Received: by 2002:a17:90a:5403:: with SMTP id z3mr4108713pjh.215.1623750651075; Tue, 15 Jun 2021 02:50:51 -0700 (PDT) Received: from localhost.localdomain ([103.249.234.121]) by smtp.gmail.com with ESMTPSA id t5sm14616460pfe.116.2021.06.15.02.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 02:50:50 -0700 (PDT) From: root X-Google-Original-From: root To: ovs-dev@openvswitch.org Date: Tue, 15 Jun 2021 09:50:24 +0000 Message-Id: <20210615095023.18963-1-root@localhost.localdomain> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mchinwal@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH] system-dpdk: Negotiation Tests for TSO X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Meher Chinwala 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 --- 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@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@d +\@EAL: Invalid NUMA socket, default to 0@d +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@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@d +\@EAL: Invalid NUMA socket, default to 0@d +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@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@d +\@EAL: Invalid NUMA socket, default to 0@d +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@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@d +\@EAL: Invalid NUMA socket, default to 0@d +\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d"]) +AT_CLEANUP + +dnl --------------------------------------------------------------------------