linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH RT 0/4] Linux v4.19.127-rt55-rc1
@ 2020-06-11 18:10 zanussi
  2020-06-11 18:10 ` [PATCH RT 1/4] fs/dcache: Include swait.h header zanussi
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: zanussi @ 2020-06-11 18:10 UTC (permalink / raw)
  To: LKML, linux-rt-users, Steven Rostedt, Thomas Gleixner,
	Carsten Emde, John Kacur, Sebastian Andrzej Siewior,
	Daniel Wagner, Clark Williams, Pavel Machek, Tom Zanussi

From: Tom Zanussi <zanussi@kernel.org>

Dear RT Folks,

This is the RT stable review cycle of patch 4.19.127-rt55-rc1.

Please scream at me if I messed something up. Please test the patches
too.

The -rc release will be uploaded to kernel.org and will be deleted
when the final release is out. This is just a review release (or
release candidate).

The pre-releases will not be pushed to the git repository, only the
final release is.

If all goes well, this patch will be converted to the next main
release on 2020-06-18.

To build 4.19.127-rt55-rc1 directly, the following patches should be applied:

  https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz

  https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.127.xz

  https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.127-rt55-rc1.patch.xz

You can also build from 4.19.127-rt54 by applying the incremental patch:

  https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/incr/patch-4.19.127-rt54-rt55-rc1.patch.xz


Enjoy,

-- Tom


Kevin Hao (1):
  mm: slub: Always flush the delayed empty slubs in flush_all()

Sebastian Andrzej Siewior (1):
  fs/dcache: Include swait.h header

Tom Zanussi (2):
  tasklet: Fix UP case for tasklet CHAINED state
  Linux 4.19.127-rt55-rc1

 fs/proc/base.c   | 1 +
 kernel/softirq.c | 6 ++++++
 localversion-rt  | 2 +-
 mm/slub.c        | 3 ---
 4 files changed, 8 insertions(+), 4 deletions(-)

-- 
2.17.1


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

* [PATCH RT 1/4] fs/dcache: Include swait.h header
  2020-06-11 18:10 [PATCH RT 0/4] Linux v4.19.127-rt55-rc1 zanussi
@ 2020-06-11 18:10 ` zanussi
  2020-06-11 18:10 ` [PATCH RT 2/4] mm: slub: Always flush the delayed empty slubs in flush_all() zanussi
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: zanussi @ 2020-06-11 18:10 UTC (permalink / raw)
  To: LKML, linux-rt-users, Steven Rostedt, Thomas Gleixner,
	Carsten Emde, John Kacur, Sebastian Andrzej Siewior,
	Daniel Wagner, Clark Williams, Pavel Machek, Tom Zanussi

From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

v4.19.127-rt55-rc1 stable review patch.
If anyone has any objections, please let me know.

-----------


[ Upstream commit 279f90ddf53cd6bd3c203fbbf488d642ea2603de ]

Include the swait.h header so it compiles even if not all patches are
applied.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Tom Zanussi <zanussi@kernel.org>

 Conflicts:
	fs/proc/base.c
---
 fs/proc/base.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index a45d4d640f01..56b1c4f1e8c0 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -95,6 +95,7 @@
 #include <linux/flex_array.h>
 #include <linux/posix-timers.h>
 #include <trace/events/oom.h>
+#include <linux/swait.h>
 #include "internal.h"
 #include "fd.h"
 
-- 
2.17.1


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

* [PATCH RT 2/4] mm: slub: Always flush the delayed empty slubs in flush_all()
  2020-06-11 18:10 [PATCH RT 0/4] Linux v4.19.127-rt55-rc1 zanussi
  2020-06-11 18:10 ` [PATCH RT 1/4] fs/dcache: Include swait.h header zanussi
