Commit 0e60ebe0 authored by Eric Dumazet's avatar Eric Dumazet Committed by Patrick McHardy
Browse files

netfilter: add __rcu annotations 



Add some __rcu annotations and use helpers to reduce number of sparse
warnings (CONFIG_SPARSE_RCU_POINTER=y)

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 9811600f

include/linux/netfilter.h

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ struct nf_afinfo { 
	int		route_key_size;

};



extern const struct nf_afinfo *nf_afinfo[NFPROTO_NUMPROTO];

extern const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO];

static inline const struct nf_afinfo *nf_get_afinfo(unsigned short family)

{

	return rcu_dereference(nf_afinfo[family]);
@@ -355,9 +355,9 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) 
#endif /*CONFIG_NETFILTER*/



#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *);

extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *) __rcu;

extern void nf_ct_attach(struct sk_buff *, struct sk_buff *);

extern void (*nf_ct_destroy)(struct nf_conntrack *);

extern void (*nf_ct_destroy)(struct nf_conntrack *) __rcu;

#else

static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {}

#endif

include/net/netfilter/nf_conntrack_ecache.h

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct nf_ct_event_notifier { 
	int (*fcn)(unsigned int events, struct nf_ct_event *item);

};



extern struct nf_ct_event_notifier *nf_conntrack_event_cb;

extern struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb;

extern int nf_conntrack_register_notifier(struct nf_ct_event_notifier *nb);

extern void nf_conntrack_unregister_notifier(struct nf_ct_event_notifier *nb);
@@ -167,7 +167,7 @@ struct nf_exp_event_notifier { 
	int (*fcn)(unsigned int events, struct nf_exp_event *item);

};



extern struct nf_exp_event_notifier *nf_expect_event_cb;

extern struct nf_exp_event_notifier __rcu *nf_expect_event_cb;

extern int nf_ct_expect_register_notifier(struct nf_exp_event_notifier *nb);

extern void nf_ct_expect_unregister_notifier(struct nf_exp_event_notifier *nb);

include/net/netfilter/nf_conntrack_l3proto.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct nf_conntrack_l3proto { 
	struct module *me;

};



extern struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX];

extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX];



/* Protocol registration. */

extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);

net/netfilter/core.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ EXPORT_SYMBOL(skb_make_writable); 
/* This does not belong here, but locally generated errors need it if connection

   tracking in use: without this, connection may not be in hash table, and hence

   manufactured ICMP or RST packets will not be associated with it. */

void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *);

void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *) __rcu __read_mostly;

EXPORT_SYMBOL(ip_ct_attach);



void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb)
@@ -229,7 +229,7 @@ void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) 
}

EXPORT_SYMBOL(nf_ct_attach);



void (*nf_ct_destroy)(struct nf_conntrack *);

void (*nf_ct_destroy)(struct nf_conntrack *) __rcu __read_mostly;

EXPORT_SYMBOL(nf_ct_destroy);



void nf_conntrack_destroy(struct nf_conntrack *nfct)

net/netfilter/nf_conntrack_expect.c

+3 −3
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static struct hlist_node *ct_expect_get_first(struct seq_file *seq) 
	struct hlist_node *n;



	for (st->bucket = 0; st->bucket < nf_ct_expect_hsize; st->bucket++) {

		n = rcu_dereference(net->ct.expect_hash[st->bucket].first);

		n = rcu_dereference(hlist_first_rcu(&net->ct.expect_hash[st->bucket]));

		if (n)

			return n;

	}
@@ -495,11 +495,11 @@ static struct hlist_node *ct_expect_get_next(struct seq_file *seq, 
	struct net *net = seq_file_net(seq);

	struct ct_expect_iter_state *st = seq->private;



	head = rcu_dereference(head->next);

	head = rcu_dereference(hlist_next_rcu(head));

	while (head == NULL) {

		if (++st->bucket >= nf_ct_expect_hsize)

			return NULL;

		head = rcu_dereference(net->ct.expect_hash[st->bucket].first);

		head = rcu_dereference(hlist_first_rcu(&net->ct.expect_hash[st->bucket]));

	}

	return head;

}