From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758724AbXIJMEX (ORCPT ); Mon, 10 Sep 2007 08:04:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758090AbXIJMDZ (ORCPT ); Mon, 10 Sep 2007 08:03:25 -0400 Received: from ecfrec.frec.bull.fr ([129.183.4.8]:32884 "EHLO ecfrec.frec.bull.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757391AbXIJMDX (ORCPT ); Mon, 10 Sep 2007 08:03:23 -0400 Message-ID: <46E5327B.6010803@bull.net> Date: Mon, 10 Sep 2007 14:03:07 +0200 From: Laurent Vivier Organization: Bull S.A.S. User-Agent: Thunderbird 1.5.0.2 (X11/20060420) MIME-Version: 1.0 To: Ingo Molnar Cc: linux-kernel Subject: [RESEND][PATCH 3/4] modify account_system_time() to update guest time in cpustat and task_struct X-Enigmail-Version: 0.94.0.0 X-MIMETrack: Itemize by SMTP Server on ECN002/FR/BULL(Release 5.0.12 |February 13, 2003) at 10/09/2007 14:09:03, Serialize by Router on ECN002/FR/BULL(Release 5.0.12 |February 13, 2003) at 10/09/2007 14:09:04, Serialize complete at 10/09/2007 14:09:04 Content-Type: multipart/mixed; boundary="------------080904040505000707080702" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --------------080904040505000707080702 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 [PATCH 3/4] modify account_system_time() to add cputime to cpustat->guest if we are running a VCPU. We add this cputime to cpustat->user instead of cpustat->system because this part of KVM code is in fact user code although it is executed in the kernel. We duplicate VCPU time between guest and user to allow an unmodified "top(1)" to display correct value. A modified "top(1)" is able to display good cpu user time and cpu guest time by subtracting cpu guest time from cpu user time. Update "gtime" in task_struct accordingly. Signed-off-by: Laurent Vivier -- ------------- Laurent.Vivier@bull.net -------------- "Software is hard" - Donald Knuth --------------080904040505000707080702 Content-Transfer-Encoding: 7bit Content-Type: text/plain; name="account_guest" Content-Disposition: inline; filename="account_guest" Index: linux-2.6/include/linux/sched.h =================================================================== --- linux-2.6.orig/include/linux/sched.h 2007-09-10 12:59:46.000000000 +0200 +++ linux-2.6/include/linux/sched.h 2007-09-10 12:59:53.000000000 +0200 @@ -1320,6 +1320,7 @@ static inline void put_task_struct(struc #define PF_STARTING 0x00000002 /* being created */ #define PF_EXITING 0x00000004 /* getting shut down */ #define PF_EXITPIDONE 0x00000008 /* pi exit done on shut down */ +#define PF_VCPU 0x00000010 /* I'm a virtual CPU */ #define PF_FORKNOEXEC 0x00000040 /* forked but didn't exec */ #define PF_SUPERPRIV 0x00000100 /* used super-user privileges */ #define PF_DUMPCORE 0x00000200 /* dumped core */ Index: linux-2.6/kernel/sched.c =================================================================== --- linux-2.6.orig/kernel/sched.c 2007-09-10 12:59:46.000000000 +0200 +++ linux-2.6/kernel/sched.c 2007-09-10 12:59:53.000000000 +0200 @@ -3276,6 +3276,27 @@ void account_user_time(struct task_struc cpustat->user = cputime64_add(cpustat->user, tmp); } +#ifdef CONFIG_GUEST_ACCOUNTING +/* + * Account guest cpu time to a process. + * @p: the process that the cpu time gets accounted to + * @cputime: the cpu time spent in virtual machine since the last update + */ +void account_guest_time(struct task_struct *p, cputime_t cputime) +{ + cputime64_t tmp; + struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat; + + tmp = cputime_to_cputime64(cputime); + + p->utime = cputime_add(p->utime, cputime); + p->gtime = cputime_add(p->gtime, cputime); + + cpustat->user = cputime64_add(cpustat->user, tmp); + cpustat->guest = cputime64_add(cpustat->guest, tmp); +} +#endif + /* * Account system cpu time to a process. * @p: the process that the cpu time gets accounted to @@ -3289,6 +3310,14 @@ void account_system_time(struct task_str struct rq *rq = this_rq(); cputime64_t tmp; +#ifdef CONFIG_GUEST_ACCOUNTING + if (p->flags & PF_VCPU) { + account_guest_time(p, cputime); + p->flags &= ~PF_VCPU; + return; + } +#endif + p->stime = cputime_add(p->stime, cputime); /* Add system time to cpustat. */ --------------080904040505000707080702--