* [PATCH AUTOSEL 5.17 21/21] Revert "parisc: Fix patch code locking and flushing" [not found] <20220510154340.153400-1-sashal@kernel.org> @ 2022-05-10 15:43 ` Sasha Levin 2022-05-10 15:49 ` Helge Deller 0 siblings, 1 reply; 4+ messages in thread From: Sasha Levin @ 2022-05-10 15:43 UTC (permalink / raw) To: linux-kernel, stable Cc: Helge Deller, Sasha Levin, James.Bottomley, dave.anglin, linux-parisc From: Helge Deller <deller@gmx.de> [ Upstream commit 6c800d7f55fcd78e17deae5ae4374d8e73482c13 ] This reverts commit a9fe7fa7d874a536e0540469f314772c054a0323. Leads to segfaults on 32bit kernel. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Sasha Levin <sashal@kernel.org> --- arch/parisc/kernel/patch.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/arch/parisc/kernel/patch.c b/arch/parisc/kernel/patch.c index e59574f65e64..80a0ab372802 100644 --- a/arch/parisc/kernel/patch.c +++ b/arch/parisc/kernel/patch.c @@ -40,7 +40,10 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags, *need_unmap = 1; set_fixmap(fixmap, page_to_phys(page)); - raw_spin_lock_irqsave(&patch_lock, *flags); + if (flags) + raw_spin_lock_irqsave(&patch_lock, *flags); + else + __acquire(&patch_lock); return (void *) (__fix_to_virt(fixmap) + (uintaddr & ~PAGE_MASK)); } @@ -49,7 +52,10 @@ static void __kprobes patch_unmap(int fixmap, unsigned long *flags) { clear_fixmap(fixmap); - raw_spin_unlock_irqrestore(&patch_lock, *flags); + if (flags) + raw_spin_unlock_irqrestore(&patch_lock, *flags); + else + __release(&patch_lock); } void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) @@ -61,9 +67,8 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) int mapped; /* Make sure we don't have any aliases in cache */ - flush_kernel_dcache_range_asm(start, end); - flush_kernel_icache_range_asm(start, end); - flush_tlb_kernel_range(start, end); + flush_kernel_vmap_range(addr, len); + flush_icache_range(start, end); p = fixmap = patch_map(addr, FIX_TEXT_POKE0, &flags, &mapped); @@ -76,10 +81,8 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) * We're crossing a page boundary, so * need to remap */ - flush_kernel_dcache_range_asm((unsigned long)fixmap, - (unsigned long)p); - flush_tlb_kernel_range((unsigned long)fixmap, - (unsigned long)p); + flush_kernel_vmap_range((void *)fixmap, + (p-fixmap) * sizeof(*p)); if (mapped) patch_unmap(FIX_TEXT_POKE0, &flags); p = fixmap = patch_map(addr, FIX_TEXT_POKE0, &flags, @@ -87,10 +90,10 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) } } - flush_kernel_dcache_range_asm((unsigned long)fixmap, (unsigned long)p); - flush_tlb_kernel_range((unsigned long)fixmap, (unsigned long)p); + flush_kernel_vmap_range((void *)fixmap, (p-fixmap) * sizeof(*p)); if (mapped) patch_unmap(FIX_TEXT_POKE0, &flags); + flush_icache_range(start, end); } void __kprobes __patch_text(void *addr, u32 insn) -- 2.35.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 5.17 21/21] Revert "parisc: Fix patch code locking and flushing" 2022-05-10 15:43 ` [PATCH AUTOSEL 5.17 21/21] Revert "parisc: Fix patch code locking and flushing" Sasha Levin @ 2022-05-10 15:49 ` Helge Deller 2022-05-14 16:24 ` Sasha Levin 0 siblings, 1 reply; 4+ messages in thread From: Helge Deller @ 2022-05-10 15:49 UTC (permalink / raw) To: Sasha Levin, linux-kernel, stable Cc: James.Bottomley, dave.anglin, linux-parisc Hello Sascha, please drop this patch from all your stable-series queues.... It shouldn't be backported. Thanks, Helge On 5/10/22 17:43, Sasha Levin wrote: > From: Helge Deller <deller@gmx.de> > > [ Upstream commit 6c800d7f55fcd78e17deae5ae4374d8e73482c13 ] > > This reverts commit a9fe7fa7d874a536e0540469f314772c054a0323. > > Leads to segfaults on 32bit kernel. > > Signed-off-by: Helge Deller <deller@gmx.de> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > arch/parisc/kernel/patch.c | 25 ++++++++++++++----------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/arch/parisc/kernel/patch.c b/arch/parisc/kernel/patch.c > index e59574f65e64..80a0ab372802 100644 > --- a/arch/parisc/kernel/patch.c > +++ b/arch/parisc/kernel/patch.c > @@ -40,7 +40,10 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags, > > *need_unmap = 1; > set_fixmap(fixmap, page_to_phys(page)); > - raw_spin_lock_irqsave(&patch_lock, *flags); > + if (flags) > + raw_spin_lock_irqsave(&patch_lock, *flags); > + else > + __acquire(&patch_lock); > > return (void *) (__fix_to_virt(fixmap) + (uintaddr & ~PAGE_MASK)); > } > @@ -49,7 +52,10 @@ static void __kprobes patch_unmap(int fixmap, unsigned long *flags) > { > clear_fixmap(fixmap); > > - raw_spin_unlock_irqrestore(&patch_lock, *flags); > + if (flags) > + raw_spin_unlock_irqrestore(&patch_lock, *flags); > + else > + __release(&patch_lock); > } > > void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) > @@ -61,9 +67,8 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) > int mapped; > > /* Make sure we don't have any aliases in cache */ > - flush_kernel_dcache_range_asm(start, end); > - flush_kernel_icache_range_asm(start, end); > - flush_tlb_kernel_range(start, end); > + flush_kernel_vmap_range(addr, len); > + flush_icache_range(start, end); > > p = fixmap = patch_map(addr, FIX_TEXT_POKE0, &flags, &mapped); > > @@ -76,10 +81,8 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) > * We're crossing a page boundary, so > * need to remap > */ > - flush_kernel_dcache_range_asm((unsigned long)fixmap, > - (unsigned long)p); > - flush_tlb_kernel_range((unsigned long)fixmap, > - (unsigned long)p); > + flush_kernel_vmap_range((void *)fixmap, > + (p-fixmap) * sizeof(*p)); > if (mapped) > patch_unmap(FIX_TEXT_POKE0, &flags); > p = fixmap = patch_map(addr, FIX_TEXT_POKE0, &flags, > @@ -87,10 +90,10 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) > } > } > > - flush_kernel_dcache_range_asm((unsigned long)fixmap, (unsigned long)p); > - flush_tlb_kernel_range((unsigned long)fixmap, (unsigned long)p); > + flush_kernel_vmap_range((void *)fixmap, (p-fixmap) * sizeof(*p)); > if (mapped) > patch_unmap(FIX_TEXT_POKE0, &flags); > + flush_icache_range(start, end); > } > > void __kprobes __patch_text(void *addr, u32 insn) ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 5.17 21/21] Revert "parisc: Fix patch code locking and flushing" 2022-05-10 15:49 ` Helge Deller @ 2022-05-14 16:24 ` Sasha Levin 2022-05-14 16:47 ` John David Anglin 0 siblings, 1 reply; 4+ messages in thread From: Sasha Levin @ 2022-05-14 16:24 UTC (permalink / raw) To: Helge Deller Cc: linux-kernel, stable, James.Bottomley, dave.anglin, linux-parisc On Tue, May 10, 2022 at 05:49:31PM +0200, Helge Deller wrote: >Hello Sascha, > >please drop this patch from all your stable-series queues.... >It shouldn't be backported. I've dropped it, but... why? -- Thanks, Sasha ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 5.17 21/21] Revert "parisc: Fix patch code locking and flushing" 2022-05-14 16:24 ` Sasha Levin @ 2022-05-14 16:47 ` John David Anglin 0 siblings, 0 replies; 4+ messages in thread From: John David Anglin @ 2022-05-14 16:47 UTC (permalink / raw) To: Sasha Levin, Helge Deller Cc: linux-kernel, stable, James.Bottomley, linux-parisc On 2022-05-14 12:24 p.m., Sasha Levin wrote: > On Tue, May 10, 2022 at 05:49:31PM +0200, Helge Deller wrote: >> Hello Sascha, >> >> please drop this patch from all your stable-series queues.... >> It shouldn't be backported. > > I've dropped it, but... why? It exposed a problem in the kernel flush code for PA 1.x machines. The patch works okay on all PA 2.0 machines. It also works on PA 1.x machines when flush_cache_all is used to flush changes to memory. Helge is investigating PA 1.x problem. -- John David Anglin dave.anglin@bell.net ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-14 16:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20220510154340.153400-1-sashal@kernel.org>
2022-05-10 15:43 ` [PATCH AUTOSEL 5.17 21/21] Revert "parisc: Fix patch code locking and flushing" Sasha Levin
2022-05-10 15:49 ` Helge Deller
2022-05-14 16:24 ` Sasha Levin
2022-05-14 16:47 ` John David Anglin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox