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

Commit 29bb33dd authored by Hal Rosenstock's avatar Hal Rosenstock Committed by Linus Torvalds
Browse files

[PATCH] IB: Optimize canceling a MAD 



Optimize canceling a MAD.
- Eliminate searching timeout list in cancel case.
- Remove duplicate calls to queue work item.
- Eliminate resending a MAD before MAD is completed.

Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarHal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 03b61ad2

drivers/infiniband/core/mad.c

+13 −8
Original line number Diff line number Diff line
@@ -1754,6 +1754,7 @@ static void wait_for_response(struct ib_mad_send_wr_private *mad_send_wr) 
	delay = mad_send_wr->timeout;

	mad_send_wr->timeout += jiffies;



	if (delay) {

		list_for_each_prev(list_item, &mad_agent_priv->wait_list) {

			temp_mad_send_wr = list_entry(list_item,

						struct ib_mad_send_wr_private,
@@ -1762,6 +1763,9 @@ static void wait_for_response(struct ib_mad_send_wr_private *mad_send_wr) 
				       temp_mad_send_wr->timeout))

				break;

		}

	}

	else

		list_item = &mad_agent_priv->wait_list;

	list_add(&mad_send_wr->agent_list, list_item);



	/* Reschedule a work item if we have a shorter timeout */
@@ -2197,7 +2201,8 @@ static void timeout_sends(void *data) 
		}



		list_del(&mad_send_wr->agent_list);

		if (!retry_send(mad_send_wr))

		if (mad_send_wr->status == IB_WC_SUCCESS &&

		    !retry_send(mad_send_wr))

			continue;



		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);