diff mbox series

[RT,2/3] Revert "mm/page_alloc: fix potential deadlock on zonelist_update_seqseqlock"

Message ID 20230609011104.967128-3-lgoncalv@redhat.com
State New
Headers show
Series Linux v5.10.180-rt89-rc1 | expand

Commit Message

Luis Claudio R. Goncalves June 9, 2023, 1:11 a.m. UTC
v5.10.180-rt89-rc1 stable review patch.
If anyone has any objections, please let me know.

-----------


This reverts commit a992c387b41186ab968fd176ca26b432b05c53ec.

The support for deferred printing was removed in v5.10-rc1-rt1 by commit
9153e3c5cb0c9 ("printk: remove deferred printing") because:

    Since printing occurs either atomically or from the printing
    kthread, there is no need for any deferring or tracking possible
    recursion paths. Remove all printk context tracking.

Also, disabling interrupts in __build_all_zonelists() should produce warnings
once that code path is hit.

Fixes: a992c387b4118 ("mm/page_alloc: fix potential deadlock on zonelist_update_seq seqlock")
Fixes: 083183f8bea0f ("rt: printk: remove new references to deferred printing")
Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
---
 mm/page_alloc.c | 14 --------------
 1 file changed, 14 deletions(-)
diff mbox series

Patch

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7e65e3ef16e3a..3760a06932a6e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6043,20 +6043,7 @@  static void __build_all_zonelists(void *data)
 	int nid;
 	int __maybe_unused cpu;
 	pg_data_t *self = data;
-	unsigned long flags;
 
-	/*
-	 * Explicitly disable this CPU's interrupts before taking seqlock
-	 * to prevent any IRQ handler from calling into the page allocator
-	 * (e.g. GFP_ATOMIC) that could hit zonelist_iter_begin and livelock.
-	 */
-	local_irq_save(flags);
-	/*
-	 * Explicitly disable this CPU's synchronous printk() before taking
-	 * seqlock to prevent any printk() from trying to hold port->lock, for
-	 * tty_insert_flip_string_and_push_buffer() on other CPU might be
-	 * calling kmalloc(GFP_ATOMIC | __GFP_NOWARN) with port->lock held.
-	 */
 	write_seqlock(&zonelist_update_seq);
 
 #ifdef CONFIG_NUMA
@@ -6091,7 +6078,6 @@  static void __build_all_zonelists(void *data)
 	}
 
 	write_sequnlock(&zonelist_update_seq);
-	local_irq_restore(flags);
 }
 
 static noinline void __init