All of lore.kernel.org
 help / color / mirror / Atom feed
* FAILED: patch "[PATCH] kthread_worker: split code for canceling the delayed work" failed to apply to 4.19-stable tree
@ 2021-06-27 14:23 gregkh
  2021-06-30 11:01 ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Petr Mladek
  0 siblings, 1 reply; 9+ messages in thread
From: gregkh @ 2021-06-27 14:23 UTC (permalink / raw)
  To: pmladek, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, stable, tj, torvalds
  Cc: stable


The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 34b3d5344719d14fd2185b2d9459b3abcb8cf9d8 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.com>
Date: Thu, 24 Jun 2021 18:39:45 -0700
Subject: [PATCH] kthread_worker: split code for canceling the delayed work
 timer

Patch series "kthread_worker: Fix race between kthread_mod_delayed_work()
and kthread_cancel_delayed_work_sync()".

This patchset fixes the race between kthread_mod_delayed_work() and
kthread_cancel_delayed_work_sync() including proper return value
handling.

This patch (of 2):

Simple code refactoring as a preparation step for fixing a race between
kthread_mod_delayed_work() and kthread_cancel_delayed_work_sync().

It does not modify the existing behavior.

Link: https://lkml.kernel.org/r/20210610133051.15337-2-pmladek@suse.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Cc: <jenhaochen@google.com>
Cc: Martin Liu <liumartin@google.com>
Cc: Minchan Kim <minchan@google.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/kernel/kthread.c b/kernel/kthread.c
index fe3f2a40d61e..121a0e1fc659 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -1092,6 +1092,33 @@ void kthread_flush_work(struct kthread_work *work)
 }
 EXPORT_SYMBOL_GPL(kthread_flush_work);
 
+/*
+ * Make sure that the timer is neither set nor running and could
+ * not manipulate the work list_head any longer.
+ *
+ * The function is called under worker->lock. The lock is temporary
+ * released but the timer can't be set again in the meantime.
+ */
+static void kthread_cancel_delayed_work_timer(struct kthread_work *work,
+					      unsigned long *flags)
+{
+	struct kthread_delayed_work *dwork =
+		container_of(work, struct kthread_delayed_work, work);
+	struct kthread_worker *worker = work->worker;
+
+	/*
+	 * del_timer_sync() must be called to make sure that the timer
+	 * callback is not running. The lock must be temporary released
+	 * to avoid a deadlock with the callback. In the meantime,
+	 * any queuing is blocked by setting the canceling counter.
+	 */
+	work->canceling++;
+	raw_spin_unlock_irqrestore(&worker->lock, *flags);
+	del_timer_sync(&dwork->timer);
+	raw_spin_lock_irqsave(&worker->lock, *flags);
+	work->canceling--;
+}
+
 /*
  * This function removes the work from the worker queue. Also it makes sure
  * that it won't get queued later via the delayed work's timer.
@@ -1106,23 +1133,8 @@ static bool __kthread_cancel_work(struct kthread_work *work, bool is_dwork,
 				  unsigned long *flags)
 {
 	/* Try to cancel the timer if exists. */
