ofp-util: Work on decoding OF1.1 flow_mods.

[openvswitch] / datapath / tunnel.c

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index cdbf94ab9a428e42d49cbf9e7deca590855b4f88..d651c11833885a573cc743d1a08bc6d2a40e001e 100644 (file)
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -111,7 +111,7 @@ static unsigned int multicast_ports __read_mostly;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
 static struct hh_cache *rt_hh(struct rtable *rt)
 {
-       struct neighbour *neigh = dst_get_neighbour(&rt->dst);
+       struct neighbour *neigh = dst_get_neighbour_noref(&rt->dst);
        if (!neigh || !(neigh->nud_state & NUD_CONNECTED) ||
                        !neigh->hh.hh_len)
                return NULL;
@@ -1002,12 +1002,15 @@ unlock:
 static struct rtable *__find_route(const struct tnl_mutable_config *mutable,
                                   u8 ipproto, u8 tos)
 {
+       /* Tunnel configuration keeps DSCP part of TOS bits, But Linux
+        * router expect RT_TOS bits only. */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
        struct flowi fl = { .nl_u = { .ip4_u = {
                                        .daddr = mutable->key.daddr,
                                        .saddr = mutable->key.saddr,
-                                       .tos = tos } },
-                           .proto = ipproto };
+                                       .tos   = RT_TOS(tos) } },
+                                       .proto = ipproto };
        struct rtable *rt;
 
        if (unlikely(ip_route_output_key(port_key_get_net(&mutable->key), &rt, &fl)))
@@ -1017,7 +1020,7 @@ static struct rtable *__find_route(const struct tnl_mutable_config *mutable,
 #else
        struct flowi4 fl = { .daddr = mutable->key.daddr,
                             .saddr = mutable->key.saddr,
-                            .flowi4_tos = tos,
+                            .flowi4_tos = RT_TOS(tos),
                             .flowi4_proto = ipproto };
 
        return ip_route_output_key(port_key_get_net(&mutable->key), &fl);
@@ -1034,7 +1037,7 @@ static struct rtable *find_route(struct vport *vport,
        *cache = NULL;
        tos = RT_TOS(tos);
 
-       if (likely(tos == mutable->tos &&
+       if (likely(tos == RT_TOS(mutable->tos) &&
            check_cache_valid(cur_cache, mutable))) {
                *cache = cur_cache;
                return cur_cache->rt;
@@ -1045,7 +1048,7 @@ static struct rtable *find_route(struct vport *vport,
                if (IS_ERR(rt))
                        return NULL;
 
-               if (likely(tos == mutable->tos))
+               if (likely(tos == RT_TOS(mutable->tos)))
                        *cache = build_cache(vport, mutable, rt);
 
                return rt;
@@ -1219,8 +1222,6 @@ int ovs_tnl_send(struct vport *vport, struct sk_buff *skb)
        else
                tos = mutable->tos;
 
-       tos = INET_ECN_encapsulate(tos, inner_tos);
-
        /* Route lookup */
        rt = find_route(vport, mutable, tos, &cache);
        if (unlikely(!rt))
@@ -1228,6 +1229,8 @@ int ovs_tnl_send(struct vport *vport, struct sk_buff *skb)
        if (unlikely(!cache))
                unattached_dst = &rt_dst(rt);
 
+       tos = INET_ECN_encapsulate(tos, inner_tos);
+
        /* Reset SKB */
        nf_reset(skb);
        secpath_reset(skb);
@@ -1402,7 +1405,8 @@ static int tnl_set_config(struct net *net, struct nlattr *options,
 
        if (a[OVS_TUNNEL_ATTR_TOS]) {
                mutable->tos = nla_get_u8(a[OVS_TUNNEL_ATTR_TOS]);
-               if (mutable->tos != RT_TOS(mutable->tos))
+               /* Reject ToS config with ECN bits set. */
+               if (mutable->tos & INET_ECN_MASK)
                        return -EINVAL;
        }
 
@@ -1553,19 +1557,24 @@ int ovs_tnl_get_options(const struct vport *vport, struct sk_buff *skb)
        const struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
        const struct tnl_mutable_config *mutable = rcu_dereference_rtnl(tnl_vport->mutable);
 
-       NLA_PUT_U32(skb, OVS_TUNNEL_ATTR_FLAGS, mutable->flags & TNL_F_PUBLIC);
-       NLA_PUT_BE32(skb, OVS_TUNNEL_ATTR_DST_IPV4, mutable->key.daddr);
-
-       if (!(mutable->flags & TNL_F_IN_KEY_MATCH))
-               NLA_PUT_BE64(skb, OVS_TUNNEL_ATTR_IN_KEY, mutable->key.in_key);
-       if (!(mutable->flags & TNL_F_OUT_KEY_ACTION))
-               NLA_PUT_BE64(skb, OVS_TUNNEL_ATTR_OUT_KEY, mutable->out_key);
-       if (mutable->key.saddr)
-               NLA_PUT_BE32(skb, OVS_TUNNEL_ATTR_SRC_IPV4, mutable->key.saddr);
-       if (mutable->tos)
-               NLA_PUT_U8(skb, OVS_TUNNEL_ATTR_TOS, mutable->tos);
-       if (mutable->ttl)
-               NLA_PUT_U8(skb, OVS_TUNNEL_ATTR_TTL, mutable->ttl);
+       if (nla_put_u32(skb, OVS_TUNNEL_ATTR_FLAGS,
+                     mutable->flags & TNL_F_PUBLIC) ||
+           nla_put_be32(skb, OVS_TUNNEL_ATTR_DST_IPV4, mutable->key.daddr))
+               goto nla_put_failure;
+
+       if (!(mutable->flags & TNL_F_IN_KEY_MATCH) &&
+           nla_put_be64(skb, OVS_TUNNEL_ATTR_IN_KEY, mutable->key.in_key))
+               goto nla_put_failure;
+       if (!(mutable->flags & TNL_F_OUT_KEY_ACTION) &&
+           nla_put_be64(skb, OVS_TUNNEL_ATTR_OUT_KEY, mutable->out_key))
+               goto nla_put_failure;
+       if (mutable->key.saddr &&
+           nla_put_be32(skb, OVS_TUNNEL_ATTR_SRC_IPV4, mutable->key.saddr))
+               goto nla_put_failure;
+       if (mutable->tos && nla_put_u8(skb, OVS_TUNNEL_ATTR_TOS, mutable->tos))
+               goto nla_put_failure;
+       if (mutable->ttl && nla_put_u8(skb, OVS_TUNNEL_ATTR_TTL, mutable->ttl))
+               goto nla_put_failure;
 
        return 0;