@ 2020-06-11 18:10 ` zanussi
  2020-06-11 18:10 ` [PATCH RT 3/4] tasklet: Fix UP case for tasklet CHAINED state zanussi
  2020-06-11 18:10 ` [PATCH RT 4/4] Linux 4.19.127-rt55-rc1 zanussi
  3 siblings, 0 replies; 6+ messages in thread
From: zanussi @ 2020-06-11 18:10 UTC (permalink / raw)
  To: LKML, linux-rt-users, Steven Rostedt, Thomas Gleixner,
	Carsten Emde, John Kacur, Sebastian Andrzej Siewior,
	Daniel Wagner, Clark Williams, Pavel Machek, Tom Zanussi
  Cc: Kevin Hao, stable-rt

From: Kevin Hao <haokexin@gmail.com>

v4.19.127-rt55-rc1 stable review patch.
If anyone has any objections, please let me know.

-----------


[ Upstream commit 23a2c31b19e99beaf5107071b0f32a596202cdae ]

After commit f0b231101c94 ("mm/SLUB: delay giving back empty slubs to
IRQ enabled regions"), when the free_slab() is invoked with the IRQ
disabled, the empty slubs are moved to a per-CPU list and will be
freed after IRQ enabled later. But in the current codes, there is
a check to see if there really has the cpu slub on a specific cpu
before flushing the delayed empty slubs, this may cause a reference
of already released kmem_cache in a scenario like below:
	cpu 0				cpu 1
  kmem_cache_destroy()
    flush_all()
                         --->IPI       flush_cpu_slab()
                                         flush_slab()
                                           deactivate_slab()
                                             discard_slab()
                                               free_slab()
                                             c->page = NULL;
      for_each_online_cpu(cpu)
        if (!has_cpu_slab(1, s))
          continue
        this skip to flush the delayed
        empty slub released by cpu1
    kmem_cache_free(kmem_cache, s)

                                       kmalloc()
                                         __slab_alloc()
                                            free_delayed()
                                            __free_slab()
                                            reference to released kmem_cache

Fixes: f0b231101c94 ("mm/SLUB: delay giving back empty slubs to IRQ enabled regions")
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: stable-rt@vger.kernel.org
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
---
 mm/slub.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mm/slub.c b/mm/slub.c
index d243c6ef7fc9..a9473bbb1338 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2341,9 +2341,6 @@ static void flush_all(struct kmem_cache *s)
 	for_each_online_cpu(cpu) {
 		struct slub_free_list *f;
 
-		if (!has_cpu_slab(cpu, s))
-			continue;
-
 		f = &per_cpu(slub_free_list, cpu);
 		raw_spin_lock_irq(&f->lock);
 		list_splice_init(&f->list, &tofree);
-- 
2.17.1


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

* [PATCH RT 3/4] tasklet: Fix UP case for tasklet CHAINED state
  2020-06-11 18:10 [PATCH RT 0/4] Linux v4.19.127-rt55-rc1 zanussi
  2020-06-11 18:10 ` [PATCH RT 1/4] fs/dcache: Include swait.h header zanussi
  2020-06-11 18:10 ` [PATCH RT 2/4] mm: slub: Always flush the delayed empty slubs in flush_all() zanussi
@ 2020-06-11 18:10 ` zanussi
  2020-06-12 13:09   ` Sebastian Andrzej Siewior
  2020-06-11 18:10 ` [PATCH RT 4/4] Linux 4.19.127-rt55-rc1 zanussi
  3 siblings, 1 reply; 6+ messages in thread
From: zanussi @ 2020-06-11 18:10 UTC (permalink / raw)
  To: LKML, linux-rt-users, Steven Rostedt, Thomas Gleixner,
	Carsten Emde, John Kacur, Sebastian Andrzej Siewior,
	Daniel Wagner, Clark Williams, Pavel Machek, Tom Zanussi

From: Tom Zanussi <zanussi@kernel.org>

v4.19.127-rt55-rc1 stable review patch.
If anyone has any objections, please let me know.

-----------


commit 62d0a2a30cd0 (tasklet: Address a race resulting in
double-enqueue) addresses a problem that can result in a tasklet being
enqueued on two cpus at the same time by combining the RUN flag with a
new CHAINED flag, and relies on the combination to be present in order
to zero it out, which can never happen on (!SMP and !PREEMPT_RT_FULL)
because the RUN flag is SMP/PREEMPT_RT_FULL-only.

So make sure the above commit is only applied for the SMP ||
PREEMPT_RT_FULL case.

