Commit 4a60dc74 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: remove nf_ct_l4proto_find_get 



Its now same as __nf_ct_l4proto_find(), so rename that to
nf_ct_l4proto_find and use it everywhere.

It never returns NULL and doesn't need locks or reference counts.

Before this series:
302824  net/netfilter/nf_conntrack.ko
 21504  net/netfilter/nf_conntrack_proto_gre.ko

  text	   data	    bss	    dec	    hex	filename
  6281	   1732	      4	   8017	   1f51	nf_conntrack_proto_gre.ko
108356	  20613	    236	 129205	  1f8b5	nf_conntrack.ko

After:
294864  net/netfilter/nf_conntrack.ko
  text	   data	    bss	    dec	    hex	filename
106979	  19557	    240	 126776	  1ef38	nf_conntrack.ko

so, even with builtin gre, total size got reduced.

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

include/net/netfilter/nf_conntrack_core.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int nf_conntrack_init_net(struct net *net); 
void nf_conntrack_cleanup_net(struct net *net);

void nf_conntrack_cleanup_net_list(struct list_head *net_exit_list);



int nf_conntrack_proto_pernet_init(struct net *net);

void nf_conntrack_proto_pernet_init(struct net *net);

void nf_conntrack_proto_pernet_fini(struct net *net);



int nf_conntrack_proto_init(void);

include/net/netfilter/nf_conntrack_l4proto.h

+1 −7
Original line number Diff line number Diff line
@@ -140,13 +140,7 @@ extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic; 


#define MAX_NF_CT_PROTO IPPROTO_UDPLITE



const struct nf_conntrack_l4proto *__nf_ct_l4proto_find(u8 l4proto);



const struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u8 l4proto);



/* Protocol global registration. */

int nf_ct_l4proto_register_one(const struct nf_conntrack_l4proto *proto);

void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *proto);

const struct nf_conntrack_l4proto *nf_ct_l4proto_find(u8 l4proto);



/* Generic netlink helpers */

int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,

net/netfilter/nf_conntrack_core.c

+3 −8
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static int nf_ct_resolve_clash(struct net *net, struct sk_buff *skb, 
	enum ip_conntrack_info oldinfo;

	struct nf_conn *loser_ct = nf_ct_get(skb, &oldinfo);



	l4proto = __nf_ct_l4proto_find(nf_ct_protonum(ct));

	l4proto = nf_ct_l4proto_find(nf_ct_protonum(ct));

	if (l4proto->allow_clash &&

	    !nf_ct_is_dying(ct) &&

	    atomic_inc_not_zero(&ct->ct_general.use)) {
@@ -1117,7 +1117,7 @@ static bool gc_worker_can_early_drop(const struct nf_conn *ct) 
	if (!test_bit(IPS_ASSURED_BIT, &ct->status))

		return true;



	l4proto = __nf_ct_l4proto_find(nf_ct_protonum(ct));

	l4proto = nf_ct_l4proto_find(nf_ct_protonum(ct));

	if (l4proto->can_early_drop && l4proto->can_early_drop(ct))

		return true;
@@ -2452,15 +2452,10 @@ int nf_conntrack_init_net(struct net *net) 
	nf_conntrack_tstamp_pernet_init(net);

	nf_conntrack_ecache_pernet_init(net);

	nf_conntrack_helper_pernet_init(net);

	nf_conntrack_proto_pernet_init(net);



	ret = nf_conntrack_proto_pernet_init(net);

	if (ret < 0)

		goto err_proto;

	return 0;



err_proto:

	nf_conntrack_ecache_pernet_fini(net);

	nf_conntrack_expect_pernet_fini(net);

err_expect:

	free_percpu(net->ct.stat);

err_pcpu_lists:

net/netfilter/nf_conntrack_expect.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int exp_seq_show(struct seq_file *s, void *v) 
		   expect->tuple.src.l3num,

		   expect->tuple.dst.protonum);

	print_tuple(s, &expect->tuple,

		    __nf_ct_l4proto_find(expect->tuple.dst.protonum));

		    nf_ct_l4proto_find(expect->tuple.dst.protonum));



	if (expect->flags & NF_CT_EXPECT_PERMANENT) {

		seq_puts(s, "PERMANENT");

net/netfilter/nf_conntrack_netlink.c

+6 −8
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int ctnetlink_dump_tuples(struct sk_buff *skb, 
	ret = ctnetlink_dump_tuples_ip(skb, tuple);



	if (ret >= 0) {

		l4proto = __nf_ct_l4proto_find(tuple->dst.protonum);

		l4proto = nf_ct_l4proto_find(tuple->dst.protonum);

		ret = ctnetlink_dump_tuples_proto(skb, tuple, l4proto);

	}

	rcu_read_unlock();
@@ -182,7 +182,7 @@ static int ctnetlink_dump_protoinfo(struct sk_buff *skb, struct nf_conn *ct) 
	struct nlattr *nest_proto;

	int ret;



	l4proto = __nf_ct_l4proto_find(nf_ct_protonum(ct));

	l4proto = nf_ct_l4proto_find(nf_ct_protonum(ct));

	if (!l4proto->to_nlattr)

		return 0;
@@ -590,7 +590,7 @@ static size_t ctnetlink_proto_size(const struct nf_conn *ct) 
	len = nla_policy_len(cta_ip_nla_policy, CTA_IP_MAX + 1);

	len *= 3u; /* ORIG, REPLY, MASTER */



	l4proto = __nf_ct_l4proto_find(nf_ct_protonum(ct));

	l4proto = nf_ct_l4proto_find(nf_ct_protonum(ct));

	len += l4proto->nlattr_size;

	if (l4proto->nlattr_tuple_size) {

		len4 = l4proto->nlattr_tuple_size();
@@ -1059,7 +1059,7 @@ static int ctnetlink_parse_tuple_proto(struct nlattr *attr, 
	tuple->dst.protonum = nla_get_u8(tb[CTA_PROTO_NUM]);



	rcu_read_lock();

	l4proto = __nf_ct_l4proto_find(tuple->dst.protonum);

	l4proto = nf_ct_l4proto_find(tuple->dst.protonum);



	if (likely(l4proto->nlattr_to_tuple)) {

		ret = nla_validate_nested(attr, CTA_PROTO_MAX,
@@ -1722,11 +1722,9 @@ static int ctnetlink_change_protoinfo(struct nf_conn *ct, 
	if (err < 0)

		return err;



	rcu_read_lock();

	l4proto = __nf_ct_l4proto_find(nf_ct_protonum(ct));

	l4proto = nf_ct_l4proto_find(nf_ct_protonum(ct));

	if (l4proto->from_nlattr)

		err = l4proto->from_nlattr(tb, ct);

	rcu_read_unlock();



	return err;

}
@@ -2676,7 +2674,7 @@ static int ctnetlink_exp_dump_mask(struct sk_buff *skb, 
	rcu_read_lock();

	ret = ctnetlink_dump_tuples_ip(skb, &m);

	if (ret >= 0) {

		l4proto = __nf_ct_l4proto_find(tuple->dst.protonum);

		l4proto = nf_ct_l4proto_find(tuple->dst.protonum);

	ret = ctnetlink_dump_tuples_proto(skb, &m, l4proto);

	}

	rcu_read_unlock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE