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

Commit 3c0a5900 authored by Sowmini Varadhan's avatar Sowmini Varadhan Committed by David S. Miller
Browse files

RDS: Add rds_conn_path_connect_if_down() for MP-aware callers 



rds_conn_path_connect_if_down() works on the rds_conn_path
that it is passed. Callers who are not t_m_capable may continue
calling rds_conn_connect_if_down, which will invoke
rds_conn_path_connect_if_down() with the default c_path[0].

Signed-off-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45997e9e

net/rds/connection.c

+9 −3
Original line number Diff line number Diff line
@@ -572,11 +572,17 @@ EXPORT_SYMBOL_GPL(rds_conn_drop); 
 * If the connection is down, trigger a connect. We may have scheduled a

 * delayed reconnect however - in this case we should not interfere.

 */

void rds_conn_path_connect_if_down(struct rds_conn_path *cp)

{

	if (rds_conn_path_state(cp) == RDS_CONN_DOWN &&

	    !test_and_set_bit(RDS_RECONNECT_PENDING, &cp->cp_flags))

		queue_delayed_work(rds_wq, &cp->cp_conn_w, 0);

}



void rds_conn_connect_if_down(struct rds_connection *conn)

{

	if (rds_conn_state(conn) == RDS_CONN_DOWN &&

	    !test_and_set_bit(RDS_RECONNECT_PENDING, &conn->c_flags))

		queue_delayed_work(rds_wq, &conn->c_conn_w, 0);

	WARN_ON(conn->c_trans->t_mp_capable);

	rds_conn_path_connect_if_down(&conn->c_path[0]);

}

EXPORT_SYMBOL_GPL(rds_conn_connect_if_down);

net/rds/rds.h

+1 −0
Original line number Diff line number Diff line
@@ -658,6 +658,7 @@ void rds_conn_destroy(struct rds_connection *conn); 
void rds_conn_drop(struct rds_connection *conn);

void rds_conn_path_drop(struct rds_conn_path *cpath);

void rds_conn_connect_if_down(struct rds_connection *conn);

void rds_conn_path_connect_if_down(struct rds_conn_path *cp);

void rds_for_each_conn_info(struct socket *sock, unsigned int len,

			  struct rds_info_iterator *iter,

			  struct rds_info_lengths *lens,

net/rds/send.c

+4 −5
Original line number Diff line number Diff line
@@ -1088,16 +1088,15 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len) 
		goto out;

	}



	rds_conn_connect_if_down(conn);

	cpath = &conn->c_path[0];



	rds_conn_path_connect_if_down(cpath);



	ret = rds_cong_wait(conn->c_fcong, dport, nonblock, rs);

	if (ret) {

		rs->rs_seen_congestion = 1;

		goto out;

	}



	cpath = &conn->c_path[0];



	while (!rds_send_queue_rm(rs, conn, cpath, rm, rs->rs_bound_port,

				  dport, &queued)) {

		rds_stats_inc(s_send_queue_full);
@@ -1167,7 +1166,7 @@ rds_send_pong(struct rds_conn_path *cp, __be16 dport) 
	rm->m_daddr = cp->cp_conn->c_faddr;

	rm->data.op_active = 1;



	rds_conn_connect_if_down(cp->cp_conn);

	rds_conn_path_connect_if_down(cp);



	ret = rds_cong_wait(cp->cp_conn->c_fcong, dport, 1, NULL);

	if (ret)