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

[XFRM] Optimize SA dumping

Browse Source 
Same comments as in "[XFRM] Optimize policy dumping"

The numbers are (20K SAs):
This commit is contained in:
Jamal Hadi Salim
2006-12-04 20:03:35 -08:00
committed by David S. Miller
parent baf5d743d1
commit 94b9bb5480
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
net/xfrm/xfrm_state.c
View File

@@ -1099,7 +1099,7 @@ int xfrm_state_walk(u8 proto, int (*func)(struct xfrm_state *, int, void*),
void *data) void *data)
{ {
int i; int i;
struct xfrm_state *x; struct xfrm_state *x, *last = NULL;
struct hlist_node *entry; struct hlist_node *entry;
int count = 0; int count = 0;
int err = 0; int err = 0;
@@ -1107,7 +1107,14 @@ int xfrm_state_walk(u8 proto, int (*func)(struct xfrm_state *, int, void*),
spin_lock_bh(&xfrm_state_lock); spin_lock_bh(&xfrm_state_lock);
for (i = 0; i <= xfrm_state_hmask; i++) { for (i = 0; i <= xfrm_state_hmask; i++) {
hlist_for_each_entry(x, entry, xfrm_state_bydst+i, bydst) { hlist_for_each_entry(x, entry, xfrm_state_bydst+i, bydst) {
if (xfrm_id_proto_match(x->id.proto, proto)) if (!xfrm_id_proto_match(x->id.proto, proto))
continue;
if (last) {
err = func(last, count, data);
if (err)
goto out;
}
last = x;
count++; count++;
} }
} }
@@ -1115,16 +1122,7 @@ int xfrm_state_walk(u8 proto, int (*func)(struct xfrm_state *, int, void*),
err = -ENOENT; err = -ENOENT;
goto out; goto out;
} }
err = func(last, 0, data);
for (i = 0; i <= xfrm_state_hmask; i++) {
hlist_for_each_entry(x, entry, xfrm_state_bydst+i, bydst) {
if (!xfrm_id_proto_match(x->id.proto, proto))
continue;
err = func(x, --count, data);
if (err)
goto out;
}
}
out: out:
spin_unlock_bh(&xfrm_state_lock); spin_unlock_bh(&xfrm_state_lock);
return err; return err;