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

Commit a8671acc authored by Sunil Goutham's avatar Sunil Goutham Committed by David S. Miller
Browse files

net: thunderx: Use skb_add_rx_frag() for split buffer Rx pkts 



Instead of a round about way of converting buffers to SKBs and
combining them into a frag list, use standard skb_add_rx_frag()
API to merge page fragments. This code is useful when incoming
packets are of size more than RCV_FRAG_LEN which is currently
set to 2048bytes.

Signed-off-by: default avatarSunil Goutham <sgoutham@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4126213

drivers/net/ethernet/cavium/thunder/nicvf_queues.c

+6 −18
Original line number Original line Diff line number Diff line
@@ -1184,8 +1184,8 @@ struct sk_buff *nicvf_get_rcv_skb(struct nicvf *nic, struct cqe_rx_t *cqe_rx) 
	int frag;

	int frag;

	int payload_len = 0;

	int payload_len = 0;

	struct sk_buff *skb = NULL;

	struct sk_buff *skb = NULL;

	struct sk_buff *skb_frag = NULL;

	struct page *page;

	struct sk_buff *prev_frag = NULL;

	int offset;

	u16 *rb_lens = NULL;

	u16 *rb_lens = NULL;

	u64 *rb_ptrs = NULL;

	u64 *rb_ptrs = NULL;
@@ -1218,22 +1218,10 @@ struct sk_buff *nicvf_get_rcv_skb(struct nicvf *nic, struct cqe_rx_t *cqe_rx) 
			skb_put(skb, payload_len);

			skb_put(skb, payload_len);

		} else {

		} else {

			/* Add fragments */

			/* Add fragments */

			skb_frag = nicvf_rb_ptr_to_skb(nic, *rb_ptrs,

			page = virt_to_page(phys_to_virt(*rb_ptrs));

						       payload_len);

			offset = phys_to_virt(*rb_ptrs) - page_address(page);

			if (!skb_frag) {

			skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,

				dev_kfree_skb(skb);

					offset, payload_len, RCV_FRAG_LEN);

				return NULL;

			}



			if (!skb_shinfo(skb)->frag_list)

				skb_shinfo(skb)->frag_list = skb_frag;

			else

				prev_frag->next = skb_frag;



			prev_frag = skb_frag;

			skb->len += payload_len;

			skb->data_len += payload_len;

			skb_frag->len = payload_len;

		}

		}

		/* Next buffer pointer */

		/* Next buffer pointer */

		rb_ptrs++;

		rb_ptrs++;