korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 14:34:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

geneve: Optimize geneve device lookup.

Browse Source 
Rather than comparing 64-bit tunnel-id, compare tunnel vni
which is 24-bit id. This also save conversion from vni
to tunnel id on each tunnel packet receive.

Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
pravin shelar 2016-11-21 11:03:01 -08:00 committed by David S. Miller
parent bcceeec3cc
commit 2e0b26e103
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/geneve.c
View File

@ -103,6 +103,17 @@ static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni)
#endif #endif
} }
static bool eq_tun_id_and_vni(u8 *tun_id, u8 *vni)
{
#ifdef __BIG_ENDIAN
return (vni[0] == tun_id[2]) &&
(vni[1] == tun_id[1]) &&
(vni[2] == tun_id[0]);
#else
return !memcmp(vni, &tun_id[5], 3);
#endif
}
static sa_family_t geneve_get_sk_family(struct geneve_sock *gs) static sa_family_t geneve_get_sk_family(struct geneve_sock *gs)
{ {
return gs->sock->sk->sk_family; return gs->sock->sk->sk_family;
@ -111,7 +122,6 @@ static sa_family_t geneve_get_sk_family(struct geneve_sock *gs)
static struct geneve_dev *geneve_lookup(struct geneve_sock *gs, static struct geneve_dev *geneve_lookup(struct geneve_sock *gs,
__be32 addr, u8 vni[]) __be32 addr, u8 vni[])
{ {
__be64 id = vni_to_tunnel_id(vni);
struct hlist_head *vni_list_head; struct hlist_head *vni_list_head;
struct geneve_dev *geneve; struct geneve_dev *geneve;
__u32 hash; __u32 hash;
@ -120,7 +130,7 @@ static struct geneve_dev *geneve_lookup(struct geneve_sock *gs,
hash = geneve_net_vni_hash(vni); hash = geneve_net_vni_hash(vni);
vni_list_head = &gs->vni_list[hash]; vni_list_head = &gs->vni_list[hash];
hlist_for_each_entry_rcu(geneve, vni_list_head, hlist) { hlist_for_each_entry_rcu(geneve, vni_list_head, hlist) {
if (!memcmp(&id, &geneve->info.key.tun_id, sizeof(id)) && if (eq_tun_id_and_vni((u8 *)&geneve->info.key.tun_id, vni) &&
addr == geneve->info.key.u.ipv4.dst) addr == geneve->info.key.u.ipv4.dst)
return geneve; return geneve;
} }
@ -131,7 +141,6 @@ static struct geneve_dev *geneve_lookup(struct geneve_sock *gs,
static struct geneve_dev *geneve6_lookup(struct geneve_sock *gs, static struct geneve_dev *geneve6_lookup(struct geneve_sock *gs,
struct in6_addr addr6, u8 vni[]) struct in6_addr addr6, u8 vni[])
{ {
__be64 id = vni_to_tunnel_id(vni);
struct hlist_head *vni_list_head; struct hlist_head *vni_list_head;
struct geneve_dev *geneve; struct geneve_dev *geneve;
__u32 hash; __u32 hash;
@ -140,7 +149,7 @@ static struct geneve_dev *geneve6_lookup(struct geneve_sock *gs,
hash = geneve_net_vni_hash(vni); hash = geneve_net_vni_hash(vni);
vni_list_head = &gs->vni_list[hash]; vni_list_head = &gs->vni_list[hash];
hlist_for_each_entry_rcu(geneve, vni_list_head, hlist) { hlist_for_each_entry_rcu(geneve, vni_list_head, hlist) {
if (!memcmp(&id, &geneve->info.key.tun_id, sizeof(id)) && if (eq_tun_id_and_vni((u8 *)&geneve->info.key.tun_id, vni) &&
ipv6_addr_equal(&addr6, &geneve->info.key.u.ipv6.dst)) ipv6_addr_equal(&addr6, &geneve->info.key.u.ipv6.dst))
return geneve; return geneve;
} }