[ovs-git] [openvswitch/ovs] 07e73e: ofpbuf: New function ofpbuf_insert().

GitHub noreply at github.com
Tue Jun 27 21:28:49 UTC 2017


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 07e73e085f1d124230fc97883eb01dd8f37f0d78
      https://github.com/openvswitch/ovs/commit/07e73e085f1d124230fc97883eb01dd8f37f0d78
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M include/openvswitch/ofpbuf.h
    M lib/ofpbuf.c

  Log Message:
  -----------
  ofpbuf: New function ofpbuf_insert().

This will receive its first users in an upcoming commit.

Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: be7ac2f3c105866542de5c1d4c7e2651250a3e92
      https://github.com/openvswitch/ovs/commit/be7ac2f3c105866542de5c1d4c7e2651250a3e92
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M lib/nx-match.c
    M lib/nx-match.h
    M lib/tun-metadata.c

  Log Message:
  -----------
  nx-match: Add context argument to nxm_put__().

An upcoming commit will need to pass an extra piece of data from
nx_put_raw() into all of its direct and indirect calls to nxm_put__().
This commit prepares for that by switching from a "struct ofpbuf *"
parameter to a context structure that, currently, contains just a
struct ofpbuf *.  The upcoming commit will add another member to the
context struct.

This commit has no visible effect on behavior.

Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 3d4b2e6eb74ed5bb5b35373aa8a489536938fee6
      https://github.com/openvswitch/ovs/commit/3d4b2e6eb74ed5bb5b35373aa8a489536938fee6
  Author: Jan Scheurich <jan.scheurich at ericsson.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M build-aux/extract-ofp-fields
    M include/openvswitch/match.h
    M include/openvswitch/meta-flow.h
    M lib/flow.c
    M lib/flow.h
    M lib/learn.c
    M lib/match.c
    M lib/meta-flow.c
    M lib/meta-flow.xml
    M lib/nx-match.c
    M lib/odp-util.c
    M lib/ofp-parse.c
    M lib/ofp-util.c
    M ofproto/ofproto-dpif-xlate.c
    M ofproto/tunnel.c
    M tests/dpif-netdev.at
    M tests/odp.at
    M tests/ofproto-dpif.at
    M tests/ofproto.at
    M tests/ovs-ofctl.at
    M tests/pmd.at
    M tests/tunnel-push-pop-ipv6.at
    M tests/tunnel-push-pop.at
    M tests/tunnel.at

  Log Message:
  -----------
  userspace: Add OXM field MFF_PACKET_TYPE

Allow packet type namespace OFPHTN_ETHERTYPE as alternative pre-requisite
for matching L3 protocols (MPLS, IP, IPv6, ARP etc).

Change the meta-flow definition of packet_type field to use the new
custom format MFS_PACKET_TYPE representing "(NS,NS_TYPE)".

Parsing routine for MFS_PACKET_TYPE added to meta-flow.c. Formatting
routine for field packet_type extracted from match_format() and moved to
flow.c to be used from meta-flow.c for formatting MFS_PACKET_TYPE.

Updated the ovs-fields man page source meta-flow.xml with documentation
for packet-type-aware bridges and added documentation for field packet_type.

Added packet_type to the matching properties in tests/ofproto.at.

If dl_type is unwildcarded due to later packet modification, make sure it
is cleared again if the original packet_type was not PT_ETH.

Signed-off-by: Jan Scheurich <jan.scheurich at ericsson.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 875ab13020b16269e0401b11fe0efc74e2cd952a
      https://github.com/openvswitch/ovs/commit/875ab13020b16269e0401b11fe0efc74e2cd952a
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M NEWS
    M lib/meta-flow.xml
    M lib/netdev-bsd.c
    M lib/netdev-dpdk.c
    M lib/netdev-dummy.c
    M lib/netdev-linux.c
    M lib/netdev-native-tnl.c
    M lib/netdev-provider.h
    M lib/netdev-vport.c
    M lib/netdev-vport.h
    M lib/netdev.c
    M lib/netdev.h
    M ofproto/ofproto-dpif-xlate.c
    M ofproto/ofproto-dpif.c
    M ofproto/tunnel.c
    M tests/tunnel-push-pop-ipv6.at
    M tests/tunnel-push-pop.at
    M vswitchd/vswitch.xml

  Log Message:
  -----------
  userspace: Handling of versatile tunnel ports

In netdev_gre_build_header(), GRE protocol and VXLAN next_potocol is set based
on packet_type of flow. If it's about an Ethernet packet, it is set to
ETP_TYPE_TEB. Otherwise, if the name space is OFPHTN_ETHERNET, it is set
according to the name space type.

