Commit 9f8550e4 authored by Eyal Birger's avatar Eyal Birger Committed by Steffen Klassert
Browse files

xfrm: fix disable_xfrm sysctl when used on xfrm interfaces 



The disable_xfrm flag signals that xfrm should not be performed during
routing towards a device before reaching device xmit.

For xfrm interfaces this is usually desired as they perform the outbound
policy lookup as part of their xmit using their if_id.

Before this change enabling this flag on xfrm interfaces prevented them
from xmitting as xfrm_lookup_with_ifid() would not perform a policy lookup
in case the original dst had the DST_NOXFRM flag.

This optimization is incorrect when the lookup is done by the xfrm
interface xmit logic.

Fix by performing policy lookup when invoked by xfrmi as if_id != 0.

Similarly it's unlikely for the 'no policy exists on net' check to yield
any performance benefits when invoked from xfrmi.

Fixes: f203b76d ("xfrm: Add virtual xfrm interfaces")
Signed-off-by: default avatarEyal Birger <eyal.birger@gmail.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 56ce7c25

net/xfrm/xfrm_policy.c

+2 −2
Original line number Diff line number Diff line
@@ -3078,8 +3078,8 @@ struct dst_entry *xfrm_lookup_with_ifid(struct net *net, 
		xflo.flags = flags;



		/* To accelerate a bit...  */

		if ((dst_orig->flags & DST_NOXFRM) ||

		    !net->xfrm.policy_count[XFRM_POLICY_OUT])

		if (!if_id && ((dst_orig->flags & DST_NOXFRM) ||

			       !net->xfrm.policy_count[XFRM_POLICY_OUT]))

			goto nopol;



		xdst = xfrm_bundle_lookup(net, fl, family, dir, &xflo, if_id);