diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-08-23 20:55:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-24 01:23:12 +0200 |
| commit | 1616b38f201945f5fc88aa09b525e3625777aa7c (patch) | |
| tree | 0d5f890a7b0d21fa7c4d7580a70e0bfcae2c0738 /net/kcm/kcmproc.c | |
| parent | strparser: Queue work when being unpaused (diff) | |
| download | linux-1616b38f201945f5fc88aa09b525e3625777aa7c.tar.xz linux-1616b38f201945f5fc88aa09b525e3625777aa7c.zip | |
kcm: Fix locking issue
Lock the lower socket in kcm_unattach. Release during call to strp_done
since that function cancels the RX timers and work queue with sync.
Also added some status information in psock reporting.
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 | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/net/kcm/kcmproc.c b/net/kcm/kcmproc.c index 47e445364f4f..bf75c9231cca 100644 --- a/net/kcm/kcmproc.c +++ b/net/kcm/kcmproc.c @@ -173,14 +173,24 @@ static void kcm_format_psock(struct kcm_psock *psock, struct seq_file *seq, if (psock->strp.rx_stopped) seq_puts(seq, "RxStop "); - if (psock->strp.rx_paused) - seq_puts(seq, "RxPause "); - if (psock->tx_kcm) seq_printf(seq, "Rsvd-%d ", psock->tx_kcm->index); - if (psock->ready_rx_msg) - seq_puts(seq, "RdyRx "); + if (!psock->strp.rx_paused && !psock->ready_rx_msg) { + if (psock->sk->sk_receive_queue.qlen) { + if (psock->strp.rx_need_bytes) + seq_printf(seq, "RxWait=%u ", + psock->strp.rx_need_bytes); + else + seq_printf(seq, "RxWait "); + } + } else { + if (psock->strp.rx_paused) + seq_puts(seq, "RxPause "); + + if (psock->ready_rx_msg) + seq_puts(seq, "RdyRx "); + } seq_puts(seq, "\n"); } |