evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mlx4: restore conditional call to napi_complete_done()

Browse source 
After commit 1a28817282 ("mlx4: use napi_complete_done()") we ended up
calling napi_complete_done() in the case NAPI poll consumed all its
budget.

This added extra interrupt pressure, this patch restores proper
behavior.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Fixes: 1a28817282 ("mlx4: use napi_complete_done()")
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2014-11-10 14:07:20 -08:00 • committed by David S. Miller
parent d21385fada
commit 2e1af7d74f
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/ethernet/mellanox/mlx4/en_rx.c
View file

@ -910,13 +910,14 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget)
cpu_curr = smp_processor_id(); cpu_curr = smp_processor_id();
aff = irq_desc_get_irq_data(cq->irq_desc)->affinity; aff = irq_desc_get_irq_data(cq->irq_desc)->affinity;
if (unlikely(!cpumask_test_cpu(cpu_curr, aff))) { if (likely(cpumask_test_cpu(cpu_curr, aff)))
/* Current cpu is not according to smp_irq_affinity - return budget;
* probably affinity changed. need to stop this NAPI
* poll, and restart it on the right CPU /* Current cpu is not according to smp_irq_affinity -
*/ * probably affinity changed. need to stop this NAPI
done = 0; * poll, and restart it on the right CPU
} */
done = 0;
} }
/* Done for now */ /* Done for now */
napi_complete_done(napi, done); napi_complete_done(napi, done);