FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-01-16 08:12:53 +08:00
Code Issues Projects Releases Wiki Activity

Rework DMA mapping

Browse Source
This commit is contained in:
Alex Forencich 2020-03-09 17:21:39 -07:00
parent 1216f7a76e
commit 37294142b8
3 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mqnic/mqnic.h
View File

@ -115,15 +115,15 @@ struct mqnic_dev {
struct mqnic_tx_info {
struct sk_buff *skb;
dma_addr_t dma_addr;
int len;
DEFINE_DMA_UNMAP_ADDR(dma_addr);
DEFINE_DMA_UNMAP_LEN(len);
int ts_requested;
};
struct mqnic_rx_info {
struct sk_buff *skb;
dma_addr_t dma_addr;
int len;
DEFINE_DMA_UNMAP_ADDR(dma_addr);
DEFINE_DMA_UNMAP_LEN(len);
};
struct mqnic_ring {

38
modules/mqnic/mqnic_rx.c
View File

@ -166,10 +166,11 @@ void mqnic_rx_write_head_ptr(struct mqnic_ring *ring)
void mqnic_free_rx_desc(struct mqnic_priv *priv, struct mqnic_ring *ring, int index)
{
struct mqnic_rx_info *rx_info = &ring->rx_info[index];
struct sk_buff *skb = rx_info->skb;
dma_unmap_single(priv->dev, rx_info->dma_addr, rx_info->len, PCI_DMA_FROMDEVICE);
rx_info->dma_addr = 0;
napi_consume_skb(rx_info->skb, 0);
dma_unmap_single(priv->dev, dma_unmap_addr(rx_info, dma_addr), dma_unmap_len(rx_info, len), PCI_DMA_FROMDEVICE);
dma_unmap_addr_set(rx_info, dma_addr, 0);
napi_consume_skb(skb, 0);
rx_info->skb = NULL;
}
@ -198,8 +199,8 @@ int mqnic_prepare_rx_desc(struct mqnic_priv *priv, struct mqnic_ring *ring, int
struct mqnic_rx_info *rx_info = &ring->rx_info[index];
struct mqnic_desc *rx_desc = (struct mqnic_desc *)(ring->buf + index * sizeof(*rx_desc));
struct sk_buff *skb = rx_info->skb;
rx_info->len = ring->mtu+ETH_HLEN;
u32 len = ring->mtu+ETH_HLEN;
dma_addr_t dma_addr;
if (unlikely(skb))
{
@ -207,20 +208,18 @@ int mqnic_prepare_rx_desc(struct mqnic_priv *priv, struct mqnic_ring *ring, int
return -1;
}
skb = netdev_alloc_skb_ip_align(priv->ndev, rx_info->len);
skb = netdev_alloc_skb_ip_align(priv->ndev, len);
if (unlikely(!skb))
{
dev_err(&priv->mdev->pdev->dev, "mqnic_prepare_rx_desc failed to allocate skb on port %d", priv->port);
return -1;
}
rx_info->skb = skb;
map_skb:
// map skb
rx_info->dma_addr = dma_map_single(priv->dev, skb->data, rx_info->len, PCI_DMA_FROMDEVICE);
dma_addr = dma_map_single(priv->dev, skb->data, len, PCI_DMA_FROMDEVICE);
if (unlikely(dma_mapping_error(priv->dev, rx_info->dma_addr)))
if (unlikely(dma_mapping_error(priv->dev, dma_addr)))
{
dev_err(&priv->mdev->pdev->dev, "mqnic_prepare_rx_desc failed to map skb on port %d", priv->port);
napi_consume_skb(rx_info->skb, 0);
@ -228,8 +227,13 @@ map_skb:
}
// write descriptor
rx_desc->len = rx_info->len;
rx_desc->addr = rx_info->dma_addr;
rx_desc->len = len;
rx_desc->addr = dma_addr;
// update rx_info
rx_info->skb = skb;
dma_unmap_addr_set(rx_info, dma_addr, dma_addr);
dma_unmap_len_set(rx_info, len, len);
return 0;
}
@ -296,10 +300,14 @@ bool mqnic_process_rx_cq(struct net_device *ndev, struct mqnic_cq_ring *cq_ring,
}
// set length
if (cpl->len <= rx_info->len)
if (cpl->len <= skb_tailroom(skb))
{
skb_put(skb, cpl->len);
}
else
{
skb_put(skb, skb_tailroom(skb));
}
skb->protocol = eth_type_trans(skb, priv->ndev);
// RX hardware timestamp
@ -320,8 +328,8 @@ bool mqnic_process_rx_cq(struct net_device *ndev, struct mqnic_cq_ring *cq_ring,
}
// unmap
dma_unmap_single(priv->dev, rx_info->dma_addr, rx_info->len, PCI_DMA_FROMDEVICE);
rx_info->dma_addr = 0;
dma_unmap_single(priv->dev, dma_unmap_addr(rx_info, dma_addr), dma_unmap_len(rx_info, len), PCI_DMA_FROMDEVICE);
dma_unmap_addr_set(rx_info, dma_addr, 0);
// hand off SKB
napi_gro_receive(&cq_ring->napi, skb);

30
modules/mqnic/mqnic_tx.c
View File

@ -166,10 +166,11 @@ void mqnic_tx_write_head_ptr(struct mqnic_ring *ring)
void mqnic_free_tx_desc(struct mqnic_priv *priv, struct mqnic_ring *ring, int index, int napi_budget)
{
struct mqnic_tx_info *tx_info = &ring->tx_info[index];
struct sk_buff *skb = tx_info->skb;
dma_unmap_single(priv->dev, tx_info->dma_addr, tx_info->len, PCI_DMA_TODEVICE);
tx_info->dma_addr = 0;
napi_consume_skb(tx_info->skb, napi_budget);
dma_unmap_single(priv->dev, dma_unmap_addr(tx_info, dma_addr), dma_unmap_len(tx_info, len), PCI_DMA_TODEVICE);
dma_unmap_addr_set(tx_info, dma_addr, 0);
napi_consume_skb(skb, napi_budget);
tx_info->skb = NULL;
}
@ -329,6 +330,7 @@ netdev_tx_t mqnic_start_xmit(struct sk_buff *skb, struct net_device *ndev)
u32 index;
bool stop_queue;
u32 clean_tail_ptr;
dma_addr_t dma_addr;
if (unlikely(!priv->port_up))
{
@ -355,8 +357,6 @@ netdev_tx_t mqnic_start_xmit(struct sk_buff *skb, struct net_device *ndev)
tx_desc = (struct mqnic_desc *)(ring->buf + index * sizeof(*tx_desc));
tx_info = &ring->tx_info[index];
tx_info->skb = skb;
tx_info->len = skb->len;
// TX hardware timestamp
tx_info->ts_requested = 0;
@ -393,21 +393,27 @@ netdev_tx_t mqnic_start_xmit(struct sk_buff *skb, struct net_device *ndev)
tx_desc->tx_csum_cmd = 0;
}
ring->packets++;
ring->bytes += tx_info->len;
// map skb
tx_info->dma_addr = dma_map_single(priv->dev, skb->data, skb->len, PCI_DMA_TODEVICE);
dma_addr = dma_map_single(priv->dev, skb->data, skb->len, PCI_DMA_TODEVICE);
if (unlikely(dma_mapping_error(priv->dev, tx_info->dma_addr)))
if (unlikely(dma_mapping_error(priv->dev, dma_addr)))
{
// mapping failed
goto tx_drop_count;
}
// write descriptor
tx_desc->len = tx_info->len;
tx_desc->addr = tx_info->dma_addr;
tx_desc->len = skb->len;
tx_desc->addr = dma_addr;
// update tx_info
tx_info->skb = skb;
dma_unmap_addr_set(tx_info, dma_addr, dma_addr);
dma_unmap_len_set(tx_info, len, skb->len);
// count packet
ring->packets++;
ring->bytes += skb->len;
// enqueue
ring->head_ptr++;