diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-10-03 06:27:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-03 13:25:20 -0700 |
| commit | e96f78ab2703f3b0d512f6b469bc685d2ef20475 (patch) | |
| tree | c3401c3053c26288e2bfef14544d326e9db3dc0d | |
| parent | 4236e2a1ad679f3b57b23ba333f261b514814f4f (diff) | |
| download | net-next-e96f78ab2703f3b0d512f6b469bc685d2ef20475.tar.gz | |
tcp/dccp: add SLAB_DESTROY_BY_RCU flag for request sockets
Before letting request sockets being put in TCP/DCCP regular
ehash table, we need to add either :
- SLAB_DESTROY_BY_RCU flag to their kmem_cache
- add RCU grace period before freeing them.
Since we carefully respected the SLAB_DESTROY_BY_RCU protocol
like ESTABLISH and TIMEWAIT sockets, use it here.
req_prot_init() being only used by TCP and DCCP, I did not add
a new slab_flags into their rsk_prot, but reuse prot->slab_flags
Since all reqsk_alloc() users are correctly dealing with a failure,
add the __GFP_NOWARN flag to avoid traces under pressure.
Fixes: 079096f103fa ("tcp/dccp: install syn_recv requests into ehash table")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/request_sock.h | 4 | ||||
| -rw-r--r-- | net/core/sock.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/request_sock.h b/include/net/request_sock.h index bae6936d75c44..dd423d8408524 100644 --- a/include/net/request_sock.h +++ b/include/net/request_sock.h @@ -82,7 +82,9 @@ static inline struct sock *req_to_sk(struct request_sock *req) static inline struct request_sock * reqsk_alloc(const struct request_sock_ops *ops, struct sock *sk_listener) { - struct request_sock *req = kmem_cache_alloc(ops->slab, GFP_ATOMIC); + struct request_sock *req; + + req = kmem_cache_alloc(ops->slab, GFP_ATOMIC | __GFP_NOWARN); if (req) { req->rsk_ops = ops; diff --git a/net/core/sock.c b/net/core/sock.c index 3307c02244d39..7dd1263e4c245 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2758,7 +2758,7 @@ static int req_prot_init(const struct proto *prot) rsk_prot->slab = kmem_cache_create(rsk_prot->slab_name, rsk_prot->obj_size, 0, - 0, NULL); + prot->slab_flags, NULL); if (!rsk_prot->slab) { pr_crit("%s: Can't create request sock SLAB cache!\n", |