diff options
| author | Karsten Graul <kgraul@linux.ibm.com> | 2021-10-07 16:14:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-08 18:00:16 +0200 |
| commit | 95f7f3e7dc6bd2e735cb5de11734ea2222b1e05a (patch) | |
| tree | 1c4e9cea0b14fd5318202c0ef6dd8512df6989e6 /net/smc/smc_cdc.c | |
| parent | Merge branch 'stmmac-regression-fix' (diff) | |
| download | linux-95f7f3e7dc6bd2e735cb5de11734ea2222b1e05a.tar.xz linux-95f7f3e7dc6bd2e735cb5de11734ea2222b1e05a.zip | |
net/smc: improved fix wait on already cleared link
Commit 8f3d65c16679 ("net/smc: fix wait on already cleared link")
introduced link refcounting to avoid waits on already cleared links.
This patch extents and improves the refcounting to cover all
remaining possible cases for this kind of error situation.
Fixes: 15e1b99aadfb ("net/smc: no WR buffer wait for terminating link group")
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_cdc.c')
| -rw-r--r-- | net/smc/smc_cdc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/smc/smc_cdc.c b/net/smc/smc_cdc.c index f23f558054a7..99acd337ba90 100644 --- a/net/smc/smc_cdc.c +++ b/net/smc/smc_cdc.c @@ -150,9 +150,11 @@ static int smcr_cdc_get_slot_and_msg_send(struct smc_connection *conn) again: link = conn->lnk; + if (!smc_wr_tx_link_hold(link)) + return -ENOLINK; rc = smc_cdc_get_free_slot(conn, link, &wr_buf, NULL, &pend); if (rc) - return rc; + goto put_out; spin_lock_bh(&conn->send_lock); if (link != conn->lnk) { @@ -160,6 +162,7 @@ again: spin_unlock_bh(&conn->send_lock); smc_wr_tx_put_slot(link, (struct smc_wr_tx_pend_priv *)pend); + smc_wr_tx_link_put(link); if (again) return -ENOLINK; again = true; @@ -167,6 +170,8 @@ again: } rc = smc_cdc_msg_send(conn, wr_buf, pend); spin_unlock_bh(&conn->send_lock); +put_out: + smc_wr_tx_link_put(link); return rc; } |