Commit 36596dad authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: add single table list for all families 



Place all existing user defined tables in struct net *, instead of
having one list per family. This saves us from one level of indentation
in netlink dump functions.

Place pointer to struct nft_af_info in struct nft_table temporarily, as
we still need this to put back reference module reference counter on
table removal.

This patch comes in preparation for the removal of struct nft_af_info.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1ea26cca

include/net/netfilter/nf_tables.h

+4 −4
Original line number Diff line number Diff line
@@ -143,22 +143,22 @@ static inline void nft_data_debug(const struct nft_data *data) 
 *	struct nft_ctx - nf_tables rule/set context

 *

 *	@net: net namespace

 * 	@afi: address family info

 * 	@table: the table the chain is contained in

 * 	@chain: the chain the rule is contained in

 *	@nla: netlink attributes

 *	@portid: netlink portID of the original message

 *	@seq: netlink sequence number

 *	@family: protocol family

 *	@report: notify via unicast netlink message

 */

struct nft_ctx {

	struct net			*net;

	struct nft_af_info		*afi;

	struct nft_table		*table;

	struct nft_chain		*chain;

	const struct nlattr * const 	*nla;

	u32				portid;

	u32				seq;

	u8				family;

	bool				report;

};
@@ -949,6 +949,7 @@ unsigned int nft_do_chain(struct nft_pktinfo *pkt, void *priv); 
 *	@use: number of chain references to this table

 *	@flags: table flag (see enum nft_table_flags)

 *	@genmask: generation mask

 *	@afinfo: address family info

 *	@name: name of the table

 */

struct nft_table {
@@ -961,6 +962,7 @@ struct nft_table { 
	u32				use;

	u16				flags:14,

					genmask:2;

	struct nft_af_info		*afi;

	char				*name;

};
@@ -970,13 +972,11 @@ struct nft_table { 
 *	@list: used internally

 *	@family: address family

 *	@owner: module owner

 *	@tables: used internally

 */

struct nft_af_info {

	struct list_head		list;

	int				family;

	struct module			*owner;

	struct list_head		tables;

};



int nft_register_afinfo(struct net *, struct nft_af_info *);

include/net/netns/nftables.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ struct nft_af_info; 


struct netns_nftables {

	struct list_head	af_info;

	struct list_head	tables;

	struct list_head	commit_list;

	struct nft_af_info	*ipv4;

	struct nft_af_info	*ipv6;

net/netfilter/nf_tables_api.c

+247 −262

File changed.

Preview size limit exceeded, changes collapsed.

net/netfilter/nf_tables_netdev.c

+9 −12

File changed.

Preview size limit exceeded, changes collapsed.

net/netfilter/nft_compat.c

+8 −8

File changed.

Preview size limit exceeded, changes collapsed.