inet: uninline inet_reqsk_alloc()
authorEric Dumazet <edumazet@google.com>
Wed, 18 Mar 2015 01:32:27 +0000 (18:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Mar 2015 02:01:56 +0000 (22:01 -0400)
inet_reqsk_alloc() is becoming fat and should not be inlined.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/inet_sock.h
net/ipv4/tcp_input.c

index cf7abb00941beaf2ff4682490a71ec2afa606851..6fec7343070f2de1d8dca6071fcb5001e7dccd2d 100644 (file)
@@ -244,28 +244,8 @@ static inline unsigned int __inet_ehashfn(const __be32 laddr,
                            initval);
 }
 
-static inline struct request_sock *
-inet_reqsk_alloc(const struct request_sock_ops *ops, struct sock *sk_listener)
-{
-       struct request_sock *req = reqsk_alloc(ops);
-
-       if (req) {
-               struct inet_request_sock *ireq = inet_rsk(req);
-
-               kmemcheck_annotate_bitfield(ireq, flags);
-               ireq->opt = NULL;
-               atomic64_set(&ireq->ir_cookie, 0);
-               ireq->ireq_state = TCP_NEW_SYN_RECV;
-               write_pnet(&ireq->ireq_net, sock_net(sk_listener));
-
-               /* Following is temporary. It is coupled with debugging
-                * helpers in reqsk_put() & reqsk_free()
-                */
-               atomic_set(&ireq->ireq_refcnt, 0);
-       }
-
-       return req;
-}
+struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
+                                     struct sock *sk_listener);
 
 static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
 {
index 2a480f6811ea14133b97eaa620d0f07a14cdcad5..52b74e0eab2a81ccfca1918074fda5b962a30c77 100644 (file)
@@ -5967,6 +5967,30 @@ static void tcp_openreq_init(struct request_sock *req,
        ireq->ir_mark = inet_request_mark(sk, skb);
 }
 
+struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
+                                     struct sock *sk_listener)
+{
+       struct request_sock *req = reqsk_alloc(ops);
+
+       if (req) {
+               struct inet_request_sock *ireq = inet_rsk(req);
+
+               kmemcheck_annotate_bitfield(ireq, flags);
+               ireq->opt = NULL;
+               atomic64_set(&ireq->ir_cookie, 0);
+               ireq->ireq_state = TCP_NEW_SYN_RECV;
+               write_pnet(&ireq->ireq_net, sock_net(sk_listener));
+
+               /* Following is temporary. It is coupled with debugging
+                * helpers in reqsk_put() & reqsk_free()
+                */
+               atomic_set(&ireq->ireq_refcnt, 0);
+       }
+
+       return req;
+}
+EXPORT_SYMBOL(inet_reqsk_alloc);
+
 int tcp_conn_request(struct request_sock_ops *rsk_ops,
                     const struct tcp_request_sock_ops *af_ops,
                     struct sock *sk, struct sk_buff *skb)