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

Commit 840df162 authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

rds: reduce memory footprint for RDS when transport is RDMA 



RDS over IB does not use multipath RDS, so the array
of additional rds_conn_path structures is always superfluous
in this case. Reduce the memory footprint of the rds module
by making this a dynamic allocation predicated on whether
the transport is mp_capable.

Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Tested-by: default avatarEfrain Galaviz <efrain.galaviz@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93b1b31f

net/rds/connection.c

+25 −9
Original line number Original line Diff line number Diff line
@@ -151,6 +151,7 @@ static struct rds_connection *__rds_conn_create(struct net *net, 
	struct rds_transport *loop_trans;

	struct rds_transport *loop_trans;

	unsigned long flags;

	unsigned long flags;

	int ret, i;

	int ret, i;

	int npaths = (trans->t_mp_capable ? RDS_MPATH_WORKERS : 1);





	rcu_read_lock();

	rcu_read_lock();

	conn = rds_conn_lookup(net, head, laddr, faddr, trans);

	conn = rds_conn_lookup(net, head, laddr, faddr, trans);
@@ -172,6 +173,12 @@ static struct rds_connection *__rds_conn_create(struct net *net, 
		conn = ERR_PTR(-ENOMEM);

		conn = ERR_PTR(-ENOMEM);

		goto out;

		goto out;

	}

	}

	conn->c_path = kcalloc(npaths, sizeof(struct rds_conn_path), gfp);

	if (!conn->c_path) {

		kmem_cache_free(rds_conn_slab, conn);

		conn = ERR_PTR(-ENOMEM);

		goto out;

	}





	INIT_HLIST_NODE(&conn->c_hash_node);

	INIT_HLIST_NODE(&conn->c_hash_node);

	conn->c_laddr = laddr;

	conn->c_laddr = laddr;
