Commit dfe99522 authored by David Howells's avatar David Howells

rxrpc: Carry call state out of locked section in rxrpc_rotate_tx_window()

Carry the call state out of the locked section in rxrpc_rotate_tx_window()
rather than sampling it afterwards.  This is only used to select tracepoint
data, but could have changed by the time we do the tracepoint.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent c479d5f2
...@@ -278,23 +278,26 @@ static bool rxrpc_rotate_tx_window(struct rxrpc_call *call, rxrpc_seq_t to, ...@@ -278,23 +278,26 @@ static bool rxrpc_rotate_tx_window(struct rxrpc_call *call, rxrpc_seq_t to,
static bool rxrpc_end_tx_phase(struct rxrpc_call *call, bool reply_begun, static bool rxrpc_end_tx_phase(struct rxrpc_call *call, bool reply_begun,
const char *abort_why) const char *abort_why)
{ {
unsigned int state;
ASSERT(test_bit(RXRPC_CALL_TX_LAST, &call->flags)); ASSERT(test_bit(RXRPC_CALL_TX_LAST, &call->flags));
write_lock(&call->state_lock); write_lock(&call->state_lock);
switch (call->state) { state = call->state;
switch (state) {
case RXRPC_CALL_CLIENT_SEND_REQUEST: case RXRPC_CALL_CLIENT_SEND_REQUEST:
case RXRPC_CALL_CLIENT_AWAIT_REPLY: case RXRPC_CALL_CLIENT_AWAIT_REPLY:
if (reply_begun) if (reply_begun)
call->state = RXRPC_CALL_CLIENT_RECV_REPLY; call->state = state = RXRPC_CALL_CLIENT_RECV_REPLY;
else else
call->state = RXRPC_CALL_CLIENT_AWAIT_REPLY; call->state = state = RXRPC_CALL_CLIENT_AWAIT_REPLY;
break; break;
case RXRPC_CALL_SERVER_AWAIT_ACK: case RXRPC_CALL_SERVER_AWAIT_ACK:
__rxrpc_call_completed(call); __rxrpc_call_completed(call);
rxrpc_notify_socket(call); rxrpc_notify_socket(call);
state = call->state;
break; break;
default: default:
...@@ -302,11 +305,10 @@ static bool rxrpc_end_tx_phase(struct rxrpc_call *call, bool reply_begun, ...@@ -302,11 +305,10 @@ static bool rxrpc_end_tx_phase(struct rxrpc_call *call, bool reply_begun,
} }
write_unlock(&call->state_lock); write_unlock(&call->state_lock);
if (call->state == RXRPC_CALL_CLIENT_AWAIT_REPLY) { if (state == RXRPC_CALL_CLIENT_AWAIT_REPLY)
trace_rxrpc_transmit(call, rxrpc_transmit_await_reply); trace_rxrpc_transmit(call, rxrpc_transmit_await_reply);
} else { else
trace_rxrpc_transmit(call, rxrpc_transmit_end); trace_rxrpc_transmit(call, rxrpc_transmit_end);
}
_leave(" = ok"); _leave(" = ok");
return true; return true;
......
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