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

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

ixgbe: Move poll routine in order to improve readability 



This change relocates the ixgbe_poll routine so it is right next to the
interrupt routine that schedules and calls it.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 6bb78cfb

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

+49 −49
Original line number Diff line number Diff line
@@ -2307,6 +2307,55 @@ static irqreturn_t ixgbe_msix_clean_rings(int irq, void *data) 
	return IRQ_HANDLED;

}



/**

 * ixgbe_poll - NAPI Rx polling callback

 * @napi: structure for representing this polling device

 * @budget: how many packets driver is allowed to clean

 *

 * This function is used for legacy and MSI, NAPI mode

 **/

static int ixgbe_poll(struct napi_struct *napi, int budget)

{

	struct ixgbe_q_vector *q_vector =

				container_of(napi, struct ixgbe_q_vector, napi);

	struct ixgbe_adapter *adapter = q_vector->adapter;

	struct ixgbe_ring *ring;

	int per_ring_budget;

	bool clean_complete = true;



#ifdef CONFIG_IXGBE_DCA

	if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)

		ixgbe_update_dca(q_vector);

#endif



	ixgbe_for_each_ring(ring, q_vector->tx)

		clean_complete &= !!ixgbe_clean_tx_irq(q_vector, ring);



	/* attempt to distribute budget to each queue fairly, but don't allow

	 * the budget to go below 1 because we'll exit polling */

	if (q_vector->rx.count > 1)

		per_ring_budget = max(budget/q_vector->rx.count, 1);

	else

		per_ring_budget = budget;



	ixgbe_for_each_ring(ring, q_vector->rx)

		clean_complete &= ixgbe_clean_rx_irq(q_vector, ring,

						     per_ring_budget);



	/* If all work not completed, return budget and keep polling */

	if (!clean_complete)

		return budget;



	/* all work done, exit the polling mode */

	napi_complete(napi);

	if (adapter->rx_itr_setting & 1)

		ixgbe_set_itr(q_vector);

	if (!test_bit(__IXGBE_DOWN, &adapter->state))

		ixgbe_irq_enable_queues(adapter, ((u64)1 << q_vector->v_idx));



	return 0;

}



/**

 * ixgbe_request_msix_irqs - Initialize MSI-X interrupts

 * @adapter: board private structure
@@ -4253,55 +4302,6 @@ void ixgbe_down(struct ixgbe_adapter *adapter) 
#endif

}



/**

 * ixgbe_poll - NAPI Rx polling callback

 * @napi: structure for representing this polling device

 * @budget: how many packets driver is allowed to clean

 *

 * This function is used for legacy and MSI, NAPI mode

 **/

static int ixgbe_poll(struct napi_struct *napi, int budget)

{

	struct ixgbe_q_vector *q_vector =

				container_of(napi, struct ixgbe_q_vector, napi);

	struct ixgbe_adapter *adapter = q_vector->adapter;

	struct ixgbe_ring *ring;

	int per_ring_budget;

	bool clean_complete = true;



#ifdef CONFIG_IXGBE_DCA

	if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)

		ixgbe_update_dca(q_vector);

#endif



	ixgbe_for_each_ring(ring, q_vector->tx)

		clean_complete &= !!ixgbe_clean_tx_irq(q_vector, ring);



	/* attempt to distribute budget to each queue fairly, but don't allow

	 * the budget to go below 1 because we'll exit polling */

	if (q_vector->rx.count > 1)

		per_ring_budget = max(budget/q_vector->rx.count, 1);

	else

		per_ring_budget = budget;



	ixgbe_for_each_ring(ring, q_vector->rx)

		clean_complete &= ixgbe_clean_rx_irq(q_vector, ring,

						     per_ring_budget);



	/* If all work not completed, return budget and keep polling */

	if (!clean_complete)

		return budget;



	/* all work done, exit the polling mode */

	napi_complete(napi);

	if (adapter->rx_itr_setting & 1)

		ixgbe_set_itr(q_vector);

	if (!test_bit(__IXGBE_DOWN, &adapter->state))

		ixgbe_irq_enable_queues(adapter, ((u64)1 << q_vector->v_idx));



	return 0;

}



/**

 * ixgbe_tx_timeout - Respond to a Tx Hang

 * @netdev: network interface device structure