* Re: [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue
2021-09-06 9:40 ` [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue Zhimin Huang
@ 2021-09-06 1:17 ` Huang, ZhiminX
2021-09-06 3:32 ` Tu, Lijuan
1 sibling, 0 replies; 6+ messages in thread
From: Huang, ZhiminX @ 2021-09-06 1:17 UTC (permalink / raw)
To: dts
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
> -----Original Message-----
> From: Huang, ZhiminX <zhiminx.huang@intel.com>
> Sent: Monday, September 6, 2021 5:41 PM
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue
>
Tested-by: Zhimin Huang <zhiminx.huang@intel.com >
[-- Attachment #2: TestKernelpfIavf.log --]
[-- Type: application/octet-stream, Size: 28552 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dts] [PATCH V2 2/2] tests/vf_vlan:fix vlan issue
2021-09-06 9:40 ` [dts] [PATCH V2 2/2] tests/vf_vlan:fix " Zhimin Huang
@ 2021-09-06 1:17 ` Huang, ZhiminX
0 siblings, 0 replies; 6+ messages in thread
From: Huang, ZhiminX @ 2021-09-06 1:17 UTC (permalink / raw)
To: dts
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
> -----Original Message-----
> From: Huang, ZhiminX <zhiminx.huang@intel.com>
> Sent: Monday, September 6, 2021 5:41 PM
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V2 2/2] tests/vf_vlan:fix vlan issue
>
Tested-by: Zhimin Huang <zhiminx.huang@intel.com >
[-- Attachment #2: TestVfVlan.log --]
[-- Type: application/octet-stream, Size: 29503 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue
2021-09-06 9:40 ` [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue Zhimin Huang
2021-09-06 1:17 ` Huang, ZhiminX
@ 2021-09-06 3:32 ` Tu, Lijuan
1 sibling, 0 replies; 6+ messages in thread
From: Tu, Lijuan @ 2021-09-06 3:32 UTC (permalink / raw)
To: Huang, ZhiminX, dts; +Cc: Huang, ZhiminX
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Zhimin Huang
> Sent: 2021年9月6日 17:41
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue
>
> 1.use dts framework interface to get kernel driver version.
> 2.according to dpdk code and kernel change about vlan for cvl,fix dts code
> to adapt test point.
>
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
Hi,
This change is caused by ice version or dpdk code?
If dpdk, please provide dpdk commit.
If ice version, please provide ice info.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dts] [PATCH V2 0/2] fix vlan issue for cvl
@ 2021-09-06 9:40 Zhimin Huang
2021-09-06 9:40 ` [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue Zhimin Huang
2021-09-06 9:40 ` [dts] [PATCH V2 2/2] tests/vf_vlan:fix " Zhimin Huang
0 siblings, 2 replies; 6+ messages in thread
From: Zhimin Huang @ 2021-09-06 9:40 UTC (permalink / raw)
To: dts; +Cc: Zhimin Huang
1.use dts framework interface to get kernel driver version.
2.according to dpdk code and kernel change about vlan for cvl, fix dts code
to adapt test point.
for dts code change:
remove vlan, the pkts with vlan not be received.
disable strip and filter, the pkts with vlan tag not be received.
Zhimin Huang (2):
tests/kernelpf_iavf:fix vlan issue
tests/vf_vlan:fix vlan issue
tests/TestSuite_kernelpf_iavf.py | 16 +++++++---------
tests/TestSuite_vf_vlan.py | 10 +++++-----
2 files changed, 12 insertions(+), 14 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue
2021-09-06 9:40 [dts] [PATCH V2 0/2] fix vlan issue for cvl Zhimin Huang
@ 2021-09-06 9:40 ` Zhimin Huang
2021-09-06 1:17 ` Huang, ZhiminX
2021-09-06 3:32 ` Tu, Lijuan
2021-09-06 9:40 ` [dts] [PATCH V2 2/2] tests/vf_vlan:fix " Zhimin Huang
1 sibling, 2 replies; 6+ messages in thread
From: Zhimin Huang @ 2021-09-06 9:40 UTC (permalink / raw)
To: dts; +Cc: Zhimin Huang
1.use dts framework interface to get kernel driver version.
2.according to dpdk code and kernel change about vlan for cvl,fix dts code
to adapt test point.
Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
tests/TestSuite_kernelpf_iavf.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index 5db1ec0..9b340a9 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -67,6 +67,8 @@ class TestKernelpfIavf(TestCase):
self.vf_mac = '00:01:23:45:67:89'
self.add_addr = '00:11:22:33:44:55'
self.wrong_mac = '00:11:22:33:44:99'
+ # get driver version
+ self.driver_version = self.nic_obj.driver_version
self.port = self.dut_ports[0]
self.vm_port = 0
@@ -155,10 +157,6 @@ class TestKernelpfIavf(TestCase):
self.dut.send_expect("ip link set %s vf 0 mac %s" %
(self.host_intf, self.vf_mac), "# ")
- # get driver version
- out = self.dut.send_expect("ethtool -i %s | awk -F':' 'NR==2{print $2}'" % self.host_intf, "# ")
- self.driver_version = out.replace(" ", "")
-
try:
for port in self.sriov_vfs_port:
@@ -420,7 +418,7 @@ class TestKernelpfIavf(TestCase):
out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP")
tcpdump_out = self.get_tcpdump_package()
receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(len(receive_pkt) == 2, "fail to tester received vlan packet!!!")
self.verify(self.vf_mac in out, "Failed to received vlan packet!!!")
else:
@@ -489,7 +487,7 @@ class TestKernelpfIavf(TestCase):
# send vlan 1 packet, vf can receive packet
out = self.send_and_getout(vlan=1, pkt_type="VLAN_UDP")
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(self.vf_mac in out, "received vlan 1 packet!!!")
else:
self.verify(self.vf_mac not in out, "Received vlan 1 packet!!!")
@@ -537,7 +535,7 @@ class TestKernelpfIavf(TestCase):
self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP")
tcpdump_out = self.get_tcpdump_package()
receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(len(receive_pkt) == 2, 'Failed to not received vlan packet!!!')
else:
self.verify(len(receive_pkt) == 1, 'Failed to not received vlan packet!!!')
@@ -574,7 +572,7 @@ class TestKernelpfIavf(TestCase):
time.sleep(1)
tcpdump_out = self.get_tcpdump_package()
receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out)
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!')
else:
self.verify(len(receive_pkt) == 1, 'Failed to received vlan packet!!!')
@@ -917,7 +915,7 @@ class TestKernelpfIavf(TestCase):
self.scapy_send_packet(self.vf_mac, self.tester_intf, vlan_flags=True, count=10)
out = self.vm_dut.get_session_output()
packets = len(re.findall('received 1 packets', out))
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(packets == 10, "Not receive expected packet")
else:
self.verify(packets == 0, "Receive expected packet")
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dts] [PATCH V2 2/2] tests/vf_vlan:fix vlan issue
2021-09-06 9:40 [dts] [PATCH V2 0/2] fix vlan issue for cvl Zhimin Huang
2021-09-06 9:40 ` [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue Zhimin Huang
@ 2021-09-06 9:40 ` Zhimin Huang
2021-09-06 1:17 ` Huang, ZhiminX
1 sibling, 1 reply; 6+ messages in thread
From: Zhimin Huang @ 2021-09-06 9:40 UTC (permalink / raw)
To: dts; +Cc: Zhimin Huang
1.use dts framework interface to get kernel driver version.
2.according to dpdk code and kernel change about vlan for cvl, fix dts code,
to adapt test point.
Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
tests/TestSuite_vf_vlan.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py
index 2865014..34ba75e 100644
--- a/tests/TestSuite_vf_vlan.py
+++ b/tests/TestSuite_vf_vlan.py
@@ -65,6 +65,9 @@ class TestVfVlan(TestCase):
self.vf_assign_method = 'vfio-pci'
self.dut.send_expect('modprobe vfio-pci', '#')
+ # get driver version
+ self.driver_version = self.nic_obj.driver_version
+
def set_up(self):
self.setup_vm_env()
@@ -107,9 +110,6 @@ class TestVfVlan(TestCase):
self.host_intf0 = self.dut.ports_info[self.used_dut_port_0]['intf']
tester_port = self.tester.get_local_port(self.used_dut_port_0)
self.tester_intf0 = self.tester.get_interface(tester_port)
- # get driver version
- out = self.dut.send_expect("ethtool -i %s | awk -F':' 'NR==2{print $2}'" % self.host_intf0, "# ")
- self.driver_version = out.replace(" ", "")
self.dut.generate_sriov_vfs_by_port(
self.used_dut_port_0, 1, driver=driver)
@@ -276,7 +276,7 @@ class TestVfVlan(TestCase):
self.vm0_testpmd.execute_cmd("start")
out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP")
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify("received" in out, "Failed to received vlan packet!!!")
else:
self.verify(
@@ -398,7 +398,7 @@ class TestVfVlan(TestCase):
# send packet with vlan
out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP")
- if self.driver_version < "2.13.10" or self.kdriver == 'ice':
+ if self.kdriver == 'i40e' and self.driver_version < "2.13.10":
self.verify(
"received 1 packets" in out, "Received mismatched vlan packet while vlan filter on")
else:
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-06 3:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-06 9:40 [dts] [PATCH V2 0/2] fix vlan issue for cvl Zhimin Huang
2021-09-06 9:40 ` [dts] [PATCH V2 1/2] tests/kernelpf_iavf:fix vlan issue Zhimin Huang
2021-09-06 1:17 ` Huang, ZhiminX
2021-09-06 3:32 ` Tu, Lijuan
2021-09-06 9:40 ` [dts] [PATCH V2 2/2] tests/vf_vlan:fix " Zhimin Huang
2021-09-06 1:17 ` Huang, ZhiminX
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).