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

Commit a0c0865f authored by Håkon Bugge's avatar Håkon Bugge Committed by David S. Miller
Browse files

rds: Fix inaccurate accounting of unsignaled wrs 



The number of unsignaled work-requests posted to the IB send queue is
tracked by a counter in the rds_ib_connection struct. When it reaches
zero, or the caller explicitly asks for it, the send-signaled bit is
set in send_flags and the counter is reset. This is performed by the
rds_ib_set_wr_signal_state() function.

However, this function is not always used which yields inaccurate
accounting. This commit fixes this, re-factors a code bloat related to
the matter, and makes the actual parameter type to the function
consistent.

Signed-off-by: default avatarHåkon Bugge <haakon.bugge@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9a0b998

net/rds/ib_send.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -661,13 +661,15 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 
			}

			}

		}

		}





		rds_ib_set_wr_signal_state(ic, send, 0);

		rds_ib_set_wr_signal_state(ic, send, false);





		/*

		/*

		 * Always signal the last one if we're stopping due to flow control.

		 * Always signal the last one if we're stopping due to flow control.

		 */

		 */

		if (ic->i_flowctl && flow_controlled && i == (work_alloc-1))

		if (ic->i_flowctl && flow_controlled && i == (work_alloc - 1)) {

			send->s_wr.send_flags |= IB_SEND_SIGNALED | IB_SEND_SOLICITED;

			rds_ib_set_wr_signal_state(ic, send, true);

			send->s_wr.send_flags |= IB_SEND_SOLICITED;

		}





		if (send->s_wr.send_flags & IB_SEND_SIGNALED)

		if (send->s_wr.send_flags & IB_SEND_SIGNALED)

			nr_sig++;

			nr_sig++;
@@ -705,11 +707,8 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 
	if (scat == &rm->data.op_sg[rm->data.op_count]) {

	if (scat == &rm->data.op_sg[rm->data.op_count]) {

		prev->s_op = ic->i_data_op;

		prev->s_op = ic->i_data_op;

		prev->s_wr.send_flags |= IB_SEND_SOLICITED;

		prev->s_wr.send_flags |= IB_SEND_SOLICITED;

		if (!(prev->s_wr.send_flags & IB_SEND_SIGNALED)) {

		if (!(prev->s_wr.send_flags & IB_SEND_SIGNALED))

			ic->i_unsignaled_wrs = rds_ib_sysctl_max_unsig_wrs;

			nr_sig += rds_ib_set_wr_signal_state(ic, prev, true);

			prev->s_wr.send_flags |= IB_SEND_SIGNALED;

			nr_sig++;

		}

		ic->i_data_op = NULL;

		ic->i_data_op = NULL;

	}

	}