diff options
| author | Julian Wiedmann <jwi@linux.ibm.com> | 2018-09-17 17:36:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-17 09:10:25 -0700 |
| commit | 4d19db777a2f32c9b76f6fd517ed8960576cb43e (patch) | |
| tree | eb5c42a655c80f5ac6300f487866004415c02e26 /drivers/s390/net | |
| parent | 121ca39aa5585def682a2c8592983442438b84dc (diff) | |
| download | linux-4d19db777a2f32c9b76f6fd517ed8960576cb43e.tar.gz linux-4d19db777a2f32c9b76f6fd517ed8960576cb43e.tar.bz2 linux-4d19db777a2f32c9b76f6fd517ed8960576cb43e.zip | |
s390/qeth: invoke softirqs after napi_schedule()
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 83a0c6e58901 ("i40e: Invoke softirqs after napi_reschedule").
Fixes: a1c3ed4c9ca0 ("qeth: NAPI support for l2 and l3 discipline")
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 3 | ||||
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 33b65471a68a..6285af373bdf 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -755,7 +755,10 @@ static int __qeth_l2_open(struct net_device *dev) if (qdio_stop_irq(card->data.ccwdev, 0) >= 0) { napi_enable(&card->napi); + local_bh_disable(); napi_schedule(&card->napi); + /* kick-start the NAPI softirq: */ + local_bh_enable(); } else rc = -EIO; return rc; diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 5d7e2921ab36..8930d2a9fcad 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -2293,7 +2293,10 @@ static int __qeth_l3_open(struct net_device *dev) if (qdio_stop_irq(card->data.ccwdev, 0) >= 0) { napi_enable(&card->napi); + local_bh_disable(); napi_schedule(&card->napi); + /* kick-start the NAPI softirq: */ + local_bh_enable(); } else rc = -EIO; return rc; |