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

Commit e80165fc authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 5121b17f f0b89458

Documentation/networking/ip-sysctl.txt

+5 −0
Original line number Diff line number Diff line
@@ -857,6 +857,11 @@ ip_unprivileged_port_start - INTEGER 


	Default: 1024



reserved_port_bind - BOOLEAN

	If set, allows explicit bind requests to applications requesting

	any port within the range of ip_local_reserved_ports.

	Default: 1



ip_nonlocal_bind - BOOLEAN

	If set, allows processes to bind() to non-local IP addresses,

	which can be quite useful - but may break some applications.

drivers/net/tun.c

+4 −0
Original line number Diff line number Diff line
@@ -1511,6 +1511,10 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
		return -EINVAL;

	}



	if (!(tun->flags & IFF_NO_PI))

		if (pi.flags & htons(CHECKSUM_UNNECESSARY))

			skb->ip_summed = CHECKSUM_UNNECESSARY;



	switch (tun->flags & TUN_TYPE_MASK) {

	case IFF_TUN:

		if (tun->flags & IFF_NO_PI) {

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -2748,6 +2748,8 @@ struct softnet_data { 
	unsigned int		processed;

	unsigned int		time_squeeze;

	unsigned int		received_rps;

	unsigned int            gro_coalesced;



#ifdef CONFIG_RPS

	struct softnet_data	*rps_ipi_list;

#endif

include/net/ip.h

+2 −0
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ static inline int inet_prot_sock(struct net *net) 


__be32 inet_current_timestamp(void);



extern int sysctl_reserved_port_bind;



/* From inetpeer.c */

extern int inet_peer_threshold;

extern int inet_peer_minttl;

include/trace/events/skb.h

+27 −0
Original line number Diff line number Diff line
@@ -51,6 +51,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),