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/
v1->v2: - Squash fixup patches. - Apply changes agreed with Jan. - Not yet done: Figure out whether to really show packet_type in (some) match_format() output. - New patch at the end unsuccessfully tries to re-enable packet-aware test. Either I don't have enough insight yet, or it just reveals a bug or two. - 4 new patches at beginning. First one is trivial. Next 3 are intended to make it easier to debug the packet aware test that is still failing. Jan, you don't have to feel obligated to review these if you feel they are off-topic; I will get separate reviews. v2->v3: - Drop first two patches, which have been applied to master. - Drop patches 3 and 4, which have been moved to a new series. - Drop last patch, which was incomplete. I'll hope that Jan or Zoltan can pick it back up. - Apply Jan's and Zoltan's comments on a few other patches. Ben Pfaff (3): ofpbuf: New function ofpbuf_insert(). nx-match: Add context argument to nxm_put__(). userspace: Handling of versatile tunnel ports Jan Scheurich (3): userspace: Add OXM field MFF_PACKET_TYPE 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 NEWS | 6 +- build-aux/extract-ofp-fields | 3 +- include/openvswitch/match.h | 5 + include/openvswitch/meta-flow.h | 20 ++ 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 | 156 +++++++-- lib/netdev-bsd.c | 1 + lib/netdev-dpdk.c | 1 + lib/netdev-dummy.c | 1 + lib/netdev-linux.c | 1 + lib/netdev-native-tnl.c | 23 +- lib/netdev-provider.h | 6 + lib/netdev-vport.c | 106 ++++-- lib/netdev-vport.h | 1 - lib/netdev.c | 8 + lib/netdev.h | 29 +- 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 | 41 +-- ofproto/ofproto-dpif.c | 4 +- ofproto/ofproto.c | 3 + ofproto/tunnel.c | 29 +- tests/automake.mk | 6 +- tests/dpif-netdev.at | 89 ++--- tests/odp.at | 1 + tests/ofproto-dpif.at | 230 ++++++------- tests/ofproto.at | 82 +++++ tests/ovs-ofctl.at | 2 +- tests/packet-type-aware.at | 495 ++++++++++++++++++++++++++++ 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 | 6 +- tests/tunnel-push-pop.at | 6 +- tests/tunnel.at | 18 +- utilities/ovs-ofctl.c | 1 + vswitchd/vswitch.xml | 94 +++++- 49 files changed, 2119 insertions(+), 509 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