From patchwork Wed Feb 1 16:34:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florent Revest X-Patchwork-Id: 51473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp381068wrn; Wed, 1 Feb 2023 08:38:59 -0800 (PST) X-Google-Smtp-Source: AK7set/U6dknERCAT9b5Tcqhy7mLaw6Z+m0IRitOAdrPwksFqZ7+SC1yI7StrQMD492hkMRmXqvp X-Received: by 2002:a17:906:5286:b0:881:7e85:915d with SMTP id c6-20020a170906528600b008817e85915dmr2490971ejm.13.1675269539434; Wed, 01 Feb 2023 08:38:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675269539; cv=none; d=google.com; s=arc-20160816; b=gq3o+VHybSHcBU/MSRAErglqpQaV2Ue0xMSMrwBAZAhtmBRllAerC6+Iz0B8GwSNdj aeWu8hpi9zSI95qpYTvSCS7lqFuz9GZ6PGDawO5bq/UXM6RnwHR2SSzvayV42G1+f9+7 Vnt0wooOcpAc5HYrMJjgj9wx956E1KEaBg70//Z9MDSJB+MLGpdXrdTpwx7813T2CDxi 7jdkh14xtShrZL9nr9oSjvaO1ZeDkyzH6F1S/PkelNmSz5KkfY9lVvKkYVaJXdk/MLc7 Ll/lQ3rFHdm0LZ7s/yIt2GcseVoD5Pd/2tIZ2/+lpMHV0L13tZPiEvCcbYfYUXP7QxRs UyBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=V920tXDgaE7z8bCeiKLUkBejFiJJs4xj6S06IJdrTDo=; b=XIaJu7QgFa4CvR+XBLDNB2HOuJZie2eIbUtAENnYEiLpgZP8PLlRKay2efd4Ybw8Z2 dQ4ZbEhGVF5cMYQ/CmRx92uL4/u1NngTpE+piUZCaJJm99fPWfwzsyIUZbGx0yBqfkPo 8vLIEOJU7kbKCvMP6UbKZYme6TGYcDPhIDUHQSxHINaVJBOPtT1qaC2VChEPIpnq3B+o xznqtcB5gGuCFwmWj46Z4Ff6cc5JGWv9xluYZ8g33JBftqLdadMlhWzvDyQ+q1kUQuyh PbMtPgBAXLvhFEPAEIqNaPgWnLzCumM8XPNARhOWfRJgJrNBOpOYjYEzIAsnFy5aDtlI wFRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=DYuGfqui; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ge21-20020a170907909500b0088db807b22csi2505246ejb.117.2023.02.01.08.38.35; Wed, 01 Feb 2023 08:38:59 -0800 (PST) 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; dkim=pass header.i=@chromium.org header.s=google header.b=DYuGfqui; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232446AbjBAQfx (ORCPT + 99 others); Wed, 1 Feb 2023 11:35:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232462AbjBAQfr (ORCPT ); Wed, 1 Feb 2023 11:35:47 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21FA49024 for ; Wed, 1 Feb 2023 08:35:31 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id n13so6114061wmr.4 for ; Wed, 01 Feb 2023 08:35:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V920tXDgaE7z8bCeiKLUkBejFiJJs4xj6S06IJdrTDo=; b=DYuGfqui4JmugKay/2snlgInuN8NoSZVoexURJTLb8Kn8f4JIyvQgTexs4woxHNsnz wO8Z6dafnQ/XbyCE2eZZeApXulDjM44aq8GV5zcg7oNuhHSxUTyM5itzgz5nZpMAO8jf QGTjtSgg4ehtaz3yn7QunU2caI+VvbmJ2wS54= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V920tXDgaE7z8bCeiKLUkBejFiJJs4xj6S06IJdrTDo=; b=G8qd004QECfmIZr2BxyP3UQBxSxQALQpOXJiIWGvqWHyRqi0HthMnyffCBCQ3X6zUS POEH+CgA3KpDdkyVBLURzlzkgzhR9j690hw5LK92x2vV2kXZJMewRMFS7dvxK6w6f0Ww OFvCjbfHEsTITbzM9n5xkg7Ii8F0Ou2HVJ2/z1AmK/6q8ruMQl8Al5Im/X61j8srzJLb q/ESLc+Mgn4LxMRGwXMMAKw/hO8Wbl2vnCAwUbCddaTnz7xVpmu5SDLryH7NApMb38Xt I+FMeuIs6E17UfKxRg64mBAmQVSpDqQ4yaqwBA01nbxfxN/SS87u+VcQIZamPxiN29wZ kWgA== X-Gm-Message-State: AO0yUKUN71CKs4rx8NFX1m6qq9JLI7iil36E0g27FgXc695Ogq8lWByx wFMVdfN8GxPMnbru3ygzQGMYKg== X-Received: by 2002:a05:600c:2e06:b0:3dd:dd46:1274 with SMTP id o6-20020a05600c2e0600b003dddd461274mr2822832wmf.4.1675269329591; Wed, 01 Feb 2023 08:35:29 -0800 (PST) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:4399:89a1:4a86:9630]) by smtp.gmail.com with ESMTPSA id r38-20020a05600c322600b003dd7edcc960sm2058522wmp.45.2023.02.01.08.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 08:35:29 -0800 (PST) From: Florent Revest To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: catalin.marinas@arm.com, will@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@kernel.org, jolsa@kernel.org, xukuohai@huaweicloud.com, Florent Revest Subject: [PATCH 5/8] ftrace: Make DIRECT_CALLS work WITH_ARGS and !WITH_REGS Date: Wed, 1 Feb 2023 17:34:17 +0100 Message-Id: <20230201163420.1579014-6-revest@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230201163420.1579014-1-revest@chromium.org> References: <20230201163420.1579014-1-revest@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756647432980532427?= X-GMAIL-MSGID: =?utf-8?q?1756647432980532427?= 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 "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. Signed-off-by: Florent Revest --- kernel/trace/Kconfig | 2 +- kernel/trace/ftrace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 5df427a2321d..4496a7c69810 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 b0426de11c45..73b6f6489ba1 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5282,7 +5282,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) static int check_direct_multi(struct ftrace_ops *ops) {