X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Ftunnel.c;h=19056b97b4f9c3d5a8decaff75abba7c5738128f;hb=9e44d715638af28689b15ef0c5be920e61c7997b;hp=67556d706343579ab0cf12c43c18c6ec91466cbc;hpb=df2c07f4338faac04f4969f243fe4e8083b309ac;p=openvswitch diff --git a/datapath/tunnel.c b/datapath/tunnel.c index 67556d70..19056b97 100644 --- a/datapath/tunnel.c +++ b/datapath/tunnel.c @@ -10,12 +10,16 @@ #include #include #include +#include #include #include +#include #include +#include #include #include #include +#include #include #include @@ -31,7 +35,6 @@ #include "actions.h" #include "checksum.h" #include "datapath.h" -#include "table.h" #include "tunnel.h" #include "vlan.h" #include "vport.h" @@ -68,8 +71,10 @@ #define CACHE_CLEANER_INTERVAL (5 * HZ) #define CACHE_DATA_ALIGN 16 +#define PORT_TABLE_SIZE 1024 -static struct tbl __rcu *port_table __read_mostly; +static struct hlist_head *port_table __read_mostly; +static int port_table_count; static void cache_cleaner(struct work_struct *work); static DECLARE_DELAYED_WORK(cache_cleaner_wq, cache_cleaner); @@ -81,8 +86,10 @@ static DECLARE_DELAYED_WORK(cache_cleaner_wq, cache_cleaner); */ static unsigned int key_local_remote_ports __read_mostly; static unsigned int key_remote_ports __read_mostly; +static unsigned int key_multicast_ports __read_mostly; static unsigned int local_remote_ports __read_mostly; static unsigned int remote_ports __read_mostly; +static unsigned int multicast_ports __read_mostly; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) #define rt_dst(rt) (rt->dst) @@ -90,26 +97,34 @@ static unsigned int remote_ports __read_mostly; #define rt_dst(rt) (rt->u.dst) #endif -static inline struct vport *tnl_vport_to_vport(const struct tnl_vport *tnl_vport) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) +static struct hh_cache *rt_hh(struct rtable *rt) { - return vport_from_priv(tnl_vport); + struct neighbour *neigh = dst_get_neighbour(&rt->dst); + if (!neigh || !(neigh->nud_state & NUD_CONNECTED) || + !neigh->hh.hh_len) + return NULL; + return &neigh->hh; } +#else +#define rt_hh(rt) (rt_dst(rt).hh) +#endif -static inline struct tnl_vport *tnl_vport_table_cast(const struct tbl_node *node) +static struct vport *tnl_vport_to_vport(const struct tnl_vport *tnl_vport) { - return container_of(node, struct tnl_vport, tbl_node); + return vport_from_priv(tnl_vport); } /* This is analogous to rtnl_dereference for the tunnel cache. It checks that * cache_lock is held, so it is only for update side code. */ -static inline struct tnl_cache *cache_dereference(struct tnl_vport *tnl_vport) +static struct tnl_cache *cache_dereference(struct tnl_vport *tnl_vport) { return rcu_dereference_protected(tnl_vport->cache, - lockdep_is_held(&tnl_vport->cache_lock)); + lockdep_is_held(&tnl_vport->cache_lock)); } -static inline void schedule_cache_cleaner(void) +static void schedule_cache_cleaner(void) { schedule_delayed_work(&cache_cleaner_wq, CACHE_CLEANER_INTERVAL); } @@ -136,6 +151,21 @@ static void free_cache_rcu(struct rcu_head *rcu) free_cache(c); } +/* Frees the portion of 'mutable' that requires RTNL and thus can't happen + * within an RCU callback. Fortunately this part doesn't require waiting for + * an RCU grace period. + */ +static void free_mutable_rtnl(struct tnl_mutable_config *mutable) +{ + ASSERT_RTNL(); + if (ipv4_is_multicast(mutable->key.daddr) && mutable->mlink) { + struct in_device *in_dev; + in_dev = inetdev_by_index(&init_net, mutable->mlink); + if (in_dev) + ip_mc_dec_group(in_dev, mutable->key.daddr); + } +} + static void assign_config_rcu(struct vport *vport, struct tnl_mutable_config *new_config) { @@ -144,6 +174,8 @@ static void assign_config_rcu(struct vport *vport, old_config = rtnl_dereference(tnl_vport->mutable); rcu_assign_pointer(tnl_vport->mutable, new_config); + + free_mutable_rtnl(old_config); call_rcu(&old_config->rcu, free_config_rcu); } @@ -161,163 +193,101 @@ static void assign_cache_rcu(struct vport *vport, struct tnl_cache *new_cache) static unsigned int *find_port_pool(const struct tnl_mutable_config *mutable) { + bool is_multicast = ipv4_is_multicast(mutable->key.daddr); + if (mutable->flags & TNL_F_IN_KEY_MATCH) { - if (mutable->saddr) + if (mutable->key.saddr) return &local_remote_ports; + else if (is_multicast) + return &multicast_ports; else return &remote_ports; } else { - if (mutable->saddr) + if (mutable->key.saddr) return &key_local_remote_ports; + else if (is_multicast) + return &key_multicast_ports; else return &key_remote_ports; } } -struct port_lookup_key { - const struct tnl_mutable_config *mutable; - __be64 key; - u32 tunnel_type; - __be32 saddr; - __be32 daddr; -}; - -/* - * Modifies 'target' to store the rcu_dereferenced pointer that was used to do - * the comparision. - */ -static int port_cmp(const struct tbl_node *node, void *target, int unused) +static u32 port_hash(const struct port_lookup_key *key) { - const struct tnl_vport *tnl_vport = tnl_vport_table_cast(node); - struct port_lookup_key *lookup = target; - - lookup->mutable = rcu_dereference_rtnl(tnl_vport->mutable); - - return (lookup->mutable->tunnel_type == lookup->tunnel_type && - lookup->mutable->daddr == lookup->daddr && - lookup->mutable->in_key == lookup->key && - lookup->mutable->saddr == lookup->saddr); + return jhash2((u32 *)key, (PORT_KEY_LEN / sizeof(u32)), 0); } -static u32 port_hash(struct port_lookup_key *k) +static struct hlist_head *find_bucket(u32 hash) { - u32 x = jhash_3words((__force u32)k->saddr, (__force u32)k->daddr, - k->tunnel_type, 0); - return jhash_2words((__force u64)k->key >> 32, (__force u32)k->key, x); + return &port_table[(hash & (PORT_TABLE_SIZE - 1))]; } -static u32 mutable_hash(const struct tnl_mutable_config *mutable) +static void port_table_add_port(struct vport *vport) { - struct port_lookup_key lookup; - - lookup.saddr = mutable->saddr; - lookup.daddr = mutable->daddr; - lookup.key = mutable->in_key; - lookup.tunnel_type = mutable->tunnel_type; - - return port_hash(&lookup); -} - -static void check_table_empty(void) -{ - struct tbl *old_table = rtnl_dereference(port_table); - - if (tbl_count(old_table) == 0) { - cancel_delayed_work_sync(&cache_cleaner_wq); - rcu_assign_pointer(port_table, NULL); - tbl_deferred_destroy(old_table, NULL); - } -} - -static int add_port(struct vport *vport) -{ - struct tbl *cur_table = rtnl_dereference(port_table); struct tnl_vport *tnl_vport = tnl_vport_priv(vport); - int err; - - if (!port_table) { - struct tbl *new_table; - - new_table = tbl_create(TBL_MIN_BUCKETS); - if (!new_table) - return -ENOMEM; + const struct tnl_mutable_config *mutable; + u32 hash; - rcu_assign_pointer(port_table, new_table); + if (port_table_count == 0) schedule_cache_cleaner(); - } else if (tbl_count(cur_table) > tbl_n_buckets(cur_table)) { - struct tbl *new_table; - - new_table = tbl_expand(cur_table); - if (IS_ERR(new_table)) { - if (PTR_ERR(new_table) != -ENOSPC) - return PTR_ERR(new_table); - } else { - rcu_assign_pointer(port_table, new_table); - tbl_deferred_destroy(cur_table, NULL); - } - } - - err = tbl_insert(rtnl_dereference(port_table), &tnl_vport->tbl_node, - mutable_hash(rtnl_dereference(tnl_vport->mutable))); - if (err) { - check_table_empty(); - return err; - } + mutable = rtnl_dereference(tnl_vport->mutable); + hash = port_hash(&mutable->key); + hlist_add_head_rcu(&tnl_vport->hash_node, find_bucket(hash)); + port_table_count++; (*find_port_pool(rtnl_dereference(tnl_vport->mutable)))++; - - return 0; } -static int move_port(struct vport *vport, struct tnl_mutable_config *new_mutable) +static void port_table_move_port(struct vport *vport, + struct tnl_mutable_config *new_mutable) { - int err; - struct tbl *cur_table = rtnl_dereference(port_table); struct tnl_vport *tnl_vport = tnl_vport_priv(vport); u32 hash; - hash = mutable_hash(new_mutable); - if (hash == tnl_vport->tbl_node.hash) - goto table_updated; - - /* - * Ideally we should make this move atomic to avoid having gaps in - * finding tunnels or the possibility of failure. However, if we do - * find a tunnel it will always be consistent. - */ - err = tbl_remove(cur_table, &tnl_vport->tbl_node); - if (err) - return err; - - err = tbl_insert(cur_table, &tnl_vport->tbl_node, hash); - if (err) { - (*find_port_pool(rtnl_dereference(tnl_vport->mutable)))--; - check_table_empty(); - return err; - } + hash = port_hash(&new_mutable->key); + hlist_del_init_rcu(&tnl_vport->hash_node); + hlist_add_head_rcu(&tnl_vport->hash_node, find_bucket(hash)); -table_updated: (*find_port_pool(rtnl_dereference(tnl_vport->mutable)))--; assign_config_rcu(vport, new_mutable); (*find_port_pool(rtnl_dereference(tnl_vport->mutable)))++; - - return 0; } -static int del_port(struct vport *vport) +static void port_table_remove_port(struct vport *vport) { struct tnl_vport *tnl_vport = tnl_vport_priv(vport); - int err; - err = tbl_remove(rtnl_dereference(port_table), &tnl_vport->tbl_node); - if (err) - return err; + hlist_del_init_rcu(&tnl_vport->hash_node); + + port_table_count--; + if (port_table_count == 0) + cancel_delayed_work_sync(&cache_cleaner_wq); - check_table_empty(); (*find_port_pool(rtnl_dereference(tnl_vport->mutable)))--; +} - return 0; +static struct vport *port_table_lookup(struct port_lookup_key *key, + const struct tnl_mutable_config **pmutable) +{ + struct hlist_node *n; + struct hlist_head *bucket; + u32 hash = port_hash(key); + struct tnl_vport *tnl_vport; + + bucket = find_bucket(hash); + + hlist_for_each_entry_rcu(tnl_vport, n, bucket, hash_node) { + struct tnl_mutable_config *mutable; + + mutable = rcu_dereference_rtnl(tnl_vport->mutable); + if (!memcmp(&mutable->key, key, PORT_KEY_LEN)) { + *pmutable = mutable; + return tnl_vport_to_vport(tnl_vport); + } + } + + return NULL; } struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be64 key, @@ -325,64 +295,64 @@ struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be64 key, const struct tnl_mutable_config **mutable) { struct port_lookup_key lookup; - struct tbl *table = rcu_dereference_rtnl(port_table); - struct tbl_node *tbl_node; - - if (unlikely(!table)) - return NULL; + struct vport *vport; + bool is_multicast = ipv4_is_multicast(saddr); lookup.saddr = saddr; lookup.daddr = daddr; - if (tunnel_type & TNL_T_KEY_EXACT) { - lookup.key = key; - lookup.tunnel_type = tunnel_type & ~TNL_T_KEY_MATCH; - - if (key_local_remote_ports) { - tbl_node = tbl_lookup(table, &lookup, sizeof(lookup), - port_hash(&lookup), port_cmp); - if (tbl_node) - goto found; - } - - if (key_remote_ports) { - lookup.saddr = 0; - - tbl_node = tbl_lookup(table, &lookup, sizeof(lookup), - port_hash(&lookup), port_cmp); - if (tbl_node) - goto found; + /* First try for exact match on in_key. */ + lookup.in_key = key; + lookup.tunnel_type = tunnel_type | TNL_T_KEY_EXACT; + if (!is_multicast && key_local_remote_ports) { + vport = port_table_lookup(&lookup, mutable); + if (vport) + return vport; + } + if (key_remote_ports) { + lookup.saddr = 0; + vport = port_table_lookup(&lookup, mutable); + if (vport) + return vport; - lookup.saddr = saddr; - } + lookup.saddr = saddr; } - if (tunnel_type & TNL_T_KEY_MATCH) { - lookup.key = 0; - lookup.tunnel_type = tunnel_type & ~TNL_T_KEY_EXACT; + /* Then try matches that wildcard in_key. */ + lookup.in_key = 0; + lookup.tunnel_type = tunnel_type | TNL_T_KEY_MATCH; + if (!is_multicast && local_remote_ports) { + vport = port_table_lookup(&lookup, mutable); + if (vport) + return vport; + } + if (remote_ports) { + lookup.saddr = 0; + vport = port_table_lookup(&lookup, mutable); + if (vport) + return vport; + } - if (local_remote_ports) { - tbl_node = tbl_lookup(table, &lookup, sizeof(lookup), - port_hash(&lookup), port_cmp); - if (tbl_node) - goto found; + if (is_multicast) { + lookup.saddr = 0; + lookup.daddr = saddr; + if (key_multicast_ports) { + lookup.tunnel_type = tunnel_type | TNL_T_KEY_EXACT; + lookup.in_key = key; + vport = port_table_lookup(&lookup, mutable); + if (vport) + return vport; } - - if (remote_ports) { - lookup.saddr = 0; - - tbl_node = tbl_lookup(table, &lookup, sizeof(lookup), - port_hash(&lookup), port_cmp); - if (tbl_node) - goto found; + if (multicast_ports) { + lookup.tunnel_type = tunnel_type | TNL_T_KEY_MATCH; + lookup.in_key = 0; + vport = port_table_lookup(&lookup, mutable); + if (vport) + return vport; } } return NULL; - -found: - *mutable = lookup.mutable; - return tnl_vport_to_vport(tnl_vport_table_cast(tbl_node)); } static void ecn_decapsulate(struct sk_buff *skb, u8 tos) @@ -628,7 +598,8 @@ static void ipv6_build_icmp(struct sk_buff *skb, struct sk_buff *nskb, } #endif /* IPv6 */ -bool tnl_frag_needed(struct vport *vport, const struct tnl_mutable_config *mutable, +bool tnl_frag_needed(struct vport *vport, + const struct tnl_mutable_config *mutable, struct sk_buff *skb, unsigned int mtu, __be64 flow_key) { unsigned int eth_hdr_len = ETH_HLEN; @@ -825,15 +796,21 @@ static void create_tunnel_header(const struct vport *vport, tnl_vport->tnl_ops->build_header(vport, mutable, iph + 1); } -static inline void *get_cached_header(const struct tnl_cache *cache) +static void *get_cached_header(const struct tnl_cache *cache) { return (void *)cache + ALIGN(sizeof(struct tnl_cache), CACHE_DATA_ALIGN); } -static inline bool check_cache_valid(const struct tnl_cache *cache, - const struct tnl_mutable_config *mutable) +static bool check_cache_valid(const struct tnl_cache *cache, + const struct tnl_mutable_config *mutable) { - return cache && + struct hh_cache *hh; + + if (!cache) + return false; + + hh = rt_hh(cache->rt); + return hh && #ifdef NEED_CACHE_TIMEOUT time_before(jiffies, cache->expiration) && #endif @@ -841,17 +818,17 @@ static inline bool check_cache_valid(const struct tnl_cache *cache, atomic_read(&init_net.ipv4.rt_genid) == cache->rt->rt_genid && #endif #ifdef HAVE_HH_SEQ - rt_dst(cache->rt).hh->hh_lock.sequence == cache->hh_seq && + hh->hh_lock.sequence == cache->hh_seq && #endif mutable->seq == cache->mutable_seq && (!is_internal_dev(rt_dst(cache->rt).dev) || (cache->flow && !cache->flow->dead)); } -static int cache_cleaner_cb(struct tbl_node *tbl_node, void *aux) +static void __cache_cleaner(struct tnl_vport *tnl_vport) { - struct tnl_vport *tnl_vport = tnl_vport_table_cast(tbl_node); - const struct tnl_mutable_config *mutable = rcu_dereference(tnl_vport->mutable); + const struct tnl_mutable_config *mutable = + rcu_dereference(tnl_vport->mutable); const struct tnl_cache *cache = rcu_dereference(tnl_vport->cache); if (cache && !check_cache_valid(cache, mutable) && @@ -859,39 +836,49 @@ static int cache_cleaner_cb(struct tbl_node *tbl_node, void *aux) assign_cache_rcu(tnl_vport_to_vport(tnl_vport), NULL); spin_unlock_bh(&tnl_vport->cache_lock); } - - return 0; } static void cache_cleaner(struct work_struct *work) { + int i; + schedule_cache_cleaner(); rcu_read_lock(); - tbl_foreach(rcu_dereference(port_table), cache_cleaner_cb, NULL); + for (i = 0; i < PORT_TABLE_SIZE; i++) { + struct hlist_node *n; + struct hlist_head *bucket; + struct tnl_vport *tnl_vport; + + bucket = &port_table[i]; + hlist_for_each_entry_rcu(tnl_vport, n, bucket, hash_node) + __cache_cleaner(tnl_vport); + } rcu_read_unlock(); } -static inline void create_eth_hdr(struct tnl_cache *cache, - const struct rtable *rt) +static void create_eth_hdr(struct tnl_cache *cache, struct hh_cache *hh) { void *cache_data = get_cached_header(cache); - int hh_len = rt_dst(rt).hh->hh_len; - int hh_off = HH_DATA_ALIGN(rt_dst(rt).hh->hh_len) - hh_len; + int hh_off; #ifdef HAVE_HH_SEQ unsigned hh_seq; do { - hh_seq = read_seqbegin(&rt_dst(rt).hh->hh_lock); - memcpy(cache_data, (void *)rt_dst(rt).hh->hh_data + hh_off, hh_len); - } while (read_seqretry(&rt_dst(rt).hh->hh_lock, hh_seq)); + hh_seq = read_seqbegin(&hh->hh_lock); + hh_off = HH_DATA_ALIGN(hh->hh_len) - hh->hh_len; + memcpy(cache_data, (void *)hh->hh_data + hh_off, hh->hh_len); + cache->hh_len = hh->hh_len; + } while (read_seqretry(&hh->hh_lock, hh_seq)); cache->hh_seq = hh_seq; #else - read_lock_bh(&rt_dst(rt).hh->hh_lock); - memcpy(cache_data, (void *)rt_dst(rt).hh->hh_data + hh_off, hh_len); - read_unlock_bh(&rt_dst(rt).hh->hh_lock); + read_lock(&hh->hh_lock); + hh_off = HH_DATA_ALIGN(hh->hh_len) - hh->hh_len; + memcpy(cache_data, (void *)hh->hh_data + hh_off, hh->hh_len); + cache->hh_len = hh->hh_len; + read_unlock(&hh->hh_lock); #endif } @@ -903,6 +890,7 @@ static struct tnl_cache *build_cache(struct vport *vport, struct tnl_cache *cache; void *cache_data; int cache_len; + struct hh_cache *hh; if (!(mutable->flags & TNL_F_HDR_CACHE)) return NULL; @@ -911,14 +899,16 @@ static struct tnl_cache *build_cache(struct vport *vport, * If there is no entry in the ARP cache or if this device does not * support hard header caching just fall back to the IP stack. */ - if (!rt_dst(rt).hh) + + hh = rt_hh(rt); + if (!hh) return NULL; /* * If lock is contended fall back to directly building the header. * We're not going to help performance by sitting here spinning. */ - if (!spin_trylock_bh(&tnl_vport->cache_lock)) + if (!spin_trylock(&tnl_vport->cache_lock)) return NULL; cache = cache_dereference(tnl_vport); @@ -927,17 +917,16 @@ static struct tnl_cache *build_cache(struct vport *vport, else cache = NULL; - cache_len = rt_dst(rt).hh->hh_len + mutable->tunnel_hlen; + cache_len = LL_RESERVED_SPACE(rt_dst(rt).dev) + mutable->tunnel_hlen; cache = kzalloc(ALIGN(sizeof(struct tnl_cache), CACHE_DATA_ALIGN) + cache_len, GFP_ATOMIC); if (!cache) goto unlock; - cache->len = cache_len; - - create_eth_hdr(cache, rt); - cache_data = get_cached_header(cache) + rt_dst(rt).hh->hh_len; + create_eth_hdr(cache, hh); + cache_data = get_cached_header(cache) + cache->hh_len; + cache->len = cache->hh_len + mutable->tunnel_hlen; create_tunnel_header(vport, mutable, rt, cache_data); @@ -949,12 +938,11 @@ static struct tnl_cache *build_cache(struct vport *vport, if (is_internal_dev(rt_dst(rt).dev)) { struct sw_flow_key flow_key; - struct tbl_node *flow_node; struct vport *dst_vport; struct sk_buff *skb; - bool is_frag; int err; int flow_key_len; + struct sw_flow *flow; dst_vport = internal_dev_get_vport(rt_dst(rt).dev); if (!dst_vport) @@ -968,19 +956,15 @@ static struct tnl_cache *build_cache(struct vport *vport, memcpy(skb->data, get_cached_header(cache), cache->len); err = flow_extract(skb, dst_vport->port_no, &flow_key, - &flow_key_len, &is_frag); + &flow_key_len); consume_skb(skb); - if (err || is_frag) + if (err) goto done; - flow_node = tbl_lookup(rcu_dereference(dst_vport->dp->table), - &flow_key, flow_key_len, - flow_hash(&flow_key, flow_key_len), - flow_cmp); - if (flow_node) { - struct sw_flow *flow = flow_cast(flow_node); - + flow = flow_tbl_lookup(rcu_dereference(dst_vport->dp->table), + &flow_key, flow_key_len); + if (flow) { cache->flow = flow; flow_hold(flow); } @@ -990,11 +974,36 @@ done: assign_cache_rcu(vport, cache); unlock: - spin_unlock_bh(&tnl_vport->cache_lock); + spin_unlock(&tnl_vport->cache_lock); return cache; } +static struct rtable *__find_route(const struct tnl_mutable_config *mutable, + u8 ipproto, u8 tos) +{ +#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 }; + struct rtable *rt; + + if (unlikely(ip_route_output_key(&init_net, &rt, &fl))) + return ERR_PTR(-EADDRNOTAVAIL); + + return rt; +#else + struct flowi4 fl = { .daddr = mutable->key.daddr, + .saddr = mutable->key.saddr, + .flowi4_tos = tos, + .flowi4_proto = ipproto }; + + return ip_route_output_key(&init_net, &fl); +#endif +} + static struct rtable *find_route(struct vport *vport, const struct tnl_mutable_config *mutable, u8 tos, struct tnl_cache **cache) @@ -1005,30 +1014,16 @@ static struct rtable *find_route(struct vport *vport, *cache = NULL; tos = RT_TOS(tos); - if (likely(tos == mutable->tos && check_cache_valid(cur_cache, mutable))) { + if (likely(tos == mutable->tos && + check_cache_valid(cur_cache, mutable))) { *cache = cur_cache; return cur_cache->rt; } else { struct rtable *rt; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) - struct flowi fl = { .nl_u = { .ip4_u = - { .daddr = mutable->daddr, - .saddr = mutable->saddr, - .tos = tos } }, - .proto = tnl_vport->tnl_ops->ipproto }; - if (unlikely(ip_route_output_key(&init_net, &rt, &fl))) - return NULL; -#else - struct flowi4 fl = { .daddr = mutable->daddr, - .saddr = mutable->saddr, - .flowi4_tos = tos, - .flowi4_proto = tnl_vport->tnl_ops->ipproto }; - - rt = ip_route_output_key(&init_net, &fl); + rt = __find_route(mutable, tnl_vport->tnl_ops->ipproto, tos); if (IS_ERR(rt)) return NULL; -#endif if (likely(tos == mutable->tos)) *cache = build_cache(vport, mutable, rt); @@ -1037,7 +1032,7 @@ static struct rtable *find_route(struct vport *vport, } } -static inline bool need_linearize(const struct sk_buff *skb) +static bool need_linearize(const struct sk_buff *skb) { int i; @@ -1050,7 +1045,7 @@ static inline bool need_linearize(const struct sk_buff *skb) * change them from underneath us and we can skip the linearization. */ for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) - if (unlikely(page_count(skb_shinfo(skb)->frags[i].page) > 1)) + if (unlikely(page_count(skb_frag_page(&skb_shinfo(skb)->frags[i])) > 1)) return true; return false; @@ -1267,7 +1262,7 @@ int tnl_send(struct vport *vport, struct sk_buff *skb) skb_push(skb, cache->len); memcpy(skb->data, get_cached_header(cache), cache->len); skb_reset_mac_header(skb); - skb_set_network_header(skb, rt_dst(rt).hh->hh_len); + skb_set_network_header(skb, cache->hh_len); } else { skb_push(skb, mutable->tunnel_hlen); @@ -1289,14 +1284,16 @@ int tnl_send(struct vport *vport, struct sk_buff *skb) iph->frag_off = frag_off; ip_select_ident(iph, &rt_dst(rt), NULL); - skb = tnl_vport->tnl_ops->update_header(vport, mutable, &rt_dst(rt), skb); + skb = tnl_vport->tnl_ops->update_header(vport, mutable, + &rt_dst(rt), skb); if (unlikely(!skb)) goto next; if (likely(cache)) { int orig_len = skb->len - cache->len; - struct vport *cache_vport = internal_dev_get_vport(rt_dst(rt).dev); + struct vport *cache_vport; + cache_vport = internal_dev_get_vport(rt_dst(rt).dev); skb->protocol = htons(ETH_P_IP); iph = ip_hdr(skb); iph->tot_len = htons(skb->len - skb_network_offset(skb)); @@ -1351,7 +1348,8 @@ static const struct nla_policy tnl_policy[OVS_TUNNEL_ATTR_MAX + 1] = { [OVS_TUNNEL_ATTR_TTL] = { .type = NLA_U8 }, }; -/* Sets OVS_TUNNEL_ATTR_* fields in 'mutable', which must initially be zeroed. */ +/* Sets OVS_TUNNEL_ATTR_* fields in 'mutable', which must initially be + * zeroed. */ static int tnl_set_config(struct nlattr *options, const struct tnl_ops *tnl_ops, const struct vport *cur_vport, struct tnl_mutable_config *mutable) @@ -1373,9 +1371,12 @@ static int tnl_set_config(struct nlattr *options, const struct tnl_ops *tnl_ops, mutable->flags = nla_get_u32(a[OVS_TUNNEL_ATTR_FLAGS]) & TNL_F_PUBLIC; - if (a[OVS_TUNNEL_ATTR_SRC_IPV4]) - mutable->saddr = nla_get_be32(a[OVS_TUNNEL_ATTR_SRC_IPV4]); - mutable->daddr = nla_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]); + mutable->key.daddr = nla_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]); + if (a[OVS_TUNNEL_ATTR_SRC_IPV4]) { + if (ipv4_is_multicast(mutable->key.daddr)) + return -EINVAL; + mutable->key.saddr = nla_get_be32(a[OVS_TUNNEL_ATTR_SRC_IPV4]); + } if (a[OVS_TUNNEL_ATTR_TOS]) { mutable->tos = nla_get_u8(a[OVS_TUNNEL_ATTR_TOS]); @@ -1386,13 +1387,13 @@ static int tnl_set_config(struct nlattr *options, const struct tnl_ops *tnl_ops, if (a[OVS_TUNNEL_ATTR_TTL]) mutable->ttl = nla_get_u8(a[OVS_TUNNEL_ATTR_TTL]); - mutable->tunnel_type = tnl_ops->tunnel_type; + mutable->key.tunnel_type = tnl_ops->tunnel_type; if (!a[OVS_TUNNEL_ATTR_IN_KEY]) { - mutable->tunnel_type |= TNL_T_KEY_MATCH; + mutable->key.tunnel_type |= TNL_T_KEY_MATCH; mutable->flags |= TNL_F_IN_KEY_MATCH; } else { - mutable->tunnel_type |= TNL_T_KEY_EXACT; - mutable->in_key = nla_get_be64(a[OVS_TUNNEL_ATTR_IN_KEY]); + mutable->key.tunnel_type |= TNL_T_KEY_EXACT; + mutable->key.in_key = nla_get_be64(a[OVS_TUNNEL_ATTR_IN_KEY]); } if (!a[OVS_TUNNEL_ATTR_OUT_KEY]) @@ -1406,13 +1407,26 @@ static int tnl_set_config(struct nlattr *options, const struct tnl_ops *tnl_ops, mutable->tunnel_hlen += sizeof(struct iphdr); - old_vport = tnl_find_port(mutable->saddr, mutable->daddr, - mutable->in_key, mutable->tunnel_type, - &old_mutable); - + old_vport = port_table_lookup(&mutable->key, &old_mutable); if (old_vport && old_vport != cur_vport) return -EEXIST; + mutable->mlink = 0; + if (ipv4_is_multicast(mutable->key.daddr)) { + struct net_device *dev; + struct rtable *rt; + + rt = __find_route(mutable, tnl_ops->ipproto, mutable->tos); + if (IS_ERR(rt)) + return -EADDRNOTAVAIL; + dev = rt_dst(rt).dev; + ip_rt_put(rt); + if (__in_dev_get_rtnl(dev) == NULL) + return -EADDRNOTAVAIL; + mutable->mlink = dev->ifindex; + ip_mc_inc_group(__in_dev_get_rtnl(dev), mutable->key.daddr); + } + return 0; } @@ -1461,13 +1475,11 @@ struct vport *tnl_create(const struct vport_parms *parms, rcu_assign_pointer(tnl_vport->mutable, mutable); - err = add_port(vport); - if (err) - goto error_free_mutable; - + port_table_add_port(vport); return vport; error_free_mutable: + free_mutable_rtnl(mutable); kfree(mutable); error_free_vport: vport_free(vport); @@ -1498,13 +1510,15 @@ int tnl_set_options(struct vport *vport, struct nlattr *options) if (err) goto error_free; - err = move_port(vport, mutable); - if (err) - goto error_free; + if (port_hash(&mutable->key) != port_hash(&old_mutable->key)) + port_table_move_port(vport, mutable); + else + assign_config_rcu(vport, mutable); return 0; error_free: + free_mutable_rtnl(mutable); kfree(mutable); error: return err; @@ -1516,14 +1530,14 @@ int tnl_get_options(const struct vport *vport, struct sk_buff *skb) 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->daddr); + 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->in_key); + 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->saddr) - NLA_PUT_BE32(skb, OVS_TUNNEL_ATTR_SRC_IPV4, mutable->saddr); + 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) @@ -1545,33 +1559,29 @@ static void free_port_rcu(struct rcu_head *rcu) vport_free(tnl_vport_to_vport(tnl_vport)); } -int tnl_destroy(struct vport *vport) +void tnl_destroy(struct vport *vport) { struct tnl_vport *tnl_vport = tnl_vport_priv(vport); - const struct tnl_mutable_config *mutable, *old_mutable; + struct tnl_mutable_config *mutable; mutable = rtnl_dereference(tnl_vport->mutable); - - if (vport == tnl_find_port(mutable->saddr, mutable->daddr, - mutable->in_key, mutable->tunnel_type, - &old_mutable)) - del_port(vport); - + port_table_remove_port(vport); + free_mutable_rtnl(mutable); call_rcu(&tnl_vport->rcu, free_port_rcu); - - return 0; } int tnl_set_addr(struct vport *vport, const unsigned char *addr) { struct tnl_vport *tnl_vport = tnl_vport_priv(vport); - struct tnl_mutable_config *mutable; + struct tnl_mutable_config *old_mutable, *mutable; - mutable = kmemdup(rtnl_dereference(tnl_vport->mutable), - sizeof(struct tnl_mutable_config), GFP_KERNEL); + old_mutable = rtnl_dereference(tnl_vport->mutable); + mutable = kmemdup(old_mutable, sizeof(struct tnl_mutable_config), GFP_KERNEL); if (!mutable) return -ENOMEM; + old_mutable->mlink = 0; + memcpy(mutable->eth_addr, addr, ETH_ALEN); assign_config_rcu(vport, mutable); @@ -1598,3 +1608,37 @@ void tnl_free_linked_skbs(struct sk_buff *skb) skb = next; } } + +int tnl_init(void) +{ + int i; + + port_table = kmalloc(PORT_TABLE_SIZE * sizeof(struct hlist_head *), + GFP_KERNEL); + if (!port_table) + return -ENOMEM; + + for (i = 0; i < PORT_TABLE_SIZE; i++) + INIT_HLIST_HEAD(&port_table[i]); + + return 0; +} + +void tnl_exit(void) +{ + int i; + + for (i = 0; i < PORT_TABLE_SIZE; i++) { + struct tnl_vport *tnl_vport; + struct hlist_head *hash_head; + struct hlist_node *n; + + hash_head = &port_table[i]; + hlist_for_each_entry(tnl_vport, n, hash_head, hash_node) { + BUG(); + goto out; + } + } +out: + kfree(port_table); +}