diff options
| author |   Karsten Graul <kgraul@linux.ibm.com> | 2019-01-30 18:51:05 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-01 14:45:45 -0800 |
| commit | 33f3fcc290671590821ff3c0c9396db1ec9b7d4c (patch) | |
| tree | 1baa87c3e5445442407de727689946b54a8c728c /net/smc | |
| parent | net/smc: recvmsg and splice_read should return 0 after shutdown (diff) | |
| download | linux-dev-33f3fcc290671590821ff3c0c9396db1ec9b7d4c.tar.xz linux-dev-33f3fcc290671590821ff3c0c9396db1ec9b7d4c.zip | |
net/smc: do not wait under send_lock
smc_cdc_get_free_slot() might wait for free transfer buffers when using
SMC-R. This wait should not be done under the send_lock, which is a
spin_lock. This fixes a cpu loop in parallel threads waiting for the
send_lock.
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/smc_tx.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index f99951f3f7fd..36af3de731b9 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -488,25 +488,23 @@ static int smcr_tx_sndbuf_nonempty(struct smc_connection *conn) struct smc_wr_buf *wr_buf; int rc; - spin_lock_bh(&conn->send_lock); rc = smc_cdc_get_free_slot(conn, &wr_buf, &pend); if (rc < 0) { if (rc == -EBUSY) { struct smc_sock *smc = container_of(conn, struct smc_sock, conn); - if (smc->sk.sk_err == ECONNABORTED) { - rc = sock_error(&smc->sk); - goto out_unlock; - } + if (smc->sk.sk_err == ECONNABORTED) + return sock_error(&smc->sk); rc = 0; if (conn->alert_token_local) /* connection healthy */ mod_delayed_work(system_wq, &conn->tx_work, SMC_TX_WORK_DELAY); } - goto out_unlock; + return rc; } + spin_lock_bh(&conn->send_lock); if (!conn->local_tx_ctrl.prod_flags.urg_data_present) { rc = smc_tx_rdma_writes(conn); if (rc) { |