sched: place state, next_sched and gso_skb in same cacheline again
authorFlorian Westphal <fw@strlen.de>
Wed, 8 Jun 2016 22:27:43 +0000 (00:27 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Jun 2016 06:58:52 +0000 (23:58 -0700)
commitc8945043cdc687388b7a43fc6f474bddd9607e80
treed22984bcaf0e223a471377f67dc83827f0cae7a6
parenta09ceb0e08140a1eec05b49b4c232d3481339cb0
sched: place state, next_sched and gso_skb in same cacheline again

Earlier commits removed two members from struct Qdisc which places
next_sched/gso_skb into a different cacheline than ->state.

This restores the struct layout to what it was before the removal.
Move the two members, then add an annotation so they all reside in the
same cacheline.

This adds a 16 byte hole after cpu_qstats.

The hole could be closed but as it doesn't decrease total struct size just
do it this way.

Reported-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sch_generic.h