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

Commit 25c14ef8 authored by Govindarajulu Varadarajan's avatar Govindarajulu Varadarajan Committed by David S. Miller
Browse files

enic: fix issues in enic_poll 



In enic_poll, we clean tx and rx queues, when low latency busy socket polling
is happening, enic_poll will only clean tx queue. After cleaning tx, it should
return total budget for re-poll.

There is a small window between vnic_intr_unmask() and enic_poll_unlock_napi().
In this window if an irq occurs and napi is scheduled on different cpu, it tries
to acquire enic_poll_lock_napi() and fails. Unlock napi_poll before unmasking
the interrupt.

v2:
Do not change tx wonk done behaviour. Consider only rx work done for completing
napi.

Signed-off-by: default avatarGovindarajulu Varadarajan <_govind@gmx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a611fb75

drivers/net/ethernet/cisco/enic/enic_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ static int enic_poll(struct napi_struct *napi, int budget) 
						 wq_work_done,

						 0 /* dont unmask intr */,

						 0 /* dont reset intr timer */);

		return rq_work_done;

		return budget;

	}



	if (budget > 0)
@@ -1191,6 +1191,7 @@ static int enic_poll(struct napi_struct *napi, int budget) 
			0 /* don't reset intr timer */);



	err = vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);

	enic_poll_unlock_napi(&enic->rq[cq_rq], napi);



	/* Buffer allocation failed. Stay in polling

	 * mode so we can try to fill the ring again.
@@ -1208,7 +1209,6 @@ static int enic_poll(struct napi_struct *napi, int budget) 
		napi_complete(napi);

		vnic_intr_unmask(&enic->intr[intr]);

	}

	enic_poll_unlock_napi(&enic->rq[cq_rq], napi);



	return rq_work_done;

}