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

Commit ee538dce authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: cls_api: make reclassify return all the way back to the original tp 



With the introduction of chain goto action, the reclassification would
cause the re-iteration of the actual chain. It makes more sense to restart
the whole thing and re-iterate starting from the original tp - start
of chain 0.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent abc7a4ef

net/sched/cls_api.c

+5 −3
Original line number Diff line number Diff line
@@ -300,7 +300,8 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
	__be16 protocol = tc_skb_protocol(skb);

#ifdef CONFIG_NET_CLS_ACT

	const int max_reclassify_loop = 4;

	const struct tcf_proto *old_tp = tp;

	const struct tcf_proto *orig_tp = tp;

	const struct tcf_proto *first_tp;

	int limit = 0;



reclassify:
@@ -315,9 +316,10 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
		err = tp->classify(skb, tp, res);

#ifdef CONFIG_NET_CLS_ACT

		if (unlikely(err == TC_ACT_RECLASSIFY && !compat_mode)) {

			first_tp = orig_tp;

			goto reset;

		} else if (unlikely(TC_ACT_EXT_CMP(err, TC_ACT_GOTO_CHAIN))) {

			old_tp = res->goto_tp;

			first_tp = res->goto_tp;

			goto reset;

		}

#endif
@@ -335,7 +337,7 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
		return TC_ACT_SHOT;

	}



	tp = old_tp;

	tp = first_tp;

	protocol = tc_skb_protocol(skb);

	goto reclassify;

#endif