lkml.org 
[lkml]   [2021]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -tip v11 05/27] kprobes: Make arch_check_ftrace_location static
    Date
    From: Punit Agrawal <punitagrawal@gmail.com>

    arch_check_ftrace_location() was introduced as a weak function in
    commit f7f242ff004499 ("kprobes: introduce weak
    arch_check_ftrace_location() helper function") to allow architectures
    to handle kprobes call site on their own.

    Recently, the only architecture (csky) to implement
    arch_check_ftrace_location() was migrated to using the common
    version.

    As a result, further cleanup the code to drop the weak attribute and
    rename the function to remove the architecture specific
    implementation.

    Signed-off-by: Punit Agrawal <punitagrawal@gmail.com>
    Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    ---
    include/linux/kprobes.h | 2 --
    kernel/kprobes.c | 4 ++--
    2 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
    index 0b75549b2815..8a9412bb0d5e 100644
    --- a/include/linux/kprobes.h
    +++ b/include/linux/kprobes.h
    @@ -361,8 +361,6 @@ static inline int arch_prepare_kprobe_ftrace(struct kprobe *p)
    }
    #endif

    -int arch_check_ftrace_location(struct kprobe *p);
    -
    /* Get the kprobe at this addr (if any) - called with preemption disabled */
    struct kprobe *get_kprobe(void *addr);

    diff --git a/kernel/kprobes.c b/kernel/kprobes.c
    index cfa9d3c263eb..30199bfcc74a 100644
    --- a/kernel/kprobes.c
    +++ b/kernel/kprobes.c
    @@ -1524,7 +1524,7 @@ static inline int warn_kprobe_rereg(struct kprobe *p)
    return ret;
    }

    -int __weak arch_check_ftrace_location(struct kprobe *p)
    +static int check_ftrace_location(struct kprobe *p)
    {
    unsigned long ftrace_addr;

    @@ -1547,7 +1547,7 @@ static int check_kprobe_address_safe(struct kprobe *p,
    {
    int ret;

    - ret = arch_check_ftrace_location(p);
    + ret = check_ftrace_location(p);
    if (ret)
    return ret;
    jump_label_lock();
    \
     
     \ /
      Last update: 2021-09-14 16:40    [W:5.047 / U:0.672 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site