Commit dbf52682 authored by Petr Mladek's avatar Petr Mladek Committed by Linus Torvalds

kthread: better support freezable kthread workers

This patch allows to make kthread worker freezable via a new @flags
parameter. It will allow to avoid an init work in some kthreads.

It currently does not affect the function of kthread_worker_fn()
but it might help to do some optimization or fixes eventually.

I currently do not know about any other use for the @flags
parameter but I believe that we will want more flags
in the future.

Finally, I hope that it will not cause confusion with @flags member
in struct kthread. Well, I guess that we will want to rework the
basic kthreads implementation once all kthreads are converted into
kthread workers or workqueues. It is possible that we will merge
the two structures.

Link: http://lkml.kernel.org/r/1470754545-17632-12-git-send-email-pmladek@suse.comSigned-off-by: default avatarPetr Mladek <pmladek@suse.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Borislav Petkov <bp@suse.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9a6b06c8
...@@ -65,7 +65,12 @@ struct kthread_work; ...@@ -65,7 +65,12 @@ struct kthread_work;
typedef void (*kthread_work_func_t)(struct kthread_work *work); typedef void (*kthread_work_func_t)(struct kthread_work *work);
void kthread_delayed_work_timer_fn(unsigned long __data); void kthread_delayed_work_timer_fn(unsigned long __data);
enum {
KTW_FREEZABLE = 1 << 0, /* freeze during suspend */
};
struct kthread_worker { struct kthread_worker {
unsigned int flags;
spinlock_t lock; spinlock_t lock;
struct list_head work_list; struct list_head work_list;
struct list_head delayed_work_list; struct list_head delayed_work_list;
...@@ -154,12 +159,13 @@ extern void __kthread_init_worker(struct kthread_worker *worker, ...@@ -154,12 +159,13 @@ extern void __kthread_init_worker(struct kthread_worker *worker,
int kthread_worker_fn(void *worker_ptr); int kthread_worker_fn(void *worker_ptr);
__printf(1, 2) __printf(2, 3)
struct kthread_worker * struct kthread_worker *
kthread_create_worker(const char namefmt[], ...); kthread_create_worker(unsigned int flags, const char namefmt[], ...);
struct kthread_worker * struct kthread_worker *
kthread_create_worker_on_cpu(int cpu, const char namefmt[], ...); kthread_create_worker_on_cpu(int cpu, unsigned int flags,
const char namefmt[], ...);
bool kthread_queue_work(struct kthread_worker *worker, bool kthread_queue_work(struct kthread_worker *worker,
struct kthread_work *work); struct kthread_work *work);
......
...@@ -560,11 +560,11 @@ void __kthread_init_worker(struct kthread_worker *worker, ...@@ -560,11 +560,11 @@ void __kthread_init_worker(struct kthread_worker *worker,
const char *name, const char *name,
struct lock_class_key *key) struct lock_class_key *key)
{ {
memset(worker, 0, sizeof(struct kthread_worker));
spin_lock_init(&worker->lock); spin_lock_init(&worker->lock);
lockdep_set_class_and_name(&worker->lock, key, name); lockdep_set_class_and_name(&worker->lock, key, name);
INIT_LIST_HEAD(&worker->work_list); INIT_LIST_HEAD(&worker->work_list);
INIT_LIST_HEAD(&worker->delayed_work_list); INIT_LIST_HEAD(&worker->delayed_work_list);
worker->task = NULL;
} }
EXPORT_SYMBOL_GPL(__kthread_init_worker); EXPORT_SYMBOL_GPL(__kthread_init_worker);
...@@ -594,6 +594,10 @@ int kthread_worker_fn(void *worker_ptr) ...@@ -594,6 +594,10 @@ int kthread_worker_fn(void *worker_ptr)
*/ */
WARN_ON(worker->task && worker->task != current); WARN_ON(worker->task && worker->task != current);
worker->task = current; worker->task = current;
if (worker->flags & KTW_FREEZABLE)
set_freezable();
repeat: repeat:
set_current_state(TASK_INTERRUPTIBLE); /* mb paired w/ kthread_stop */ set_current_state(TASK_INTERRUPTIBLE); /* mb paired w/ kthread_stop */
...@@ -627,7 +631,8 @@ int kthread_worker_fn(void *worker_ptr) ...@@ -627,7 +631,8 @@ int kthread_worker_fn(void *worker_ptr)
EXPORT_SYMBOL_GPL(kthread_worker_fn); EXPORT_SYMBOL_GPL(kthread_worker_fn);
static struct kthread_worker * static struct kthread_worker *
__kthread_create_worker(int cpu, const char namefmt[], va_list args) __kthread_create_worker(int cpu, unsigned int flags,
const char namefmt[], va_list args)
{ {
struct kthread_worker *worker; struct kthread_worker *worker;
struct task_struct *task; struct task_struct *task;
...@@ -657,6 +662,7 @@ __kthread_create_worker(int cpu, const char namefmt[], va_list args) ...@@ -657,6 +662,7 @@ __kthread_create_worker(int cpu, const char namefmt[], va_list args)
if (IS_ERR(task)) if (IS_ERR(task))
goto fail_task; goto fail_task;
worker->flags = flags;
worker->task = task; worker->task = task;
wake_up_process(task); wake_up_process(task);
return worker; return worker;
...@@ -668,6 +674,7 @@ __kthread_create_worker(int cpu, const char namefmt[], va_list args) ...@@ -668,6 +674,7 @@ __kthread_create_worker(int cpu, const char namefmt[], va_list args)
/** /**
* kthread_create_worker - create a kthread worker * kthread_create_worker - create a kthread worker
* @flags: flags modifying the default behavior of the worker
* @namefmt: printf-style name for the kthread worker (task). * @namefmt: printf-style name for the kthread worker (task).
* *
* Returns a pointer to the allocated worker on success, ERR_PTR(-ENOMEM) * Returns a pointer to the allocated worker on success, ERR_PTR(-ENOMEM)
...@@ -675,13 +682,13 @@ __kthread_create_worker(int cpu, const char namefmt[], va_list args) ...@@ -675,13 +682,13 @@ __kthread_create_worker(int cpu, const char namefmt[], va_list args)
* when the worker was SIGKILLed. * when the worker was SIGKILLed.
*/ */
struct kthread_worker * struct kthread_worker *
kthread_create_worker(const char namefmt[], ...) kthread_create_worker(unsigned int flags, const char namefmt[], ...)
{ {
struct kthread_worker *worker; struct kthread_worker *worker;
va_list args; va_list args;
va_start(args, namefmt); va_start(args, namefmt);
worker = __kthread_create_worker(-1, namefmt, args); worker = __kthread_create_worker(-1, flags, namefmt, args);
va_end(args); va_end(args);
return worker; return worker;
...@@ -692,6 +699,7 @@ EXPORT_SYMBOL(kthread_create_worker); ...@@ -692,6 +699,7 @@ EXPORT_SYMBOL(kthread_create_worker);
* kthread_create_worker_on_cpu - create a kthread worker and bind it * kthread_create_worker_on_cpu - create a kthread worker and bind it
* it to a given CPU and the associated NUMA node. * it to a given CPU and the associated NUMA node.
* @cpu: CPU number * @cpu: CPU number
* @flags: flags modifying the default behavior of the worker
* @namefmt: printf-style name for the kthread worker (task). * @namefmt: printf-style name for the kthread worker (task).
* *
* Use a valid CPU number if you want to bind the kthread worker * Use a valid CPU number if you want to bind the kthread worker
...@@ -705,13 +713,14 @@ EXPORT_SYMBOL(kthread_create_worker); ...@@ -705,13 +713,14 @@ EXPORT_SYMBOL(kthread_create_worker);
* when the worker was SIGKILLed. * when the worker was SIGKILLed.
*/ */
struct kthread_worker * struct kthread_worker *
kthread_create_worker_on_cpu(int cpu, const char namefmt[], ...) kthread_create_worker_on_cpu(int cpu, unsigned int flags,
const char namefmt[], ...)
{ {
struct kthread_worker *worker; struct kthread_worker *worker;
va_list args; va_list args;
va_start(args, namefmt); va_start(args, namefmt);
worker = __kthread_create_worker(cpu, namefmt, args); worker = __kthread_create_worker(cpu, flags, namefmt, args);
va_end(args); va_end(args);
return worker; return worker;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment