Commit 15e1b99a authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

net/smc: no WR buffer wait for terminating link group 



Avoid waiting for a free work request buffer, if the link group
is already terminating.

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

net/smc/smc_llc.c

+3 −0
Original line number Diff line number Diff line
@@ -656,6 +656,7 @@ void smc_llc_link_active(struct smc_link *link, int testlink_time) 
void smc_llc_link_deleting(struct smc_link *link)

{

	link->state = SMC_LNK_DELETING;

	smc_wr_wakeup_tx_wait(link);

}



/* called in tasklet context */
@@ -663,6 +664,8 @@ void smc_llc_link_inactive(struct smc_link *link) 
{

	link->state = SMC_LNK_INACTIVE;

	cancel_delayed_work(&link->llc_testlink_wrk);

	smc_wr_wakeup_reg_wait(link);

	smc_wr_wakeup_tx_wait(link);

}



/* called in worker context */

net/smc/smc_wr.c

+6 −4
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static inline void smc_wr_tx_process_cqe(struct ib_wc *wc) 
			link->wr_reg_state = FAILED;

		else

			link->wr_reg_state = CONFIRMED;

		wake_up(&link->wr_reg_wait);

		smc_wr_wakeup_reg_wait(link);

		return;

	}
@@ -171,6 +171,7 @@ int smc_wr_tx_get_free_slot(struct smc_link *link, 
			    struct smc_rdma_wr **wr_rdma_buf,

			    struct smc_wr_tx_pend_priv **wr_pend_priv)

{

	struct smc_link_group *lgr = smc_get_lgr(link);

	struct smc_wr_tx_pend *wr_pend;

	u32 idx = link->wr_tx_cnt;

	struct ib_send_wr *wr_ib;
@@ -179,19 +180,20 @@ int smc_wr_tx_get_free_slot(struct smc_link *link, 


	*wr_buf = NULL;

	*wr_pend_priv = NULL;

	if (in_softirq()) {

	if (in_softirq() || lgr->terminating) {

		rc = smc_wr_tx_get_free_slot_index(link, &idx);

		if (rc)

			return rc;

	} else {

		rc = wait_event_timeout(

		rc = wait_event_interruptible_timeout(

			link->wr_tx_wait,

			link->state == SMC_LNK_INACTIVE ||

			lgr->terminating ||

			(smc_wr_tx_get_free_slot_index(link, &idx) != -EBUSY),

			SMC_WR_TX_WAIT_FREE_SLOT_TIME);

		if (!rc) {

			/* timeout - terminate connections */

			smc_lgr_terminate_sched(smc_get_lgr(link));

			smc_lgr_terminate_sched(lgr);

			return -EPIPE;

		}

		if (idx == link->wr_tx_cnt)

net/smc/smc_wr.h

+10 −0
Original line number Diff line number Diff line
@@ -60,6 +60,16 @@ static inline void smc_wr_tx_set_wr_id(atomic_long_t *wr_tx_id, long val) 
	atomic_long_set(wr_tx_id, val);

}



static inline void smc_wr_wakeup_tx_wait(struct smc_link *lnk)

{

	wake_up_all(&lnk->wr_tx_wait);

}



static inline void smc_wr_wakeup_reg_wait(struct smc_link *lnk)

{

	wake_up(&lnk->wr_reg_wait);

}



/* post a new receive work request to fill a completed old work request entry */

static inline int smc_wr_rx_post(struct smc_link *link)

{