diff options
| author | Ben Pfaff <blp@ovn.org> | 2017-06-23 16:47:59 +0000 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-06-27 17:28:30 -0400 |
| commit | 875ab13020b16269e0401b11fe0efc74e2cd952a (patch) | |
| tree | b474fb6bbb68be94bffd7ce6d4cd9a889408689c /ofproto/tunnel.c | |
| parent | 3d4b2e6eb74ed5bb5b35373aa8a489536938fee6 (diff) | |
| download | openvswitch-875ab13020b16269e0401b11fe0efc74e2cd952a.tar.gz | |
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@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto/tunnel.c')
| -rw-r--r-- | ofproto/tunnel.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index fa99b3102..c6856a09e 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -50,7 +50,7 @@ struct tnl_match { bool in_key_flow; bool ip_src_flow; bool ip_dst_flow; - bool is_layer3; + enum netdev_pt_mode pt_mode; }; struct tnl_port { @@ -164,7 +164,7 @@ tnl_port_add__(const struct ofport_dpif *ofport, const struct netdev *netdev, tnl_port->match.ip_dst_flow = cfg->ip_dst_flow; tnl_port->match.in_key_flow = cfg->in_key_flow; tnl_port->match.odp_port = odp_port; - tnl_port->match.is_layer3 = netdev_vport_is_layer3(netdev); + tnl_port->match.pt_mode = netdev_get_pt_mode(netdev); map = tnl_match_map(&tnl_port->match); existing_port = tnl_find_exact(&tnl_port->match, *map); @@ -564,8 +564,20 @@ tnl_find(const struct flow *flow) OVS_REQ_RDLOCK(rwlock) match.in_key_flow = in_key_flow; match.ip_dst_flow = ip_dst_flow; match.ip_src_flow = ip_src == IP_SRC_FLOW; - match.is_layer3 = flow->packet_type != htonl(PT_ETH); + /* Look for a legacy L2 or L3 tunnel port first. */ + if (pt_ns(flow->packet_type) == OFPHTN_ETHERTYPE) { + match.pt_mode = NETDEV_PT_LEGACY_L3; + } else { + match.pt_mode = NETDEV_PT_LEGACY_L2; + } + tnl_port = tnl_find_exact(&match, map); + if (tnl_port) { + return tnl_port; + } + + /* Then check for a packet type aware port. */ + match.pt_mode = NETDEV_PT_AWARE; tnl_port = tnl_find_exact(&match, map); if (tnl_port) { return tnl_port; @@ -614,11 +626,12 @@ tnl_match_fmt(const struct tnl_match *match, struct ds *ds) } else { ds_put_format(ds, ", key=%#"PRIx64, ntohll(match->in_key)); } - if (match->is_layer3) { - ds_put_cstr(ds, ", layer3"); - } - ds_put_format(ds, ", dp port=%"PRIu32, match->odp_port); + const char *pt_mode + = (match->pt_mode == NETDEV_PT_LEGACY_L2 ? "legacy_l2" + : match->pt_mode == NETDEV_PT_LEGACY_L3 ? "legacy_l3" + : "ptap"); + ds_put_format(ds, ", %s, dp port=%"PRIu32, pt_mode, match->odp_port); } static void |