Merge "skb: printing port numbers with gso trace events" (2f97bb4d) · Commits · e / devices / android_kernel_fairphone_FP3

include/trace/events/skb.h

+27 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,33 @@ TRACE_EVENT(consume_skb,
		TP_printk("skbaddr=%p", __entry->skbaddr)
		);

		TRACE_EVENT(print_skb_gso,

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

		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=%pK, 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,

		TP_PROTO(const struct sk_buff *skb, int len),

+6 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,8 @@
		#include <linux/netfilter_ingress.h>
		#include <linux/sctp.h>
		#include <linux/crash_dump.h>
		#include <linux/tcp.h>
		#include <net/tcp.h>

		#include "net-sysfs.h"

		@@ -2988,6 +2990,10 @@ static struct sk_buff validate_xmit_skb(struct sk_buff skb, struct net_device
		if (netif_needs_gso(skb, features)) {
		struct sk_buff *segs;

		__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;