Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca281265 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Doug Ledford
Browse files

IB/mad: pass ib_mad_send_buf explicitly to the recv_handler 



Stop abusing wr_id and just pass the parameter explicitly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHal Rosenstock <hal@mellanox.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 39f42655

drivers/infiniband/core/cm.c

+1 −0
Original line number Diff line number Diff line
@@ -3503,6 +3503,7 @@ int ib_cm_notify(struct ib_cm_id *cm_id, enum ib_event_type event) 
EXPORT_SYMBOL(ib_cm_notify);



static void cm_recv_handler(struct ib_mad_agent *mad_agent,

			    struct ib_mad_send_buf *send_buf,

			    struct ib_mad_recv_wc *mad_recv_wc)

{

	struct cm_port *port = mad_agent->context;

drivers/infiniband/core/mad.c

+10 −8
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static void snoop_recv(struct ib_mad_qp_info *qp_info, 


		atomic_inc(&mad_snoop_priv->refcount);

		spin_unlock_irqrestore(&qp_info->snoop_lock, flags);

		mad_snoop_priv->agent.recv_handler(&mad_snoop_priv->agent,

		mad_snoop_priv->agent.recv_handler(&mad_snoop_priv->agent, NULL,

						   mad_recv_wc);

		deref_snoop_agent(mad_snoop_priv);

		spin_lock_irqsave(&qp_info->snoop_lock, flags);
@@ -1994,8 +1994,8 @@ static void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv, 
				/* user rmpp is in effect

				 * and this is an active RMPP MAD

				 */

				mad_recv_wc->wc->wr_id = 0;

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

				mad_agent_priv->agent.recv_handler(

						&mad_agent_priv->agent, NULL,

						mad_recv_wc);

				atomic_dec(&mad_agent_priv->refcount);

			} else {
@@ -2010,8 +2010,9 @@ static void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv, 
			spin_unlock_irqrestore(&mad_agent_priv->lock, flags);



			/* Defined behavior is to complete response before request */

			mad_recv_wc->wc->wr_id = (unsigned long) &mad_send_wr->send_buf;

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

			mad_agent_priv->agent.recv_handler(

					&mad_agent_priv->agent,

					&mad_send_wr->send_buf,

					mad_recv_wc);

			atomic_dec(&mad_agent_priv->refcount);
@@ -2021,7 +2022,7 @@ static void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv, 
			ib_mad_complete_send_wr(mad_send_wr, &mad_send_wc);

		}

	} else {

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

		mad_agent_priv->agent.recv_handler(&mad_agent_priv->agent, NULL,

						   mad_recv_wc);

		deref_mad_agent(mad_agent_priv);

	}
@@ -2762,6 +2763,7 @@ static void local_completions(struct work_struct *work) 
					   IB_MAD_SNOOP_RECVS);

			recv_mad_agent->agent.recv_handler(

						&recv_mad_agent->agent,

						&local->mad_send_wr->send_buf,

						&local->mad_priv->header.recv_wc);

			spin_lock_irqsave(&recv_mad_agent->lock, flags);

			atomic_dec(&recv_mad_agent->refcount);

drivers/infiniband/core/sa_query.c

+4 −3
Original line number Diff line number Diff line
@@ -1669,14 +1669,15 @@ static void send_handler(struct ib_mad_agent *agent, 
}



static void recv_handler(struct ib_mad_agent *mad_agent,

			 struct ib_mad_send_buf *send_buf,

			 struct ib_mad_recv_wc *mad_recv_wc)

{

	struct ib_sa_query *query;

	struct ib_mad_send_buf *mad_buf;



	mad_buf = (void *) (unsigned long) mad_recv_wc->wc->wr_id;

	query = mad_buf->context[0];

	if (!send_buf)

		return;



	query = send_buf->context[0];

	if (query->callback) {

		if (mad_recv_wc->wc->status == IB_WC_SUCCESS)

			query->callback(query,

drivers/infiniband/core/user_mad.c

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ static void send_handler(struct ib_mad_agent *agent, 
}



static void recv_handler(struct ib_mad_agent *agent,

			 struct ib_mad_send_buf *send_buf,

			 struct ib_mad_recv_wc *mad_recv_wc)

{

	struct ib_umad_file *file = agent->context;

drivers/infiniband/ulp/srpt/ib_srpt.c

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ static void srpt_mad_send_handler(struct ib_mad_agent *mad_agent, 
 * srpt_mad_recv_handler() - MAD reception callback function.

 */

static void srpt_mad_recv_handler(struct ib_mad_agent *mad_agent,

				  struct ib_mad_send_buf *send_buf,

				  struct ib_mad_recv_wc *mad_wc)

{

	struct srpt_port *sport = (struct srpt_port *)mad_agent->context;