From: Christoph Hellwig <hch@lst.de> To: Andrew Morton <akpm@linux-foundation.org> Cc: Dexuan Cui <decui@microsoft.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Peter Zijlstra <peterz@infradead.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Jessica Yu <jeyu@kernel.org>, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/3] arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page Date: Thu, 18 Jun 2020 08:43:06 +0200 [thread overview] Message-ID: <20200618064307.32739-3-hch@lst.de> (raw) In-Reply-To: <20200618064307.32739-1-hch@lst.de> Use PAGE_KERNEL_ROX directly instead of allocating RWX and setting the page read-only just after the allocation. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/arm64/kernel/probes/kprobes.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index d1c95dcf1d7833..cbe49cd117cfec 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -120,15 +120,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) void *alloc_insn_page(void) { - void *page; - - page = vmalloc_exec(PAGE_SIZE); - if (page) { - set_memory_ro((unsigned long)page, 1); - set_vm_flush_reset_perms(page); - } - - return page; + return __vmalloc_node_range(PAGE_SIZE, 1, VMALLOC_START, VMALLOC_END, + GFP_KERNEL, PAGE_KERNEL_ROX, VM_FLUSH_RESET_PERMS, + NUMA_NO_NODE, __func__); } /* arm kprobe: install breakpoint in text */ -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-hyperv@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>, Catalin Marinas <catalin.marinas@arm.com>, x86@kernel.org, Dexuan Cui <decui@microsoft.com>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Jessica Yu <jeyu@kernel.org>, Vitaly Kuznetsov <vkuznets@redhat.com>, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page Date: Thu, 18 Jun 2020 08:43:06 +0200 [thread overview] Message-ID: <20200618064307.32739-3-hch@lst.de> (raw) In-Reply-To: <20200618064307.32739-1-hch@lst.de> Use PAGE_KERNEL_ROX directly instead of allocating RWX and setting the page read-only just after the allocation. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/arm64/kernel/probes/kprobes.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index d1c95dcf1d7833..cbe49cd117cfec 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -120,15 +120,9 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) void *alloc_insn_page(void) { - void *page; - - page = vmalloc_exec(PAGE_SIZE); - if (page) { - set_memory_ro((unsigned long)page, 1); - set_vm_flush_reset_perms(page); - } - - return page; + return __vmalloc_node_range(PAGE_SIZE, 1, VMALLOC_START, VMALLOC_END, + GFP_KERNEL, PAGE_KERNEL_ROX, VM_FLUSH_RESET_PERMS, + NUMA_NO_NODE, __func__); } /* arm kprobe: install breakpoint in text */ -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-06-18 6:43 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-18 6:43 fix a hyperv W^X violation and remove vmalloc_exec Christoph Hellwig 2020-06-18 6:43 ` Christoph Hellwig 2020-06-18 6:43 ` [PATCH 1/3] x86/hyperv: allocate the hypercall page with only read and execute bits Christoph Hellwig 2020-06-18 6:43 ` Christoph Hellwig 2020-06-18 11:47 ` Wei Liu 2020-06-18 11:47 ` Wei Liu 2020-06-18 6:43 ` Christoph Hellwig [this message] 2020-06-18 6:43 ` [PATCH 2/3] arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page Christoph Hellwig 2020-06-18 8:55 ` David Hildenbrand 2020-06-18 8:55 ` David Hildenbrand 2020-06-18 10:35 ` Peter Zijlstra 2020-06-18 10:35 ` Peter Zijlstra 2020-06-18 13:50 ` Christoph Hellwig 2020-06-18 13:50 ` Christoph Hellwig 2020-06-18 9:27 ` Peter Zijlstra 2020-06-18 9:27 ` Peter Zijlstra 2020-06-21 2:16 ` Andrew Morton 2020-06-23 9:05 ` Christoph Hellwig 2020-06-23 9:07 ` Will Deacon 2020-06-23 9:37 ` Peter Zijlstra 2020-06-23 9:57 ` Will Deacon 2020-06-27 7:34 ` Ard Biesheuvel 2020-06-27 7:34 ` Ard Biesheuvel 2020-06-27 7:34 ` Ard Biesheuvel 2020-06-27 7:56 ` Christoph Hellwig 2020-06-27 7:56 ` Christoph Hellwig 2020-06-27 7:57 ` Ard Biesheuvel 2020-06-27 7:57 ` Ard Biesheuvel 2020-06-27 7:57 ` Ard Biesheuvel 2020-06-18 6:43 ` [PATCH 3/3] mm: remove vmalloc_exec Christoph Hellwig 2020-06-18 6:43 ` Christoph Hellwig 2020-06-18 8:53 ` David Hildenbrand 2020-06-18 8:53 ` David Hildenbrand 2020-06-18 9:28 ` fix a hyperv W^X violation and " Peter Zijlstra 2020-06-18 9:28 ` Peter Zijlstra
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=20200618064307.32739-3-hch@lst.de \ --to=hch@lst.de \ --cc=akpm@linux-foundation.org \ --cc=catalin.marinas@arm.com \ --cc=decui@microsoft.com \ --cc=jeyu@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-hyperv@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=peterz@infradead.org \ --cc=vkuznets@redhat.com \ --cc=will@kernel.org \ --cc=x86@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.