Commit 490f33c4 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

inet: shrink netns_ipv4 by another cache line 



By shuffling around some fields to remove 8 bytes of hole,
we can save one cache line.

pahole result before/after the patch :

/* size: 768, cachelines: 12, members: 139 */
/* sum members: 673, holes: 11, sum holes: 39 */
/* padding: 56 */
/* paddings: 2, sum paddings: 7 */
/* forced alignments: 1 */

->

/* size: 704, cachelines: 11, members: 139 */
/* sum members: 673, holes: 10, sum holes: 31 */
/* paddings: 2, sum paddings: 7 */
/* forced alignments: 1 */

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1caf8d39

include/net/netns/ipv4.h

+3 −3
Original line number Diff line number Diff line
@@ -57,17 +57,17 @@ struct netns_ipv4 { 
	struct mutex		ra_mutex;

#ifdef CONFIG_IP_MULTIPLE_TABLES

	struct fib_rules_ops	*rules_ops;

	bool			fib_has_custom_rules;

	unsigned int		fib_rules_require_fldissect;

	struct fib_table __rcu	*fib_main;

	struct fib_table __rcu	*fib_default;

	unsigned int		fib_rules_require_fldissect;

	bool			fib_has_custom_rules;

#endif

	bool			fib_has_custom_local_routes;

	bool			fib_offload_disabled;

#ifdef CONFIG_IP_ROUTE_CLASSID

	int			fib_num_tclassid_users;

#endif

	struct hlist_head	*fib_table_hash;

	bool			fib_offload_disabled;

	struct sock		*fibnl;



	struct sock  * __percpu	*icmp_sk;