Re: [PATCH v4 5/7] arch/x86: kprobes: Use text_alloc() in alloc_insn_page()

From: Jarkko Sakkinen
Date: Thu Jul 23 2020 - 18:16:48 EST


On Fri, Jul 17, 2020 at 06:04:19AM +0300, Jarkko Sakkinen wrote:
> Use text_alloc() as part of the arch specific implementation for
> alloc_insn_page().
>
> Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
> Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx>Im
> ---
> arch/x86/kernel/kprobes/core.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
> index ada39ddbc922..0f20a3e52a06 100644
> --- a/arch/x86/kernel/kprobes/core.c
> +++ b/arch/x86/kernel/kprobes/core.c
> @@ -423,7 +423,7 @@ void *alloc_insn_page(void)
> {
> void *page;
>
> - page = module_alloc(PAGE_SIZE);
> + page = text_alloc(PAGE_SIZE);
> if (!page)
> return NULL;
>
> @@ -443,12 +443,6 @@ void *alloc_insn_page(void)
> return page;
> }
>
> -/* Recover page to RW mode before releasing it */
> -void free_insn_page(void *page)
> -{
> - module_memfree(page);

This must be a mistake. Should be just changed to call text_memfree().

Probably just my clumsiness when refactoring the series.

> -}
> -
> static int arch_copy_kprobe(struct kprobe *p)
> {
> struct insn insn;
> --
> 2.25.1
>

/Jarkko