AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

inet: Don't lookup the socket if there's a socket attached to the skb

Browse Source 
Use the socket cached in the skb if it's present.

Signed-off-by: KOVACS Krisztian <hidden@sch.bme.hu>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
KOVACS Krisztian 2008-10-07 12:41:01 -07:00 committed by David S. Miller
parent 607c4aaf03
commit 23542618de
5 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/net/inet6_hashtables.h
View File

@ -96,10 +96,14 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo,
const __be16 sport,
const __be16 dport)
{
return __inet6_lookup(dev_net(skb->dst->dev), hashinfo,
&ipv6_hdr(skb)->saddr, sport,
&ipv6_hdr(skb)->daddr, ntohs(dport),
inet6_iif(skb));
struct sock *sk;
if (unlikely(sk = skb_steal_sock(skb)))
return sk;
else return __inet6_lookup(dev_net(skb->dst->dev), hashinfo,
&ipv6_hdr(skb)->saddr, sport,
&ipv6_hdr(skb)->daddr, ntohs(dport),
inet6_iif(skb));
}
extern struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,

10
include/net/inet_hashtables.h
View File

@ -378,11 +378,15 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,
const __be16 sport,
const __be16 dport)
{
struct sock *sk;
const struct iphdr *iph = ip_hdr(skb);
return __inet_lookup(dev_net(skb->dst->dev), hashinfo,
iph->saddr, sport,
iph->daddr, dport, inet_iif(skb));
if (unlikely(sk = skb_steal_sock(skb)))
return sk;
else
return __inet_lookup(dev_net(skb->dst->dev), hashinfo,
iph->saddr, sport,
iph->daddr, dport, inet_iif(skb));
}
extern int __inet_hash_connect(struct inet_timewait_death_row *death_row,

12
include/net/sock.h
View File

@ -1324,6 +1324,18 @@ static inline void sk_change_net(struct sock *sk, struct net *net)
sock_net_set(sk, hold_net(net));
}
static inline struct sock *skb_steal_sock(struct sk_buff *skb)
{
if (unlikely(skb->sk)) {
struct sock *sk = skb->sk;
skb->destructor = NULL;
skb->sk = NULL;
return sk;
}
return NULL;
}
extern void sock_enable_timestamp(struct sock *sk);
extern int sock_get_timestamp(struct sock *, struct timeval __user *);
extern int sock_get_timestampns(struct sock *, struct timespec __user *);

10
net/ipv4/udp.c
View File

@ -306,11 +306,15 @@ static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb,
__be16 sport, __be16 dport,
struct hlist_head udptable[])
{
struct sock *sk;
const struct iphdr *iph = ip_hdr(skb);
return __udp4_lib_lookup(dev_net(skb->dst->dev), iph->saddr, sport,
iph->daddr, dport, inet_iif(skb),
udptable);
if (unlikely(sk = skb_steal_sock(skb)))
return sk;
else
return __udp4_lib_lookup(dev_net(skb->dst->dev), iph->saddr, sport,
iph->daddr, dport, inet_iif(skb),
udptable);
}
struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,

10
net/ipv6/udp.c
View File

@ -111,11 +111,15 @@ static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb,
__be16 sport, __be16 dport,
struct hlist_head udptable[])
{
struct sock *sk;
struct ipv6hdr *iph = ipv6_hdr(skb);
return __udp6_lib_lookup(dev_net(skb->dst->dev), &iph->saddr, sport,
&iph->daddr, dport, inet6_iif(skb),
udptable);
if (unlikely(sk = skb_steal_sock(skb)))
return sk;
else
return __udp6_lib_lookup(dev_net(skb->dst->dev), &iph->saddr, sport,
&iph->daddr, dport, inet6_iif(skb),
udptable);
}
/*