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

Commit a2a32584 authored by Guanjun He's avatar Guanjun He Committed by Sage Weil
Browse files

libceph: prevent the race of incoming work during teardown 



Add an atomic variable 'stopping' as flag in struct ceph_messenger,
set this flag to 1 in function ceph_destroy_client(), and add the condition code
in function ceph_data_ready() to test the flag value, if true(1), just return.

Signed-off-by: default avatarGuanjun He <gjhe@suse.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent a16cb1f7

include/linux/ceph/messenger.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct ceph_messenger { 
	struct ceph_entity_inst inst;    /* my name+address */

	struct ceph_entity_addr my_enc_addr;



	atomic_t stopping;

	bool nocrc;



	/*

net/ceph/ceph_common.c

+2 −0
Original line number Diff line number Diff line
@@ -495,6 +495,8 @@ void ceph_destroy_client(struct ceph_client *client) 
{

	dout("destroy_client %p\n", client);



	atomic_set(&client->msgr.stopping, 1);



	/* unmount */

	ceph_osdc_stop(&client->osdc);

net/ceph/messenger.c

+5 −0
Original line number Diff line number Diff line
@@ -254,6 +254,9 @@ static void con_sock_state_closed(struct ceph_connection *con) 
static void ceph_sock_data_ready(struct sock *sk, int count_unused)

{

	struct ceph_connection *con = sk->sk_user_data;

	if (atomic_read(&con->msgr->stopping)) {

		return;

	}



	if (sk->sk_state != TCP_CLOSE_WAIT) {

		dout("%s on %p state = %lu, queueing work\n", __func__,
@@ -2413,6 +2416,8 @@ void ceph_messenger_init(struct ceph_messenger *msgr, 
	encode_my_addr(msgr);

	msgr->nocrc = nocrc;



	atomic_set(&msgr->stopping, 0);



	dout("%s %p\n", __func__, msgr);

}

EXPORT_SYMBOL(ceph_messenger_init);