cyclic: Don't disable cylic function upon exceeding CPU time
PATCH 1/1 cyclic: Don't disable cylic function upon exceeding CPU time
With the migration of the watchdog infrastructure to cyclic functions it's been noticed, that at least one watchdog driver is broken now. As the execution time of it's watchdog reset function is quite long.
In general it's not really necessary (right now) to disable the cyclic function upon exceeding CPU time usage. So instead of disabling the cylic function in this case, let's just print a warning once to show this potential problem to the user.
--- common/cyclic.c | 12 ++++++++---- include/cyclic.h | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-)
common/cyclic.c +8 -4
@@ -85,13 +85,17 @@ void cyclic_run(void) cyclic->cpu_time_us += cpu_time;/* Check if cpu-time exceeds max allowed time */ -if (cpu_time >CONFIG_CYCLIC_MAX_CPU_TIME_US ) { -pr_err ("cyclic function %s took too long: %lldus vs %dus max, disabling\n" , +if ((cpu_time >CONFIG_CYCLIC_MAX_CPU_TIME_US ) && + (!cyclic->already_warned)) { +pr_err ("cyclic function %s took too long: %lldus vs %dus max\n" , cyclic->name, cpu_time,CONFIG_CYCLIC_MAX_CPU_TIME_US ); -/* Unregister this cyclic function */ -cyclic_unregister (cyclic); +/* +* Don't disable this function, just warn once +* about this exceeding CPU time usage +*/ + cyclic->already_warned = true; } } }
include/cyclic.h +2 -0
@@ -39,6 +39,7 @@ struct cyclic_drv {* @run_cnt: Counter of executions occurances * @next_call: Next time in us, when the function shall be executed again * @list: List node +* @already_warned: Flag that we've warned about exceeding CPU time usage */ struct cyclic_info {void (*func)(void *ctx);
@@ -50,6 +51,7 @@ struct cyclic_info {uint64_t run_cnt;uint64_t next_call;struct list_head list; +bool already_warned; };/** Function type for cyclic functions */
Signature · 1 line
2.38.0
Quoted 9 lines · Stefan Roese
With the migration of the watchdog infrastructure to cyclic functions it's been noticed, that at least one watchdog driver is broken now. As the execution time of it's watchdog reset function is quite long.
In general it's not really necessary (right now) to disable the cyclic function upon exceeding CPU time usage. So instead of disabling the cylic function in this case, let's just print a warning once to show this potential problem to the user.
Quoted 5 lines
Signed-off-by Stefan Roese <[email protected]>Suggested-by Rasmus Villemoes <[email protected]>Cc Rasmus Villemoes <[email protected]>Cc Tom Rini <[email protected]>Cc Pali Rohár <[email protected]>
Applied to u-boot-watchdog/master
Thanks,
Stefan
Quoted 44 lines
--- common/cyclic.c | 12 ++++++++---- include/cyclic.h | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-)common/cyclic.c +8
-4@@ -85,13 +85,17 @@ void cyclic_run(void) cyclic->cpu_time_us += cpu_time;/* Check if cpu-time exceeds max allowed time */ -if (cpu_time >CONFIG_CYCLIC_MAX_CPU_TIME_US ) { -pr_err ("cyclic function %s took too long: %lldus vs %dus max, disabling\n" , +if ((cpu_time >CONFIG_CYCLIC_MAX_CPU_TIME_US ) && + (!cyclic->already_warned)) { +pr_err ("cyclic function %s took too long: %lldus vs %dus max\n" , cyclic->name, cpu_time,CONFIG_CYCLIC_MAX_CPU_TIME_US ); -/* Unregister this cyclic function */ -cyclic_unregister (cyclic); +/* +* Don't disable this function, just warn once +* about this exceeding CPU time usage +*/ + cyclic->already_warned = true; } } }include/cyclic.h +1
-0@@ -39,6 +39,7 @@ struct cyclic_drv {* @run_cnt: Counter of executions occurances * @next_call: Next time in us, when the function shall be executed again * @list: List node +* @already_warned: Flag that we've warned about exceeding CPU time usage */ struct cyclic_info {void (*func)(void *ctx);
include/cyclic.h struct cyclic_info { · line 57
Quoted 7 lines
include/cyclic.h +1
-0@@ -50,6 +51,7 @@ struct cyclic_info {uint64_t run_cnt;uint64_t next_call;struct list_head list; +bool already_warned; };/** Function type for cyclic functions */
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]