net/smc: Reset conn->lgr when link group registration fails
Wen Gu
reviewerPATCH v4 1/1 net/smc: Reset conn->lgr when link group registration fails
SMC connections might fail to be registered in a link group due to unable to find a link to assign to during its creation. As a result, connection creation will return a failure and most resources related to the connection won't be applied or initialized, such as conn->abort_work or conn->lnk.
If smc_conn_free() is invoked later, it will try to access the resources related to the connection, which wasn't initialized, thus causing a warning or crash.
This patch tries to fix this by resetting conn->lgr to NULL if an abnormal exit occurs in smc_lgr_register_conn(), thus avoiding the access to uninitialized resources in smc_conn_free().
Meanwhile, the new created link group should be terminated if smc connections can't be registered in it. So smc_lgr_cleanup_early() is modified to take care of link group only and invoked to terminate unusable link group by smc_conn_create(). The call to smc_conn_free() is moved out from smc_lgr_cleanup_early() to smc_conn_abort().
---v1->v2:
- Reset conn->lgr to NULL in smc_lgr_register_conn().
- Only free new created link group.v2->v3:
- Using __smc_lgr_terminate() instead of smc_lgr_schedule_free_work() for an immediate free.v3->v4:
- Modify smc_lgr_cleanup_early() and invoke it from smc_conn_create().
--- net/smc/af_smc.c | 7 ++++--- net/smc/smc_core.c | 12 +++++++----- net/smc/smc_core.h | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-)
net/smc/af_smc.c +4 -3
@@ -630,10 +630,11 @@ static int smc_connect_decline_fallback(struct smc_sock *smc, int reason_code,static void smc_conn_abort (struct smc_sock *smc,int local_first) { +struct smc_connection *conn = &smc->conn; + +smc_conn_free (conn);if (local_first) -smc_lgr_cleanup_early (&smc->conn); -else -smc_conn_free (&smc->conn); +smc_lgr_cleanup_early (conn->lgr); }/* check if there is a rdma device available for this connection. */
net/smc/smc_core.c +7 -5
@@ -171,8 +171,10 @@ static int smc_lgr_register_conn(struct smc_connection *conn, bool first)if (!conn->lgr->is_smcd) { rc =smcr_lgr_conn_assign_link (conn, first); -if (rc) +if (rc) { + conn->lgr =NULL ;return rc; + } }/* find a new alert_token_local value not yet used by some connection * in this link group
@@ -622,15 +624,13 @@ int smcd_nl_get_lgr(struct sk_buff *skb, struct netlink_callback *cb)return skb->len; } -void smc_lgr_cleanup_early (struct smc_connection *conn) +void smc_lgr_cleanup_early (struct smc_link_group *lgr) { -struct smc_link_group *lgr = conn->lgr;spinlock_t *lgr_lock;if (!lgr)return ; -smc_conn_free (conn);smc_lgr_list_head (lgr, &lgr_lock);spin_lock_bh (lgr_lock);/* do not use this link group for new connections */
@@ -1835,8 +1835,10 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini)write_lock_bh (&lgr->conns_lock); rc =smc_lgr_register_conn (conn, true);write_unlock_bh (&lgr->conns_lock); -if (rc) +if (rc) { +smc_lgr_cleanup_early (lgr); goto out; + } } conn->local_tx_ctrl.common.type =SMC_CDC_MSG_TYPE ; conn->local_tx_ctrl.len =SMC_WR_TX_SIZE ;
net/smc/smc_core.h +1 -1
@@ -468,7 +468,7 @@ static inline void smc_set_pci_values(struct pci_dev *pci_dev,struct smc_sock ;struct smc_clc_msg_accept_confirm ; -void smc_lgr_cleanup_early (struct smc_connection *conn); +void smc_lgr_cleanup_early (struct smc_link_group *lgr);void smc_lgr_terminate_sched (struct smc_link_group *lgr);void smcr_port_add (struct smc_ib_device *smcibdev,u8 ibport);void smcr_port_err (struct smc_ib_device *smcibdev,u8 ibport);
Signature · 1 line
1.8.3.1
net/smc/af_smc.c static int smc_connect_decline_fallback(struct smc_sock *smc, int reason_code, · line 638
Quoted 13 lines · Wen Gu
net/smc/af_smc.c +4
-3@@ -630,10 +630,11 @@ static int smc_connect_decline_fallback(struct smc_sock *smc, int reason_code,static void smc_conn_abort (struct smc_sock *smc,int local_first) { +struct smc_connection *conn = &smc->conn; + +smc_conn_free (conn);if (local_first) -smc_lgr_cleanup_early (&smc->conn); -else -smc_conn_free (&smc->conn); +smc_lgr_cleanup_early (conn->lgr); }
Looks like I missed a prereq patch here, but wo'nt conn->lgr be set to NULL after smc_conn_free() called smc_lgr_unregister_conn()?
Wen Gu
reviewerQuoted 2 lines · Karsten Graul
Looks like I missed a prereq patch here, but wo'nt
conn->lgrbe set to NULL aftersmc_conn_free()calledsmc_lgr_unregister_conn()?
Right... I should hold a local copy of lgr in smc_conn_abort().
My another RFC patch removes 'conn->lgr = NULL' from smc_lgr_unregister_conn(), so I make a mistake here...
I will fix this. Thank you.
Wen Gu