When 'CONFIG_DEFERRED_STRUCT_PAGE_INIT' is set, 'pgdat_resize_lock'
will be called inside 'pgdatinit' kthread to initialise the deferred
pages with local interrupts disabled. Which is introduced by
commit 3a2d7fa8a3d5 ("mm: disable interrupts while initializing deferred
pages").
But 'pgdatinit' kthread is possible be pined on the boot CPU (CPU#0 by
default), especially in small system with NRCPUS <= 2. In this case, the
interrupts are disabled on boot CPU during memory initialising, which
caused the tick_sched timer be blocked, leading to wall clock stuck.
Fixes: commit 3a2d7fa8a3d5 ("mm: disable interrupts while initializing
deferred pages")
Signed-off-by: Shile Zhang <shile.zhang@xxxxxxxxxxxxxxxxx>
---
include/linux/memory_hotplug.h | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index ba0dca6aac6e..be69a6dc4fee 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -6,6 +6,8 @@
#include <linux/spinlock.h>
#include <linux/notifier.h>
#include <linux/bug.h>
+#include <linux/sched.h>
+#include <linux/smp.h>
struct page;
struct zone;
@@ -282,12 +284,22 @@ static inline bool movable_node_is_enabled(void)
static inline
void pgdat_resize_lock(struct pglist_data *pgdat, unsigned long *flags)
{
- spin_lock_irqsave(&pgdat->node_size_lock, *flags);
+ /*
+ * Disable local interrupts on boot CPU will stop the tick_sched
+ * timer, which will block jiffies(wall clock) update.
+ */
+ if (current->cpu != get_boot_cpu_id())
+ spin_lock_irqsave(&pgdat->node_size_lock, *flags);
+ else
+ spin_lock(&pgdat->node_size_lock);
}
static inline
void pgdat_resize_unlock(struct pglist_data *pgdat, unsigned long *flags)
{
- spin_unlock_irqrestore(&pgdat->node_size_lock, *flags);
+ if (current->cpu != get_boot_cpu_id())
+ spin_unlock_irqrestore(&pgdat->node_size_lock, *flags);
+ else
+ spin_unlock(&pgdat->node_size_lock);
}
static inline
void pgdat_resize_init(struct pglist_data *pgdat)
--
2.24.0.rc2
