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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F156C433EF for ; Wed, 15 Jun 2022 21:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349871AbiFOVRS (ORCPT ); Wed, 15 Jun 2022 17:17:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346840AbiFOVRR (ORCPT ); Wed, 15 Jun 2022 17:17:17 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B2B55535B; Wed, 15 Jun 2022 14:17:16 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id gl15so25663384ejb.4; Wed, 15 Jun 2022 14:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=acFZjeQbPbG/W+34Xt6CKod4UkLK3sFwa3+HWGx3msk=; b=Vct6bycomh7Zuwc1nNEWB+tZIt6sBAEXPeeCSRhhNxvmHJ3/EqVlnwk7jCzEPuwfCI rmk0eaIKSUnRmOw5ot1eQttjnvEkC/xD26Gb8fKJHRihDthnvU20c9IeXVN838eh6xzm PA7Yl5GNLx/RTEGxlQIc7lvZ/snGHPDu0U43cUT7aGL7CpbihSG8u0bv7TeSIvlr0TJk R8VGzRWh6zbM7BtEcltDtvVVGxjvnw49ebeE23MEk4DB3K9MsUdseXKkW0/jNTo9Gd1q q2qE74QtL6PcARyQ9pZwnmQ+h05p66ZLRCwTcrwBZu6C42Q/n4mihrIN6bsthI20JwAJ wbMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=acFZjeQbPbG/W+34Xt6CKod4UkLK3sFwa3+HWGx3msk=; b=DNczuDe7lrtZdUu85pm0KUClcjqIRY//eJZ2vMu+3F3jcAmkUglHLQS9343pHhO41c UFxLYKScB5bO0k7186cMJFa/R8WxYhZAGIXUKSBTCSOM4LxvyPp2Dgh0h4ubV5MOzYA/ CZUT5ynurcIorE4a6lr7NwwNJ90TBLaK1sNY7MPAL3sfU5FIaLVQ0YlrT2z+EoVRokp1 q62RY55v9Y9EzVAJ3ThzaS1Sf2NkCFGMA2Pxq2qN3nbrRPjzO4AqbS9wEQo96QRaYvta +7facCdihKnLXMY9DPY7XZsG1FcCIkDF101zoU6LxHj0bw1ZFx/Yz3n1skXm2nsI6rsz Z+vA== X-Gm-Message-State: AJIora81t81QlFRaa0sZeaDzbsmcQX+gOTtUmTON64yYV/wZh5nKKKWH 0cWd1Zpdv6+VrGhLajC0phwQlrA0hCfwfw== X-Google-Smtp-Source: AGRyM1tKL20v53GtHIu2rMxKfGU4pd5Wku1sc09EGB+bL6qXd45KyDc7dw0pXmW9KZA0yisR7HQgAw== X-Received: by 2002:a17:906:5e4c:b0:70a:4673:bdcc with SMTP id b12-20020a1709065e4c00b0070a4673bdccmr1533927eju.511.1655327835108; Wed, 15 Jun 2022 14:17:15 -0700 (PDT) Received: from erthalion.local (dslb-094-222-028-039.094.222.pools.vodafone-ip.de. [94.222.28.39]) by smtp.gmail.com with ESMTPSA id d18-20020a1709067f1200b00711eea3fa9bsm6756234ejr.42.2022.06.15.14.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 14:17:14 -0700 (PDT) From: Dmitrii Dolgov <9erthalion6@gmail.com> To: linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, songliubraving@fb.com, rostedt@goodmis.org, peterz@infradead.org, mingo@redhat.com, mhiramat@kernel.org, alexei.starovoitov@gmail.com Cc: Dmitrii Dolgov <9erthalion6@gmail.com> Subject: [PATCH v3 1/1] perf/kprobe: maxactive for fd-based kprobe Date: Wed, 15 Jun 2022 23:15:59 +0200 Message-Id: <20220615211559.7856-1-9erthalion6@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org From: Song Liu Enable specifying maxactive for fd based kretprobe. This will be useful for tracing tools like bcc and bpftrace (see for example discussion [1]). Use highest 12 bit (bit 52-63) to allow maximal maxactive of 4095. The original patch [2] seems to be fallen through the cracks and wasn't applied. I've merely rebased the work done by Song Liu and verififed it still works. Note that changes in rethook implementation may render maxactive obsolete. [1]: https://github.com/iovisor/bpftrace/issues/835 [2]: https://lore.kernel.org/all/20191007223111.1142454-1-songliubraving@fb.com/ Signed-off-by: Song Liu Signed-off-by: Dmitrii Dolgov <9erthalion6@gmail.com> --- Changes in v3: - Set correct author Changes in v2: - Fix comment about number bits for the offset include/linux/trace_events.h | 3 ++- kernel/events/core.c | 20 ++++++++++++++++---- kernel/trace/trace_event_perf.c | 5 +++-- kernel/trace/trace_kprobe.c | 4 ++-- kernel/trace/trace_probe.h | 2 +- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index e6e95a9f07a5..7ca453a73252 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -850,7 +850,8 @@ extern void perf_trace_destroy(struct perf_event *event); extern int perf_trace_add(struct perf_event *event, int flags); extern void perf_trace_del(struct perf_event *event, int flags); #ifdef CONFIG_KPROBE_EVENTS -extern int perf_kprobe_init(struct perf_event *event, bool is_retprobe); +extern int perf_kprobe_init(struct perf_event *event, bool is_retprobe, + int max_active); extern void perf_kprobe_destroy(struct perf_event *event); extern int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type, const char **symbol, diff --git a/kernel/events/core.c b/kernel/events/core.c index 23bb19716ad3..e8127f9b4df5 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9809,24 +9809,34 @@ static struct pmu perf_tracepoint = { * PERF_PROBE_CONFIG_IS_RETPROBE if set, create kretprobe/uretprobe * if not set, create kprobe/uprobe * - * The following values specify a reference counter (or semaphore in the - * terminology of tools like dtrace, systemtap, etc.) Userspace Statically - * Defined Tracepoints (USDT). Currently, we use 40 bit for the offset. + * PERF_UPROBE_REF_CTR_OFFSET_* specify a reference counter (or semaphore + * in the terminology of tools like dtrace, systemtap, etc.) Userspace + * Statically Defined Tracepoints (USDT). Currently, we use 32 bit for the + * offset. * * PERF_UPROBE_REF_CTR_OFFSET_BITS # of bits in config as th offset * PERF_UPROBE_REF_CTR_OFFSET_SHIFT # of bits to shift left + * + * PERF_KPROBE_MAX_ACTIVE_* defines max_active for kretprobe. + * KRETPROBE_MAXACTIVE_MAX is 4096. We allow 4095 here to save a bit. */ enum perf_probe_config { PERF_PROBE_CONFIG_IS_RETPROBE = 1U << 0, /* [k,u]retprobe */ PERF_UPROBE_REF_CTR_OFFSET_BITS = 32, PERF_UPROBE_REF_CTR_OFFSET_SHIFT = 64 - PERF_UPROBE_REF_CTR_OFFSET_BITS, + PERF_KPROBE_MAX_ACTIVE_BITS = 12, + PERF_KPROBE_MAX_ACTIVE_SHIFT = 64 - PERF_KPROBE_MAX_ACTIVE_BITS, }; PMU_FORMAT_ATTR(retprobe, "config:0"); #endif #ifdef CONFIG_KPROBE_EVENTS +/* KRETPROBE_MAXACTIVE_MAX is 4096, only allow 4095 here to save a bit */ +PMU_FORMAT_ATTR(max_active, "config:52-63"); + static struct attribute *kprobe_attrs[] = { + &format_attr_max_active.attr, &format_attr_retprobe.attr, NULL, }; @@ -9857,6 +9867,7 @@ static int perf_kprobe_event_init(struct perf_event *event) { int err; bool is_retprobe; + int max_active; if (event->attr.type != perf_kprobe.type) return -ENOENT; @@ -9871,7 +9882,8 @@ static int perf_kprobe_event_init(struct perf_event *event) return -EOPNOTSUPP; is_retprobe = event->attr.config & PERF_PROBE_CONFIG_IS_RETPROBE; - err = perf_kprobe_init(event, is_retprobe); + max_active = event->attr.config >> PERF_KPROBE_MAX_ACTIVE_SHIFT; + err = perf_kprobe_init(event, is_retprobe, max_active); if (err) return err; diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index a114549720d6..129000327809 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -245,7 +245,8 @@ void perf_trace_destroy(struct perf_event *p_event) } #ifdef CONFIG_KPROBE_EVENTS -int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) +int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe, + int max_active) { int ret; char *func = NULL; @@ -271,7 +272,7 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) tp_event = create_local_trace_kprobe( func, (void *)(unsigned long)(p_event->attr.kprobe_addr), - p_event->attr.probe_offset, is_retprobe); + p_event->attr.probe_offset, is_retprobe, max_active); if (IS_ERR(tp_event)) { ret = PTR_ERR(tp_event); goto out; diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 47cebef78532..3ad30cfce9c3 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1784,7 +1784,7 @@ static int unregister_kprobe_event(struct trace_kprobe *tk) /* create a trace_kprobe, but don't add it to global lists */ struct trace_event_call * create_local_trace_kprobe(char *func, void *addr, unsigned long offs, - bool is_return) + bool is_return, int max_active) { enum probe_print_type ptype; struct trace_kprobe *tk; @@ -1799,7 +1799,7 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs, event = func ? func : "DUMMY_EVENT"; tk = alloc_trace_kprobe(KPROBE_EVENT_SYSTEM, event, (void *)addr, func, - offs, 0 /* maxactive */, 0 /* nargs */, + offs, max_active, 0 /* nargs */, is_return); if (IS_ERR(tk)) { diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index 92cc149af0fd..26fe21980793 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -376,7 +376,7 @@ extern int traceprobe_set_print_fmt(struct trace_probe *tp, enum probe_print_typ #ifdef CONFIG_PERF_EVENTS extern struct trace_event_call * create_local_trace_kprobe(char *func, void *addr, unsigned long offs, - bool is_return); + bool is_return, int max_active); extern void destroy_local_trace_kprobe(struct trace_event_call *event_call); extern struct trace_event_call * -- 2.32.0