l2tp: report rx cookie discards in netlink get

When an L2TPv3 session receives a data frame with an incorrect cookie
l2tp_core logs a warning message and bumps a stats counter to reflect
the fact that the packet has been dropped.

However, the stats counter in question is missing from the l2tp_netlink
get message for tunnel and session instances.

Include the statistic in the netlink get response.

Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h
index 88a0d32b8c07f3744182cae17f1dec9a4238c877..30c80d5ba4bfcba26a2bdd14045cfe0b936fdbfb 100644 (file)
--- a/include/uapi/linux/l2tp.h
+++ b/include/uapi/linux/l2tp.h
@@ -144,6 +144,7 @@ enum {
        L2TP_ATTR_RX_OOS_PACKETS,       /* u64 */
        L2TP_ATTR_RX_ERRORS,            /* u64 */
        L2TP_ATTR_STATS_PAD,
+       L2TP_ATTR_RX_COOKIE_DISCARDS,   /* u64 */
        __L2TP_ATTR_STATS_MAX,
 };
 

diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index 83c015f7f20d39005a34ee3b64ff41316f1843e4..5ca5056e9636453c0514ba68a805f4fcc60cc3d9 100644 (file)
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -420,6 +420,9 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 portid, u32 seq, int fla
            nla_put_u64_64bit(skb, L2TP_ATTR_RX_SEQ_DISCARDS,
                              atomic_long_read(&tunnel->stats.rx_seq_discards),
                              L2TP_ATTR_STATS_PAD) ||
+           nla_put_u64_64bit(skb, L2TP_ATTR_RX_COOKIE_DISCARDS,
+                             atomic_long_read(&tunnel->stats.rx_cookie_discards),
+                             L2TP_ATTR_STATS_PAD) ||
            nla_put_u64_64bit(skb, L2TP_ATTR_RX_OOS_PACKETS,
                              atomic_long_read(&tunnel->stats.rx_oos_packets),
                              L2TP_ATTR_STATS_PAD) ||
@@ -760,6 +763,9 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl
            nla_put_u64_64bit(skb, L2TP_ATTR_RX_SEQ_DISCARDS,
                              atomic_long_read(&session->stats.rx_seq_discards),
                              L2TP_ATTR_STATS_PAD) ||
+           nla_put_u64_64bit(skb, L2TP_ATTR_RX_COOKIE_DISCARDS,
+                             atomic_long_read(&session->stats.rx_cookie_discards),
+                             L2TP_ATTR_STATS_PAD) ||
            nla_put_u64_64bit(skb, L2TP_ATTR_RX_OOS_PACKETS,
                              atomic_long_read(&session->stats.rx_oos_packets),
                              L2TP_ATTR_STATS_PAD) ||