Commit 4a861692 authored by Sage Weil's avatar Sage Weil
Browse files

libceph: clean up con flags



Rename flags with CON_FLAG prefix, move the definitions into the c file,
and (better) document their meaning.
Signed-off-by: default avatarSage Weil <sage@inktank.com>
parent 8dacc7da
...@@ -106,16 +106,6 @@ struct ceph_msg_pos { ...@@ -106,16 +106,6 @@ struct ceph_msg_pos {
#define BASE_DELAY_INTERVAL (HZ/2) #define BASE_DELAY_INTERVAL (HZ/2)
#define MAX_DELAY_INTERVAL (5 * 60 * HZ) #define MAX_DELAY_INTERVAL (5 * 60 * HZ)
/*
* ceph_connection flag bits
*/
#define LOSSYTX 0 /* we can close channel or drop messages on errors */
#define KEEPALIVE_PENDING 3
#define WRITE_PENDING 4 /* we have data ready to send */
#define SOCK_CLOSED 11 /* socket state changed to closed */
#define BACKOFF 15
/* /*
* A single connection with another host. * A single connection with another host.
* *
......
...@@ -87,6 +87,15 @@ ...@@ -87,6 +87,15 @@
#define CON_STATE_OPEN 5 /* -> STANDBY, CLOSED */ #define CON_STATE_OPEN 5 /* -> STANDBY, CLOSED */
#define CON_STATE_STANDBY 6 /* -> PREOPEN, CLOSED */ #define CON_STATE_STANDBY 6 /* -> PREOPEN, CLOSED */
/*
* ceph_connection flag bits
*/
#define CON_FLAG_LOSSYTX 0 /* we can close channel or drop
* messages on errors */
#define CON_FLAG_KEEPALIVE_PENDING 1 /* we need to send a keepalive */
#define CON_FLAG_WRITE_PENDING 2 /* we have data ready to send */
#define CON_FLAG_SOCK_CLOSED 3 /* socket state changed to closed */
#define CON_FLAG_BACKOFF 4 /* need to retry queuing delayed work */
/* static tag bytes (protocol control messages) */ /* static tag bytes (protocol control messages) */
static char tag_msg = CEPH_MSGR_TAG_MSG; static char tag_msg = CEPH_MSGR_TAG_MSG;
...@@ -288,7 +297,7 @@ static void ceph_sock_write_space(struct sock *sk) ...@@ -288,7 +297,7 @@ static void ceph_sock_write_space(struct sock *sk)
* buffer. See net/ipv4/tcp_input.c:tcp_check_space() * buffer. See net/ipv4/tcp_input.c:tcp_check_space()
* and net/core/stream.c:sk_stream_write_space(). * and net/core/stream.c:sk_stream_write_space().
*/ */
if (test_bit(WRITE_PENDING, &con->flags)) { if (test_bit(CON_FLAG_WRITE_PENDING, &con->flags)) {
if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk)) { if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk)) {
dout("%s %p queueing write work\n", __func__, con); dout("%s %p queueing write work\n", __func__, con);
clear_bit(SOCK_NOSPACE, &sk->sk_socket->flags); clear_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
...@@ -313,7 +322,7 @@ static void ceph_sock_state_change(struct sock *sk) ...@@ -313,7 +322,7 @@ static void ceph_sock_state_change(struct sock *sk)
case TCP_CLOSE_WAIT: case TCP_CLOSE_WAIT:
dout("%s TCP_CLOSE_WAIT\n", __func__); dout("%s TCP_CLOSE_WAIT\n", __func__);
con_sock_state_closing(con); con_sock_state_closing(con);
set_bit(SOCK_CLOSED, &con->flags); set_bit(CON_FLAG_SOCK_CLOSED, &con->flags);
queue_con(con); queue_con(con);
break; break;
case TCP_ESTABLISHED: case TCP_ESTABLISHED:
...@@ -449,12 +458,12 @@ static int con_close_socket(struct ceph_connection *con) ...@@ -449,12 +458,12 @@ static int con_close_socket(struct ceph_connection *con)
con->sock = NULL; con->sock = NULL;
/* /*
* Forcibly clear the SOCK_CLOSE flag. It gets set * Forcibly clear the SOCK_CLOSED flag. It gets set
* independent of the connection mutex, and we could have * independent of the connection mutex, and we could have
* received a socket close event before we had the chance to * received a socket close event before we had the chance to
* shut the socket down. * shut the socket down.
*/ */
clear_bit(SOCK_CLOSED, &con->flags); clear_bit(CON_FLAG_SOCK_CLOSED, &con->flags);
con_sock_state_closed(con); con_sock_state_closed(con);
return rc; return rc;
} }
...@@ -516,9 +525,9 @@ void ceph_con_close(struct ceph_connection *con) ...@@ -516,9 +525,9 @@ void ceph_con_close(struct ceph_connection *con)
ceph_pr_addr(&con->peer_addr.in_addr)); ceph_pr_addr(&con->peer_addr.in_addr));
con->state = CON_STATE_CLOSED; con->state = CON_STATE_CLOSED;
clear_bit(LOSSYTX, &con->flags); /* so we retry next connect */ clear_bit(CON_FLAG_LOSSYTX, &con->flags); /* so we retry next connect */
clear_bit(KEEPALIVE_PENDING, &con->flags); clear_bit(CON_FLAG_KEEPALIVE_PENDING, &con->flags);
clear_bit(WRITE_PENDING, &con->flags); clear_bit(CON_FLAG_WRITE_PENDING, &con->flags);
reset_connection(con); reset_connection(con);
con->peer_global_seq = 0; con->peer_global_seq = 0;
...@@ -770,7 +779,7 @@ static void prepare_write_message(struct ceph_connection *con) ...@@ -770,7 +779,7 @@ static void prepare_write_message(struct ceph_connection *con)
/* no, queue up footer too and be done */ /* no, queue up footer too and be done */
prepare_write_message_footer(con); prepare_write_message_footer(con);
set_bit(WRITE_PENDING, &con->flags); set_bit(CON_FLAG_WRITE_PENDING, &con->flags);
} }
/* /*
...@@ -791,7 +800,7 @@ static void prepare_write_ack(struct ceph_connection *con) ...@@ -791,7 +800,7 @@ static void prepare_write_ack(struct ceph_connection *con)
&con->out_temp_ack); &con->out_temp_ack);
con->out_more = 1; /* more will follow.. eventually.. */ con->out_more = 1; /* more will follow.. eventually.. */
set_bit(WRITE_PENDING, &con->flags); set_bit(CON_FLAG_WRITE_PENDING, &con->flags);
} }
/* /*
...@@ -802,7 +811,7 @@ static void prepare_write_keepalive(struct ceph_connection *con) ...@@ -802,7 +811,7 @@ static void prepare_write_keepalive(struct ceph_connection *con)
dout("prepare_write_keepalive %p\n", con); dout("prepare_write_keepalive %p\n", con);
con_out_kvec_reset(con); con_out_kvec_reset(con);
con_out_kvec_add(con, sizeof (tag_keepalive), &tag_keepalive); con_out_kvec_add(con, sizeof (tag_keepalive), &tag_keepalive);
set_bit(WRITE_PENDING, &con->flags); set_bit(CON_FLAG_WRITE_PENDING, &con->flags);
} }
/* /*
...@@ -845,7 +854,7 @@ static void prepare_write_banner(struct ceph_connection *con) ...@@ -845,7 +854,7 @@ static void prepare_write_banner(struct ceph_connection *con)
&con->msgr->my_enc_addr); &con->msgr->my_enc_addr);
con->out_more = 0; con->out_more = 0;
set_bit(WRITE_PENDING, &con->flags); set_bit(CON_FLAG_WRITE_PENDING, &con->flags);
} }
static int prepare_write_connect(struct ceph_connection *con) static int prepare_write_connect(struct ceph_connection *con)
...@@ -896,7 +905,7 @@ static int prepare_write_connect(struct ceph_connection *con) ...@@ -896,7 +905,7 @@ static int prepare_write_connect(struct ceph_connection *con)
auth->authorizer_buf); auth->authorizer_buf);
con->out_more = 0; con->out_more = 0;
set_bit(WRITE_PENDING, &con->flags); set_bit(CON_FLAG_WRITE_PENDING, &con->flags);
return 0; return 0;
} }
...@@ -1622,7 +1631,7 @@ static int process_connect(struct ceph_connection *con) ...@@ -1622,7 +1631,7 @@ static int process_connect(struct ceph_connection *con)
le32_to_cpu(con->in_reply.connect_seq)); le32_to_cpu(con->in_reply.connect_seq));
if (con->in_reply.flags & CEPH_MSG_CONNECT_LOSSY) if (con->in_reply.flags & CEPH_MSG_CONNECT_LOSSY)
set_bit(LOSSYTX, &con->flags); set_bit(CON_FLAG_LOSSYTX, &con->flags);
con->delay = 0; /* reset backoff memory */ con->delay = 0; /* reset backoff memory */
...@@ -2061,14 +2070,15 @@ do_next: ...@@ -2061,14 +2070,15 @@ do_next:
prepare_write_ack(con); prepare_write_ack(con);
goto more; goto more;
} }
if (test_and_clear_bit(KEEPALIVE_PENDING, &con->flags)) { if (test_and_clear_bit(CON_FLAG_KEEPALIVE_PENDING,
&con->flags)) {
prepare_write_keepalive(con); prepare_write_keepalive(con);
goto more; goto more;
} }
} }
/* Nothing to do! */ /* Nothing to do! */
clear_bit(WRITE_PENDING, &con->flags); clear_bit(CON_FLAG_WRITE_PENDING, &con->flags);
dout("try_write nothing else to write.\n"); dout("try_write nothing else to write.\n");
ret = 0; ret = 0;
out: out:
...@@ -2241,7 +2251,7 @@ static void con_work(struct work_struct *work) ...@@ -2241,7 +2251,7 @@ static void con_work(struct work_struct *work)
mutex_lock(&con->mutex); mutex_lock(&con->mutex);
restart: restart:
if (test_and_clear_bit(SOCK_CLOSED, &con->flags)) { if (test_and_clear_bit(CON_FLAG_SOCK_CLOSED, &con->flags)) {
switch (con->state) { switch (con->state) {
case CON_STATE_CONNECTING: case CON_STATE_CONNECTING:
con->error_msg = "connection failed"; con->error_msg = "connection failed";
...@@ -2260,7 +2270,7 @@ restart: ...@@ -2260,7 +2270,7 @@ restart:
goto fault; goto fault;
} }
if (test_and_clear_bit(BACKOFF, &con->flags)) { if (test_and_clear_bit(CON_FLAG_BACKOFF, &con->flags)) {
dout("con_work %p backing off\n", con); dout("con_work %p backing off\n", con);
if (queue_delayed_work(ceph_msgr_wq, &con->work, if (queue_delayed_work(ceph_msgr_wq, &con->work,
round_jiffies_relative(con->delay))) { round_jiffies_relative(con->delay))) {
...@@ -2336,7 +2346,7 @@ static void ceph_fault(struct ceph_connection *con) ...@@ -2336,7 +2346,7 @@ static void ceph_fault(struct ceph_connection *con)
con_close_socket(con); con_close_socket(con);
if (test_bit(LOSSYTX, &con->flags)) { if (test_bit(CON_FLAG_LOSSYTX, &con->flags)) {
dout("fault on LOSSYTX channel, marking CLOSED\n"); dout("fault on LOSSYTX channel, marking CLOSED\n");
con->state = CON_STATE_CLOSED; con->state = CON_STATE_CLOSED;
goto out_unlock; goto out_unlock;
...@@ -2356,9 +2366,9 @@ static void ceph_fault(struct ceph_connection *con) ...@@ -2356,9 +2366,9 @@ static void ceph_fault(struct ceph_connection *con)
/* If there are no messages queued or keepalive pending, place /* If there are no messages queued or keepalive pending, place
* the connection in a STANDBY state */ * the connection in a STANDBY state */
if (list_empty(&con->out_queue) && if (list_empty(&con->out_queue) &&
!test_bit(KEEPALIVE_PENDING, &con->flags)) { !test_bit(CON_FLAG_KEEPALIVE_PENDING, &con->flags)) {
dout("fault %p setting STANDBY clearing WRITE_PENDING\n", con); dout("fault %p setting STANDBY clearing WRITE_PENDING\n", con);
clear_bit(WRITE_PENDING, &con->flags); clear_bit(CON_FLAG_WRITE_PENDING, &con->flags);
con->state = CON_STATE_STANDBY; con->state = CON_STATE_STANDBY;
} else { } else {
/* retry after a delay. */ /* retry after a delay. */
...@@ -2383,7 +2393,7 @@ static void ceph_fault(struct ceph_connection *con) ...@@ -2383,7 +2393,7 @@ static void ceph_fault(struct ceph_connection *con)
* that when con_work restarts we schedule the * that when con_work restarts we schedule the
* delay then. * delay then.
*/ */
set_bit(BACKOFF, &con->flags); set_bit(CON_FLAG_BACKOFF, &con->flags);
} }
} }
...@@ -2440,8 +2450,8 @@ static void clear_standby(struct ceph_connection *con) ...@@ -2440,8 +2450,8 @@ static void clear_standby(struct ceph_connection *con)
dout("clear_standby %p and ++connect_seq\n", con); dout("clear_standby %p and ++connect_seq\n", con);
con->state = CON_STATE_PREOPEN; con->state = CON_STATE_PREOPEN;
con->connect_seq++; con->connect_seq++;
WARN_ON(test_bit(WRITE_PENDING, &con->flags)); WARN_ON(test_bit(CON_FLAG_WRITE_PENDING, &con->flags));
WARN_ON(test_bit(KEEPALIVE_PENDING, &con->flags)); WARN_ON(test_bit(CON_FLAG_KEEPALIVE_PENDING, &con->flags));
} }
} }
...@@ -2482,7 +2492,7 @@ void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg) ...@@ -2482,7 +2492,7 @@ void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg)
/* if there wasn't anything waiting to send before, queue /* if there wasn't anything waiting to send before, queue
* new work */ * new work */
if (test_and_set_bit(WRITE_PENDING, &con->flags) == 0) if (test_and_set_bit(CON_FLAG_WRITE_PENDING, &con->flags) == 0)
queue_con(con); queue_con(con);
} }
EXPORT_SYMBOL(ceph_con_send); EXPORT_SYMBOL(ceph_con_send);
...@@ -2571,8 +2581,8 @@ void ceph_con_keepalive(struct ceph_connection *con) ...@@ -2571,8 +2581,8 @@ void ceph_con_keepalive(struct ceph_connection *con)
mutex_lock(&con->mutex); mutex_lock(&con->mutex);
clear_standby(con); clear_standby(con);
mutex_unlock(&con->mutex); mutex_unlock(&con->mutex);
if (test_and_set_bit(KEEPALIVE_PENDING, &con->flags) == 0 && if (test_and_set_bit(CON_FLAG_KEEPALIVE_PENDING, &con->flags) == 0 &&
test_and_set_bit(WRITE_PENDING, &con->flags) == 0) test_and_set_bit(CON_FLAG_WRITE_PENDING, &con->flags) == 0)
queue_con(con); queue_con(con);
} }
EXPORT_SYMBOL(ceph_con_keepalive); EXPORT_SYMBOL(ceph_con_keepalive);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment