net: cdc_ncm/cdc_mbim: adding NCM protocol statistics

To have an idea of the effects of the protocol coalescing
it's useful to have some counters showing the different
aspects.

Due to the asymmetrical usbnet interface the netdev
rx_bytes counter has been counting real received payload,
while the tx_bytes counter has included the NCM/MBIM
framing overhead. This overhead can be many times the
payload because of the aggressive padding strategy of
this driver, and will vary a lot depending on device
and traffic.

With very few exceptions, users are only interested in
the payload size.  Having an somewhat accurate payload
byte counter is particularly important for mobile
broadband devices, which many NCM devices and of course
all MBIM devices are. Users and userspace applications
will use this counter to monitor account quotas.

Having protocol specific counters for the overhead, we are
now able to correct the tx_bytes netdev counter so that
it shows the real payload

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
index bc23273d0455..5ee7a1dbc023 100644
--- a/drivers/net/usb/cdc_mbim.c
+++ b/drivers/net/usb/cdc_mbim.c
@@ -420,6 +420,7 @@ static int cdc_mbim_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)
         struct usb_cdc_ncm_dpe16 *dpe16;
         int ndpoffset;
         int loopcount = 50; /* arbitrary max preventing infinite loop */
+        u32 payload = 0;
         u8 *c;
         u16 tci;
 
@@ -482,6 +483,7 @@ next_ndp:
                         if (!skb)
                                 goto error;
                         usbnet_skb_return(dev, skb);
+                        payload += len; /* count payload bytes in this NTB */
                 }
         }
 err_ndp:
@@ -490,6 +492,10 @@ err_ndp:
         if (ndpoffset && loopcount--)
                 goto next_ndp;
 
+        /* update stats */
+        ctx->rx_overhead += skb_in->len - payload;
+        ctx->rx_ntbs++;
+
         return 1;
 error:
         return 0;