Alarmtimer fixes (hopefully 3.7 material)
cover Alarmtimer fixes (hopefully 3.7 material)
Arve Hjønnevåg reported numerous crashes from the "BUG_ON(timer->state != HRTIMER_STATE_CALLBACK)" check in __run_hrtimer after it called alarmtimer_fired.
Looking at the code, I realized much of the logic duplicated the hrtimer code, and that by multiplexing numerous alarmtimers onto a single hrtimer didn't really gain us anything over just using an hrtimer per alarmtimer. Especially given the various ways hrtimer actions can fail.
So this patchset tries to simplify some of the alarmtimer code by utilizing the hrtimer logic in a more direct manner. Followed then by a few cleanup patches.
I've done some brief testing with some simpler test cases, but I'd appreciate any additional testing or review.
I'm hoping to resubmit this so it can go in for 3.7.
thanks
-john
John Stultz (3):
alarmtimer: Use hrtimer per-alarm instead of per-base
alarmtimer: Remove unused helpers & defines
alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
include/linux/alarmtimer.h | 31 +------------- kernel/time/alarmtimer.c | 99 +++++++++++++------------------------------- 2 files changed, 31 insertions(+), 99 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 alarmtimer: Use hrtimer per-alarm instead of per-base
Arve Hjønnevåg reported numerous crashes from the "BUG_ON(timer->state != HRTIMER_STATE_CALLBACK)" check in __run_hrtimer after it called alarmtimer_fired.
It ends up the alarmtimer code was not properly handling possible failures of hrtimer_try_to_cancel, and because these faulres occur when the underlying base hrtimer is being run, this limits the ability to properly handle modifications to any alarmtimers on that base.
Because much of the logic duplicates the hrtimer logic, it seems that we might as well have a per-alarmtimer hrtimer, and avoid the extra complextity of trying to multiplex many alarmtimers off of one hrtimer.
Thus this patch moves the hrtimer to the alarm structure and simplifies the management logic.
--- include/linux/alarmtimer.h | 3 +- kernel/time/alarmtimer.c | 93 +++++++++++++------------------------------- 2 files changed, 28 insertions(+), 68 deletions(-)
include/linux/alarmtimer.h +2 -1
@@ -35,6 +35,7 @@ enum alarmtimer_restart {*/ struct alarm {struct timerqueue_node node; +struct hrtimer timer;enum alarmtimer_restart (*function)(struct alarm *,ktime_t now);enum alarmtimer_type type;int state;
@@ -43,7 +44,7 @@ struct alarm {void alarm_init (struct alarm *alarm,enum alarmtimer_type type,enum alarmtimer_restart (*function)(struct alarm *,ktime_t )); -void alarm_start (struct alarm *alarm,ktime_t start); +int alarm_start (struct alarm *alarm,ktime_t start);int alarm_try_to_cancel (struct alarm *alarm);int alarm_cancel (struct alarm *alarm);
kernel/time/alarmtimer.c +26 -67
175 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/3 alarmtimer: Remove unused helpers & defines
In reply to John StultzNo one is using these alarmtimer state helpers, so yank them.
--- include/linux/alarmtimer.h | 28 ---------------------------- 1 file changed, 28 deletions(-)
include/linux/alarmtimer.h +0 -28
@@ -21,7 +21,6 @@ enum alarmtimer_restart {#define ALARMTIMER_STATE_INACTIVE 0x00#define ALARMTIMER_STATE_ENQUEUED 0x01 -#define ALARMTIMER_STATE_CALLBACK 0x02/** * struct alarm - Alarm timer structure
@@ -50,33 +49,6 @@ int alarm_cancel(struct alarm *alarm);u64 alarm_forward (struct alarm *alarm,ktime_t now,ktime_t interval); -/* -* A alarmtimer is active, when it is enqueued into timerqueue or the -* callback function is running. -*/ -static inline int alarmtimer_active (const struct alarm *timer) -{ -return timer->state !=ALARMTIMER_STATE_INACTIVE ; -} - -/* -* Helper function to check, whether the timer is on one of the queues -*/ -static inline int alarmtimer_is_queued (struct alarm *timer) -{ -return timer->state &ALARMTIMER_STATE_ENQUEUED ; -} - -/* -* Helper function to check, whether the timer is running the callback -* function -*/ -static inline int alarmtimer_callback_running (struct alarm *timer) -{ -return timer->state &ALARMTIMER_STATE_CALLBACK ; -} - -/* Provide way to access the rtc device being used by alarmtimers */ struct rtc_device *alarmtimer_get_rtcdev (void );
Signature · 1 line
1.7.9.5
PATCH 3/3 alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
In reply to John StultzNow that alarmtimer_remove has been simplified, change its name to _dequeue to better match its paired _enqueue function.
--- kernel/time/alarmtimer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/time/alarmtimer.c +4 -4
@@ -142,7 +142,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm) }/** -* alarmtimer_remove - Removes an alarm timer from an alarm_base timerqueue +* alarmtimer_dequeue - Removes an alarm timer from an alarm_base timerqueue * @base: pointer to the base where the timer is running * @alarm: pointer to alarm being removed *
@@ -150,7 +150,7 @@ static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm)* * Must hold base->lock when calling. */ -static void alarmtimer_remove (struct alarm_base *base,struct alarm *alarm) +static void alarmtimer_dequeue (struct alarm_base *base,struct alarm *alarm) {if (!(alarm->state &ALARMTIMER_STATE_ENQUEUED ))return ;
@@ -178,7 +178,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)int restart =ALARMTIMER_NORESTART ;spin_lock_irqsave (&base->lock, flags); -alarmtimer_remove (base, alarm); +alarmtimer_dequeue (base, alarm);spin_unlock_irqrestore (&base->lock, flags);if (alarm->function)
@@ -332,7 +332,7 @@ int alarm_try_to_cancel(struct alarm *alarm)spin_lock_irqsave (&base->lock, flags); ret =hrtimer_try_to_cancel (&alarm->timer);if (ret >=0 ) -alarmtimer_remove (base, alarm); +alarmtimer_dequeue (base, alarm);spin_unlock_irqrestore (&base->lock, flags);return ret; }
Signature · 1 line
1.7.9.5