X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Ftunnel.c;h=b238cd06044ca736491e3b06f18f827f027bd130;hb=e441a806a0387487080ca16176ffdee7a75b3d1e;hp=ce325c00673e5e8bc087233aa153d64add1777d8;hpb=fa1173605150ace75da049ade03367070cc674c3;p=sliver-openvswitch.git diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index ce325c006..b238cd060 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -31,12 +31,15 @@ VLOG_DEFINE_THIS_MODULE(tunnel); +/* skb mark used for IPsec tunnel packets */ +#define IPSEC_MARK 1 + struct tnl_match { ovs_be64 in_key; ovs_be32 ip_src; ovs_be32 ip_dst; odp_port_t odp_port; - uint32_t skb_mark; + uint32_t pkt_mark; bool in_key_flow; bool ip_src_flow; bool ip_dst_flow; @@ -64,25 +67,25 @@ static struct hmap *ofport_map OVS_GUARDED_BY(rwlock) = &ofport_map__; static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); static struct vlog_rate_limit dbg_rl = VLOG_RATE_LIMIT_INIT(60, 60); -static struct tnl_port *tnl_find(struct tnl_match *) OVS_REQ_RDLOCK(&rwlock); +static struct tnl_port *tnl_find(const struct flow *) OVS_REQ_RDLOCK(rwlock); static struct tnl_port *tnl_find_exact(struct tnl_match *) - OVS_REQ_RDLOCK(&rwlock); + OVS_REQ_RDLOCK(rwlock); static struct tnl_port *tnl_find_ofport(const struct ofport_dpif *) - OVS_REQ_RDLOCK(&rwlock); + OVS_REQ_RDLOCK(rwlock); static uint32_t tnl_hash(struct tnl_match *); static void tnl_match_fmt(const struct tnl_match *, struct ds *); -static char *tnl_port_fmt(const struct tnl_port *) OVS_REQ_RDLOCK(&rwlock); +static char *tnl_port_fmt(const struct tnl_port *) OVS_REQ_RDLOCK(rwlock); static void tnl_port_mod_log(const struct tnl_port *, const char *action) - OVS_REQ_RDLOCK(&rwlock); + OVS_REQ_RDLOCK(rwlock); static const char *tnl_port_get_name(const struct tnl_port *) - OVS_REQ_RDLOCK(&rwlock); -static void tnl_port_del__(const struct ofport_dpif *) OVS_REQ_WRLOCK(&rwlock); + OVS_REQ_RDLOCK(rwlock); +static void tnl_port_del__(const struct ofport_dpif *) OVS_REQ_WRLOCK(rwlock); static bool tnl_port_add__(const struct ofport_dpif *ofport, const struct netdev *netdev, odp_port_t odp_port, bool warn) - OVS_REQ_WRLOCK(&rwlock) + OVS_REQ_WRLOCK(rwlock) { const struct netdev_tunnel_config *cfg; struct tnl_port *existing_port; @@ -101,7 +104,7 @@ tnl_port_add__(const struct ofport_dpif *ofport, const struct netdev *netdev, tnl_port->match.ip_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.skb_mark = cfg->ipsec ? IPSEC_MARK : 0; + tnl_port->match.pkt_mark = cfg->ipsec ? IPSEC_MARK : 0; tnl_port->match.in_key_flow = cfg->in_key_flow; tnl_port->match.odp_port = odp_port; @@ -206,24 +209,15 @@ tnl_port_receive(const struct flow *flow) OVS_EXCLUDED(rwlock) char *pre_flow_str = NULL; const struct ofport_dpif *ofport; struct tnl_port *tnl_port; - struct tnl_match match; - - memset(&match, 0, sizeof match); - match.odp_port = flow->in_port.odp_port; - match.ip_src = flow->tunnel.ip_dst; - match.ip_dst = flow->tunnel.ip_src; - match.in_key = flow->tunnel.tun_id; - match.skb_mark = flow->skb_mark; ovs_rwlock_rdlock(&rwlock); - tnl_port = tnl_find(&match); + tnl_port = tnl_find(flow); ofport = tnl_port ? tnl_port->ofport : NULL; if (!tnl_port) { - struct ds ds = DS_EMPTY_INITIALIZER; + char *flow_str = flow_to_string(flow); - tnl_match_fmt(&match, &ds); - VLOG_WARN_RL(&rl, "receive tunnel port not found (%s)", ds_cstr(&ds)); - ds_destroy(&ds); + VLOG_WARN_RL(&rl, "receive tunnel port not found (%s)", flow_str); + free(flow_str); goto out; } @@ -249,6 +243,46 @@ out: return ofport; } +static bool +tnl_ecn_ok(const struct flow *base_flow, struct flow *flow) +{ + if (is_ip_any(base_flow) + && (flow->tunnel.ip_tos & IP_ECN_MASK) == IP_ECN_CE) { + 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) +{ + if (tnl_port_should_receive(flow)) { + memset(&wc->masks.tunnel, 0xff, sizeof wc->masks.tunnel); + memset(&wc->masks.pkt_mark, 0xff, sizeof wc->masks.pkt_mark); + + if (!tnl_ecn_ok(base_flow, flow)) { + return false; + } + + flow->pkt_mark &= ~IPSEC_MARK; + } + + return true; +} + /* 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 @@ -282,7 +316,7 @@ tnl_port_send(const struct ofport_dpif *ofport, struct flow *flow, if (!cfg->ip_dst_flow) { flow->tunnel.ip_dst = tnl_port->match.ip_dst; } - flow->skb_mark = tnl_port->match.skb_mark; + flow->pkt_mark = tnl_port->match.pkt_mark; if (!cfg->out_key_flow) { flow->tunnel.tun_id = cfg->out_key; @@ -370,55 +404,55 @@ tnl_find_exact(struct tnl_match *match) OVS_REQ_RDLOCK(rwlock) return NULL; } +/* Returns the tnl_port that is the best match for the tunnel data in 'flow', + * or NULL if no tnl_port matches 'flow'. */ static struct tnl_port * -tnl_find(struct tnl_match *match_) OVS_REQ_RDLOCK(rwlock) +tnl_find(const struct flow *flow) OVS_REQ_RDLOCK(rwlock) { - struct tnl_match match = *match_; - struct tnl_port *tnl_port; + enum ip_src_type { + IP_SRC_CFG, /* ip_src must equal configured address. */ + IP_SRC_ANY, /* Any ip_src is acceptable. */ + IP_SRC_FLOW /* ip_src is handled in flow table. */ + }; + + struct tnl_match_pattern { + bool in_key_flow; + bool ip_dst_flow; + enum ip_src_type ip_src; + }; + + static const struct tnl_match_pattern patterns[] = { + { false, false, IP_SRC_CFG }, /* remote_ip, local_ip, in_key. */ + { false, false, IP_SRC_ANY }, /* remote_ip, in_key. */ + { true, false, IP_SRC_CFG }, /* remote_ip, local_ip. */ + { true, false, IP_SRC_ANY }, /* remote_ip. */ + { true, true, IP_SRC_ANY }, /* Flow-based remote. */ + { true, true, IP_SRC_FLOW }, /* Flow-based everything. */ + }; + + const struct tnl_match_pattern *p; + struct tnl_match match; - /* remote_ip, local_ip, in_key */ - tnl_port = tnl_find_exact(&match); - if (tnl_port) { - return tnl_port; - } + memset(&match, 0, sizeof match); + match.odp_port = flow->in_port.odp_port; + match.pkt_mark = flow->pkt_mark; - /* remote_ip, in_key */ - match.ip_src = 0; - tnl_port = tnl_find_exact(&match); - if (tnl_port) { - return tnl_port; - } - match.ip_src = match_->ip_src; + for (p = patterns; p < &patterns[ARRAY_SIZE(patterns)]; p++) { + struct tnl_port *tnl_port; - /* remote_ip, local_ip */ - match.in_key = 0; - match.in_key_flow = true; - tnl_port = tnl_find_exact(&match); - if (tnl_port) { - return tnl_port; - } + match.in_key_flow = p->in_key_flow; + match.in_key = p->in_key_flow ? 0 : flow->tunnel.tun_id; - /* remote_ip */ - match.ip_src = 0; - tnl_port = tnl_find_exact(&match); - if (tnl_port) { - return tnl_port; - } + match.ip_dst_flow = p->ip_dst_flow; + match.ip_dst = p->ip_dst_flow ? 0 : flow->tunnel.ip_src; - /* Flow-based remote */ - match.ip_dst = 0; - match.ip_dst_flow = true; - tnl_port = tnl_find_exact(&match); - if (tnl_port) { - return tnl_port; - } + match.ip_src_flow = p->ip_src == IP_SRC_FLOW; + match.ip_src = p->ip_src == IP_SRC_CFG ? flow->tunnel.ip_dst : 0; - /* Flow-based everything */ - match.ip_src = 0; - match.ip_src_flow = true; - tnl_port = tnl_find_exact(&match); - if (tnl_port) { - return tnl_port; + tnl_port = tnl_find_exact(&match); + if (tnl_port) { + return tnl_port; + } } return NULL; @@ -444,7 +478,7 @@ tnl_match_fmt(const struct tnl_match *match, struct ds *ds) } ds_put_format(ds, ", dp port=%"PRIu32, match->odp_port); - ds_put_format(ds, ", skb mark=%"PRIu32, match->skb_mark); + ds_put_format(ds, ", pkt mark=%"PRIu32, match->pkt_mark); } static void