From 29ac5eccf72371572204adbc4e3a3d0f7bc8dee4 Mon Sep 17 00:00:00 2001 From: Jason Uhlenkott Date: Wed, 19 Nov 2008 17:09:56 +0000 Subject: sdio: use interruptible sleep in kthread main loops My FreeRunner's load average was leveling off at 2.00 as a result of these two kernel threads: SDIO Helper D c02b4500 0 255 2 [] (schedule+0x0/0x2d4) from [] (__down+0x100/0x158) [] (__down+0x0/0x158) from [] (__down_failed+0xc/0x20) r7:00000000 r6:c01fbd64 r5:c7cb7134 r4:c7d58000 [] (CardDetectHelperFunction+0x0/0x1ac) from [] (HelperLaunch+0x1c/0x28) r5:c7cb7134 r4:c7cb7134 [] (HelperLaunch+0x0/0x28) from [] (kthread+0x60/0x94) r4:c7d58000 [] (kthread+0x0/0x94) from [] (do_exit+0x0/0x744) r6:00000000 r5:00000000 r4:00000000 SDIO Helper D c02b4500 0 259 2 [] (schedule+0x0/0x2d4) from [] (__down+0x100/0x158) [] (__down+0x0/0x158) from [] (__down_failed+0xc/0x20) r7:c0382bb4 r6:c0382b34 r5:c7d5a000 r4:00000001 [] (SDIOIrqHelperFunction+0x0/0x29c) from [] (HelperLaunch+0x1c/0x28) r8:00000000 r7:00000000 r6:c01fbd64 r5:c0382bb4 r4:c0382bb4 [] (HelperLaunch+0x0/0x28) from [] (kthread+0x60/0x94) r4:c7d5a000 [] (kthread+0x0/0x94) from [] (do_exit+0x0/0x744) r6:00000000 r5:00000000 r4:00000000 This fixes them to use interruptible sleep primitives while waiting in their main loops, as is conventional for kernel threads. They can't actually be interrupted since kernel threads ignore all signals, but by sleeping this way they get classified as long term waiters, and don't get counted as running for purposes of load average calculation. This is intended as a minimal fix. In the longer term, it'd probably make sense to replace the semaphores with completions or something, and to do away with some of these StudlyCapped wrapper functions. Signed-off-by: Jason Uhlenkott -- This is untested, but what could possibly go wrong? ;) --- include/linux/sdio/ctsystem_linux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/sdio/ctsystem_linux.h b/include/linux/sdio/ctsystem_linux.h index 0de89a66d7b..c9e44f20175 100644 --- a/include/linux/sdio/ctsystem_linux.h +++ b/include/linux/sdio/ctsystem_linux.h @@ -968,7 +968,7 @@ typedef struct _OSKERNEL_HELPER { } +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#define SD_WAIT_FOR_WAKEUP(p) SignalWait(&(p)->WakeSignal); +#define SD_WAIT_FOR_WAKEUP(p) SignalWaitInterruptible(&(p)->WakeSignal); #define CT_LE16_TO_CPU_ENDIAN(x) __le16_to_cpu(x) #define CT_LE32_TO_CPU_ENDIAN(x) __le32_to_cpu(x) -- cgit v1.2.3