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

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

net: convert core to skb paged frag APIs 



Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15133fbb

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -1898,12 +1898,12 @@ static inline int skb_add_data(struct sk_buff *skb, 
}



static inline int skb_can_coalesce(struct sk_buff *skb, int i,

				   struct page *page, int off)

				   const struct page *page, int off)

{

	if (i) {

		struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1];



		return page == frag->page &&

		return page == skb_frag_page(frag) &&

		       off == frag->page_offset + frag->size;

	}

	return 0;

net/core/datagram.c

+4 −4
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset, 
			int err;

			u8  *vaddr;

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

			struct page *page = frag->page;

			struct page *page = skb_frag_page(frag);



			if (copy > len)

				copy = len;
@@ -418,7 +418,7 @@ int skb_copy_datagram_const_iovec(const struct sk_buff *skb, int offset, 
			int err;

			u8  *vaddr;

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

			struct page *page = frag->page;

			struct page *page = skb_frag_page(frag);



			if (copy > len)

				copy = len;
@@ -508,7 +508,7 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, 
			int err;

			u8  *vaddr;

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

			struct page *page = frag->page;

			struct page *page = skb_frag_page(frag);



			if (copy > len)

				copy = len;
@@ -594,7 +594,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, 
			int err = 0;

			u8  *vaddr;

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

			struct page *page = frag->page;

			struct page *page = skb_frag_page(frag);



			if (copy > len)

				copy = len;

net/core/dev.c

+9 −7
Original line number Diff line number Diff line
@@ -1949,10 +1949,12 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) 
#ifdef CONFIG_HIGHMEM

	int i;

	if (!(dev->features & NETIF_F_HIGHDMA)) {

		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)

			if (PageHighMem(skb_shinfo(skb)->frags[i].page))

		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

			if (PageHighMem(skb_frag_page(frag)))

				return 1;

		}

	}



	if (PCI_DMA_BUS_IS_PHYS) {

		struct device *pdev = dev->dev.parent;
@@ -1960,7 +1962,8 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) 
		if (!pdev)

			return 0;

		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

			dma_addr_t addr = page_to_phys(skb_shinfo(skb)->frags[i].page);

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

			dma_addr_t addr = page_to_phys(skb_frag_page(frag));

			if (!pdev->dma_mask || addr + PAGE_SIZE - 1 > *pdev->dma_mask)

				return 1;

		}
@@ -3474,7 +3477,7 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) 
		skb_shinfo(skb)->frags[0].size -= grow;



		if (unlikely(!skb_shinfo(skb)->frags[0].size)) {

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

			skb_frag_unref(skb, 0);

			memmove(skb_shinfo(skb)->frags,

				skb_shinfo(skb)->frags + 1,

				--skb_shinfo(skb)->nr_frags * sizeof(skb_frag_t));
@@ -3538,10 +3541,9 @@ void skb_gro_reset_offset(struct sk_buff *skb) 
	NAPI_GRO_CB(skb)->frag0_len = 0;



	if (skb->mac_header == skb->tail &&

	    !PageHighMem(skb_shinfo(skb)->frags[0].page)) {

	    !PageHighMem(skb_frag_page(&skb_shinfo(skb)->frags[0]))) {

		NAPI_GRO_CB(skb)->frag0 =

			page_address(skb_shinfo(skb)->frags[0].page) +

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

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

		NAPI_GRO_CB(skb)->frag0_len = skb_shinfo(skb)->frags[0].size;

	}

}

net/core/kmap_skb.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ static inline void *kmap_skb_frag(const skb_frag_t *frag) 


	local_bh_disable();

#endif

	return kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ);

	return kmap_atomic(skb_frag_page(frag), KM_SKB_DATA_SOFTIRQ);

}



static inline void kunmap_skb_frag(void *vaddr)

net/core/pktgen.c

+1 −2
Original line number Diff line number Diff line
@@ -2602,8 +2602,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb, 
				if (!pkt_dev->page)

					break;

			}

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

			get_page(pkt_dev->page);

			skb_frag_set_page(skb, i, pkt_dev->page);

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

			/*last fragment, fill rest of data*/

			if (i == (frags - 1))