From: "tip-bot2 for Yunfeng Ye" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Yunfeng Ye <yeyunfeng@huawei.com>,
Frederic Weisbecker <frederic@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/nohz] tick/nohz: Update idle_exittime on actual idle exit
Date: Thu, 13 May 2021 13:17:28 -0000 [thread overview]
Message-ID: <162091184863.29796.6829372078329871845.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210512232924.150322-5-frederic@kernel.org>
The following commit has been merged into the timers/nohz branch of tip:
Commit-ID: 96c9b90396f9ab6caf13b4ebf00095818ac53b7f
Gitweb: https://git.kernel.org/tip/96c9b90396f9ab6caf13b4ebf00095818ac53b7f
Author: Yunfeng Ye <yeyunfeng@huawei.com>
AuthorDate: Thu, 13 May 2021 01:29:18 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Thu, 13 May 2021 14:21:21 +02:00
tick/nohz: Update idle_exittime on actual idle exit
The idle_exittime field of tick_sched is used to record the time when
the idle state was left. but currently the idle_exittime is updated in
the function tick_nohz_restart_sched_tick(), which is not always in idle
state when nohz_full is configured:
tick_irq_exit
tick_nohz_irq_exit
tick_nohz_full_update_tick
tick_nohz_restart_sched_tick
ts->idle_exittime = now;
It's thus overwritten by mistake on nohz_full tick restart. Move the
update to the appropriate idle exit path instead.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210512232924.150322-5-frederic@kernel.org
---
kernel/time/tick-sched.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 1afa759..89ec0ab 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -921,8 +921,6 @@ static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now)
* Cancel the scheduled timer and restore the tick
*/
ts->tick_stopped = 0;
- ts->idle_exittime = now;
-
tick_nohz_restart(ts, now);
}
@@ -1194,10 +1192,13 @@ unsigned long tick_nohz_get_idle_calls(void)
return ts->idle_calls;
}
-static void tick_nohz_account_idle_ticks(struct tick_sched *ts)
+static void tick_nohz_account_idle_time(struct tick_sched *ts,
+ ktime_t now)
{
unsigned long ticks;
+ ts->idle_exittime = now;
+
if (vtime_accounting_enabled_this_cpu())
return;
/*
@@ -1218,8 +1219,9 @@ void tick_nohz_idle_restart_tick(void)
struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
if (ts->tick_stopped) {
- tick_nohz_restart_sched_tick(ts, ktime_get());
- tick_nohz_account_idle_ticks(ts);
+ ktime_t now = ktime_get();
+ tick_nohz_restart_sched_tick(ts, now);
+ tick_nohz_account_idle_time(ts, now);
}
}
@@ -1230,7 +1232,7 @@ static void tick_nohz_idle_update_tick(struct tick_sched *ts, ktime_t now)
else
tick_nohz_restart_sched_tick(ts, now);
- tick_nohz_account_idle_ticks(ts);
+ tick_nohz_account_idle_time(ts, now);
}
/**
next prev parent reply other threads:[~2021-05-13 13:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 23:29 [GIT PULL] tick/nohz updates v3 Frederic Weisbecker
2021-05-12 23:29 ` [PATCH 01/10] tick/nohz: Evaluate the CPU expression after the static key Frederic Weisbecker
2021-05-13 13:17 ` [tip: timers/nohz] " tip-bot2 for Peter Zijlstra
2021-05-12 23:29 ` [PATCH 02/10] tick/nohz: Conditionally restart tick on idle exit Frederic Weisbecker
2021-05-13 13:17 ` [tip: timers/nohz] " tip-bot2 for Yunfeng Ye
2021-05-12 23:29 ` [PATCH 03/10] tick/nohz: Remove superflous check for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE Frederic Weisbecker
2021-05-13 13:17 ` [tip: timers/nohz] " tip-bot2 for Frederic Weisbecker
2021-05-12 23:29 ` [PATCH 04/10] tick/nohz: Update idle_exittime on actual idle exit Frederic Weisbecker
2021-05-13 13:17 ` tip-bot2 for Yunfeng Ye [this message]
2021-05-12 23:29 ` [PATCH 05/10] tick/nohz: Update nohz_full Kconfig help Frederic Weisbecker
2021-05-13 13:17 ` [tip: timers/nohz] " tip-bot2 for Frederic Weisbecker
2021-05-12 23:29 ` [PATCH 06/10] tick/nohz: Only wakeup a single target cpu when kicking a task Frederic Weisbecker
2021-05-13 13:17 ` [tip: timers/nohz] tick/nohz: Only wake up " tip-bot2 for Frederic Weisbecker
2021-05-12 23:29 ` [PATCH 07/10] tick/nohz: Change signal tick dependency to wakeup CPUs of member tasks Frederic Weisbecker
2021-05-13 13:17 ` [tip: timers/nohz] tick/nohz: Change signal tick dependency to wake up " tip-bot2 for Marcelo Tosatti
2021-05-12 23:29 ` [PATCH 08/10] tick/nohz: Kick only _queued_ task whose tick dependency is updated Frederic Weisbecker
2021-05-13 13:17 ` [tip: timers/nohz] " tip-bot2 for Marcelo Tosatti
2021-05-12 23:29 ` [PATCH 09/10] tick/nohz: Call tick_nohz_task_switch() with interrupts disabled Frederic Weisbecker
2021-05-13 13:17 ` [tip: timers/nohz] " tip-bot2 for Peter Zijlstra
2021-05-12 23:29 ` [PATCH 10/10] MAINTAINERS: Add myself as context tracking maintainer Frederic Weisbecker
2021-05-19 9:21 ` [tip: timers/nohz] " tip-bot2 for Frederic Weisbecker
2021-05-13 12:23 ` [GIT PULL] tick/nohz updates v3 Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162091184863.29796.6829372078329871845.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=frederic@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
--cc=yeyunfeng@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).