-	if (is_dwork) {
-		struct kthread_delayed_work *dwork =
-			container_of(work, struct kthread_delayed_work, work);
-		struct kthread_worker *worker = work->worker;
-
-		/*
-		 * del_timer_sync() must be called to make sure that the timer
-		 * callback is not running. The lock must be temporary released
-		 * to avoid a deadlock with the callback. In the meantime,
-		 * any queuing is blocked by setting the canceling counter.
-		 */
-		work->canceling++;
-		raw_spin_unlock_irqrestore(&worker->lock, *flags);
-		del_timer_sync(&dwork->timer);
-		raw_spin_lock_irqsave(&worker->lock, *flags);
-		work->canceling--;
-	}
+	if (is_dwork)
+		kthread_cancel_delayed_work_timer(work, flags);
 
 	/*
 	 * Try to remove the work from a worker list. It might either


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work()
  2021-06-27 14:23 FAILED: patch "[PATCH] kthread_worker: split code for canceling the delayed work" failed to apply to 4.19-stable tree gregkh
@ 2021-06-30 11:01 ` Petr Mladek
  2021-06-30 11:01   ` [PATCH 1/2] kthread_worker: split code for canceling the delayed work timer Petr Mladek
                     ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Petr Mladek @ 2021-06-30 11:01 UTC (permalink / raw)
  To: stable
  Cc: gregkh, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, tj, torvalds, Petr Mladek

This is backport of the series for the following stable trees:

   + 4.9
   + 4.14
   + 4.19

The orignal series did not apply because of a conflict with the commit
("kthread: Convert worker lock to raw spinlock").

Petr Mladek (2):
  kthread_worker: split code for canceling the delayed work timer
  kthread: prevent deadlock when kthread_mod_delayed_work() races with
    kthread_cancel_delayed_work_sync()

 kernel/kthread.c | 77 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 26 deletions(-)

-- 
2.26.2


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 1/2] kthread_worker: split code for canceling the delayed work timer
  2021-06-30 11:01 ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Petr Mladek
@ 2021-06-30 11:01   ` Petr Mladek
  2021-06-30 11:01   ` [PATCH 2/2] kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync() Petr Mladek
  2021-06-30 11:06   ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Greg KH
  2 siblings, 0 replies; 9+ messages in thread
From: Petr Mladek @ 2021-06-30 11:01 UTC (permalink / raw)
  To: stable
  Cc: gregkh, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, tj, torvalds, Petr Mladek

Patch series "kthread_worker: Fix race between kthread_mod_delayed_work()
and kthread_cancel_delayed_work_sync()".

This patchset fixes the race between kthread_mod_delayed_work() and
kthread_cancel_delayed_work_sync() including proper return value
handling.

This patch (of 2):

Simple code refactoring as a preparation step for fixing a race between
kthread_mod_delayed_work() and kthread_cancel_delayed_work_sync().

It does not modify the existing behavior.

Link: https://lkml.kernel.org/r/20210610133051.15337-2-pmladek@suse.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Cc: <jenhaochen@google.com>
Cc: Martin Liu <liumartin@google.com>
Cc: Minchan Kim <minchan@google.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 kernel/kthread.c | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/kernel/kthread.c b/kernel/kthread.c
index 81abfac35127..b2688c39c6f1 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -1009,6 +1009,33 @@ void kthread_flush_work(struct kthread_work *work)
 }
 EXPORT_SYMBOL_GPL(kthread_flush_work);
 
+/*
+ * Make sure that the timer is neither set nor running and could
+ * not manipulate the work list_head any longer.
+ *
+ * The function is called under worker->lock. The lock is temporary
+ * released but the timer can't be set again in the meantime.
+ */
+static void kthread_cancel_delayed_work_timer(struct kthread_work *work,
+					      unsigned long *flags)
+{
+	struct kthread_delayed_work *dwork =
+		container_of(work, struct kthread_delayed_work, work);
+	struct kthread_worker *worker = work->worker;
+
+	/*
+	 * del_timer_sync() must be called to make sure that the timer
+	 * callback is not running. The lock must be temporary released
+	 * to avoid a deadlock with the callback. In the meantime,
+	 * any queuing is blocked by setting the canceling counter.
+	 */
+	work->canceling++;
+	spin_unlock_irqrestore(&worker->lock, *flags);
+	del_timer_sync(&dwork->timer);
+	spin_lock_irqsave(&worker->lock, *flags);
+	work->canceling--;
+}
+
 /*
  * This function removes the work from the worker queue. Also it makes sure
  * that it won't get queued later via the delayed work's timer.
@@ -1023,23 +1050,8 @@ static bool __kthread_cancel_work(struct kthread_work *work, bool is_dwork,
 				  unsigned long *flags)
 {
 	/* Try to cancel the timer if exists. */
