2.6.15-mm4
Hi Andrew,
I get the following badness when booting mm4 on my thinkpad T43:
hdaps: IBM ThinkPad T43 detected.
hdaps: initial latch check good (0x01).
Time: acpi_pm clocksource has been installed.
input: hdaps as /class/input/input3
hdaps: driver successfully loaded.
Non-volatile memory driver v1.2
Badness in __mutex_trylock_slowpath at kernel/mutex.c:281
[<c01251cf>] mutex_trylock+0x5a/0xe7 [<e09c02d2>] hdaps_inputdev_poll+0xd/0xbd [hdaps] [<c011befc>] run_timer_softirq+0x105/0x147 [<c0118a0b>] __do_softirq+0x34/0x7d [<c0118a76>] do_softirq+0x22/0x26 [<c0104a64>] do_IRQ+0x22/0x2a [<c01033ce>] common_interrupt+0x1a/0x20
kjournald starting. Commit interval 5 seconds
Regards,
Brice
Quoted 11 lines · Brice Goglin
Hi Andrew,
I get the following badness when booting mm4 on my thinkpad T43:
hdaps: IBM ThinkPad T43 detected.
hdaps: initial latch check good (0x01).
Time:acpi_pmclocksource has been installed.
input: hdaps as /class/input/input3
hdaps: driver successfully loaded.
Non-volatile memory driver v1.2
Badness in__mutex_trylock_slowpathatkernel/mutex.c:281
Quoted 8 lines
[<c01251cf>] mutex_trylock+0x5a/0xe7 [<e09c02d2>] hdaps_inputdev_poll+0xd/0xbd [hdaps] [<c011befc>] run_timer_softirq+0x105/0x147 [<c0118a0b>] __do_softirq+0x34/0x7d [<c0118a76>] do_softirq+0x22/0x26 [<c0104a64>] do_IRQ+0x22/0x2a [<c01033ce>] common_interrupt+0x1a/0x20kjournald starting. Commit interval 5 seconds
Could you try the patch below?
Ingo
--
undo hdaps.c mutex conversion - hdaps_inputdev_poll() is used in an irq context.
----
drivers/hwmon/hdaps.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-)
drivers/hwmon/hdaps.c +18 -19
@@ -33,7 +33,6 @@#include <linux/module.h> #include <linux/timer.h> #include <linux/dmi.h> -#include <linux/mutex.h> #include <asm/io.h> #define HDAPS_LOW_PORT 0x1600/* first port used by hdaps */
@@ -77,10 +76,10 @@ static u8 km_activity;static int rest_x;static int rest_y; -static DEFINE_MUTEX (hdaps_mutex); +static DECLARE_MUTEX (hdaps_sem);/* -* __get_latch - Get the value from a given port. Callers must hold hdaps_mutex. +* __get_latch - Get the value from a given port. Callers must hold hdaps_sem. */ static inline u8 __get_latch (u16 port) {
@@ -89,7 +88,7 @@ static inline u8 __get_latch(u16 port)/* * __check_latch - Check a port latch for a given value. Returns zero if the -* port contains the given value. Callers must hold hdaps_mutex. +* port contains the given value. Callers must hold hdaps_sem. */ static inline int __check_latch (u16 port,u8 val) {
@@ -100,7 +99,7 @@ static inline int __check_latch(u16 port/* * __wait_latch - Wait up to 100us for a port latch to get a certain value, -* returning zero if the value is obtained. Callers must hold hdaps_mutex. +* returning zero if the value is obtained. Callers must hold hdaps_sem. */ static int __wait_latch (u16 port,u8 val) {
@@ -117,7 +116,7 @@ static int __wait_latch(u16 port, u8 val/* * __device_refresh - request a refresh from the accelerometer. Does not wait -* for refresh to complete. Callers must hold hdaps_mutex. +* for refresh to complete. Callers must hold hdaps_sem. */ static void __device_refresh (void ) {
@@ -131,7 +130,7 @@ static void __device_refresh(void)/* * __device_refresh_sync - request a synchronous refresh from the * accelerometer. We wait for the refresh to complete. Returns zero if -* successful and nonzero on error. Callers must hold hdaps_mutex. +* successful and nonzero on error. Callers must hold hdaps_sem. */ static int __device_refresh_sync (void ) {
@@ -141,7 +140,7 @@ static int __device_refresh_sync(void)/* * __device_complete - indicate to the accelerometer that we are done reading -* data, and then initiate an async refresh. Callers must hold hdaps_mutex. +* data, and then initiate an async refresh. Callers must hold hdaps_sem. */ static inline void __device_complete (void ) {
@@ -159,7 +158,7 @@ static int hdaps_readb_one(unsigned int {int ret; -mutex_lock (&hdaps_mutex); +down (&hdaps_sem);/* do a sync refresh -- we need to be sure that we read fresh data */ ret =__device_refresh_sync ();
@@ -170,7 +169,7 @@ static int hdaps_readb_one(unsigned int__device_complete (); out: -mutex_unlock (&hdaps_mutex); +up (&hdaps_sem);return ret; }
@@ -205,9 +204,9 @@ static int hdaps_read_pair(unsigned int {int ret; -mutex_lock (&hdaps_mutex); +down (&hdaps_sem); ret =__hdaps_read_pair (port1, port2, val1, val2); -mutex_unlock (&hdaps_mutex); +up (&hdaps_sem);return ret; }
@@ -220,7 +219,7 @@ static int hdaps_device_init(void) {int total, ret = -ENXIO ; -mutex_lock (&hdaps_mutex); +down (&hdaps_sem);outb (0x13 ,0x1610 );outb (0x01 ,0x161f );
@@ -286,13 +285,13 @@ static int hdaps_device_init(void) } out: -mutex_unlock (&hdaps_mutex); +up (&hdaps_sem);return ret; }/* -* hdaps_calibrate - Set our "resting" values. Callers must hold hdaps_mutex. +* hdaps_calibrate - Set our "resting" values. Callers must hold hdaps_sem. */ static void hdaps_calibrate (void ) {
@@ -304,7 +303,7 @@ static void hdaps_inputdev_poll(unsignedint x, y;/* Cannot sleep. Try nonblockingly. If we fail, try again later. */ -if (!mutex_trylock (&hdaps_mutex)) { +if (down_trylock (&hdaps_sem)) {mod_timer (&hdaps_timer, jiffies +HDAPS_POLL_PERIOD );return ; }
@@ -319,7 +318,7 @@ static void hdaps_inputdev_poll(unsignedmod_timer (&hdaps_timer, jiffies +HDAPS_POLL_PERIOD ); out: -mutex_unlock (&hdaps_mutex); +up (&hdaps_sem); }
@@ -399,9 +398,9 @@ static ssize_t hdaps_calibrate_store(strstruct device_attribute *attr, const char *buf, size_t count) { - mutex_lock(&hdaps_mutex); + down(&hdaps_sem);hdaps_calibrate (); -mutex_unlock (&hdaps_mutex); +up (&hdaps_sem);return count; }
Quoted 26 lines · Ingo Molnar
Quoted 11 lines · Brice Goglin
Hi Andrew,
I get the following badness when booting mm4 on my thinkpad T43:
hdaps: IBM ThinkPad T43 detected.
hdaps: initial latch check good (0x01).
Time:acpi_pmclocksource has been installed.
input: hdaps as /class/input/input3
hdaps: driver successfully loaded.
Non-volatile memory driver v1.2
Badness in__mutex_trylock_slowpathatkernel/mutex.c:281Quoted 10 lines
[<c01251cf>] mutex_trylock+0x5a/0xe7 [<e09c02d2>] hdaps_inputdev_poll+0xd/0xbd [hdaps] [<c011befc>] run_timer_softirq+0x105/0x147 [<c0118a0b>] __do_softirq+0x34/0x7d [<c0118a76>] do_softirq+0x22/0x26 [<c0104a64>] do_IRQ+0x22/0x2a [<c01033ce>] common_interrupt+0x1a/0x20kjournald starting. Commit interval 5 seconds
Quoted 4 lines
Could you try the patch below?
Yes, it does fix it. What's the bug ? The mutexes are supposed to work where semaphores do, aren't they ?
Brice
Quoted 4 lines · Brice Goglin
Quoted 1 line
Could you try the patch below?
Yes, it does fix it. What's the bug ? The mutexes are supposed to work where semaphores do, aren't they ?
no, not always. We could introduce mutex_trylock_irqsafe() and mutex_unlock_irqsafe(), but it's probably not worth doing it - it's just 3-4 cases so far, out of hundreds of mutex conversions.
Ingo