From patchwork Mon Sep 12 07:47:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 75970 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp725684qgf; Mon, 12 Sep 2016 00:49:04 -0700 (PDT) X-Received: by 10.66.193.199 with SMTP id hq7mr12290607pac.70.1473666541776; Mon, 12 Sep 2016 00:49:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i65si20411123pfb.261.2016.09.12.00.49.01; Mon, 12 Sep 2016 00:49:01 -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 S932677AbcILHs4 (ORCPT + 27 others); Mon, 12 Sep 2016 03:48:56 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:38502 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753142AbcILHsv (ORCPT ); Mon, 12 Sep 2016 03:48:51 -0400 Received: by mail-wm0-f52.google.com with SMTP id 1so129139475wmz.1 for ; Mon, 12 Sep 2016 00:48:51 -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:in-reply-to:references; bh=r52vYq7Z6+KA5/XX6vYVm3VDrEMbNdYV9seabSU+JMU=; b=YxrkxWVZkOKTRIjNgLwltFT+sCCO5XSKWyRfVzKalqxDqqdc7D3eASe1sv+OQoXauy tufzVvNudrm5PiWfFfbEbhvPbQhh37hobthts6FPwNoQAfVzWUtCJ6S7Z8VGdl1Yk2/2 iH8EURAEF1160b0hhtEUURK2jAxFQoKwbP63w= 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:in-reply-to :references; bh=r52vYq7Z6+KA5/XX6vYVm3VDrEMbNdYV9seabSU+JMU=; b=cGLeHdmOWXe61GGI2DEJosoyO1Dr5Nq0nXsoaveyookZXGvKtw2DrXHCcbXVKAfYBK ZLdQ4BxFUd8RzAbuxCzQpVp/z1UP/44lFl0QD35yjlZrkI/RRpWH9ItsRL4hSQBUOmJV OWPJBTrJk2tl8AsrpyOpk81e1UDeNSPA61PTFe2OGv8FAX9vLk5GMKe6W108p+7buFzb t63Mo4zD4RjL1OVpzF4UaeAffauiz3ZoE58pef4HhwLcPjzmq0VtyQDEOfSDOm4Vaxee fpvjpB6f7O69g/5VexBTKkWlY+68yIkm7QwkXWGbQj/QZK4YRg/mVimtNY2MCtDAh2mt A2LQ== X-Gm-Message-State: AE9vXwNVIUvvGHKqy0mK1WuOvDAoBCa/M2PaohcnFlVTTXV+cJ8uHMeIGdDeEWgP2ktBALaU X-Received: by 10.28.107.24 with SMTP id g24mr9571009wmc.12.1473666525243; Mon, 12 Sep 2016 00:48:45 -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 i195sm16502821wmg.14.2016.09.12.00.48.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Sep 2016 00:48:44 -0700 (PDT) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, yuyang.du@intel.com, Morten.Rasmussen@arm.com Cc: linaro-kernel@lists.linaro.org, dietmar.eggemann@arm.com, pjt@google.com, bsegall@google.com, Vincent Guittot Subject: [PATCH 7/7 v3] sched: fix wrong utilization accounting when switching to fair class Date: Mon, 12 Sep 2016 09:47:52 +0200 Message-Id: <1473666472-13749-8-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473666472-13749-1-git-send-email-vincent.guittot@linaro.org> References: <1473666472-13749-1-git-send-email-vincent.guittot@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When a task switches to fair scheduling class, the period between now and the last update of its utilization is accounted as running time whatever happened during this period. This wrong accounting applies to the task and also to the task group branch. When changing the property of a running task like its list of allowed CPUs or its scheduling class, we follow the sequence: -dequeue task -put task -change the property -set task as current task -enqueue task The end of the sequence doesn't follow the normal sequence which is : -enqueue a task -then set the task as current task. This wrong ordering is the root cause of wrong utilization accounting. Update the sequence to follow the right one: -dequeue task -put task -change the property -enqueue task -set task as current task Signed-off-by: Vincent Guittot --- kernel/sched/core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 1.9.1 diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3e52d08..7a9c9b9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1105,10 +1105,10 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) p->sched_class->set_cpus_allowed(p, new_mask); - if (running) - p->sched_class->set_curr_task(rq); if (queued) enqueue_task(rq, p, ENQUEUE_RESTORE); + if (running) + p->sched_class->set_curr_task(rq); } /* @@ -3687,10 +3687,10 @@ void rt_mutex_setprio(struct task_struct *p, int prio) p->prio = prio; - if (running) - p->sched_class->set_curr_task(rq); if (queued) enqueue_task(rq, p, queue_flag); + if (running) + p->sched_class->set_curr_task(rq); check_class_changed(rq, p, prev_class, oldprio); out_unlock: @@ -4243,8 +4243,6 @@ static int __sched_setscheduler(struct task_struct *p, prev_class = p->sched_class; __setscheduler(rq, p, attr, pi); - if (running) - p->sched_class->set_curr_task(rq); if (queued) { /* * We enqueue to tail when the priority of a task is @@ -4255,6 +4253,8 @@ static int __sched_setscheduler(struct task_struct *p, enqueue_task(rq, p, queue_flags); } + if (running) + p->sched_class->set_curr_task(rq); check_class_changed(rq, p, prev_class, oldprio); preempt_disable(); /* avoid rq from going away on us */ @@ -5417,10 +5417,10 @@ void sched_setnuma(struct task_struct *p, int nid) p->numa_preferred_nid = nid; - if (running) - p->sched_class->set_curr_task(rq); if (queued) enqueue_task(rq, p, ENQUEUE_RESTORE); + if (running) + p->sched_class->set_curr_task(rq); task_rq_unlock(rq, p, &rf); } #endif /* CONFIG_NUMA_BALANCING */ @@ -7868,10 +7868,10 @@ void sched_move_task(struct task_struct *tsk) sched_change_group(tsk, TASK_MOVE_GROUP); - if (unlikely(running)) - tsk->sched_class->set_curr_task(rq); if (queued) enqueue_task(rq, tsk, ENQUEUE_RESTORE | ENQUEUE_MOVE); + if (unlikely(running)) + tsk->sched_class->set_curr_task(rq); task_rq_unlock(rq, tsk, &rf); }