linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Frederic Weisbecker" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Frederic Weisbecker <frederic@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	"Peter Zijlstra (Intel)" <peterz@infradead.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] posix-cpu-timers: Force next expiration recalc after itimer reset
Date: Tue, 10 Aug 2021 15:13:33 -0000	[thread overview]
Message-ID: <162860841395.395.9934714280931151215.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210726125513.271824-4-frederic@kernel.org>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     406dd42bd1ba0c01babf9cde169bb319e52f6147
Gitweb:        https://git.kernel.org/tip/406dd42bd1ba0c01babf9cde169bb319e52f6147
Author:        Frederic Weisbecker <frederic@kernel.org>
AuthorDate:    Mon, 26 Jul 2021 14:55:10 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 10 Aug 2021 17:09:59 +02:00

posix-cpu-timers: Force next expiration recalc after itimer reset

When an itimer deactivates a previously armed expiration, it simply doesn't
do anything. As a result the process wide cputime counter keeps running and
the tick dependency stays set until it reaches the old ghost expiration
value.

This can be reproduced with the following snippet:

	void trigger_process_counter(void)
	{
		struct itimerval n = {};

		n.it_value.tv_sec = 100;
		setitimer(ITIMER_VIRTUAL, &n, NULL);
		n.it_value.tv_sec = 0;
		setitimer(ITIMER_VIRTUAL, &n, NULL);
	}

Fix this with resetting the relevant base expiration. This is similar to
disarming a timer.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210726125513.271824-4-frederic@kernel.org

---
 kernel/time/posix-cpu-timers.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 61c78b6..5c71322 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1379,8 +1379,6 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid,
 			}
 		}
 
-		if (!*newval)
-			return;
 		*newval += now;
 	}
 

  reply	other threads:[~2021-08-10 15:15 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-26 12:55 [GIT PULL] posix-cpu-timers leftover overhead fixes Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 1/6] posix-cpu-timers: Assert task sighand is locked while starting cputime counter Frederic Weisbecker
2021-08-10 15:13   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 2/6] posix-cpu-timers: Force next_expiration recalc after timer deletion Frederic Weisbecker
2021-08-10 15:13   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 3/6] posix-cpu-timers: Force next expiration recalc after itimer reset Frederic Weisbecker
2021-08-10 15:13   ` tip-bot2 for Frederic Weisbecker [this message]
2021-07-26 12:55 ` [PATCH 4/6] posix-cpu-timers: Remove confusing error code override Frederic Weisbecker
2021-08-10 15:13   ` [tip: timers/core] posix-cpu-timers: Remove confusing return value override tip-bot2 for Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 5/6] posix-cpu-timers: Consolidate timer base accessor Frederic Weisbecker
2021-08-10 15:13   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 6/6] posix-cpu-timers: Recalc next expiration when timer_settime() ends up not queueing Frederic Weisbecker
2021-08-10 15:13   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker

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=162860841395.395.9934714280931151215.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=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /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).