From patchwork Tue May 24 08:55:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 68442 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp512708qge; Tue, 24 May 2016 01:56:09 -0700 (PDT) X-Received: by 10.98.98.6 with SMTP id w6mr5142891pfb.0.1464080169701; Tue, 24 May 2016 01:56:09 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dt12si3493116pac.0.2016.05.24.01.56.09; Tue, 24 May 2016 01:56:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754899AbcEXI4F (ORCPT + 30 others); Tue, 24 May 2016 04:56:05 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:36453 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754851AbcEXI4B (ORCPT ); Tue, 24 May 2016 04:56:01 -0400 Received: by mail-wm0-f53.google.com with SMTP id n129so117882479wmn.1 for ; Tue, 24 May 2016 01:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ASDqBGrTooRgzNwikK7Pb2gy/O4lJLayUuhUA6DKUH8=; b=dts6Avt5P/70ob6p8cVtI6DUEx6XKHOiaO7YNGy7JuxiS8QXgxePZ3NicHgLAd9ZCi a3RkfjH3TsqkwAW8S5w0acXZSmD3TuS1ZclLZM36FMRUpTM4OSSAb/WSCgLDMWEhpbfS Qi42zwI29U89PMPl2d9ZhkGDr2rUIntqcojUY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ASDqBGrTooRgzNwikK7Pb2gy/O4lJLayUuhUA6DKUH8=; b=AtY+c7sCAe9m62dUqNyWfKiaEh3rkqzMjFS+HO0IhIpNDNmKdPpgKwjTyKacn0WAts T07+qlN0g8ZYSBEPPyD9wW1ThM+BJpWpEC6eHg546aLuBkHkG/QRqK4qbl3q7kBHCIMV 5ul5lf2OjqfsYJJKM0bo0Y/z7GfbfCljd/DLpHkok3G6tD/IEGf428clbyPzEQSd1+ij IbzGXtoeIzRzDkHgnSNIkXXr7tOtj/uV6imOrGxPSelVwQNYusBWzGVZIMoBBwMJ0C6L pzlNeKu7KcoXNLtTAdgNIy08wZ/+a54lwFByNTHcMcnrvgr7HexK7Hq8rRL/mec9luYi j0Yg== X-Gm-Message-State: ALyK8tIaZ3J0Uh5yVjXbIEzi13QdDqNv2hV6//kxyIK4q/Mpgmc8Ma7HsHswk0wG0FRQNATs X-Received: by 10.194.11.36 with SMTP id n4mr3325078wjb.10.1464080159740; Tue, 24 May 2016 01:55:59 -0700 (PDT) Received: from localhost.localdomain (pas72-3-88-189-71-117.fbx.proxad.net. [88.189.71.117]) by smtp.gmail.com with ESMTPSA id h14sm14556936wme.1.2016.05.24.01.55.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 May 2016 01:55:58 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, pjt@google.com Cc: yuyang.du@intel.com, dietmar.eggemann@arm.com, bsegall@google.com, Vincent Guittot Subject: [RFC PATCH] sched: fix hierarchical order in rq->leaf_cfs_rq_list Date: Tue, 24 May 2016 10:55:35 +0200 Message-Id: <1464080135-17112-1-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the insertion of cfs_rq in rq->leaf_cfs_rq_list to ensure that a child will always called before its parent. The hierarchical order in shares update list has been introduced by commit 67e86250f8ea ("sched: Introduce hierarchal order on shares update list") With the current implementation a child can be still put after its parent. Lets take the example of root \ b /\ c d* | e* with root -> b -> c already enqueued but not d -> e so the leaf_cfs_rq_list looks like: head -> c -> b -> root -> tail The branch d -> e will be added the first time that they are enqueued, starting with e then d. When e is added, its parents is not already on the list so e is put at the tail : head -> c -> b -> root -> e -> tail Then, d is added at the head because its parent is already on the list: head -> d -> c -> b -> root -> e -> tail e is not placed at the right position and will be called the last whereas it should be called at the beginning. Because it follows the bottom-up enqueue sequence, we are sure that we will finished to add either a cfs_rq without parent or a cfs_rq with a parent that is already on the list. We can use this event to detect when we have finished to add a new branch. For the others, whose parents are not already added, we have to ensure that they will be added after their children that have just been inserted the steps before, and after any potential parents that are already in the list. The easiest way is to put the cfs_rq just after the last inserted one and to keep track of it untl the branch is fully added. Signed-off-by: Vincent Guittot --- kernel/sched/core.c | 1 + kernel/sched/fair.c | 24 ++++++++++++++++++++---- kernel/sched/sched.h | 1 + 3 files changed, 22 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/kernel/sched/core.c b/kernel/sched/core.c index adcafda..ef97be4 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7351,6 +7351,7 @@ void __init sched_init(void) #ifdef CONFIG_FAIR_GROUP_SCHED root_task_group.shares = ROOT_TASK_GROUP_LOAD; INIT_LIST_HEAD(&rq->leaf_cfs_rq_list); + rq->leaf_alone = &rq->leaf_cfs_rq_list; /* * How much cpu bandwidth does root_task_group get? * diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b8a33ab..07f0f1b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -290,15 +290,31 @@ static inline void list_add_leaf_cfs_rq(struct cfs_rq *cfs_rq) * Ensure we either appear before our parent (if already * enqueued) or force our parent to appear after us when it is * enqueued. The fact that we always enqueue bottom-up - * reduces this to two cases. + * reduces this to two cases and a special case for the root + * cfs_rq. */ if (cfs_rq->tg->parent && cfs_rq->tg->parent->cfs_rq[cpu_of(rq_of(cfs_rq))]->on_list) { - list_add_rcu(&cfs_rq->leaf_cfs_rq_list, - &rq_of(cfs_rq)->leaf_cfs_rq_list); - } else { + /* Add the child just before its parent */ + list_add_tail_rcu(&cfs_rq->leaf_cfs_rq_list, + &(cfs_rq->tg->parent->cfs_rq[cpu_of(rq_of(cfs_rq))]->leaf_cfs_rq_list)); + rq_of(cfs_rq)->leaf_alone = &rq_of(cfs_rq)->leaf_cfs_rq_list; + } else if (!cfs_rq->tg->parent) { + /* + * cfs_rq without parent should be + * at the end of the list + */ list_add_tail_rcu(&cfs_rq->leaf_cfs_rq_list, &rq_of(cfs_rq)->leaf_cfs_rq_list); + rq_of(cfs_rq)->leaf_alone = &rq_of(cfs_rq)->leaf_cfs_rq_list; + } else { + /* + * Our parent has not already been added so make sure + * that it will be put after us + */ + list_add_rcu(&cfs_rq->leaf_cfs_rq_list, + rq_of(cfs_rq)->leaf_alone); + rq_of(cfs_rq)->leaf_alone = &cfs_rq->leaf_cfs_rq_list; } cfs_rq->on_list = 1; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 69da6fc..9693fe9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -607,6 +607,7 @@ struct rq { #ifdef CONFIG_FAIR_GROUP_SCHED /* list of leaf cfs_rq on this cpu: */ struct list_head leaf_cfs_rq_list; + struct list_head *leaf_alone; #endif /* CONFIG_FAIR_GROUP_SCHED */ /*