@@ -181,6 +188,7 @@ static struct rds_connection *__rds_conn_create(struct net *net, 




	ret = rds_cong_get_maps(conn);

	ret = rds_cong_get_maps(conn);

	if (ret) {

	if (ret) {

		kfree(conn->c_path);

		kmem_cache_free(rds_conn_slab, conn);

		kmem_cache_free(rds_conn_slab, conn);

		conn = ERR_PTR(ret);

		conn = ERR_PTR(ret);

		goto out;

		goto out;
@@ -207,13 +215,14 @@ static struct rds_connection *__rds_conn_create(struct net *net, 
	conn->c_trans = trans;

	conn->c_trans = trans;





	init_waitqueue_head(&conn->c_hs_waitq);

	init_waitqueue_head(&conn->c_hs_waitq);

	for (i = 0; i < RDS_MPATH_WORKERS; i++) {

	for (i = 0; i < npaths; i++) {

		__rds_conn_path_init(conn, &conn->c_path[i],

		__rds_conn_path_init(conn, &conn->c_path[i],

				     is_outgoing);

				     is_outgoing);

		conn->c_path[i].cp_index = i;

		conn->c_path[i].cp_index = i;

	}

	}

	ret = trans->conn_alloc(conn, gfp);

	ret = trans->conn_alloc(conn, gfp);

	if (ret) {

	if (ret) {

		kfree(conn->c_path);

		kmem_cache_free(rds_conn_slab, conn);

		kmem_cache_free(rds_conn_slab, conn);

		conn = ERR_PTR(ret);

		conn = ERR_PTR(ret);

		goto out;

		goto out;
@@ -236,6 +245,7 @@ static struct rds_connection *__rds_conn_create(struct net *net, 
		/* Creating passive conn */

		/* Creating passive conn */

		if (parent->c_passive) {

		if (parent->c_passive) {

			trans->conn_free(conn->c_path[0].cp_transport_data);

			trans->conn_free(conn->c_path[0].cp_transport_data);

			kfree(conn->c_path);

			kmem_cache_free(rds_conn_slab, conn);

			kmem_cache_free(rds_conn_slab, conn);

			conn = parent->c_passive;

			conn = parent->c_passive;

		} else {

		} else {
@@ -252,7 +262,7 @@ static struct rds_connection *__rds_conn_create(struct net *net, 
			struct rds_conn_path *cp;

			struct rds_conn_path *cp;

			int i;

			int i;





			for (i = 0; i < RDS_MPATH_WORKERS; i++) {

			for (i = 0; i < npaths; i++) {

				cp = &conn->c_path[i];

				cp = &conn->c_path[i];

				/* The ->conn_alloc invocation may have

				/* The ->conn_alloc invocation may have

				 * allocated resource for all paths, so all

				 * allocated resource for all paths, so all
@@ -261,6 +271,7 @@ static struct rds_connection *__rds_conn_create(struct net *net, 
				if (cp->cp_transport_data)

				if (cp->cp_transport_data)

					trans->conn_free(cp->cp_transport_data);

					trans->conn_free(cp->cp_transport_data);

			}

			}

			kfree(conn->c_path);

			kmem_cache_free(rds_conn_slab, conn);

			kmem_cache_free(rds_conn_slab, conn);

			conn = found;

			conn = found;

		} else {

		} else {
@@ -407,6 +418,7 @@ void rds_conn_destroy(struct rds_connection *conn) 
	unsigned long flags;

	unsigned long flags;

	int i;

	int i;

	struct rds_conn_path *cp;

	struct rds_conn_path *cp;

	int npaths = (conn->c_trans->t_mp_capable ? RDS_MPATH_WORKERS : 1);





	rdsdebug("freeing conn %p for %pI4 -> "

	rdsdebug("freeing conn %p for %pI4 -> "

		 "%pI4\n", conn, &conn->c_laddr,

		 "%pI4\n", conn, &conn->c_laddr,
@@ -420,7 +432,7 @@ void rds_conn_destroy(struct rds_connection *conn) 
	synchronize_rcu();

	synchronize_rcu();





	/* shut the connection down */

	/* shut the connection down */

	for (i = 0; i < RDS_MPATH_WORKERS; i++) {

	for (i = 0; i < npaths; i++) {

		cp = &conn->c_path[i];

		cp = &conn->c_path[i];

		rds_conn_path_destroy(cp);

		rds_conn_path_destroy(cp);

		BUG_ON(!list_empty(&cp->cp_retrans));

		BUG_ON(!list_empty(&cp->cp_retrans));
@@ -434,6 +446,7 @@ void rds_conn_destroy(struct rds_connection *conn) 
	rds_cong_remove_conn(conn);

	rds_cong_remove_conn(conn);





	put_net(conn->c_net);

	put_net(conn->c_net);

	kfree(conn->c_path);

	kmem_cache_free(rds_conn_slab, conn);

	kmem_cache_free(rds_conn_slab, conn);





	spin_lock_irqsave(&rds_conn_lock, flags);

	spin_lock_irqsave(&rds_conn_lock, flags);
@@ -464,8 +477,12 @@ static void rds_conn_message_info(struct socket *sock, unsigned int len, 
	     i++, head++) {

	     i++, head++) {

		hlist_for_each_entry_rcu(conn, head, c_hash_node) {

		hlist_for_each_entry_rcu(conn, head, c_hash_node) {

			struct rds_conn_path *cp;

			struct rds_conn_path *cp;

			int npaths;





			for (j = 0; j < RDS_MPATH_WORKERS; j++) {

			npaths = (conn->c_trans->t_mp_capable ?

				 RDS_MPATH_WORKERS : 1);



			for (j = 0; j < npaths; j++) {

				cp = &conn->c_path[j];

				cp = &conn->c_path[j];

				if (want_send)

				if (want_send)

					list = &cp->cp_send_queue;

					list = &cp->cp_send_queue;
@@ -486,8 +503,6 @@ static void rds_conn_message_info(struct socket *sock, unsigned int len, 
				}

				}





				spin_unlock_irqrestore(&cp->cp_lock, flags);

				spin_unlock_irqrestore(&cp->cp_lock, flags);

				if (!conn->c_trans->t_mp_capable)

					break;

			}

			}

		}

		}

	}

	}
@@ -571,15 +586,16 @@ static void rds_walk_conn_path_info(struct socket *sock, unsigned int len, 
	     i++, head++) {

	     i++, head++) {

		hlist_for_each_entry_rcu(conn, head, c_hash_node) {

		hlist_for_each_entry_rcu(conn, head, c_hash_node) {

			struct rds_conn_path *cp;

			struct rds_conn_path *cp;

			int npaths;





			for (j = 0; j < RDS_MPATH_WORKERS; j++) {

			npaths = (conn->c_trans->t_mp_capable ?

				 RDS_MPATH_WORKERS : 1);

			for (j = 0; j < npaths; j++) {

				cp = &conn->c_path[j];

				cp = &conn->c_path[j];





				/* XXX no cp_lock usage.. */

				/* XXX no cp_lock usage.. */

				if (!visitor(cp, buffer))

				if (!visitor(cp, buffer))

					continue;

					continue;

				if (!conn->c_trans->t_mp_capable)

					break;

			}

			}





			/* We copy as much as we can fit in the buffer,

			/* We copy as much as we can fit in the buffer,

net/rds/rds.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ struct rds_connection { 
	struct list_head	c_map_item;

	struct list_head	c_map_item;

	unsigned long		c_map_queued;

	unsigned long		c_map_queued;





	struct rds_conn_path	c_path[RDS_MPATH_WORKERS];

	struct rds_conn_path	*c_path;

	wait_queue_head_t	c_hs_waitq; /* handshake waitq */

	wait_queue_head_t	c_hs_waitq; /* handshake waitq */





	u32			c_my_gen_num;

	u32			c_my_gen_num;