| Message ID | 166238343946.2220027.17449153257338684100.stgit@ebuild |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tests: Add system-traffic.at tests to check-offloads. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/intel-ovs-compilation | success | test: success |
On 05/09/2022 16:10, Eelco Chaudron wrote: > If a tc flow was installed but has not yet been used, report it as such. > > In addition, add a delay to the "IGMP - flood under normal action" test > case to make it work with many repetitions. This delay is also present > in other ICMP/IGMP tests. > > Signed-off-by: Eelco Chaudron <echaudro@redhat.com> > --- > lib/tc.c | 8 +++++++- > tests/system-offloads-testsuite.at | 3 +-- > tests/system-traffic.at | 2 ++ > 3 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/lib/tc.c b/lib/tc.c > index f8fbe44bf..583358f46 100644 > --- a/lib/tc.c > +++ b/lib/tc.c > @@ -1352,7 +1352,13 @@ get_user_hz(void) > static void > nl_parse_tcf(const struct tcf_t *tm, struct tc_flower *flower) > { > - uint64_t lastused = time_msec() - (tm->lastuse * 1000 / get_user_hz()); > + uint64_t lastused; > + > + if (tm->firstuse == 0) { > + lastused = 0; > + } else { > + lastused = time_msec() - (tm->lastuse * 1000 / get_user_hz()); > + } > > if (flower->lastused < lastused) { > flower->lastused = lastused; > diff --git a/tests/system-offloads-testsuite.at b/tests/system-offloads-testsuite.at > index 4f47f4370..446d20a6d 100644 > --- a/tests/system-offloads-testsuite.at > +++ b/tests/system-offloads-testsuite.at > @@ -87,8 +87,7 @@ conntrack - multiple zones, local > conntrack - multi-stage pipeline, local > conntrack - ICMP related with NAT > conntrack - DNAT load balancing > -conntrack - DNAT load balancing with NC > -IGMP - flood under normal action" > +conntrack - DNAT load balancing with NC" > echo "$ovs_test_skip_list" | sed "s/<SPC>/ /g"]) > > m4_include([tests/system-traffic.at]) > diff --git a/tests/system-traffic.at b/tests/system-traffic.at > index fb823f2a8..2f6a4c57c 100644 > --- a/tests/system-traffic.at > +++ b/tests/system-traffic.at > @@ -6966,6 +6966,8 @@ f0 00 00 01 01 01 08 00 46 c0 00 28 00 00 40 00 01 02 d3 49 45 65 eb 4a e0 dnl > 00 00 16 94 04 00 00 22 00 f9 02 00 00 00 01 04 00 00 00 e0 00 00 fb 00 00 dnl > 00 00 00 00 > /dev/null]) > > +sleep 1 > + > AT_CHECK([ovs-appctl dpctl/dump-flows --names | grep -e .*ipv4 | sort | dnl > strip_stats | strip_used | strip_recirc | dnl > sed 's/,packet_type(ns=[[0-9]]*,id=[[0-9]]*),/,/'], > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev Acked-by: Roi Dayan <roid@nvidia.com>
diff --git a/lib/tc.c b/lib/tc.c index f8fbe44bf..583358f46 100644 --- a/lib/tc.c +++ b/lib/tc.c @@ -1352,7 +1352,13 @@ get_user_hz(void) static void nl_parse_tcf(const struct tcf_t *tm, struct tc_flower *flower) { - uint64_t lastused = time_msec() - (tm->lastuse * 1000 / get_user_hz()); + uint64_t lastused; + + if (tm->firstuse == 0) { + lastused = 0; + } else { + lastused = time_msec() - (tm->lastuse * 1000 / get_user_hz()); + } if (flower->lastused < lastused) { flower->lastused = lastused; diff --git a/tests/system-offloads-testsuite.at b/tests/system-offloads-testsuite.at index 4f47f4370..446d20a6d 100644 --- a/tests/system-offloads-testsuite.at +++ b/tests/system-offloads-testsuite.at @@ -87,8 +87,7 @@ conntrack - multiple zones, local conntrack - multi-stage pipeline, local conntrack - ICMP related with NAT conntrack - DNAT load balancing -conntrack - DNAT load balancing with NC -IGMP - flood under normal action" +conntrack - DNAT load balancing with NC" echo "$ovs_test_skip_list" | sed "s/<SPC>/ /g"]) m4_include([tests/system-traffic.at]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index fb823f2a8..2f6a4c57c 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -6966,6 +6966,8 @@ f0 00 00 01 01 01 08 00 46 c0 00 28 00 00 40 00 01 02 d3 49 45 65 eb 4a e0 dnl 00 00 16 94 04 00 00 22 00 f9 02 00 00 00 01 04 00 00 00 e0 00 00 fb 00 00 dnl 00 00 00 00 > /dev/null]) +sleep 1 + AT_CHECK([ovs-appctl dpctl/dump-flows --names | grep -e .*ipv4 | sort | dnl strip_stats | strip_used | strip_recirc | dnl sed 's/,packet_type(ns=[[0-9]]*,id=[[0-9]]*),/,/'],
If a tc flow was installed but has not yet been used, report it as such. In addition, add a delay to the "IGMP - flood under normal action" test case to make it work with many repetitions. This delay is also present in other ICMP/IGMP tests. Signed-off-by: Eelco Chaudron <echaudro@redhat.com> --- lib/tc.c | 8 +++++++- tests/system-offloads-testsuite.at | 3 +-- tests/system-traffic.at | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-)