Commit fd9c31f8 authored by Jason Xing's avatar Jason Xing Committed by Jakub Kicinski
Browse files

udp: introduce __sk_mem_schedule() usage 

Keep the accounting schema consistent across different protocols
with __sk_mem_schedule(). Besides, it adjusts a little bit on how
to calculate forward allocated memory compared to before. After
applied this patch, we could avoid receive path scheduling extra
amount of memory.

Link: https://lore.kernel.org/lkml/20230221110344.82818-1-kerneljasonxing@gmail.com/


Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230308021153.99777-1-kerneljasonxing@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d0928c1c

net/ipv4/udp.c

+16 −11
Original line number Diff line number Diff line
@@ -1531,10 +1531,21 @@ static void busylock_release(spinlock_t *busy) 
		spin_unlock(busy);

}



static int udp_rmem_schedule(struct sock *sk, int size)

{

	int delta;



	delta = size - sk->sk_forward_alloc;

	if (delta > 0 && !__sk_mem_schedule(sk, delta, SK_MEM_RECV))

		return -ENOBUFS;



	return 0;

}



int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)

{

	struct sk_buff_head *list = &sk->sk_receive_queue;

	int rmem, delta, amt, err = -ENOMEM;

	int rmem, err = -ENOMEM;

	spinlock_t *busy = NULL;

	int size;
@@ -1567,18 +1578,12 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb) 
		goto uncharge_drop;



	spin_lock(&list->lock);

	if (size >= sk->sk_forward_alloc) {

		amt = sk_mem_pages(size);

		delta = amt << PAGE_SHIFT;

		if (!__sk_mem_raise_allocated(sk, delta, amt, SK_MEM_RECV)) {

			err = -ENOBUFS;

	err = udp_rmem_schedule(sk, size);

	if (err) {

		spin_unlock(&list->lock);

		goto uncharge_drop;

	}



		sk->sk_forward_alloc += delta;

	}



	sk->sk_forward_alloc -= size;



	/* no need to setup a destructor, we will explicitly release the