Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1458822

[PATCH v10 10/11] kthread: Allow to modify delayed kthread work

Show all headers | View raw

There are situations when we need to modify the delay of a delayed kthread
work. For example, when the work depends on an event and the initial delay
means a timeout. Then we want to queue the work immediately when the event
happens.

This patch implements kthread_mod_delayed_work() as inspired workqueues.
It cancels the timer, removes the work from any worker list and queues it
again with the given timeout.

A very special case is when the work is being canceled at the same time.
It might happen because of the regular kthread_cancel_delayed_work_sync()
or by another kthread_mod_delayed_work(). In this case, we do nothing and
let the other operation win. This should not normally happen as the caller
is supposed to synchronize these operations a reasonable way.

Signed-off-by: Petr Mladek <pmladek@suse.com>
Acked-by: Tejun Heo <tj@kernel.org>
---
 include/linux/kthread.h |  4 ++++
 kernel/kthread.c        | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index 77435dcde707..5c2ec2c4eb22 100644
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -168,6 +168,10 @@ bool kthread_queue_delayed_work(struct kthread_worker *worker,
 				struct kthread_delayed_work *dwork,
 				unsigned long delay);
 
+bool kthread_mod_delayed_work(struct kthread_worker *worker,
+			      struct kthread_delayed_work *dwork,
+			      unsigned long delay);
+
 void kthread_flush_work(struct kthread_work *work);
 void kthread_flush_worker(struct kthread_worker *worker);
 
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 526646971ec1..0de621e1c732 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -972,6 +972,59 @@ static bool __kthread_cancel_work(struct kthread_work *work, bool is_dwork,
 	return false;
 }
 
+/**
+ * kthread_mod_delayed_work - modify delay of or queue a kthread delayed work
+ * @worker: kthread worker to use
+ * @dwork: kthread delayed work to queue
+ * @delay: number of jiffies to wait before queuing
+ *
+ * If @dwork is idle, equivalent to kthread_queue_delayed_work(). Otherwise,
+ * modify @dwork's timer so that it expires after @delay. If @delay is zero,
+ * @work is guaranteed to be queued immediately.
+ *
+ * Return: %true if @dwork was pending and its timer was modified,
+ * %false otherwise.
+ *
+ * A special case is when the work is being canceled in parallel.
+ * It might be caused either by the real kthread_cancel_delayed_work_sync()
+ * or yet another kthread_mod_delayed_work() call. We let the other command
+ * win and return %false here. The caller is supposed to synchronize these
+ * operations a reasonable way.
+ *
+ * This function is safe to call from any context including IRQ handler.
+ * See __kthread_cancel_work() and kthread_delayed_work_timer_fn()
+ * for details.
+ */
+bool kthread_mod_delayed_work(struct kthread_worker *worker,
+			      struct kthread_delayed_work *dwork,
+			      unsigned long delay)
+{
+	struct kthread_work *work = &dwork->work;
+	unsigned long flags;
+	int ret = false;
+
+	spin_lock_irqsave(&worker->lock, flags);
+
+	/* Do not bother with canceling when never queued. */
+	if (!work->worker)
+		goto fast_queue;
+
+	/* Work must not be used with >1 worker, see kthread_queue_work() */
+	WARN_ON_ONCE(work->worker != worker);
+
+	/* Do not fight with another command that is canceling this work. */
+	if (work->canceling)
+		goto out;
+
+	ret = __kthread_cancel_work(work, true, &flags);
+fast_queue:
+	__kthread_queue_delayed_work(worker, dwork, delay);
+out:
+	spin_unlock_irqrestore(&worker->lock, flags);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(kthread_mod_delayed_work);
+
 static bool __kthread_cancel_work_sync(struct kthread_work *work, bool is_dwork)
 {
 	struct kthread_worker *worker = work->worker;
-- 
1.8.5.6

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v10 00/11] kthread: Kthread worker API improvements Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 05/11] kthread: Add kthread_create_worker*() Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 06/11] kthread: Add kthread_destroy_worker() Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 08/11] kthread: Initial support for delayed kthread work Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 04/11] kthread: Allow to call __kthread_create_on_node() with va_list args Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 10/11] kthread: Allow to modify delayed kthread work Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 11/11] kthread: Better support freezable kthread workers Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 07/11] kthread: Detect when a kthread work is used by more workers Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 09/11] kthread: Allow to cancel kthread work Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 01/11] kthread: Rename probe_kthread_data() to kthread_probe_data() Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200
  [PATCH v10 02/11] kthread: Kthread worker API cleanup Petr Mladek <pmladek@suse.com> - 2016-08-09 17:00 +0200

csiph-web