52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From 28b059934bf7e456de1f9388d3bb08544243ac57 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <28b059934bf7e456de1f9388d3bb08544243ac57.1601675151.git.zanussi@kernel.org>
|
|
In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Wed, 9 Jan 2013 12:08:15 +0100
|
|
Subject: [PATCH 082/333] slub: Enable irqs for __GFP_WAIT
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz
|
|
|
|
SYSTEM_RUNNING might be too late for enabling interrupts. Allocations
|
|
with GFP_WAIT can happen before that. So use this as an indicator.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
mm/slub.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/mm/slub.c b/mm/slub.c
|
|
index b1201a491169..362ec0e00f89 100644
|
|
--- a/mm/slub.c
|
|
+++ b/mm/slub.c
|
|
@@ -1589,10 +1589,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
|
|
void *start, *p;
|
|
int idx, order;
|
|
bool shuffle;
|
|
+ bool enableirqs = false;
|
|
|
|
flags &= gfp_allowed_mask;
|
|
|
|
if (gfpflags_allow_blocking(flags))
|
|
+ enableirqs = true;
|
|
+#ifdef CONFIG_PREEMPT_RT_FULL
|
|
+ if (system_state > SYSTEM_BOOTING)
|
|
+ enableirqs = true;
|
|
+#endif
|
|
+ if (enableirqs)
|
|
local_irq_enable();
|
|
|
|
flags |= s->allocflags;
|
|
@@ -1651,7 +1658,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
|
|
page->frozen = 1;
|
|
|
|
out:
|
|
- if (gfpflags_allow_blocking(flags))
|
|
+ if (enableirqs)
|
|
local_irq_disable();
|
|
if (!page)
|
|
return NULL;
|
|
--
|
|
2.17.1
|
|
|