-	if (is_dwork) {
-		struct kthread_delayed_work *dwork =
-			container_of(work, struct kthread_delayed_work, work);
-		struct kthread_worker *worker = work->worker;
-
-		/*
-		 * del_timer_sync() must be called to make sure that the timer
-		 * callback is not running. The lock must be temporary released
-		 * to avoid a deadlock with the callback. In the meantime,
-		 * any queuing is blocked by setting the canceling counter.
-		 */
-		work->canceling++;
-		spin_unlock_irqrestore(&worker->lock, *flags);
-		del_timer_sync(&dwork->timer);
-		spin_lock_irqsave(&worker->lock, *flags);
-		work->canceling--;
-	}
+	if (is_dwork)
+		kthread_cancel_delayed_work_timer(work, flags);
 
 	/*
 	 * Try to remove the work from a worker list. It might either
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/2] kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()
  2021-06-30 11:01 ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Petr Mladek
  2021-06-30 11:01   ` [PATCH 1/2] kthread_worker: split code for canceling the delayed work timer Petr Mladek
@ 2021-06-30 11:01   ` Petr Mladek
  2021-06-30 11:06   ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Greg KH
  2 siblings, 0 replies; 9+ messages in thread
From: Petr Mladek @ 2021-06-30 11:01 UTC (permalink / raw)
  To: stable
  Cc: gregkh, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, tj, torvalds, Petr Mladek

The system might hang with the following backtrace:

	schedule+0x80/0x100
	schedule_timeout+0x48/0x138
	wait_for_common+0xa4/0x134
	wait_for_completion+0x1c/0x2c
	kthread_flush_work+0x114/0x1cc
	kthread_cancel_work_sync.llvm.16514401384283632983+0xe8/0x144
	kthread_cancel_delayed_work_sync+0x18/0x2c
	xxxx_pm_notify+0xb0/0xd8
	blocking_notifier_call_chain_robust+0x80/0x194
	pm_notifier_call_chain_robust+0x28/0x4c
	suspend_prepare+0x40/0x260
	enter_state+0x80/0x3f4
	pm_suspend+0x60/0xdc
	state_store+0x108/0x144
	kobj_attr_store+0x38/0x88
	sysfs_kf_write+0x64/0xc0
	kernfs_fop_write_iter+0x108/0x1d0
	vfs_write+0x2f4/0x368
	ksys_write+0x7c/0xec

It is caused by the following race between kthread_mod_delayed_work()
and kthread_cancel_delayed_work_sync():

CPU0				CPU1

Context: Thread A		Context: Thread B

kthread_mod_delayed_work()
  spin_lock()
  __kthread_cancel_work()
     spin_unlock()
     del_timer_sync()
				kthread_cancel_delayed_work_sync()
				  spin_lock()
				  __kthread_cancel_work()
				    spin_unlock()
				    del_timer_sync()
				    spin_lock()

				  work->canceling++
				  spin_unlock
     spin_lock()
   queue_delayed_work()
     // dwork is put into the worker->delayed_work_list

   spin_unlock()

				  kthread_flush_work()
     // flush_work is put at the tail of the dwork

				    wait_for_completion()

Context: IRQ

  kthread_delayed_work_timer_fn()
    spin_lock()
    list_del_init(&work->node);
    spin_unlock()

BANG: flush_work is not longer linked and will never get proceed.

The problem is that kthread_mod_delayed_work() checks work->canceling
flag before canceling the timer.

A simple solution is to (re)check work->canceling after
__kthread_cancel_work().  But then it is not clear what should be
returned when __kthread_cancel_work() removed the work from the queue
(list) and it can't queue it again with the new @delay.

The return value might be used for reference counting.  The caller has
to know whether a new work has been queued or an existing one was
replaced.

The proper solution is that kthread_mod_delayed_work() will remove the
work from the queue (list) _only_ when work->canceling is not set.  The
flag must be checked after the timer is stopped and the remaining
operations can be done under worker->lock.

Note that kthread_mod_delayed_work() could remove the timer and then
bail out.  It is fine.  The other canceling caller needs to cancel the
timer as well.  The important thing is that the queue (list)
manipulation is done atomically under worker->lock.

Link: https://lkml.kernel.org/r/20210610133051.15337-3-pmladek@suse.com
Fixes: 9a6b06c8d9a220860468a ("kthread: allow to modify delayed kthread work")
Signed-off-by: Petr Mladek <pmladek@suse.com>
Reported-by: Martin Liu <liumartin@google.com>
Cc: <jenhaochen@google.com>
Cc: Minchan Kim <minchan@google.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 kernel/kthread.c | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/kernel/kthread.c b/kernel/kthread.c
index b2688c39c6f1..9750f4f7f901 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -1037,8 +1037,11 @@ static void kthread_cancel_delayed_work_timer(struct kthread_work *work,
 }
 
 /*
- * This function removes the work from the worker queue. Also it makes sure
- * that it won't get queued later via the delayed work's timer.
+ * This function removes the work from the worker queue.
+ *
+ * It is called under worker->lock. The caller must make sure that
+ * the timer used by delayed work is not running, e.g. by calling
+ * kthread_cancel_delayed_work_timer().
  *
  * The work might still be in use when this function finishes. See the
  * current_work proceed by the worker.
@@ -1046,13 +1049,8 @@ static void kthread_cancel_delayed_work_timer(struct kthread_work *work,
  * Return: %true if @work was pending and successfully canceled,
  *	%false if @work was not pending
  */
