Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef2662b2 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe/ixgbevf: use napi_schedule_irqoff() 



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: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarDarin Miller <darin.j.miller@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8a9ca110

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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.

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}