Commit c4df1bdd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-sched-fix-stats-accounting-for-child-NOLOCK-qdiscs' 



Paolo Abeni says:

====================
net: sched: fix stats accounting for child NOLOCK qdiscs

Currently, stats accounting for NOLOCK qdisc enslaved to classful (lock)
qdiscs is buggy. Per CPU values are ignored in most places, as a result,
stats dump in the above scenario always report 0 length backlog and parent
backlog len is not updated correctly on NOLOCK qdisc removal.

The first patch address stats dumping, and the second one child qdisc removal.
I'm targeting the net tree as this is a bugfix, but it could be moved to
net-next due to the relatively large diffstat.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0db6f8be e5f0e8f8

include/net/sch_generic.h

+37 −7
Original line number Diff line number Diff line
@@ -923,6 +923,41 @@ static inline void qdisc_qstats_overlimit(struct Qdisc *sch) 
	sch->qstats.overlimits++;

}



static inline int qdisc_qstats_copy(struct gnet_dump *d, struct Qdisc *sch)

{

	__u32 qlen = qdisc_qlen_sum(sch);



	return gnet_stats_copy_queue(d, sch->cpu_qstats, &sch->qstats, qlen);

}



static inline void qdisc_qstats_qlen_backlog(struct Qdisc *sch,  __u32 *qlen,

					     __u32 *backlog)

{

	struct gnet_stats_queue qstats = { 0 };

	__u32 len = qdisc_qlen_sum(sch);



	__gnet_stats_copy_queue(&qstats, sch->cpu_qstats, &sch->qstats, len);

	*qlen = qstats.qlen;

	*backlog = qstats.backlog;

}



static inline void qdisc_tree_flush_backlog(struct Qdisc *sch)

{

	__u32 qlen, backlog;



	qdisc_qstats_qlen_backlog(sch, &qlen, &backlog);

	qdisc_tree_reduce_backlog(sch, qlen, backlog);

}



static inline void qdisc_purge_queue(struct Qdisc *sch)

{

	__u32 qlen, backlog;



	qdisc_qstats_qlen_backlog(sch, &qlen, &backlog);

	qdisc_reset(sch);

	qdisc_tree_reduce_backlog(sch, qlen, backlog);

}



static inline void qdisc_skb_head_init(struct qdisc_skb_head *qh)

{

	qh->head = NULL;
@@ -1106,13 +1141,8 @@ static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new, 
	sch_tree_lock(sch);

	old = *pold;

	*pold = new;

	if (old != NULL) {

		unsigned int qlen = old->q.qlen;

		unsigned int backlog = old->qstats.backlog;



		qdisc_reset(old);

		qdisc_tree_reduce_backlog(old, qlen, backlog);

	}

	if (old != NULL)

		qdisc_tree_flush_backlog(old);

	sch_tree_unlock(sch);



	return old;

net/sched/sch_cbq.c

+4 −6
Original line number Diff line number Diff line
@@ -1358,9 +1358,11 @@ cbq_dump_class_stats(struct Qdisc *sch, unsigned long arg, 
{

	struct cbq_sched_data *q = qdisc_priv(sch);

	struct cbq_class *cl = (struct cbq_class *)arg;

	__u32 qlen;



	cl->xstats.avgidle = cl->avgidle;

	cl->xstats.undertime = 0;

	qdisc_qstats_qlen_backlog(cl->q, &qlen, &cl->qstats.backlog);



	if (cl->undertime != PSCHED_PASTPERFECT)

		cl->xstats.undertime = cl->undertime - q->now;
@@ -1368,7 +1370,7 @@ cbq_dump_class_stats(struct Qdisc *sch, unsigned long arg, 
	if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),

				  d, NULL, &cl->bstats) < 0 ||

	    gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||

	    gnet_stats_copy_queue(d, NULL, &cl->qstats, cl->q->q.qlen) < 0)

	    gnet_stats_copy_queue(d, NULL, &cl->qstats, qlen) < 0)

		return -1;



	return gnet_stats_copy_app(d, &cl->xstats, sizeof(cl->xstats));
@@ -1665,17 +1667,13 @@ static int cbq_delete(struct Qdisc *sch, unsigned long arg) 
{

	struct cbq_sched_data *q = qdisc_priv(sch);

	struct cbq_class *cl = (struct cbq_class *)arg;

	unsigned int qlen, backlog;



	if (cl->filters || cl->children || cl == &q->link)

		return -EBUSY;



	sch_tree_lock(sch);



	qlen = cl->q->q.qlen;

	backlog = cl->q->qstats.backlog;

	qdisc_reset(cl->q);

	qdisc_tree_reduce_backlog(cl->q, qlen, backlog);

	qdisc_purge_queue(cl->q);



	if (cl->next_alive)

		cbq_deactivate_class(cl);

net/sched/sch_drr.c

+4 −12
Original line number Diff line number Diff line
@@ -50,15 +50,6 @@ static struct drr_class *drr_find_class(struct Qdisc *sch, u32 classid) 
	return container_of(clc, struct drr_class, common);

}



static void drr_purge_queue(struct drr_class *cl)

{

	unsigned int len = cl->qdisc->q.qlen;

	unsigned int backlog = cl->qdisc->qstats.backlog;



	qdisc_reset(cl->qdisc);

	qdisc_tree_reduce_backlog(cl->qdisc, len, backlog);

}



static const struct nla_policy drr_policy[TCA_DRR_MAX + 1] = {

	[TCA_DRR_QUANTUM]	= { .type = NLA_U32 },

};
@@ -167,7 +158,7 @@ static int drr_delete_class(struct Qdisc *sch, unsigned long arg) 


	sch_tree_lock(sch);



	drr_purge_queue(cl);

	qdisc_purge_queue(cl->qdisc);

	qdisc_class_hash_remove(&q->clhash, &cl->common);



	sch_tree_unlock(sch);
