genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-05-20 19:47:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NETFILTER]: nf_conntrack_expect: use RCU for expectation hash

Browse Source 
Use RCU for expectation hash. This doesn't buy much for conntrack
runtime performance, but allows to reduce the use of nf_conntrack_lock
for /proc and nf_netlink_conntrack.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy
2008-01-31 04:38:19 -08:00
committed by David S. Miller
parent c52fbb410b
commit 7d0742da1c
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
View File

@@ -191,10 +191,12 @@ struct ct_expect_iter_state {
static struct hlist_node *ct_expect_get_first(struct seq_file *seq)
{
struct ct_expect_iter_state *st = seq->private;
struct hlist_node *n;
for (st->bucket = 0; st->bucket < nf_ct_expect_hsize; st->bucket++) {
if (!hlist_empty(&nf_ct_expect_hash[st->bucket]))
return nf_ct_expect_hash[st->bucket].first;
n = rcu_dereference(nf_ct_expect_hash[st->bucket].first);
if (n)
return n;
}
return NULL;
}
@@ -204,11 +206,11 @@ static struct hlist_node *ct_expect_get_next(struct seq_file *seq,
{
struct ct_expect_iter_state *st = seq->private;
head = head->next;
head = rcu_dereference(head->next);
while (head == NULL) {
if (++st->bucket >= nf_ct_expect_hsize)
return NULL;
head = nf_ct_expect_hash[st->bucket].first;
head = rcu_dereference(nf_ct_expect_hash[st->bucket].first);
}
return head;
}
@@ -225,7 +227,7 @@ static struct hlist_node *ct_expect_get_idx(struct seq_file *seq, loff_t pos)
static void *exp_seq_start(struct seq_file *seq, loff_t *pos)
{
read_lock_bh(&nf_conntrack_lock);
rcu_read_lock();
return ct_expect_get_idx(seq, *pos);
}
@@ -237,7 +239,7 @@ static void *exp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
static void exp_seq_stop(struct seq_file *seq, void *v)
{
read_unlock_bh(&nf_conntrack_lock);
rcu_read_unlock();
}
static int exp_seq_show(struct seq_file *s, void *v)