Commit 0a99be43 authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller
Browse files

net/smc: log important pnetid and state change events 



Print to system log when SMC links are available or go down, link group
state changes or pnetids are applied to and removed from devices.
The log entries are triggered by either user configuration actions or
adapter activation/deactivation events and are not expected to happen
often. The entries help SMC users to keep track of the SMC link group
status and to detect when actions are needed (like to add replacements
for failed adapters).

Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b38eb47f

net/smc/af_smc.c

+2 −4
Original line number Diff line number Diff line
@@ -378,8 +378,6 @@ static int smcr_clnt_conf_first_link(struct smc_sock *smc) 
	struct smc_llc_qentry *qentry;

	int rc;



	link->lgr->type = SMC_LGR_SINGLE;



	/* receive CONFIRM LINK request from server over RoCE fabric */

	qentry = smc_llc_wait(link->lgr, NULL, SMC_LLC_WAIT_TIME,

			      SMC_LLC_CONFIRM_LINK);
@@ -414,6 +412,7 @@ static int smcr_clnt_conf_first_link(struct smc_sock *smc) 
		return SMC_CLC_DECL_TIMEOUT_CL;



	smc_llc_link_active(link);

	smcr_lgr_set_type(link->lgr, SMC_LGR_SINGLE);



	/* optional 2nd link, receive ADD LINK request from server */

	qentry = smc_llc_wait(link->lgr, NULL, SMC_LLC_WAIT_TIME,
@@ -1037,8 +1036,6 @@ static int smcr_serv_conf_first_link(struct smc_sock *smc) 
	struct smc_llc_qentry *qentry;

	int rc;



	link->lgr->type = SMC_LGR_SINGLE;



	if (smcr_link_reg_rmb(link, smc->conn.rmb_desc))

		return SMC_CLC_DECL_ERR_REGRMB;
@@ -1067,6 +1064,7 @@ static int smcr_serv_conf_first_link(struct smc_sock *smc) 
	smc->conn.rmb_desc->is_conf_rkey = true;



	smc_llc_link_active(link);

	smcr_lgr_set_type(link->lgr, SMC_LGR_SINGLE);



	/* initial contact - try to establish second link */

	smc_llc_srv_add_link(link);

net/smc/smc_core.c

+29 −5
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ dealloc_pd: 
free_link_mem:

	smc_wr_free_link_mem(lnk);

clear_llc_lnk:

	smc_llc_link_clear(lnk);

	smc_llc_link_clear(lnk, false);

out:

	put_device(&ini->ib_dev->ibdev->dev);

	memset(lnk, 0, sizeof(struct smc_link));
@@ -718,14 +718,14 @@ static void smcr_rtoken_clear_link(struct smc_link *lnk) 
}



/* must be called under lgr->llc_conf_mutex lock */

void smcr_link_clear(struct smc_link *lnk)

void smcr_link_clear(struct smc_link *lnk, bool log)

{

	struct smc_ib_device *smcibdev;



	if (!lnk->lgr || lnk->state == SMC_LNK_UNUSED)

		return;

	lnk->peer_qpn = 0;

	smc_llc_link_clear(lnk);

	smc_llc_link_clear(lnk, log);

	smcr_buf_unmap_lgr(lnk);

	smcr_rtoken_clear_link(lnk);

	smc_ib_modify_qp_reset(lnk);
@@ -812,7 +812,7 @@ static void smc_lgr_free(struct smc_link_group *lgr) 
		mutex_lock(&lgr->llc_conf_mutex);

		for (i = 0; i < SMC_LINKS_PER_LGR_MAX; i++) {

			if (lgr->lnk[i].state != SMC_LNK_UNUSED)

				smcr_link_clear(&lgr->lnk[i]);

				smcr_link_clear(&lgr->lnk[i], false);

		}

		mutex_unlock(&lgr->llc_conf_mutex);

		smc_llc_lgr_clear(lgr);
@@ -1040,12 +1040,36 @@ void smc_smcr_terminate_all(struct smc_ib_device *smcibdev) 
/* set new lgr type and clear all asymmetric link tagging */

void smcr_lgr_set_type(struct smc_link_group *lgr, enum smc_lgr_type new_type)

{

	char *lgr_type = "";

	int i;



	for (i = 0; i < SMC_LINKS_PER_LGR_MAX; i++)

		if (smc_link_usable(&lgr->lnk[i]))

			lgr->lnk[i].link_is_asym = false;

	if (lgr->type == new_type)

		return;

	lgr->type = new_type;



	switch (lgr->type) {

	case SMC_LGR_NONE:

		lgr_type = "NONE";

		break;

	case SMC_LGR_SINGLE:

		lgr_type = "SINGLE";

		break;

	case SMC_LGR_SYMMETRIC:

		lgr_type = "SYMMETRIC";

		break;

	case SMC_LGR_ASYMMETRIC_PEER:

		lgr_type = "ASYMMETRIC_PEER";

		break;

	case SMC_LGR_ASYMMETRIC_LOCAL:

		lgr_type = "ASYMMETRIC_LOCAL";

		break;

	}

	pr_warn_ratelimited("smc: SMC-R lg %*phN state changed: "

			    "%s, pnetid %.16s\n", SMC_LGR_ID_SIZE, &lgr->id,

			    lgr_type, lgr->pnet_id);

}



/* set new lgr type and tag a link as asymmetric */
@@ -1146,7 +1170,7 @@ static void smcr_link_down(struct smc_link *lnk) 
	smc_ib_modify_qp_reset(lnk);

	to_lnk = smc_switch_conns(lgr, lnk, true);

	if (!to_lnk) { /* no backup link available */

		smcr_link_clear(lnk);

		smcr_link_clear(lnk, true);

		return;

	}

	smcr_lgr_set_type(lgr, SMC_LGR_SINGLE);

net/smc/smc_core.h

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ void smc_core_exit(void); 


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);

