diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-03-07 22:11:11 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-09 21:36:15 (GMT) |
| commit | 29152a34f72cb4d7ab32885ad2f20a482c92a8f3 (patch) | |
| tree | 89287b971525eab8a238437e3e12959074f9fa63 /net/kcm/kcmproc.c | |
| parent | 7ced95ef525c329f947c424859cf2b0a3b731f8c (diff) | |
| download | linux-29152a34f72cb4d7ab32885ad2f20a482c92a8f3.tar.xz | |
kcm: Add receive message timeout
This patch adds receive timeout for message assembly on the attached TCP
sockets. The timeout is set when a new messages is started and the whole
message has not been received by TCP (not in the receive queue). If the
completely message is subsequently received the timer is cancelled, if the
timer expires the RX side is aborted.
The timeout value is taken from the socket timeout (SO_RCVTIMEO) that is
set on a TCP socket (i.e. set by get sockopt before attaching a TCP socket
to KCM.
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/kcm/kcmproc.c')
| -rw-r--r-- | net/kcm/kcmproc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/kcm/kcmproc.c b/net/kcm/kcmproc.c index 7638b35..7380087 100644 --- a/net/kcm/kcmproc.c +++ b/net/kcm/kcmproc.c @@ -331,7 +331,7 @@ static int kcm_stats_seq_show(struct seq_file *seq, void *v) mux_stats.rx_ready_drops); seq_printf(seq, - "%-8s %-10s %-16s %-10s %-16s %-10s %-10s %-10s %-10s %-10s %-10s %-10s %-10s\n", + "%-8s %-10s %-16s %-10s %-16s %-10s %-10s %-10s %-10s %-10s %-10s %-10s %-10s %-10s\n", "Psock", "RX-Msgs", "RX-Bytes", @@ -344,10 +344,11 @@ static int kcm_stats_seq_show(struct seq_file *seq, void *v) "RX-NeedMor", "RX-BadLen", "RX-TooBig", + "RX-Timeout", "TX-Aborts"); seq_printf(seq, - "%-8s %-10llu %-16llu %-10llu %-16llu %-10llu %-10llu %-10u %-10u %-10u %-10u %-10u %-10u\n", + "%-8s %-10llu %-16llu %-10llu %-16llu %-10llu %-10llu %-10u %-10u %-10u %-10u %-10u %-10u %-10u\n", "", psock_stats.rx_msgs, psock_stats.rx_bytes, @@ -360,6 +361,7 @@ static int kcm_stats_seq_show(struct seq_file *seq, void *v) psock_stats.rx_need_more_hdr, psock_stats.rx_bad_hdr_len, psock_stats.rx_msg_too_big, + psock_stats.rx_msg_timeouts, psock_stats.tx_aborts); return 0; |