net: introduce skb_coalesce_rx_frag() (f8e617e1) · Commits · 戴 / test

Sometimes we need to coalesce the rx frags to avoid frag list. One example is virtio-net driver which tries to use small frags for both MTU sized packet and GSO packet. So this patch introduce skb_coalesce_rx_frag() to do this. Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Michael Dalton <mwdalton@google.com> Cc: Eric Dumazet <edumazet@google.com> Acked-by:

Michael S. Tsirkin <mst@redhat.com> Signed-off-by:

Jason Wang <jasowang@redhat.com> Acked-by:

Eric Dumazet <edumazet@google.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

include/linux/skbuff.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1372,6 +1372,9 @@ static inline void skb_fill_page_desc(struct sk_buff *skb, int i,
		void skb_add_rx_frag(struct sk_buff skb, int i, struct page page, int off,
		int size, unsigned int truesize);

		void skb_coalesce_rx_frag(struct sk_buff *skb, int i, int size,
		unsigned int truesize);

		#define SKB_PAGE_ASSERT(skb) BUG_ON(skb_shinfo(skb)->nr_frags)
		#define SKB_FRAG_ASSERT(skb) BUG_ON(skb_has_frag_list(skb))
		#define SKB_LINEAR_ASSERT(skb) BUG_ON(skb_is_nonlinear(skb))

net/core/skbuff.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -476,6 +476,18 @@ void skb_add_rx_frag(struct sk_buff skb, int i, struct page page, int off,
		}
		EXPORT_SYMBOL(skb_add_rx_frag);

		void skb_coalesce_rx_frag(struct sk_buff *skb, int i, int size,
		unsigned int truesize)
		{
		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

		skb_frag_size_add(frag, size);
		skb->len += size;
		skb->data_len += size;
		skb->truesize += truesize;
		}
		EXPORT_SYMBOL(skb_coalesce_rx_frag);

		static void skb_drop_list(struct sk_buff **listp)
		{
		kfree_skb_list(*listp);

Admin message