lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: connlimit: factor hlist search into new function

Browse Source 
Simplifies followup patch that introduces separate locks for each of
the hash slots.

Reviewed-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal
2014-03-07 14:37:09 +01:00
committed by Pablo Neira Ayuso
parent a4c2e8beba
commit 15cfd52895
1 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
net/netfilter/xt_connlimit.c
View File

@@ -92,30 +92,24 @@ same_source_net(const union nf_inet_addr *addr,
} }
} }
static int count_them(struct net *net, static int count_hlist(struct net *net,
struct xt_connlimit_data *data, struct hlist_head *head,
const struct nf_conntrack_tuple *tuple, const struct nf_conntrack_tuple *tuple,
const union nf_inet_addr *addr, const union nf_inet_addr *addr,
const union nf_inet_addr *mask, const union nf_inet_addr *mask,
u_int8_t family) u_int8_t family)
{ {
const struct nf_conntrack_tuple_hash *found; const struct nf_conntrack_tuple_hash *found;
struct xt_connlimit_conn *conn; struct xt_connlimit_conn *conn;
struct hlist_node *n; struct hlist_node *n;
struct nf_conn *found_ct; struct nf_conn *found_ct;
struct hlist_head *hash;
bool addit = true; bool addit = true;
int matches = 0; int matches = 0;
if (family == NFPROTO_IPV6)
hash = &data->iphash[connlimit_iphash6(addr, mask)];
else
hash = &data->iphash[connlimit_iphash(addr->ip & mask->ip)];
rcu_read_lock(); rcu_read_lock();
/* check the saved connections */ /* check the saved connections */
hlist_for_each_entry_safe(conn, n, hash, node) { hlist_for_each_entry_safe(conn, n, head, node) {
found = nf_conntrack_find_get(net, NF_CT_DEFAULT_ZONE, found = nf_conntrack_find_get(net, NF_CT_DEFAULT_ZONE,
&conn->tuple); &conn->tuple);
found_ct = NULL; found_ct = NULL;
@@ -166,13 +160,38 @@ static int count_them(struct net *net,
return -ENOMEM; return -ENOMEM;
conn->tuple = *tuple; conn->tuple = *tuple;
conn->addr = *addr; conn->addr = *addr;
hlist_add_head(&conn->node, hash); hlist_add_head(&conn->node, head);
++matches; ++matches;
} }
return matches; return matches;
} }
static int count_them(struct net *net,
struct xt_connlimit_data *data,
const struct nf_conntrack_tuple *tuple,
const union nf_inet_addr *addr,
const union nf_inet_addr *mask,
u_int8_t family)
{
struct hlist_head *hhead;
int count;
u32 hash;
if (family == NFPROTO_IPV6)
hash = connlimit_iphash6(addr, mask);
else
hash = connlimit_iphash(addr->ip & mask->ip);
hhead = &data->iphash[hash];
spin_lock_bh(&data->lock);
count = count_hlist(net, hhead, tuple, addr, mask, family);
spin_unlock_bh(&data->lock);
return count;
}
static bool static bool
connlimit_mt(const struct sk_buff *skb, struct xt_action_param *par) connlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)
{ {
@@ -202,10 +221,8 @@ connlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)
iph->daddr : iph->saddr; iph->daddr : iph->saddr;
} }
spin_lock_bh(&info->data->lock);
connections = count_them(net, info->data, tuple_ptr, &addr, connections = count_them(net, info->data, tuple_ptr, &addr,
&info->mask, par->family); &info->mask, par->family);
spin_unlock_bh(&info->data->lock);
if (connections < 0) if (connections < 0)
/* kmalloc failed, drop it entirely */ /* kmalloc failed, drop it entirely */