Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp1169547pxb; Fri, 21 Jan 2022 11:20:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJw6dwlStrOkWx2CJrt8410o7CjkfDW1CHEsxP8elKE/TsQkf4r2quMKQsMJkgJ1Fva7eN2G X-Received: by 2002:a17:902:a3c8:b0:14a:e524:b41b with SMTP id q8-20020a170902a3c800b0014ae524b41bmr5349895plb.2.1642792815699; Fri, 21 Jan 2022 11:20:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642792815; cv=none; d=google.com; s=arc-20160816; b=ZD7FOQpdrAw/ObB8+FyT/UD6CGIX8BKuMqv2CvUwZUfPMIBFITwncREMclq2p2Of9i HH3s4NsHfcJ9iRiOjo12094wIVmzzAYmmezItEjaX0MdptivnwjcnBwZcu8vgcM5oqp5 kc09WalkseIL5OUxzq+JunUrE3W3uJxC7CwnYnzhosfPffSWNI/6qBcFwtsVUW/NpSxs QKzHP8BRDukb47E92OptuXOefWWYmNth8ZnX6oUFIwzHATvCaeoYW3/8hSrGqvasnzPC hRYKJgglwoFACVTiMWMSDRKPnS5E0mIw05DD0sd7XRa1TBi8tqGCD39nDJEBhTtrYAKd Q73A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CvXcM+LUwJ1e/sknrqw4idlb3rXOP6/YG7Yc9NGTMQ0=; b=Ypwy8rIeP7nqVmARMoz/7ZiY6cwrHy7sPETwKxpft5ye+cQv8SsICFqXR2mmYNNb8B qLJ9iXiMJXZbgl99u+1AJy1Pw1qu5NBind/N3BpflufqENMp3Umd9AECRUq2RgepXBCV LUCrpD665kE80wXX+hS9ieikP4AvlcYD1Cxvqwfe1lWWbvfXgSllRR1gbetygcutcXqL 2xjpZIFBft2JqkWHeLFh7FYwCHju2qkSzHgTDuJyyFwR3xuydwQmALuWfk3Mvywy/9rb hVwgsMW4Y4IEwTNFNboHrWPXRuZU2OmzzZBhS2xbh+Uhc/UTZSQz8ziePGOk7X0ud4zo //LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="fnKYB/8o"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s33si6570248pgm.603.2022.01.21.11.20.03; Fri, 21 Jan 2022 11:20:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="fnKYB/8o"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355339AbiASO5E (ORCPT + 99 others); Wed, 19 Jan 2022 09:57:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355317AbiASO5C (ORCPT ); Wed, 19 Jan 2022 09:57:02 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0D09C06161C; Wed, 19 Jan 2022 06:57:02 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 5243D61325; Wed, 19 Jan 2022 14:57:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D45CC340E1; Wed, 19 Jan 2022 14:56:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642604221; bh=UtmrQUg+QHgTKYr+YTBSAKpCMIVJ0RQetp9r0O+nF90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fnKYB/8oWfpE52JfTUvJegRytrpM5SZ6nHyz4vVJN+HO3juBSqqnOeYW/bpLBrH+v mx22GqSTcrk08L04NSe5lP1aGCoGK1+904FMSDF8avHnygegdpUJ8p1KznTyRbcD+M sFf7C4yC2aLnakWFzb6nDzXiroU6cTe6oewO9Hk3YU99DusMUoowqPzWKR9Vnjh185 nAfz8zSyAYs70iUfZswY0bRQKrMACCTi+z0UCp4krtI2sIZlCKvpAEOnoN+hcvF0vp yy/u+SxKZmSWImHtvZReQysKrCHOWs2dwY9gt+PRd93Eg9Nbu3oBw3QDm2QEPcmza2 7m3umk6yHxRUw== From: Masami Hiramatsu To: Jiri Olsa , Alexei Starovoitov Cc: Daniel Borkmann , Andrii Nakryiko , Masami Hiramatsu , netdev@vger.kernel.org, bpf@vger.kernel.org, lkml , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Steven Rostedt , "Naveen N . Rao" , Anil S Keshavamurthy , "David S . Miller" Subject: [RFC PATCH v3 2/9] fprobe: Add ftrace based probe APIs Date: Wed, 19 Jan 2022 23:56:56 +0900 Message-Id: <164260421611.657731.15819765180139836537.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <164260419349.657731.13913104835063027148.stgit@devnote2> References: <164260419349.657731.13913104835063027148.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The fprobe is a wrapper API for ftrace function tracer. Unlike kprobes, this probes only supports the function entry, but it can probe multiple functions by one fprobe. The usage is almost same as the kprobe, user will specify the function names by fprobe::syms, the number of syms by fprobe::nentry, and the user handler by fprobe::entry_handler. struct fprobe fp = { 0 }; const char *targets[] = { "func1", "func2", "func3"}; fp.handler = user_handler; fp.nentry = ARRAY_SIZE(targets); fp.syms = targets; ret = register_fprobe(&fp); Signed-off-by: Masami Hiramatsu --- Changes in v3: - Update kerneldocs. --- include/linux/fprobe.h | 80 +++++++++++++++++++++++++++++++++ kernel/trace/Kconfig | 10 ++++ kernel/trace/Makefile | 1 kernel/trace/fprobe.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 208 insertions(+) create mode 100644 include/linux/fprobe.h create mode 100644 kernel/trace/fprobe.c diff --git a/include/linux/fprobe.h b/include/linux/fprobe.h new file mode 100644 index 000000000000..2fc487d933e3 --- /dev/null +++ b/include/linux/fprobe.h @@ -0,0 +1,80 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Simple ftrace probe wrapper */ +#ifndef _LINUX_FPROBE_H +#define _LINUX_FPROBE_H + +#include +#include + +/** + * struct fprobe - ftrace based probe. + * @syms: The array of symbols to probe. + * @addrs: The array of address of the symbols. + * @nentry: The number of entries of @syms or @addrs. + * @ftrace: The ftrace_ops. + * @nmissed: The counter for missing events. + * @flags: The status flag. + * @entry_handler: The callback function for function entry. + * + * User must set either @syms or @addrs, but not both. If user sets + * only @syms, the @addrs are generated when registering the fprobe. + * That auto-generated @addrs will be freed when unregistering. + */ +struct fprobe { + const char **syms; + unsigned long *addrs; + unsigned int nentry; + + struct ftrace_ops ftrace; + unsigned long nmissed; + unsigned int flags; + void (*entry_handler)(struct fprobe *fp, unsigned long entry_ip, struct pt_regs *regs); +}; + +#define FPROBE_FL_DISABLED 1 + +static inline bool fprobe_disabled(struct fprobe *fp) +{ + return (fp) ? fp->flags & FPROBE_FL_DISABLED : false; +} + +#ifdef CONFIG_FPROBE +int register_fprobe(struct fprobe *fp); +int unregister_fprobe(struct fprobe *fp); +#else +static inline int register_fprobe(struct fprobe *fp) +{ + return -EOPNOTSUPP; +} +static inline int unregister_fprobe(struct fprobe *fp) +{ + return -EOPNOTSUPP; +} +#endif + +/** + * disable_fprobe() - Disable fprobe + * @fp: The fprobe to be disabled. + * + * This will soft-disable @fp. Note that this doesn't remove the ftrace + * hooks from the function entry. + */ +static inline void disable_fprobe(struct fprobe *fp) +{ + if (fp) + fp->flags |= FPROBE_FL_DISABLED; +} + +/** + * enable_fprobe() - Enable fprobe + * @fp: The fprobe to be enabled. + * + * This will soft-enable @fp. + */ +static inline void enable_fprobe(struct fprobe *fp) +{ + if (fp) + fp->flags &= ~FPROBE_FL_DISABLED; +} + +#endif diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 420ff4bc67fd..6834b0272798 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -223,6 +223,16 @@ config DYNAMIC_FTRACE_WITH_ARGS depends on DYNAMIC_FTRACE depends on HAVE_DYNAMIC_FTRACE_WITH_ARGS +config FPROBE + bool "Kernel Function Probe (fprobe)" + depends on FUNCTION_TRACER + depends on DYNAMIC_FTRACE_WITH_REGS + default n + help + This option enables kernel function probe feature, which is + similar to kprobes, but probes only for kernel function entries + and it can probe multiple functions by one fprobe. + config FUNCTION_PROFILER bool "Kernel function profiler" depends on FUNCTION_TRACER diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index bedc5caceec7..79255f9de9a4 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -97,6 +97,7 @@ obj-$(CONFIG_PROBE_EVENTS) += trace_probe.o obj-$(CONFIG_UPROBE_EVENTS) += trace_uprobe.o obj-$(CONFIG_BOOTTIME_TRACING) += trace_boot.o obj-$(CONFIG_FTRACE_RECORD_RECURSION) += trace_recursion_record.o +obj-$(CONFIG_FPROBE) += fprobe.o obj-$(CONFIG_TRACEPOINT_BENCHMARK) += trace_benchmark.o diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c new file mode 100644 index 000000000000..8b068deadc48 --- /dev/null +++ b/kernel/trace/fprobe.c @@ -0,0 +1,117 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * fprobe - Simple ftrace probe wrapper for function entry. + */ +#define pr_fmt(fmt) "fprobe: " fmt + +#include +#include +#include +#include +#include + +static void fprobe_handler(unsigned long ip, unsigned long parent_ip, + struct ftrace_ops *ops, struct ftrace_regs *fregs) +{ + struct fprobe *fp; + int bit; + + fp = container_of(ops, struct fprobe, ftrace); + if (fprobe_disabled(fp)) + return; + + bit = ftrace_test_recursion_trylock(ip, parent_ip); + if (bit < 0) { + fp->nmissed++; + return; + } + + if (fp->entry_handler) + fp->entry_handler(fp, ip, ftrace_get_regs(fregs)); + + ftrace_test_recursion_unlock(bit); +} +NOKPROBE_SYMBOL(fprobe_handler); + +static int convert_func_addresses(struct fprobe *fp) +{ + unsigned int i; + + if (!fp->syms) + return 0; + + fp->addrs = kcalloc(fp->nentry, sizeof(*fp->addrs), GFP_KERNEL); + if (!fp->addrs) + return -ENOMEM; + + for (i = 0; i < fp->nentry; i++) { + + fp->addrs[i] = kallsyms_lookup_name(fp->syms[i]); + if (!fp->addrs[i]) + return -ENOENT; + } + + return 0; +} + +/** + * register_fprobe() - Register fprobe to ftrace + * @fp: A fprobe data structure to be registered. + * + * This expects the user set @fp::entry_handler, @fp::syms or @fp:addrs, + * and @fp::nentry. + * Note that you do not set both of @fp::addrs and @fp::syms. + */ +int register_fprobe(struct fprobe *fp) +{ + int ret; + + if (!fp || !fp->nentry || (!fp->syms && !fp->addrs) || + (fp->syms && fp->addrs)) + return -EINVAL; + + ret = convert_func_addresses(fp); + if (ret < 0) + return ret; + + fp->nmissed = 0; + fp->ftrace.func = fprobe_handler; + fp->ftrace.flags = FTRACE_OPS_FL_SAVE_REGS; + + ret = ftrace_set_filter_ips(&fp->ftrace, fp->addrs, fp->nentry, 0, 0); + if (!ret) + ret = register_ftrace_function(&fp->ftrace); + + if (ret < 0 && fp->syms) { + kfree(fp->addrs); + fp->addrs = NULL; + } + + return ret; +} +EXPORT_SYMBOL_GPL(register_fprobe); + +/** + * unregister_fprobe() - Unregister fprobe from ftrace + * @fp: A fprobe data structure to be unregistered. + * + * Unregister fprobe (and remove ftrace hooks from the function entries). + * If the @fp::addrs are generated by register_fprobe(), it will be removed + * automatically. + */ +int unregister_fprobe(struct fprobe *fp) +{ + int ret; + + if (!fp || !fp->nentry || !fp->addrs) + return -EINVAL; + + ret = unregister_ftrace_function(&fp->ftrace); + + if (!ret && fp->syms) { + kfree(fp->addrs); + fp->addrs = NULL; + } + return ret; +} +EXPORT_SYMBOL_GPL(unregister_fprobe);