Skip to content

Commit 966df6d

Browse files
Sven Van Asbroeckdavem330
authored andcommitted
lan743x: sync only the received area of an rx ring buffer
On cpu architectures w/o dma cache snooping, dma_unmap() is a is a very expensive operation, because its resulting sync needs to invalidate cpu caches. Increase efficiency/performance by syncing only those sections of the lan743x's rx ring buffers that are actually in use. Signed-off-by: Sven Van Asbroeck <[email protected]> Reviewed-by: Bryan Whitehead <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a8db76d commit 966df6d

File tree

1 file changed

+26
-9
lines changed

1 file changed

+26
-9
lines changed

drivers/net/ethernet/microchip/lan743x_main.c

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,35 +1939,52 @@ static int lan743x_rx_init_ring_element(struct lan743x_rx *rx, int index)
19391939
struct net_device *netdev = rx->adapter->netdev;
19401940
struct device *dev = &rx->adapter->pdev->dev;
19411941
struct lan743x_rx_buffer_info *buffer_info;
1942+
unsigned int buffer_length, used_length;
19421943
struct lan743x_rx_descriptor *descriptor;
19431944
struct sk_buff *skb;
19441945
dma_addr_t dma_ptr;
1945-
int length;
19461946

1947-
length = netdev->mtu + ETH_HLEN + 4 + RX_HEAD_PADDING;
1947+
buffer_length = netdev->mtu + ETH_HLEN + 4 + RX_HEAD_PADDING;
19481948

19491949
descriptor = &rx->ring_cpu_ptr[index];
19501950
buffer_info = &rx->buffer_info[index];
1951-
skb = __netdev_alloc_skb(netdev, length, GFP_ATOMIC | GFP_DMA);
1951+
skb = __netdev_alloc_skb(netdev, buffer_length, GFP_ATOMIC | GFP_DMA);
19521952
if (!skb)
19531953
return -ENOMEM;
1954-
dma_ptr = dma_map_single(dev, skb->data, length, DMA_FROM_DEVICE);
1954+
dma_ptr = dma_map_single(dev, skb->data, buffer_length, DMA_FROM_DEVICE);
19551955
if (dma_mapping_error(dev, dma_ptr)) {
19561956
dev_kfree_skb_any(skb);
19571957
return -ENOMEM;
19581958
}
1959-
if (buffer_info->dma_ptr)
1960-
dma_unmap_single(dev, buffer_info->dma_ptr,
1961-
buffer_info->buffer_length, DMA_FROM_DEVICE);
1959+
if (buffer_info->dma_ptr) {
1960+
/* sync used area of buffer only */
1961+
if (le32_to_cpu(descriptor->data0) & RX_DESC_DATA0_LS_)
1962+
/* frame length is valid only if LS bit is set.
1963+
* it's a safe upper bound for the used area in this
1964+
* buffer.
1965+
*/
1966+
used_length = min(RX_DESC_DATA0_FRAME_LENGTH_GET_
1967+
(le32_to_cpu(descriptor->data0)),
1968+
buffer_info->buffer_length);
1969+
else
1970+
used_length = buffer_info->buffer_length;
1971+
dma_sync_single_for_cpu(dev, buffer_info->dma_ptr,
1972+
used_length,
1973+
DMA_FROM_DEVICE);
1974+
dma_unmap_single_attrs(dev, buffer_info->dma_ptr,
1975+
buffer_info->buffer_length,
1976+
DMA_FROM_DEVICE,
1977+
DMA_ATTR_SKIP_CPU_SYNC);
1978+
}
19621979

19631980
buffer_info->skb = skb;
19641981
buffer_info->dma_ptr = dma_ptr;
1965-
buffer_info->buffer_length = length;
1982+
buffer_info->buffer_length = buffer_length;
19661983
descriptor->data1 = cpu_to_le32(DMA_ADDR_LOW32(buffer_info->dma_ptr));
19671984
descriptor->data2 = cpu_to_le32(DMA_ADDR_HIGH32(buffer_info->dma_ptr));
19681985
descriptor->data3 = 0;
19691986
descriptor->data0 = cpu_to_le32((RX_DESC_DATA0_OWN_ |
1970-
(length & RX_DESC_DATA0_BUF_LENGTH_MASK_)));
1987+
(buffer_length & RX_DESC_DATA0_BUF_LENGTH_MASK_)));
19711988
lan743x_rx_update_tail(rx, index);
19721989

19731990
return 0;

0 commit comments

Comments
 (0)