From patchwork Mon Aug 30 17:06:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 143001 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7UHOBPv023531 for ; Mon, 30 Aug 2010 17:24:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756132Ab0H3RYF (ORCPT ); Mon, 30 Aug 2010 13:24:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19997 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755536Ab0H3RYC (ORCPT ); Mon, 30 Aug 2010 13:24:02 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7UHNmkP023082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 30 Aug 2010 13:23:48 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7UHNhjp001675; Mon, 30 Aug 2010 13:23:47 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com, zamsden@redhat.com, mtosatti@redhat.com, riel@redhat.com, peterz@infradead.org, mingo@elte.hu, jeremy@goop.org Subject: [RFC v2 4/7] change kernel accounting to include steal time Date: Mon, 30 Aug 2010 13:06:38 -0400 Message-Id: <1283188001-7911-5-git-send-email-glommer@redhat.com> In-Reply-To: <1283188001-7911-1-git-send-email-glommer@redhat.com> References: <1283188001-7911-1-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 30 Aug 2010 17:24:11 +0000 (UTC) diff --git a/include/linux/sched.h b/include/linux/sched.h index 0478888..e571ddd 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -312,6 +312,7 @@ long io_schedule_timeout(long timeout); extern void cpu_init (void); extern void trap_init(void); extern void update_process_times(int user); +extern cputime_t (*hypervisor_steal_time)(void); extern void scheduler_tick(void); extern void sched_show_task(struct task_struct *p); diff --git a/kernel/sched.c b/kernel/sched.c index f52a880..9695c92 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -3157,6 +3157,16 @@ unsigned long long thread_group_sched_runtime(struct task_struct *p) return ns; } +cputime_t (*hypervisor_steal_time)(void) = NULL; + +static inline cputime_t get_steal_time_from_hypervisor(void) +{ + if (!hypervisor_steal_time) + return 0; + return hypervisor_steal_time(); +} + + /* * Account user cpu time to a process. * @p: the process that the cpu time gets accounted to @@ -3169,6 +3179,12 @@ void account_user_time(struct task_struct *p, cputime_t cputime, struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat; cputime64_t tmp; + tmp = get_steal_time_from_hypervisor(); + if (tmp) { + account_steal_time(tmp); + return; + } + /* Add user time to process. */ p->utime = cputime_add(p->utime, cputime); p->utimescaled = cputime_add(p->utimescaled, cputime_scaled); @@ -3234,6 +3250,12 @@ void account_system_time(struct task_struct *p, int hardirq_offset, return; } + tmp = get_steal_time_from_hypervisor(); + if (tmp) { + account_steal_time(tmp); + return; + } + /* Add system time to process. */ p->stime = cputime_add(p->stime, cputime); p->stimescaled = cputime_add(p->stimescaled, cputime_scaled); @@ -3276,6 +3298,13 @@ void account_idle_time(cputime_t cputime) cputime64_t cputime64 = cputime_to_cputime64(cputime); struct rq *rq = this_rq(); + /* + * if we're idle, we don't account it as steal time, since we did + * not want to run anyway. We do call the steal function, however, to + * give the guest the chance to flush its internal buffers + */ + get_steal_time_from_hypervisor(); + if (atomic_read(&rq->nr_iowait) > 0) cpustat->iowait = cputime64_add(cpustat->iowait, cputime64); else