asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[NETFILTER]: nf_conntrack_helper/nf_conntrack_netlink: convert to expectation hash

Browse source 
Convert from the global expectation list to the hash table.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-07-07 22:35:21 -07:00 committed by David S. Miller
parent 5d08ad440f
commit 31f15875c5
2 changed files with 58 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
net/netfilter/nf_conntrack_helper.c
View file

@ -114,22 +114,25 @@ EXPORT_SYMBOL_GPL(nf_conntrack_helper_register);
void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me) void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
{ {
unsigned int i;
struct nf_conntrack_tuple_hash *h; struct nf_conntrack_tuple_hash *h;
struct nf_conntrack_expect *exp, *tmp; struct nf_conntrack_expect *exp;
struct hlist_node *n; struct hlist_node *n, *next;
unsigned int i;
/* Need write lock here, to delete helper. */ /* Need write lock here, to delete helper. */
write_lock_bh(&nf_conntrack_lock); write_lock_bh(&nf_conntrack_lock);
list_del(&me->list); list_del(&me->list);
/* Get rid of expectations */ /* Get rid of expectations */
list_for_each_entry_safe(exp, tmp, &nf_ct_expect_list, list) { for (i = 0; i < nf_ct_expect_hsize; i++) {
struct nf_conn_help *help = nfct_help(exp->master); hlist_for_each_entry_safe(exp, n, next,
if ((help->helper == me || exp->helper == me) && &nf_ct_expect_hash[i], hnode) {
del_timer(&exp->timeout)) { struct nf_conn_help *help = nfct_help(exp->master);
nf_ct_unlink_expect(exp); if ((help->helper == me || exp->helper == me) &&
nf_ct_expect_put(exp); del_timer(&exp->timeout)) {
nf_ct_unlink_expect(exp);
nf_ct_expect_put(exp);
}
} }
} }

79
net/netfilter/nf_conntrack_netlink.c
View file

@ -1237,8 +1237,8 @@ nfattr_failure:
#endif #endif
static int ctnetlink_exp_done(struct netlink_callback *cb) static int ctnetlink_exp_done(struct netlink_callback *cb)
{ {
if (cb->args[0]) if (cb->args[1])
nf_ct_expect_put((struct nf_conntrack_expect *)cb->args[0]); nf_ct_expect_put((struct nf_conntrack_expect *)cb->args[1]);
return 0; return 0;
} }
@ -1246,35 +1246,37 @@ static int
ctnetlink_exp_dump_table(struct sk_buff *skb, struct netlink_callback *cb) ctnetlink_exp_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
{ {
struct nf_conntrack_expect *exp, *last; struct nf_conntrack_expect *exp, *last;
struct list_head *i;
struct nfgenmsg *nfmsg = NLMSG_DATA(cb->nlh); struct nfgenmsg *nfmsg = NLMSG_DATA(cb->nlh);
struct hlist_node *n;
u_int8_t l3proto = nfmsg->nfgen_family; u_int8_t l3proto = nfmsg->nfgen_family;
read_lock_bh(&nf_conntrack_lock); read_lock_bh(&nf_conntrack_lock);
last = (struct nf_conntrack_expect *)cb->args[0]; last = (struct nf_conntrack_expect *)cb->args[1];
for (; cb->args[0] < nf_ct_expect_hsize; cb->args[0]++) {
restart: restart:
list_for_each_prev(i, &nf_ct_expect_list) { hlist_for_each_entry(exp, n, &nf_ct_expect_hash[cb->args[0]],
exp = (struct nf_conntrack_expect *) i; hnode) {
if (l3proto && exp->tuple.src.l3num != l3proto) if (l3proto && exp->tuple.src.l3num != l3proto)
continue;
if (cb->args[0]) {
if (exp != last)
continue; continue;
cb->args[0] = 0; if (cb->args[1]) {
if (exp != last)
continue;
cb->args[1] = 0;
}
if (ctnetlink_exp_fill_info(skb, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
IPCTNL_MSG_EXP_NEW,
1, exp) < 0) {
atomic_inc(&exp->use);
cb->args[1] = (unsigned long)exp;
goto out;
}
} }
if (ctnetlink_exp_fill_info(skb, NETLINK_CB(cb->skb).pid, if (cb->args[1]) {
cb->nlh->nlmsg_seq, cb->args[1] = 0;
IPCTNL_MSG_EXP_NEW, goto restart;
1, exp) < 0) {
atomic_inc(&exp->use);
cb->args[0] = (unsigned long)exp;
goto out;
} }
} }
if (cb->args[0]) {
cb->args[0] = 0;
goto restart;
}
out: out:
read_unlock_bh(&nf_conntrack_lock); read_unlock_bh(&nf_conntrack_lock);
if (last) if (last)
@ -1354,11 +1356,13 @@ static int
ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb, ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb,
struct nlmsghdr *nlh, struct nfattr *cda[]) struct nlmsghdr *nlh, struct nfattr *cda[])
{ {
struct nf_conntrack_expect *exp, *tmp; struct nf_conntrack_expect *exp;
struct nf_conntrack_tuple tuple; struct nf_conntrack_tuple tuple;
struct nf_conntrack_helper *h; struct nf_conntrack_helper *h;
struct nfgenmsg *nfmsg = NLMSG_DATA(nlh); struct nfgenmsg *nfmsg = NLMSG_DATA(nlh);
struct hlist_node *n, *next;
u_int8_t u3 = nfmsg->nfgen_family; u_int8_t u3 = nfmsg->nfgen_family;
unsigned int i;
int err; int err;
if (nfattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp)) if (nfattr_bad_size(cda, CTA_EXPECT_MAX, cta_min_exp))
@ -1390,6 +1394,7 @@ ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb,
nf_ct_expect_put(exp); nf_ct_expect_put(exp);
} else if (cda[CTA_EXPECT_HELP_NAME-1]) { } else if (cda[CTA_EXPECT_HELP_NAME-1]) {
char *name = NFA_DATA(cda[CTA_EXPECT_HELP_NAME-1]); char *name = NFA_DATA(cda[CTA_EXPECT_HELP_NAME-1]);
struct nf_conn_help *m_help;
/* delete all expectations for this helper */ /* delete all expectations for this helper */
write_lock_bh(&nf_conntrack_lock); write_lock_bh(&nf_conntrack_lock);
@ -1398,22 +1403,30 @@ ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb,
write_unlock_bh(&nf_conntrack_lock); write_unlock_bh(&nf_conntrack_lock);
return -EINVAL; return -EINVAL;
} }
list_for_each_entry_safe(exp, tmp, &nf_ct_expect_list, list) { for (i = 0; i < nf_ct_expect_hsize; i++) {
struct nf_conn_help *m_help = nfct_help(exp->master); hlist_for_each_entry_safe(exp, n, next,
if (m_help->helper == h &nf_ct_expect_hash[i],
&& del_timer(&exp->timeout)) { hnode) {
nf_ct_unlink_expect(exp); m_help = nfct_help(exp->master);
nf_ct_expect_put(exp); if (m_help->helper == h
&& del_timer(&exp->timeout)) {
nf_ct_unlink_expect(exp);
nf_ct_expect_put(exp);
}
} }
} }
write_unlock_bh(&nf_conntrack_lock); write_unlock_bh(&nf_conntrack_lock);
} else { } else {
/* This basically means we have to flush everything*/ /* This basically means we have to flush everything*/
write_lock_bh(&nf_conntrack_lock); write_lock_bh(&nf_conntrack_lock);
list_for_each_entry_safe(exp, tmp, &nf_ct_expect_list, list) { for (i = 0; i < nf_ct_expect_hsize; i++) {
if (del_timer(&exp->timeout)) { hlist_for_each_entry_safe(exp, n, next,
nf_ct_unlink_expect(exp); &nf_ct_expect_hash[i],
nf_ct_expect_put(exp); hnode) {
if (del_timer(&exp->timeout)) {
nf_ct_unlink_expect(exp);
nf_ct_expect_put(exp);
}
} }
} }
write_unlock_bh(&nf_conntrack_lock); write_unlock_bh(&nf_conntrack_lock);