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

Commit 409753bf authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Mark Fasheh
Browse files

ocfs2/cluster: Get rid of arguments to the timeout routines 



We keep seeing bug reports related to NULL pointer derefs in
o2net_set_nn_state(). When I originally wrote up the configurable timeout
patch, I had tried to plan for multiple clusters. This was silly.

The timeout routines all use o2nm_single_cluster so there's no point in
passing an argument at all. This patch removes the arguments and kills those
bugs dead.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent dda47bce

fs/ocfs2/cluster/tcp.c

+20 −27
Original line number Original line Diff line number Diff line
@@ -142,23 +142,17 @@ static void o2net_idle_timer(unsigned long data); 
static void o2net_sc_postpone_idle(struct o2net_sock_container *sc);

static void o2net_sc_postpone_idle(struct o2net_sock_container *sc);

static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc);

static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc);





/*

static inline int o2net_reconnect_delay(void)

 * FIXME: These should use to_o2nm_cluster_from_node(), but we end up

 * losing our parent link to the cluster during shutdown. This can be

 * solved by adding a pre-removal callback to configfs, or passing

 * around the cluster with the node. -jeffm

 */

static inline int o2net_reconnect_delay(struct o2nm_node *node)

{

{

	return o2nm_single_cluster->cl_reconnect_delay_ms;

	return o2nm_single_cluster->cl_reconnect_delay_ms;

}

}





static inline int o2net_keepalive_delay(struct o2nm_node *node)

static inline int o2net_keepalive_delay(void)

{

{

	return o2nm_single_cluster->cl_keepalive_delay_ms;

	return o2nm_single_cluster->cl_keepalive_delay_ms;

}

}





static inline int o2net_idle_timeout(struct o2nm_node *node)

static inline int o2net_idle_timeout(void)

{

{

	return o2nm_single_cluster->cl_idle_timeout_ms;

	return o2nm_single_cluster->cl_idle_timeout_ms;

}

}
@@ -444,9 +438,9 @@ static void o2net_set_nn_state(struct o2net_node *nn, 
		/* delay if we're withing a RECONNECT_DELAY of the

		/* delay if we're withing a RECONNECT_DELAY of the

		 * last attempt */

		 * last attempt */

		delay = (nn->nn_last_connect_attempt +

		delay = (nn->nn_last_connect_attempt +

			 msecs_to_jiffies(o2net_reconnect_delay(NULL)))

			 msecs_to_jiffies(o2net_reconnect_delay()))

			- jiffies;

			- jiffies;

		if (delay > msecs_to_jiffies(o2net_reconnect_delay(NULL)))

		if (delay > msecs_to_jiffies(o2net_reconnect_delay()))

			delay = 0;

			delay = 0;

		mlog(ML_CONN, "queueing conn attempt in %lu jiffies\n", delay);

		mlog(ML_CONN, "queueing conn attempt in %lu jiffies\n", delay);

		queue_delayed_work(o2net_wq, &nn->nn_connect_work, delay);

		queue_delayed_work(o2net_wq, &nn->nn_connect_work, delay);
@@ -460,7 +454,7 @@ static void o2net_set_nn_state(struct o2net_node *nn, 
		 * the connect_expired work will do anything.  The rest will see

		 * the connect_expired work will do anything.  The rest will see

		 * that it's already queued and do nothing.

		 * that it's already queued and do nothing.

		 */

		 */

		delay += msecs_to_jiffies(o2net_idle_timeout(NULL));

		delay += msecs_to_jiffies(o2net_idle_timeout());

		queue_delayed_work(o2net_wq, &nn->nn_connect_expired, delay);

		queue_delayed_work(o2net_wq, &nn->nn_connect_expired, delay);

	}

	}
@@ -1159,23 +1153,23 @@ static int o2net_check_handshake(struct o2net_sock_container *sc) 
	 * but isn't. This can ultimately cause corruption.

	 * but isn't. This can ultimately cause corruption.

	 */

	 */

	if (be32_to_cpu(hand->o2net_idle_timeout_ms) !=

	if (be32_to_cpu(hand->o2net_idle_timeout_ms) !=

				o2net_idle_timeout(sc->sc_node)) {

				o2net_idle_timeout()) {

		mlog(ML_NOTICE, SC_NODEF_FMT " uses a network idle timeout of "

		mlog(ML_NOTICE, SC_NODEF_FMT " uses a network idle timeout of "

		     "%u ms, but we use %u ms locally.  disconnecting\n",

		     "%u ms, but we use %u ms locally.  disconnecting\n",

		     SC_NODEF_ARGS(sc),

		     SC_NODEF_ARGS(sc),

		     be32_to_cpu(hand->o2net_idle_timeout_ms),

		     be32_to_cpu(hand->o2net_idle_timeout_ms),

		     o2net_idle_timeout(sc->sc_node));

		     o2net_idle_timeout());

		o2net_ensure_shutdown(nn, sc, -ENOTCONN);

		o2net_ensure_shutdown(nn, sc, -ENOTCONN);

		return -1;

		return -1;

	}

	}





	if (be32_to_cpu(hand->o2net_keepalive_delay_ms) !=

	if (be32_to_cpu(hand->o2net_keepalive_delay_ms) !=

			o2net_keepalive_delay(sc->sc_node)) {

			o2net_keepalive_delay()) {

		mlog(ML_NOTICE, SC_NODEF_FMT " uses a keepalive delay of "

		mlog(ML_NOTICE, SC_NODEF_FMT " uses a keepalive delay of "

		     "%u ms, but we use %u ms locally.  disconnecting\n",

		     "%u ms, but we use %u ms locally.  disconnecting\n",

		     SC_NODEF_ARGS(sc),

		     SC_NODEF_ARGS(sc),

		     be32_to_cpu(hand->o2net_keepalive_delay_ms),

		     be32_to_cpu(hand->o2net_keepalive_delay_ms),

		     o2net_keepalive_delay(sc->sc_node));

		     o2net_keepalive_delay());

		o2net_ensure_shutdown(nn, sc, -ENOTCONN);

		o2net_ensure_shutdown(nn, sc, -ENOTCONN);

		return -1;

		return -1;

	}

	}
