Skip to content

Commit b64b7bb

Browse files
Jakub Kicinskidavem330
authored andcommitted
nfp: add separate buffer allocation function for napi
Introduce a separate buffer allocation function to be called from NAPI. We can make assumptions about the context and buffer size. Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c0f031b commit b64b7bb

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,26 @@ nfp_net_rx_alloc_one(struct nfp_net_rx_ring *rx_ring, dma_addr_t *dma_addr,
10981098
return frag;
10991099
}
11001100

1101+
static void *nfp_net_napi_alloc_one(struct nfp_net *nn, dma_addr_t *dma_addr)
1102+
{
1103+
void *frag;
1104+
1105+
frag = napi_alloc_frag(nn->fl_bufsz);
1106+
if (!frag) {
1107+
nn_warn_ratelimit(nn, "Failed to alloc receive page frag\n");
1108+
return NULL;
1109+
}
1110+
1111+
*dma_addr = nfp_net_dma_map_rx(nn, frag, nn->fl_bufsz, DMA_FROM_DEVICE);
1112+
if (dma_mapping_error(&nn->pdev->dev, *dma_addr)) {
1113+
skb_free_frag(frag);
1114+
nn_warn_ratelimit(nn, "Failed to map DMA RX buffer\n");
1115+
return NULL;
1116+
}
1117+
1118+
return frag;
1119+
}
1120+
11011121
/**
11021122
* nfp_net_rx_give_one() - Put mapped skb on the software and hardware rings
11031123
* @rx_ring: RX ring structure
@@ -1413,8 +1433,7 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)
14131433
nfp_net_rx_drop(r_vec, rx_ring, rxbuf, NULL);
14141434
continue;
14151435
}
1416-
new_frag = nfp_net_rx_alloc_one(rx_ring, &new_dma_addr,
1417-
nn->fl_bufsz);
1436+
new_frag = nfp_net_napi_alloc_one(nn, &new_dma_addr);
14181437
if (unlikely(!new_frag)) {
14191438
nfp_net_rx_drop(r_vec, rx_ring, rxbuf, skb);
14201439
continue;

0 commit comments

Comments
 (0)