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

Commit 01c68026 authored by Ian Campbell's avatar Ian Campbell Committed by David S. Miller
Browse files

xen: netfront: convert to SKB paged frag API. 



Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: xen-devel@lists.xensource.com
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea066ad1

drivers/net/xen-netfront.c

+19 −15
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static void xennet_alloc_rx_buffers(struct net_device *dev) 
			break;

		}



		skb_shinfo(skb)->frags[0].page = page;

		__skb_fill_page_desc(skb, 0, page, 0, 0);

		skb_shinfo(skb)->nr_frags = 1;

		__skb_queue_tail(&np->rx_batch, skb);

	}
@@ -309,8 +309,8 @@ static void xennet_alloc_rx_buffers(struct net_device *dev) 
		BUG_ON((signed short)ref < 0);

		np->grant_rx_ref[id] = ref;



		pfn = page_to_pfn(skb_shinfo(skb)->frags[0].page);

		vaddr = page_address(skb_shinfo(skb)->frags[0].page);

		pfn = page_to_pfn(skb_frag_page(&skb_shinfo(skb)->frags[0]));

		vaddr = page_address(skb_frag_page(&skb_shinfo(skb)->frags[0]));



		req = RING_GET_REQUEST(&np->rx, req_prod + i);

		gnttab_grant_foreign_access_ref(ref,
@@ -461,7 +461,7 @@ static void xennet_make_frags(struct sk_buff *skb, struct net_device *dev, 
		ref = gnttab_claim_grant_reference(&np->gref_tx_head);

		BUG_ON((signed short)ref < 0);



		mfn = pfn_to_mfn(page_to_pfn(frag->page));

		mfn = pfn_to_mfn(page_to_pfn(skb_frag_page(frag)));

		gnttab_grant_foreign_access_ref(ref, np->xbdev->otherend_id,

						mfn, GNTMAP_readonly);
@@ -762,23 +762,22 @@ static RING_IDX xennet_fill_frags(struct netfront_info *np, 
	struct skb_shared_info *shinfo = skb_shinfo(skb);

	int nr_frags = shinfo->nr_frags;

	RING_IDX cons = np->rx.rsp_cons;

	skb_frag_t *frag = shinfo->frags + nr_frags;

	struct sk_buff *nskb;



	while ((nskb = __skb_dequeue(list))) {

		struct xen_netif_rx_response *rx =

			RING_GET_RESPONSE(&np->rx, ++cons);

		skb_frag_t *nfrag = &skb_shinfo(nskb)->frags[0];



		frag->page = skb_shinfo(nskb)->frags[0].page;

		frag->page_offset = rx->offset;

		frag->size = rx->status;

		__skb_fill_page_desc(skb, nr_frags,

				     skb_frag_page(nfrag),

				     rx->offset, rx->status);



		skb->data_len += rx->status;



		skb_shinfo(nskb)->nr_frags = 0;

		kfree_skb(nskb);



		frag++;

		nr_frags++;

	}
@@ -873,7 +872,7 @@ static int handle_incoming_queue(struct net_device *dev, 
		memcpy(skb->data, vaddr + offset,

		       skb_headlen(skb));



		if (page != skb_shinfo(skb)->frags[0].page)

		if (page != skb_frag_page(&skb_shinfo(skb)->frags[0]))

			__free_page(page);



		/* Ethernet work: Delayed to here as it peeks the header. */
@@ -954,7 +953,8 @@ static int xennet_poll(struct napi_struct *napi, int budget) 
			}

		}



		NETFRONT_SKB_CB(skb)->page = skb_shinfo(skb)->frags[0].page;

		NETFRONT_SKB_CB(skb)->page =

			skb_frag_page(&skb_shinfo(skb)->frags[0]);

		NETFRONT_SKB_CB(skb)->offset = rx->offset;



		len = rx->status;
@@ -968,7 +968,7 @@ static int xennet_poll(struct napi_struct *napi, int budget) 
			skb_shinfo(skb)->frags[0].size = rx->status - len;

			skb->data_len = rx->status - len;

		} else {

			skb_shinfo(skb)->frags[0].page = NULL;

			__skb_fill_page_desc(skb, 0, NULL, 0, 0);

			skb_shinfo(skb)->nr_frags = 0;

		}
@@ -1143,7 +1143,8 @@ static void xennet_release_rx_bufs(struct netfront_info *np) 


		if (!xen_feature(XENFEAT_auto_translated_physmap)) {

			/* Remap the page. */

			struct page *page = skb_shinfo(skb)->frags[0].page;

			const struct page *page =

				skb_frag_page(&skb_shinfo(skb)->frags[0]);

			unsigned long pfn = page_to_pfn(page);

			void *vaddr = page_address(page);
@@ -1650,6 +1651,8 @@ static int xennet_connect(struct net_device *dev) 


	/* Step 2: Rebuild the RX buffer freelist and the RX ring itself. */

	for (requeue_idx = 0, i = 0; i < NET_RX_RING_SIZE; i++) {

		skb_frag_t *frag;

		const struct page *page;

		if (!np->rx_skbs[i])

			continue;
@@ -1657,10 +1660,11 @@ static int xennet_connect(struct net_device *dev) 
		ref = np->grant_rx_ref[requeue_idx] = xennet_get_rx_ref(np, i);

		req = RING_GET_REQUEST(&np->rx, requeue_idx);



		frag = &skb_shinfo(skb)->frags[0];

		page = skb_frag_page(frag);

		gnttab_grant_foreign_access_ref(

			ref, np->xbdev->otherend_id,

			pfn_to_mfn(page_to_pfn(skb_shinfo(skb)->

					       frags->page)),

			pfn_to_mfn(page_to_pfn(page)),

			0);

		req->gref = ref;

		req->id   = requeue_idx;