Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a24e04e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: fix sk_mem_reclaim_partial() 



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>
parent 4633c9e0

include/net/sock.h

+3 −3
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ static inline struct inode *SOCK_INODE(struct socket *socket) 
 * Functions for memory accounting

 */

int __sk_mem_schedule(struct sock *sk, int size, int kind);

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_SHIFT ilog2(SK_MEM_QUANTUM)
@@ -1409,7 +1409,7 @@ static inline void sk_mem_reclaim(struct sock *sk) 
	if (!sk_has_account(sk))

		return;

	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)
@@ -1417,7 +1417,7 @@ static inline void sk_mem_reclaim_partial(struct sock *sk) 
	if (!sk_has_account(sk))

		return;

	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)

net/core/sock.c

+5 −4
Original line number Diff line number Diff line
@@ -2069,12 +2069,13 @@ EXPORT_SYMBOL(__sk_mem_schedule); 
/**

 *	__sk_reclaim - reclaim memory_allocated

 *	@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,

				sk->sk_forward_alloc >> SK_MEM_QUANTUM_SHIFT);

	sk->sk_forward_alloc &= SK_MEM_QUANTUM - 1;

	amount >>= SK_MEM_QUANTUM_SHIFT;

	sk_memory_allocated_sub(sk, amount);

	sk->sk_forward_alloc -= amount << SK_MEM_QUANTUM_SHIFT;



	if (sk_under_memory_pressure(sk) &&

	    (sk_memory_allocated(sk) < sk_prot_mem_limits(sk, 0)))