From: Zong Li <zong.li@sifive.com>
To: paul.walmsley@sifive.com, palmer@dabbelt.com,
aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Zong Li <zong.li@sifive.com>
Subject: [PATCH 8/8] riscv: add two hook functions of ftrace
Date: Mon, 17 Feb 2020 16:32:23 +0800 [thread overview]
Message-ID: <20200217083223.2011-9-zong.li@sifive.com> (raw)
In-Reply-To: <20200217083223.2011-1-zong.li@sifive.com>
After the text section be mask as non-writable, the ftrace have to
change the permission of text for dynamic patching the intructions.
Add ftrace_arch_code_modify_prepare and
ftrace_arch_code_modify_post_process to change permission.
Signed-off-by: Zong Li <zong.li@sifive.com>
---
arch/riscv/kernel/ftrace.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/riscv/kernel/ftrace.c b/arch/riscv/kernel/ftrace.c
index c40fdcdeb950..576df0807200 100644
--- a/arch/riscv/kernel/ftrace.c
+++ b/arch/riscv/kernel/ftrace.c
@@ -7,9 +7,27 @@
#include <linux/ftrace.h>
#include <linux/uaccess.h>
+#include <linux/memory.h>
+#include <asm/set_memory.h>
#include <asm/cacheflush.h>
#ifdef CONFIG_DYNAMIC_FTRACE
+int ftrace_arch_code_modify_prepare(void) __acquires(&text_mutex)
+{
+ mutex_lock(&text_mutex);
+ set_kernel_text_rw();
+ set_all_modules_text_rw();
+ return 0;
+}
+
+int ftrace_arch_code_modify_post_process(void) __releases(&text_mutex)
+{
+ set_all_modules_text_ro();
+ set_kernel_text_ro();
+ mutex_unlock(&text_mutex);
+ return 0;
+}
+
static int ftrace_check_current_call(unsigned long hook_pos,
unsigned int *expected)
{
--
2.25.0
next prev parent reply other threads:[~2020-02-17 8:32 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 8:32 [PATCH 0/8] Support strict kernel memory permissions for security Zong Li
2020-02-17 8:32 ` [PATCH 1/8] riscv: add ARCH_HAS_SET_MEMORY support Zong Li
2020-03-05 0:57 ` Palmer Dabbelt
2020-02-17 8:32 ` [PATCH 2/8] riscv: add ARCH_HAS_SET_DIRECT_MAP support Zong Li
2020-03-05 0:57 ` Palmer Dabbelt
2020-02-17 8:32 ` [PATCH 3/8] riscv: add ARCH_SUPPORTS_DEBUG_PAGEALLOC support Zong Li
2020-03-05 0:57 ` Palmer Dabbelt
2020-02-17 8:32 ` [PATCH 4/8] riscv: move exception table immediately after RO_DATA Zong Li
2020-03-05 0:57 ` Palmer Dabbelt
2020-03-05 4:01 ` Zong Li
2020-02-17 8:32 ` [PATCH 5/8] riscv: add alignment for text, rodata and data sections Zong Li
2020-03-05 0:58 ` Palmer Dabbelt
2020-02-17 8:32 ` [PATCH 6/8] riscv: add STRICT_KERNEL_RWX support Zong Li
2020-03-05 1:21 ` Palmer Dabbelt
2020-03-05 4:08 ` Zong Li
2020-02-17 8:32 ` [PATCH 7/8] riscv: add DEBUG_WX support Zong Li
2020-03-05 1:44 ` Palmer Dabbelt
2020-03-05 5:53 ` Zong Li
2020-02-17 8:32 ` Zong Li [this message]
2020-03-05 1:44 ` [PATCH 8/8] riscv: add two hook functions of ftrace Palmer Dabbelt
2020-03-05 4:27 ` Zong Li
2020-03-05 15:55 ` [PATCH 0/8] Support strict kernel memory permissions for security Palmer Dabbelt
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=20200217083223.2011-9-zong.li@sifive.com \
--to=zong.li@sifive.com \
--cc=aou@eecs.berkeley.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.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).