Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 16 Jun 2021 13:21:11 +0200
From:   Frederic Weisbecker <frederic@kernel.org>
To:     Peter Zijlstra <peterz@infradead.org>
Cc:     Thomas Gleixner <tglx@linutronix.de>,
        LKML <linux-kernel@vger.kernel.org>,
        "Eric W . Biederman" <ebiederm@xmission.com>,
        Oleg Nesterov <oleg@redhat.com>, Ingo Molnar <mingo@kernel.org>
Subject: Re: [PATCH 4/6] posix-cpu-timers: Force next_expiration recalc after
 timer reset
Message-ID: <20210616112111.GB801071@lothringen>
References: <20210604113159.26177-1-frederic@kernel.org>
 <20210604113159.26177-5-frederic@kernel.org>
 <YMnDFQ9bvVPHu/kJ@hirez.programming.kicks-ass.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <YMnDFQ9bvVPHu/kJ@hirez.programming.kicks-ass.net>
Precedence: bulk

On Wed, Jun 16, 2021 at 11:23:33AM +0200, Peter Zijlstra wrote:
> On Fri, Jun 04, 2021 at 01:31:57PM +0200, Frederic Weisbecker wrote:
> 
> > @@ -647,8 +651,6 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
> >  	if (unlikely(timer->it.cpu.firing)) {
> >  		timer->it.cpu.firing = -1;
> >  		ret = TIMER_RETRY;
> > -	} else {
> > -		cpu_timer_dequeue(ctmr);
> >  	}
> >  
> >  	/*
> > @@ -713,9 +715,13 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
> >  	 * For a timer with no notification action, we don't actually
> >  	 * arm the timer (we'll just fake it for timer_gettime).
> >  	 */
> > -	cpu_timer_setexpires(ctmr, new_expires);
> > -	if (new_expires != 0 && val < new_expires) {
> > -		arm_timer(timer, p);
> > +	if (new_expires != 0) {
> > +		cpu_timer_dequeue(ctmr);
> > +		cpu_timer_setexpires(ctmr, new_expires);
> > +		if (val < new_expires)
> > +			arm_timer(timer, p);
> > +	} else {
> > +		disarm_timer(timer, p);
> >  	}
> >  
> >  	unlock_task_sighand(p, &flags);
> 
> AFAICT there's an error path in between where you've removed
> cpu_timer_dequeue() and added it back. This error path will now leave
> the timer enqueued.

Ah that's the case where the timer is firing. In this case it can't be queued
anyway. Also it's a retry path so we'll eventually dequeue it in any case
(should it be concurrently requeued after firing).

Thanks.