Linux Trace Kernel
 help / color / mirror / Atom feed
From: Gabriele Monaco <gmonaco@redhat.com>
To: wen.yang@linux.dev
Cc: Nam Cao <namcao@linutronix.de>,
	linux-trace-kernel@vger.kernel.org,
	 linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v8 02/14] rv: Fix ha_monitor timer and invariant underflow
Date: Thu, 19 Nov 2026 15:34:23 +0100	[thread overview]
Message-ID: <825843fdfe962bc03b360d686773ca82f2502d60.camel@redhat.com> (raw)
In-Reply-To: <f373c9fd1652b4c5789fddd83a18b9e6e350c588.1793900349.git.wen.yang@linux.dev>

On Fri, 2026-11-06 at 01:49 +0800, wen.yang@linux.dev wrote:
> From: Wen Yang <wen.yang@linux.dev>
> 
> ha_start_timer_ns() and ha_start_timer_jiffy() compute the remaining
> budget as expire - passed.  Once the elapsed time passed exceeds the
> budget expire (e.g. a state transition after the invariant should have
> fired, before the timer callback ran), the unsigned subtraction
> underflows to a huge value and the timer is scheduled far into the
> future instead of expiring immediately, so the monitor stops enforcing
> the budget.
> 
> ha_check_invariant_ns() computes store >= time_ns - expire_ns, which
> underflows when the system uptime is still below expire_ns (a monitor
> armed early in boot with a large budget), reporting a false violation.
> 
> Clamp the timer remainder to 0 (fire immediately) when passed >= expire,
> and rewrite the invariant check as store + expire_ns >= time_ns so
> neither side can underflow.  Both timer flavours (jiffy and hrtimer) are
> fixed.
> 
> Fixes: f5587d1b6ec9 ("rv: Add Hybrid Automata monitor type")
> Fixes: ab2900ae252b ("rv: Simplify hybrid automata monitors's clock
> variables")
> Reported-by: sashiko-bot <sashiko-bot@kernel.org>
> Reviewed-by: Gabriele Monaco <gmonaco@redhat.com>
> Signed-off-by: Wen Yang <wen.yang@linux.dev>
> ---

Minor nits on the comments that you added since last time, you can keep my
review tag.

>  include/rv/ha_monitor.h | 29 ++++++++++++++++++++++++-----
>  1 file changed, 24 insertions(+), 5 deletions(-)
> 
> diff --git a/include/rv/ha_monitor.h b/include/rv/ha_monitor.h
> index 93ac99ff7f1d..ebb7f91e3447 100644
> --- a/include/rv/ha_monitor.h
> +++ b/include/rv/ha_monitor.h
> @@ -351,7 +351,11 @@ static inline void ha_reset_clk_ns(struct ha_monitor
> *ha_mon, enum envs env, u64
>  static inline bool ha_check_invariant_ns(struct ha_monitor *ha_mon, enum envs
> env,
>  					 u64 time_ns, u64 expire_ns)
>  {
> -	return READ_ONCE(ha_mon->env_store[env]) >= time_ns - expire_ns;
> +	/*
> +	 * Compare as store + expire >= time to avoid underflow when the
> +	 * system uptime is still below expire_ns (early boot, large budget).
> +	 */

This comment isn't necessary, please instruct your LLMs not to mention how the
code use to look before they touched it. There are commit messages for that. And
I wouldn't get too technical on the code there, the diff speaks clearly enough.

> +	return READ_ONCE(ha_mon->env_store[env]) + expire_ns >= time_ns;
>  }

Why don't you do the same in ha_check_invariant_jiffy() ?

>  /*
>   * ha_invariant_passed_ns - prepare the invariant and return the time since
> reset
> @@ -410,6 +414,17 @@ static inline void ha_inv_to_guard(struct ha_monitor
> *ha_mon, enum envs env,
>  	WRITE_ONCE(ha_mon->env_store[env], READ_ONCE(ha_mon->env_store[env])
> - value);
>  }
>  
> +/*
> + * ha_time_left - time left before expire, 0 once it already passed
> + *
> + * A plain expire - passed underflows and would arm the timer far in the
> + * future.  Unit-agnostic: callers pass ns or jiffies consistently.

This second paragraph is also redundant. It's clear what you aim to do and I'd
say the fact it doesn't have a unit in the name means it doesn't require one
(from the code it's fairly obvious anyway).

Thanks,
Gabriele

> + */
> +static inline u64 ha_time_left(u64 passed, u64 expire)
> +{
> +	return passed < expire ? expire - passed : 0;
> +}
> +
>  #if HA_TIMER_TYPE == HA_TIMER_WHEEL
>  /*
>   * Helper functions to handle the monitor timer.
> @@ -439,15 +454,17 @@ static inline void ha_start_timer_jiffy(struct
> ha_monitor *ha_mon, enum envs env
>  {
>  	u64 passed = ha_invariant_passed_jiffy(ha_mon, env, time_ns);
>  
> -	mod_timer(&ha_mon->timer, get_jiffies_64() + expire - passed);
> +	mod_timer(&ha_mon->timer,
> +		  get_jiffies_64() + ha_time_left(passed, expire));
>  }
>  static inline void ha_start_timer_ns(struct ha_monitor *ha_mon, enum envs
> env,
>  				     u64 expire, u64 time_ns)
>  {
>  	u64 passed = ha_invariant_passed_ns(ha_mon, env, time_ns);
> +	u64 delay = ha_time_left(passed, expire);
>  
>  	ha_start_timer_jiffy(ha_mon, ENV_MAX_STORED,
> -			     nsecs_to_jiffies(expire - passed + TICK_NSEC -
> 1), time_ns);
> +			     nsecs_to_jiffies(delay + TICK_NSEC - 1),
> time_ns);
>  }
>  /*
>   * ha_cancel_timer - Cancel the timer
> @@ -494,7 +511,8 @@ static inline void ha_start_timer_ns(struct ha_monitor
> *ha_mon, enum envs env,
>  
>  	if (RV_MON_TYPE == RV_MON_PER_CPU)
>  		mode |= HRTIMER_MODE_PINNED;
> -	hrtimer_start(&ha_mon->hrtimer, ns_to_ktime(expire - passed), mode);
> +	hrtimer_start(&ha_mon->hrtimer,
> +		      ns_to_ktime(ha_time_left(passed, expire)), mode);
>  }
>  static inline void ha_start_timer_jiffy(struct ha_monitor *ha_mon, enum envs
> env,
>  					u64 expire, u64 time_ns)
> @@ -502,7 +520,8 @@ static inline void ha_start_timer_jiffy(struct ha_monitor
> *ha_mon, enum envs env
>  	u64 passed = ha_invariant_passed_jiffy(ha_mon, env, time_ns);
>  
>  	ha_start_timer_ns(ha_mon, ENV_MAX_STORED,
> -			  jiffies_to_nsecs(expire - passed), time_ns);
> +			  jiffies_to_nsecs(ha_time_left(passed, expire)),
> +			  time_ns);
>  }
>  /*
>   * ha_cancel_timer - Cancel the timer


  reply	other threads:[~2026-11-19 14:34 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-05 17:49 [PATCH v8 00/14] rv: Add task latency over budget RV monitor wen.yang
2026-11-05 17:49 ` [PATCH v8 01/14] rv: Force environment reset action on HA monitor start wen.yang
2026-11-05 17:49 ` [PATCH v8 02/14] rv: Fix ha_monitor timer and invariant underflow wen.yang
2026-11-19 14:34   ` Gabriele Monaco [this message]
2026-11-05 17:49 ` [PATCH v8 03/14] rv: Add a KUnit test for the HA timer underflow wen.yang
2026-11-05 17:49 ` [PATCH v8 04/14] rv: Disarm HA timers on the storage free path wen.yang
2026-11-05 17:49 ` [PATCH v8 05/14] rv: Add a KUnit test for " wen.yang
2026-11-05 17:49 ` [PATCH v8 06/14] rv: Make da_monitor_reset_hook, sync_hook and EVENT_NONE_LBL overridable wen.yang
2026-11-05 17:49 ` [PATCH v8 07/14] rv: Introduce DA_MON_ALLOCATION_STRATEGY wen.yang
2026-11-05 17:49 ` [PATCH v8 08/14] rv: Support embedded target types in per-object DA storage wen.yang
2026-11-05 17:49 ` [PATCH v8 09/14] rv: Add generic uprobe infrastructure for RV monitors wen.yang
2026-11-05 17:49 ` [PATCH v8 10/14] rv: Add tlob model DOT file wen.yang
2026-11-05 17:49 ` [PATCH v8 11/14] rv: Add tlob hybrid automaton monitor wen.yang
2026-11-05 17:49 ` [PATCH v8 12/14] rv: Add KUnit tests for the tlob monitor wen.yang
2026-11-05 17:49 ` [PATCH v8 13/14] selftests/verification: Add tlob selftests wen.yang
2026-11-05 17:49 ` [PATCH v8 14/14] selftests/ftrace: Walk up parent dirs to find test.d/functions wen.yang

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=825843fdfe962bc03b360d686773ca82f2502d60.camel@redhat.com \
    --to=gmonaco@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=namcao@linutronix.de \
    --cc=wen.yang@linux.dev \
    /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