From: Jordan Niethe <jniethe5@gmail.com>
To: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>,
ajd@linux.ibm.com, Nicholas Piggin <npiggin@gmail.com>,
naveen.n.rao@linux.ibm.com,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
Daniel Axtens <dja@axtens.net>
Subject: Re: [PATCH v9 3/8] powerpc/kprobes: Mark newly allocated probes as RO
Date: Wed, 17 Mar 2021 11:52:37 +1100 [thread overview]
Message-ID: <CACzsE9pM7ysy8DnjzBuOVmKHgPHrN6cBD2+3_Dz_-vKqOf0LXw@mail.gmail.com> (raw)
In-Reply-To: <6d04f7c6-8950-2666-13cc-d2f7bf788952@csgroup.eu>
On Tue, Mar 16, 2021 at 5:44 PM Christophe Leroy
<christophe.leroy@csgroup.eu> wrote:
>
>
>
> Le 16/03/2021 à 04:17, Jordan Niethe a écrit :
> > From: Russell Currey <ruscur@russell.cc>
> >
> > With CONFIG_STRICT_KERNEL_RWX=y and CONFIG_KPROBES=y, there will be one
> > W+X page at boot by default. This can be tested with
> > CONFIG_PPC_PTDUMP=y and CONFIG_PPC_DEBUG_WX=y set, and checking the
> > kernel log during boot.
> >
>
> This text is confusing. I don't understand what is the status before the patch, and what is the
> status after.
>
> "there will be one ...", does it mean after the patch ?
>
> > Add an arch specific insn page allocator which returns RO pages if
> > STRICT_KERNEL_RWX is enabled. This page is only written to with
> > patch_instruction() which is able to write RO pages.
>
> "an" or "the" arch specific insn page allocator ?
>
> >
> > Reviewed-by: Daniel Axtens <dja@axtens.net>
> > Signed-off-by: Russell Currey <ruscur@russell.cc>
> > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> > [jpn: Reword commit message, switch from vmalloc_exec(), add
> > free_insn_page()]
> > Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
> > ---
> > v9: - vmalloc_exec() no longer exists
> > - Set the page to RW before freeing it
> > ---
> > arch/powerpc/kernel/kprobes.c | 22 ++++++++++++++++++++++
> > 1 file changed, 22 insertions(+)
> >
> > diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
> > index 01ab2163659e..bb7e4d321988 100644
> > --- a/arch/powerpc/kernel/kprobes.c
> > +++ b/arch/powerpc/kernel/kprobes.c
> > @@ -25,6 +25,8 @@
> > #include <asm/sections.h>
> > #include <asm/inst.h>
> > #include <linux/uaccess.h>
> > +#include <linux/set_memory.h>
> > +#include <linux/vmalloc.h>
> >
> > DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
> > DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
> > @@ -103,6 +105,26 @@ kprobe_opcode_t *kprobe_lookup_name(const char *name, unsigned int offset)
> > return addr;
> > }
> >
> > +void *alloc_insn_page(void)
> > +{
> > + void *page = vmalloc(PAGE_SIZE);
>
> Can't do that on book3s/32, see https://github.com/linuxppc/linux/commit/6ca05532 and
> https://github.com/linuxppc/linux/commit/7fbc22ce
>
> Should do:
> return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, GFP_KERNEL,
> PAGE_KERNEL_ROX, VM_FLUSH_RESET_PERMS, NUMA_NO_NODE,
> __builtin_return_address(0));
>
>
> To keep it simple, you'll probably need to define MODULES_VADDR and MODULES_END as resp
> VMALLOC_START and VMALLOC_END when they are not defined, maybe in asm/pgtable.h
Thank you, I had overlooked that. I will do it like that in the next revision.
>
> > +
> > + if (!page)
> > + return NULL;
> > +
> > + set_memory_ro((unsigned long)page, 1);
> > + set_memory_x((unsigned long)page, 1);
> > +
> > + return page;
> > +}
> > +
> > +void free_insn_page(void *page)
> > +{
> > + set_memory_nx((unsigned long)page, 1);
> > + set_memory_rw((unsigned long)page, 1);
> > + vfree(page);
> > +}
> > +
> > int arch_prepare_kprobe(struct kprobe *p)
> > {
> > int ret = 0;
> >
next prev parent reply other threads:[~2021-03-17 0:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 3:17 [PATCH v9 1/8] powerpc/mm: Implement set_memory() routines Jordan Niethe
2021-03-16 3:17 ` [PATCH v9 2/8] powerpc/lib/code-patching: Set up Strict RWX patching earlier Jordan Niethe
2021-03-16 3:36 ` Russell Currey
2021-03-16 6:32 ` Christophe Leroy
2021-03-17 0:38 ` Jordan Niethe
2021-03-17 12:04 ` Michael Ellerman
2021-03-16 3:17 ` [PATCH v9 3/8] powerpc/kprobes: Mark newly allocated probes as RO Jordan Niethe
2021-03-16 6:44 ` Christophe Leroy
2021-03-17 0:50 ` Jordan Niethe
2021-03-17 0:52 ` Jordan Niethe [this message]
2021-03-17 6:12 ` Christophe Leroy
2021-03-18 2:42 ` Jordan Niethe
2021-03-16 3:17 ` [PATCH v9 4/8] powerpc/mm/ptdump: debugfs handler for W+X checks at runtime Jordan Niethe
2021-03-16 6:47 ` Christophe Leroy
2021-03-16 3:17 ` [PATCH v9 5/8] powerpc: Set ARCH_HAS_STRICT_MODULE_RWX Jordan Niethe
2021-03-16 6:51 ` Christophe Leroy
2021-03-17 2:15 ` Jordan Niethe
2021-03-17 5:43 ` Christophe Leroy
2021-03-16 3:17 ` [PATCH v9 6/8] powerpc/configs: Enable STRICT_MODULE_RWX in skiroot_defconfig Jordan Niethe
2021-03-16 3:17 ` [PATCH v9 7/8] powerpc/mm: implement set_memory_attr() Jordan Niethe
2021-03-16 7:25 ` Christophe Leroy
2021-03-17 0:54 ` Jordan Niethe
2021-03-16 3:17 ` [PATCH v9 8/8] powerpc/32: use set_memory_attr() Jordan Niethe
2021-03-19 1:19 ` [PATCH v9 1/8] powerpc/mm: Implement set_memory() routines Michael Ellerman
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=CACzsE9pM7ysy8DnjzBuOVmKHgPHrN6cBD2+3_Dz_-vKqOf0LXw@mail.gmail.com \
--to=jniethe5@gmail.com \
--cc=ajd@linux.ibm.com \
--cc=christophe.leroy@c-s.fr \
--cc=christophe.leroy@csgroup.eu \
--cc=dja@axtens.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen.n.rao@linux.ibm.com \
--cc=npiggin@gmail.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;
as well as URLs for NNTP newsgroup(s).