Commit a5b79829 authored by Eric Dumazet's avatar Eric Dumazet Committed by Willy Tarreau

net: fix sk_mem_reclaim_partial()

commit 1a24e04e upstream.

sk_mem_reclaim_partial() goal is to ensure each socket has
one SK_MEM_QUANTUM forward allocation. This is needed both for
performance and better handling of memory pressure situations in
follow up patches.

SK_MEM_QUANTUM is currently a page, but might be reduced to 4096 bytes
as some arches have 64KB pages.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 4c1307b2
...@@ -1358,7 +1358,7 @@ static inline struct inode *SOCK_INODE(struct socket *socket) ...@@ -1358,7 +1358,7 @@ static inline struct inode *SOCK_INODE(struct socket *socket)
* Functions for memory accounting * Functions for memory accounting
*/ */
extern int __sk_mem_schedule(struct sock *sk, int size, int kind); extern int __sk_mem_schedule(struct sock *sk, int size, int kind);
extern void __sk_mem_reclaim(struct sock *sk); void __sk_mem_reclaim(struct sock *sk, int amount);
#define SK_MEM_QUANTUM ((int)PAGE_SIZE) #define SK_MEM_QUANTUM ((int)PAGE_SIZE)
#define SK_MEM_QUANTUM_SHIFT ilog2(SK_MEM_QUANTUM) #define SK_MEM_QUANTUM_SHIFT ilog2(SK_MEM_QUANTUM)
...@@ -1399,7 +1399,7 @@ static inline void sk_mem_reclaim(struct sock *sk) ...@@ -1399,7 +1399,7 @@ static inline void sk_mem_reclaim(struct sock *sk)
if (!sk_has_account(sk)) if (!sk_has_account(sk))
return; return;
if (sk->sk_forward_alloc >= SK_MEM_QUANTUM) if (sk->sk_forward_alloc >= SK_MEM_QUANTUM)
__sk_mem_reclaim(sk); __sk_mem_reclaim(sk, sk->sk_forward_alloc);
} }
static inline void sk_mem_reclaim_partial(struct sock *sk) static inline void sk_mem_reclaim_partial(struct sock *sk)
...@@ -1407,7 +1407,7 @@ static inline void sk_mem_reclaim_partial(struct sock *sk) ...@@ -1407,7 +1407,7 @@ static inline void sk_mem_reclaim_partial(struct sock *sk)
if (!sk_has_account(sk)) if (!sk_has_account(sk))
return; return;
if (sk->sk_forward_alloc > SK_MEM_QUANTUM) if (sk->sk_forward_alloc > SK_MEM_QUANTUM)
__sk_mem_reclaim(sk); __sk_mem_reclaim(sk, sk->sk_forward_alloc - 1);
} }
static inline void sk_mem_charge(struct sock *sk, int size) static inline void sk_mem_charge(struct sock *sk, int size)
......
...@@ -2048,12 +2048,13 @@ EXPORT_SYMBOL(__sk_mem_schedule); ...@@ -2048,12 +2048,13 @@ EXPORT_SYMBOL(__sk_mem_schedule);
/** /**
* __sk_reclaim - reclaim memory_allocated * __sk_reclaim - reclaim memory_allocated
* @sk: socket * @sk: socket
* @amount: number of bytes (rounded down to a SK_MEM_QUANTUM multiple)
*/ */
void __sk_mem_reclaim(struct sock *sk) void __sk_mem_reclaim(struct sock *sk, int amount)
{ {
sk_memory_allocated_sub(sk, amount >>= SK_MEM_QUANTUM_SHIFT;
sk->sk_forward_alloc >> SK_MEM_QUANTUM_SHIFT); sk_memory_allocated_sub(sk, amount);
sk->sk_forward_alloc &= SK_MEM_QUANTUM - 1; sk->sk_forward_alloc -= amount << SK_MEM_QUANTUM_SHIFT;
if (sk_under_memory_pressure(sk) && if (sk_under_memory_pressure(sk) &&
(sk_memory_allocated(sk) < sk_prot_mem_limits(sk, 0))) (sk_memory_allocated(sk) < sk_prot_mem_limits(sk, 0)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment