From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49E42C433EF for ; Mon, 13 Dec 2021 14:21:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239053AbhLMOVB (ORCPT ); Mon, 13 Dec 2021 09:21:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234384AbhLMOUz (ORCPT ); Mon, 13 Dec 2021 09:20:55 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 295C4C061756; Mon, 13 Dec 2021 06:20:55 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E6952B81066; Mon, 13 Dec 2021 14:20:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B337C34602; Mon, 13 Dec 2021 14:20:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1639405252; bh=ht6ZI9FyTsSKgSb9gGLyxQGNJx9e9l7hCqsJBOmDVGI=; h=From:To:Cc:Subject:Date:From; b=MRN63ErhIkfwczUeo1ygtLLC/J/LIUrjs/BfE6aLMtLRkppxOXGQJduTw4hV67sen 5kZWHu/i3I4R3uvhx7+seIPm/oME83vcco4La1ZSHZEY8GPNdi35VLD705hC/fPUwL n073pMykHDKr+yukhrsxQbA1/ZSp3GdFs6/Qd00UDww/POF2y0WWSOsfUMGOO0TiMr d8mwrAEOaEQ8L7gciYApOCn3PxbeQC/gAmqNFTzQ2IObhFGom9dJbL4R0z/r7iKaMC fbEq3aLjpQz0StbCD98rSXeQjV6GLt33KxgwJwdVzqT1xPvD97KrIJUuR+IPnlLwVr 3MNW7wMche+IQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Frederic Weisbecker , Hasegawa Hitomi , Thomas Gleixner , Masayoshi Mizuma , Phil Auld , Sasha Levin , mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org Subject: [PATCH MANUALSEL 4.14] sched/cputime: Fix getrusage(RUSAGE_THREAD) with nohz_full Date: Mon, 13 Dec 2021 09:20:48 -0500 Message-Id: <20211213142049.352507-1-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Frederic Weisbecker [ Upstream commit e7f2be115f0746b969c0df14c0d182f65f005ca5 ] getrusage(RUSAGE_THREAD) with nohz_full may return shorter utime/stime than the actual time. task_cputime_adjusted() snapshots utime and stime and then adjust their sum to match the scheduler maintained cputime.sum_exec_runtime. Unfortunately in nohz_full, sum_exec_runtime is only updated once per second in the worst case, causing a discrepancy against utime and stime that can be updated anytime by the reader using vtime. To fix this situation, perform an update of cputime.sum_exec_runtime when the cputime snapshot reports the task as actually running while the tick is disabled. The related overhead is then contained within the relevant situations. Reported-by: Hasegawa Hitomi Signed-off-by: Frederic Weisbecker Signed-off-by: Hasegawa Hitomi Signed-off-by: Thomas Gleixner Tested-by: Masayoshi Mizuma Acked-by: Phil Auld Link: https://lore.kernel.org/r/20211026141055.57358-3-frederic@kernel.org Signed-off-by: Sasha Levin --- include/linux/sched/cputime.h | 5 +++-- kernel/sched/cputime.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/linux/sched/cputime.h b/include/linux/sched/cputime.h index d0677f6739f63..787f3221b575b 100644 --- a/include/linux/sched/cputime.h +++ b/include/linux/sched/cputime.h @@ -18,15 +18,16 @@ #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN -extern void task_cputime(struct task_struct *t, +extern bool task_cputime(struct task_struct *t, u64 *utime, u64 *stime); extern u64 task_gtime(struct task_struct *t); #else -static inline void task_cputime(struct task_struct *t, +static inline bool task_cputime(struct task_struct *t, u64 *utime, u64 *stime) { *utime = t->utime; *stime = t->stime; + return false; } static inline u64 task_gtime(struct task_struct *t) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 45c2cd37fe6b0..2d6c3372d8795 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -664,7 +664,8 @@ void task_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st) .sum_exec_runtime = p->se.sum_exec_runtime, }; - task_cputime(p, &cputime.utime, &cputime.stime); + if (task_cputime(p, &cputime.utime, &cputime.stime)) + cputime.sum_exec_runtime = task_sched_runtime(p); cputime_adjust(&cputime, &p->prev_cputime, ut, st); } EXPORT_SYMBOL_GPL(task_cputime_adjusted); @@ -857,19 +858,21 @@ u64 task_gtime(struct task_struct *t) * add up the pending nohz execution time since the last * cputime snapshot. */ -void task_cputime(struct task_struct *t, u64 *utime, u64 *stime) +bool task_cputime(struct task_struct *t, u64 *utime, u64 *stime) { struct vtime *vtime = &t->vtime; unsigned int seq; u64 delta; + int ret; if (!vtime_accounting_enabled()) { *utime = t->utime; *stime = t->stime; - return; + return false; } do { + ret = false; seq = read_seqcount_begin(&vtime->seqcount); *utime = t->utime; @@ -879,6 +882,7 @@ void task_cputime(struct task_struct *t, u64 *utime, u64 *stime) if (vtime->state == VTIME_INACTIVE || is_idle_task(t)) continue; + ret = true; delta = vtime_delta(vtime); /* @@ -890,5 +894,7 @@ void task_cputime(struct task_struct *t, u64 *utime, u64 *stime) else if (vtime->state == VTIME_SYS) *stime += vtime->stime + delta; } while (read_seqcount_retry(&vtime->seqcount, seq)); + + return ret; } #endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */ -- 2.33.0