On Wed, 28 Apr 2021 at 15:10, Odin Ugedal <odin@xxxxxxxxxx> wrote: > > Hi, > > > Would be good to mention that the problem happens only if the new cfs_rq has > > been removed from the leaf_cfs_rq_list because its PELT metrics were already > > null. In such case __update_blocked_fair() never updates the blocked load of > > the new cfs_rq and never propagate the removed load in the hierarchy. > > Well, it does technically occur when PELT metrics were null and therefore > removed from this leaf_cfs_rq_list, that is correct. We do however not add > newly created cfs_rq's to leaf_cfs_rq_list, so that is also a reason for it You're right that we wait for the 1st task to be enqueued to add the cfs_rq in the list > to occur. Most users of cgroups are probably creating a new cgroup and then > attaching a process to it, so I think that will be the _biggest_ issue. Yes, I agree that according to your sequence, your problem mainly comes from this and not the commit below > > > The fix tag should be : > > Fixes: 039ae8bcf7a5 ("sched/fair: Fix O(nr_cgroups) in the load balancing path") > > > > This patch re-introduced the del of idle cfs_rq from leaf_cfs_rq_list in order to > > skip useless update of blocked load. > > Thanks for pointing me at that patch! A quick look makes me think that that > commit caused the issue to occur _more often_, but was not the one that > introduced it. I should probably investigate a bit more tho., since I didn't > dig that deep in it. It is not a clean revert for that patch on v5.12, > but I did apply the diff below to test. It is essentially what the patch > 039ae8bcf7a5 does, as far as I see. There might however been more commits > beteen those, so I might take a look further behind to see. > > Doing this does make the problem less severe, resulting in ~90/10 load on the > example that without the diff results in ~99/1. So with this diff/reverting > 039ae8bcf7a5, there is still an issue. > > Should I keep two "Fixes", or should I just take one of them? You can keep both fixes tags > > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index 794c2cb945f8..5fac4fbf6f84 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -7941,8 +7941,8 @@ static bool __update_blocked_fair(struct rq *rq, > bool *done) > * There can be a lot of idle CPU cgroups. Don't let fully > * decayed cfs_rqs linger on the list. > */ > - if (cfs_rq_is_decayed(cfs_rq)) > - list_del_leaf_cfs_rq(cfs_rq); > + // if (cfs_rq_is_decayed(cfs_rq)) > + // list_del_leaf_cfs_rq(cfs_rq); > > /* Don't need periodic decay once load/util_avg are null */ > if (cfs_rq_has_blocked(cfs_rq)) > > > propagate_entity_cfs_rq() already goes across the tg tree to > > propagate the attach/detach. > > > > would be better to call list_add_leaf_cfs_rq(cfs_rq) inside this function > > instead of looping twice the tg tree. Something like: > > > > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > > index 33b1ee31ae0f..18441ce7316c 100644 > > --- a/kernel/sched/fair.c > > +++ b/kernel/sched/fair.c > > @@ -11026,10 +11026,10 @@ static void propagate_entity_cfs_rq(struct sched_entity *se) > > for_each_sched_entity(se) { > > cfs_rq = cfs_rq_of(se); > > > > - if (cfs_rq_throttled(cfs_rq)) > > - break; > > + if (!cfs_rq_throttled(cfs_rq)) > > + update_load_avg(cfs_rq, se, UPDATE_TG); > > > > - update_load_avg(cfs_rq, se, UPDATE_TG); > > + list_add_leaf_cfs_rq(cfs_rq); > > } > > } > > #else > > > Thanks for that feedback! > > I did think about that, but was not sure what would be the best one. > If it is "safe" to always run list_add_leaf_cfs_rq there (since it is used in If the cfs_rq is already in the list list_add_leaf_cfs_rq() will exit early but if it's not, we don't have to make sure that the whole branch in the list In fact, we can break as soon as list_add_leaf_cfs_rq() and cfs_rq_throttled() return true > more places than just on cgroup change and move to fair class), I do agree > that that is a better solution. Will test that, and post a new patch > if it works as expected. > > Also, the current code will exit from the loop in case a cfs_rq is throttled, > while your suggestion will keep looping. For list_add_leaf_cfs_rq that is fine > (and required), but should we keep running update_load_avg? I do think it is ok, When a cfs_rq is throttled, it is not accounted in its parent anymore so we don't have to update and propagate the load down. > and the likelihood of a cfs_rq being throttled is not that high after all, so > I guess it doesn't really matter. > > Thanks > Odin