Commit 100fdd1f authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net: remove SK_MEM_QUANTUM and SK_MEM_QUANTUM_SHIFT 



Due to memcg interface, SK_MEM_QUANTUM is effectively PAGE_SIZE.

This might change in the future, but it seems better to avoid the
confusion.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e70f3c70

include/net/sock.h

+3 −5
Original line number Diff line number Diff line
@@ -1532,8 +1532,6 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind); 
void __sk_mem_reduce_allocated(struct sock *sk, int amount);

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)

#define SK_MEM_SEND	0

#define SK_MEM_RECV	1
@@ -1545,7 +1543,7 @@ static inline long sk_prot_mem_limits(const struct sock *sk, int index) 


static inline int sk_mem_pages(int amt)

{

	return (amt + SK_MEM_QUANTUM - 1) >> SK_MEM_QUANTUM_SHIFT;

	return (amt + PAGE_SIZE - 1) >> PAGE_SHIFT;

}



static inline bool sk_has_account(struct sock *sk)
@@ -1594,7 +1592,7 @@ static inline void sk_mem_reclaim(struct sock *sk) 


	reclaimable = sk->sk_forward_alloc - sk_unused_reserved_mem(sk);



	if (reclaimable >= SK_MEM_QUANTUM)

	if (reclaimable >= (int)PAGE_SIZE)

		__sk_mem_reclaim(sk, reclaimable);

}
@@ -1613,7 +1611,7 @@ static inline void sk_mem_reclaim_partial(struct sock *sk) 


	reclaimable = sk->sk_forward_alloc - sk_unused_reserved_mem(sk);



	if (reclaimable > SK_MEM_QUANTUM)

	if (reclaimable > (int)PAGE_SIZE)

		__sk_mem_reclaim(sk, reclaimable - 1);

}

net/core/sock.c

+8 −8
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ EXPORT_SYMBOL(sock_set_mark); 
static void sock_release_reserved_memory(struct sock *sk, int bytes)

{

	/* Round down bytes to multiple of pages */

	bytes &= ~(SK_MEM_QUANTUM - 1);

	bytes = round_down(bytes, PAGE_SIZE);



	WARN_ON(bytes > sk->sk_reserved_mem);

	sk->sk_reserved_mem -= bytes;
@@ -1028,9 +1028,9 @@ static int sock_reserve_memory(struct sock *sk, int bytes) 
		mem_cgroup_uncharge_skmem(sk->sk_memcg, pages);

		return -ENOMEM;

	}

	sk->sk_forward_alloc += pages << SK_MEM_QUANTUM_SHIFT;

	sk->sk_forward_alloc += pages << PAGE_SHIFT;



	sk->sk_reserved_mem += pages << SK_MEM_QUANTUM_SHIFT;

	sk->sk_reserved_mem += pages << PAGE_SHIFT;



	return 0;

}
@@ -3003,10 +3003,10 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind) 
{

	int ret, amt = sk_mem_pages(size);



	sk->sk_forward_alloc += amt << SK_MEM_QUANTUM_SHIFT;

	sk->sk_forward_alloc += amt << PAGE_SHIFT;

	ret = __sk_mem_raise_allocated(sk, size, amt, kind);

	if (!ret)

		sk->sk_forward_alloc -= amt << SK_MEM_QUANTUM_SHIFT;

		sk->sk_forward_alloc -= amt << PAGE_SHIFT;

	return ret;

}

EXPORT_SYMBOL(__sk_mem_schedule);
@@ -3034,12 +3034,12 @@ EXPORT_SYMBOL(__sk_mem_reduce_allocated); 
/**

 *	__sk_mem_reclaim - reclaim sk_forward_alloc and memory_allocated

 *	@sk: socket

 *	@amount: number of bytes (rounded down to a SK_MEM_QUANTUM multiple)

 *	@amount: number of bytes (rounded down to a PAGE_SIZE multiple)

 */

void __sk_mem_reclaim(struct sock *sk, int amount)

{

	amount >>= SK_MEM_QUANTUM_SHIFT;

	sk->sk_forward_alloc -= amount << SK_MEM_QUANTUM_SHIFT;

	amount >>= PAGE_SHIFT;

	sk->sk_forward_alloc -= amount << PAGE_SHIFT;

	__sk_mem_reduce_allocated(sk, amount);

}

EXPORT_SYMBOL(__sk_mem_reclaim);

net/ipv4/tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -4661,11 +4661,11 @@ void __init tcp_init(void) 
	max_wshare = min(4UL*1024*1024, limit);

	max_rshare = min(6UL*1024*1024, limit);



	init_net.ipv4.sysctl_tcp_wmem[0] = SK_MEM_QUANTUM;

	init_net.ipv4.sysctl_tcp_wmem[0] = PAGE_SIZE;

	init_net.ipv4.sysctl_tcp_wmem[1] = 16*1024;

	init_net.ipv4.sysctl_tcp_wmem[2] = max(64*1024, max_wshare);



	init_net.ipv4.sysctl_tcp_rmem[0] = SK_MEM_QUANTUM;

	init_net.ipv4.sysctl_tcp_rmem[0] = PAGE_SIZE;

	init_net.ipv4.sysctl_tcp_rmem[1] = 131072;

	init_net.ipv4.sysctl_tcp_rmem[2] = max(131072, max_rshare);

net/ipv4/tcp_input.c

+1 −1
Original line number Diff line number Diff line
@@ -5287,7 +5287,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk) 
		    before(TCP_SKB_CB(skb)->end_seq, start)) {

			/* Do not attempt collapsing tiny skbs */

			if (range_truesize != head->truesize ||

			    end - start >= SKB_WITH_OVERHEAD(SK_MEM_QUANTUM)) {

			    end - start >= SKB_WITH_OVERHEAD(PAGE_SIZE)) {

				tcp_collapse(sk, NULL, &tp->out_of_order_queue,

					     head, skb, start, end);

			} else {

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -3367,7 +3367,7 @@ void sk_forced_mem_schedule(struct sock *sk, int size) 
	if (size <= sk->sk_forward_alloc)

		return;

	amt = sk_mem_pages(size);

	sk->sk_forward_alloc += amt * SK_MEM_QUANTUM;

	sk->sk_forward_alloc += amt << PAGE_SHIFT;

	sk_memory_allocated_add(sk, amt);



	if (mem_cgroup_sockets_enabled && sk->sk_memcg)