Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96e9b108 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "skb: printing port numbers with gso trace events"

parents ca7139db beeb76de

include/trace/events/skb.h

+9 −4
Original line number Diff line number Diff line
@@ -52,24 +52,29 @@ TRACE_EVENT(consume_skb, 


TRACE_EVENT(print_skb_gso,



	TP_PROTO(struct sk_buff *skb),

	TP_PROTO(struct sk_buff *skb, __be16 src, __be16 dest),



	TP_ARGS(skb),

	TP_ARGS(skb, src, dest),



	TP_STRUCT__entry(

		__field(void *,	skbaddr)

		__field(int   ,	len)

		__field(int   ,	data_len)

		__field(__be16 , src)

		__field(__be16 , dest)

	),



	TP_fast_assign(

		__entry->skbaddr = skb;

		__entry->len = skb->len;

		__entry->data_len = skb->data_len;

		__entry->src = src;

		__entry->dest = dest;

	),



	TP_printk("GSO: skbaddr=%p, len=%d, data_len=%d",

		__entry->skbaddr, __entry->len, __entry->data_len)

	TP_printk("GSO: skbaddr=%p, len=%d, data_len=%d, src=%u, dest=%u",

		__entry->skbaddr, __entry->len, __entry->data_len,

		be16_to_cpu(__entry->src), be16_to_cpu(__entry->dest))

);



TRACE_EVENT(skb_copy_datagram_iovec,

net/core/dev.c

+6 −1
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ 
#include <linux/vmalloc.h>

#include <linux/if_macvlan.h>

#include <linux/errqueue.h>

#include <linux/tcp.h>

#include <net/tcp.h>



#include "net-sysfs.h"
@@ -2733,7 +2735,10 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device 
	if (netif_needs_gso(dev, skb, features)) {

		struct sk_buff *segs;



		trace_print_skb_gso(skb);

		__be16 src_port = tcp_hdr(skb)->source;

		__be16 dest_port = tcp_hdr(skb)->dest;



		trace_print_skb_gso(skb, src_port, dest_port);

		segs = skb_gso_segment(skb, features);

		if (IS_ERR(segs)) {

			goto out_kfree_skb;