| Message ID | 1415832126-31901-1-git-send-email-_govind@gmx.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 11/12/2014 02:42 PM, Govindarajulu Varadarajan wrote: > With the commit d75b1ade567 ("net: less interrupt masking in NAPI") napi repoll > is done only when work_done == budget. In tx napi poll we always return 0. > So tx napi is not called again and we do not clean up the tx ring. Good catch, I had exactly the same bug in bcmsysport.c, sounds like drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c could also need a fix. Thanks! > > Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> > --- > drivers/net/ethernet/cisco/enic/enic_main.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c > index 73cf165..5afe360 100644 > --- a/drivers/net/ethernet/cisco/enic/enic_main.c > +++ b/drivers/net/ethernet/cisco/enic/enic_main.c > @@ -1312,9 +1312,10 @@ static int enic_poll_msix_wq(struct napi_struct *napi, int budget) > if (!wq_work_done) { > napi_complete(napi); > vnic_intr_unmask(&enic->intr[intr]); > + return 0; > } > > - return 0; > + return budget; > } > > static int enic_poll_msix_rq(struct napi_struct *napi, int budget) > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Florian Fainelli <f.fainelli@gmail.com> Date: Wed, 12 Nov 2014 15:44:06 -0800 > On 11/12/2014 02:42 PM, Govindarajulu Varadarajan wrote: >> With the commit d75b1ade567 ("net: less interrupt masking in NAPI") napi repoll >> is done only when work_done == budget. In tx napi poll we always return 0. >> So tx napi is not called again and we do not clean up the tx ring. > > Good catch, I had exactly the same bug in bcmsysport.c, sounds like > drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c could also need a fix. > > Thanks! > >> >> Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 73cf165..5afe360 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -1312,9 +1312,10 @@ static int enic_poll_msix_wq(struct napi_struct *napi, int budget) if (!wq_work_done) { napi_complete(napi); vnic_intr_unmask(&enic->intr[intr]); + return 0; } - return 0; + return budget; } static int enic_poll_msix_rq(struct napi_struct *napi, int budget)
With the commit d75b1ade567 ("net: less interrupt masking in NAPI") napi repoll is done only when work_done == budget. In tx napi poll we always return 0. So tx napi is not called again and we do not clean up the tx ring. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> --- drivers/net/ethernet/cisco/enic/enic_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)