devlink: add devlink_fmsg_dump_skb() function

Add devlink_fmsg_dump_skb() function that adds some diagnostic
information about skb (like length, pkt type, MAC, etc) to devlink
fmsg mechanism using bunch of devlink_fmsg_put() function calls.

Signed-off-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index b5e1427ea4d7211623cb9e45ee6da5d7bcbacfbb..58e33959c85216ad3e52df8cc3e449eab6d1b73f 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1268,6 +1268,7 @@ enum devlink_trap_group_generic_id {
                u16 :           devlink_fmsg_u32_pair_put,      \
                u32 :           devlink_fmsg_u32_pair_put,      \
                u64 :           devlink_fmsg_u64_pair_put,      \
+               int :           devlink_fmsg_u32_pair_put,      \
                char * :        devlink_fmsg_string_pair_put,   \
                const char * :  devlink_fmsg_string_pair_put)   \
        (fmsg, name, (value)))
@@ -2005,6 +2006,7 @@ int devlink_compat_switch_id_get(struct net_device *dev,
 
 int devlink_nl_port_handle_fill(struct sk_buff *msg, struct devlink_port *devlink_port);
 size_t devlink_nl_port_handle_size(struct devlink_port *devlink_port);
+void devlink_fmsg_dump_skb(struct devlink_fmsg *fmsg, const struct sk_buff *skb);
 
 #else
 

diff --git a/net/devlink/health.c b/net/devlink/health.c
index b8d3084e6fe06359297e4c39ddf020419e6b9035..57db6799722a9926409ba974d8290ddbfa4eb7bf 100644 (file)
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -1238,3 +1238,70 @@ int devlink_nl_health_reporter_test_doit(struct sk_buff *skb,
 
        return reporter->ops->test(reporter, info->extack);
 }
+
+/**
+ * devlink_fmsg_dump_skb - Dump sk_buffer structure
+ * @fmsg: devlink formatted message pointer
+ * @skb: pointer to skb
+ *
+ * Dump diagnostic information about sk_buff structure, like headroom, length,
+ * tailroom, MAC, etc.
+ */
+void devlink_fmsg_dump_skb(struct devlink_fmsg *fmsg, const struct sk_buff *skb)
+{
+       struct skb_shared_info *sh = skb_shinfo(skb);
+       struct sock *sk = skb->sk;
+       bool has_mac, has_trans;
+
+       has_mac = skb_mac_header_was_set(skb);
+       has_trans = skb_transport_header_was_set(skb);
+
+       devlink_fmsg_pair_nest_start(fmsg, "skb");
+       devlink_fmsg_obj_nest_start(fmsg);
+       devlink_fmsg_put(fmsg, "actual len", skb->len);
+       devlink_fmsg_put(fmsg, "head len", skb_headlen(skb));
+       devlink_fmsg_put(fmsg, "data len", skb->data_len);
+       devlink_fmsg_put(fmsg, "tail len", skb_tailroom(skb));
+       devlink_fmsg_put(fmsg, "MAC", has_mac ? skb->mac_header : -1);
+       devlink_fmsg_put(fmsg, "MAC len",
+                        has_mac ? skb_mac_header_len(skb) : -1);
+       devlink_fmsg_put(fmsg, "network hdr", skb->network_header);
+       devlink_fmsg_put(fmsg, "network hdr len",
+                        has_trans ? skb_network_header_len(skb) : -1);
+       devlink_fmsg_put(fmsg, "transport hdr",
+                        has_trans ? skb->transport_header : -1);
+       devlink_fmsg_put(fmsg, "csum", (__force u32)skb->csum);
+       devlink_fmsg_put(fmsg, "csum_ip_summed", (u8)skb->ip_summed);
+       devlink_fmsg_put(fmsg, "csum_complete_sw", !!skb->csum_complete_sw);
+       devlink_fmsg_put(fmsg, "csum_valid", !!skb->csum_valid);
+       devlink_fmsg_put(fmsg, "csum_level", (u8)skb->csum_level);
+       devlink_fmsg_put(fmsg, "sw_hash", !!skb->sw_hash);
+       devlink_fmsg_put(fmsg, "l4_hash", !!skb->l4_hash);
+       devlink_fmsg_put(fmsg, "proto", ntohs(skb->protocol));
+       devlink_fmsg_put(fmsg, "pkt_type", (u8)skb->pkt_type);
+       devlink_fmsg_put(fmsg, "iif", skb->skb_iif);
+
+       if (sk) {
+               devlink_fmsg_pair_nest_start(fmsg, "sk");
+               devlink_fmsg_obj_nest_start(fmsg);
+               devlink_fmsg_put(fmsg, "family", sk->sk_type);
+               devlink_fmsg_put(fmsg, "type", sk->sk_type);
+               devlink_fmsg_put(fmsg, "proto", sk->sk_protocol);
+               devlink_fmsg_obj_nest_end(fmsg);
+               devlink_fmsg_pair_nest_end(fmsg);
+       }
+
+       devlink_fmsg_obj_nest_end(fmsg);
+       devlink_fmsg_pair_nest_end(fmsg);
+
+       devlink_fmsg_pair_nest_start(fmsg, "shinfo");
+       devlink_fmsg_obj_nest_start(fmsg);
+       devlink_fmsg_put(fmsg, "tx_flags", sh->tx_flags);
+       devlink_fmsg_put(fmsg, "nr_frags", sh->nr_frags);
+       devlink_fmsg_put(fmsg, "gso_size", sh->gso_size);
+       devlink_fmsg_put(fmsg, "gso_type", sh->gso_type);
+       devlink_fmsg_put(fmsg, "gso_segs", sh->gso_segs);
+       devlink_fmsg_obj_nest_end(fmsg);
+       devlink_fmsg_pair_nest_end(fmsg);
+}
+EXPORT_SYMBOL_GPL(devlink_fmsg_dump_skb);