linuxkpi: Fix mod_timer and del_timer_sync
ClosedPublic
Actions

Authored by manu on May 24 2020, 4:11 PM.

Details

Reviewers

• hselasky
emaste

Commits

rS361452: linuxkpi: Fix mod_timer and del_timer_sync

Summary

mod_timer is supposed to return 1 if the modified timer was pending, which
is exactly what callout_reset does so return this value directly.
The only not handled case is when callout_reset fails, for now returns 0 as if the timer
wasn't modified.
del_timer_sync returns int so add a function and handle that.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

manu created this revision.May 24 2020, 4:11 PM

Herald added a subscriber: imp. · View Herald TranscriptMay 24 2020, 4:11 PM

manu requested review of this revision.May 24 2020, 4:11 PM

• hselasky added inline comments.May 24 2020, 9:28 PM

sys/compat/linuxkpi/common/include/linux/timer.h
86–87	This is wrong. callout_drain() is not the same like callout_stop() as used by del_timer(). Please read the callout implementation carefully.
sys/compat/linuxkpi/common/src/linux_compat.c
1912	Please read the callout_reset() code that you return exactly what you want!

manu added inline comments.May 24 2020, 9:36 PM

sys/compat/linuxkpi/common/include/linux/timer.h
86–87	oops sorry, I'll change that.
sys/compat/linuxkpi/common/src/linux_compat.c
1912	?

• hselasky added inline comments.May 24 2020, 9:53 PM

sys/compat/linuxkpi/common/src/linux_compat.c
1912	From what I know callout functions can return 1,0,-1. Are you sure callout reset only returns 1/0 ?

manu added inline comments.May 24 2020, 10:07 PM

sys/compat/linuxkpi/common/src/linux_compat.c
1912	Oh mhm, right, I guess I should just ignore <0 like we do now. I'll change that.

manu updated this revision to Diff 72220.May 25 2020, 8:51 AM

manu edited the summary of this revision. (Show Details)

manu marked 2 inline comments as done.May 25 2020, 8:57 AM

• hselasky added inline comments.May 25 2020, 9:22 AM

sys/compat/linuxkpi/common/src/linux_compat.c
1908	Callout reset never fails. Please remove or update this comment. Either it: starts timer from clear (0) or re-starts timer (1) MPASS(ret == 0 \|\| ret == 1); return (ret == 1);