edac: fix period calculation in edac_device_reset_delay_period()
PATCH v2 1/1 edac: fix period calculation in edac_device_reset_delay_period()
Fix period calculation in case user sets a value of 1000. The input of round_jiffies_relative() should be in jiffies and not in milli-seconds.
---
v2 --> v1:
- Fix the bug without modifying jiffs which is used to set edac_dev->delay.
drivers/edac/edac_device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/edac/edac_device.c +4 -4
@@ -398,13 +398,13 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev, {unsigned long jiffs =msecs_to_jiffies (value); -if (value ==1000 ) - jiffs =round_jiffies_relative (value); - edac_dev->poll_msec = value; edac_dev->delay = jiffs; -edac_mod_work (&edac_dev->work, jiffs); +if (value ==1000 ) +edac_mod_work (&edac_dev->work,round_jiffies_relative (jiffs)); +else +edac_mod_work (&edac_dev->work, jiffs); }int edac_device_alloc_index (void )
Signature · 1 line
2.37.1
Borislav Petkov
maintainerQuoted 5 lines · Eliav Farber
Fix period calculation in case user sets a value of 1000. The input of
round_jiffies_relative()should be in jiffies and not in milli-seconds.Signed-off-by Eliav Farber <[email protected]>
I guess.
Also, I think the one-liner below does the same, no?
---
drivers/edac/edac_device.c +1 -1
@@ -399,7 +399,7 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,unsigned long jiffs =msecs_to_jiffies (value);if (value ==1000 ) - jiffs =round_jiffies_relative (value); + jiffs =round_jiffies_relative (jiffs); edac_dev->poll_msec = value; edac_dev->delay = jiffs;
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 5 lines · Borislav Petkov
Quoted 4 lines · Eliav Farber
Fix period calculation in case user sets a value of 1000. The input of
round_jiffies_relative()should be in jiffies and not in milli-seconds.
Quoted 7 lines
Quoted 1 line
Signed-off-by Eliav Farber <[email protected]>Fixes c4cf3b454eca ("EDAC: Rework workqueue handling")I guess.
Also, I think the one-liner below does the same, no?
The one-liner below will not work.
See the comment in edac_device_workq_setup() that explains why round is used:
"
optimize here for the 1 second case, which will be normal value, to fire ON the 1 second time event. This helps reduce all sorts of timers firing on sub-second basis, while they are happy
to fire together on the 1 second exactly
"
So only the first schedule should be rounded.
But all other schedules after that should be 1000ms.
When rounding jiffs and saving it in edac_dev->delay it means that all future schedules will not be with the correct delay.
The fix I suggested is the same logic used in:
- edac_device_workq_setup()
- edac_device_workq_function()
--
Regards, Eliav
Quoted 22 lines
---
drivers/edac/edac_device.c +1
-1@@ -399,7 +399,7 @@ void edac_device_reset_delay_period(structedac_device_ctl_info *edac_dev, unsigned long jiffs = msecs_to_jiffies(value); if (value == 1000) - jiffs = round_jiffies_relative(value); + jiffs = round_jiffies_relative(jiffs); edac_dev->poll_msec = value;edac_dev->delay = jiffs;
Signature · 4 lines
Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette
Borislav Petkov
maintainerQuoted 2 lines · Eliav
The one-liner below will not work. See the comment in
edac_device_workq_setup()that explains why round is used:
Bah, right you are - there's that "optimization".
Ok, I've applied this:
---
From: Eliav Farber <[email protected]>
Date: Thu, 20 Oct 2022 12:44:58 +0000
Subject: [PATCH] EDAC/device: Fix period calculation in
edac_device_reset_delay_period()
Fix period calculation in case user sets a value of 1000. The input of round_jiffies_relative() should be in jiffies and not in milli-seconds.
[ bp: Use the same code pattern as in edac_device_workq_setup() for
clarity. ]
--- drivers/edac/edac_device.c | 17 ++++++++--------- drivers/edac/edac_module.h | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-)
drivers/edac/edac_device.c +8 -9
@@ -394,17 +394,16 @@ static void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev)* Then restart the workq on the new delay */ void edac_device_reset_delay_period (struct edac_device_ctl_info *edac_dev, -unsigned long value) +unsigned long msec) { -unsigned long jiffs =msecs_to_jiffies (value); - -if (value ==1000 ) - jiffs =round_jiffies_relative (value); - - edac_dev->poll_msec = value; - edac_dev->delay = jiffs; + edac_dev->poll_msec = msec; + edac_dev->delay =msecs_to_jiffies (msec); -edac_mod_work (&edac_dev->work, jiffs); +/* See comment in edac_device_workq_setup() above */ +if (edac_dev->poll_msec ==1000 ) +edac_mod_work (&edac_dev->work,round_jiffies_relative (edac_dev->delay)); +else +edac_mod_work (&edac_dev->work, edac_dev->delay); }int edac_device_alloc_index (void )
drivers/edac/edac_module.h +1 -1
@@ -53,7 +53,7 @@ bool edac_stop_work(struct delayed_work *work);bool edac_mod_work (struct delayed_work *work,unsigned long delay);extern void edac_device_reset_delay_period (struct edac_device_ctl_info - *edac_dev,unsigned long value); + *edac_dev,unsigned long msec);extern void edac_mc_reset_delay_period (unsigned long value);/*
Signature · 9 lines
2.35.1
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette