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

Commit 2da43c4a authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

RDS: TCP: make receive path use the rds_conn_path 



The ->sk_user_data contains a pointer to the rds_conn_path
for the socket. Use this consistently in the rds_tcp_data_ready
callbacks to get the rds_conn_path for rds_recv_incoming.

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 ea3b1ea5

net/rds/ib.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ struct rds_transport rds_ib_transport = { 
	.xmit			= rds_ib_xmit,

	.xmit_rdma		= rds_ib_xmit_rdma,

	.xmit_atomic		= rds_ib_xmit_atomic,

	.recv			= rds_ib_recv,

	.recv_path		= rds_ib_recv_path,

	.conn_alloc		= rds_ib_conn_alloc,

	.conn_free		= rds_ib_conn_free,

	.conn_connect		= rds_ib_conn_connect,

net/rds/ib.h

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ void rds_ib_mr_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc); 
/* ib_recv.c */

int rds_ib_recv_init(void);

void rds_ib_recv_exit(void);

int rds_ib_recv(struct rds_connection *conn);

int rds_ib_recv_path(struct rds_conn_path *conn);

int rds_ib_recv_alloc_caches(struct rds_ib_connection *ic);

void rds_ib_recv_free_caches(struct rds_ib_connection *ic);

void rds_ib_recv_refill(struct rds_connection *conn, int prefill, gfp_t gfp);

net/rds/ib_recv.c

+2 −1
Original line number Diff line number Diff line
@@ -1009,8 +1009,9 @@ void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic, 
		rds_ib_recv_refill(conn, 0, GFP_NOWAIT);

}



int rds_ib_recv(struct rds_connection *conn)

int rds_ib_recv_path(struct rds_conn_path *cp)

{

	struct rds_connection *conn = cp->cp_conn;

	struct rds_ib_connection *ic = conn->c_transport_data;

	int ret = 0;

net/rds/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void rds_loop_inc_free(struct rds_incoming *inc) 
}



/* we need to at least give the thread something to succeed */

static int rds_loop_recv(struct rds_connection *conn)

static int rds_loop_recv_path(struct rds_conn_path *cp)

{

	return 0;

}
@@ -185,7 +185,7 @@ void rds_loop_exit(void) 
 */

struct rds_transport rds_loop_transport = {

	.xmit			= rds_loop_xmit,

	.recv			= rds_loop_recv,

	.recv_path		= rds_loop_recv_path,

	.conn_alloc		= rds_loop_conn_alloc,

	.conn_free		= rds_loop_conn_free,

	.conn_connect		= rds_loop_conn_connect,

net/rds/rds.h

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ struct rds_transport { 
		    unsigned int hdr_off, unsigned int sg, unsigned int off);

	int (*xmit_rdma)(struct rds_connection *conn, struct rm_rdma_op *op);

	int (*xmit_atomic)(struct rds_connection *conn, struct rm_atomic_op *op);

	int (*recv)(struct rds_connection *conn);

	int (*recv_path)(struct rds_conn_path *cp);

	int (*inc_copy_to_user)(struct rds_incoming *inc, struct iov_iter *to);

	void (*inc_free)(struct rds_incoming *inc);