netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: William Dauchy <william@gandi.net>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 1/9] ixgbevf: Fix handling of NAPI budget when multiple queues are enabled per vector
Date: Thu, 24 Dec 2015 21:29:48 -0800	[thread overview]
Message-ID: <1451021396-68858-2-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1451021396-68858-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: William Dauchy <william@gandi.net>

This is the same patch as for ixgbe but applied differently according to
busy polling.  See commit 5d6002b7b822c74 ("ixgbe: Fix handling of NAPI
budget when multiple queues are enabled per vector")

Signed-off-by: William Dauchy <william@gandi.net>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index f098952..478c0f1 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1016,6 +1016,8 @@ static int ixgbevf_poll(struct napi_struct *napi, int budget)
 	ixgbevf_for_each_ring(ring, q_vector->tx)
 		clean_complete &= ixgbevf_clean_tx_irq(q_vector, ring);
 
+	if (budget <= 0)
+		return budget;
 #ifdef CONFIG_NET_RX_BUSY_POLL
 	if (!ixgbevf_qv_lock_napi(q_vector))
 		return budget;
-- 
2.5.0

  reply	other threads:[~2015-12-25  5:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-25  5:29 [net-next 0/9][pull request] 10GbE Intel Wired LAN Driver Updates 2015-12-24 Jeff Kirsher
2015-12-25  5:29 ` Jeff Kirsher [this message]
2015-12-25  5:29 ` [net-next 2/9] ixgbevf: minor cleanups for ixgbevf_set_itr() Jeff Kirsher
2015-12-25  5:29 ` [net-next 3/9] ixgbe: add support for QSFP PHY types in ixgbe_get_settings() Jeff Kirsher
2015-12-25  5:29 ` [net-next 4/9] ixgbe: report correct media type for KR, KX and KX4 interfaces Jeff Kirsher
2015-12-25  5:29 ` [net-next 5/9] ixgbe: Clean up redundancy in hw_enc_features Jeff Kirsher
2015-12-25  5:29 ` [net-next 6/9] ixgbe: fix RSS limit for X550 Jeff Kirsher
2015-12-25  5:29 ` [net-next 7/9] ixgbe: Correct X550EM_x revision check Jeff Kirsher
2015-12-25  5:29 ` [net-next 8/9] ixgbe: fix write to VLVFB in ixgbe_clear_vf_vlans() Jeff Kirsher
2015-12-25 15:33   ` Tantilov, Emil S
2015-12-25  5:29 ` [net-next 9/9] ixgbe: Fix bugs " Jeff Kirsher
2015-12-26  4:34 ` [net-next 0/9][pull request] 10GbE Intel Wired LAN Driver Updates 2015-12-24 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1451021396-68858-2-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    --cc=william@gandi.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).