net: drop_monitor: support drop reason

In the commit c504e5c2f964 ("net: skb: introduce kfree_skb_reason()")
drop reason is introduced to the tracepoint of kfree_skb. Therefore,
drop_monitor is able to report the drop reason to users by netlink.

The drop reasons are reported as string to users, which is exactly
the same as what we do when reporting it to ftrace.

Signed-off-by: Menglong Dong <imagedong@tencent.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20220209060838.55513-1-imagedong@tencent.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/uapi/linux/net_dropmon.h b/include/uapi/linux/net_dropmon.h
index 66048cc..1bbea8f 100644 (file)
--- a/include/uapi/linux/net_dropmon.h
+++ b/include/uapi/linux/net_dropmon.h
@@ -93,6 +93,7 @@ enum net_dm_attr {
        NET_DM_ATTR_SW_DROPS,                   /* flag */
        NET_DM_ATTR_HW_DROPS,                   /* flag */
        NET_DM_ATTR_FLOW_ACTION_COOKIE,         /* binary */
+       NET_DM_ATTR_REASON,                     /* string */
 
        __NET_DM_ATTR_MAX,
        NET_DM_ATTR_MAX = __NET_DM_ATTR_MAX - 1

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 7b288a1..4641126 100644 (file)
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -48,6 +48,19 @@
 static int trace_state = TRACE_OFF;
 static bool monitor_hw;
 
+#undef EM
+#undef EMe
+
+#define EM(a, b)       [a] = #b,
+#define EMe(a, b)      [a] = #b
+
+/* drop_reasons is used to translate 'enum skb_drop_reason' to string,
+ * which is reported to user space.
+ */
+static const char * const drop_reasons[] = {
+       TRACE_SKB_DROP_REASON
+};
+
 /* net_dm_mutex
  *
  * An overall lock guarding every operation coming from userspace.
@@ -126,6 +139,7 @@ struct net_dm_skb_cb {
                struct devlink_trap_metadata *hw_metadata;
                void *pc;
        };
+       enum skb_drop_reason reason;
 };
 
 #define NET_DM_SKB_CB(__skb) ((struct net_dm_skb_cb *)&((__skb)->cb[0]))
@@ -498,6 +512,7 @@ static void net_dm_packet_trace_kfree_skb_hit(void *ignore,
 {
        ktime_t tstamp = ktime_get_real();
        struct per_cpu_dm_data *data;
+       struct net_dm_skb_cb *cb;
        struct sk_buff *nskb;
        unsigned long flags;
 
@@ -508,7 +523,11 @@ static void net_dm_packet_trace_kfree_skb_hit(void *ignore,
        if (!nskb)
                return;
 
-       NET_DM_SKB_CB(nskb)->pc = location;
+       if ((unsigned int)reason >= SKB_DROP_REASON_MAX)
+               reason = SKB_DROP_REASON_NOT_SPECIFIED;
+       cb = NET_DM_SKB_CB(nskb);
+       cb->reason = reason;
+       cb->pc = location;
        /* Override the timestamp because we care about the time when the
         * packet was dropped.
         */
@@ -553,7 +572,8 @@ static size_t net_dm_in_port_size(void)
 
 #define NET_DM_MAX_SYMBOL_LEN 40
 
-static size_t net_dm_packet_report_size(size_t payload_len)
+static size_t net_dm_packet_report_size(size_t payload_len,
+                                       enum skb_drop_reason reason)
 {
        size_t size;
 
@@ -574,6 +594,8 @@ static size_t net_dm_packet_report_size(size_t payload_len)
               nla_total_size(sizeof(u32)) +
               /* NET_DM_ATTR_PROTO */
               nla_total_size(sizeof(u16)) +
+              /* NET_DM_ATTR_REASON */
+              nla_total_size(strlen(drop_reasons[reason]) + 1) +
               /* NET_DM_ATTR_PAYLOAD */
               nla_total_size(payload_len);
 }
@@ -606,7 +628,7 @@ nla_put_failure:
 static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb,
                                     size_t payload_len)
 {
-       u64 pc = (u64)(uintptr_t) NET_DM_SKB_CB(skb)->pc;
+       struct net_dm_skb_cb *cb = NET_DM_SKB_CB(skb);
        char buf[NET_DM_MAX_SYMBOL_LEN];
        struct nlattr *attr;
        void *hdr;
@@ -620,10 +642,15 @@ static int net_dm_packet_report_fill(struct sk_buff *msg, struct sk_buff *skb,
        if (nla_put_u16(msg, NET_DM_ATTR_ORIGIN, NET_DM_ORIGIN_SW))
                goto nla_put_failure;
 
-       if (nla_put_u64_64bit(msg, NET_DM_ATTR_PC, pc, NET_DM_ATTR_PAD))
+       if (nla_put_u64_64bit(msg, NET_DM_ATTR_PC, (u64)(uintptr_t)cb->pc,
+                             NET_DM_ATTR_PAD))
+               goto nla_put_failure;
+
+       if (nla_put_string(msg, NET_DM_ATTR_REASON,
+                          drop_reasons[cb->reason]))
                goto nla_put_failure;
 
-       snprintf(buf, sizeof(buf), "%pS", NET_DM_SKB_CB(skb)->pc);
+       snprintf(buf, sizeof(buf), "%pS", cb->pc);
        if (nla_put_string(msg, NET_DM_ATTR_SYMBOL, buf))
                goto nla_put_failure;
 
@@ -679,7 +706,9 @@ static void net_dm_packet_report(struct sk_buff *skb)
        if (net_dm_trunc_len)
                payload_len = min_t(size_t, net_dm_trunc_len, payload_len);
 
-       msg = nlmsg_new(net_dm_packet_report_size(payload_len), GFP_KERNEL);
+       msg = nlmsg_new(net_dm_packet_report_size(payload_len,
+                                                 NET_DM_SKB_CB(skb)->reason),
+                       GFP_KERNEL);
        if (!msg)
                goto out;