Signed-off-by: Jan Scheurich <jan.scheurich at ericsson.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 526cf4e1d6a8197d06d64efef54dff2eec988bd7
      https://github.com/openvswitch/ovs/commit/526cf4e1d6a8197d06d64efef54dff2eec988bd7
  Author: Jan Scheurich <jan.scheurich at ericsson.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M tests/automake.mk
    A tests/packet-type-aware.at
    A tests/system-userspace-packet-type-aware.at
    M tests/system-userspace-testsuite.at
    M tests/testsuite.at

  Log Message:
  -----------
  tests: Added unit tests in packet-type-aware.at

First and second unit tests perform basic verification.

The third one is a triangular bridge setup test case. It tests dataplane
in non-PTAP and ptap bridges in conjunction with L2 and L3 GRE tunnels.
It uses veth ports, therefore requires root privileges.

A simplified version of the third test is added to system userspace unit tests.

 GRE tunneling test setup for PTAP bridge

     192.168.10.10           192.168.10.20             192.168.10.30
    n1                       n2                        n3
    |                        |                         |
   +------o------+          +------o------+           +------o------+
   |    br-in1   |          |    br-in2   |           |    br-in3   |
   |             |          |   (PTAP)    |           |             |
   +------o------+          +------o------+           +------o------+
   gre                      gre                       gre
   10.0.0.1                (10.0.0.2)                (10.0.0.3)
  (20.0.0.1)                20.0.0.2                 (20.0.0.3)
  (30.0.0.1) LOCAL         (30.0.0.2) LOCAL           30.0.0.3  LOCAL
   +-----------o-+          +-----------o-+           +-----------o-+
   |    br-p1    |          |    br-p2    |           |    br-p3    |
   +------o------+          +------o------+           +------o------+
     p1-0 |                        | p2-0                    | p3-0
     p0-1 |                        | p0-2                    | p0-3
       +--o------------------------o-------------------------o--+
       |                          br0                           |
       +--------------------------------------------------------+

   GRE tunnel ports:
      No     Bridge      Name        Packet-Type Remote bridge & ports
     -----------------------------------------------------------------------
      1020   br-in1      gre-12      legacy-l2   br-in2 2010 (ptap)
      1021   br-in1      gre-12_l3   legacy-l3         same
      1030   br-in1      gre-13      legacy-l2   br-in3 3010 (l2)
      2010   br-in2      gre-21      ptap        br-in1 1020 (l2), 1021 (l3)
      2030   br-in2      gre-23      ptap        br-in3 3020 (l2), 3021 (l3)
      3010   br-in1      gre-31      legacy-l2   br-in1 1030 (l2)
      3020   br-in1      gre-32      legacy-l2   br-in2 2010 (ptap)
      3021   br-in1      gre-32_l3   legacy-l3         same

Signed-off-by: Jan Scheurich <jan.scheurich at ericsson.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 6a81043e1b7669ef0b8eed386f83d875de11cb8d
      https://github.com/openvswitch/ovs/commit/6a81043e1b7669ef0b8eed386f83d875de11cb8d
  Author: Jan Scheurich <jan.scheurich at ericsson.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M lib/flow.c
    M lib/ofp-print.c
    M ofproto/ofproto-dpif-xlate.c

  Log Message:
  -----------
  userspace: Complete Packet In handling

Send packet_in for non-Ethernet packets.
Include packet_type in Packet In for ptap bridges.

Signed-off-by: Jan Scheurich <jan.scheurich at ericsson.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: cb1145d1b91a08acf07c68df9dc1474fae5ebfb1
      https://github.com/openvswitch/ovs/commit/cb1145d1b91a08acf07c68df9dc1474fae5ebfb1
  Author: Zoltán Balogh <zoltan.balogh at ericsson.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M lib/flow.c
    M lib/ofp-parse.c
    M lib/ofp-print.c
    M lib/ofp-util.c
    M ofproto/ofproto.c
    M tests/ofproto.at
    M utilities/ovs-ofctl.c

  Log Message:
  -----------
  userspace: Introduce packet_type in OF 1.5 packet-out

Introducing packet_type in OF 1.5 packet-out.
Partly based on Jean Tourrilhes's work.

Add test cases for OF1.5 packet-out
Add negative test case for OF1.5 packet-out

Signed-off-by: Jean Tourrilhes <jt at labs.hpe.com>
Signed-off-by: Zoltan Balogh <zoltan.balogh at ericsson.com>
Co-authored-by: Jan Scheurich <jan.scheurich at ericsson.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/de8f7050d558...cb1145d1b91a


More information about the git mailing list