@@ -269,7 +260,8 @@ static int drr_dump_class_stats(struct Qdisc *sch, unsigned long arg, 
				struct gnet_dump *d)

{

	struct drr_class *cl = (struct drr_class *)arg;

	__u32 qlen = cl->qdisc->q.qlen;

	__u32 qlen = qdisc_qlen_sum(cl->qdisc);

	struct Qdisc *cl_q = cl->qdisc;

	struct tc_drr_stats xstats;



	memset(&xstats, 0, sizeof(xstats));
@@ -279,7 +271,7 @@ static int drr_dump_class_stats(struct Qdisc *sch, unsigned long arg, 
	if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),

				  d, NULL, &cl->bstats) < 0 ||

	    gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||

	    gnet_stats_copy_queue(d, NULL, &cl->qdisc->qstats, qlen) < 0)

	    gnet_stats_copy_queue(d, cl_q->cpu_qstats, &cl_q->qstats, qlen) < 0)

		return -1;



	return gnet_stats_copy_app(d, &xstats, sizeof(xstats));

net/sched/sch_hfsc.c

+5 −14
Original line number Diff line number Diff line
@@ -844,16 +844,6 @@ qdisc_peek_len(struct Qdisc *sch) 
	return len;

}



static void

hfsc_purge_queue(struct Qdisc *sch, struct hfsc_class *cl)

{

	unsigned int len = cl->qdisc->q.qlen;

	unsigned int backlog = cl->qdisc->qstats.backlog;



	qdisc_reset(cl->qdisc);

	qdisc_tree_reduce_backlog(cl->qdisc, len, backlog);

}



static void

hfsc_adjust_levels(struct hfsc_class *cl)

{
@@ -1076,7 +1066,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid, 
	qdisc_class_hash_insert(&q->clhash, &cl->cl_common);

	list_add_tail(&cl->siblings, &parent->children);

	if (parent->level == 0)

		hfsc_purge_queue(sch, parent);

		qdisc_purge_queue(parent->qdisc);

	hfsc_adjust_levels(parent);

	sch_tree_unlock(sch);
@@ -1112,7 +1102,7 @@ hfsc_delete_class(struct Qdisc *sch, unsigned long arg) 
	list_del(&cl->siblings);

	hfsc_adjust_levels(cl->cl_parent);



	hfsc_purge_queue(sch, cl);

	qdisc_purge_queue(cl->qdisc);

	qdisc_class_hash_remove(&q->clhash, &cl->cl_common);



	sch_tree_unlock(sch);
@@ -1328,8 +1318,9 @@ hfsc_dump_class_stats(struct Qdisc *sch, unsigned long arg, 
{

	struct hfsc_class *cl = (struct hfsc_class *)arg;

	struct tc_hfsc_stats xstats;

	__u32 qlen;



	cl->qstats.backlog = cl->qdisc->qstats.backlog;

	qdisc_qstats_qlen_backlog(cl->qdisc, &qlen, &cl->qstats.backlog);

	xstats.level   = cl->level;

	xstats.period  = cl->cl_vtperiod;

	xstats.work    = cl->cl_total;
@@ -1337,7 +1328,7 @@ hfsc_dump_class_stats(struct Qdisc *sch, unsigned long arg, 


	if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch), d, NULL, &cl->bstats) < 0 ||

	    gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||

	    gnet_stats_copy_queue(d, NULL, &cl->qstats, cl->qdisc->q.qlen) < 0)

	    gnet_stats_copy_queue(d, NULL, &cl->qstats, qlen) < 0)

		return -1;



	return gnet_stats_copy_app(d, &xstats, sizeof(xstats));

net/sched/sch_htb.c

+6 −16
Original line number Diff line number Diff line
@@ -1127,10 +1127,9 @@ htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d) 
	};

	__u32 qlen = 0;



	if (!cl->level && cl->leaf.q) {

		qlen = cl->leaf.q->q.qlen;

		qs.backlog = cl->leaf.q->qstats.backlog;

	}

	if (!cl->level && cl->leaf.q)

		qdisc_qstats_qlen_backlog(cl->leaf.q, &qlen, &qs.backlog);



	cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens),

				    INT_MIN, INT_MAX);

	cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens),
@@ -1270,13 +1269,8 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) 


	sch_tree_lock(sch);



	if (!cl->level) {

		unsigned int qlen = cl->leaf.q->q.qlen;

		unsigned int backlog = cl->leaf.q->qstats.backlog;



		qdisc_reset(cl->leaf.q);

		qdisc_tree_reduce_backlog(cl->leaf.q, qlen, backlog);

	}

	if (!cl->level)

		qdisc_purge_queue(cl->leaf.q);



	/* delete from hash and active; remainder in destroy_class */

	qdisc_class_hash_remove(&q->clhash, &cl->common);
@@ -1404,12 +1398,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, 
					  classid, NULL);

		sch_tree_lock(sch);

		if (parent && !parent->level) {

			unsigned int qlen = parent->leaf.q->q.qlen;

			unsigned int backlog = parent->leaf.q->qstats.backlog;



			/* turn parent into inner node */

			qdisc_reset(parent->leaf.q);

			qdisc_tree_reduce_backlog(parent->leaf.q, qlen, backlog);

			qdisc_purge_queue(parent->leaf.q);

			qdisc_put(parent->leaf.q);

			if (parent->prio_activity)

				htb_deactivate(q, parent);

CRA Git | Maintained and supported by SUSTech CRA and CCSE