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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79F7BC47083 for ; Fri, 4 Jun 2021 11:32:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6150361437 for ; Fri, 4 Jun 2021 11:32:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230264AbhFDLeG (ORCPT ); Fri, 4 Jun 2021 07:34:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:34606 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbhFDLeC (ORCPT ); Fri, 4 Jun 2021 07:34:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AFFE16142D; Fri, 4 Jun 2021 11:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622806336; bh=/PIiltEyNMBNXT8yeoBzndiKGXomcSozlO2Zttror6Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ue0JD7jS90ayhLNBJQZiKD1yBtSVzpjZtp+pkQNImbrdrkQ+543h4ZU4oXe8GAhzJ RexMiuSiLG4rLVtR7JAg1XVsMd6VmAwgbfpRGmLmF9ZyDMWCP/jdEASf/JYoBhNqwM ojanR3zjQ6tm5Pphoeadv4tlfUFHrs1SF++J8cxrl/e35ppwIkFnWTIZH/gnDqTryQ XUm/6QFRRbAHYh5dnC93SyrG/GCLrSwSPQm8nRsLUNlUzJgEa6R23J3LsaaOf5olmB zNzdkIPrquEKJ1BsswDIq2Rhi1iXYhbMGTYP4/FluJcp+xSYII8XGvUAHLajOEVBJ4 9NmWnQ34hCH4w== From: Frederic Weisbecker To: Thomas Gleixner Cc: LKML , Frederic Weisbecker , Peter Zijlstra , "Eric W . Biederman" , Oleg Nesterov , Ingo Molnar Subject: [PATCH 6/6] posix-cpu-timers: Force next expiration recalc after itimer reset Date: Fri, 4 Jun 2021 13:31:59 +0200 Message-Id: <20210604113159.26177-7-frederic@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210604113159.26177-1-frederic@kernel.org> References: <20210604113159.26177-1-frederic@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 we reach 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 Cc: Oleg Nesterov Cc: Thomas Gleixner Cc: Peter Zijlstra (Intel) Cc: Ingo Molnar Cc: Eric W. Biederman --- 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 d8325a906314..8a1ec78a7ebb 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -1407,8 +1407,6 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid, } } - if (!*newval) - return; *newval += now; } -- 2.25.1