@@ -91,12 +91,10 @@ class TestCBDMA(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- str_info = 'Misc (rawdev) devices using kernel driver'
out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
- pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+ pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
if pci_info is not None:
dev_info = pci_info.group(1)
# the numa id of dma dev, only add the device which
@@ -114,14 +114,10 @@ class TestDPDKGROLib(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- str_info = 'Misc (rawdev) devices using kernel driver'
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
- pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+ pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
if pci_info is not None:
dev_info = pci_info.group(1)
# the numa id of ioat dev, only add the device which
@@ -114,13 +114,10 @@ class TestVirTioVhostCbdma(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
- pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+ pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
if pci_info is not None:
dev_info = pci_info.group(1)
# the numa id of ioat dev, only add the device which
@@ -281,14 +281,11 @@ class TestVhostEventIdxInterrupt(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
self.cbdma_dev_infos = []
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
- pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+ pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
if pci_info is not None:
# dev_info = pci_info.group(1)
# the numa id of ioat dev, only add the device which
@@ -112,14 +112,10 @@ class TestVhostUserInterrupt(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- str_info = 'Misc (rawdev) devices using kernel driver'
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
- pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+ pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
if pci_info is not None:
dev_info = pci_info.group(1)
# the numa id of ioat dev, only add the device which
@@ -268,11 +268,8 @@ class TestVhostVirtioPmdInterrupt(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
- cbdma_dev_infos = re.findall('\s*(0000:\d+:\d+.\d+)', out)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
+ cbdma_dev_infos = re.findall('\s*(0000:\S+:\d+.\d+)', out)
self.verify(len(cbdma_dev_infos) >= cbdma_num, 'There no enough cbdma device to run this suite')
used_cbdma = cbdma_dev_infos[0:cbdma_num]
@@ -185,14 +185,10 @@ class TestVirtioUserInterrupt(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- str_info = 'Misc (rawdev) devices using kernel driver'
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
- pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+ pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
if pci_info is not None:
dev_info = pci_info.group(1)
# the numa id of ioat dev, only add the device which
@@ -89,11 +89,8 @@ class TestVirtioIdxInterrupt(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
- cbdma_dev_infos = re.findall('\s*(0000:\d+:\d+.\d+)', out)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
+ cbdma_dev_infos = re.findall('\s*(0000:\S+:\d+.\d+)', out)
self.verify(len(cbdma_dev_infos) >= cbdma_num, 'There no enough cbdma device to run this suite')
used_cbdma = cbdma_dev_infos[0:cbdma_num]
dmas_info = ''
@@ -87,14 +87,10 @@ class TestVM2VMVirtioNetPerf(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- str_info = 'Misc (rawdev) devices using kernel driver'
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
- pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+ pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
if pci_info is not None:
dev_info = pci_info.group(1)
# the numa id of ioat dev, only add the device which on same socket with nic dev
@@ -113,11 +109,11 @@ class TestVM2VMVirtioNetPerf(TestCase):
dmas_info = ''
for dmas in used_cbdma[0:int(cbdma_num/2)]:
number = used_cbdma[0:int(cbdma_num/2)].index(dmas)
- dmas = 'txq{}@{},'.format(number, dmas.replace('0000:', ''))
+ dmas = 'txq{}@{},'.format(number, dmas)
dmas_info += dmas
for dmas in used_cbdma[int(cbdma_num/2):]:
number = used_cbdma[int(cbdma_num/2):].index(dmas)
- dmas = 'txq{}@{},'.format(number, dmas.replace('0000:', ''))
+ dmas = 'txq{}@{},'.format(number, dmas)
dmas_info += dmas
self.dmas_info = dmas_info[:-1]
self.device_str = ' '.join(used_cbdma)
@@ -476,7 +472,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
self.vm_args = "disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on"
self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=1, nb_cores=2,
server_mode=False, opt_queue=None, combined=False, rxq_txq=None)
- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='ufo')
+ self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso')
def test_vm2vm_packed_ring_iperf_with_ufo(self):
"""
@@ -676,11 +676,7 @@ class TestVM2VMVirtioPMD(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "this case use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- str_info = 'Misc (rawdev) devices using kernel driver'
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
@@ -709,14 +709,10 @@ class TestVM2VMVirtioUser(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- str_info = 'Misc (rawdev) devices using kernel driver'
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
- pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
+ pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)
if pci_info is not None:
dev_info = pci_info.group(1)
# the numa id of ioat dev, only add the device which
@@ -235,11 +235,7 @@ class TestVswitchSampleCBDMA(TestCase):
"""
get all cbdma ports
"""
- # check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
- str_info = 'Misc (rawdev) devices using kernel driver'
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
pci_info = re.search('\s*(0000:\S*:\d*.\d*)', device)