input: fix locking context in ml_ff_set_gain
Subsystems (2)
PATCH 1/1 input: fix locking context in ml_ff_set_gain
Quoted 1 line
From
177c4e7a84c40925605d485f6d5367deb44a84c8Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Sat, 31 Oct 2009 14:13:40 -0700
Subject: [PATCH] input: fix locking context in ml_ff_set_gain
the ml_ff_set_gain() function uses spin_lock_bh/spin_unlock_bh for locking. Unfortunately, this function can be called with irqs off:vfs_write ->evdev_write ->input_inject_event (disables interrupts) -> input_handle_event ->input_ff_event ->ml_ff_set_gain
and doing spin_unlock_bh() with interrupts off is not allowed (and causes a nice warning as a result).
This patch fixes this by turning the locking into the _irqsave variant.
--- drivers/input/ff-memless.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/input/ff-memless.c +3 -2
@@ -380,8 +380,9 @@ static void ml_ff_set_gain(struct input_dev *dev, u16 gain) {struct ml_device *ml = dev->ff->private;int i; +unsigned long flags; -spin_lock_bh (&ml->timer_lock); +spin_lock_irqsave (&ml->timer_lock, flags); ml->gain = gain;
@@ -390,7 +391,7 @@ static void ml_ff_set_gain(struct input_dev *dev, u16 gain)ml_play_effects (ml); -spin_unlock_bh (&ml->timer_lock); +spin_unlock_irqrestore (&ml->timer_lock, flags); }static int ml_ff_playback (struct input_dev *dev,int effect_id,int value)
Signature · 8 lines
1.6.2.5 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Dmitry Torokhov
maintainerHi Arjan,
Quoted 15 lines · Arjan van de Ven
From
177c4e7a84c40925605d485f6d5367deb44a84c8Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Sat, 31 Oct 2009 14:13:40 -0700
Subject: [PATCH] input: fix locking context inml_ff_set_gainthe
ml_ff_set_gain()function uses spin_lock_bh/spin_unlock_bh for locking. Unfortunately, this function can be called with irqs off:vfs_write->evdev_write->input_inject_event(disables interrupts) ->input_handle_event->input_ff_event->ml_ff_set_gain
Quoted 4 lines
and doing
spin_unlock_bh()with interrupts off is not allowed (and causes a nice warning as a result).This patch fixes this by turning the locking into the
_irqsavevariant.
Thank you for the patch but it seems that the rest of the locking in ff-memless.c is screwqed up ever since locking (dev->event_lock) was added to the input core and this change plugs one hole but exposes others. I think I need to convert ff-memless.c over to rely on event_lock instead of the private timer_lock, but I will need a couple of days.
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainerQuoted 21 lines · Dmitry Torokhov
Hi Arjan,
Quoted 18 lines · Arjan van de Ven
From
177c4e7a84c40925605d485f6d5367deb44a84c8Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Sat, 31 Oct 2009 14:13:40 -0700
Subject: [PATCH] input: fix locking context inml_ff_set_gainthe
ml_ff_set_gain()function uses spin_lock_bh/spin_unlock_bh for locking. Unfortunately, this function can be called with irqs off:vfs_write->evdev_write->input_inject_event(disables interrupts) ->input_handle_event->input_ff_event->ml_ff_set_gainand doing
spin_unlock_bh()with interrupts off is not allowed (and causes a nice warning as a result).
Quoted 9 lines
Quoted 1 line
This patch fixes this by turning the locking into the
_irqsavevariant.Thank you for the patch but it seems that the rest of the locking in
ff-memless.cis screwqed up ever since locking (dev->event_lock) was added to the input core and this change plugs one hole but exposes others. I think I need to convertff-memless.cover to rely onevent_lockinstead of the privatetimer_lock, but I will need a couple of days.
OK, it ended up being pretty simple. Anssi, any chance you could test it to make sure I did not screw up? Thanks!
Signature · 25 lines
Dmitry Input: fix locking in memoryless force-feedback devices From: Dmitry Torokhov <[email protected]> Now that input core acquires dev->event_lock spinlock and disables interrupts when propagating input events, using spin_lock_bh() in ff-memless driver is not allowed. Actually, the timer_lock itself is not needed anymore, we should simply use dev->event_lock as well. Also do a small cleanup in force-feedback core. Reported-by: kerneloops.org Reported-by: http://www.kerneloops.org/searchweek.php?search=ml_ff_set_gain Reported-by: Arjan van de Ven <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/ff-core.c | 20 +++++++++++--------- drivers/input/ff-memless.c | 25 ++++++++++--------------- include/linux/input.h | 4 ++++ 3 files changed, 25 insertions(+), 24 deletions(-)
drivers/input/ff-core.c +11 -9
@@ -337,16 +337,16 @@ int input_ff_create(struct input_dev *dev, int max_effects) dev->ff = ff; dev->flush = flush_effects; dev->event = input_ff_event; -set_bit (EV_FF , dev->evbit); +__set_bit (EV_FF , dev->evbit);/* Copy "true" bits into ff device bitmap */ for (i =0 ; i <=FF_MAX ; i++)if (test_bit (i, dev->ffbit)) -set_bit (i, ff->ffbit); +__set_bit (i, ff->ffbit);/* we can emulate RUMBLE with periodic effects */ if (test_bit (FF_PERIODIC , ff->ffbit)) -set_bit (FF_RUMBLE , dev->ffbit); +__set_bit (FF_RUMBLE , dev->ffbit);return 0 ; }
@@ -362,12 +362,14 @@ EXPORT_SYMBOL_GPL(input_ff_create);*/ void input_ff_destroy (struct input_dev *dev) { -clear_bit (EV_FF , dev->evbit); -if (dev->ff) { -if (dev->ff->destroy) - dev->ff->destroy (dev->ff); -kfree (dev->ff->private); -kfree (dev->ff); +struct ff_device *ff = dev->ff; + +__clear_bit (EV_FF , dev->evbit); +if (ff) { +if (ff->destroy) + ff->destroy (ff); +kfree (ff->private); +kfree (ff); dev->ff =NULL ; } }
drivers/input/ff-memless.c +10 -15
@@ -61,7 +61,6 @@ struct ml_device {struct ml_effect_state states[FF_MEMLESS_EFFECTS ];int gain;struct timer_list timer; -spinlock_t timer_lock;struct input_dev *dev; int (*play_effect)(struct input_dev *dev, void *data,
@@ -371,35 +370,34 @@ static void ml_effect_timer(unsigned long timer_data)debug ("timer: updating effects" ); -spin_lock (&ml->timer_lock); +spin_lock_irq (&dev->event_lock);ml_play_effects (ml); -spin_unlock (&ml->timer_lock); +spin_unlock_irq (&dev->event_lock); } +/* +* Sets requested gain for FF effects. Called with dev->event_lock held. +*/ static void ml_ff_set_gain (struct input_dev *dev,u16 gain) {struct ml_device *ml = dev->ff->private;int i; -spin_lock_bh (&ml->timer_lock); - ml->gain = gain;for (i =0 ; i <FF_MEMLESS_EFFECTS ; i++)__clear_bit (FF_EFFECT_PLAYING , &ml->states[i].flags);ml_play_effects (ml); - -spin_unlock_bh (&ml->timer_lock); } +/* +* Start/stop specified FF effect. Called with dev->event_lock held. +*/ static int ml_ff_playback (struct input_dev *dev,int effect_id,int value) {struct ml_device *ml = dev->ff->private;struct ml_effect_state *state = &ml->states[effect_id]; -unsigned long flags; - -spin_lock_irqsave (&ml->timer_lock, flags);if (value >0 ) {debug ("initiated play" );
@@ -425,8 +423,6 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value)ml_play_effects (ml); } -spin_unlock_irqrestore (&ml->timer_lock, flags); -return 0 ; }
@@ -436,7 +432,7 @@ static int ml_ff_upload(struct input_dev *dev,struct ml_device *ml = dev->ff->private;struct ml_effect_state *state = &ml->states[effect->id]; -spin_lock_bh (&ml->timer_lock); +spin_lock_irq (&dev->event_lock);if (test_bit (FF_EFFECT_STARTED , &state->flags)) {__clear_bit (FF_EFFECT_PLAYING , &state->flags);
@@ -448,7 +444,7 @@ static int ml_ff_upload(struct input_dev *dev,ml_schedule_timer (ml); } -spin_unlock_bh (&ml->timer_lock); +spin_unlock_irq (&dev->event_lock);return 0 ; }
@@ -482,7 +478,6 @@ int input_ff_create_memless(struct input_dev *dev, void *data, ml->private = data; ml->play_effect = play_effect; ml->gain =0xffff ; -spin_lock_init (&ml->timer_lock);setup_timer (&ml->timer, ml_effect_timer, (unsigned long )dev);set_bit (FF_GAIN , dev->ffbit);
include/linux/input.h +4 -0
@@ -1377,6 +1377,10 @@ extern struct class input_class;* methods; erase() is optional. set_gain() and set_autocenter() need * only be implemented if driver sets up FF_GAIN and FF_AUTOCENTER * bits. +* +* Note that playback(), set_gain() and set_autocenter() are called with +* dev->event_lock spinlock held and interrupts off and thus may not +* sleep. */ struct ff_device { int (*upload)(struct input_dev *dev, struct ff_effect *effect,
Quoted 4 lines
OK, it ended up being pretty simple. Anssi, any chance you could test it to make sure I did not screw up? Thanks!
@@ -371,35 +370,34 @@ static void ml_effect_timer(unsigned long timer_data)
debug("timer: updating effects");
- spin_lock(&ml->timer_lock);
+ spin_lock_irq(&dev->event_lock);
ml_play_effects(ml);
- spin_unlock(&ml->timer_lock);
+ spin_unlock_irq(&dev->event_lock);
}
this bit looks evil.
might be better off as irqsave...
Signature · 3 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Dmitry Torokhov
maintainerQuoted 17 lines · Arjan van de Ven
Quoted 4 lines
OK, it ended up being pretty simple. Anssi, any chance you could test it to make sure I did not screw up? Thanks!
(quoted diff) +2
-2@@ -371,35 +370,34 @@ static void ml_effect_timer(unsigned long timer_data) debug("timer: updating effects"); - spin_lock(&ml->timer_lock); + spin_lock_irq(&dev->event_lock); ml_play_effects(ml); - spin_unlock(&ml->timer_lock); + spin_unlock_irq(&dev->event_lock); }this bit looks evil.
Quoted 2 lines
might be better off as irqsave...
Yes, I think I better do that. _irq should work at the moment but who knows what happen in the future...
Signature · 24 lines
Dmitry Input: fix locking in memoryless force-feedback devices From: Dmitry Torokhov <[email protected]> Now that input core acquires dev->event_lock spinlock and disables interrupts when propagating input events, using spin_lock_bh() in ff-memless driver is not allowed. Actually, the timer_lock itself is not needed anymore, we should simply use dev->event_lock as well. Also do a small cleanup in force-feedback core. Reported-by: kerneloops.org Reported-by: http://www.kerneloops.org/searchweek.php?search=ml_ff_set_gain Reported-by: Arjan van de Ven <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/ff-core.c | 20 +++++++++++--------- drivers/input/ff-memless.c | 26 +++++++++++--------------- include/linux/input.h | 4 ++++ 3 files changed, 26 insertions(+), 24 deletions(-)
drivers/input/ff-core.c +11 -9
@@ -337,16 +337,16 @@ int input_ff_create(struct input_dev *dev, int max_effects) dev->ff = ff; dev->flush = flush_effects; dev->event = input_ff_event; -set_bit (EV_FF , dev->evbit); +__set_bit (EV_FF , dev->evbit);/* Copy "true" bits into ff device bitmap */ for (i =0 ; i <=FF_MAX ; i++)if (test_bit (i, dev->ffbit)) -set_bit (i, ff->ffbit); +__set_bit (i, ff->ffbit);/* we can emulate RUMBLE with periodic effects */ if (test_bit (FF_PERIODIC , ff->ffbit)) -set_bit (FF_RUMBLE , dev->ffbit); +__set_bit (FF_RUMBLE , dev->ffbit);return 0 ; }
@@ -362,12 +362,14 @@ EXPORT_SYMBOL_GPL(input_ff_create);*/ void input_ff_destroy (struct input_dev *dev) { -clear_bit (EV_FF , dev->evbit); -if (dev->ff) { -if (dev->ff->destroy) - dev->ff->destroy (dev->ff); -kfree (dev->ff->private); -kfree (dev->ff); +struct ff_device *ff = dev->ff; + +__clear_bit (EV_FF , dev->evbit); +if (ff) { +if (ff->destroy) + ff->destroy (ff); +kfree (ff->private); +kfree (ff); dev->ff =NULL ; } }
drivers/input/ff-memless.c +11 -15
@@ -61,7 +61,6 @@ struct ml_device {struct ml_effect_state states[FF_MEMLESS_EFFECTS ];int gain;struct timer_list timer; -spinlock_t timer_lock;struct input_dev *dev; int (*play_effect)(struct input_dev *dev, void *data,
@@ -368,38 +367,38 @@ static void ml_effect_timer(unsigned long timer_data) {struct input_dev *dev = (struct input_dev *)timer_data;struct ml_device *ml = dev->ff->private; +unsigned long flags;debug ("timer: updating effects" ); -spin_lock (&ml->timer_lock); +spin_lock_irqsave (&dev->event_lock, flags);ml_play_effects (ml); -spin_unlock (&ml->timer_lock); +spin_unlock_irqrestore (&dev->event_lock, flags); } +/* +* Sets requested gain for FF effects. Called with dev->event_lock held. +*/ static void ml_ff_set_gain (struct input_dev *dev,u16 gain) {struct ml_device *ml = dev->ff->private;int i; -spin_lock_bh (&ml->timer_lock); - ml->gain = gain;for (i =0 ; i <FF_MEMLESS_EFFECTS ; i++)__clear_bit (FF_EFFECT_PLAYING , &ml->states[i].flags);ml_play_effects (ml); - -spin_unlock_bh (&ml->timer_lock); } +/* +* Start/stop specified FF effect. Called with dev->event_lock held. +*/ static int ml_ff_playback (struct input_dev *dev,int effect_id,int value) {struct ml_device *ml = dev->ff->private;struct ml_effect_state *state = &ml->states[effect_id]; -unsigned long flags; - -spin_lock_irqsave (&ml->timer_lock, flags);if (value >0 ) {debug ("initiated play" );
@@ -425,8 +424,6 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value)ml_play_effects (ml); } -spin_unlock_irqrestore (&ml->timer_lock, flags); -return 0 ; }
@@ -436,7 +433,7 @@ static int ml_ff_upload(struct input_dev *dev,struct ml_device *ml = dev->ff->private;struct ml_effect_state *state = &ml->states[effect->id]; -spin_lock_bh (&ml->timer_lock); +spin_lock_irq (&dev->event_lock);if (test_bit (FF_EFFECT_STARTED , &state->flags)) {__clear_bit (FF_EFFECT_PLAYING , &state->flags);
@@ -448,7 +445,7 @@ static int ml_ff_upload(struct input_dev *dev,ml_schedule_timer (ml); } -spin_unlock_bh (&ml->timer_lock); +spin_unlock_irq (&dev->event_lock);return 0 ; }
@@ -482,7 +479,6 @@ int input_ff_create_memless(struct input_dev *dev, void *data, ml->private = data; ml->play_effect = play_effect; ml->gain =0xffff ; -spin_lock_init (&ml->timer_lock);setup_timer (&ml->timer, ml_effect_timer, (unsigned long )dev);set_bit (FF_GAIN , dev->ffbit);
include/linux/input.h +4 -0
@@ -1377,6 +1377,10 @@ extern struct class input_class;* methods; erase() is optional. set_gain() and set_autocenter() need * only be implemented if driver sets up FF_GAIN and FF_AUTOCENTER * bits. +* +* Note that playback(), set_gain() and set_autocenter() are called with +* dev->event_lock spinlock held and interrupts off and thus may not +* sleep. */ struct ff_device { int (*upload)(struct input_dev *dev, struct ff_effect *effect,