Commit 6d74c3a8 authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller
Browse files

net/smc: multiple link support and LLC flow for smc_llc_do_delete_rkey 



Adapt smc_llc_do_delete_rkey() to use the LLC flow and support multiple
links when deleting the rkeys for rmb buffers at the peer.

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 3d88a21b

net/smc/smc_core.c

+4 −6
Original line number Diff line number Diff line
@@ -446,13 +446,11 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) 
}



static void smcr_buf_unuse(struct smc_buf_desc *rmb_desc,

			   struct smc_link *lnk)

			   struct smc_link_group *lgr)

{

	struct smc_link_group *lgr = lnk->lgr;



	if (rmb_desc->is_conf_rkey && !list_empty(&lgr->list)) {

		/* unregister rmb with peer */

		smc_llc_do_delete_rkey(lnk, rmb_desc);

		smc_llc_do_delete_rkey(lgr, rmb_desc);

		rmb_desc->is_conf_rkey = false;

	}

	if (rmb_desc->is_reg_err) {
@@ -475,7 +473,7 @@ static void smc_buf_unuse(struct smc_connection *conn, 
	if (conn->rmb_desc && lgr->is_smcd)

		conn->rmb_desc->used = 0;

	else if (conn->rmb_desc)

		smcr_buf_unuse(conn->rmb_desc, conn->lnk);

		smcr_buf_unuse(conn->rmb_desc, lgr);

}



/* remove a finished connection from its link group */
@@ -1169,7 +1167,6 @@ static int smcr_buf_map_usable_links(struct smc_link_group *lgr, 
		if (!smc_link_usable(lnk))

			continue;

		if (smcr_buf_map_link(buf_desc, is_rmb, lnk)) {

			smcr_buf_unuse(buf_desc, lnk);

			rc = -ENOMEM;

			goto out;

		}
@@ -1275,6 +1272,7 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_smcd, bool is_rmb) 


	if (!is_smcd) {

		if (smcr_buf_map_usable_links(lgr, buf_desc, is_rmb)) {

			smcr_buf_unuse(buf_desc, lgr);

			return -ENOMEM;

		}

	}

net/smc/smc_core.h

+0 −3
Original line number Diff line number Diff line
@@ -123,9 +123,6 @@ struct smc_link { 
	struct delayed_work	llc_testlink_wrk; /* testlink worker */

	struct completion	llc_testlink_resp; /* wait for rx of testlink */

	int			llc_testlink_time; /* testlink interval */

	struct completion	llc_delete_rkey_resp; /* w4 rx of del rkey */

	int			llc_delete_rkey_resp_rc; /* rc from del rkey */

	struct mutex		llc_delete_rkey_mutex; /* serialize usage */

};



/* For now we just allow one parallel link per link group. The SMC protocol

net/smc/smc_llc.c

+19 −20
Original line number Diff line number Diff line
@@ -720,7 +720,6 @@ static void smc_llc_rx_response(struct smc_link *link, 
				struct smc_llc_qentry *qentry)

{

	u8 llc_type = qentry->msg.raw.hdr.common.type;

	union smc_llc_msg *llc = &qentry->msg;



	switch (llc_type) {

	case SMC_LLC_TEST_LINK:
@@ -730,6 +729,7 @@ static void smc_llc_rx_response(struct smc_link *link, 
	case SMC_LLC_ADD_LINK:

	case SMC_LLC_CONFIRM_LINK:

	case SMC_LLC_CONFIRM_RKEY:

	case SMC_LLC_DELETE_RKEY:

		/* assign responses to the local flow, we requested them */

		smc_llc_flow_qentry_set(&link->lgr->llc_flow_lcl, qentry);

		wake_up_interruptible(&link->lgr->llc_waiter);
@@ -741,11 +741,6 @@ static void smc_llc_rx_response(struct smc_link *link, 
	case SMC_LLC_CONFIRM_RKEY_CONT:

		/* unused as long as we don't send this type of msg */

		break;

	case SMC_LLC_DELETE_RKEY:

		link->llc_delete_rkey_resp_rc = llc->raw.hdr.flags &

						SMC_LLC_FLAG_RKEY_NEG;

		complete(&link->llc_delete_rkey_resp);

		break;

	}

	kfree(qentry);

}
@@ -850,8 +845,6 @@ void smc_llc_lgr_clear(struct smc_link_group *lgr) 


int smc_llc_link_init(struct smc_link *link)

{

	init_completion(&link->llc_delete_rkey_resp);

	mutex_init(&link->llc_delete_rkey_mutex);

	init_completion(&link->llc_testlink_resp);

	INIT_DELAYED_WORK(&link->llc_testlink_wrk, smc_llc_testlink_work);

	return 0;
@@ -909,27 +902,33 @@ int smc_llc_do_confirm_rkey(struct smc_link *send_link, 
}



/* unregister an rtoken at the remote peer */

int smc_llc_do_delete_rkey(struct smc_link *link,

int smc_llc_do_delete_rkey(struct smc_link_group *lgr,

			   struct smc_buf_desc *rmb_desc)

{

	struct smc_llc_qentry *qentry = NULL;

	struct smc_link *send_link;

	int rc = 0;



	mutex_lock(&link->llc_delete_rkey_mutex);

	if (link->state != SMC_LNK_ACTIVE)

		goto out;

	reinit_completion(&link->llc_delete_rkey_resp);

	rc = smc_llc_send_delete_rkey(link, rmb_desc);

	send_link = smc_llc_usable_link(lgr);

	if (!send_link)

		return -ENOLINK;



	rc = smc_llc_flow_initiate(lgr, SMC_LLC_FLOW_RKEY);

	if (rc)

		return rc;

	/* protected by llc_flow control */

	rc = smc_llc_send_delete_rkey(send_link, rmb_desc);

	if (rc)

		goto out;

	/* receive DELETE RKEY response from server over RoCE fabric */

	rc = wait_for_completion_interruptible_timeout(

			&link->llc_delete_rkey_resp, SMC_LLC_WAIT_TIME);

	if (rc <= 0 || link->llc_delete_rkey_resp_rc)

	qentry = smc_llc_wait(lgr, send_link, SMC_LLC_WAIT_TIME,

			      SMC_LLC_DELETE_RKEY);

	if (!qentry || (qentry->msg.raw.hdr.flags & SMC_LLC_FLAG_RKEY_NEG))

		rc = -EFAULT;

	else

		rc = 0;

out:

	mutex_unlock(&link->llc_delete_rkey_mutex);

	if (qentry)

		smc_llc_flow_qentry_del(&lgr->llc_flow_lcl);

	smc_llc_flow_stop(lgr, &lgr->llc_flow_lcl);

	return rc;

}

net/smc/smc_llc.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void smc_llc_link_deleting(struct smc_link *link); 
void smc_llc_link_clear(struct smc_link *link);

int smc_llc_do_confirm_rkey(struct smc_link *send_link,

			    struct smc_buf_desc *rmb_desc);

int smc_llc_do_delete_rkey(struct smc_link *link,

int smc_llc_do_delete_rkey(struct smc_link_group *lgr,

			   struct smc_buf_desc *rmb_desc);

int smc_llc_flow_initiate(struct smc_link_group *lgr,

			  enum smc_llc_flowtype type);