From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9036C33CA9 for ; Tue, 14 Jan 2020 01:37:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7EF92080D for ; Tue, 14 Jan 2020 01:37:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729545AbgANBhx (ORCPT ); Mon, 13 Jan 2020 20:37:53 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:8714 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728946AbgANBhx (ORCPT ); Mon, 13 Jan 2020 20:37:53 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id BA7115B6EC2D4E62466E; Tue, 14 Jan 2020 09:37:51 +0800 (CST) Received: from [127.0.0.1] (10.133.217.236) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.439.0; Tue, 14 Jan 2020 09:37:42 +0800 Subject: Re: [PATCH] x86/ftrace: usr ftrace_write to simplify code To: , CC: , , , , , References: <20200113073347.22748-1-cj.chengjian@huawei.com> From: "chengjian (D)" Message-ID: <8ab66ffb-614b-063d-7362-2f01906aec51@huawei.com> Date: Tue, 14 Jan 2020 09:37:41 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: <20200113073347.22748-1-cj.chengjian@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Originating-IP: [10.133.217.236] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I am sorry. usr => use in subject. I will resend this patch.  --Cheng Jian On 2020/1/13 15:33, Cheng Jian wrote: > ftrace_write() can be used directly in ftrace_modify_code_direct(), > that make the code more brief. > > Signed-off-by: Cheng Jian > --- > arch/x86/kernel/ftrace.c | 24 +++++++++++------------- > 1 file changed, 11 insertions(+), 13 deletions(-) > > diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c > index 024c3053dbba..6b36ed2fd04d 100644 > --- a/arch/x86/kernel/ftrace.c > +++ b/arch/x86/kernel/ftrace.c > @@ -114,6 +114,16 @@ static const unsigned char *ftrace_nop_replace(void) > return ideal_nops[NOP_ATOMIC5]; > } > > +static int ftrace_write(unsigned long ip, const char *val, int size) > +{ > + ip = text_ip_addr(ip); > + > + if (probe_kernel_write((void *)ip, val, size)) > + return -EPERM; > + > + return 0; > +} > + > static int > ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code, > unsigned const char *new_code) > @@ -138,10 +148,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code, > if (memcmp(replaced, old_code, MCOUNT_INSN_SIZE) != 0) > return -EINVAL; > > - ip = text_ip_addr(ip); > - > /* replace the text with the new text */ > - if (probe_kernel_write((void *)ip, new_code, MCOUNT_INSN_SIZE)) > + if (ftrace_write(ip, new_code, MCOUNT_INSN_SIZE)) > return -EPERM; > > sync_core(); > @@ -326,16 +334,6 @@ int ftrace_int3_handler(struct pt_regs *regs) > } > NOKPROBE_SYMBOL(ftrace_int3_handler); > > -static int ftrace_write(unsigned long ip, const char *val, int size) > -{ > - ip = text_ip_addr(ip); > - > - if (probe_kernel_write((void *)ip, val, size)) > - return -EPERM; > - > - return 0; > -} > - > static int add_break(unsigned long ip, const char *old) > { > unsigned char replaced[MCOUNT_INSN_SIZE];