diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2017-05-23 09:11:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-25 18:11:49 +0200 |
| commit | ee538dcea28930bd95606fe00a834935d6fb5613 (patch) | |
| tree | 79dde84b56787905c8e914c5f7e649459c50bd59 /net/sched | |
| parent | Merge tag 'mlx5-update-2017-05-23' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-ee538dcea28930bd95606fe00a834935d6fb5613.tar.xz linux-ee538dcea28930bd95606fe00a834935d6fb5613.zip | |
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: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_api.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 01a8b8b4bab8..89fbb35bc666 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -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 @@ reclassify: 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 @@ reset: return TC_ACT_SHOT; } - tp = old_tp; + tp = first_tp; protocol = tc_skb_protocol(skb); goto reclassify; #endif |