diff options
| author | Eric Dumazet <edumazet@google.com> | 2019-06-14 16:22:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-14 20:18:28 -0700 |
| commit | ede61ca474a0348b975d9824565b66c7595461de (patch) | |
| tree | bc0770bb86ede5aed3f91f68773e412ee1067d07 /include/net | |
| parent | a8e11e5c5611a9f70470aebeb2c1dd6132f609d7 (diff) | |
| download | linux-stable-ede61ca474a0348b975d9824565b66c7595461de.tar.gz linux-stable-ede61ca474a0348b975d9824565b66c7595461de.tar.bz2 linux-stable-ede61ca474a0348b975d9824565b66c7595461de.zip | |
tcp: add tcp_rx_skb_cache sysctl
Instead of relying on rps_needed, it is safer to use a separate
static key, since we do not want to enable TCP rx_skb_cache
by default. This feature can cause huge increase of memory
usage on hosts with millions of sockets.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index e9d769c04637..b02645e2dfad 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2433,13 +2433,11 @@ static inline void skb_setup_tx_timestamp(struct sk_buff *skb, __u16 tsflags) * This routine must be called with interrupts disabled or with the socket * locked so that the sk_buff queue operation is ok. */ +DECLARE_STATIC_KEY_FALSE(tcp_rx_skb_cache_key); static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb) { __skb_unlink(skb, &sk->sk_receive_queue); - if ( -#ifdef CONFIG_RPS - !static_branch_unlikely(&rps_needed) && -#endif + if (static_branch_unlikely(&tcp_rx_skb_cache_key) && !sk->sk_rx_skb_cache) { sk->sk_rx_skb_cache = skb; skb_orphan(skb); |