Commit 5508ff7c authored Sep 16, 2022 by Zhengchao Shao Committed by Jakub Kicinski Sep 20, 2022

net/sched: use tc_cls_stats_dump() in filter



use tc_cls_stats_dump() in filter.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Tested-by: Victor Nogueira <victor@mojatatu.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent fe0df81d

net/sched/cls_basic.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -251,16 +251,9 @@ static void basic_walk(struct tcf_proto tp, struct tcf_walker arg,
	struct basic_filter *f;		struct basic_filter *f;

	list_for_each_entry(f, &head->flist, link) {		list_for_each_entry(f, &head->flist, link) {
	if (arg->count < arg->skip)		if (!tc_cls_stats_dump(tp, arg, f))
	goto skip;

	if (arg->fn(tp, f, arg) < 0) {
	arg->stop = 1;
	break;		break;
	}		}
	skip:
	arg->count++;
	}
	}		}

	static void basic_bind_class(void fh, u32 classid, unsigned long cl, void q,		static void basic_bind_class(void fh, u32 classid, unsigned long cl, void q,

net/sched/cls_bpf.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -650,15 +650,9 @@ static void cls_bpf_walk(struct tcf_proto tp, struct tcf_walker arg,
	struct cls_bpf_prog *prog;		struct cls_bpf_prog *prog;

	list_for_each_entry(prog, &head->plist, link) {		list_for_each_entry(prog, &head->plist, link) {
	if (arg->count < arg->skip)		if (!tc_cls_stats_dump(tp, arg, prog))
	goto skip;
	if (arg->fn(tp, prog, arg) < 0) {
	arg->stop = 1;
	break;		break;
	}		}
	skip:
	arg->count++;
	}
	}		}

	static int cls_bpf_reoffload(struct tcf_proto tp, bool add, flow_setup_cb_t cb,		static int cls_bpf_reoffload(struct tcf_proto tp, bool add, flow_setup_cb_t cb,

net/sched/cls_flow.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -683,15 +683,9 @@ static void flow_walk(struct tcf_proto tp, struct tcf_walker arg,
	struct flow_filter *f;		struct flow_filter *f;

	list_for_each_entry(f, &head->filters, list) {		list_for_each_entry(f, &head->filters, list) {
	if (arg->count < arg->skip)		if (!tc_cls_stats_dump(tp, arg, f))
	goto skip;
	if (arg->fn(tp, f, arg) < 0) {
	arg->stop = 1;
	break;		break;
	}		}
	skip:
	arg->count++;
	}
	}		}

	static struct tcf_proto_ops cls_flow_ops __read_mostly = {		static struct tcf_proto_ops cls_flow_ops __read_mostly = {

net/sched/cls_fw.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -358,16 +358,9 @@ static void fw_walk(struct tcf_proto tp, struct tcf_walker arg,

	for (f = rtnl_dereference(head->ht[h]); f;		for (f = rtnl_dereference(head->ht[h]); f;
	f = rtnl_dereference(f->next)) {		f = rtnl_dereference(f->next)) {
	if (arg->count < arg->skip) {		if (!tc_cls_stats_dump(tp, arg, f))
	arg->count++;
	continue;
	}
	if (arg->fn(tp, f, arg) < 0) {
	arg->stop = 1;
	return;		return;
	}		}
	arg->count++;
	}
	}		}
	}		}

net/sched/cls_route.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -587,16 +587,9 @@ static void route4_walk(struct tcf_proto tp, struct tcf_walker arg,
	for (f = rtnl_dereference(b->ht[h1]);		for (f = rtnl_dereference(b->ht[h1]);
	f;		f;
	f = rtnl_dereference(f->next)) {		f = rtnl_dereference(f->next)) {
	if (arg->count < arg->skip) {		if (!tc_cls_stats_dump(tp, arg, f))
	arg->count++;
	continue;
	}
	if (arg->fn(tp, f, arg) < 0) {
	arg->stop = 1;
	return;		return;
	}		}
	arg->count++;
	}
	}		}
	}		}
	}		}