lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 682/846] cputime, cpuacct: Include guest time in user time in cpuacct.stat
    Date
    From: Andrey Ryabinin <arbn@yandex-team.com>

    commit 9731698ecb9c851f353ce2496292ff9fcea39dff upstream.

    cpuacct.stat in no-root cgroups shows user time without guest time
    included int it. This doesn't match with user time shown in root
    cpuacct.stat and /proc/<pid>/stat. This also affects cgroup2's cpu.stat
    in the same way.

    Make account_guest_time() to add user time to cgroup's cpustat to
    fix this.

    Fixes: ef12fefabf94 ("cpuacct: add per-cgroup utime/stime statistics")
    Signed-off-by: Andrey Ryabinin <arbn@yandex-team.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com>
    Acked-by: Tejun Heo <tj@kernel.org>
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20211115164607.23784-1-arbn@yandex-team.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    kernel/sched/cputime.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/kernel/sched/cputime.c
    +++ b/kernel/sched/cputime.c
    @@ -148,10 +148,10 @@ void account_guest_time(struct task_stru

    /* Add guest time to cpustat. */
    if (task_nice(p) > 0) {
    - cpustat[CPUTIME_NICE] += cputime;
    + task_group_account_field(p, CPUTIME_NICE, cputime);
    cpustat[CPUTIME_GUEST_NICE] += cputime;
    } else {
    - cpustat[CPUTIME_USER] += cputime;
    + task_group_account_field(p, CPUTIME_USER, cputime);
    cpustat[CPUTIME_GUEST] += cputime;
    }
    }

    \
     
     \ /
      Last update: 2022-01-25 01:12    [W:2.964 / U:1.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site