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

Commit 8faf491e authored by Li RongQing's avatar Li RongQing Committed by Steffen Klassert
Browse files

xfrm: optimise to search the inexact policy list 



The policies are organized into list by priority ascent of policy,
so it is unnecessary to continue to loop the policy if the priority
of current looped police is larger than or equal priority which is
from the policy_bydst list.

This allows to match policy with ~0U priority in inexact list too.

Signed-off-by: default avatarLi RongQing <roy.qing.li@gmail.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent de2ad486

net/xfrm/xfrm_policy.c

+8 −3
Original line number Diff line number Diff line
@@ -1114,6 +1114,9 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 
	}

	chain = &net->xfrm.policy_inexact[dir];

	hlist_for_each_entry(pol, chain, bydst) {

		if ((pol->priority >= priority) && ret)

			break;



		err = xfrm_policy_match(pol, fl, type, family, dir);

		if (err) {

			if (err == -ESRCH)
@@ -1122,7 +1125,7 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 
				ret = ERR_PTR(err);

				goto fail;

			}

		} else if (pol->priority < priority) {

		} else {

			ret = pol;

			break;

		}
@@ -3203,9 +3206,11 @@ static struct xfrm_policy *xfrm_migrate_policy_find(const struct xfrm_selector * 
	}

	chain = &net->xfrm.policy_inexact[dir];

	hlist_for_each_entry(pol, chain, bydst) {

		if ((pol->priority >= priority) && ret)

			break;



		if (xfrm_migrate_selector_match(sel, &pol->selector) &&

		    pol->type == type &&

		    pol->priority < priority) {

		    pol->type == type) {

			ret = pol;

			break;

		}