Commit 2def8ff3 authored by Abel Wu's avatar Abel Wu Committed by Paolo Abeni
Browse files

sock: Code cleanup on __sk_mem_raise_allocated() 



Code cleanup for both better simplicity and readability.
No functional change intended.

Signed-off-by: default avatarAbel Wu <wuyun.abel@bytedance.com>
Acked-by: default avatarShakeel Butt <shakeelb@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20231019120026.42215-1-wuyun.abel@bytedance.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent f6e12277

net/core/sock.c

+12 −10
Original line number Diff line number Diff line
@@ -3039,17 +3039,19 @@ EXPORT_SYMBOL(sk_wait_data); 
 */

int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind)

{

	bool memcg_charge = mem_cgroup_sockets_enabled && sk->sk_memcg;

	struct mem_cgroup *memcg = mem_cgroup_sockets_enabled ? sk->sk_memcg : NULL;

	struct proto *prot = sk->sk_prot;

	bool charged = true;

	bool charged = false;

	long allocated;



	sk_memory_allocated_add(sk, amt);

	allocated = sk_memory_allocated(sk);

	if (memcg_charge &&

	    !(charged = mem_cgroup_charge_skmem(sk->sk_memcg, amt,

						gfp_memcg_charge())))



	if (memcg) {

		if (!mem_cgroup_charge_skmem(memcg, amt, gfp_memcg_charge()))

			goto suppress_allocation;

		charged = true;

	}



	/* Under limit. */

	if (allocated <= sk_prot_mem_limits(sk, 0)) {
@@ -3104,8 +3106,8 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) 
		 */

		if (sk->sk_wmem_queued + size >= sk->sk_sndbuf) {

			/* Force charge with __GFP_NOFAIL */

			if (memcg_charge && !charged) {

				mem_cgroup_charge_skmem(sk->sk_memcg, amt,

			if (memcg && !charged) {

				mem_cgroup_charge_skmem(memcg, amt,

					gfp_memcg_charge() | __GFP_NOFAIL);

			}

			return 1;
@@ -3117,8 +3119,8 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) 


	sk_memory_allocated_sub(sk, amt);



	if (memcg_charge && charged)

		mem_cgroup_uncharge_skmem(sk->sk_memcg, amt);

	if (charged)

		mem_cgroup_uncharge_skmem(memcg, amt);



	return 0;

}