* Re: [dts] [PATCH V1 0/2] adapt to CVL nic
2021-03-25 15:57 [dts] [PATCH V1 0/2] adapt to CVL nic xiewei
@ 2021-03-25 7:37 ` Xie, WeiX
2021-03-25 15:57 ` [dts] [PATCH V1 1/2] tests/kernelpf_iavf: " xiewei
2021-03-25 15:57 ` [dts] [PATCH V1 2/2] tests/vf_vlan: " xiewei
2 siblings, 0 replies; 6+ messages in thread
From: Xie, WeiX @ 2021-03-25 7:37 UTC (permalink / raw)
To: dts
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
> -----Original Message-----
> From: Xie, WeiX
> Sent: Thursday, March 25, 2021 11:58 PM
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts][PATCH V1 0/2] adapt to CVL nic
Tested-by: Xie Wei <weix.xie@intel.com>
[-- Attachment #2: TestVfVlan.log --]
[-- Type: application/octet-stream, Size: 108799 bytes --]
[-- Attachment #3: TestKernelpfIavf.log --]
[-- Type: application/octet-stream, Size: 1475977 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dts] [PATCH V1 2/2] tests/vf_vlan: adapt to CVL nic
2021-03-25 15:57 ` [dts] [PATCH V1 2/2] tests/vf_vlan: " xiewei
@ 2021-03-25 7:54 ` Zhao, HaiyangX
0 siblings, 0 replies; 6+ messages in thread
From: Zhao, HaiyangX @ 2021-03-25 7:54 UTC (permalink / raw)
To: Xie, WeiX, dts; +Cc: Xie, WeiX
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of xiewei
> Sent: Thursday, March 25, 2021 23:58
> To: dts@dpdk.org
> Cc: Xie, WeiX <weix.xie@intel.com>
> Subject: [dts] [PATCH V1 2/2] tests/vf_vlan: adapt to CVL nic
>
> adapt to ice driver update for vlan issue on AVF/DCF.
> vf_vlan_rx: while vlan set filter on, the pkts with random vlan id 1-4095 shall
> not be received.
> add_pvid_vf: while ip link set pf_intf vf 0 vlan 0, the pkts with random vlan id
> 1-4095 shall not be received.
>
> Signed-off-by: xiewei <weix.xie@intel.com>
> ---
> tests/TestSuite_vf_vlan.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py index
> 28650143..0cc2ba89 100644
> --- a/tests/TestSuite_vf_vlan.py
> +++ b/tests/TestSuite_vf_vlan.py
> @@ -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":
Hi, wei,
Now you can just use self.nic_obj.driver_version to do the kernel driver version judgement,
And the code of getting kernel driver version in suite could be removed.
> 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
* [dts] [PATCH V1 0/2] adapt to CVL nic
@ 2021-03-25 15:57 xiewei
2021-03-25 7:37 ` Xie, WeiX
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: xiewei @ 2021-03-25 15:57 UTC (permalink / raw)
To: dts; +Cc: xiewei
adapt to ice driver update for vlan issue on AVF/DCF.
xiewei (2):
tests/kernelpf_iavf: adapt to CVL nic
tests/vf_vlan: adapt to CVL nic
tests/TestSuite_kernelpf_iavf.py | 10 +++++-----
tests/TestSuite_vf_vlan.py | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dts] [PATCH V1 1/2] tests/kernelpf_iavf: adapt to CVL nic
2021-03-25 15:57 [dts] [PATCH V1 0/2] adapt to CVL nic xiewei
2021-03-25 7:37 ` Xie, WeiX
@ 2021-03-25 15:57 ` xiewei
2021-03-25 15:57 ` [dts] [PATCH V1 2/2] tests/vf_vlan: " xiewei
2 siblings, 0 replies; 6+ messages in thread
From: xiewei @ 2021-03-25 15:57 UTC (permalink / raw)
To: dts; +Cc: xiewei
adapt to ice driver update for vlan issue on AVF/DCF.
vf_add_pvid: remove vlan, the pkts with random vlan id 1-4095 shall not be received.
vf_vlan_rx: remove vlan, the pkts with vlan 1 shall not be received.
vf_vlan_strip: disable strip, the pkts with random vlan tag shall not be received.
vf_vlan_filter: disable filter, the pkts with random vlan tag shall not be received.
vf_vlan_promisc: disable filter and strip, the pkts with random vlan tag shall not be received.
Signed-off-by: xiewei <weix.xie@intel.com>
---
tests/TestSuite_kernelpf_iavf.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index 5db1ec00..c953e46c 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -420,7 +420,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 +489,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 +537,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 +574,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 +917,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 V1 2/2] tests/vf_vlan: adapt to CVL nic
2021-03-25 15:57 [dts] [PATCH V1 0/2] adapt to CVL nic xiewei
2021-03-25 7:37 ` Xie, WeiX
2021-03-25 15:57 ` [dts] [PATCH V1 1/2] tests/kernelpf_iavf: " xiewei
@ 2021-03-25 15:57 ` xiewei
2021-03-25 7:54 ` Zhao, HaiyangX
2 siblings, 1 reply; 6+ messages in thread
From: xiewei @ 2021-03-25 15:57 UTC (permalink / raw)
To: dts; +Cc: xiewei
adapt to ice driver update for vlan issue on AVF/DCF.
vf_vlan_rx: while vlan set filter on, the pkts with random vlan id 1-4095 shall not be received.
add_pvid_vf: while ip link set pf_intf vf 0 vlan 0, the pkts with random vlan id 1-4095 shall not be received.
Signed-off-by: xiewei <weix.xie@intel.com>
---
tests/TestSuite_vf_vlan.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py
index 28650143..0cc2ba89 100644
--- a/tests/TestSuite_vf_vlan.py
+++ b/tests/TestSuite_vf_vlan.py
@@ -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
* [dts] [PATCH V1 1/2] tests/kernelpf_iavf: adapt to CVL NIC
2021-03-26 10:52 [dts] [PATCH V1 0/2] adapt to CVL NIC xiewei
@ 2021-03-26 10:52 ` xiewei
0 siblings, 0 replies; 6+ messages in thread
From: xiewei @ 2021-03-26 10:52 UTC (permalink / raw)
To: dts; +Cc: xiewei
a.adapt to framework and remove the code of getting kernel driver version.
b.adapt to ice driver update for vlan issue on AVF/DCF:
vf_add_pvid: remove vlan, the pkts with random vlan id 1-4095 shall not be received.
vf_vlan_rx: remove vlan, the pkts with vlan 1 shall not be received.
vf_vlan_strip: disable strip, the pkts with random vlan tag shall not be received.
vf_vlan_filter: disable filter, the pkts with random vlan tag shall not be received.
vf_vlan_promisc: disable filter and strip, the pkts with random vlan tag shall not be received.
Signed-off-by: xiewei <weix.xie@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 5db1ec00..9b340a99 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
end of thread, other threads:[~2021-03-26 2:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-25 15:57 [dts] [PATCH V1 0/2] adapt to CVL nic xiewei
2021-03-25 7:37 ` Xie, WeiX
2021-03-25 15:57 ` [dts] [PATCH V1 1/2] tests/kernelpf_iavf: " xiewei
2021-03-25 15:57 ` [dts] [PATCH V1 2/2] tests/vf_vlan: " xiewei
2021-03-25 7:54 ` Zhao, HaiyangX
2021-03-26 10:52 [dts] [PATCH V1 0/2] adapt to CVL NIC xiewei
2021-03-26 10:52 ` [dts] [PATCH V1 1/2] tests/kernelpf_iavf: " xiewei
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).