leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfp: make use of napi_consume_skb()

Browse Source 
Use napi_consume_skb() in nfp_net_tx_complete() to get bulk free.
Pass 0 as budget for ctrl queue completion since it runs out of
a tasklet.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2018-06-29 17:04:37 -07:00 committed by David S. Miller
parent 670b5274ff
commit d387b8a19a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
View File

@ -945,11 +945,12 @@ err_free:
/** /**
* nfp_net_tx_complete() - Handled completed TX packets * nfp_net_tx_complete() - Handled completed TX packets
* @tx_ring: TX ring structure * @tx_ring: TX ring structure
* @budget: NAPI budget (only used as bool to determine if in NAPI context)
* *
* Return: Number of completed TX descriptors * Return: Number of completed TX descriptors
*/ */
static void nfp_net_tx_complete(struct nfp_net_tx_ring *tx_ring) static void nfp_net_tx_complete(struct nfp_net_tx_ring *tx_ring, int budget)
{ {
struct nfp_net_r_vector *r_vec = tx_ring->r_vec; struct nfp_net_r_vector *r_vec = tx_ring->r_vec;
struct nfp_net_dp *dp = &r_vec->nfp_net->dp; struct nfp_net_dp *dp = &r_vec->nfp_net->dp;
@ -999,7 +1000,7 @@ static void nfp_net_tx_complete(struct nfp_net_tx_ring *tx_ring)
/* check for last gather fragment */ /* check for last gather fragment */
if (fidx == nr_frags - 1) if (fidx == nr_frags - 1)
dev_consume_skb_any(skb); napi_consume_skb(skb, budget);
tx_ring->txbufs[idx].dma_addr = 0; tx_ring->txbufs[idx].dma_addr = 0;
tx_ring->txbufs[idx].skb = NULL; tx_ring->txbufs[idx].skb = NULL;
@ -1828,7 +1829,7 @@ static int nfp_net_poll(struct napi_struct *napi, int budget)
unsigned int pkts_polled = 0; unsigned int pkts_polled = 0;
if (r_vec->tx_ring) if (r_vec->tx_ring)
nfp_net_tx_complete(r_vec->tx_ring); nfp_net_tx_complete(r_vec->tx_ring, budget);
if (r_vec->rx_ring) if (r_vec->rx_ring)
pkts_polled = nfp_net_rx(r_vec->rx_ring, budget); pkts_polled = nfp_net_rx(r_vec->rx_ring, budget);
@ -2062,7 +2063,7 @@ static void nfp_ctrl_poll(unsigned long arg)
struct nfp_net_r_vector *r_vec = (void *)arg; struct nfp_net_r_vector *r_vec = (void *)arg;
spin_lock_bh(&r_vec->lock); spin_lock_bh(&r_vec->lock);
nfp_net_tx_complete(r_vec->tx_ring); nfp_net_tx_complete(r_vec->tx_ring, 0);
__nfp_ctrl_tx_queued(r_vec); __nfp_ctrl_tx_queued(r_vec);
spin_unlock_bh(&r_vec->lock); spin_unlock_bh(&r_vec->lock);