Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94b9bb54 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[XFRM] Optimize SA dumping 

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

The numbers are (20K SAs):
parent baf5d743

net/xfrm/xfrm_state.c

+11 −13
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ int xfrm_state_walk(u8 proto, int (*func)(struct xfrm_state *, int, void*), 
		    void *data)

{

	int i;

	struct xfrm_state *x;

	struct xfrm_state *x, *last = NULL;

	struct hlist_node *entry;

	int count = 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);

	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))

			if (!xfrm_id_proto_match(x->id.proto, proto))

				continue;

			if (last) {

				err = func(last, count, data);

				if (err)

					goto out;

			}

			last = x;

			count++;

		}

	}
@@ -1115,16 +1122,7 @@ int xfrm_state_walk(u8 proto, int (*func)(struct xfrm_state *, int, void*), 
		err = -ENOENT;

		goto out;

	}



	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;

		}

	}

	err = func(last, 0, data);

out:

	spin_unlock_bh(&xfrm_state_lock);

	return err;