diff options
author | David Howells <dhowells@redhat.com> | 2018-05-10 18:26:01 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2018-05-10 18:26:01 -0400 |
commit | 6b47fe1d1ca3aec3a1a8623439c22fbf51016cd8 (patch) | |
tree | 1947f6871f93fe343bea644289b4243519c3ef6f /net/rxrpc/output.c | |
parent | 494337c918403db5743af0348d963cafb9b20cee (diff) |
rxrpc: Trace UDP transmission failure
Add a tracepoint to log transmission failure from the UDP transport socket
being used by AF_RXRPC.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/output.c')
-rw-r--r-- | net/rxrpc/output.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c index 6b9d27f0d7ec..f03de1c59ba3 100644 --- a/net/rxrpc/output.c +++ b/net/rxrpc/output.c | |||
@@ -210,6 +210,9 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, bool ping, | |||
210 | if (ping) | 210 | if (ping) |
211 | call->ping_time = now; | 211 | call->ping_time = now; |
212 | conn->params.peer->last_tx_at = ktime_get_real(); | 212 | conn->params.peer->last_tx_at = ktime_get_real(); |
213 | if (ret < 0) | ||
214 | trace_rxrpc_tx_fail(call->debug_id, serial, ret, | ||
215 | rxrpc_tx_fail_call_ack); | ||
213 | 216 | ||
214 | if (call->state < RXRPC_CALL_COMPLETE) { | 217 | if (call->state < RXRPC_CALL_COMPLETE) { |
215 | if (ret < 0) { | 218 | if (ret < 0) { |
@@ -294,6 +297,10 @@ int rxrpc_send_abort_packet(struct rxrpc_call *call) | |||
294 | ret = kernel_sendmsg(conn->params.local->socket, | 297 | ret = kernel_sendmsg(conn->params.local->socket, |
295 | &msg, iov, 1, sizeof(pkt)); | 298 | &msg, iov, 1, sizeof(pkt)); |
296 | conn->params.peer->last_tx_at = ktime_get_real(); | 299 | conn->params.peer->last_tx_at = ktime_get_real(); |
300 | if (ret < 0) | ||
301 | trace_rxrpc_tx_fail(call->debug_id, serial, ret, | ||
302 | rxrpc_tx_fail_call_abort); | ||
303 | |||
297 | 304 | ||
298 | rxrpc_put_connection(conn); | 305 | rxrpc_put_connection(conn); |
299 | return ret; | 306 | return ret; |
@@ -387,6 +394,9 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb, | |||
387 | conn->params.peer->last_tx_at = ktime_get_real(); | 394 | conn->params.peer->last_tx_at = ktime_get_real(); |
388 | 395 | ||
389 | up_read(&conn->params.local->defrag_sem); | 396 | up_read(&conn->params.local->defrag_sem); |
397 | if (ret < 0) | ||
398 | trace_rxrpc_tx_fail(call->debug_id, serial, ret, | ||
399 | rxrpc_tx_fail_call_data_nofrag); | ||
390 | if (ret == -EMSGSIZE) | 400 | if (ret == -EMSGSIZE) |
391 | goto send_fragmentable; | 401 | goto send_fragmentable; |
392 | 402 | ||
@@ -476,6 +486,10 @@ send_fragmentable: | |||
476 | #endif | 486 | #endif |
477 | } | 487 | } |
478 | 488 | ||
489 | if (ret < 0) | ||
490 | trace_rxrpc_tx_fail(call->debug_id, serial, ret, | ||
491 | rxrpc_tx_fail_call_data_frag); | ||
492 | |||
479 | up_write(&conn->params.local->defrag_sem); | 493 | up_write(&conn->params.local->defrag_sem); |
480 | goto done; | 494 | goto done; |
481 | } | 495 | } |
@@ -493,6 +507,7 @@ void rxrpc_reject_packets(struct rxrpc_local *local) | |||
493 | struct kvec iov[2]; | 507 | struct kvec iov[2]; |
494 | size_t size; | 508 | size_t size; |
495 | __be32 code; | 509 | __be32 code; |
510 | int ret; | ||
496 | 511 | ||
497 | _enter("%d", local->debug_id); | 512 | _enter("%d", local->debug_id); |
498 | 513 | ||
@@ -527,7 +542,10 @@ void rxrpc_reject_packets(struct rxrpc_local *local) | |||
527 | whdr.flags ^= RXRPC_CLIENT_INITIATED; | 542 | whdr.flags ^= RXRPC_CLIENT_INITIATED; |
528 | whdr.flags &= RXRPC_CLIENT_INITIATED; | 543 | whdr.flags &= RXRPC_CLIENT_INITIATED; |
529 | 544 | ||
530 | kernel_sendmsg(local->socket, &msg, iov, 2, size); | 545 | ret = kernel_sendmsg(local->socket, &msg, iov, 2, size); |
546 | if (ret < 0) | ||
547 | trace_rxrpc_tx_fail(local->debug_id, 0, ret, | ||
548 | rxrpc_tx_fail_reject); | ||
531 | } | 549 | } |
532 | 550 | ||
533 | rxrpc_free_skb(skb, rxrpc_skb_rx_freed); | 551 | rxrpc_free_skb(skb, rxrpc_skb_rx_freed); |
@@ -578,7 +596,8 @@ void rxrpc_send_keepalive(struct rxrpc_peer *peer) | |||
578 | 596 | ||
579 | ret = kernel_sendmsg(peer->local->socket, &msg, iov, 2, len); | 597 | ret = kernel_sendmsg(peer->local->socket, &msg, iov, 2, len); |
580 | if (ret < 0) | 598 | if (ret < 0) |
581 | _debug("sendmsg failed: %d", ret); | 599 | trace_rxrpc_tx_fail(peer->debug_id, 0, ret, |
600 | rxrpc_tx_fail_version_keepalive); | ||
582 | 601 | ||
583 | peer->last_tx_at = ktime_get_real(); | 602 | peer->last_tx_at = ktime_get_real(); |
584 | _leave(""); | 603 | _leave(""); |