lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ipmi: use kthread API

Browse Source 
Convert ipmi driver thread to kthread API, only sleep when interface is
idle.

Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Cc: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Matt Domsch
2005-11-07 01:00:04 -08:00
committed by Linus Torvalds
parent a9a2c44ff0
commit e9a705a0a0
1 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/char/ipmi/ipmi_si_intf.c
View File

@@ -52,6 +52,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/kthread.h>
#include <asm/irq.h> #include <asm/irq.h>
#ifdef CONFIG_HIGH_RES_TIMERS #ifdef CONFIG_HIGH_RES_TIMERS
#include <linux/hrtime.h> #include <linux/hrtime.h>
@@ -222,8 +223,7 @@ struct smi_info
unsigned long watchdog_pretimeouts; unsigned long watchdog_pretimeouts;
unsigned long incoming_messages; unsigned long incoming_messages;
struct completion exiting; struct task_struct *thread;
long thread_pid;
}; };
static struct notifier_block *xaction_notifier_list; static struct notifier_block *xaction_notifier_list;
@@ -785,31 +785,22 @@ static void set_run_to_completion(void *send_info, int i_run_to_completion)
static int ipmi_thread(void *data) static int ipmi_thread(void *data)
{ {
struct smi_info *smi_info = data; struct smi_info *smi_info = data;
unsigned long flags, last=1; unsigned long flags;
enum si_sm_result smi_result; enum si_sm_result smi_result;
daemonize("kipmi%d", smi_info->intf_num);
allow_signal(SIGKILL);
set_user_nice(current, 19); set_user_nice(current, 19);
while (!atomic_read(&smi_info->stop_operation)) { while (!kthread_should_stop()) {
schedule_timeout(last);
spin_lock_irqsave(&(smi_info->si_lock), flags); spin_lock_irqsave(&(smi_info->si_lock), flags);
smi_result=smi_event_handler(smi_info, 0); smi_result=smi_event_handler(smi_info, 0);
spin_unlock_irqrestore(&(smi_info->si_lock), flags); spin_unlock_irqrestore(&(smi_info->si_lock), flags);
if (smi_result == SI_SM_CALL_WITHOUT_DELAY) if (smi_result == SI_SM_CALL_WITHOUT_DELAY) {
last = 0; /* do nothing */
else if (smi_result == SI_SM_CALL_WITH_DELAY) { }
else if (smi_result == SI_SM_CALL_WITH_DELAY)
udelay(1); udelay(1);
last = 0; else
schedule_timeout_interruptible(1);
} }
else {
/* System is idle; go to sleep */
last = 1;
current->state = TASK_INTERRUPTIBLE;
}
}
smi_info->thread_pid = 0;
complete_and_exit(&(smi_info->exiting), 0);
return 0; return 0;
} }
@@ -2212,11 +2203,8 @@ static void setup_xaction_handlers(struct smi_info *smi_info)
static inline void wait_for_timer_and_thread(struct smi_info *smi_info) static inline void wait_for_timer_and_thread(struct smi_info *smi_info)
{ {
if (smi_info->thread_pid > 0) { if (smi_info->thread != ERR_PTR(-ENOMEM))
/* wake the potentially sleeping thread */ kthread_stop(smi_info->thread);
kill_proc(smi_info->thread_pid, SIGKILL, 0);
wait_for_completion(&(smi_info->exiting));
}
del_timer_sync(&smi_info->si_timer); del_timer_sync(&smi_info->si_timer);
} }
@@ -2348,12 +2336,9 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
new_smi->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES; new_smi->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES;
add_timer(&(new_smi->si_timer)); add_timer(&(new_smi->si_timer));
if (new_smi->si_type != SI_BT) { if (new_smi->si_type != SI_BT)
init_completion(&(new_smi->exiting)); new_smi->thread = kthread_run(ipmi_thread, new_smi,
new_smi->thread_pid = kernel_thread(ipmi_thread, new_smi, "kipmi%d", new_smi->intf_num);
CLONE_FS|CLONE_FILES|
CLONE_SIGHAND);
}
rv = ipmi_register_smi(&handlers, rv = ipmi_register_smi(&handlers,
new_smi, new_smi,