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

Commit 98ba0bd5 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

sock: allocate skbs from optmem 



Add sock_omalloc and sock_ofree to be able to allocate control skbs,
for instance for looping errors onto sk_error_queue.

The transmit budget (sk_wmem_alloc) is involved in transmit skb
shaping, most notably in TCP Small Queues. Using this budget for
control packets would impact transmission.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84b7187c

include/net/sock.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1531,6 +1531,8 @@ struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force, 
			     gfp_t priority);

			     gfp_t priority);

void __sock_wfree(struct sk_buff *skb);

void __sock_wfree(struct sk_buff *skb);

void sock_wfree(struct sk_buff *skb);

void sock_wfree(struct sk_buff *skb);

struct sk_buff *sock_omalloc(struct sock *sk, unsigned long size,

			     gfp_t priority);

void skb_orphan_partial(struct sk_buff *skb);

void skb_orphan_partial(struct sk_buff *skb);

void sock_rfree(struct sk_buff *skb);

void sock_rfree(struct sk_buff *skb);

void sock_efree(struct sk_buff *skb);

void sock_efree(struct sk_buff *skb);

net/core/sock.c

+27 −0
Original line number Original line Diff line number Diff line
@@ -1923,6 +1923,33 @@ struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force, 
}

}

EXPORT_SYMBOL(sock_wmalloc);

EXPORT_SYMBOL(sock_wmalloc);





static void sock_ofree(struct sk_buff *skb)

{

	struct sock *sk = skb->sk;



	atomic_sub(skb->truesize, &sk->sk_omem_alloc);

}



struct sk_buff *sock_omalloc(struct sock *sk, unsigned long size,

			     gfp_t priority)

{

	struct sk_buff *skb;



	/* small safe race: SKB_TRUESIZE may differ from final skb->truesize */

	if (atomic_read(&sk->sk_omem_alloc) + SKB_TRUESIZE(size) >

	    sysctl_optmem_max)

		return NULL;



	skb = alloc_skb(size, priority);

	if (!skb)

		return NULL;



	atomic_add(skb->truesize, &sk->sk_omem_alloc);

	skb->sk = sk;

	skb->destructor = sock_ofree;

	return skb;

}



/*

/*

 * Allocate a memory block from the socket's option memory buffer.

 * Allocate a memory block from the socket's option memory buffer.

 */

 */