Message ID | 1682561552-32324-6-git-send-email-tangyouling@loongson.cn |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp632788vqo; Wed, 26 Apr 2023 19:48:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7r6CD2Qbf5bsYDZisEmvrNxBsT6o4RIk44uvNrJGcs8aGrdpwvLlXRt8TYidWMNShU9uE1 X-Received: by 2002:a17:90b:1645:b0:247:e4c:d168 with SMTP id il5-20020a17090b164500b002470e4cd168mr343537pjb.10.1682563698123; Wed, 26 Apr 2023 19:48:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682563698; cv=none; d=google.com; s=arc-20160816; b=bSy9lCEXW8XK72w7QWG6JfDC9rsjkmwdOrmHrhazcEZ9e5k+uqmKjIPTRn5I2QIXd0 Pa83NmMRs4KS2PTcJor8hwlXnJQMSC32WHT9ed16DikL6RSQBtpMzlij8H2L2S0Fs7tp nkcdbOLqQFVG4OKXXMGfmIDdsRiSCVW8K7deU9uAt/XznT63Rt7+bXNpoxYAQxNYbuMe 4EKR7y11bsiq/Cgonia72ZbwK3h68bnpQrTXgc4m5+01IKKHclZt5dcn6FfSkyJsaOgB J4HqRnPtfkQda2y80eXAb0b95W/npwBs+Qp/J5fWRrTaC+Y5/tcUR+BZDNK8BoYKb/3n RfJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=kEu5iQIUW3PhYcZ5GZ4wKxHsQDWUByC2sL+QqMnPZ10=; b=txDZVTttbuIx/TnUhRKmrPanK7SE1urbMyC9JiA0ZaCGhb9DNMLhdgStVNpVIIxBQT WIR0WLr7XVOwD5Td4dRae/vYgYoZG7odJ+3HmPBRkkckrTnHKEXCzU+TX775YJo1cpZ5 SuE1ThQhENkrO2VzWSeEImGrL/8E7pmd+XiztLjmZEmCB/5C6piNRnC0+vyOtmmYBIjw itUkVnJl5fqBOl8Gvb7tR6J1Vzk6jXsQUraPldCM3PAk05dRzs4l/x9nXnU4GqcvBXcz xFCnxrlHIGz5bKktpPaSXtHZwU/xJm8vbkSqfGngOgt+MnJ8ZxrcI0JDIIAcWk94W3go avCg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mj6-20020a17090b368600b0023d3fad2294si17323572pjb.10.2023.04.26.19.48.02; Wed, 26 Apr 2023 19:48:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242970AbjD0COF (ORCPT <rfc822;zxc52fgh@gmail.com> + 99 others); Wed, 26 Apr 2023 22:14:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242907AbjD0CN4 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 26 Apr 2023 22:13:56 -0400 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EB737423A; Wed, 26 Apr 2023 19:12:48 -0700 (PDT) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8Dxi+oe2klk6l4BAA--.2372S3; Thu, 27 Apr 2023 10:12:46 +0800 (CST) Received: from bogon.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxqrYQ2klkZ_U9AA--.18515S7; Thu, 27 Apr 2023 10:12:45 +0800 (CST) From: Youling Tang <tangyouling@loongson.cn> To: Huacai Chen <chenhuacai@kernel.org>, Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu <mhiramat@kernel.org>, Mark Rutland <mark.rutland@arm.com> Cc: WANG Xuerui <kernel@xen0n.name>, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, loongarch@lists.linux.dev, loongson-kernel@lists.loongnix.cn, Qing Zhang <zhangqing@loongson.cn> Subject: [PATCH v2 5/5] LoongArch: Abstract DYNAMIC_FTRACE_WITH_ARGS accesses Date: Thu, 27 Apr 2023 10:12:32 +0800 Message-Id: <1682561552-32324-6-git-send-email-tangyouling@loongson.cn> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1682561552-32324-1-git-send-email-tangyouling@loongson.cn> References: <1682561552-32324-1-git-send-email-tangyouling@loongson.cn> X-CM-TRANSID: AQAAf8CxqrYQ2klkZ_U9AA--.18515S7 X-CM-SenderInfo: 5wdqw5prxox03j6o00pqjv00gofq/ X-Coremail-Antispam: 1Uk129KBjvJXoW7uw1xCF1xJFWDJrWfWFWrAFb_yoW8uw48pr ySk3Z8GFW7CFs2k3W29F15Xr1rJryrAry8CryIkw13AFn8Jw18Zry3uryqyrWUtayxJrWa vF1akwsxWrn09a7anT9S1TB71UUUUj7qnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj qI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUIcSsGvfJTRUUU bSAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s 1l1IIY67AEw4v_Jrv_JF1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84 ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AKxVW8Jr0_Cr1U M2kKe7AKxVWUAVWUtwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07AIYIkI8VC2zV CFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWrXVW3AwAv7VC2 z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkF7I 0En4kS14v26r126r1DMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCI bckI1I0E14v26r126r1DMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_Jr I_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v2 6F1j6w1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7 xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_ Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07j6rWOUUUUU= X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764295912325621971?= X-GMAIL-MSGID: =?utf-8?q?1764295912325621971?= |
Series |
LoongArch: ftrace: Add direct call support and code simplification
|
|
Commit Message
Youling Tang
April 27, 2023, 2:12 a.m. UTC
From: Qing Zhang <zhangqing@loongson.cn> 1. Adds new ftrace_regs_{get,set}_*() helpers which can be used to manipulate ftrace_regs. When CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y, these can always be used on any ftrace_regs, and when CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=n these can be used when regs are available. A new ftrace_regs_has_args(fregs) helper is added which code can use to check when these are usable. 2. Prepare ftrace_regs_set_instruction_pointer support in advance. Signed-off-by: Qing Zhang <zhangqing@loongson.cn> --- arch/loongarch/include/asm/ftrace.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
Comments
On Thu, Apr 27 2023 at 10:12:32 AM +0800, Youling Tang wrote: > From: Qing Zhang <zhangqing@loongson.cn> > > 1. Adds new ftrace_regs_{get,set}_*() helpers which can be used to manipulate > ftrace_regs. When CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y, these can always > be used on any ftrace_regs, and when CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=n > these can be used when regs are available. A new ftrace_regs_has_args(fregs) > helper is added which code can use to check when these are usable. > > 2. Prepare ftrace_regs_set_instruction_pointer support in advance. > > Signed-off-by: Qing Zhang <zhangqing@loongson.cn> > --- > arch/loongarch/include/asm/ftrace.h | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h > index f789e680f633..30ee01243416 100644 > --- a/arch/loongarch/include/asm/ftrace.h > +++ b/arch/loongarch/include/asm/ftrace.h > @@ -54,6 +54,31 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs * > return &fregs->regs; > } > > +static __always_inline void > +ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, > + unsigned long ip) > +{ > + regs_set_return_value(&fregs->regs, ip); > +} > + > +static __always_inline unsigned long > +ftrace_regs_get_instruction_pointer(struct ftrace_regs *fregs) > +{ > + return instruction_pointer(&fregs->regs); > +} > + > +#define ftrace_regs_get_argument(fregs, n) \ > + regs_get_kernel_argument(&(fregs)->regs, n) > +#define ftrace_regs_get_stack_pointer(fregs) \ > + kernel_stack_pointer(&(fregs)->regs) > +#define ftrace_regs_return_value(fregs) \ > + regs_return_value(&(fregs)->regs) > +#define ftrace_regs_set_return_value(fregs, ret) \ Hi Youling, > + regs_set_return_value(&(fregs)->regs, ret) ^^^^^^^^^^^^^^^^^^^^^^^^ I can not find the implementation of this function, am I missing something? > +#define ftrace_override_function_with_return(fregs) \ > + override_function_with_return(&(fregs)->regs) > +#define ftrace_regs_query_register_offset(name) \ ^^^^^^ There seems to be a missing function here. Otherwise, the backslash should be redundant. Did I understand correctly? Best Regards, Enze > + > #define ftrace_graph_func ftrace_graph_func > void ftrace_graph_func(unsigned long ip, unsigned long parent_ip, > struct ftrace_ops *op, struct ftrace_regs *fregs);
Hi, Enze On 04/27/2023 02:16 PM, Enze Li wrote: > On Thu, Apr 27 2023 at 10:12:32 AM +0800, Youling Tang wrote: > >> From: Qing Zhang <zhangqing@loongson.cn> >> >> 1. Adds new ftrace_regs_{get,set}_*() helpers which can be used to manipulate >> ftrace_regs. When CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y, these can always >> be used on any ftrace_regs, and when CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=n >> these can be used when regs are available. A new ftrace_regs_has_args(fregs) >> helper is added which code can use to check when these are usable. >> >> 2. Prepare ftrace_regs_set_instruction_pointer support in advance. >> >> Signed-off-by: Qing Zhang <zhangqing@loongson.cn> >> --- >> arch/loongarch/include/asm/ftrace.h | 25 +++++++++++++++++++++++++ >> 1 file changed, 25 insertions(+) >> >> diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h >> index f789e680f633..30ee01243416 100644 >> --- a/arch/loongarch/include/asm/ftrace.h >> +++ b/arch/loongarch/include/asm/ftrace.h >> @@ -54,6 +54,31 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs * >> return &fregs->regs; >> } >> >> +static __always_inline void >> +ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, >> + unsigned long ip) >> +{ >> + regs_set_return_value(&fregs->regs, ip); >> +} >> + >> +static __always_inline unsigned long >> +ftrace_regs_get_instruction_pointer(struct ftrace_regs *fregs) >> +{ >> + return instruction_pointer(&fregs->regs); >> +} >> + >> +#define ftrace_regs_get_argument(fregs, n) \ >> + regs_get_kernel_argument(&(fregs)->regs, n) >> +#define ftrace_regs_get_stack_pointer(fregs) \ >> + kernel_stack_pointer(&(fregs)->regs) >> +#define ftrace_regs_return_value(fregs) \ >> + regs_return_value(&(fregs)->regs) >> +#define ftrace_regs_set_return_value(fregs, ret) \ > > Hi Youling, > >> + regs_set_return_value(&(fregs)->regs, ret) > ^^^^^^^^^^^^^^^^^^^^^^^^ > I can not find the implementation of this function, am I missing > something? Note: This patch depends on regs_set_return_value() in the patch "LoongArch: Add support for function error injection". https://github.com/chenhuacai/linux/commit/c78e80c75b98feeb02b9a6eefb9de759f9036f42 > >> +#define ftrace_override_function_with_return(fregs) \ >> + override_function_with_return(&(fregs)->regs) >> +#define ftrace_regs_query_register_offset(name) \ > ^^^^^^ > There seems to be a missing function here. Otherwise, the backslash > should be redundant. Did I understand correctly? Sorry for my oversight. ftrace_regs_query_register_offset() will reuse regs_query_register_offset(), I will modify it as follows, #define ftrace_regs_query_register_offset(name) \ regs_query_register_offset(name) Thanks, Youling. > > Best Regards, > Enze > >> + >> #define ftrace_graph_func ftrace_graph_func >> void ftrace_graph_func(unsigned long ip, unsigned long parent_ip, >> struct ftrace_ops *op, struct ftrace_regs *fregs);
diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h index f789e680f633..30ee01243416 100644 --- a/arch/loongarch/include/asm/ftrace.h +++ b/arch/loongarch/include/asm/ftrace.h @@ -54,6 +54,31 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs * return &fregs->regs; } +static __always_inline void +ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, + unsigned long ip) +{ + regs_set_return_value(&fregs->regs, ip); +} + +static __always_inline unsigned long +ftrace_regs_get_instruction_pointer(struct ftrace_regs *fregs) +{ + return instruction_pointer(&fregs->regs); +} + +#define ftrace_regs_get_argument(fregs, n) \ + regs_get_kernel_argument(&(fregs)->regs, n) +#define ftrace_regs_get_stack_pointer(fregs) \ + kernel_stack_pointer(&(fregs)->regs) +#define ftrace_regs_return_value(fregs) \ + regs_return_value(&(fregs)->regs) +#define ftrace_regs_set_return_value(fregs, ret) \ + regs_set_return_value(&(fregs)->regs, ret) +#define ftrace_override_function_with_return(fregs) \ + override_function_with_return(&(fregs)->regs) +#define ftrace_regs_query_register_offset(name) \ + #define ftrace_graph_func ftrace_graph_func void ftrace_graph_func(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *op, struct ftrace_regs *fregs);