From patchwork Wed Mar 22 18:42:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 73624 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2505624wrt; Wed, 22 Mar 2023 11:47:40 -0700 (PDT) X-Google-Smtp-Source: AK7set+AAw8nFPRVCAZLfAVrVKujE6lL2raCux1Qwe1zPKIvYGD/mCSbUriJC0ggpZTh4Nm2Xg5U X-Received: by 2002:a17:902:f9cf:b0:1a1:cd76:7880 with SMTP id kz15-20020a170902f9cf00b001a1cd767880mr2901752plb.15.1679510860214; Wed, 22 Mar 2023 11:47:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679510860; cv=none; d=google.com; s=arc-20160816; b=vTAbh34EqLcZeJ0CqLTcdSO1gxFpfNm6Bj/dev0+lHXiHX0OMOHdRzY3Cw1rdFzRN9 iESm1L9K/eI/nhIqzDWr/xCSb+7X1gU7vT9VJnb3IvSTP1hzqq5VGYtpmma2Y/tvRpHm 3FG7W7Bqe9nxgRkm2Fo0qjpkGfcSSJOesvqyL3Cb9c+Dqg0DrAg6Ol8mu9ww3L3G63Fl aIDT2yWMt/AEvjVQp0NB/lDl/OUq1hKjAG3vKysZwK4Vr4zmxv3DFV2de0kZgZ/UOKHS v6u5kcnpOkAE/Dg03Mc8+xCF7GICQoUJsTJ4cqKN4b7A+GO/R8ATC4noK8N9MAL2XDq1 y0kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=ktHH7m8Who63MTieJ5NQUhPFiFA8r834cISFAHdBmqI=; b=JJypbeyhEiO3f3TUJd1RPttiJTIg1DXVGpT3uSHjknSPuGjBxgy4BiRkdEogTXxnaH Rl70lnPidvf4Nt6qL8rmPqEofUaPJxaEdWy9IJfG1tEbU4M1BioK1Rx/pmtnikvVB6lr vuDfH3tOxxq23gXG9Ks7R9LrJiOYZioeL5yDGY/1aINnqRnGwUmsj8ZalZjMi7vGqXes HkZAZvlrC5Vq3X/mQHlmk9QUU07RadeiS0a8q7q5Md6p3fW23mv49ldJ1H+1a/4XfpYQ 7xERbgDUijUjlPyrB9rcDV/Y+tA0B7rfw965NUk/ljIUlQITU6+32Y3az7N53SV+DhSg vTgA== 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 193-20020a6303ca000000b004fba03ee686si16994843pgd.202.2023.03.22.11.47.27; Wed, 22 Mar 2023 11:47:40 -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 S231168AbjCVSoK (ORCPT + 99 others); Wed, 22 Mar 2023 14:44:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230127AbjCVSnj (ORCPT ); Wed, 22 Mar 2023 14:43:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 845702DE50 for ; Wed, 22 Mar 2023 11:43:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2A9E6B81DAA for ; Wed, 22 Mar 2023 18:43:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA993C4339E; Wed, 22 Mar 2023 18:43:35 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1pf3Qs-000pZ5-2z; Wed, 22 Mar 2023 14:43:34 -0400 Message-ID: <20230322184334.744106182@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 22 Mar 2023 14:42:45 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Florent Revest , Jiri Olsa Subject: [for-next][PATCH 06/11] ftrace: Make DIRECT_CALLS work WITH_ARGS and !WITH_REGS References: <20230322184239.594953818@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761094779453907736?= X-GMAIL-MSGID: =?utf-8?q?1761094779453907736?= From: Florent Revest Direct called trampolines can be called in two ways: - either from the ftrace callsite. In this case, they do not access any struct ftrace_regs nor pt_regs - Or, if a ftrace ops is also attached, from the end of a ftrace trampoline. In this case, the call_direct_funcs ops is in charge of setting the direct call trampoline's address in a struct ftrace_regs Since: commit 9705bc709604 ("ftrace: pass fregs to arch_ftrace_set_direct_caller()") The later case no longer requires a full pt_regs. It only needs a struct ftrace_regs so DIRECT_CALLS can work with both WITH_ARGS or WITH_REGS. With architectures like arm64 already abandoning WITH_REGS in favor of WITH_ARGS, it's important to have DIRECT_CALLS work WITH_ARGS only. Link: https://lkml.kernel.org/r/20230321140424.345218-7-revest@chromium.org Signed-off-by: Florent Revest Co-developed-by: Mark Rutland Signed-off-by: Mark Rutland Acked-by: Jiri Olsa Signed-off-by: Steven Rostedt (Google) --- include/linux/ftrace.h | 6 ++++++ kernel/trace/Kconfig | 2 +- kernel/trace/ftrace.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 6a532dd6789e..31f1e1df2af3 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -241,6 +241,12 @@ enum { FTRACE_OPS_FL_DIRECT = BIT(17), }; +#ifndef CONFIG_DYNAMIC_FTRACE_WITH_ARGS +#define FTRACE_OPS_FL_SAVE_ARGS FTRACE_OPS_FL_SAVE_REGS +#else +#define FTRACE_OPS_FL_SAVE_ARGS 0 +#endif + /* * FTRACE_OPS_CMD_* commands allow the ftrace core logic to request changes * to a ftrace_ops. Note, the requests may fail. diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index a856d4a34c67..5b1e7fa41ca8 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -257,7 +257,7 @@ config DYNAMIC_FTRACE_WITH_REGS config DYNAMIC_FTRACE_WITH_DIRECT_CALLS def_bool y - depends on DYNAMIC_FTRACE_WITH_REGS + depends on DYNAMIC_FTRACE_WITH_REGS || DYNAMIC_FTRACE_WITH_ARGS depends on HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS config DYNAMIC_FTRACE_WITH_CALL_OPS diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 3bef2abc037a..3b46dba3f69b 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5288,7 +5288,7 @@ static LIST_HEAD(ftrace_direct_funcs); static int register_ftrace_function_nolock(struct ftrace_ops *ops); -#define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_REGS) +#define MULTI_FLAGS (FTRACE_OPS_FL_DIRECT | FTRACE_OPS_FL_SAVE_ARGS) static int check_direct_multi(struct ftrace_ops *ops) {