Commit 96fd26b9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rds-assorted-bug-fixes' 



Santosh Shilimkar says:

====================
RDS: Assorted bug fixes

We would like to improve RDS upstream support and in that context, I
started playing with it.  But run into number of issues including as
basic is RDS IB RDMA doesn't work. As part of the debug, I ended up
creating the $subject series which has bunch of assorted fixes. At
least with this series I can run RDS IB RDMA and other tests
successfully.

Some of these fixes have been done by Chris Meson, Andy Grover and
Zach Brown while at Oracle. There are still more kinks with FMR and
error handling and I plan to address them in a follow up series.

Series generated against Linus's master(v4.2-rc-7) but also applies
against next-next cleanly. Its tested on Oracle hardware with IB
fabric for both bcopy as well as RDMA mode. I don't have access
to iWARP hardware so any testing help on iWARP hardware appreciated.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 43e122b0 ae05368a

net/rds/af_rds.c

+9 −0
Original line number Diff line number Diff line
@@ -438,6 +438,14 @@ static const struct proto_ops rds_proto_ops = { 
	.sendpage =	sock_no_sendpage,

};



static void rds_sock_destruct(struct sock *sk)

{

	struct rds_sock *rs = rds_sk_to_rs(sk);



	WARN_ON((&rs->rs_item != rs->rs_item.next ||

		 &rs->rs_item != rs->rs_item.prev));

}



static int __rds_create(struct socket *sock, struct sock *sk, int protocol)

{

	struct rds_sock *rs;
@@ -445,6 +453,7 @@ static int __rds_create(struct socket *sock, struct sock *sk, int protocol) 
	sock_init_data(sock, sk);

	sock->ops		= &rds_proto_ops;

	sk->sk_protocol		= protocol;

	sk->sk_destruct		= rds_sock_destruct;



	rs = rds_sk_to_rs(sk);

	spin_lock_init(&rs->rs_lock);

net/rds/connection.c

+2 −0
Original line number Diff line number Diff line
@@ -301,6 +301,8 @@ void rds_conn_shutdown(struct rds_connection *conn) 


		wait_event(conn->c_waitq,

			   !test_bit(RDS_IN_XMIT, &conn->c_flags));

		wait_event(conn->c_waitq,

			   !test_bit(RDS_RECV_REFILL, &conn->c_flags));



		conn->c_trans->conn_shutdown(conn);

		rds_conn_reset(conn);

net/rds/ib.h

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ void rds_ib_recv_exit(void); 
int rds_ib_recv(struct rds_connection *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);

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

void rds_ib_inc_free(struct rds_incoming *inc);

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

void rds_ib_recv_cq_comp_handler(struct ib_cq *cq, void *context);

net/rds/ib_cm.c

+10 −7
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even 
	rds_ib_recv_init_ring(ic);

	/* Post receive buffers - as a side effect, this will update

	 * the posted credit count. */

	rds_ib_recv_refill(conn, 1);

	rds_ib_recv_refill(conn, 1, GFP_KERNEL);



	/* Tune RNR behavior */

	rds_ib_tune_rnr(ic, &qp_attr);
@@ -640,6 +640,15 @@ void rds_ib_conn_shutdown(struct rds_connection *conn) 
			   (atomic_read(&ic->i_signaled_sends) == 0));

		tasklet_kill(&ic->i_recv_tasklet);



		/* first destroy the ib state that generates callbacks */

		if (ic->i_cm_id->qp)

			rdma_destroy_qp(ic->i_cm_id);

		if (ic->i_send_cq)

			ib_destroy_cq(ic->i_send_cq);

		if (ic->i_recv_cq)

			ib_destroy_cq(ic->i_recv_cq);



		/* then free the resources that ib callbacks use */

		if (ic->i_send_hdrs)

			ib_dma_free_coherent(dev,

					   ic->i_send_ring.w_nr *
@@ -663,12 +672,6 @@ void rds_ib_conn_shutdown(struct rds_connection *conn) 
		if (ic->i_recvs)

			rds_ib_recv_clear_ring(ic);



		if (ic->i_cm_id->qp)

			rdma_destroy_qp(ic->i_cm_id);

		if (ic->i_send_cq)

			ib_destroy_cq(ic->i_send_cq);

		if (ic->i_recv_cq)

			ib_destroy_cq(ic->i_recv_cq);

		rdma_destroy_id(ic->i_cm_id);



		/*

net/rds/ib_rdma.c

+8 −3
Original line number Diff line number Diff line
@@ -151,12 +151,17 @@ int rds_ib_update_ipaddr(struct rds_ib_device *rds_ibdev, __be32 ipaddr) 
	struct rds_ib_device *rds_ibdev_old;



	rds_ibdev_old = rds_ib_get_device(ipaddr);

	if (rds_ibdev_old) {

	if (!rds_ibdev_old)

		return rds_ib_add_ipaddr(rds_ibdev, ipaddr);



	if (rds_ibdev_old != rds_ibdev) {

		rds_ib_remove_ipaddr(rds_ibdev_old, ipaddr);

		rds_ib_dev_put(rds_ibdev_old);

		return rds_ib_add_ipaddr(rds_ibdev, ipaddr);

	}

	rds_ib_dev_put(rds_ibdev_old);



	return rds_ib_add_ipaddr(rds_ibdev, ipaddr);

	return 0;

}



void rds_ib_add_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *conn)
@@ -485,7 +490,7 @@ static void __rds_ib_teardown_mr(struct rds_ib_mr *ibmr) 


			/* FIXME we need a way to tell a r/w MR

			 * from a r/o MR */

			BUG_ON(irqs_disabled());

			WARN_ON(!page->mapping && irqs_disabled());

			set_page_dirty(page);

			put_page(page);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE