| Message ID | CACna6rzMMUA_MQemYyP93+TjP4aocL1WaYQUJFwQm3+DLNAefg@mail.gmail.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
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 -- 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
On 23 April 2015 at 20:28, Eric Dumazet <eric.dumazet@gmail.com> 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() As you obviously noticed, I fixed bgmac now and submitted the fix. Just wanted to say a thanks for helping with that!
On Thu, 2015-04-23 at 21:08 +0200, Rafał Miłecki wrote: > As you obviously noticed, I fixed bgmac now and submitted the fix. > > Just wanted to say a thanks for helping with that! > Sure, it was a pleasure ;) -- 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/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 4929932..40ce34d 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -1219,6 +1219,7 @@ static irqreturn_t bgmac_interrupt(int irq, void *dev_id) struct bgmac *bgmac = netdev_priv(dev_id); u32 int_status = bgmac_read(bgmac, BGMAC_INT_STATUS); + pr_info("[%s] int_status:0x%08x & int_mask:0x%08x = 0x%08x\n", __FUNCTION__, int_status, bgmac->int_mask, int_status & bgmac->int_mask); int_status &= bgmac->int_mask; if (!int_status) @@ -1240,22 +1241,31 @@ static int bgmac_poll(struct napi_struct *napi, int weight) { struct bgmac *bgmac = container_of(napi, struct bgmac, napi); int handled = 0; + u32 int_status; + pr_info("[%s] START weight:%d\n", __FUNCTION__, weight); /* Ack */ bgmac_write(bgmac, BGMAC_INT_STATUS, ~0); bgmac_dma_tx_free(bgmac, &bgmac->tx_ring[0]); handled += bgmac_dma_rx_read(bgmac, &bgmac->rx_ring[0], weight); + pr_info("[%s] Read handled:%d skb-s\n", __FUNCTION__, handled); /* Poll again if more events arrived in the meantime */ - if (bgmac_read(bgmac, BGMAC_INT_STATUS) & (BGMAC_IS_TX0 | BGMAC_IS_RX)) + int_status = bgmac_read(bgmac, BGMAC_INT_STATUS); + pr_info("[%s] Read IRQ status again BGMAC_IS_TX0:%d BGMAC_IS_RX:%d\n", __FUNCTION__, !!(int_status & BGMAC_IS_TX0), !!(int_status & BGMAC_IS_RX)); + if (int_status & (BGMAC_IS_TX0 | BGMAC_IS_RX)) { + pr_info("[%s] END more skb-s to handle, returning handled:%d\n", __FUNCTION__, handled); return handled; + } if (handled < weight) { + pr_info("[%s] Read skb-s < weight, calling napi_complete, en IRQs\n", __FUNCTION__); napi_complete(napi); bgmac_chip_intrs_on(bgmac); } + pr_info("[%s] END returning handled:%d\n", __FUNCTION__, handled); return handled; }