Commit a6d996cb authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

x86/alternatives: Acquire pte lock with interrupts enabled

pte lock is never acquired in-IRQ context so it does not require interrupts
to be disabled. The lock is a regular spinlock which cannot be acquired
with interrupts disabled on RT.

RT complains about pte_lock() in __text_poke() because it's invoked after
disabling interrupts.

__text_poke() has to disable interrupts as use_temporary_mm() expects
interrupts to be off because it invokes switch_mm_irqs_off() and uses
per-CPU (current active mm) data.

Move the PTE lock handling outside the interrupt disabled region.

Signed-off-by: default avatarSebastian Andrzej Siewior <>
Signed-off-by: default avatarThomas Gleixner <>
Acked-by; Peter Zijlstra (Intel) <>
parent f29dfa53
......@@ -874,8 +874,6 @@ static void *__text_poke(void *addr, const void *opcode, size_t len)
BUG_ON(!pages[0] || (cross_page_boundary && !pages[1]));
* Map the page without the global bit, as TLB flushing is done with
* flush_tlb_mm_range(), which is intended for non-global PTEs.
......@@ -892,6 +890,8 @@ static void *__text_poke(void *addr, const void *opcode, size_t len)
pte = mk_pte(pages[0], pgprot);
set_pte_at(poking_mm, poking_addr, ptep, pte);
......@@ -941,8 +941,8 @@ static void *__text_poke(void *addr, const void *opcode, size_t len)
BUG_ON(memcmp(addr, opcode, len));
pte_unmap_unlock(ptep, ptl);
pte_unmap_unlock(ptep, ptl);
return addr;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment