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

Commit 226f7a7d authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

RDS: Rework path specific indirections 



Refactor code to avoid separate indirections for single-path
and multipath transports. All transports (both single and mp-capable)
will get a pointer to the rds_conn_path, and can trivially derive
the rds_connection from the ->cp_conn.

Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc9a2002

net/rds/connection.c

+1 −4
Original line number Diff line number Diff line
@@ -326,9 +326,6 @@ void rds_conn_shutdown(struct rds_conn_path *cp) 
		wait_event(cp->cp_waitq,

			   !test_bit(RDS_RECV_REFILL, &cp->cp_flags));



		if (!conn->c_trans->t_mp_capable)

			conn->c_trans->conn_shutdown(conn);

		else

		conn->c_trans->conn_path_shutdown(cp);

		rds_conn_path_reset(cp);

net/rds/ib.c

+2 −2
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ void rds_ib_exit(void) 


struct rds_transport rds_ib_transport = {

	.laddr_check		= rds_ib_laddr_check,

	.xmit_complete		= rds_ib_xmit_complete,

	.xmit_path_complete	= rds_ib_xmit_path_complete,

	.xmit			= rds_ib_xmit,

	.xmit_rdma		= rds_ib_xmit_rdma,

	.xmit_atomic		= rds_ib_xmit_atomic,
@@ -389,7 +389,7 @@ struct rds_transport rds_ib_transport = { 
	.conn_alloc		= rds_ib_conn_alloc,

	.conn_free		= rds_ib_conn_free,

	.conn_connect		= rds_ib_conn_connect,

	.conn_shutdown		= rds_ib_conn_shutdown,

	.conn_path_shutdown	= rds_ib_conn_path_shutdown,

	.inc_copy_to_user	= rds_ib_inc_copy_to_user,

	.inc_free		= rds_ib_inc_free,

	.cm_initiate_connect	= rds_ib_cm_initiate_connect,

net/rds/ib.h

+2 −2
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ extern struct list_head ib_nodev_conns; 
int rds_ib_conn_alloc(struct rds_connection *conn, gfp_t gfp);

void rds_ib_conn_free(void *arg);

int rds_ib_conn_connect(struct rds_connection *conn);

void rds_ib_conn_shutdown(struct rds_connection *conn);

void rds_ib_conn_path_shutdown(struct rds_conn_path *cp);

void rds_ib_state_change(struct sock *sk);

int rds_ib_listen_init(void);

void rds_ib_listen_stop(void);
@@ -384,7 +384,7 @@ u32 rds_ib_ring_completed(struct rds_ib_work_ring *ring, u32 wr_id, u32 oldest); 
extern wait_queue_head_t rds_ib_ring_empty_wait;



/* ib_send.c */

void rds_ib_xmit_complete(struct rds_connection *conn);

void rds_ib_xmit_path_complete(struct rds_conn_path *cp);

int rds_ib_xmit(struct rds_connection *conn, struct rds_message *rm,

		unsigned int hdr_off, unsigned int sg, unsigned int off);

void rds_ib_send_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc);

net/rds/ib_cm.c

+2 −1
Original line number Diff line number Diff line
@@ -731,8 +731,9 @@ int rds_ib_conn_connect(struct rds_connection *conn) 
 * so that it can be called at any point during startup.  In fact it

 * can be called multiple times for a given connection.

 */

void rds_ib_conn_shutdown(struct rds_connection *conn)

void rds_ib_conn_path_shutdown(struct rds_conn_path *cp)

{

	struct rds_connection *conn = cp->cp_conn;

	struct rds_ib_connection *ic = conn->c_transport_data;

	int err = 0;

net/rds/ib_send.c

+2 −1
Original line number Diff line number Diff line
@@ -980,8 +980,9 @@ int rds_ib_xmit_rdma(struct rds_connection *conn, struct rm_rdma_op *op) 
	return ret;

}



void rds_ib_xmit_complete(struct rds_connection *conn)

void rds_ib_xmit_path_complete(struct rds_conn_path *cp)

{

	struct rds_connection *conn = cp->cp_conn;

	struct rds_ib_connection *ic = conn->c_transport_data;



	/* We may have a pending ACK or window update we were unable