summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-24 18:37:55 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-24 18:37:55 -0400
commitaa200b2bdafa8ebf22c63913340df4caac927981 (patch)
treec64afbbbc53185f918fa6e5cb239b0400658b3f9
parentf31d9d332d98e43027cb43dc38520759f5b66404 (diff)
downloadlongterm-queue-5.2-aa200b2bdafa8ebf22c63913340df4caac927981.tar.gz
next: drop commits local to linux-next tree generation
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue-next/fork-silence-a-false-postive-warning-in-__mmdrop.patch50
-rw-r--r--queue-next/mm-slub-fix-conversion-of-freelist_corrupted.patch59
2 files changed, 0 insertions, 109 deletions
diff --git a/queue-next/fork-silence-a-false-postive-warning-in-__mmdrop.patch b/queue-next/fork-silence-a-false-postive-warning-in-__mmdrop.patch
deleted file mode 100644
index 4928fadb..00000000
--- a/queue-next/fork-silence-a-false-postive-warning-in-__mmdrop.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4f24152e7efeb2804534cc51872fc63d2bf79284 Mon Sep 17 00:00:00 2001
-From: Qian Cai <cai@lca.pw>
-Date: Thu, 20 Aug 2020 10:01:23 +1000
-Subject: [PATCH] fork: silence a false postive warning in __mmdrop
-
-commit 4f24152e7efeb2804534cc51872fc63d2bf79284 upstream.
-
-commit bf2c59fce407 ("sched/core: Fix illegal RCU from offline CPUs")
-delayed,
-
-idle->active_mm = &init_mm;
-
-into finish_cpu() instead of idle_task_exit() which results in a false
-positive warning that was originally designed in the commit 3eda69c92d47
-("kernel/fork.c: detect early free of a live mm").
-
- WARNING: CPU: 127 PID: 72976 at kernel/fork.c:697
- __mmdrop+0x230/0x2c0
- do_exit+0x424/0xfa0
- Call Trace:
- do_exit+0x424/0xfa0
- do_group_exit+0x64/0xd0
- sys_exit_group+0x24/0x30
- system_call_exception+0x108/0x1d0
- system_call_common+0xf0/0x278
-
-Link: http://lkml.kernel.org/r/20200604150344.1796-1-cai@lca.pw
-Fixes: bf2c59fce407 ("sched/core: Fix illegal RCU from offline CPUs")
-Signed-off-by: Qian Cai <cai@lca.pw>
-Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
-Cc: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-
-diff --git a/kernel/fork.c b/kernel/fork.c
-index 4d32190861bd..ac7f0524a5fe 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -677,7 +677,6 @@ void __mmdrop(struct mm_struct *mm)
- {
- BUG_ON(mm == &init_mm);
- WARN_ON_ONCE(mm == current->mm);
-- WARN_ON_ONCE(mm == current->active_mm);
- mm_free_pgd(mm);
- destroy_context(mm);
- mmu_notifier_subscriptions_destroy(mm);
---
-2.27.0
-
diff --git a/queue-next/mm-slub-fix-conversion-of-freelist_corrupted.patch b/queue-next/mm-slub-fix-conversion-of-freelist_corrupted.patch
deleted file mode 100644
index 7c29f74b..00000000
--- a/queue-next/mm-slub-fix-conversion-of-freelist_corrupted.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0da021477ea2a817accd1650b9efede52f0c8efb Mon Sep 17 00:00:00 2001
-From: Eugeniu Rosca <erosca@de.adit-jv.com>
-Date: Thu, 20 Aug 2020 10:01:23 +1000
-Subject: [PATCH] mm: slub: fix conversion of freelist_corrupted()
-
-commit 0da021477ea2a817accd1650b9efede52f0c8efb upstream.
-
-Commit 52f23478081ae0 ("mm/slub.c: fix corrupted freechain in
-deactivate_slab()") suffered an update when picked up from LKML [1].
-
-Specifically, relocating 'freelist = NULL' into 'freelist_corrupted()'
-created a no-op statement. Fix it by sticking to the behavior intended in
-the original patch [1]. Prefer the lowest-line-count solution.
-
-The issue popped up as a result of static analysis and code review.
-Therefore, I lack any specific runtime behavior example being fixed.
-
-[1] https://lore.kernel.org/linux-mm/20200331031450.12182-1-dongli.zhang@oracle.com/
-
-Link: http://lkml.kernel.org/r/20200811124656.10308-1-erosca@de.adit-jv.com
-Fixes: 52f23478081ae0 ("mm/slub.c: fix corrupted freechain in deactivate_slab()")
-Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
-Cc: Dongli Zhang <dongli.zhang@oracle.com>
-Cc: Joe Jin <joe.jin@oracle.com>
-Cc: Christoph Lameter <cl@linux.com>
-Cc: Pekka Enberg <penberg@kernel.org>
-Cc: David Rientjes <rientjes@google.com>
-Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-
-diff --git a/mm/slub.c b/mm/slub.c
-index 68c02b2eecd9..9a3e963b02a3 100644
---- a/mm/slub.c
-+++ b/mm/slub.c
-@@ -677,7 +677,6 @@ static bool freelist_corrupted(struct kmem_cache *s, struct page *page,
- if ((s->flags & SLAB_CONSISTENCY_CHECKS) &&
- !check_valid_pointer(s, page, nextfree)) {
- object_err(s, page, freelist, "Freechain corrupt");
-- freelist = NULL;
- slab_fix(s, "Isolate corrupted freechain");
- return true;
- }
-@@ -2184,8 +2183,10 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
- * 'freelist' is already corrupted. So isolate all objects
- * starting at 'freelist'.
- */
-- if (freelist_corrupted(s, page, freelist, nextfree))
-+ if (freelist_corrupted(s, page, freelist, nextfree)) {
-+ freelist = NULL;
- break;
-+ }
-
- do {
- prior = page->freelist;
---
-2.27.0
-