Unverified Commit 2b61c887 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13154 RDMA/mad: Improve handling of timed out WRs of mad agent 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2KYQUJTTCV2BQWM46TX6I444NI7MJZNV/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2BVE 
 
Link:https://gitee.com/openeuler/kernel/pulls/13154

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents f7544a74 4c347a4b

drivers/infiniband/core/mad.c

+8 −6
Original line number Diff line number Diff line
@@ -2631,14 +2631,16 @@ static int retry_send(struct ib_mad_send_wr_private *mad_send_wr) 


static void timeout_sends(struct work_struct *work)

{

	struct ib_mad_send_wr_private *mad_send_wr, *n;

	struct ib_mad_agent_private *mad_agent_priv;

	struct ib_mad_send_wr_private *mad_send_wr;

	struct ib_mad_send_wc mad_send_wc;

	struct list_head local_list;

	unsigned long flags, delay;



	mad_agent_priv = container_of(work, struct ib_mad_agent_private,

				      timed_work.work);

	mad_send_wc.vendor_err = 0;

	INIT_LIST_HEAD(&local_list);



	spin_lock_irqsave(&mad_agent_priv->lock, flags);

	while (!list_empty(&mad_agent_priv->wait_list)) {
@@ -2656,13 +2658,16 @@ static void timeout_sends(struct work_struct *work) 
			break;

		}



		list_del(&mad_send_wr->agent_list);

		list_del_init(&mad_send_wr->agent_list);

		if (mad_send_wr->status == IB_WC_SUCCESS &&

		    !retry_send(mad_send_wr))

			continue;



		list_add_tail(&mad_send_wr->agent_list, &local_list);

	}

	spin_unlock_irqrestore(&mad_agent_priv->lock, flags);



	list_for_each_entry_safe(mad_send_wr, n, &local_list, agent_list) {

		if (mad_send_wr->status == IB_WC_SUCCESS)

			mad_send_wc.status = IB_WC_RESP_TIMEOUT_ERR;

		else
@@ -2670,11 +2675,8 @@ static void timeout_sends(struct work_struct *work) 
		mad_send_wc.send_buf = &mad_send_wr->send_buf;

		mad_agent_priv->agent.send_handler(&mad_agent_priv->agent,

						   &mad_send_wc);



		deref_mad_agent(mad_agent_priv);

		spin_lock_irqsave(&mad_agent_priv->lock, flags);

	}

	spin_unlock_irqrestore(&mad_agent_priv->lock, flags);

}



/*