From: David S. Miller <davem@davemloft.net>
Date: Thu, 9 Aug 2018 18:52:36 +0000 (-0700)
Subject: Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a736e074680745faa5dc6be8dd3c58ad4850aab9;p=linux.git

Merge ra./pub/scm/linux/kernel/git/davem/net

Overlapping changes in RXRPC, changing to ktime_get_seconds() whilst
adding some tracepoints.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

a736e074680745faa5dc6be8dd3c58ad4850aab9
diff --cc net/rxrpc/conn_event.c
index 84d40ba9856f4,3fde001fcc392..6df56ce688616
--- a/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
@@@ -138,13 -136,10 +138,13 @@@ static void rxrpc_conn_retransmit_call(
  	}
  
  	ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, ioc, len);
- 	conn->params.peer->last_tx_at = ktime_get_real();
+ 	conn->params.peer->last_tx_at = ktime_get_seconds();
  	if (ret < 0)
 -		trace_rxrpc_tx_fail(conn->debug_id, serial, ret,
 -				    rxrpc_tx_fail_call_final_resend);
 +		trace_rxrpc_tx_fail(chan->call_debug_id, serial, ret,
 +				    rxrpc_tx_point_call_final_resend);
 +	else
 +		trace_rxrpc_tx_packet(chan->call_debug_id, &pkt.whdr,
 +				      rxrpc_tx_point_call_final_resend);
  
  	_leave("");
  }
@@@ -250,9 -245,7 +250,9 @@@ static int rxrpc_abort_connection(struc
  		return -EAGAIN;
  	}
  
 +	trace_rxrpc_tx_packet(conn->debug_id, &whdr, rxrpc_tx_point_conn_abort);
 +
- 	conn->params.peer->last_tx_at = ktime_get_real();
+ 	conn->params.peer->last_tx_at = ktime_get_seconds();
  
  	_leave(" = 0");
  	return 0;
diff --cc net/rxrpc/output.c
index 801dbf3d34789,4774c8f5634d9..ccf5de160444f
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@@ -209,13 -209,10 +209,13 @@@ int rxrpc_send_ack_packet(struct rxrpc_
  	now = ktime_get_real();
  	if (ping)
  		call->ping_time = now;
- 	conn->params.peer->last_tx_at = ktime_get_real();
+ 	conn->params.peer->last_tx_at = ktime_get_seconds();
  	if (ret < 0)
  		trace_rxrpc_tx_fail(call->debug_id, serial, ret,
 -				    rxrpc_tx_fail_call_ack);
 +				    rxrpc_tx_point_call_ack);
 +	else
 +		trace_rxrpc_tx_packet(call->debug_id, &pkt->whdr,
 +				      rxrpc_tx_point_call_ack);
  
  	if (call->state < RXRPC_CALL_COMPLETE) {
  		if (ret < 0) {
@@@ -299,13 -296,10 +299,13 @@@ int rxrpc_send_abort_packet(struct rxrp
  
  	ret = kernel_sendmsg(conn->params.local->socket,
  			     &msg, iov, 1, sizeof(pkt));
- 	conn->params.peer->last_tx_at = ktime_get_real();
+ 	conn->params.peer->last_tx_at = ktime_get_seconds();
  	if (ret < 0)
  		trace_rxrpc_tx_fail(call->debug_id, serial, ret,
 -				    rxrpc_tx_fail_call_abort);
 +				    rxrpc_tx_point_call_abort);
 +	else
 +		trace_rxrpc_tx_packet(call->debug_id, &pkt.whdr,
 +				      rxrpc_tx_point_call_abort);
  
  
  	rxrpc_put_connection(conn);
@@@ -612,11 -597,8 +612,11 @@@ void rxrpc_send_keepalive(struct rxrpc_
  	ret = kernel_sendmsg(peer->local->socket, &msg, iov, 2, len);
  	if (ret < 0)
  		trace_rxrpc_tx_fail(peer->debug_id, 0, ret,
 -				    rxrpc_tx_fail_version_keepalive);
 +				    rxrpc_tx_point_version_keepalive);
 +	else
 +		trace_rxrpc_tx_packet(peer->debug_id, &whdr,
 +				      rxrpc_tx_point_version_keepalive);
  
- 	peer->last_tx_at = ktime_get_real();
+ 	peer->last_tx_at = ktime_get_seconds();
  	_leave("");
  }
diff --cc net/rxrpc/rxkad.c
index eaf8f4f446b02,47cb019c521a8..cea16838d5885
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@@ -670,9 -669,7 +670,9 @@@ static int rxkad_issue_challenge(struc
  		return -EAGAIN;
  	}
  
- 	conn->params.peer->last_tx_at = ktime_get_real();
+ 	conn->params.peer->last_tx_at = ktime_get_seconds();
 +	trace_rxrpc_tx_packet(conn->debug_id, &whdr,
 +			      rxrpc_tx_point_rxkad_challenge);
  	_leave(" = 0");
  	return 0;
  }