From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754259AbcFPLTM (ORCPT ); Thu, 16 Jun 2016 07:19:12 -0400 Received: from mx2.suse.de ([195.135.220.15]:46507 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752097AbcFPLTH (ORCPT ); Thu, 16 Jun 2016 07:19:07 -0400 From: Petr Mladek To: Andrew Morton , Oleg Nesterov , Tejun Heo , Ingo Molnar , Peter Zijlstra Cc: Steven Rostedt , "Paul E. McKenney" , Josh Triplett , Thomas Gleixner , Linus Torvalds , Jiri Kosina , Borislav Petkov , Michal Hocko , linux-mm@kvack.org, Vlastimil Babka , linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH v9 07/12] kthread: Add kthread_destroy_worker() Date: Thu, 16 Jun 2016 13:17:26 +0200 Message-Id: <1466075851-24013-8-git-send-email-pmladek@suse.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1466075851-24013-1-git-send-email-pmladek@suse.com> References: <1466075851-24013-1-git-send-email-pmladek@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current kthread worker users call flush() and stop() explicitly. This function drains the worker, stops it, and frees the kthread_worker struct in one call. It is supposed to be used together with kthread_create_worker*() that allocates struct kthread_worker. Also note that drain() correctly handles self-queuing works in compare with flush(). Signed-off-by: Petr Mladek --- include/linux/kthread.h | 2 ++ kernel/kthread.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/linux/kthread.h b/include/linux/kthread.h index c889b653f8cb..b2c4dcea8f51 100644 --- a/include/linux/kthread.h +++ b/include/linux/kthread.h @@ -137,4 +137,6 @@ void kthread_flush_work(struct kthread_work *work); void kthread_flush_worker(struct kthread_worker *worker); void kthread_drain_worker(struct kthread_worker *worker); +void kthread_destroy_worker(struct kthread_worker *worker); + #endif /* _LINUX_KTHREAD_H */ diff --git a/kernel/kthread.c b/kernel/kthread.c index 4454b1267718..567ec49b4872 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -853,3 +853,24 @@ void kthread_drain_worker(struct kthread_worker *worker) spin_unlock_irq(&worker->lock); } EXPORT_SYMBOL(kthread_drain_worker); + +/** + * kthread_destroy_worker - destroy a kthread worker + * @worker: worker to be destroyed + * + * Drain and destroy @worker. It has the same conditions + * for use as kthread_drain_worker(), see above. + */ +void kthread_destroy_worker(struct kthread_worker *worker) +{ + struct task_struct *task; + + task = worker->task; + if (WARN_ON(!task)) + return; + + kthread_drain_worker(worker); + kthread_stop(task); + kfree(worker); +} +EXPORT_SYMBOL(kthread_destroy_worker); -- 1.8.5.6