-static bool __kthread_cancel_work(struct kthread_work *work, bool is_dwork,
-				  unsigned long *flags)
+static bool __kthread_cancel_work(struct kthread_work *work)
 {
-	/* Try to cancel the timer if exists. */
-	if (is_dwork)
-		kthread_cancel_delayed_work_timer(work, flags);
-
 	/*
 	 * Try to remove the work from a worker list. It might either
 	 * be from worker->work_list or from worker->delayed_work_list.
@@ -1105,11 +1103,23 @@ bool kthread_mod_delayed_work(struct kthread_worker *worker,
 	/* 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. */
+	/*
+	 * Temporary cancel the work but do not fight with another command
+	 * that is canceling the work as well.
+	 *
+	 * It is a bit tricky because of possible races with another
+	 * mod_delayed_work() and cancel_delayed_work() callers.
+	 *
+	 * The timer must be canceled first because worker->lock is released
+	 * when doing so. But the work can be removed from the queue (list)
+	 * only when it can be queued again so that the return value can
+	 * be used for reference counting.
+	 */
+	kthread_cancel_delayed_work_timer(work, &flags);
 	if (work->canceling)
 		goto out;
+	ret = __kthread_cancel_work(work);
 
-	ret = __kthread_cancel_work(work, true, &flags);
 fast_queue:
 	__kthread_queue_delayed_work(worker, dwork, delay);
 out:
@@ -1131,7 +1141,10 @@ static bool __kthread_cancel_work_sync(struct kthread_work *work, bool is_dwork)
 	/* Work must not be used with >1 worker, see kthread_queue_work(). */
 	WARN_ON_ONCE(work->worker != worker);
 
-	ret = __kthread_cancel_work(work, is_dwork, &flags);
+	if (is_dwork)
+		kthread_cancel_delayed_work_timer(work, &flags);
+
+	ret = __kthread_cancel_work(work);
 
 	if (worker->current_work != work)
 		goto out_fast;
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work()
  2021-06-30 11:01 ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Petr Mladek
  2021-06-30 11:01   ` [PATCH 1/2] kthread_worker: split code for canceling the delayed work timer Petr Mladek
  2021-06-30 11:01   ` [PATCH 2/2] kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync() Petr Mladek
@ 2021-06-30 11:06   ` Greg KH
  2021-06-30 11:31     ` Petr Mladek
  2 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2021-06-30 11:06 UTC (permalink / raw)
  To: Petr Mladek
  Cc: stable, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, tj, torvalds

On Wed, Jun 30, 2021 at 01:01:47PM +0200, Petr Mladek wrote:
> This is backport of the series for the following stable trees:
> 
>    + 4.9
>    + 4.14
>    + 4.19
> 
> The orignal series did not apply because of a conflict with the commit
> ("kthread: Convert worker lock to raw spinlock").
> 
> Petr Mladek (2):
>   kthread_worker: split code for canceling the delayed work timer
>   kthread: prevent deadlock when kthread_mod_delayed_work() races with
>     kthread_cancel_delayed_work_sync()
> 
>  kernel/kthread.c | 77 ++++++++++++++++++++++++++++++++----------------
>  1 file changed, 51 insertions(+), 26 deletions(-)
> 
> -- 
> 2.26.2
> 

What is the original git commit ids of these patches in Linus's tree?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work()
  2021-06-30 11:06   ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Greg KH
@ 2021-06-30 11:31     ` Petr Mladek
  2021-07-05  7:10       ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Petr Mladek @ 2021-06-30 11:31 UTC (permalink / raw)
  To: Greg KH
  Cc: stable, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, tj, torvalds

On Wed 2021-06-30 13:06:39, Greg KH wrote:
> On Wed, Jun 30, 2021 at 01:01:47PM +0200, Petr Mladek wrote:
> > This is backport of the series for the following stable trees:
> > 
> >    + 4.9
> >    + 4.14
> >    + 4.19
> > 
> > The orignal series did not apply because of a conflict with the commit
> > ("kthread: Convert worker lock to raw spinlock").
> > 
> > Petr Mladek (2):
> >   kthread_worker: split code for canceling the delayed work timer
> >   kthread: prevent deadlock when kthread_mod_delayed_work() races with
> >     kthread_cancel_delayed_work_sync()
> > 
> >  kernel/kthread.c | 77 ++++++++++++++++++++++++++++++++----------------
> >  1 file changed, 51 insertions(+), 26 deletions(-)
> > 
> > -- 
> > 2.26.2
> > 
> 
> What is the original git commit ids of these patches in Linus's tree?

commit 34b3d5344719d14fd2185b2d9459b3abcb8cf9d8 ("kthread_worker: split code for canceling the delayed work timer")
commit 5fa54346caf67b4b1b10b1f390316ae466da4d53 ("kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync())"

The original commits have already been taken for the newer stable trees.

I am sorry for the inconvenience.

Best Regards,
Petr

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work()
  2021-06-30 11:31     ` Petr Mladek
@ 2021-07-05  7:10       ` Greg KH
  2021-07-07 10:55         ` Petr Mladek
  0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2021-07-05  7:10 UTC (permalink / raw)
  To: Petr Mladek
  Cc: stable, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, tj, torvalds

On Wed, Jun 30, 2021 at 01:31:45PM +0200, Petr Mladek wrote:
> On Wed 2021-06-30 13:06:39, Greg KH wrote:
> > On Wed, Jun 30, 2021 at 01:01:47PM +0200, Petr Mladek wrote:
> > > This is backport of the series for the following stable trees:
> > > 
> > >    + 4.9
> > >    + 4.14
> > >    + 4.19
> > > 
> > > The orignal series did not apply because of a conflict with the commit
> > > ("kthread: Convert worker lock to raw spinlock").
> > > 
> > > Petr Mladek (2):
> > >   kthread_worker: split code for canceling the delayed work timer
> > >   kthread: prevent deadlock when kthread_mod_delayed_work() races with
> > >     kthread_cancel_delayed_work_sync()
> > > 
> > >  kernel/kthread.c | 77 ++++++++++++++++++++++++++++++++----------------
> > >  1 file changed, 51 insertions(+), 26 deletions(-)
> > > 
> > > -- 
> > > 2.26.2
> > > 
> > 
> > What is the original git commit ids of these patches in Linus's tree?
> 
> commit 34b3d5344719d14fd2185b2d9459b3abcb8cf9d8 ("kthread_worker: split code for canceling the delayed work timer")
> commit 5fa54346caf67b4b1b10b1f390316ae466da4d53 ("kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync())"
> 
> The original commits have already been taken for the newer stable trees.
> 
> I am sorry for the inconvenience.

What about backports for 5.4, 5.10, and 5.12?  We can not take patches
only for older kernels, otherwise people upgrading to newer ones would
have a regression.  Please can you submit these patches for those trees
too?  Until that, I can not take these.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work()
  2021-07-05  7:10       ` Greg KH
@ 2021-07-07 10:55         ` Petr Mladek
  2021-07-08 18:23           ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Petr Mladek @ 2021-07-07 10:55 UTC (permalink / raw)
  To: Greg KH
  Cc: stable, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, tj, torvalds

On Mon 2021-07-05 09:10:58, Greg KH wrote:
> On Wed, Jun 30, 2021 at 01:31:45PM +0200, Petr Mladek wrote:
> > On Wed 2021-06-30 13:06:39, Greg KH wrote:
> > > On Wed, Jun 30, 2021 at 01:01:47PM +0200, Petr Mladek wrote:
> > > > This is backport of the series for the following stable trees:
> > > > 
> > > >    + 4.9
> > > >    + 4.14
> > > >    + 4.19
> > > > 
> > > > The orignal series did not apply because of a conflict with the commit
> > > > ("kthread: Convert worker lock to raw spinlock").
> > > > 
> > > > Petr Mladek (2):
> > > >   kthread_worker: split code for canceling the delayed work timer
> > > >   kthread: prevent deadlock when kthread_mod_delayed_work() races with
> > > >     kthread_cancel_delayed_work_sync()
> > > > 
> > > >  kernel/kthread.c | 77 ++++++++++++++++++++++++++++++++----------------
> > > >  1 file changed, 51 insertions(+), 26 deletions(-)
> > > > 
> > > > -- 
> > > > 2.26.2
> > > > 
> > > 
> > > What is the original git commit ids of these patches in Linus's tree?
> > 
> > commit 34b3d5344719d14fd2185b2d9459b3abcb8cf9d8 ("kthread_worker: split code for canceling the delayed work timer")
> > commit 5fa54346caf67b4b1b10b1f390316ae466da4d53 ("kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync())"
> > 
> > The original commits have already been taken for the newer stable trees.
> > 
> > I am sorry for the inconvenience.
> 
> What about backports for 5.4, 5.10, and 5.12?  We can not take patches
> only for older kernels, otherwise people upgrading to newer ones would
> have a regression.  Please can you submit these patches for those trees
> too?  Until that, I can not take these.

The patches for 5.4, 5.10, and 5.12 did not need any changes. My
understanding is that the original commits have already been queued
for these never code trees. See the mail in stable-commits:

for 5.4:

https://www.spinics.net/lists/stable-commits/msg203482.html
https://www.spinics.net/lists/stable-commits/msg203481.html

for 5.10:

https://www.spinics.net/lists/stable-commits/msg203486.html
https://www.spinics.net/lists/stable-commits/msg203485.html

for 5.12:

https://www.spinics.net/lists/stable-commits/msg203494.html
https://www.spinics.net/lists/stable-commits/msg203493.html

I am sorry, I should have mentioned this in the cover letter.

Best Regards,
Petr

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work()
  2021-07-07 10:55         ` Petr Mladek
@ 2021-07-08 18:23           ` Greg KH
  0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2021-07-08 18:23 UTC (permalink / raw)
  To: Petr Mladek
  Cc: stable, akpm, jenhaochen, liumartin, minchan, nathan,
	ndesaulniers, oleg, tj, torvalds

On Wed, Jul 07, 2021 at 12:55:30PM +0200, Petr Mladek wrote:
> On Mon 2021-07-05 09:10:58, Greg KH wrote:
> > On Wed, Jun 30, 2021 at 01:31:45PM +0200, Petr Mladek wrote:
> > > On Wed 2021-06-30 13:06:39, Greg KH wrote:
> > > > On Wed, Jun 30, 2021 at 01:01:47PM +0200, Petr Mladek wrote:
> > > > > This is backport of the series for the following stable trees:
> > > > > 
> > > > >    + 4.9
> > > > >    + 4.14
> > > > >    + 4.19
> > > > > 
> > > > > The orignal series did not apply because of a conflict with the commit
> > > > > ("kthread: Convert worker lock to raw spinlock").
> > > > > 
> > > > > Petr Mladek (2):
> > > > >   kthread_worker: split code for canceling the delayed work timer
> > > > >   kthread: prevent deadlock when kthread_mod_delayed_work() races with
> > > > >     kthread_cancel_delayed_work_sync()
> > > > > 
> > > > >  kernel/kthread.c | 77 ++++++++++++++++++++++++++++++++----------------
> > > > >  1 file changed, 51 insertions(+), 26 deletions(-)
> > > > > 
> > > > > -- 
> > > > > 2.26.2
> > > > > 
> > > > 
> > > > What is the original git commit ids of these patches in Linus's tree?
> > > 
> > > commit 34b3d5344719d14fd2185b2d9459b3abcb8cf9d8 ("kthread_worker: split code for canceling the delayed work timer")
> > > commit 5fa54346caf67b4b1b10b1f390316ae466da4d53 ("kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync())"
> > > 
> > > The original commits have already been taken for the newer stable trees.
> > > 
> > > I am sorry for the inconvenience.
> > 
> > What about backports for 5.4, 5.10, and 5.12?  We can not take patches
> > only for older kernels, otherwise people upgrading to newer ones would
> > have a regression.  Please can you submit these patches for those trees
> > too?  Until that, I can not take these.
> 
> The patches for 5.4, 5.10, and 5.12 did not need any changes. My
> understanding is that the original commits have already been queued
> for these never code trees. See the mail in stable-commits:
> 
> for 5.4:
> 
> https://www.spinics.net/lists/stable-commits/msg203482.html
> https://www.spinics.net/lists/stable-commits/msg203481.html
> 
> for 5.10:
> 
> https://www.spinics.net/lists/stable-commits/msg203486.html
> https://www.spinics.net/lists/stable-commits/msg203485.html
> 
> for 5.12:
> 
> https://www.spinics.net/lists/stable-commits/msg203494.html
> https://www.spinics.net/lists/stable-commits/msg203493.html
> 
> I am sorry, I should have mentioned this in the cover letter.

No worries, all now queued up, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-07-08 18:23 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-27 14:23 FAILED: patch "[PATCH] kthread_worker: split code for canceling the delayed work" failed to apply to 4.19-stable tree gregkh
2021-06-30 11:01 ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Petr Mladek
2021-06-30 11:01   ` [PATCH 1/2] kthread_worker: split code for canceling the delayed work timer Petr Mladek
2021-06-30 11:01   ` [PATCH 2/2] kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync() Petr Mladek
2021-06-30 11:06   ` [PATCH 0/2] kthread_worker: Fix race between kthread_mod_delayed_work() Greg KH
2021-06-30 11:31     ` Petr Mladek
2021-07-05  7:10       ` Greg KH
2021-07-07 10:55         ` Petr Mladek
2021-07-08 18:23           ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.