Commit ab12cb47 authored by Michal Soltys's avatar Michal Soltys Committed by David S. Miller
Browse files

net/sched/sch_hfsc.c: go passive after vt update 



When a class is going passive, it should update its cl_vt first
to be consistent with the last dequeue operation.

Otherwise its cl_vt will be one packet behind and parent's cvtmax might
not be updated as well.

One possible side effect is if some class goes passive and subsequently
goes active /without/ its parent going passive - with cl_vt lagging one
packet behind - comparison made in init_vf() will be affected (same
period).

Signed-off-by: default avatarMichal Soltys <soltys@ziu.info>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2354f056

net/sched/sch_hfsc.c

+15 −16
Original line number Diff line number Diff line
@@ -778,6 +778,20 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time) 
		else

			go_passive = 0;



		/* update vt */

		cl->cl_vt = rtsc_y2x(&cl->cl_virtual, cl->cl_total)

			    - cl->cl_vtoff + cl->cl_vtadj;



		/*

		 * if vt of the class is smaller than cvtmin,

		 * the class was skipped in the past due to non-fit.

		 * if so, we need to adjust vtadj.

		 */

		if (cl->cl_vt < cl->cl_parent->cl_cvtmin) {

			cl->cl_vtadj += cl->cl_parent->cl_cvtmin - cl->cl_vt;

			cl->cl_vt = cl->cl_parent->cl_cvtmin;

		}



		if (go_passive) {

			/* no more active child, going passive */
@@ -794,25 +808,10 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time) 
			continue;

		}



		/*

		 * update vt and f

		 */

		cl->cl_vt = rtsc_y2x(&cl->cl_virtual, cl->cl_total)

			    - cl->cl_vtoff + cl->cl_vtadj;



		/*

		 * if vt of the class is smaller than cvtmin,

		 * the class was skipped in the past due to non-fit.

		 * if so, we need to adjust vtadj.

		 */

		if (cl->cl_vt < cl->cl_parent->cl_cvtmin) {

			cl->cl_vtadj += cl->cl_parent->cl_cvtmin - cl->cl_vt;

			cl->cl_vt = cl->cl_parent->cl_cvtmin;

		}



		/* update the vt tree */

		vttree_update(cl);



		/* update f */

		if (cl->cl_flags & HFSC_USC) {

			cl->cl_myf = cl->cl_myfadj + rtsc_y2x(&cl->cl_ulimit,

							      cl->cl_total);

CRA Git | Maintained and supported by SUSTech CRA and CCSE