net: core: unwrap skb list receive slightly further

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/trace/events/net.h b/include/trace/events/net.h
index 9c886739246ae4e91d8369f4c690bccd56f27912..00aa72ce0e7c79b18b4f597cd1287df1e2bd4aff 100644 (file)
--- a/include/trace/events/net.h
+++ b/include/trace/events/net.h
@@ -223,6 +223,13 @@ DEFINE_EVENT(net_dev_rx_verbose_template, netif_receive_skb_entry,
        TP_ARGS(skb)
 );
 
+DEFINE_EVENT(net_dev_rx_verbose_template, netif_receive_skb_list_entry,
+
+       TP_PROTO(const struct sk_buff *skb),
+
+       TP_ARGS(skb)
+);
+
 DEFINE_EVENT(net_dev_rx_verbose_template, netif_rx_entry,
 
        TP_PROTO(const struct sk_buff *skb),

diff --git a/net/core/dev.c b/net/core/dev.c
index 85c456a4b55151489e3f32d2297bafc9954d97ae..308acfd481390ee569379b7baa83d7e9045d2ef5 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4920,8 +4920,10 @@ void netif_receive_skb_list(struct list_head *head)
 {
        struct sk_buff *skb, *next;
 
+       list_for_each_entry(skb, head, list)
+               trace_netif_receive_skb_list_entry(skb);
        list_for_each_entry_safe(skb, next, head, list)
-               netif_receive_skb(skb);
+               netif_receive_skb_internal(skb);
 }
 EXPORT_SYMBOL(netif_receive_skb_list);