diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-09-03 09:44:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-04 14:41:55 -0400 |
| commit | 430eda6d6d568eded71dfd1be5a16c0c1379e201 (patch) | |
| tree | 70d298414943feba8822064ef91638d4f397a742 | |
| parent | f8de31040d50b7e4c26a5ca4c02b2929dde34a58 (diff) | |
| download | linux-430eda6d6d568eded71dfd1be5a16c0c1379e201.tar.bz2 | |
vxlan: Optimize vxlan rcv
vxlan-udp-recv function lookup vxlan_sock struct on every packet
recv by using udp-port number. we can use sk->sk_user_data to
store vxlan_sock and avoid lookup.
I have open coded rcu-api to store and read vxlan_sock from
sk_user_data to avoid sparse warning as sk_user_data is not
__rcu pointer.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/vxlan.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index ebda3a1c2f31..bd35d2dfc50a 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -916,6 +916,8 @@ void vxlan_sock_release(struct vxlan_sock *vs) spin_lock(&vn->sock_lock); hlist_del_rcu(&vs->hlist); + smp_wmb(); + vs->sock->sk->sk_user_data = NULL; spin_unlock(&vn->sock_lock); queue_work(vxlan_wq, &vs->del_work); @@ -1009,7 +1011,8 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) port = inet_sk(sk)->inet_sport; - vs = vxlan_find_sock(sock_net(sk), port); + smp_read_barrier_depends(); + vs = (struct vxlan_sock *)sk->sk_user_data; if (!vs) goto drop; @@ -2236,6 +2239,8 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port, atomic_set(&vs->refcnt, 1); vs->rcv = rcv; vs->data = data; + smp_wmb(); + vs->sock->sk->sk_user_data = vs; spin_lock(&vn->sock_lock); hlist_add_head_rcu(&vs->hlist, vs_head(net, port)); |