linux-kernel - Re: [PATCH v2 23/31] watchdog: Switch to use hrtimer

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <882031d8-5b8b-455c-9f5e-90090408304e@roeck-us.net>
Date: Tue, 11 Feb 2025 08:16:22 -0800
From: Guenter Roeck <linux@...ck-us.net>
To: Nam Cao <namcao@...utronix.de>
Cc: Anna-Maria Behnsen <anna-maria@...utronix.de>,
	Frederic Weisbecker <frederic@...nel.org>,
	Thomas Gleixner <tglx@...utronix.de>, linux-kernel@...r.kernel.org,
	Wim Van Sebroeck <wim@...ux-watchdog.org>,
	linux-watchdog@...r.kernel.org
Subject: Re: [PATCH v2 23/31] watchdog: Switch to use hrtimer_setup()

On Wed, Feb 05, 2025 at 11:39:07AM +0100, Nam Cao wrote:
> hrtimer_setup() takes the callback function pointer as argument and
> initializes the timer completely.
> 
> Replace hrtimer_init() and the open coded initialization of
> hrtimer::function with the new setup mechanism.
> 
> Patch was created by using Coccinelle.
> 
> Signed-off-by: Nam Cao <namcao@...utronix.de>
> Cc: Wim Van Sebroeck <wim@...ux-watchdog.org>
> Cc: linux-watchdog@...r.kernel.org
> ---

Change log missing. I am also personally not a friend of changing
multiple drivers in a single patch for changes like this. That makes
it all but impossible to revert one of the driver changes if it was
wrong without reverting everything.

Guenter

>  drivers/watchdog/softdog.c                     | 8 +++-----
>  drivers/watchdog/watchdog_dev.c                | 4 ++--
>  drivers/watchdog/watchdog_hrtimer_pretimeout.c | 4 ++--
>  kernel/watchdog.c                              | 3 +--
>  4 files changed, 8 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
> index 7a1096265f18..0820e35ad2e3 100644
> --- a/drivers/watchdog/softdog.c
> +++ b/drivers/watchdog/softdog.c
> @@ -187,14 +187,12 @@ static int __init softdog_init(void)
>  	watchdog_set_nowayout(&softdog_dev, nowayout);
>  	watchdog_stop_on_reboot(&softdog_dev);
>  
> -	hrtimer_init(&softdog_ticktock, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> -	softdog_ticktock.function = softdog_fire;
> +	hrtimer_setup(&softdog_ticktock, softdog_fire, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
>  
>  	if (IS_ENABLED(CONFIG_SOFT_WATCHDOG_PRETIMEOUT)) {
>  		softdog_info.options |= WDIOF_PRETIMEOUT;
> -		hrtimer_init(&softdog_preticktock, CLOCK_MONOTONIC,
> -			     HRTIMER_MODE_REL);
> -		softdog_preticktock.function = softdog_pretimeout;
> +		hrtimer_setup(&softdog_preticktock, softdog_pretimeout, CLOCK_MONOTONIC,
> +			      HRTIMER_MODE_REL);
>  	}
>  
>  	if (soft_active_on_boot)
> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
> index 19698d87dc57..8369fd94fc1a 100644
> --- a/drivers/watchdog/watchdog_dev.c
> +++ b/drivers/watchdog/watchdog_dev.c
> @@ -1051,8 +1051,8 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
>  	}
>  
>  	kthread_init_work(&wd_data->work, watchdog_ping_work);
> -	hrtimer_init(&wd_data->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
> -	wd_data->timer.function = watchdog_timer_expired;
> +	hrtimer_setup(&wd_data->timer, watchdog_timer_expired, CLOCK_MONOTONIC,
> +		      HRTIMER_MODE_REL_HARD);
>  	watchdog_hrtimer_pretimeout_init(wdd);
>  
>  	if (wdd->id == 0) {
> diff --git a/drivers/watchdog/watchdog_hrtimer_pretimeout.c b/drivers/watchdog/watchdog_hrtimer_pretimeout.c
> index 940b53718a91..fbc7eecd8b20 100644
> --- a/drivers/watchdog/watchdog_hrtimer_pretimeout.c
> +++ b/drivers/watchdog/watchdog_hrtimer_pretimeout.c
> @@ -23,8 +23,8 @@ void watchdog_hrtimer_pretimeout_init(struct watchdog_device *wdd)
>  {
>  	struct watchdog_core_data *wd_data = wdd->wd_data;
>  
> -	hrtimer_init(&wd_data->pretimeout_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> -	wd_data->pretimeout_timer.function = watchdog_hrtimer_pretimeout;
> +	hrtimer_setup(&wd_data->pretimeout_timer, watchdog_hrtimer_pretimeout, CLOCK_MONOTONIC,
> +		      HRTIMER_MODE_REL);
>  }
>  
>  void watchdog_hrtimer_pretimeout_start(struct watchdog_device *wdd)
> diff --git a/kernel/watchdog.c b/kernel/watchdog.c
> index b2da7de39d06..6a98dbc931ac 100644
> --- a/kernel/watchdog.c
> +++ b/kernel/watchdog.c
> @@ -797,8 +797,7 @@ static void watchdog_enable(unsigned int cpu)
>  	 * Start the timer first to prevent the hardlockup watchdog triggering
>  	 * before the timer has a chance to fire.
>  	 */
> -	hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
> -	hrtimer->function = watchdog_timer_fn;
> +	hrtimer_setup(hrtimer, watchdog_timer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
>  	hrtimer_start(hrtimer, ns_to_ktime(sample_period),
>  		      HRTIMER_MODE_REL_PINNED_HARD);
>  
> -- 
> 2.39.5
> 
>