From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756049AbcIUNiX (ORCPT ); Wed, 21 Sep 2016 09:38:23 -0400 Received: from mail-lf0-f46.google.com ([209.85.215.46]:36710 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754740AbcIUNiT (ORCPT ); Wed, 21 Sep 2016 09:38:19 -0400 From: Matt Fleming To: Peter Zijlstra , Ingo Molnar Cc: Byungchul Park , Frederic Weisbecker , Luca Abeni , Rik van Riel , Thomas Gleixner , Wanpeng Li , Yuyang Du , Petr Mladek , Jan Kara , Sergey Senozhatsky , linux-kernel@vger.kernel.org, Mel Gorman , Mike Galbraith , Matt Fleming Subject: [PATCH v2 2/7] sched/fair: Update rq clock before waking up new task Date: Wed, 21 Sep 2016 14:38:08 +0100 Message-Id: <20160921133813.31976-3-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160921133813.31976-1-matt@codeblueprint.co.uk> References: <20160921133813.31976-1-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When initialising an entity's util and load averages we need an up to date runqueue clock. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Mel Gorman Cc: Mike Galbraith Signed-off-by: Matt Fleming --- kernel/sched/fair.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index ab1cf3866a5b..7f8a61e97599 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -731,7 +731,10 @@ void post_init_entity_util_avg(struct sched_entity *se) struct cfs_rq *cfs_rq = cfs_rq_of(se); struct sched_avg *sa = &se->avg; long cap = (long)(SCHED_CAPACITY_SCALE - cfs_rq->avg.util_avg) / 2; - u64 now = cfs_rq_clock_task(cfs_rq); + u64 now; + + update_rq_clock(rq_of(cfs_rq)); + now = cfs_rq_clock_task(cfs_rq); if (cap > 0) { if (cfs_rq->avg.util_avg != 0) { -- 2.9.3