Commit 7b70d033 authored by Steve Wise's avatar Steve Wise Committed by David S. Miller
Browse files

RDS/IW+IB: Allow max credit advertise window. 



Fix hack that restricts the credit advertisement to 127.

Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarAndy Grover <andy.grover@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d39e0602

net/rds/ib.h

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ int rds_ib_xmit_rdma(struct rds_connection *conn, struct rds_rdma_op *op); 
void rds_ib_send_add_credits(struct rds_connection *conn, unsigned int credits);

void rds_ib_advertise_credits(struct rds_connection *conn, unsigned int posted);

int rds_ib_send_grab_credits(struct rds_ib_connection *ic, u32 wanted,

			     u32 *adv_credits, int need_posted);

			     u32 *adv_credits, int need_posted, int max_posted);



/* ib_stats.c */

DECLARE_PER_CPU(struct rds_ib_statistics, rds_ib_stats);

net/rds/ib_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ void rds_ib_attempt_ack(struct rds_ib_connection *ic) 
	}



	/* Can we get a send credit? */

	if (!rds_ib_send_grab_credits(ic, 1, &adv_credits, 0)) {

	if (!rds_ib_send_grab_credits(ic, 1, &adv_credits, 0, RDS_MAX_ADV_CREDIT)) {

		rds_ib_stats_inc(s_ib_tx_throttle);

		clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);

		return;

net/rds/ib_send.c

+4 −4
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ void rds_ib_send_cq_comp_handler(struct ib_cq *cq, void *context) 
 * and using atomic_cmpxchg when updating the two counters.

 */

int rds_ib_send_grab_credits(struct rds_ib_connection *ic,

			     u32 wanted, u32 *adv_credits, int need_posted)

			     u32 wanted, u32 *adv_credits, int need_posted, int max_posted)

{

	unsigned int avail, posted, got = 0, advertise;

	long oldval, newval;
@@ -351,7 +351,7 @@ int rds_ib_send_grab_credits(struct rds_ib_connection *ic, 
	 * available.

	 */

	if (posted && (got || need_posted)) {

		advertise = min_t(unsigned int, posted, RDS_MAX_ADV_CREDIT);

		advertise = min_t(unsigned int, posted, max_posted);

		newval -= IB_SET_POST_CREDITS(advertise);

	}
@@ -498,7 +498,7 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 


	credit_alloc = work_alloc;

	if (ic->i_flowctl) {

		credit_alloc = rds_ib_send_grab_credits(ic, work_alloc, &posted, 0);

		credit_alloc = rds_ib_send_grab_credits(ic, work_alloc, &posted, 0, RDS_MAX_ADV_CREDIT);

		adv_credits += posted;

		if (credit_alloc < work_alloc) {

			rds_ib_ring_unalloc(&ic->i_send_ring, work_alloc - credit_alloc);
@@ -571,7 +571,7 @@ int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm, 
		/*

		 * Update adv_credits since we reset the ACK_REQUIRED bit.

		 */

		rds_ib_send_grab_credits(ic, 0, &posted, 1);

		rds_ib_send_grab_credits(ic, 0, &posted, 1, RDS_MAX_ADV_CREDIT - adv_credits);

		adv_credits += posted;

		BUG_ON(adv_credits > 255);

	} else if (ic->i_rm != rm)

net/rds/iw.h

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ int rds_iw_xmit_rdma(struct rds_connection *conn, struct rds_rdma_op *op); 
void rds_iw_send_add_credits(struct rds_connection *conn, unsigned int credits);

void rds_iw_advertise_credits(struct rds_connection *conn, unsigned int posted);

int rds_iw_send_grab_credits(struct rds_iw_connection *ic, u32 wanted,

			     u32 *adv_credits, int need_posted);

			     u32 *adv_credits, int need_posted, int max_posted);



/* ib_stats.c */

DECLARE_PER_CPU(struct rds_iw_statistics, rds_iw_stats);

net/rds/iw_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ void rds_iw_attempt_ack(struct rds_iw_connection *ic) 
	}



	/* Can we get a send credit? */

	if (!rds_iw_send_grab_credits(ic, 1, &adv_credits, 0)) {

	if (!rds_iw_send_grab_credits(ic, 1, &adv_credits, 0, RDS_MAX_ADV_CREDIT)) {

		rds_iw_stats_inc(s_iw_tx_throttle);

		clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);

		return;