mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Christophe Leroy (CS GROUP)" <chleroy@kernel.org>
To: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>,
	Mike Rapoport <rppt@kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org,
	Madhavan Srinivasan <maddy@linux.ibm.com>,
	Venkat Rao Bagalkote <venkat88@linux.ibm.com>,
	linux-kernel@vger.kernel.org,
	Michael Ellerman <mpe@ellerman.id.au>,
	Nicholas Piggin <npiggin@gmail.com>,
	Shrikanth Hegde <sshegde@linux.ibm.com>,
	Hari Bathini <hbathini@linux.ibm.com>
Subject: Re: [PATCHv2 2/3] powerpc/execmem: Allocate kprobes insn pages from the modules area on book3s/32
Date: Tue, 17 Nov 2026 15:04:49 +0100	[thread overview]
Message-ID: <eb634d1f-cb08-44a8-88c9-e3b559c399a3@kernel.org> (raw)
In-Reply-To: <zev77i3i.ritesh.list@gmail.com>



Le 17/11/2026 à 13:33, Ritesh Harjani a écrit :
> Mike Rapoport <rppt@kernel.org> writes:
> 
>> On Mon, Nov 16, 2026 at 04:11:07PM +0100, Christophe Leroy (CS GROUP) wrote:
>>> Hi Mike,
>>>
>>> Le 15/11/2026 à 09:29, Mike Rapoport a écrit :
>>>> On Fri, Nov 13, 2026 at 06:01:37PM +0530, Ritesh Harjani (IBM) wrote:
>>>>> On book3s/32, a kprobe on an instruction that can't be emulated and has
>>>>> to be single stepped out of line, crashes the kernel. For e.g. with the
>>>>> following cmds...
>>>>>       ~> echo 9 > /proc/sys/kernel/printk
>>>>>       ~> mount -t debugfs debugfs /sys/kernel/debug
>>>>>       ~> echo 'p:wx filldir64+0xb8' > /sys/kernel/debug/tracing/kprobe_events
>>>>>       ~> echo 1 > /sys/kernel/debug/tracing/events/kprobes/wx/enable
>>>>>       ~> echo 1 > /sys/kernel/debug/tracing/events/kprobes/enable
>>>>>
>>>>> ...we can see the following crash:
>>>>>       kernel tried to execute exec-protected page (f101a008) - exploit attempt? (uid: 0)
>>>>>       BUG: Unable to handle kernel instruction fetch
>>>>>       Faulting instruction address: 0xc02b919c
>>>>>       Vector: 400 (Instruction Access) at [f19a9d60]
>>>>>           pc: c02b919c: filldir64+0xb8/0x2dc
>>>>>           lr: c02b9148: filldir64+0x64/0x2dc
>>>>>           sp: f19a9e20
>>>>>          msr: 10029032
>>>>>         current = 0xc112e900
>>>>>           pid   = 102, comm = ls
>>>>>       enter ? for help
>>>>>       [f19a9e20] c1a8d420 (unreliable)
>>>>>       [f19a9e50] c02e4074 dcache_readdir+0x208/0x2a8
>>>>>       [f19a9e90] c02b8c5c iterate_dir+0x88/0x1fc
>>>>>       [f19a9ec0] c02b96e0 sys_getdents64+0x88/0x198
>>>>>       [f19a9f10] c0014400 system_call_exception+0xf8/0x20c
>>>>>       [f19a9f30] c00191ac ret_from_syscall+0x0/0x2c
>>>>>       ---- Exception: c00 (System Call) at a7596164
>>>>>       SP (af802310) is in userspace
>>>>>
>>>>> This happens because on book3s/32 the exec permission is per segment
>>>>> (256MB), not per page. The page tables have no hardware exec bit, only
>>>>> the segment registers have a no-execute (N) bit. mmu_mark_initmem_nx()
>>>>> sets N on all the kernel segments except the ones of the modules area.
>>>>> So nothing in the vmalloc area can be executed, even when the page is
>>>>> mapped with PAGE_KERNEL_ROX or PAGE_KERNEL_EXEC, because _PAGE_EXEC is
>>>>> a software only bit there and the segment's N bit is what the MMU
>>>>> enforces.
>>>>>
>>>>> Before commit 1b750c2fbf82 ("powerpc: extend execmem_params for kprobes
>>>>> allocations"), the kprobes insn pages came from module_alloc(). That
>>>>> commit moved them to the whole of the vmalloc space, on the grounds
>>>>> that kprobes use a breakpoint and don't need to be near the kernel
>>>>> text. That is fine on platforms where the exec permission is per page,
>>>>> as PAGE_KERNEL_ROX is then enough to make a vmalloc page executable.
>>>>> It is not on book3s/32, where the modules area is not only close to
>>>>> the kernel text but is also the only page-mapped area whose segment is
>>>>> left executable. So the insn pages must keep coming from there.
>>>>>
>>>>> Hence, use the modules area for EXECMEM_KPROBES on book3s/32.
>>>> Right, I missed that on book3s/32 does vmalloc is not executable and its
>>>> protection can't be changed.
>>>>
>>>> Could it be that 8xx also need a special treatment for kprobes?
>>>
>>> Yes indeed, not for the same reasons but because 8xx ITLB-miss handler
>>> doesn't expect any instruction TLB miss on kernel addresses other than the
>>> ones from the module area:
>>>
>>> Commit 4afb0be7ccda ("powerpc/8xx: Avoid testing for kernel space in ITLB
>>> Miss.")
>>> Commit 16a71c045186 ("powerpc/8xx: Preallocate execmem page tables")
>>> Commit 33c527522f39 ("powerpc/8xx: Inconditionally use task PGDIR in ITLB
>>> misses")
>>>
> 
> Right. I looked at the above series which added all of this support [1].
> So looks like 603 might also have this related problem (other than the
> per segment N bit issue), since it's iTLB miss handler only walks the
> task's PGDIR, unlike it's dTLB handler which falls back to reloading the
> missing kernel PGD entry from swapper_pg_dir. So what I meant to say is
> that, similar to 8xx, a new PGD entry created in the kernel's vmalloc
> area for an insn page does not get copied over after the task is
> created (/PGDIR allocated), on 603 as well.
> But since MODLUES_VADDR is defined for both BOOK3S/32 and 8xx, so I guess it
> gets covered by the same change anyways.
> 
> [1]: https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flinuxppc-dev%2Fcover.1724173828.git.christophe.leroy%40csgroup.eu%2F&data=05%7C02%7Cchristophe.leroy%40csgroup.eu%7C0dc9911f0edd40821c2d08df44aea3d2%7C8b87af7d86474dc78df45f69a2011bb5%7C0%7C0%7C639305189016985969%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=UbPfu7OsJohLOnRi3b2v67TmweDvZBTi%2BCX3qcrp3qM%3D&reserved=0
> 
>>> So at the end as MODULES_VADDR/MODULES_END only exist on book3s/32 and 8xx I
>>> think when they exist they should be used as follows:
>>>
>>> diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
>>> index b617b69452cd..856f4609c488 100644
>>> --- a/arch/powerpc/mm/mem.c
>>> +++ b/arch/powerpc/mm/mem.c
>>> @@ -428,8 +428,13 @@ struct execmem_info __init *execmem_arch_setup(void)
>>>   				.fallback_end	= fallback_end,
>>>   			},
>>>   			[EXECMEM_KPROBES] = {
>>> +#ifdef MODULES_VADDR
>>> +				.start	= MODULES_VADDR,
>>> +				.end	= MODULES_END,
>>> +#else
>>>   				.start	= VMALLOC_START,
>>>   				.end	= VMALLOC_END,
>>> +#endif
>>
>> We already have #ifdef MODULES_VADDR a few lines above, I think the
>> assignment of kprobes_start and kprobes_end could go there instead of if
>> (IS_ENABLED(CONFIG_PPC_BOOK3S_32)).
>>
> 
> Right. So let me use the following diff then?
> 
> Please let me know if this diff looks good to you? If yes, then I can
> send a v3.

My preference would go to something similar to 'start' and 'end', no 
init at declaration, kprobes_start and kprobes_end set to 
VMALLOC_START/VMALLOC_END inside the #else

Christophe

> 
> Also - it will be good to know if patch-1 and patch-3 looks ok too,
> before I spin a next revision?
> 
> Thanks Christophe & Mike, for reviewing and pointing this out!
> 
> 
> diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
> index 77b63b52d8f2..547120a30bee 100644
> --- a/arch/powerpc/mm/mem.c
> +++ b/arch/powerpc/mm/mem.c
> @@ -391,6 +391,7 @@ struct execmem_info __init *execmem_arch_setup(void)
>          pgprot_t kprobes_prot = strict_kernel_rwx_enabled() ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC;
>          pgprot_t prot = strict_module_rwx_enabled() ? PAGE_KERNEL : PAGE_KERNEL_EXEC;
>          unsigned long fallback_start = 0, fallback_end = 0;
> +       unsigned long kprobes_start = VMALLOC_START, kprobes_end = VMALLOC_END;
>          unsigned long start, end;
> 
>          /*
> @@ -410,6 +411,9 @@ struct execmem_info __init *execmem_arch_setup(void)
>          }
> 
>          end = MODULES_END;
> +
> +       kprobes_start = MODULES_VADDR;
> +       kprobes_end = MODULES_END;
>   #else
>          start = VMALLOC_START;
>          end = VMALLOC_END;
> @@ -428,8 +432,8 @@ struct execmem_info __init *execmem_arch_setup(void)
>                                  .fallback_end   = fallback_end,
>                          },
>                          [EXECMEM_KPROBES] = {
> -                               .start  = VMALLOC_START,
> -                               .end    = VMALLOC_END,
> +                               .start  = kprobes_start,
> +                               .end    = kprobes_end,
>                                  .pgprot = kprobes_prot,
>                                  .alignment = 1,
>                          },
> 
> 
> 
> -ritesh
> 
> 
>>>   				.pgprot	= kprobes_prot,
>>>   				.alignment = 1,
>>>   			},
>>>
>>>
>>>>
>>>>> Fixes: 1b750c2fbf82 ("powerpc: extend execmem_params for kprobes allocations")
>>>>> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
>>>>
>>>> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
>>>>
>>>>> ---
>>>>>    arch/powerpc/mm/mem.c | 10 ++++++++--
>>>>>    1 file changed, 8 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
>>>>> index 77b63b52d8f2..ae1bc7359353 100644
>>>>> --- a/arch/powerpc/mm/mem.c
>>>>> +++ b/arch/powerpc/mm/mem.c
>>>>> @@ -391,6 +391,7 @@ struct execmem_info __init *execmem_arch_setup(void)
>>>>>    	pgprot_t kprobes_prot = strict_kernel_rwx_enabled() ? PAGE_KERNEL_ROX : PAGE_KERNEL_EXEC;
>>>>>    	pgprot_t prot = strict_module_rwx_enabled() ? PAGE_KERNEL : PAGE_KERNEL_EXEC;
>>>>>    	unsigned long fallback_start = 0, fallback_end = 0;
>>>>> +	unsigned long kprobes_start = VMALLOC_START, kprobes_end = VMALLOC_END;
>>>>>    	unsigned long start, end;
>>>>>
>>>>>    	/*
>>>>> @@ -410,6 +411,11 @@ struct execmem_info __init *execmem_arch_setup(void)
>>>>>    	}
>>>>>
>>>>>    	end = MODULES_END;
>>>>> +
>>>>> +	if (IS_ENABLED(CONFIG_PPC_BOOK3S_32)) {
>>>>> +		kprobes_start = MODULES_VADDR;
>>>>> +		kprobes_end = MODULES_END;
>>>>> +	}
>>>>>    #else
>>>>>    	start = VMALLOC_START;
>>>>>    	end = VMALLOC_END;
>>>>> @@ -428,8 +434,8 @@ struct execmem_info __init *execmem_arch_setup(void)
>>>>>    				.fallback_end	= fallback_end,
>>>>>    			},
>>>>>    			[EXECMEM_KPROBES] = {
>>>>> -				.start	= VMALLOC_START,
>>>>> -				.end	= VMALLOC_END,
>>>>> +				.start	= kprobes_start,
>>>>> +				.end	= kprobes_end,
>>>>>    				.pgprot	= kprobes_prot,
>>>>>    				.alignment = 1,
>>>>>    			},
>>>>> --
>>>>> 2.39.5
>>>>>
>>>>>
>>>>
>>>
>>
>> -- 
>> Sincerely yours,
>> Mike.


  reply	other threads:[~2026-11-17 14:04 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-13 12:31 [PATCHv2 0/3] powerpc: kprobes insn page fixes Ritesh Harjani (IBM)
2026-11-13 12:31 ` [PATCHv2 1/3] powerpc/execmem: Don't leave kprobes insn pages W+X when CONFIG_MODULES=n Ritesh Harjani (IBM)
2026-11-17 14:08   ` Christophe Leroy (CS GROUP)
2026-11-13 12:31 ` [PATCHv2 2/3] powerpc/execmem: Allocate kprobes insn pages from the modules area on book3s/32 Ritesh Harjani (IBM)
2026-11-15  8:29   ` Mike Rapoport
2026-11-16 15:11     ` Christophe Leroy (CS GROUP)
2026-11-16 15:57       ` Mike Rapoport
2026-11-17 12:33         ` Ritesh Harjani
2026-11-17 14:04           ` Christophe Leroy (CS GROUP) [this message]
2026-11-17 14:15             ` Mike Rapoport
2026-11-13 12:31 ` [PATCHv2 3/3] powerpc/ptdump: Show the exec flag of kernel mappings on e500 Ritesh Harjani (IBM)
2026-11-17 14:09   ` Christophe Leroy (CS GROUP)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=eb634d1f-cb08-44a8-88c9-e3b559c399a3@kernel.org \
    --to=chleroy@kernel.org \
    --cc=hbathini@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=maddy@linux.ibm.com \
    --cc=mpe@ellerman.id.au \
    --cc=npiggin@gmail.com \
    --cc=ritesh.list@gmail.com \
    --cc=rppt@kernel.org \
    --cc=sshegde@linux.ibm.com \
    --cc=venkat88@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®