Skip to content

Commit

Permalink
net: sched: set dedicated tcf_walker flag when tp is empty
Browse files Browse the repository at this point in the history
Using tcf_walker->stop flag to determine when tcf_walker->fn() was called
at least once is unreliable. Some classifiers set 'stop' flag on error
before calling walker callback, other classifiers used to call it with NULL
filter pointer when empty. In order to prevent further regressions, extend
tcf_walker structure with dedicated 'nonempty' flag. Set this flag in
tcf_walker->fn() implementation that is used to check if classifier has
filters configured.

Fixes: 8b64678 ("net: sched: refactor tp insert/delete for concurrent execution")
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Suggested-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vlad Buslov authored and David S. Miller committed Feb 25, 2019
1 parent e3af71a commit 6676d5e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
1 change: 1 addition & 0 deletions include/net/pkt_cls.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ struct tcf_walker {
int stop;
int skip;
int count;
bool nonempty;
unsigned long cookie;
int (*fn)(struct tcf_proto *, void *node, struct tcf_walker *);
};
Expand Down
13 changes: 9 additions & 4 deletions net/sched/cls_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -238,18 +238,23 @@ static void tcf_proto_put(struct tcf_proto *tp, bool rtnl_held,
tcf_proto_destroy(tp, rtnl_held, extack);
}

static int walker_noop(struct tcf_proto *tp, void *d, struct tcf_walker *arg)
static int walker_check_empty(struct tcf_proto *tp, void *d,
struct tcf_walker *arg)
{
return -1;
if (tp) {
arg->nonempty = true;
return -1;
}
return 0;
}

static bool tcf_proto_is_empty(struct tcf_proto *tp, bool rtnl_held)
{
struct tcf_walker walker = { .fn = walker_noop, };
struct tcf_walker walker = { .fn = walker_check_empty, };

if (tp->ops->walk) {
tp->ops->walk(tp, &walker, rtnl_held);
return !walker.stop;
return !walker.nonempty;
}
return true;
}
Expand Down

0 comments on commit 6676d5e

Please sign in to comment.