This series is based on Zoltan Balogh's series here: https://patchwork.ozlabs.org/patch/770490/ https://patchwork.ozlabs.org/patch/770487/ https://patchwork.ozlabs.org/patch/770495/ https://patchwork.ozlabs.org/patch/770498/ https://patchwork.ozlabs.org/patch/770488/ https://patchwork.ozlabs.org/patch/770489/
I've taken it and applied it verbatim (possibly with really minor rebase fixes--I don't remember), and interspersed with many commits that make minor or major changes, titled "fixup: ". These commits are meant to be squashed into Zoltan's previous commit to make some change that I explain in the commit message. I've also added a few commits of my own that would not be squashed but included independently. I'd appreciate comments. Ben Pfaff (25): fixup: packet_type originated in OpenFlow 1.5, not 1.3. fixup: Make packet_type formatting more like other fields. fixup: Improve documentation. fixup: Coding style. fixup: Always match on packet_type in datapath flows. ofp-parse: Allow "packet_type(0,0)" to be abbreviated "eth". fixup: Need OFPBMC_BAD_TYPE in OF1.0 since it can now be used there. fixup: Revalidate if 'packet-type-aware' setting changes. fixup: Wrap docs to 79 columns. fixup: Move compose_output_action__() code back where it started. ofpbuf: New function ofpbuf_insert(). nx-match: Add context argument to nxm_put__(). fixup: Change from global modal behavior to L3 tunnel only mode. ofp-util: Remove prototype for unimplemented function. fixup: Fix locking in netdev-native-tnl. fixup: Coding style. fixup: Clarify how legacy L3 tunnels work. fixup: Adapt tests to revised policy. fixup: Style. fixup: Don't suppress packet_type. fixup: Remove root-only test. fixup: Make tests set legacy-l3-pipeline instead of packet-type-aware. fixup: Style. fixup: Update test expected results. fixup: Allow non-Ethernet packets anywhere. Jan Scheurich (5): userspace: Add OXM field MFF_PACKET_TYPE userspace: Add bridge property 'packet-type-aware' userspace: Handling of versatile tunnel ports tests: Added unit tests in packet-type-aware.at userspace: Complete Packet In handling Zoltán Balogh (1): userspace: Introduce packet_type in OF 1.5 packet-out build-aux/extract-ofp-fields | 3 +- include/openvswitch/match.h | 5 + include/openvswitch/meta-flow.h | 20 ++ include/openvswitch/ofp-util.h | 2 - include/openvswitch/ofpbuf.h | 1 + lib/flow.c | 74 +++-- lib/flow.h | 27 +- lib/learn.c | 1 + lib/match.c | 98 +++++-- lib/meta-flow.c | 86 +++++- lib/meta-flow.xml | 154 ++++++++-- lib/netdev-native-tnl.c | 23 +- lib/nx-match.c | 264 +++++++++-------- lib/nx-match.h | 6 +- lib/odp-util.c | 38 +-- lib/ofp-parse.c | 25 ++ lib/ofp-print.c | 11 +- lib/ofp-util.c | 69 +++-- lib/ofpbuf.c | 18 ++ lib/tun-metadata.c | 4 +- ofproto/ofproto-dpif-xlate.c | 39 +-- ofproto/ofproto-dpif-xlate.h | 1 + ofproto/ofproto-dpif.c | 10 + ofproto/ofproto-provider.h | 4 + ofproto/ofproto.c | 17 +- ofproto/ofproto.h | 1 + ofproto/tunnel.c | 15 +- tests/automake.mk | 6 +- tests/dpif-netdev.at | 89 +++--- tests/odp.at | 1 + tests/ofproto-dpif.at | 230 +++++++-------- tests/ofproto.at | 86 ++++++ tests/ovs-ofctl.at | 2 +- tests/packet-type-aware.at | 31 ++ tests/pmd.at | 8 +- tests/system-userspace-packet-type-aware.at | 422 ++++++++++++++++++++++++++++ tests/system-userspace-testsuite.at | 1 + tests/testsuite.at | 1 + tests/tunnel-push-pop-ipv6.at | 2 +- tests/tunnel-push-pop.at | 2 +- tests/tunnel.at | 18 +- utilities/ovs-ofctl.c | 1 + vswitchd/bridge.c | 10 + vswitchd/vswitch.xml | 80 +++++- 44 files changed, 1552 insertions(+), 454 deletions(-) create mode 100644 tests/packet-type-aware.at create mode 100644 tests/system-userspace-packet-type-aware.at -- 2.10.2 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
