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

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

i40e/i40evf: Fix handling of napi budget 



The polling routine for i40e was rounding up the budget for Rx cleanup to
1.  This is incorrect as the netpoll poll call is expecting no Rx to be
processed as the budget passed was 0.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 51161aa9

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+5 −0
Original line number Diff line number Diff line
@@ -1846,6 +1846,10 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) 
		ring->arm_wb = false;

	}



	/* Handle case where we are called by netpoll with a budget of 0 */

	if (budget <= 0)

		goto tx_only;



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

	 * allow the budget to go below 1 because that would exit polling early.

	 */
@@ -1862,6 +1866,7 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) 


	/* If work not completed, return budget and polling will return */

	if (!clean_complete) {

tx_only:

		if (arm_wb)

			i40e_force_wb(vsi, q_vector);

		return budget;

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+5 −0
Original line number Diff line number Diff line
@@ -1287,6 +1287,10 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) 
		ring->arm_wb = false;

	}



	/* Handle case where we are called by netpoll with a budget of 0 */

	if (budget <= 0)

		goto tx_only;



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

	 * allow the budget to go below 1 because that would exit polling early.

	 */
@@ -1303,6 +1307,7 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget) 


	/* If work not completed, return budget and polling will return */

	if (!clean_complete) {

tx_only:

		if (arm_wb)

			i40evf_force_wb(vsi, q_vector);

		return budget;