All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Alexander Duyck <aduyck@mirantis.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 10/15] ixgbe/ixgbevf: use napi_schedule_irqoff()
Date: Mon, 23 Nov 2015 11:36:11 -0800	[thread overview]
Message-ID: <1448307376-20063-11-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1448307376-20063-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Alexander Duyck <aduyck@mirantis.com>

The ixgbe_intr and ixgbe/ixgbevf_msix_clean_rings functions run from hard
interrupt context or with interrupts already disabled in netpoll.

They can use napi_schedule_irqoff() instead of napi_schedule()

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Darin Miller <darin.j.miller@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c     | 4 ++--
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 4fa94a3..c95042e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2754,7 +2754,7 @@ static irqreturn_t ixgbe_msix_clean_rings(int irq, void *data)
 	/* EIAM disabled interrupts (on this vector) for us */
 
 	if (q_vector->rx.ring || q_vector->tx.ring)
-		napi_schedule(&q_vector->napi);
+		napi_schedule_irqoff(&q_vector->napi);
 
 	return IRQ_HANDLED;
 }
@@ -2948,7 +2948,7 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
 		ixgbe_ptp_check_pps_event(adapter, eicr);
 
 	/* would disable interrupts here but EIAM disabled it */
-	napi_schedule(&q_vector->napi);
+	napi_schedule_irqoff(&q_vector->napi);
 
 	/*
 	 * re-enable link(maybe) and non-queue interrupts, no flush.
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index e678178..1b15f95 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1288,7 +1288,7 @@ static irqreturn_t ixgbevf_msix_clean_rings(int irq, void *data)
 
 	/* EIAM disabled interrupts (on this vector) for us */
 	if (q_vector->rx.ring || q_vector->tx.ring)
-		napi_schedule(&q_vector->napi);
+		napi_schedule_irqoff(&q_vector->napi);
 
 	return IRQ_HANDLED;
 }
-- 
2.5.0

  parent reply	other threads:[~2015-11-23 19:36 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-23 19:36 [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2015-11-23 Jeff Kirsher
2015-11-23 19:36 ` [net-next 01/15] fm10k: do not assume VF always has 1 queue Jeff Kirsher
2015-11-23 19:36 ` [net-next 02/15] fm10k: Correct MTU for jumbo frames Jeff Kirsher
2015-11-23 19:36 ` [net-next 03/15] ixgbe: drop null test before destroy functions Jeff Kirsher
2015-11-23 19:36 ` [net-next 04/15] ixgbe: Delete redundant include file Jeff Kirsher
2015-11-24 18:36   ` Joe Perches
2015-11-23 19:36 ` [net-next 05/15] ixgbe: fix multiple kernel-doc errors Jeff Kirsher
2015-11-23 19:36 ` [net-next 06/15] fm10k: Fix handling of NAPI budget when multiple queues are enabled per vector Jeff Kirsher
2015-11-23 19:36 ` [net-next 07/15] ixgbe: " Jeff Kirsher
2015-11-27  8:25   ` William Dauchy
2015-11-23 19:36 ` [net-next 08/15] ixgbe: Add KR mode support for CS4227 chip Jeff Kirsher
2015-11-23 19:36 ` [net-next 09/15] ixgbevf: Limit lowest interrupt rate for adaptive interrupt moderation to 12K Jeff Kirsher
2015-11-23 19:36 ` Jeff Kirsher [this message]
2015-11-23 19:36 ` [net-next 11/15] ixgbe: Remove CS4227 diagnostic code Jeff Kirsher
2015-11-23 19:36 ` [net-next 12/15] i40evf: fix compiler warning of unused variable Jeff Kirsher
2015-11-26 14:03   ` Sergei Shtylyov
2015-11-23 19:36 ` [net-next 13/15] ixgbevf: use ether_addr_copy instead of memcpy Jeff Kirsher
2015-11-23 19:36 ` [net-next 14/15] ixgbevf: fix spoofed packets with random MAC Jeff Kirsher
2015-11-23 19:36 ` [net-next 15/15] intel: i40e: fix confused code Jeff Kirsher
2015-11-24 15:39 ` [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2015-11-23 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=1448307376-20063-11-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=aduyck@mirantis.com \
    --cc=davem@davemloft.net \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.