mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 18:07:03 +00:00
skge: add dma_mapping check
This old driver never checked for DMA mapping errors. Causing splats with the new DMA mapping checks: WARNING: at lib/dma-debug.c:937 check_unmap+0x47b/0x930() skge 0000:01:09.0: DMA-API: device driver failed to check map Add checks and unwind code. Reported-by: poma <pomidorabelisima@gmail.com> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
72a67a94bc
commit
136d8f377e
@ -931,15 +931,18 @@ static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u32 base)
|
||||
}
|
||||
|
||||
/* Allocate and setup a new buffer for receiving */
|
||||
static void skge_rx_setup(struct skge_port *skge, struct skge_element *e,
|
||||
struct sk_buff *skb, unsigned int bufsize)
|
||||
static int skge_rx_setup(struct skge_port *skge, struct skge_element *e,
|
||||
struct sk_buff *skb, unsigned int bufsize)
|
||||
{
|
||||
struct skge_rx_desc *rd = e->desc;
|
||||
u64 map;
|
||||
dma_addr_t map;
|
||||
|
||||
map = pci_map_single(skge->hw->pdev, skb->data, bufsize,
|
||||
PCI_DMA_FROMDEVICE);
|
||||
|
||||
if (pci_dma_mapping_error(skge->hw->pdev, map))
|
||||
return -1;
|
||||
|
||||
rd->dma_lo = map;
|
||||
rd->dma_hi = map >> 32;
|
||||
e->skb = skb;
|
||||
@ -953,6 +956,7 @@ static void skge_rx_setup(struct skge_port *skge, struct skge_element *e,
|
||||
rd->control = BMU_OWN | BMU_STF | BMU_IRQ_EOF | BMU_TCP_CHECK | bufsize;
|
||||
dma_unmap_addr_set(e, mapaddr, map);
|
||||
dma_unmap_len_set(e, maplen, bufsize);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Resume receiving using existing skb,
|
||||
@ -1014,7 +1018,10 @@ static int skge_rx_fill(struct net_device *dev)
|
||||
return -ENOMEM;
|
||||
|
||||
skb_reserve(skb, NET_IP_ALIGN);
|
||||
skge_rx_setup(skge, e, skb, skge->rx_buf_size);
|
||||
if (skge_rx_setup(skge, e, skb, skge->rx_buf_size) < 0) {
|
||||
dev_kfree_skb(skb);
|
||||
return -EIO;
|
||||
}
|
||||
} while ((e = e->next) != ring->start);
|
||||
|
||||
ring->to_clean = ring->start;
|
||||
@ -2729,7 +2736,7 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
|
||||
struct skge_tx_desc *td;
|
||||
int i;
|
||||
u32 control, len;
|
||||
u64 map;
|
||||
dma_addr_t map;
|
||||
|
||||
if (skb_padto(skb, ETH_ZLEN))
|
||||
return NETDEV_TX_OK;
|
||||
@ -2743,6 +2750,9 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
|
||||
e->skb = skb;
|
||||
len = skb_headlen(skb);
|
||||
map = pci_map_single(hw->pdev, skb->data, len, PCI_DMA_TODEVICE);
|
||||
if (pci_dma_mapping_error(hw->pdev, map))
|
||||
goto mapping_error;
|
||||
|
||||
dma_unmap_addr_set(e, mapaddr, map);
|
||||
dma_unmap_len_set(e, maplen, len);
|
||||
|
||||
@ -2778,6 +2788,8 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
|
||||
|
||||
map = skb_frag_dma_map(&hw->pdev->dev, frag, 0,
|
||||
skb_frag_size(frag), DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(&hw->pdev->dev, map))
|
||||
goto mapping_unwind;
|
||||
|
||||
e = e->next;
|
||||
e->skb = skb;
|
||||
@ -2815,6 +2827,26 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
|
||||
}
|
||||
|
||||
return NETDEV_TX_OK;
|
||||
|
||||
mapping_unwind:
|
||||
e = skge->tx_ring.to_use;
|
||||
pci_unmap_single(hw->pdev,
|
||||
dma_unmap_addr(e, mapaddr),
|
||||
dma_unmap_len(e, maplen),
|
||||
PCI_DMA_TODEVICE);
|
||||
while (i-- > 0) {
|
||||
e = e->next;
|
||||
pci_unmap_page(hw->pdev,
|
||||
dma_unmap_addr(e, mapaddr),
|
||||
dma_unmap_len(e, maplen),
|
||||
PCI_DMA_TODEVICE);
|
||||
}
|
||||
|
||||
mapping_error:
|
||||
if (net_ratelimit())
|
||||
dev_warn(&hw->pdev->dev, "%s: tx mapping error\n", dev->name);
|
||||
dev_kfree_skb(skb);
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
|
||||
@ -3058,13 +3090,17 @@ static struct sk_buff *skge_rx_get(struct net_device *dev,
|
||||
if (!nskb)
|
||||
goto resubmit;
|
||||
|
||||
if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) {
|
||||
dev_kfree_skb(nskb);
|
||||
goto resubmit;
|
||||
}
|
||||
|
||||
pci_unmap_single(skge->hw->pdev,
|
||||
dma_unmap_addr(e, mapaddr),
|
||||
dma_unmap_len(e, maplen),
|
||||
PCI_DMA_FROMDEVICE);
|
||||
skb = e->skb;
|
||||
prefetch(skb->data);
|
||||
skge_rx_setup(skge, e, nskb, skge->rx_buf_size);
|
||||
}
|
||||
|
||||
skb_put(skb, len);
|
||||
|
Loading…
Reference in New Issue
Block a user