| Message ID | 1607599507-5879-1-git-send-email-loic.poulain@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | net: mhi: Fix unexpected queue wake | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Thu, 10 Dec 2020 12:25:07 +0100 you wrote: > This patch checks that MHI queue is not full before waking up the net > queue. This fix sporadic MHI queueing issues in xmit. Indeed xmit and > its symmetric complete callback (ul_callback) can run concurently, it > is then not safe to unconditionnaly waking the queue in the callback > without checking queue fullness. > > Fixes: 3ffec6a14f24 ("net: Add mhi-net driver") > Signed-off-by: Loic Poulain <loic.poulain@linaro.org> > > [...] Here is the summary with links: - net: mhi: Fix unexpected queue wake https://git.kernel.org/netdev/net-next/c/efc36d3c344a You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c index 8e72d94..b7f7f2e 100644 --- a/drivers/net/mhi_net.c +++ b/drivers/net/mhi_net.c @@ -173,6 +173,7 @@ static void mhi_net_ul_callback(struct mhi_device *mhi_dev, { struct mhi_net_dev *mhi_netdev = dev_get_drvdata(&mhi_dev->dev); struct net_device *ndev = mhi_netdev->ndev; + struct mhi_device *mdev = mhi_netdev->mdev; struct sk_buff *skb = mhi_res->buf_addr; /* Hardware has consumed the buffer, so free the skb (which is not @@ -196,7 +197,7 @@ static void mhi_net_ul_callback(struct mhi_device *mhi_dev, } u64_stats_update_end(&mhi_netdev->stats.tx_syncp); - if (netif_queue_stopped(ndev)) + if (netif_queue_stopped(ndev) && !mhi_queue_is_full(mdev, DMA_TO_DEVICE)) netif_wake_queue(ndev); }
This patch checks that MHI queue is not full before waking up the net queue. This fix sporadic MHI queueing issues in xmit. Indeed xmit and its symmetric complete callback (ul_callback) can run concurently, it is then not safe to unconditionnaly waking the queue in the callback without checking queue fullness. Fixes: 3ffec6a14f24 ("net: Add mhi-net driver") Signed-off-by: Loic Poulain <loic.poulain@linaro.org> --- drivers/net/mhi_net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4