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

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

Merge "net: add a per-cpu counter for the number of frames coalesced in GRO"

parents aaa79582 fbb0f9dd

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -2337,6 +2337,7 @@ struct softnet_data { 
	unsigned int		time_squeeze;

	unsigned int		cpu_collision;

	unsigned int		received_rps;

	unsigned int		gro_coalesced;



#ifdef CONFIG_RPS

	struct softnet_data	*rps_ipi_list;

net/core/dev.c

+1 −0
Original line number Diff line number Diff line
@@ -3895,6 +3895,7 @@ static int napi_gro_complete(struct sk_buff *skb) 
	}



out:

	__this_cpu_add(softnet_data.gro_coalesced, NAPI_GRO_CB(skb)->count > 1);

	return netif_receive_skb_internal(skb);

}

net/core/net-procfs.c

+3 −2
Original line number Diff line number Diff line
@@ -159,10 +159,11 @@ static int softnet_seq_show(struct seq_file *seq, void *v) 
#endif



	seq_printf(seq,

		   "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",

		   "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",

		   sd->processed, sd->dropped, sd->time_squeeze, 0,

		   0, 0, 0, 0, /* was fastroute */

		   sd->cpu_collision, sd->received_rps, flow_limit_count);

		   sd->cpu_collision, sd->received_rps, flow_limit_count,

		   sd->gro_coalesced);

	return 0;

}