@@ -1353,12 +1347,11 @@ static void o2net_initialize_handshake(void) 
{

{

	o2net_hand->o2hb_heartbeat_timeout_ms = cpu_to_be32(

	o2net_hand->o2hb_heartbeat_timeout_ms = cpu_to_be32(

		O2HB_MAX_WRITE_TIMEOUT_MS);

		O2HB_MAX_WRITE_TIMEOUT_MS);

	o2net_hand->o2net_idle_timeout_ms = cpu_to_be32(

	o2net_hand->o2net_idle_timeout_ms = cpu_to_be32(o2net_idle_timeout());

		o2net_idle_timeout(NULL));

	o2net_hand->o2net_keepalive_delay_ms = cpu_to_be32(

	o2net_hand->o2net_keepalive_delay_ms = cpu_to_be32(

		o2net_keepalive_delay(NULL));

		o2net_keepalive_delay());

	o2net_hand->o2net_reconnect_delay_ms = cpu_to_be32(

	o2net_hand->o2net_reconnect_delay_ms = cpu_to_be32(

		o2net_reconnect_delay(NULL));

		o2net_reconnect_delay());

}

}





/* ------------------------------------------------------------ */

/* ------------------------------------------------------------ */
@@ -1404,8 +1397,8 @@ static void o2net_idle_timer(unsigned long data) 




	printk(KERN_INFO "o2net: connection to " SC_NODEF_FMT " has been idle for %u.%u "

	printk(KERN_INFO "o2net: connection to " SC_NODEF_FMT " has been idle for %u.%u "

	     "seconds, shutting it down.\n", SC_NODEF_ARGS(sc),

	     "seconds, shutting it down.\n", SC_NODEF_ARGS(sc),

		     o2net_idle_timeout(sc->sc_node) / 1000,

		     o2net_idle_timeout() / 1000,

		     o2net_idle_timeout(sc->sc_node) % 1000);

		     o2net_idle_timeout() % 1000);

	mlog(ML_NOTICE, "here are some times that might help debug the "

	mlog(ML_NOTICE, "here are some times that might help debug the "

	     "situation: (tmr %ld.%ld now %ld.%ld dr %ld.%ld adv "

	     "situation: (tmr %ld.%ld now %ld.%ld dr %ld.%ld adv "

	     "%ld.%ld:%ld.%ld func (%08x:%u) %ld.%ld:%ld.%ld)\n",

	     "%ld.%ld:%ld.%ld func (%08x:%u) %ld.%ld:%ld.%ld)\n",
@@ -1433,10 +1426,10 @@ static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc) 
{

{

	o2net_sc_cancel_delayed_work(sc, &sc->sc_keepalive_work);

	o2net_sc_cancel_delayed_work(sc, &sc->sc_keepalive_work);

	o2net_sc_queue_delayed_work(sc, &sc->sc_keepalive_work,

	o2net_sc_queue_delayed_work(sc, &sc->sc_keepalive_work,

		      msecs_to_jiffies(o2net_keepalive_delay(sc->sc_node)));

		      msecs_to_jiffies(o2net_keepalive_delay()));

	do_gettimeofday(&sc->sc_tv_timer);

	do_gettimeofday(&sc->sc_tv_timer);

	mod_timer(&sc->sc_idle_timeout,

	mod_timer(&sc->sc_idle_timeout,

	       jiffies + msecs_to_jiffies(o2net_idle_timeout(sc->sc_node)));

	       jiffies + msecs_to_jiffies(o2net_idle_timeout()));

}

}





static void o2net_sc_postpone_idle(struct o2net_sock_container *sc)

static void o2net_sc_postpone_idle(struct o2net_sock_container *sc)
@@ -1578,8 +1571,8 @@ static void o2net_connect_expired(struct work_struct *work) 
		mlog(ML_ERROR, "no connection established with node %u after "

		mlog(ML_ERROR, "no connection established with node %u after "

		     "%u.%u seconds, giving up and returning errors.\n",

		     "%u.%u seconds, giving up and returning errors.\n",

		     o2net_num_from_nn(nn),

		     o2net_num_from_nn(nn),

		     o2net_idle_timeout(NULL) / 1000,

		     o2net_idle_timeout() / 1000,

		     o2net_idle_timeout(NULL) % 1000);

		     o2net_idle_timeout() % 1000);





		o2net_set_nn_state(nn, NULL, 0, -ENOTCONN);

		o2net_set_nn_state(nn, NULL, 0, -ENOTCONN);

	}

	}
@@ -1634,7 +1627,7 @@ static void o2net_hb_node_up_cb(struct o2nm_node *node, int node_num, 




	/* ensure an immediate connect attempt */

	/* ensure an immediate connect attempt */

	nn->nn_last_connect_attempt = jiffies -

	nn->nn_last_connect_attempt = jiffies -

		(msecs_to_jiffies(o2net_reconnect_delay(node)) + 1);

		(msecs_to_jiffies(o2net_reconnect_delay()) + 1);





	if (node_num != o2nm_this_node()) {

	if (node_num != o2nm_this_node()) {

		/* believe it or not, accept and node hearbeating testing

		/* believe it or not, accept and node hearbeating testing