Commit e01ee14d authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Add partial fragment unmapping code 



The following patches are going to break skb fragments into smaller
sizes.  This patch attempts to make the change easier to digest by only
addressing the skb teardown portion.

The patch modifies the driver to skip over any BDs that have a flag set
that indicates the BD isn't the beginning of an skb fragment.  Such BDs
were a result of segmentation and do not need a pci_unmap_page() call.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d681b27

drivers/net/tg3.c

+26 −0
Original line number Diff line number Diff line
@@ -4840,6 +4840,12 @@ static void tg3_tx(struct tg3_napi *tnapi) 


		ri->skb = NULL;



		while (ri->fragmented) {

			ri->fragmented = false;

			sw_idx = NEXT_TX(sw_idx);

			ri = &tnapi->tx_buffers[sw_idx];

		}



		sw_idx = NEXT_TX(sw_idx);



		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
@@ -4851,6 +4857,13 @@ static void tg3_tx(struct tg3_napi *tnapi) 
				       dma_unmap_addr(ri, mapping),

				       skb_shinfo(skb)->frags[i].size,

				       PCI_DMA_TODEVICE);



			while (ri->fragmented) {

				ri->fragmented = false;

				sw_idx = NEXT_TX(sw_idx);

				ri = &tnapi->tx_buffers[sw_idx];

			}



			sw_idx = NEXT_TX(sw_idx);

		}
@@ -5926,6 +5939,13 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last) 
			 dma_unmap_addr(txb, mapping),

			 skb_headlen(skb),

			 PCI_DMA_TODEVICE);



	while (txb->fragmented) {

		txb->fragmented = false;

		entry = NEXT_TX(entry);

		txb = &tnapi->tx_buffers[entry];

	}



	for (i = 0; i < last; i++) {

		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
@@ -5935,6 +5955,12 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last) 
		pci_unmap_page(tnapi->tp->pdev,

			       dma_unmap_addr(txb, mapping),

			       frag->size, PCI_DMA_TODEVICE);



		while (txb->fragmented) {

			txb->fragmented = false;

			entry = NEXT_TX(entry);

			txb = &tnapi->tx_buffers[entry];

		}

	}

}

drivers/net/tg3.h

+1 −0
Original line number Diff line number Diff line
@@ -2655,6 +2655,7 @@ struct ring_info { 
struct tg3_tx_ring_info {

	struct sk_buff			*skb;

	DEFINE_DMA_UNMAP_ADDR(mapping);

	bool				fragmented;

};



struct tg3_link_config {

CRA Git | Maintained and supported by SUSTech CRA and CCSE