void smcr_link_clear(struct smc_link *lnk, bool log);

int smcr_buf_map_lgr(struct smc_link *lnk);

int smcr_buf_reg_lgr(struct smc_link *lnk);

void smcr_lgr_set_type(struct smc_link_group *lgr, enum smc_lgr_type new_type);

net/smc/smc_ib.c

+11 −0
Original line number Diff line number Diff line
@@ -575,6 +575,8 @@ static void smc_ib_add_dev(struct ib_device *ibdev) 


	/* trigger reading of the port attributes */

	port_cnt = smcibdev->ibdev->phys_port_cnt;

	pr_warn_ratelimited("smc: adding ib device %s with port count %d\n",

			    smcibdev->ibdev->name, port_cnt);

	for (i = 0;

	     i < min_t(size_t, port_cnt, SMC_MAX_PORTS);

	     i++) {
@@ -583,6 +585,13 @@ static void smc_ib_add_dev(struct ib_device *ibdev) 
		if (smc_pnetid_by_dev_port(ibdev->dev.parent, i,

					   smcibdev->pnetid[i]))

			smc_pnetid_by_table_ib(smcibdev, i + 1);

		pr_warn_ratelimited("smc:    ib device %s port %d has pnetid "

				    "%.16s%s\n",

				    smcibdev->ibdev->name, i + 1,

				    smcibdev->pnetid[i],

				    smcibdev->pnetid_by_user[i] ?

				     " (user defined)" :

				     "");

	}

	schedule_work(&smcibdev->port_event_work);

}
@@ -599,6 +608,8 @@ static void smc_ib_remove_dev(struct ib_device *ibdev, void *client_data) 
	spin_lock(&smc_ib_devices.lock);

	list_del_init(&smcibdev->list); /* remove from smc_ib_devices */

	spin_unlock(&smc_ib_devices.lock);

	pr_warn_ratelimited("smc: removing ib device %s\n",

			    smcibdev->ibdev->name);

	smc_smcr_terminate_all(smcibdev);

	smc_ib_cleanup_per_ibdev(smcibdev);

	ib_unregister_event_handler(&smcibdev->event_handler);

net/smc/smc_ism.c

+6 −0
Original line number Diff line number Diff line
@@ -321,12 +321,18 @@ int smcd_register_dev(struct smcd_dev *smcd) 
	list_add_tail(&smcd->list, &smcd_dev_list.list);

	spin_unlock(&smcd_dev_list.lock);



	pr_warn_ratelimited("smc: adding smcd device %s with pnetid %.16s%s\n",

			    dev_name(&smcd->dev), smcd->pnetid,

			    smcd->pnetid_by_user ? " (user defined)" : "");



	return device_add(&smcd->dev);

}

EXPORT_SYMBOL_GPL(smcd_register_dev);



void smcd_unregister_dev(struct smcd_dev *smcd)

{

	pr_warn_ratelimited("smc: removing smcd device %s\n",

			    dev_name(&smcd->dev));

	spin_lock(&smcd_dev_list.lock);

	list_del_init(&smcd->list);

	spin_unlock(&smcd_dev_list.lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE