Patch "IB/mlx4: Fix incorrect cq flushing in error state" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

IB/mlx4: Fix incorrect cq flushing in error state

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ib-mlx4-fix-incorrect-cq-flushing-in-error-state.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Ariel Nahum <[email protected]>
Date: Sun, 9 Aug 2015 11:16:27 +0300
Subject: IB/mlx4: Fix incorrect cq flushing in error state

From: Ariel Nahum <[email protected]>

commit 799cdaf8a98f13d4fba3162e21e1e63f21045010 upstream.

When handling a device internal error, the driver is responsible to drain the completion queue with flush errors.

In case a completion queue was assigned to multiple send queues, the driver iterates over the send queues and generates flush errors of inflight wqes. The driver must correctly pass the wc array with an offset as a result of the previous send queue iteration. Not doing so will overwrite previously set completions and return a wrong number of polled completions which includes ones which were not correctly set.

---
 drivers/infiniband/hw/mlx4/cq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -629,7 +629,7 @@ static void mlx4_ib_poll_sw_comp(struct
 	 * simulated FLUSH_ERR completions
 	 */
 	list_for_each_entry(qp, &cq->send_qp_list, cq_send_list) {
-		mlx4_ib_qp_sw_comp(qp, num_entries, wc, npolled, 1);
+		mlx4_ib_qp_sw_comp(qp, num_entries, wc + *npolled, npolled, 1);
 		if (*npolled >= num_entries)
 			goto out;
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/ib-mlx4-fix-incorrect-cq-flushing-in-error-state.patch