Skip to contentSkip to conversation

Patch "[PATCH 020/135] fm10k: Fix handling of NAPI budget when multiple" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 9, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

[PATCH 020/135] fm10k: Fix handling of NAPI budget when multiple

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     0020-fm10k-Fix-handling-of-NAPI-budget-when-multiple-queu.patch

and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From d2cefd7c700cd39e4af907a991a440e0acca3c4b Mon Sep 17 00:00:00 2001

From: Alexander Duyck <[email protected]>
Date: Tue, 22 Sep 2015 14:35:35 -0700
Subject: [PATCH 020/135] fm10k: Fix handling of NAPI budget when multiple
queues are enabled per vector

[ Upstream commit 9f872986479b6e0543eb5c615e5f9491bb04e5c1 ]

This patch corrects an issue in which the polling routine would increase the budget for Rx to at least 1 per queue if multiple queues were present. This would result in Rx packets being processed when the budget was 0 which is meant to indicate that no Rx can be handled.

---
 drivers/net/ethernet/intel/fm10k/fm10k_main.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/net/ethernet/intel/fm10k/fm10k_main.c +4 -0
@@ -1428,6 +1428,10 @@ static int fm10k_poll(struct napi_struct
 	fm10k_for_each_ring(ring, q_vector->tx)
 		clean_complete &= fm10k_clean_tx_irq(q_vector, ring);
 
+	/* Handle case where we are called by netpoll with a budget of 0 */
+	if (budget <= 0)
+		return budget;
+
 	/* attempt to distribute budget to each queue fairly, but don't
 	 * allow the budget to go below 1 because we'll exit polling
 	 */

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/0014-ixgbe-Fix-handling-of-NAPI-budget-when-multiple-queu.patch queue-4.4/0025-fm10k-Cleanup-exception-handling-for-mailbox-interru.patch queue-4.4/0020-fm10k-Fix-handling-of-NAPI-budget-when-multiple-queu.patch queue-4.4/0024-fm10k-Cleanup-MSI-X-interrupts-in-case-of-failure.patch