diff mbox

NAPI: Polling function requesting extra calls - difference between 3.18.11 and 4.0.0

Message ID 1429814038.22254.80.camel@edumazet-glaptop2.roam.corp.google.com
State RFC, archived
Delegated to: David Miller
Headers show

Commit Message

Eric Dumazet April 23, 2015, 6:33 p.m. UTC 
On Thu, 2015-04-23 at 11:28 -0700, Eric Dumazet wrote:
> On Thu, 2015-04-23 at 20:18 +0200, Rafał Miłecki wrote:
> 
> > 
> > Can you help us with this, please? Does bgmac use NAPI incorrectly?
> > Were there some important changes in 3.19 or 4.0?
> > 
> 
> Right they were important changes in NAPI indeed :
> 
> 3b47d30396ba net: gro: add a per device gro flush timer
> d75b1ade567f net: less interrupt masking in NAPI
> bc9ad166e38a net: introduce napi_schedule_irqoff()
> 
> This requested some fixes in various drivers :
> 
> commit f31ec95fa19e07a8beebcc0297284f23aa57967e
> commit 24e579c8898aa641ede3149234906982290934e5
> commit 6088beef3f7517717bd21d90b379714dd0837079
> commit f104fedc0da126abe93dd0f4a9fa13e5133bf9df
> commit 7a05dc64e2e4c611d89007b125b20c0d2a4d31a5
> commit 001ce546bb537bb5b7821f05633556a0c9787e32
> commit 3079c652141f9d6377417a7e8fd650c9948df65e
> commit 8acdf999accfd95093db17f33a58429a38782060
> commit 6a6dc08ff6395f58be3ee568cb970ea956f16819
> 

It looks like following fix is needed :



--
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

Comments

Rafał Miłecki April 23, 2015, 6:35 p.m. UTC | #1 
On 23 April 2015 at 20:33, Eric Dumazet <eric.dumazet@gmail.com> wrote:
> On Thu, 2015-04-23 at 11:28 -0700, Eric Dumazet wrote:
>> On Thu, 2015-04-23 at 20:18 +0200, Rafał Miłecki wrote:
>>
>> >
>> > Can you help us with this, please? Does bgmac use NAPI incorrectly?
>> > Were there some important changes in 3.19 or 4.0?
>> >
>>
>> Right they were important changes in NAPI indeed :
>>
>> 3b47d30396ba net: gro: add a per device gro flush timer
>> d75b1ade567f net: less interrupt masking in NAPI
>> bc9ad166e38a net: introduce napi_schedule_irqoff()
>>
>> This requested some fixes in various drivers :
>>
>> commit f31ec95fa19e07a8beebcc0297284f23aa57967e
>> commit 24e579c8898aa641ede3149234906982290934e5
>> commit 6088beef3f7517717bd21d90b379714dd0837079
>> commit f104fedc0da126abe93dd0f4a9fa13e5133bf9df
>> commit 7a05dc64e2e4c611d89007b125b20c0d2a4d31a5
>> commit 001ce546bb537bb5b7821f05633556a0c9787e32
>> commit 3079c652141f9d6377417a7e8fd650c9948df65e
>> commit 8acdf999accfd95093db17f33a58429a38782060
>> commit 6a6dc08ff6395f58be3ee568cb970ea956f16819
>>
>
> It looks like following fix is needed :
>
> diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
> index de77d3a74abc..21e3c38c7c75 100644
> --- a/drivers/net/ethernet/broadcom/bgmac.c
> +++ b/drivers/net/ethernet/broadcom/bgmac.c
> @@ -1260,7 +1260,7 @@ static int bgmac_poll(struct napi_struct *napi, int weight)
>
>         /* Poll again if more events arrived in the meantime */
>         if (bgmac_read(bgmac, BGMAC_INT_STATUS) & (BGMAC_IS_TX0 | BGMAC_IS_RX))
> -               return handled;
> +               return weight;
>
>         if (handled < weight) {
>                 napi_complete(napi);
>
>

Yeah, I'm flashing my device with the same patch applied right now :)
diff mbox

Patch

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index de77d3a74abc..21e3c38c7c75 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1260,7 +1260,7 @@  static int bgmac_poll(struct napi_struct *napi, int weight)
 
 	/* Poll again if more events arrived in the meantime */
 	if (bgmac_read(bgmac, BGMAC_INT_STATUS) & (BGMAC_IS_TX0 | BGMAC_IS_RX))
-		return handled;
+		return weight;
 
 	if (handled < weight) {
 		napi_complete(napi);