X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Ftunnel.c;h=60e477376b31fa29f115d48f54442f020611fb8a;hb=89108874d59364313f9e5e192ba8ca00a2771d93;hp=3ea0eb44f92a0042425b26d89aa73eeb13133cad;hpb=c876a4bb9bcc881befac5647a1e311b5af09d549;p=cascardo%2Fovs.git diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index 3ea0eb44f..60e477376 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013, 2014 Nicira, Inc. +/* Copyright (c) 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,8 +47,8 @@ VLOG_DEFINE_THIS_MODULE(tunnel); struct tnl_match { ovs_be64 in_key; - ovs_be32 ip_src; - ovs_be32 ip_dst; + struct in6_addr ipv6_src; + struct in6_addr ipv6_dst; odp_port_t odp_port; uint32_t pkt_mark; bool in_key_flow; @@ -161,8 +161,12 @@ tnl_port_add__(const struct ofport_dpif *ofport, const struct netdev *netdev, tnl_port->change_seq = netdev_get_change_seq(tnl_port->netdev); tnl_port->match.in_key = cfg->in_key; - tnl_port->match.ip_src = cfg->ip_src; - tnl_port->match.ip_dst = cfg->ip_dst; + if (cfg->ip_src) { + in6_addr_set_mapped_ipv4(&tnl_port->match.ipv6_src, cfg->ip_src); + } + if (cfg->ip_dst) { + in6_addr_set_mapped_ipv4(&tnl_port->match.ipv6_dst, cfg->ip_dst); + } tnl_port->match.ip_src_flow = cfg->ip_src_flow; tnl_port->match.ip_dst_flow = cfg->ip_dst_flow; tnl_port->match.pkt_mark = cfg->ipsec ? IPSEC_MARK : 0; @@ -195,22 +199,27 @@ tnl_port_add__(const struct ofport_dpif *ofport, const struct netdev *netdev, tnl_port_mod_log(tnl_port, "adding"); if (native_tnl) { - tnl_port_map_insert(odp_port, tnl_port->match.ip_dst, - cfg->dst_port, name); + tnl_port_map_insert(odp_port, cfg->dst_port, name); } return true; } /* Adds 'ofport' to the module with datapath port number 'odp_port'. 'ofport's * must be added before they can be used by the module. 'ofport' must be a - * tunnel. */ -void + * tunnel. + * + * Returns 0 if successful, otherwise a positive errno value. */ +int tnl_port_add(const struct ofport_dpif *ofport, const struct netdev *netdev, odp_port_t odp_port, bool native_tnl, const char name[]) OVS_EXCLUDED(rwlock) { + bool ok; + fat_rwlock_wrlock(&rwlock); - tnl_port_add__(ofport, netdev, odp_port, true, native_tnl, name); + ok = tnl_port_add__(ofport, netdev, odp_port, true, native_tnl, name); fat_rwlock_unlock(&rwlock); + + return ok ? 0 : EEXIST; } /* Checks if the tunnel represented by 'ofport' reconfiguration due to changes @@ -257,7 +266,7 @@ tnl_port_del__(const struct ofport_dpif *ofport) OVS_REQ_WRLOCK(rwlock) netdev_get_tunnel_config(tnl_port->netdev); struct hmap **map; - tnl_port_map_delete(tnl_port->match.ip_dst, cfg->dst_port); + tnl_port_map_delete(cfg->dst_port); tnl_port_mod_log(tnl_port, "removing"); map = tnl_match_map(&tnl_port->match); hmap_remove(*map, &tnl_port->match_node); @@ -327,69 +336,58 @@ out: return ofport; } -static bool -tnl_ecn_ok(const struct flow *base_flow, struct flow *flow, - struct flow_wildcards *wc) -{ - if (is_ip_any(base_flow)) { - if ((flow->tunnel.ip_tos & IP_ECN_MASK) == IP_ECN_CE) { - if (wc) { - wc->masks.nw_tos |= IP_ECN_MASK; - } - if ((base_flow->nw_tos & IP_ECN_MASK) == IP_ECN_NOT_ECT) { - VLOG_WARN_RL(&rl, "dropping tunnel packet marked ECN CE" - " but is not ECN capable"); - return false; - } else { - /* Set the ECN CE value in the tunneled packet. */ - flow->nw_tos |= IP_ECN_CE; - } - } - } - - return true; -} - /* Should be called at the beginning of action translation to initialize * wildcards and perform any actions based on receiving on tunnel port. * * Returns false if the packet must be dropped. */ bool -tnl_xlate_init(const struct flow *base_flow, struct flow *flow, - struct flow_wildcards *wc) +tnl_process_ecn(struct flow *flow) { - /* tnl_port_should_receive() examines the 'tunnel.ip_dst' field to - * determine the presence of the tunnel metadata. However, since tunnels' - * datapath port numbers are different from the non-tunnel ports, and we - * always unwildcard the 'in_port', we do not need to unwildcard - * the 'tunnel.ip_dst' for non-tunneled packets. */ - if (tnl_port_should_receive(flow)) { - if (wc) { - wc->masks.tunnel.tun_id = OVS_BE64_MAX; - wc->masks.tunnel.ip_src = OVS_BE32_MAX; - wc->masks.tunnel.ip_dst = OVS_BE32_MAX; - wc->masks.tunnel.flags = (FLOW_TNL_F_DONT_FRAGMENT | - FLOW_TNL_F_CSUM | - FLOW_TNL_F_KEY); - wc->masks.tunnel.ip_tos = UINT8_MAX; - wc->masks.tunnel.ip_ttl = UINT8_MAX; - /* The tp_src and tp_dst members in flow_tnl are set to be always - * wildcarded, not to unwildcard them here. */ - wc->masks.tunnel.tp_src = 0; - wc->masks.tunnel.tp_dst = 0; - - memset(&wc->masks.pkt_mark, 0xff, sizeof wc->masks.pkt_mark); - } - if (!tnl_ecn_ok(base_flow, flow, wc)) { + if (!tnl_port_should_receive(flow)) { + return true; + } + + if (is_ip_any(flow) && (flow->tunnel.ip_tos & IP_ECN_MASK) == IP_ECN_CE) { + if ((flow->nw_tos & IP_ECN_MASK) == IP_ECN_NOT_ECT) { + VLOG_WARN_RL(&rl, "dropping tunnel packet marked ECN CE" + " but is not ECN capable"); return false; } - flow->pkt_mark &= ~IPSEC_MARK; + /* Set the ECN CE value in the tunneled packet. */ + flow->nw_tos |= IP_ECN_CE; } + flow->pkt_mark &= ~IPSEC_MARK; return true; } +void +tnl_wc_init(struct flow *flow, struct flow_wildcards *wc) +{ + if (tnl_port_should_receive(flow)) { + wc->masks.tunnel.tun_id = OVS_BE64_MAX; + wc->masks.tunnel.ip_src = OVS_BE32_MAX; + wc->masks.tunnel.ip_dst = OVS_BE32_MAX; + wc->masks.tunnel.flags = (FLOW_TNL_F_DONT_FRAGMENT | + FLOW_TNL_F_CSUM | + FLOW_TNL_F_KEY); + wc->masks.tunnel.ip_tos = UINT8_MAX; + wc->masks.tunnel.ip_ttl = UINT8_MAX; + /* The tp_src and tp_dst members in flow_tnl are set to be always + * wildcarded, not to unwildcard them here. */ + wc->masks.tunnel.tp_src = 0; + wc->masks.tunnel.tp_dst = 0; + + memset(&wc->masks.pkt_mark, 0xff, sizeof wc->masks.pkt_mark); + + if (is_ip_any(flow) + && (flow->tunnel.ip_tos & IP_ECN_MASK) == IP_ECN_CE) { + wc->masks.nw_tos |= IP_ECN_MASK; + } + } +} + /* Given that 'flow' should be output to the ofport corresponding to * 'tnl_port', updates 'flow''s tunnel headers and returns the actual datapath * port that the output should happen on. May return ODPP_NONE if the output @@ -418,10 +416,10 @@ tnl_port_send(const struct ofport_dpif *ofport, struct flow *flow, } if (!cfg->ip_src_flow) { - flow->tunnel.ip_src = tnl_port->match.ip_src; + flow->tunnel.ip_src = in6_addr_get_mapped_ipv4(&tnl_port->match.ipv6_src); } if (!cfg->ip_dst_flow) { - flow->tunnel.ip_dst = tnl_port->match.ip_dst; + flow->tunnel.ip_dst = in6_addr_get_mapped_ipv4(&tnl_port->match.ipv6_dst); } flow->pkt_mark = tnl_port->match.pkt_mark; @@ -454,7 +452,7 @@ tnl_port_send(const struct ofport_dpif *ofport, struct flow *flow, } } - flow->tunnel.flags = (cfg->dont_fragment ? FLOW_TNL_F_DONT_FRAGMENT : 0) + flow->tunnel.flags |= (cfg->dont_fragment ? FLOW_TNL_F_DONT_FRAGMENT : 0) | (cfg->csum ? FLOW_TNL_F_CSUM : 0) | (cfg->out_key_present ? FLOW_TNL_F_KEY : 0); @@ -541,10 +539,12 @@ tnl_find(const struct flow *flow) OVS_REQ_RDLOCK(rwlock) * here as a description of how to treat received * packets. */ match.in_key = in_key_flow ? 0 : flow->tunnel.tun_id; - match.ip_src = (ip_src == IP_SRC_CFG - ? flow->tunnel.ip_dst - : 0); - match.ip_dst = ip_dst_flow ? 0 : flow->tunnel.ip_src; + if (ip_src == IP_SRC_CFG && flow->tunnel.ip_dst) { + in6_addr_set_mapped_ipv4(&match.ipv6_src, flow->tunnel.ip_dst); + } + if (!ip_dst_flow && flow->tunnel.ip_src) { + in6_addr_set_mapped_ipv4(&match.ipv6_dst, flow->tunnel.ip_src); + } match.odp_port = flow->in_port.odp_port; match.pkt_mark = flow->pkt_mark; match.in_key_flow = in_key_flow; @@ -573,7 +573,7 @@ tnl_match_map(const struct tnl_match *m) enum ip_src_type ip_src; ip_src = (m->ip_src_flow ? IP_SRC_FLOW - : m->ip_src ? IP_SRC_CFG + : ipv6_addr_is_set(&m->ipv6_src) ? IP_SRC_CFG : IP_SRC_ANY); return &tnl_match_maps[6 * m->in_key_flow + 3 * m->ip_dst_flow + ip_src]; @@ -584,10 +584,12 @@ tnl_match_fmt(const struct tnl_match *match, struct ds *ds) OVS_REQ_RDLOCK(rwlock) { if (!match->ip_dst_flow) { - ds_put_format(ds, IP_FMT"->"IP_FMT, IP_ARGS(match->ip_src), - IP_ARGS(match->ip_dst)); + print_ipv6_mapped(ds, &match->ipv6_src); + ds_put_cstr(ds, "->"); + print_ipv6_mapped(ds, &match->ipv6_dst); } else if (!match->ip_src_flow) { - ds_put_format(ds, IP_FMT"->flow", IP_ARGS(match->ip_src)); + print_ipv6_mapped(ds, &match->ipv6_src); + ds_put_cstr(ds, "->flow"); } else { ds_put_cstr(ds, "flow->flow"); } @@ -675,8 +677,8 @@ tnl_port_get_name(const struct tnl_port *tnl_port) OVS_REQ_RDLOCK(rwlock) int tnl_port_build_header(const struct ofport_dpif *ofport, const struct flow *tnl_flow, - uint8_t dmac[ETH_ADDR_LEN], - uint8_t smac[ETH_ADDR_LEN], + const struct eth_addr dmac, + const struct eth_addr smac, ovs_be32 ip_src, struct ovs_action_push_tnl *data) { struct tnl_port *tnl_port; @@ -693,8 +695,8 @@ tnl_port_build_header(const struct ofport_dpif *ofport, memset(data->header, 0, sizeof data->header); eth = (struct eth_header *)data->header; - memcpy(eth->eth_dst, dmac, ETH_ADDR_LEN); - memcpy(eth->eth_src, smac, ETH_ADDR_LEN); + eth->eth_dst = dmac; + eth->eth_src = smac; eth->eth_type = htons(ETH_TYPE_IP); l3 = (eth + 1);