Fixes: 62d0a2a30cd0 ("tasklet: Address a race resulting in double-enqueue")
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
Reported-by: Ramon Fried <rfried.dev@gmail.com>
Tested-By: Ramon Fried <rfried.dev@gmail.com>
---
 kernel/softirq.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 73dae64bfc9c..9bad7a16dc61 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -947,10 +947,12 @@ static void __tasklet_schedule_common(struct tasklet_struct *t,
 	 * is locked before adding it to the list.
 	 */
 	if (test_bit(TASKLET_STATE_SCHED, &t->state)) {
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
 		if (test_and_set_bit(TASKLET_STATE_CHAINED, &t->state)) {
 			tasklet_unlock(t);
 			return;
 		}
+#endif
 		t->next = NULL;
 		*head->tail = t;
 		head->tail = &(t->next);
@@ -1044,7 +1046,11 @@ static void tasklet_action_common(struct softirq_action *a,
 again:
 		t->func(t->data);
 
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
 		while (cmpxchg(&t->state, TASKLET_STATEF_RC, 0) != TASKLET_STATEF_RC) {
+#else
+		while (!tasklet_tryunlock(t)) {
+#endif
 			/*
 			 * If it got disabled meanwhile, bail out:
 			 */
-- 
2.17.1


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

* [PATCH RT 4/4] Linux 4.19.127-rt55-rc1
  2020-06-11 18:10 [PATCH RT 0/4] Linux v4.19.127-rt55-rc1 zanussi
                   ` (2 preceding siblings ...)
  2020-06-11 18:10 ` [PATCH RT 3/4] tasklet: Fix UP case for tasklet CHAINED state zanussi
@ 2020-06-11 18:10 ` zanussi
  3 siblings, 0 replies; 6+ messages in thread
From: zanussi @ 2020-06-11 18:10 UTC (permalink / raw)
  To: LKML, linux-rt-users, Steven Rostedt, Thomas Gleixner,
	Carsten Emde, John Kacur, Sebastian Andrzej Siewior,
	Daniel Wagner, Clark Williams, Pavel Machek, Tom Zanussi

From: Tom Zanussi <zanussi@kernel.org>

v4.19.127-rt55-rc1 stable review patch.
If anyone has any objections, please let me know.

-----------


Signed-off-by: Tom Zanussi <zanussi@kernel.org>
---
 localversion-rt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/localversion-rt b/localversion-rt
index 3165a8781ff5..58b8cb2d7489 100644
--- a/localversion-rt
+++ b/localversion-rt
@@ -1 +1 @@
--rt54
+-rt55-rc1
-- 
2.17.1


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

* Re: [PATCH RT 3/4] tasklet: Fix UP case for tasklet CHAINED state
  2020-06-11 18:10 ` [PATCH RT 3/4] tasklet: Fix UP case for tasklet CHAINED state zanussi
@ 2020-06-12 13:09   ` Sebastian Andrzej Siewior
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Andrzej Siewior @ 2020-06-12 13:09 UTC (permalink / raw)
  To: zanussi
  Cc: LKML, linux-rt-users, Steven Rostedt, Thomas Gleixner,
	Carsten Emde, John Kacur, Daniel Wagner, Clark Williams,
	Pavel Machek

On 2020-06-11 13:10:16 [-0500], zanussi@kernel.org wrote:
> commit 62d0a2a30cd0 (tasklet: Address a race resulting in
> double-enqueue) addresses a problem that can result in a tasklet being
> enqueued on two cpus at the same time by combining the RUN flag with a
> new CHAINED flag, and relies on the combination to be present in order
> to zero it out, which can never happen on (!SMP and !PREEMPT_RT_FULL)
> because the RUN flag is SMP/PREEMPT_RT_FULL-only.
> 
> So make sure the above commit is only applied for the SMP ||
> PREEMPT_RT_FULL case.
> 
> Fixes: 62d0a2a30cd0 ("tasklet: Address a race resulting in double-enqueue")
> Signed-off-by: Tom Zanussi <zanussi@kernel.org>
> Reported-by: Ramon Fried <rfried.dev@gmail.com>
> Tested-By: Ramon Fried <rfried.dev@gmail.com>

Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

Sebastian

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

end of thread, other threads:[~2020-06-12 13:09 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-11 18:10 [PATCH RT 0/4] Linux v4.19.127-rt55-rc1 zanussi
2020-06-11 18:10 ` [PATCH RT 1/4] fs/dcache: Include swait.h header zanussi
2020-06-11 18:10 ` [PATCH RT 2/4] mm: slub: Always flush the delayed empty slubs in flush_all() zanussi
2020-06-11 18:10 ` [PATCH RT 3/4] tasklet: Fix UP case for tasklet CHAINED state zanussi
2020-06-12 13:09   ` Sebastian Andrzej Siewior
2020-06-11 18:10 ` [PATCH RT 4/4] Linux 4.19.127-rt55-rc1 zanussi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).