[IPV4]: Uninline inet_lookup_listener
By modern standards this function is way too big to be inlined. It's even bigger than __inet_lookup_listener :) Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1a01912ae0
commit
99a92ff504
|
@ -271,39 +271,10 @@ static inline int inet_iif(const struct sk_buff *skb)
|
|||
return ((struct rtable *)skb->dst)->rt_iif;
|
||||
}
|
||||
|
||||
extern struct sock *__inet_lookup_listener(const struct hlist_head *head,
|
||||
const u32 daddr,
|
||||
const unsigned short hnum,
|
||||
const int dif);
|
||||
|
||||
/* Optimize the common listener case. */
|
||||
static inline struct sock *
|
||||
extern struct sock *
|
||||
inet_lookup_listener(struct inet_hashinfo *hashinfo,
|
||||
const u32 daddr,
|
||||
const unsigned short hnum, const int dif)
|
||||
{
|
||||
struct sock *sk = NULL;
|
||||
const struct hlist_head *head;
|
||||
|
||||
read_lock(&hashinfo->lhash_lock);
|
||||
head = &hashinfo->listening_hash[inet_lhashfn(hnum)];
|
||||
if (!hlist_empty(head)) {
|
||||
const struct inet_sock *inet = inet_sk((sk = __sk_head(head)));
|
||||
|
||||
if (inet->num == hnum && !sk->sk_node.next &&
|
||||
(!inet->rcv_saddr || inet->rcv_saddr == daddr) &&
|
||||
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
|
||||
!sk->sk_bound_dev_if)
|
||||
goto sherry_cache;
|
||||
sk = __inet_lookup_listener(head, daddr, hnum, dif);
|
||||
}
|
||||
if (sk) {
|
||||
sherry_cache:
|
||||
sock_hold(sk);
|
||||
}
|
||||
read_unlock(&hashinfo->lhash_lock);
|
||||
return sk;
|
||||
}
|
||||
const unsigned short hnum, const int dif);
|
||||
|
||||
/* Socket demux engine toys. */
|
||||
#ifdef __BIG_ENDIAN
|
||||
|
|
|
@ -124,8 +124,10 @@ EXPORT_SYMBOL(inet_listen_wlock);
|
|||
* remote address for the connection. So always assume those are both
|
||||
* wildcarded during the search since they can never be otherwise.
|
||||
*/
|
||||
struct sock *__inet_lookup_listener(const struct hlist_head *head, const u32 daddr,
|
||||
const unsigned short hnum, const int dif)
|
||||
static struct sock *__inet_lookup_listener(const struct hlist_head *head,
|
||||
const u32 daddr,
|
||||
const unsigned short hnum,
|
||||
const int dif)
|
||||
{
|
||||
struct sock *result = NULL, *sk;
|
||||
const struct hlist_node *node;
|
||||
|
@ -159,7 +161,34 @@ struct sock *__inet_lookup_listener(const struct hlist_head *head, const u32 dad
|
|||
return result;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(__inet_lookup_listener);
|
||||
/* Optimize the common listener case. */
|
||||
struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo,
|
||||
const u32 daddr, const unsigned short hnum,
|
||||
const int dif)
|
||||
{
|
||||
struct sock *sk = NULL;
|
||||
const struct hlist_head *head;
|
||||
|
||||
read_lock(&hashinfo->lhash_lock);
|
||||
head = &hashinfo->listening_hash[inet_lhashfn(hnum)];
|
||||
if (!hlist_empty(head)) {
|
||||
const struct inet_sock *inet = inet_sk((sk = __sk_head(head)));
|
||||
|
||||
if (inet->num == hnum && !sk->sk_node.next &&
|
||||
(!inet->rcv_saddr || inet->rcv_saddr == daddr) &&
|
||||
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
|
||||
!sk->sk_bound_dev_if)
|
||||
goto sherry_cache;
|
||||
sk = __inet_lookup_listener(head, daddr, hnum, dif);
|
||||
}
|
||||
if (sk) {
|
||||
sherry_cache:
|
||||
sock_hold(sk);
|
||||
}
|
||||
read_unlock(&hashinfo->lhash_lock);
|
||||
return sk;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(inet_lookup_listener);
|
||||
|
||||
/* called with local bh disabled */
|
||||
static int __inet_check_established(struct inet_timewait_death_row *death_row,
|
||||
|
|
Loading…
Reference in a new issue