Commit 3fde94b6 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: flowtable: reorder nf_flowtable struct members 



Place the read-mostly parts accessed by the datapath first.

In particular, we do access ->flags member (to see if HW offload
is enabled) for every single packet, but this is placed in the 5th
cacheline.

priority could stay where it is, but move it too to cover a hole.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ffb40fba

include/net/netfilter/nf_flow_table.h

+5 −4
Original line number Diff line number Diff line
@@ -74,12 +74,13 @@ enum nf_flowtable_flags { 
};



struct nf_flowtable {

	struct list_head		list;

	struct rhashtable		rhashtable;

	int				priority;

	unsigned int			flags;		/* readonly in datapath */

	int				priority;	/* control path (padding hole) */

	struct rhashtable		rhashtable;	/* datapath, read-mostly members come first */



	struct list_head		list;		/* slowpath parts */

	const struct nf_flowtable_type	*type;

	struct delayed_work		gc_work;

	unsigned int			flags;

	struct flow_block		flow_block;

	struct rw_semaphore		flow_block_lock; /* Guards flow_block */

	possible_net_t			net;