net/smc: Fix smc-r link reference count
Subsystems (5)
D. Wythe
maintainerPATCH 1/1 net/smc: Fix smc-r link reference count
From: "D. Wythe" <[email protected]>
The following scenarios exist:
lnk->refcnt=1;smcr_link_put(lnk);
lnk->refcnt=0; smcr_link_hold(lnk); __smcr_link_clear(lnk); do_xxx(lnk);
This patch try using refcount_inc_not_zero() instead refcount_inc() to prevent this race condition. Therefore, we need to always check its return value, and respond with an error when it fails.
--- net/smc/af_smc.c | 3 +-- net/smc/smc_core.c | 27 +++++++++++++++++++++------ net/smc/smc_core.h | 4 ++-- 3 files changed, 24 insertions(+), 10 deletions(-)
net/smc/af_smc.c +1 -2
@@ -1129,11 +1129,10 @@ static int smc_connect_rdma(struct smc_sock *smc,break ; } } -if (!link) { +if (!link || !smc_switch_link_and_count (&smc->conn, link)) { reason_code =SMC_CLC_DECL_NOSRVLINK ; goto connect_abort; } -smc_switch_link_and_count (&smc->conn, link); }/* create send buffer and rmb */
net/smc/smc_core.c +21 -6
@@ -996,7 +996,7 @@ static int smc_switch_cursor(struct smc_sock *smc, struct smc_cdc_tx_pend *pend,return rc; } -void smc_switch_link_and_count (struct smc_connection *conn, +bool smc_switch_link_and_count (struct smc_connection *conn,struct smc_link *to_lnk) {atomic_dec (&conn->lnk->conn_cnt);
@@ -1005,7 +1005,7 @@ void smc_switch_link_and_count(struct smc_connection *conn, conn->lnk = to_lnk;atomic_inc (&conn->lnk->conn_cnt);/* link_put in smc_conn_free() */ -smcr_link_hold (conn->lnk); +return smcr_link_hold (conn->lnk); } struct smc_link *smc_switch_conns(struct smc_link_group *lgr,
@@ -1029,11 +1029,21 @@ struct smc_link *smc_switch_conns(struct smc_link_group *lgr, from_lnk->ibport == lgr->lnk[i].ibport) {continue ; } + +/* Try to hold a reference here. Once succeed, +* all subsequent hold in smc_switch_link_and_count() will not fail. +* We can simplify the subsequent processing logic. +*/ +if (!smcr_link_hold (&lgr->lnk[i])) +continue ; + to_lnk = &lgr->lnk[i];break ; }if (!to_lnk || !smc_wr_tx_link_hold (to_lnk)) {smc_lgr_terminate_sched (lgr); +if (to_lnk) +smcr_link_put (to_lnk);/* smcr_link_hold() above */ return NULL ; } again:
@@ -1056,6 +1066,7 @@ struct smc_link *smc_switch_conns(struct smc_link_group *lgr, smc->sk.sk_state == SMC_PEERABORTWAIT || smc->sk.sk_state == SMC_PROCESSABORT) {spin_lock_bh (&conn->send_lock); +/* smcr_link_hold() already, won't fail */ smc_switch_link_and_count (conn, to_lnk);spin_unlock_bh (&conn->send_lock);continue ;
@@ -1068,6 +1079,7 @@ struct smc_link *smc_switch_conns(struct smc_link_group *lgr, goto err_out;/* avoid race with smcr_tx_sndbuf_nonempty() */ spin_lock_bh (&conn->send_lock); +/* smcr_link_hold() already, won't fail */ smc_switch_link_and_count (conn, to_lnk); rc =smc_switch_cursor (smc, pend, wr_buf);spin_unlock_bh (&conn->send_lock);
@@ -1078,11 +1090,13 @@ struct smc_link *smc_switch_conns(struct smc_link_group *lgr, }read_unlock_bh (&lgr->conns_lock);smc_wr_tx_link_put (to_lnk); +smcr_link_put (to_lnk);/* smcr_link_hold() above */ return to_lnk; err_out:smcr_link_down_cond_sched (to_lnk);smc_wr_tx_link_put (to_lnk); +smcr_link_put (to_lnk);/* smcr_link_hold() above */ return NULL ; }
@@ -1260,9 +1274,9 @@ void smcr_link_clear(struct smc_link *lnk, bool log)smcr_link_put (lnk);/* theoretically last link_put */ } -void smcr_link_hold (struct smc_link *lnk) +bool smcr_link_hold (struct smc_link *lnk) { -refcount_inc (&lnk->refcnt); +return refcount_inc_not_zero (&lnk->refcnt); }void smcr_link_put (struct smc_link *lnk)
@@ -1904,8 +1918,9 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini) } }smc_lgr_hold (conn->lgr);/* lgr_put in smc_conn_free() */ -if (!conn->lgr->is_smcd) -smcr_link_hold (conn->lnk);/* link_put in smc_conn_free() */ +if (!conn->lgr->is_smcd && !smcr_link_hold (conn->lnk)) +return SMC_CLC_DECL_NOACTLINK ; + conn->freed =0 ; conn->local_tx_ctrl.common.type =SMC_CDC_MSG_TYPE ; conn->local_tx_ctrl.len =SMC_WR_TX_SIZE ;
net/smc/smc_core.h +2 -2
@@ -528,9 +528,9 @@ void smc_rtoken_set2(struct smc_link_group *lgr, int rtok_idx, int link_id,int smcr_link_init (struct smc_link_group *lgr,struct smc_link *lnk,u8 link_idx,struct smc_init_info *ini);void smcr_link_clear (struct smc_link *lnk,bool log); -void smcr_link_hold (struct smc_link *lnk); +bool smcr_link_hold (struct smc_link *lnk);void smcr_link_put (struct smc_link *lnk); -void smc_switch_link_and_count (struct smc_connection *conn, +bool smc_switch_link_and_count (struct smc_connection *conn,struct smc_link *to_lnk);int smcr_buf_map_lgr (struct smc_link *lnk);int smcr_buf_reg_lgr (struct smc_link *lnk);
Signature · 1 line
1.8.3.1
D. Wythe
maintainerQuoted 11 lines · D. Wythe
From: "D. Wythe" <[email protected]>
The following scenarios exist:
lnk->refcnt=1;
smcr_link_put(lnk);lnk->refcnt=0; smcr_link_hold(lnk); __smcr_link_clear(lnk); do_xxx(lnk);
Quoted 6 lines
This patch try using
refcount_inc_not_zero()insteadrefcount_inc()to prevent this race condition. Therefore, we need to always check its return value, and respond with an error when it fails.Fixes 20c9398d3309 ("net/smc: Resolve the race between SMC-R link access and clear")Signed-off-by D. Wythe <[email protected]>
Wrong subject prefix here, please ignore this patch, we will send another revison later.
Thanks.
D. Wythe
Wen Gu
reviewerQuoted 11 lines · D. Wythe
From: "D. Wythe" <[email protected]>
The following scenarios exist:
lnk->refcnt=1;
smcr_link_put(lnk);lnk->refcnt=0; smcr_link_hold(lnk); __smcr_link_clear(lnk); do_xxx(lnk);
Quoted 7 lines
This patch try using
refcount_inc_not_zero()insteadrefcount_inc()to prevent this race condition. Therefore, we need to always check its return value, and respond with an error when it fails.Fixes 20c9398d3309 ("net/smc: Resolve the race between SMC-R link access and clear")Signed-off-by D. Wythe <[email protected]>---
Thanks for your analysis.
1) Is the patch more appropriate to 'net' ?
2) The refcnt of smc link will be
- initilized to 1 in smcr_link_init();
- increased when connections assigned to the link;
eg. smc_conn_create() or smc_switch_link_and_count();
- decreased when connections removed from the link or link is cleared,
eg. smc_conn_free(), smc_switch_link_and_count(), smcr_link_clear().
I see the theoretical race between smcr_link_hold() and smcr_link_put(). Have you encountered this issue in actual test, such as triggering WARN of refcount_inc()? Because IMHO the race window is small (link state will turned to SMC_LNK_UNUSED after smcr_link_put() and connections will not be assigned to it).
3) Does the refcount of lgr (smc_lgr_hold(), smc_lgr_put()) has the similar problem?
D. Wythe
maintainerQuoted 3 lines · Wen Gu
Thanks for your analysis.
1) Is the patch more appropriate to 'net' ?
That's my mistake.
Quoted 10 lines
2) The refcnt of smc link will be
- initilized to 1 in
smcr_link_init();- increased when connections assigned to the link; eg.
smc_conn_create()orsmc_switch_link_and_count();- decreased when connections removed from the link or link is cleared, eg.
smc_conn_free(),smc_switch_link_and_count(),smcr_link_clear().
Quoted 8 lines
I see the theoretical race between
smcr_link_hold()andsmcr_link_put(). Have you encountered this
issue in actual test, such as triggering WARN ofrefcount_inc()?
Because IMHO the race window is small
(link state will turned toSMC_LNK_UNUSEDaftersmcr_link_put()and
connections will not be assigned to it).
Got your point, this race may happened with our another radical change. At present, this patch may not be needed.
Thanks.
D. Wythe