strparser: Generalize strparser

Generalize strparser from more than just being used in conjunction
with read_sock. strparser will also be used in the send path with
zero proxy. The primary change is to create strp_process function
that performs the critical processing on skbs. The documentation
is also updated to reflect the new uses.

Signed-off-by: Tom Herbert <tom@quantonium.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 17 insertions, 17 deletions

diff --git a/net/kcm/kcmproc.c b/net/kcm/kcmproc.c
index c343ac60bf50..c748e8a6a72c 100644
--- a/net/kcm/kcmproc.c
+++ b/net/kcm/kcmproc.c
@@ -155,8 +155,8 @@ static void kcm_format_psock(struct kcm_psock *psock, struct seq_file *seq,
         seq_printf(seq,
                    "   psock-%-5u %-10llu %-16llu %-10llu %-16llu %-8d %-8d %-8d %-8d ",
                    psock->index,
-                   psock->strp.stats.rx_msgs,
-                   psock->strp.stats.rx_bytes,
+                   psock->strp.stats.msgs,
+                   psock->strp.stats.bytes,
                    psock->stats.tx_msgs,
                    psock->stats.tx_bytes,
                    psock->sk->sk_receive_queue.qlen,
@@ -170,22 +170,22 @@ static void kcm_format_psock(struct kcm_psock *psock, struct seq_file *seq,
         if (psock->tx_stopped)
                 seq_puts(seq, "TxStop ");
 
-        if (psock->strp.rx_stopped)
+        if (psock->strp.stopped)
                 seq_puts(seq, "RxStop ");
 
         if (psock->tx_kcm)
                 seq_printf(seq, "Rsvd-%d ", psock->tx_kcm->index);
 
-        if (!psock->strp.rx_paused && !psock->ready_rx_msg) {
+        if (!psock->strp.paused && !psock->ready_rx_msg) {
                 if (psock->sk->sk_receive_queue.qlen) {
-                        if (psock->strp.rx_need_bytes)
+                        if (psock->strp.need_bytes)
                                 seq_printf(seq, "RxWait=%u ",
-                                           psock->strp.rx_need_bytes);
+                                           psock->strp.need_bytes);
                         else
                                 seq_printf(seq, "RxWait ");
                 }
         } else  {
-                if (psock->strp.rx_paused)
+                if (psock->strp.paused)
                         seq_puts(seq, "RxPause ");
 
                 if (psock->ready_rx_msg)
@@ -371,20 +371,20 @@ static int kcm_stats_seq_show(struct seq_file *seq, void *v)
         seq_printf(seq,
                    "%-8s %-10llu %-16llu %-10llu %-16llu %-10llu %-10llu %-10u %-10u %-10u %-10u %-10u %-10u %-10u %-10u %-10u\n",
                    "",
-                   strp_stats.rx_msgs,
-                   strp_stats.rx_bytes,
+                   strp_stats.msgs,
+                   strp_stats.bytes,
                    psock_stats.tx_msgs,
                    psock_stats.tx_bytes,
                    psock_stats.reserved,
                    psock_stats.unreserved,
-                   strp_stats.rx_aborts,
-                   strp_stats.rx_interrupted,
-                   strp_stats.rx_unrecov_intr,
-                   strp_stats.rx_mem_fail,
-                   strp_stats.rx_need_more_hdr,
-                   strp_stats.rx_bad_hdr_len,
-                   strp_stats.rx_msg_too_big,
-                   strp_stats.rx_msg_timeouts,
+                   strp_stats.aborts,
+                   strp_stats.interrupted,
+                   strp_stats.unrecov_intr,
+                   strp_stats.mem_fail,
+                   strp_stats.need_more_hdr,
+                   strp_stats.bad_hdr_len,
+                   strp_stats.msg_too_big,
+                   strp_stats.msg_timeouts,
                    psock_stats.tx_aborts);
 
         return 0;