[ovs-git] [openvswitch/ovs] 6ee3e3: test-conntrack: Fix conntrack benchmark by clearin...

[Ilya Maximets]

  Branch: refs/heads/branch-2.14
  Home:   https://github.com/openvswitch/ovs
  Commit: 6ee3e39044c5f7ea62f619739f90a42b650ef562
      https://github.com/openvswitch/ovs/commit/6ee3e39044c5f7ea62f619739f90a42b650ef562
  Author: Ilya Maximets <i.maximets at ovn.org>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M tests/test-conntrack.c

  Log Message:
  -----------
  test-conntrack: Fix conntrack benchmark by clearing conntrack metadata.

Packets in the benchmark must be treated as new packets, i.e. they
should not have conntrack metadata set.  Current code will set up
'pkt->md.conn' after the first run and all subsequent calls will hit
the 'fast' processing that is intended for recirculated packets making
a false impression that current conntrack implementation is lightning
fast.

Before the change:
  $ ./ovstest test-conntrack benchmark 4 33554432 32 1
  conntrack:   1059 ms

After (correct):
  $ ./ovstest test-conntrack benchmark 4 33554432 32 1
  conntrack:  92785 ms

Fixes: 594570ea1cde ("conntrack: Optimize recirculations.")
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>
Acked-by: Aaron Conole <aconole at redhat.com>


  Commit: a2ab3061ff9eb88975eedb6ea753daf825ec74da
      https://github.com/openvswitch/ovs/commit/a2ab3061ff9eb88975eedb6ea753daf825ec74da
  Author: Greg Rose <gvrose8192 at gmail.com>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M ofproto/ipfix-gen-entities
    M ovsdb/dot2pic
    M ovsdb/ovsdb-doc
    M python/build/soutil.py
    M tests/ovsdb-monitor-sort.py
    M tests/sendpkt.py
    M tests/test-l7.py
    M tests/uuidfilt.py
    M utilities/ovs-dev.py
    M utilities/ovs-pipegen.py
    M xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
    M xenserver/opt_xensource_libexec_interface-reconfigure
    M xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync

  Log Message:
  -----------
  python: Fixup python shebangs to python3.

Builds on RHEL 8.2 systems are failing due to this issue.

See [1] as to why this is necessary.

I used the following command to identify files that need this fix:
find . -type f -executable | /usr/lib/rpm/redhat/brp-mangle-shebangs

I also updated the copyright notices as needed.

1. https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error

Fixes: 1ca0323e7c29 ("Require Python 3 and remove support for Python 2.")
Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
Acked-by: Aaron Conole <aconole at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


  Commit: cc334a62edc58ab9dad34739fa8ae2407867a626
      https://github.com/openvswitch/ovs/commit/cc334a62edc58ab9dad34739fa8ae2407867a626
  Author: Timothy Redaelli <tredaelli at redhat.com>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M lib/meta-flow.xml

  Log Message:
  -----------
  meta-flow: fix a typo in "MPLS Bottom of Stack Field" paragraph.

In the ovs-fields.7 manual page, the "MPLS Bottom of Stack Field" paragraph
says:
 * When mpls_bos is 1, there is another MPLS label following this one,
   so the Ethertype passed to pop_mpls should be an MPLS Ethertype. [...]

 * When mpls_bos is 0, this MPLS label is the last one, so the Ethertype
   passed to pop_mpls should be a non-MPLS Ethertype such as IPv4. [...]

The values 0 and 1 have been swapped: when BOS is 1,
then no more label stack entries follows.

Fixes: 96fee5e0a2a0 ("ovs-fields: New manpage to document Open vSwitch and OpenFlow fields.")
Reported-at: https://bugzilla.redhat.com/1842032
Reported-by: Guillaume Nault <gnault at redhat.com>
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Greg Rose <gvrose8192 at gmail.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


  Commit: b5ba81a90a8c34e3450b9261db225a2d59dae694
      https://github.com/openvswitch/ovs/commit/b5ba81a90a8c34e3450b9261db225a2d59dae694
  Author: Timothy Redaelli <tredaelli at redhat.com>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M utilities/ovs-dpctl-top.in

  Log Message:
  -----------
  ovs-dpctl-top: Skip "eth()" element.

With commit efde188622ae ("odp-util: Print eth() for Ethernet flows if
packet_type is absent.") "eth()" is printed for Ethernet flows if packet_type
is absent, but this broke "ovs-dpctl-top" since it expects that every
element has a value.

This commit skips the parsing of the empty "eth()" element.

Fixes: efde188622ae ("odp-util: Print eth() for Ethernet flows if packet_type is absent.")
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Flavio Leitner <fbl at sysclose.org>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


  Commit: adad1267441e966dcee1125b2d6f44512fec7dd8
      https://github.com/openvswitch/ovs/commit/adad1267441e966dcee1125b2d6f44512fec7dd8
  Author: Ilya Maximets <i.maximets at ovn.org>
  Date:   2020-08-26 (Wed, 26 Aug 2020)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis: Merge matrix entries.

It's not possible to use 'matrix' twice.  This makes travis to use
the latest one dropping all the osx and arm64 jobs.

Fixes: 00d3374d8d54 ("travis: Test build of debian packages.")
Acked-by: Aaron Conole <aconole at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/b3ee3433550a...adad1267441e