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

Commit 22fc4c4c authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: gre: switch module to be built-in 



This makes the last of the modular l4 trackers 'bool'.

After this, all infrastructure to handle dynamic l4 protocol registration
becomes obsolete and can be removed in followup patches.

Old:
302824 net/netfilter/nf_conntrack.ko
 21504 net/netfilter/nf_conntrack_proto_gre.ko

New:
313728 net/netfilter/nf_conntrack.ko

Old:
   text	   data	    bss	    dec	    hex	filename
   6281	   1732	      4	   8017	   1f51	nf_conntrack_proto_gre.ko
 108356	  20613	    236	 129205	  1f8b5	nf_conntrack.ko
New:
 112095	  21381	    240	 133716	  20a54	nf_conntrack.ko

The size increase is only temporary.

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

include/linux/netfilter/nf_conntrack_proto_gre.h

+1 −13
Original line number Diff line number Diff line
@@ -22,23 +22,11 @@ struct nf_ct_gre_keymap { 
	struct rcu_head rcu;

};



enum grep_conntrack {

	GRE_CT_UNREPLIED,

	GRE_CT_REPLIED,

	GRE_CT_MAX

};



struct netns_proto_gre {

	struct nf_proto_net	nf;

	rwlock_t		keymap_lock;

	struct list_head	keymap_list;

	unsigned int		gre_timeouts[GRE_CT_MAX];

};



/* add new tuple->key_reply pair to keymap */

int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,

			 struct nf_conntrack_tuple *t);



void nf_ct_gre_keymap_flush(struct net *net);

/* delete keymap entries */

void nf_ct_gre_keymap_destroy(struct nf_conn *ct);

include/net/netfilter/ipv4/nf_conntrack_ipv4.h

+3 −0
Original line number Diff line number Diff line
@@ -22,5 +22,8 @@ extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp; 
#ifdef CONFIG_NF_CT_PROTO_UDPLITE

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite;

#endif

#ifdef CONFIG_NF_CT_PROTO_GRE

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_gre;

#endif



#endif /*_NF_CONNTRACK_IPV4_H*/

include/net/netfilter/nf_conntrack_l4proto.h

+7 −0
Original line number Diff line number Diff line
@@ -239,4 +239,11 @@ static inline struct nf_sctp_net *nf_sctp_pernet(struct net *net) 
}

#endif



#ifdef CONFIG_NF_CT_PROTO_GRE

static inline struct nf_gre_net *nf_gre_pernet(struct net *net)

{

	return &net->ct.nf_ct_proto.gre;

}

#endif



#endif /*_NF_CONNTRACK_PROTOCOL_H*/

include/net/netns/conntrack.h

+17 −0
Original line number Diff line number Diff line
@@ -70,6 +70,20 @@ struct nf_sctp_net { 
};

#endif



#ifdef CONFIG_NF_CT_PROTO_GRE

enum gre_conntrack {

	GRE_CT_UNREPLIED,

	GRE_CT_REPLIED,

	GRE_CT_MAX

};



struct nf_gre_net {

	struct nf_proto_net	nf;

	struct list_head	keymap_list;

	unsigned int		timeouts[GRE_CT_MAX];

};

#endif



struct nf_ip_net {

	struct nf_generic_net   generic;

	struct nf_tcp_net	tcp;
@@ -82,6 +96,9 @@ struct nf_ip_net { 
#ifdef CONFIG_NF_CT_PROTO_SCTP

	struct nf_sctp_net	sctp;

#endif

#ifdef CONFIG_NF_CT_PROTO_GRE

	struct nf_gre_net	gre;

#endif

};



struct ct_pcpu {

net/netfilter/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ config NF_CT_PROTO_DCCP 
	  If unsure, say Y.



config NF_CT_PROTO_GRE

	tristate

	bool



config NF_CT_PROTO_SCTP

	bool 'SCTP protocol connection tracking support'