提交 2d757828 编写于 作者: J Julian Wiedmann 提交者: Greg Kroah-Hartman

s390/qeth: invoke softirqs after napi_schedule()

[ Upstream commit 4d19db777a2f32c9b76f6fd517ed8960576cb43e ]

Calling napi_schedule() from process context does not ensure that the
NET_RX softirq is run in a timely fashion. So trigger it manually.

This is no big issue with current code. A call to ndo_open() is usually
followed by a ndo_set_rx_mode() call, and for qeth this contains a
spin_unlock_bh(). Except for OSN, where qeth_l2_set_rx_mode() bails out
early.
Nevertheless it's best to not depend on this behaviour, and just fix
the issue at its source like all other drivers do. For instance see
commit 83a0c6e5 ("i40e: Invoke softirqs after napi_reschedule").

Fixes: a1c3ed4c ("qeth: NAPI support for l2 and l3 discipline")
Signed-off-by: NJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NSasha Levin <sashal@kernel.org>
上级 66fb291b
...@@ -789,7 +789,10 @@ static int __qeth_l2_open(struct net_device *dev) ...@@ -789,7 +789,10 @@ static int __qeth_l2_open(struct net_device *dev)
if (qdio_stop_irq(card->data.ccwdev, 0) >= 0) { if (qdio_stop_irq(card->data.ccwdev, 0) >= 0) {
napi_enable(&card->napi); napi_enable(&card->napi);
local_bh_disable();
napi_schedule(&card->napi); napi_schedule(&card->napi);
/* kick-start the NAPI softirq: */
local_bh_enable();
} else } else
rc = -EIO; rc = -EIO;
return rc; return rc;
......
...@@ -2414,7 +2414,10 @@ static int __qeth_l3_open(struct net_device *dev) ...@@ -2414,7 +2414,10 @@ static int __qeth_l3_open(struct net_device *dev)
if (qdio_stop_irq(card->data.ccwdev, 0) >= 0) { if (qdio_stop_irq(card->data.ccwdev, 0) >= 0) {
napi_enable(&card->napi); napi_enable(&card->napi);
local_bh_disable();
napi_schedule(&card->napi); napi_schedule(&card->napi);
/* kick-start the NAPI softirq: */
local_bh_enable();
} else } else
rc = -EIO; rc = -EIO;
return rc; return rc;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册