@@ -11,6 +11,12 @@ import re
import time
testQueues = [4]
+testRxqTxq = [
+ {"rxq": 4, "txq": 8,},
+ {"rxq": 6, "txq": 8,},
+ {"rxq": 3, "txq": 9,},
+ {"rxq": 6, "txq": 9,},
+]
reta_entries = []
reta_lines = []
@@ -36,8 +42,13 @@ class TestVfRss(TestCase):
self.tester.scapy_foreground()
self.tester.scapy_append('sys.path.append("./")')
self.tester.scapy_append("from sctp import *")
- self.vm_dut_0.send_expect("start", "testpmd>")
- mac = self.vm0_testpmd.get_port_mac(0)
+
+ if self.setup_1pf_1vf_1vm_env_flag == 1:
+ self.vm_dut_0.send_expect("start", "testpmd>")
+ mac = self.vm0_testpmd.get_port_mac(0)
+ else:
+ mac = self.pmd_out.get_port_mac(0)
+
# send packet with different source and dest ip
if tran_type == "ipv4-other":
for i in range(packet_count):
@@ -152,8 +163,11 @@ class TestVfRss(TestCase):
else:
print("\ntran_type error!\n")
-
- out = self.vm_dut_0.get_session_output()
+ if self.setup_1pf_1vf_1vm_env_flag == 1:
+ out = self.vm_dut_0.get_session_output()
+ else:
+ out = self.dut.get_session_output()
+ self.dut.send_expect("show fwd stats all", "testpmd>")
print("*******************************************")
print(out)
if not reta_entries:
@@ -195,7 +209,8 @@ class TestVfRss(TestCase):
break
else:
pass
- self.verifyResult()
+ if "pmdrss" in self.running_case:
+ self.verifyResult()
def verifyResult(self):
"""
@@ -292,13 +307,16 @@ class TestVfRss(TestCase):
self.host_testpmd = None
self.setup_1pf_1vf_1vm_env_flag = 0
self.dcf_mode = load_global_setting(DPDK_DCFMODE_SETTING)
- self.setup_1pf_1vf_1vm_env(driver="")
+
def set_up(self):
"""
Run before each test case.
"""
- pass
+ if "rxq_txq_inconsistent" in self.running_case:
+ self.destroy_1pf_1vf_1vm_env()
+ elif self.setup_1pf_1vf_1vm_env_flag == 0:
+ self.setup_1pf_1vf_1vm_env(driver="")
def setup_1pf_1vf_1vm_env(self, driver="default"):
@@ -362,7 +380,7 @@ class TestVfRss(TestCase):
port = self.dut.ports_info[port_id]["port"]
port.bind_driver()
- self.setup_1pf_2vf_1vm_env_flag = 0
+ self.setup_1pf_1vf_1vm_env_flag = 0
def launch_testpmd(self, **kwargs):
dcf_flag = kwargs.get("dcf_flag")
@@ -375,6 +393,13 @@ class TestVfRss(TestCase):
port_options={self.vf0_guest_pci: "cap=dcf"},
socket=self.vm0_ports_socket,
)
+ elif self.setup_1pf_1vf_1vm_env_flag == 0:
+ self.pmd_out.start_testpmd(
+ cores="1S/9C/1T",
+ param=param,
+ eal_param="-a %s --file-prefix=vf"
+ % self.vf_port_pci,
+ )
else:
self.vm0_testpmd.start_testpmd(
"all",
@@ -503,6 +528,45 @@ class TestVfRss(TestCase):
self.send_packet(itf, iptype, queue, 128)
self.vm_dut_0.send_expect("quit", "# ", 30)
+ def test_vf_rss_rxq_txq_inconsistent(self):
+
+ self.pmd_out = PmdOutput(self.dut)
+ self.dut.generate_sriov_vfs_by_port(self.dut_ports[0], 1)
+ self.vf_port = self.dut.ports_info[self.dut_ports[0]]["vfs_port"][0]
+ iptypes = {
+ "ipv4-other": "ip",
+ "ipv4-udp": "udp",
+ "ipv4-tcp": "tcp",
+ "ipv4-sctp": "sctp",
+ "ipv6-other": "ip",
+ "ipv6-udp": "udp",
+ "ipv6-tcp": "tcp",
+ "ipv6-sctp": "sctp",
+ }
+
+ self.vf_port.bind_driver(driver="vfio-pci")
+ self.vf_port_pci = self.dut.ports_info[self.dut_ports[0]]["sriov_vfs_pci"][0]
+ localPort = self.tester.get_local_port(self.dut_ports[0])
+ itf = self.tester.get_interface(localPort)
+ eal_param = "--nb-core=8"
+ # test with different rss queues
+ for i in testRxqTxq:
+ self.launch_testpmd(
+ dcf_flag=self.dcf_mode,
+ param="--rxq=%s --txq=%s %s" % (str(i["rxq"]), str(i["txq"]), eal_param),
+ )
+ self.dut.send_expect("set fwd rxonly", "testpmd>")
+ self.dut.send_expect("set verbose 1", "testpmd>")
+ self.dut.send_expect("start", "testpmd>")
+ self.pmd_out.wait_link_status_up('all')
+ queue = i["rxq"]
+ for iptype, rsstype in list(iptypes.items()):
+ self.send_packet(itf, iptype, queue, 64)
+
+ self.dut.send_expect("stop", "testpmd>")
+ self.dut.send_expect("quit", "# ", 30)
+
+
def tear_down(self):
"""
Run after each test case.