]> git.baikalelectronics.ru Git - kernel.git/commitdiff
igb: fix netpoll exit with traffic
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Tue, 23 Nov 2021 20:40:00 +0000 (12:40 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 25 Nov 2021 15:39:31 +0000 (07:39 -0800)
Oleksandr brought a bug report where netpoll causes trace
messages in the log on igb.

Danielle brought this back up as still occurring, so we'll try
again.

[22038.710800] ------------[ cut here ]------------
[22038.710801] igb_poll+0x0/0x1440 [igb] exceeded budget in poll
[22038.710802] WARNING: CPU: 12 PID: 40362 at net/core/netpoll.c:155 netpoll_poll_dev+0x18a/0x1a0

As Alex suggested, change the driver to return work_done at the
exit of napi_poll, which should be safe to do in this driver
because it is not polling multiple queues in this single napi
context (multiple queues attached to one MSI-X vector). Several
other drivers contain the same simple sequence, so I hope
this will not create new problems.

Fixes: 2d85e7745659 ("igb: Refactor clean_rx_irq to reduce overhead and improve performance")
Reported-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Reported-by: Danielle Ratson <danieller@nvidia.com>
Suggested-by: Alexander Duyck <alexander.duyck@gmail.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: Danielle Ratson <danieller@nvidia.com>
Link: https://lore.kernel.org/r/20211123204000.1597971-1-jesse.brandeburg@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/intel/igb/igb_main.c

index 836be0d3b29105d48530e2ce6b3f8db13c730e71..fd54d3ef890bc191503d5ace25e91ead932a2098 100644 (file)
@@ -8026,7 +8026,7 @@ static int igb_poll(struct napi_struct *napi, int budget)
        if (likely(napi_complete_done(napi, work_done)))
                igb_ring_irq_enable(q_vector);
 
-       return min(work_done, budget - 1);
+       return work_done;
 }
 
 /**