From patchwork Thu Oct 28 12:08:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589967 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18485C433F5 for ; Thu, 28 Oct 2021 12:09:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED3AE610F8 for ; Thu, 28 Oct 2021 12:09:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230240AbhJ1MLk (ORCPT ); Thu, 28 Oct 2021 08:11:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbhJ1MLj (ORCPT ); Thu, 28 Oct 2021 08:11:39 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3C8DC061570 for ; Thu, 28 Oct 2021 05:09:12 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id w1so4939778edd.0 for ; Thu, 28 Oct 2021 05:09:12 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=3XhVp4JSBUV8SttFoyd78ipydqoXFBMe4lekUcLa+WI=; b=q0zlotN7kvA2aDpK1XVgJHCajTQS9gpK1QNErliHh9wYWrXq8NxSMvH+sy0QHWnKCr ArJDlxNk1534CioxHmSEsVM8alP5ARG4UXpKLCiIxA5AZ0XdaXyaCLgqDusZy6v1j/DP jcYgt846Hz4mdRVMHGFtO0XspqDsCUCHhhtQMCZBFRFx89bREO33QJTa4VrYYqk45B5T O6NS3T9MRPQrGGZ0KCBJEv7LnfJllZ8aT+Zp+U8AJ+xdDhqsAJTXFx5LfXFCf2ZYfVGH WwR+n/zIPdp2xHaF38Dpdtc6S0PtOyDGxWVB6KneTEpXuPgD5s2RWrlvjp8vU7qIl+e+ wcYQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3XhVp4JSBUV8SttFoyd78ipydqoXFBMe4lekUcLa+WI=; b=V1JCgq3VZVspnWykboysK20Ulu+IIKJbo5VJI3cGRgvO53WNpCwq0ZjeetYz/YYkkA MIhBXaUXv3JDgxk0Kl3Vq7ZuSjUU5BCzJ8s3hWHQyOsQf8WvRAJtdOQoS0CH+dnJPe/H lsGkEY9qyh1psnRtlYiOWs9l8Xy/uSXeJVwEYUPVToze1sE5Y7d/GizLAkrL406cP8En 9unK5XZnB5tNU3d5eCpHBTw2/oTZZcN5wgjzsZA7hQndELmokXhHov7QPAuMyN9qxQYM DHhx4NfyjytdF317AR1wq/+KjvCC6cs5t+/41R/oDy3TNIzDGmLfV7l+UJSzjoecskkZ DxFg== X-Gm-Message-State: AOAM532XLkYqLRZZDOcTVXGHNqyDj5D1Xy5ig/km86/2D4+QyS9JDPBG /jqXdo1eKdYEkiYHF4IG+KUQE7x6wXcFjg== X-Google-Smtp-Source: ABdhPJxX8lAX9IPg8PFekRaijxOUEccQKTYh1oRUFxnMrI1ENx9wEU/rfhHf2XSP9x3h6UlJ4qKZUg== X-Received: by 2002:a50:d802:: with SMTP id o2mr5299690edj.331.1635422951251; Thu, 28 Oct 2021 05:09:11 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:10 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 01/12] libtracefs: Add new internal APIs for dynamic events Date: Thu, 28 Oct 2021 15:08:56 +0300 Message-Id: <20211028120907.101847-2-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Ftrace supports dynamic events, created by the user - kprobes, uprobes, eprobes and synthetic events. There are two interfaces for managing these events - new common "dynamic_events" file and event specific "kprobe_events", "uprobe_events", "synthetic_events" files. The configuration syntax for all dynamic events is almost the same. To simplify support of dynamic events in thw tracefs library, a new internal helper layer is implemented. It handles both configuration interfaces - the common "dynamic_events" file is preferred, if available. On the old kernels, where this file is missing, the event specific files are used. The new helper layer can be used to create, delete and get ftrace dynamic events form any type. Most of the APIs are internal, not exposed to the library users. Only one API is exposed publicly: tracefs_dynevent_list_free() This new logic is designed to be used internally within the library, from the APIs that implement kprobes, uprobes, eprobes and synthetic events support. Signed-off-by: Tzvetomir Stoyanov (VMware) --- include/tracefs-local.h | 34 +++ include/tracefs.h | 3 + src/Makefile | 1 + src/tracefs-dynevents.c | 463 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 501 insertions(+) create mode 100644 src/tracefs-dynevents.c diff --git a/include/tracefs-local.h b/include/tracefs-local.h index 684eccf..f15896f 100644 --- a/include/tracefs-local.h +++ b/include/tracefs-local.h @@ -94,4 +94,38 @@ int synth_add_start_field(struct tracefs_synth *synth, const char *start_field, const char *name, enum tracefs_hist_key_type type); + +/* Internal interface for ftrace dynamic events */ +#define DYNEVENT_ADD_BIT(M, B) ((M) |= (1ULL<<(B))) +#define DYNEVENT_CHECK_BIT(M, B) ((M)&(1ULL<<(B))) + +enum trace_dynevent_type { + TRACE_DYNEVENT_KPROBE = 0, + TRACE_DYNEVENT_KRETPROBE, + TRACE_DYNEVENT_UPROBE, + TRACE_DYNEVENT_URETPROBE, + TRACE_DYNEVENT_EPROBE, + TRACE_DYNEVENT_SYNTH, + TRACE_DYNEVENT_MAX, +}; + +struct tracefs_dynevent { + char *trace_file; + char *prefix; + char *system; + char *event; + char *address; + char *format; + enum trace_dynevent_type type; +}; + +struct tracefs_dynevent * +dynevent_alloc(enum trace_dynevent_type type, const char *system, + const char *event, const char *address, const char *format); +void dynevent_free(struct tracefs_dynevent *devent); +int dynevent_create(struct tracefs_dynevent *devent); +int dynevent_destroy(struct tracefs_dynevent *devent); +int dynevent_get_all(unsigned long type_mask, const char *system, + struct tracefs_dynevent ***ret_events); + #endif /* _TRACE_FS_LOCAL_H */ diff --git a/include/tracefs.h b/include/tracefs.h index a2cda30..4020551 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -238,6 +238,9 @@ ssize_t tracefs_trace_pipe_stream(int fd, struct tracefs_instance *instance, int ssize_t tracefs_trace_pipe_print(struct tracefs_instance *instance, int flags); void tracefs_trace_pipe_stop(struct tracefs_instance *instance); +struct tracefs_dynevent; +void tracefs_dynevent_list_free(struct tracefs_dynevent ***events); + enum tracefs_kprobe_type { TRACEFS_ALL_KPROBES, TRACEFS_KPROBE, diff --git a/src/Makefile b/src/Makefile index 4e38d98..99cd7da 100644 --- a/src/Makefile +++ b/src/Makefile @@ -11,6 +11,7 @@ OBJS += tracefs-marker.o OBJS += tracefs-kprobes.o OBJS += tracefs-hist.o OBJS += tracefs-filter.o +OBJS += tracefs-dynevents.o # Order matters for the the three below OBJS += sqlhist-lex.o diff --git a/src/tracefs-dynevents.c b/src/tracefs-dynevents.c new file mode 100644 index 0000000..68ee95a --- /dev/null +++ b/src/tracefs-dynevents.c @@ -0,0 +1,463 @@ +// SPDX-License-Identifier: LGPL-2.1 +/* + * Copyright (C) 2021 VMware Inc, Steven Rostedt + * + * Updates: + * Copyright (C) 2021, VMware, Tzvetomir Stoyanov + * + */ +#include +#include +#include +#include +#include +#include +#include + +#include "tracefs.h" +#include "tracefs-local.h" + +#define DYNEVENTS_EVENTS "dynamic_events" +#define KPROBE_EVENTS "kprobe_events" +#define UPROBE_EVENTS "uprobe_events" +#define SYNTH_EVENTS "synthetic_events" +#define DYNEVENTS_DEFAULT_GROUP "dynamic" +#define RETPROBE_DEFAUL_PREFIX "r:" + +struct dyn_events_desc; +static int dyn_generic_parse(struct dyn_events_desc *, + const char *, char *, struct tracefs_dynevent **); +static int dyn_synth_parse(struct dyn_events_desc *, + const char *, char *, struct tracefs_dynevent **); +static int dyn_generic_del(struct dyn_events_desc *, struct tracefs_dynevent *); +static int dyn_synth_del(struct dyn_events_desc *, struct tracefs_dynevent *); + +struct dyn_events_desc { + enum trace_dynevent_type type; + const char *file; + const char *prefix; + int (*dyn_events_del)(struct dyn_events_desc *desc, struct tracefs_dynevent *dyn); + int (*dyn_events_parse)(struct dyn_events_desc *desc, const char *group, + char *line, struct tracefs_dynevent **ret_dyn); +} dynevents[TRACE_DYNEVENT_MAX] = { + {TRACE_DYNEVENT_KPROBE, NULL, "p:", dyn_generic_del, dyn_generic_parse}, + {TRACE_DYNEVENT_KRETPROBE, NULL, "r", dyn_generic_del, dyn_generic_parse}, + {TRACE_DYNEVENT_UPROBE, NULL, "p:", dyn_generic_del, dyn_generic_parse}, + {TRACE_DYNEVENT_URETPROBE, NULL, "r", dyn_generic_del, dyn_generic_parse}, + {TRACE_DYNEVENT_EPROBE, NULL, "e:", dyn_generic_del, dyn_generic_parse}, + {TRACE_DYNEVENT_SYNTH, NULL, "s:", dyn_synth_del, dyn_synth_parse}, +}; + +int dyn_generic_del(struct dyn_events_desc *desc, struct tracefs_dynevent *dyn) +{ + char *str; + int ret; + + if (dyn->system) + ret = asprintf(&str, "-:%s/%s", dyn->system, dyn->event); + else + ret = asprintf(&str, "-:%s", dyn->event); + + if (ret < 0) + return -1; + + ret = tracefs_instance_file_append(NULL, desc->file, str); + free(str); + + return ret < 0 ? ret : 0; +} + +__hidden void dynevent_free(struct tracefs_dynevent *devent) +{ + if (!devent) + return; + free(devent->system); + free(devent->event); + free(devent->address); + free(devent->format); + free(devent->prefix); + free(devent->trace_file); + free(devent); +} + +static int dyn_generic_parse(struct dyn_events_desc *desc, const char *group, + char *line, struct tracefs_dynevent **ret_dyn) +{ + struct tracefs_dynevent *dyn; + char *address; + char *system; + char *format; + char *event; + + if (strncmp(line, desc->prefix, strlen(desc->prefix))) + return -1; + + system = strchr(line, ':'); + if (!system) + return -1; + event = strchr(line, '/'); + if (!event) + return -1; + address = strchr(line, ' '); + if (!address) + return -1; + format = strchr(address+1, ' '); + + *address = '\0'; + *event = '\0'; + + /* KPROBEs and UPROBEs share the same prefix, check the format */ + if (desc->type == TRACE_DYNEVENT_UPROBE || desc->type == TRACE_DYNEVENT_URETPROBE) { + if (!strchr(format, '/')) + return -1; + } + if (group && strcmp(group, system+1) != 0) + return -1; + + if (!ret_dyn) + return 0; + + dyn = calloc(1, sizeof(*dyn)); + if (!dyn) + return -1; + dyn->type = desc->type; + dyn->trace_file = strdup(desc->file); + if (!dyn->trace_file) + goto error; + dyn->system = strdup(system+1); + if (!dyn->system) + goto error; + *(system+1) = '\0'; + /* Prefix of KRETPROBE can contain MAXACTIVE integer */ + dyn->prefix = strdup(line); + if (!dyn->prefix) + goto error; + dyn->event = strdup(event+1); + if (!dyn->event) + goto error; + if (desc->type == TRACE_DYNEVENT_SYNTH) { + /* Synthetic events have no address */ + dyn->format = strdup(address+1); + if (!dyn->format) + goto error; + } else { + if (format) + *format = '\0'; + dyn->address = strdup(address+1); + if (!dyn->address) + goto error; + if (format) { + dyn->format = strdup(format+1); + if (!dyn->format) + goto error; + } + } + *ret_dyn = dyn; + return 0; +error: + dynevent_free(dyn); + return -1; +} + +int dyn_synth_del(struct dyn_events_desc *desc, struct tracefs_dynevent *dyn) +{ + char *str; + int ret; + + if (strcmp(desc->file, DYNEVENTS_EVENTS)) + return dyn_generic_del(desc, dyn); + + ret = asprintf(&str, "!%s", dyn->event); + if (ret < 0) + return -1; + + ret = tracefs_instance_file_append(NULL, desc->file, str); + free(str); + + return ret < 0 ? ret : 0; +} + +static int dyn_synth_parse(struct dyn_events_desc *desc, const char *group, + char *line, struct tracefs_dynevent **ret_dyn) +{ + struct tracefs_dynevent *dyn; + char *format; + + if (strcmp(desc->file, DYNEVENTS_EVENTS)) + return dyn_generic_parse(desc, group, line, ret_dyn); + + /* synthetic_events file has slightly different syntax */ + format = strchr(line, ' '); + if (!format) + return -1; + if (!ret_dyn) + return 0; + + *format = '\0'; + dyn = calloc(1, sizeof(*dyn)); + if (!dyn) + return -1; + dyn->type = desc->type; + dyn->trace_file = strdup(desc->file); + if (!dyn->trace_file) + goto error; + + dyn->event = strdup(line); + if (!dyn->event) + goto error; + dyn->format = strdup(format+1); + if (!dyn->format) + goto error; + + *ret_dyn = dyn; + return 0; +error: + dynevent_free(dyn); + return -1; +} + +static struct dyn_events_desc *get_devent_desc(enum trace_dynevent_type type) +{ + static bool init; + int i; + + if (init) + goto out; + + init = true; + /* Use ftrace dynamic_events, if available */ + if (tracefs_file_exists(NULL, DYNEVENTS_EVENTS)) { + for (i = 0; i < TRACE_DYNEVENT_MAX; i++) + dynevents[i].file = DYNEVENTS_EVENTS; + goto out; + } + + if (tracefs_file_exists(NULL, KPROBE_EVENTS)) { + dynevents[TRACE_DYNEVENT_KPROBE].file = KPROBE_EVENTS; + dynevents[TRACE_DYNEVENT_KRETPROBE].file = KPROBE_EVENTS; + } + if (tracefs_file_exists(NULL, UPROBE_EVENTS)) { + dynevents[TRACE_DYNEVENT_UPROBE].file = UPROBE_EVENTS; + dynevents[TRACE_DYNEVENT_URETPROBE].file = UPROBE_EVENTS; + } + if (tracefs_file_exists(NULL, SYNTH_EVENTS)) { + dynevents[TRACE_DYNEVENT_SYNTH].file = SYNTH_EVENTS; + dynevents[TRACE_DYNEVENT_SYNTH].prefix = ""; + } + +out: + return &dynevents[type]; +} + +__hidden struct tracefs_dynevent * +dynevent_alloc(enum trace_dynevent_type type, const char *system, + const char *event, const char *address, const char *format) +{ + struct tracefs_dynevent *devent; + struct dyn_events_desc *desc; + + if (!event) { + errno = EINVAL; + return NULL; + } + + desc = get_devent_desc(type); + if (!desc || !desc->file) { + errno = ENOTSUP; + return NULL; + } + + devent = calloc(1, sizeof(*devent)); + if (!devent) + return NULL; + + devent->type = type; + devent->trace_file = strdup(desc->file); + if (!devent->trace_file) + goto err; + if (!system) + system = DYNEVENTS_DEFAULT_GROUP; + devent->system = strdup(system); + if (!devent->system) + goto err; + devent->event = strdup(event); + if (!devent->event) + goto err; + if (type == TRACE_DYNEVENT_KRETPROBE || type == TRACE_DYNEVENT_URETPROBE) + devent->prefix = strdup(RETPROBE_DEFAUL_PREFIX); + else + devent->prefix = strdup(desc->prefix); + + if (!devent->prefix) + goto err; + if (address) { + devent->address = strdup(address); + if (!devent->address) + goto err; + } + if (format) { + devent->format = strdup(format); + if (!devent->format) + goto err; + } + + return devent; +err: + dynevent_free(devent); + return NULL; +} + +__hidden int dynevent_create(struct tracefs_dynevent *devent) +{ + char *str; + int ret; + + if (!devent) + return -1; + if (devent->system && devent->system[0]) + ret = asprintf(&str, "%s%s/%s %s %s\n", + devent->prefix, devent->system, devent->event, + devent->address?devent->address:"", + devent->format?devent->format:""); + else + ret = asprintf(&str, "%s%s %s %s\n", + devent->prefix, devent->event, + devent->address?devent->address:"", + devent->format?devent->format:""); + if (ret < 0) + return -1; + ret = tracefs_instance_file_append(NULL, devent->trace_file, str); + free(str); + + return ret < 0 ? ret : 0; +} + +__hidden int dynevent_destroy(struct tracefs_dynevent *devent) +{ + struct dyn_events_desc *desc; + + if (!devent) + return -1; + desc = get_devent_desc(devent->type); + if (!desc) + return -1; + return desc->dyn_events_del(desc, devent); +} + +static int get_all_type(enum trace_dynevent_type type, const char *system, + struct tracefs_dynevent ***ret_all) +{ + struct dyn_events_desc *desc; + struct tracefs_dynevent *devent, **tmp, **all = NULL; + char *content; + int count = 0; + char *line; + char *next; + int ret; + + desc = get_devent_desc(type); + if (!desc) + return -1; + + content = tracefs_instance_file_read(NULL, desc->file, NULL); + if (!content) + return -1; + line = content; + do { + next = strchr(line, '\n'); + if (next) + *next = '\0'; + ret = desc->dyn_events_parse(desc, system, line, ret_all ? &devent : NULL); + if (!ret) { + if (ret_all) { + tmp = realloc(all, (count+1)*sizeof(struct tracefs_dynevent *)); + if (!tmp) + goto error; + all = tmp; + all[count] = devent; + } + count++; + } + line = next + 1; + } while (next); + + free(content); + if (ret_all) + *ret_all = all; + return count; + +error: + free(content); + free(all); + return -1; +} + +/** + * tracefs_dynevent_list_free - Deletes an array of pointers to dynamic event contexts + * @events: An array of pointers to dynamic event contexts. The last element of the array + * must be a NULL pointer. + */ +void tracefs_dynevent_list_free(struct tracefs_dynevent ***events) +{ + struct tracefs_dynevent **devent; + int i = 0; + + if (!events || !(*events)) + return; + + devent = *events; + while (devent[i]) + dynevent_free(devent[i++]); + + free(*events); +} + +__hidden int dynevent_get_all(unsigned long type_mask, const char *system, + struct tracefs_dynevent ***ret_events) +{ + struct tracefs_dynevent **events, **tmp, **all_events = NULL; + int count, all = 0; + int i; + + for (i = 0; i < TRACE_DYNEVENT_MAX; i++) { + if (!DYNEVENT_CHECK_BIT(type_mask, i)) + continue; + count = get_all_type(i, system, ret_events ? &events : NULL); + if (count > 0) { + if (ret_events) { + tmp = realloc(all_events, + (all + count)*sizeof(struct tracefs_dynevent *)); + if (!tmp) + goto error; + all_events = tmp; + memcpy(all_events + all, events, + count*sizeof(struct tracefs_dynevent *)); + } + all += count; + } + + } + + if (ret_events) { + /* Add a NULL pointer at the end */ + if (all > 0) { + tmp = realloc(all_events, + (all + 1)*sizeof(struct tracefs_dynevent *)); + if (!tmp) + goto error; + all_events = tmp; + all_events[all] = NULL; + } + *ret_events = all_events; + } + + return all; + +error: + if (all_events) { + for (i = 0; i < all; i++) + free(all_events[i]); + free(all_events); + } + return -1; +} From patchwork Thu Oct 28 12:08:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589969 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48188C433F5 for ; Thu, 28 Oct 2021 12:09:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2EB5260F90 for ; Thu, 28 Oct 2021 12:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230264AbhJ1MLm (ORCPT ); Thu, 28 Oct 2021 08:11:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbhJ1MLl (ORCPT ); Thu, 28 Oct 2021 08:11:41 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A95AC061570 for ; Thu, 28 Oct 2021 05:09:14 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id 5so23268221edw.7 for ; Thu, 28 Oct 2021 05:09:14 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=s27DRwdzMZn1X7JsHj+RWkGbryG9TpWSXANqEscYviw=; b=SQeISJlnaerShnhZE/W/mkQoF+ATyhx0UsMwzPuDi9sJF3pKM9noF199nEQnQ4Qdpw kNKvYKPfds8QmV3teOSHt5/tMQDWbS9dMgvgII9AGHNtB07gQ1mpyDVcnorb6FpLJJN7 H90IfWlDSrYK4AwRKy89mRPn8F1yVSqK9rwP1xBDVSbHQQDNBo/b2FKupyTSo7oXaDfp 5GH8BiaPVpcwy/VAQ4V/YGze/HNZ5xO6ffxOu5jNgKNCtlQ1UzEG9OtJ63fhvRqe3jX7 utMfkV7UtU9QX1WujOpjce8SBlOPRgfwBZJaRt3gVyt+ZKM2c7YbMZQAs2OM8yEonH8f 9x1Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=s27DRwdzMZn1X7JsHj+RWkGbryG9TpWSXANqEscYviw=; b=q8iyCzelN1XOJt6icAyWyAkHQt8mAw+RyICCbAXD7snEZ9z7WJdJD7PsMXxfoYghXC j6y2CsxliFcljDF/nIXPtZ4OIPJQeMY6wqiDsWglFEwgXFebMBPDZTVEcxPNE8I22uE+ wKLqXcNoJyUj6McXU1sILsSLLcV+SOcj/oItOADzQ0L8z0v+JOFMcUvC2pszJThpsCrO 7Uyi8DLyS+Lav3ZkgppSrass7UWJ6JheMgnifRdGddu9MdIK8AbbOZCMsbJtAsaHC6V1 RJf6ArlOs0BaItYzwFNz6bQc+H0zsavzgq37NJAN6iu2zbVVYoxFDOF0uEjcn+Ne1dfW Th4A== X-Gm-Message-State: AOAM531/DJ/J41R4MIPXDfXJmqu01tudTqWFCyXLctIprYKm4WY6HJf9 gIJU6FjQmk5eVkiq9vmPH+uw0uXxS0se8w== X-Google-Smtp-Source: ABdhPJwcvNTLmhbx8v+ICXawLjb1MxXm3cvQh2WagnDF+WkOgZrlQ7Bf6/++wUhb0EIYWxZWdiJk/Q== X-Received: by 2002:a50:e089:: with SMTP id f9mr5643408edl.290.1635422952543; Thu, 28 Oct 2021 05:09:12 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:11 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 02/12] libtracefs: Rename tracefs_get_kprobes API Date: Thu, 28 Oct 2021 15:08:57 +0300 Message-Id: <20211028120907.101847-3-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The names of tracefs API should follow the same pattern: tracefs_XXX_ Rename tracefs_get_kprobes() to tracefs_kprobes_get() to be consistent with that pattern. Signed-off-by: Tzvetomir Stoyanov (VMware) --- Documentation/libtracefs-kprobes.txt | 8 ++++---- include/tracefs.h | 2 +- src/tracefs-kprobes.c | 6 +++--- utest/tracefs-utest.c | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/libtracefs-kprobes.txt b/Documentation/libtracefs-kprobes.txt index c10576e..ca48fa9 100644 --- a/Documentation/libtracefs-kprobes.txt +++ b/Documentation/libtracefs-kprobes.txt @@ -3,7 +3,7 @@ libtracefs(3) NAME ---- -tracefs_kprobe_raw, tracefs_kretprobe_raw, tracefs_get_kprobes, tracefs_kprobe_info, tracefs_kprobe_clear_all, tracefs_kprobe_clear_probe - Create, list, and destroy kprobes +tracefs_kprobe_raw, tracefs_kretprobe_raw, tracefs_kprobes_get, tracefs_kprobe_info, tracefs_kprobe_clear_all, tracefs_kprobe_clear_probe - Create, list, and destroy kprobes SYNOPSIS -------- @@ -13,7 +13,7 @@ SYNOPSIS int tracefs_kprobe_raw(const char pass:[*]system, const char pass:[*]event, const char pass:[*]addr, const char pass:[*]format); int tracefs_kretprobe_raw(const char pass:[*]system, const char pass:[*]event, const char pass:[*]addr, const char pass:[*]format); -char pass:[*]pass:[*]tracefs_get_kprobes(enum tracefs_kprobe_type type); +char pass:[*]pass:[*]tracefs_kprobes_get(enum tracefs_kprobe_type type); enum tracefs_kprobe_type tracefs_kprobe_info(const char pass:[*]group, const char pass:[*]event, char pass:[*]pass:[*]type, char pass:[*]pass:[*]addr, char pass:[*]pass:[*]format); enum tracefs_kprobe_type tracefs_kprobe_type(const char pass:[*]group, const char pass:[*]event) @@ -36,7 +36,7 @@ document. creates a kretprobe instead of a kprobe. The difference is also described in the Linux kernel source in the Documentation/trace/kprobetrace.rst file. -*tracefs_get_kprobes*() returns an array of strings (char pass:[*]) that contain +*tracefs_kprobes_get*() returns an array of strings (char pass:[*]) that contain the registered kprobes and kretprobes depending on the given _type_. If _type_ is TRACEFS_ALL_KPROBES, then all kprobes found are returned. If _type_ is TRACEFS_KPROBE, then only normal kprobes are returned. If _type_ is @@ -76,7 +76,7 @@ If a parsing error occurs on *tracefs_kprobe_raw*() or *tracefs_kretprobe_raw*() then *tracefs_error_last*(3) may be used to retrieve the error message explaining the parsing issue. -*tracefs_get_kprobes*() returns an allocate string list of allocated strings +*tracefs_kprobes_get*() returns an allocate string list of allocated strings on success that must be freed with *tracefs_list_free*(3) and returns NULL on error. diff --git a/include/tracefs.h b/include/tracefs.h index 4020551..0240aef 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -251,7 +251,7 @@ int tracefs_kprobe_raw(const char *system, const char *event, const char *addr, const char *format); int tracefs_kretprobe_raw(const char *system, const char *event, const char *addr, const char *format); -char **tracefs_get_kprobes(enum tracefs_kprobe_type type); +char **tracefs_kprobes_get(enum tracefs_kprobe_type type); enum tracefs_kprobe_type tracefs_kprobe_info(const char *group, const char *event, char **type, char **addr, char **format); int tracefs_kprobe_clear_all(bool force); diff --git a/src/tracefs-kprobes.c b/src/tracefs-kprobes.c index 6fdd8f9..d4c5f9e 100644 --- a/src/tracefs-kprobes.c +++ b/src/tracefs-kprobes.c @@ -158,7 +158,7 @@ static int parse_kprobe(char *content, char **saveptr, } /** - * tracefs_get_kprobes - return a list kprobes (by group/event name) + * tracefs_kprobes_get - return a list kprobes (by group/event name) * @type: The type of kprobes to return. * * If @type is TRACEFS_ALL_KPROBES all kprobes in the kprobe_events @@ -174,7 +174,7 @@ static int parse_kprobe(char *content, char **saveptr, * only a NULL pointer. * On error, NULL is returned. */ -char **tracefs_get_kprobes(enum tracefs_kprobe_type type) +char **tracefs_kprobes_get(enum tracefs_kprobe_type type) { char **list = NULL; char *content; @@ -357,7 +357,7 @@ static int kprobe_clear_probes(const char *group, bool force) int ret; int i; - kprobe_list = tracefs_get_kprobes(TRACEFS_ALL_KPROBES); + kprobe_list = tracefs_kprobes_get(TRACEFS_ALL_KPROBES); if (!kprobe_list) return -1; diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c index 09bb8f2..7c1a84e 100644 --- a/utest/tracefs-utest.c +++ b/utest/tracefs-utest.c @@ -583,7 +583,7 @@ static void test_instance_file(void) free(kaddr); free(kformat); - kprobes = tracefs_get_kprobes(TRACEFS_ALL_KPROBES); + kprobes = tracefs_kprobes_get(TRACEFS_ALL_KPROBES); CU_TEST(kprobes != NULL); for (i = 0; kprobes[i]; i++) { @@ -612,7 +612,7 @@ static void test_instance_file(void) tracefs_list_free(kprobes); CU_TEST(i == 3); - kprobes = tracefs_get_kprobes(TRACEFS_KPROBE); + kprobes = tracefs_kprobes_get(TRACEFS_KPROBE); CU_TEST(kprobes != NULL); for (i = 0; kprobes[i]; i++) { @@ -631,7 +631,7 @@ static void test_instance_file(void) tracefs_list_free(kprobes); CU_TEST(i == 2); - kprobes = tracefs_get_kprobes(TRACEFS_KRETPROBE); + kprobes = tracefs_kprobes_get(TRACEFS_KRETPROBE); CU_TEST(kprobes != NULL); for (i = 0; kprobes[i]; i++) { @@ -663,7 +663,7 @@ static void test_instance_file(void) ret = tracefs_kprobe_clear_probe(KPROBE_2_GROUP, NULL, true); CU_TEST(ret == 0); - kprobes = tracefs_get_kprobes(TRACEFS_ALL_KPROBES); + kprobes = tracefs_kprobes_get(TRACEFS_ALL_KPROBES); CU_TEST(kprobes != NULL); for (i = 0; kprobes[i]; i++) { @@ -682,7 +682,7 @@ static void test_instance_file(void) ret = tracefs_kprobe_clear_all(true); CU_TEST(ret == 0); - kprobes = tracefs_get_kprobes(TRACEFS_ALL_KPROBES); + kprobes = tracefs_kprobes_get(TRACEFS_ALL_KPROBES); CU_TEST(kprobes != NULL); CU_TEST(kprobes[0] == NULL); From patchwork Thu Oct 28 12:08:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589979 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B210C433FE for ; Thu, 28 Oct 2021 12:09:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FA76610FC for ; Thu, 28 Oct 2021 12:09:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230293AbhJ1MLr (ORCPT ); Thu, 28 Oct 2021 08:11:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbhJ1MLp (ORCPT ); Thu, 28 Oct 2021 08:11:45 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B843FC0613B9 for ; Thu, 28 Oct 2021 05:09:18 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id r4so23322657edi.5 for ; Thu, 28 Oct 2021 05:09:18 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=WsoLxa8cLX9iZenPySJS5HYfuk7OataG2QLlzHuauiM=; b=nrsyi5DCjSiMo+BiZiOmT2hTdND/9a8488jhzsO2Vk9o3Sh3jKnaDHqNQacd74H+cD yPZCekxWNeoMJTcllYS6LCtnXf/61casH/pOg33w9N7TZ8Irg1QQ1MEl0yIzhglDXC6G kgdtd9mHycvsvmJEkHN/FZGK2KHXS/k0+gMsNlVPJKuJbXIMvRYBptMcjHnZsPsB02YE dqfV3MfY65Gj6D8PS49y8g9toGafWLx7+8EtomYKrEIyOQrGz0n6M1i7+REMXgz3bRke q77aEkItqTWfoHH+1oyKwb0sjmsJf3nrSil601Pfwhv78nFQrfzzfE9Ztcply0qYIUnb FUTA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WsoLxa8cLX9iZenPySJS5HYfuk7OataG2QLlzHuauiM=; b=PvNCBffC9bO2JvPQ2SNm7I13GDt2n9jV7YI/XpKsvOg2uQ6SE6I4mPbwFv+jpGqRy6 bNwaRwx4cvtYCB9KjsIW5sU6ExN4xLJ2LAre49pmg649kLiI440stQidA35CFcxsaEmr IeGf7F7P+zwDL1O05nKq7Vt1iOuL888cuptsYSw5Tf5BZQqORXFak1iqU5NuQPchzImX 4vLDTi/YKkn+eLMSNNsz8UFPkEoc/BGwdKF/9SHhZ5OwWz9VjTX0G65b/61rgZF5VKd9 gE2fDWNTOlceroGbOJi2pXXvIH/GkP66FuPO4VmhxH3qfkLvVGvHr4kRg7NahzLYUHrP zDPg== X-Gm-Message-State: AOAM530OMWi3eGQL+4vklBdIpKH4/2E3Xd0gEw99fLvmD9FaNMdErT9u IZO9uqrv5kUiTpas4Dd/4Np4F0tMHzW4Mg== X-Google-Smtp-Source: ABdhPJwfRK9lJf6ss+Q4hm8RBy3AJmccbTbGxBnRoJlP5zjXEZ8hypGR/5PgKfQ7hGNK0DeBqkh9XA== X-Received: by 2002:a50:9b4b:: with SMTP id a11mr5673881edj.316.1635422953427; Thu, 28 Oct 2021 05:09:13 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:12 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 03/12] libtracefs: New kprobes APIs Date: Thu, 28 Oct 2021 15:08:58 +0300 Message-Id: <20211028120907.101847-4-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In order to be consistent with the other APIs, a new set of kprobe APIs is introduced: tracefs_kprobe_alloc(); tracefs_kretprobe_alloc(); tracefs_kprobe_create(); tracefs_kprobe_destroy(); tracefs_kprobe_free(); These APIs work with kprobe context, represented by the tracefs_dynevent structure. Signed-off-by: Tzvetomir Stoyanov (VMware) --- include/tracefs.h | 8 ++ src/tracefs-kprobes.c | 169 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) diff --git a/include/tracefs.h b/include/tracefs.h index 0240aef..e7d545c 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -247,6 +247,14 @@ enum tracefs_kprobe_type { TRACEFS_KRETPROBE, }; +struct tracefs_dynevent * +tracefs_kprobe_alloc(const char *system, const char *event, const char *addr, const char *format); +struct tracefs_dynevent * +tracefs_kretprobe_alloc(const char *system, const char *event, + const char *addr, const char *format, int max); +int tracefs_kprobe_create(struct tracefs_dynevent *kprobe); +int tracefs_kprobe_destroy(struct tracefs_dynevent *kprobe, bool force); +void tracefs_kprobe_free(struct tracefs_dynevent *kprobe); int tracefs_kprobe_raw(const char *system, const char *event, const char *addr, const char *format); int tracefs_kretprobe_raw(const char *system, const char *event, diff --git a/src/tracefs-kprobes.c b/src/tracefs-kprobes.c index d4c5f9e..80dc327 100644 --- a/src/tracefs-kprobes.c +++ b/src/tracefs-kprobes.c @@ -20,6 +20,135 @@ #define KPROBE_EVENTS "kprobe_events" #define KPROBE_DEFAULT_GROUP "kprobes" +static struct tracefs_dynevent * +kprobe_alloc(enum trace_dynevent_type type, const char *system, const char *event, + const char *addr, const char *format) +{ + struct tracefs_dynevent *kp; + const char *sys = system; + const char *ename = event; + char *tmp; + + if (!addr || !format) { + errno = EBADMSG; + return NULL; + } + if (!sys) + sys = KPROBE_DEFAULT_GROUP; + + if (!event) { + ename = strdup(addr); + if (!ename) + return NULL; + tmp = strchr(ename, ':'); + if (tmp) + *tmp = '\0'; + } + + kp = dynevent_alloc(type, sys, ename, addr, format); + if (!event) + free((char *)ename); + if (!kp) + return NULL; + return kp; +} + + +/** + * tracefs_kprobe_alloc - Allocate new kprobe context + * @system: The system name (NULL for the default kprobes) + * @event: The event to create (NULL to use @addr for the event) + * @addr: The function and offset (or address) to insert the probe + * @format: The format string to define the probe. + * + * Allocate a kprobe context that will be in the @system group (or kprobes if + * @system is NULL). Have the name of @event (or @addr if @event is + * NULL). Will be inserted to @addr (function name, with or without + * offset, or a address). And the @format will define the format + * of the kprobe. See the Linux documentation file under: + * Documentation/trace/kprobetrace.rst + * The kprobe is not created in the system. + * + * Return a pointer to a kprobe context on success, or NULL on error. + * The returned pointer must be freed with tracefs_kprobe_free() + * + * errno will be set to EBADMSG if addr or format is NULL. + */ +struct tracefs_dynevent * +tracefs_kprobe_alloc(const char *system, const char *event, const char *addr, const char *format) + +{ + return kprobe_alloc(TRACE_DYNEVENT_KPROBE, system, event, addr, format); +} + +/** + * tracefs_kretprobe_alloc - Allocate new kretprobe context + * @system: The system name (NULL for the default kprobes) + * @event: The event to create (NULL to use @addr for the event) + * @addr: The function and offset (or address) to insert the retprobe + * @format: The format string to define the retprobe. + * + * Allocate a kretprobe that will be in the @system group (or kprobes if + * @system is NULL). Have the name of @event (or @addr if @event is + * NULL). Will be inserted to @addr (function name, with or without + * offset, or a address). And the @format will define the raw format + * of the kprobe. See the Linux documentation file under: + * Documentation/trace/kprobetrace.rst + * The kretprobe is not created in the system. + * + * Return a pointer to a kprobe context on success, or NULL on error. + * The returned pointer must be freed with tracefs_kprobe_free() + * + * errno will be set to EBADMSG if addr or format is NULL. + */ +struct tracefs_dynevent * +tracefs_kretprobe_alloc(const char *system, const char *event, + const char *addr, const char *format, int max) +{ + struct tracefs_dynevent *kp; + int ret; + + kp = kprobe_alloc(TRACE_DYNEVENT_KRETPROBE, system, event, addr, format); + if (!kp) + return NULL; + if (max) { + free(kp->prefix); + kp->prefix = NULL; + ret = asprintf(&kp->prefix, "r%d:", max); + if (ret < 0) + goto error; + } + + return kp; +error: + dynevent_free(kp); + return NULL; +} + +/** + * tracefs_kprobe_create - Create a kprobe or kretprobe in the system + * @kprobe: Pointer to a kprobe context, describing the probe + * + * Return 0 on success, or -1 on error. + */ +int tracefs_kprobe_create(struct tracefs_dynevent *kprobe) +{ + return dynevent_create(kprobe); +} + +/** + * tracefs_kprobe_free - Free a kprobe context + * @kprobe: Pointer to a kprobe context + * + * The kprobe/kretprobe, described by this context, is not + * removed from the system by this API. It only frees the memory. + */ +void tracefs_kprobe_free(struct tracefs_dynevent *kprobe) +{ + dynevent_free(kprobe); +} + + static int insert_kprobe(const char *type, const char *system, const char *event, const char *addr, const char *format) @@ -474,3 +603,43 @@ int tracefs_kprobe_clear_probe(const char *system, const char *event, bool force return ret < 0 ? -1 : 0; } + +/** + * tracefs_kprobe_destroy - Remove a kprobe or kretprobe from the system + * @kprobe: A kprobe context, describing the kprobe that will be deleted. + * If NULL, all kprobes and kretprobes in the system will be deleted + * @force: Will attempt to disable all kprobe events and clear them + * + * The kprobe/kretprobe context is not freed by this API. + * It only removes the probe from the system. + * + * Return 0 on success, or -1 on error. + */ +int tracefs_kprobe_destroy(struct tracefs_dynevent *kprobe, bool force) +{ + char **instance_list; + int ret; + + if (!kprobe) { + if (tracefs_instance_file_clear(NULL, KPROBE_EVENTS) == 0) + return 0; + if (!force) + return -1; + /* Attempt to disable all kprobe events */ + return kprobe_clear_probes(NULL, force); + } + + /* + * Since we know we are disabling a specific event, try + * to disable it first before clearing it. + */ + if (force) { + instance_list = tracefs_instances(NULL); + disable_events(kprobe->system, kprobe->event, instance_list); + tracefs_list_free(instance_list); + } + + ret = dynevent_destroy(kprobe); + + return ret < 0 ? -1 : 0; +} From patchwork Thu Oct 28 12:08:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589971 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8585EC433FE for ; Thu, 28 Oct 2021 12:09:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D93C610F8 for ; Thu, 28 Oct 2021 12:09:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230274AbhJ1MLn (ORCPT ); Thu, 28 Oct 2021 08:11:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230265AbhJ1MLn (ORCPT ); Thu, 28 Oct 2021 08:11:43 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 620AEC061570 for ; Thu, 28 Oct 2021 05:09:16 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id f8so2278736edy.4 for ; Thu, 28 Oct 2021 05:09: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=y0cW1T41hmSx1fhsT025xt2zuivyWD0bEQof68DZI7g=; b=TN3x9TsT7fL1HJe6twpKb8e5UD0QPdv78IqRd/nvAsXqQBSgAhdKVbvbpTV89Hpjc0 iTp3lHV773PF7V6hThEvgyMTRA8y1Js7C8ScY7oZrLq0MXyU66hA0j4GyrxzSsmV0LX5 nyoFHLPBUa/H+lRMM4lVoPxLGjqajm18YJ3J/gfssmPb6fCdaCnLQNUXqnnDjSLebLFF IV+dXtsfoS8HBks0/dZdMLojS7fXH+3p8Yjz1mWzhjmAxwKXBYGCNy55BVVanZ1pKVUA WFgkT8tzftTkrPLRpqkA/EJKA7aLcGEF8oovV8jV4zn8dAln/KXJxkPkydnAzWuoZvbX 9rfA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=y0cW1T41hmSx1fhsT025xt2zuivyWD0bEQof68DZI7g=; b=PIEe7cr2VjGLX0iCMcDXxEb3mVgEzbHNU72D3PtHIUwZBkS1uojIoVxznOsAvEgjEI v2xGuwRxS/V8VQWLx2UXJxgOi51/CI8MeB6prH+yOpijgsYB7G/ki+7SUHc4FPk/AW+l FGmr6PTkynu0ogGsEwhcPxtfVkgQUbLoke5enRKseulIeofz6MqYAjtfI4jjrLGmp3tm zhH5/qaFQhzhZDBHyIkHicNUMnIMzD8jfuzeCQg4vR+bmTDpots0YTXiddDwz6o9dqad gm1dVA9KMI0KwTCFJtD2MvVzgEc1+2A8VLg2e1GqFRAoNwvXCKuJm/IYRk0UnPVBOAlT tb/Q== X-Gm-Message-State: AOAM531i/86zhLwgEimrfqVvhqbi4w8CMY0w5oh/Lq4UskLY9+PlFWcf tLYR/2cZdRE//iKKF5+666Y= X-Google-Smtp-Source: ABdhPJxwD8XJeo9pTei7De1BAyy9rcmx808SQx0wusDcRVPKtJIa/s2CFcdEzd2sooBD73uh5PEgvg== X-Received: by 2002:a05:6402:17c4:: with SMTP id s4mr5604445edy.253.1635422954307; Thu, 28 Oct 2021 05:09:14 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:13 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 04/12] libtracefs: Remove redundant kprobes APIs Date: Thu, 28 Oct 2021 15:08:59 +0300 Message-Id: <20211028120907.101847-5-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The newly introduced API tracefs_kprobe_destroy() can be used to clear a specific kprobe or all kprobes from the system. These legacy APIs are removed as redundant: tracefs_kprobe_clear_all(); tracefs_kprobe_clear_probe(); There is one functionality, missing in the new API - clearing all kprobes from specific system only. If this is needed, tracefs_kprobe_destroy() can be extended with that use case. Signed-off-by: Tzvetomir Stoyanov (VMware) --- include/tracefs.h | 2 -- src/tracefs-kprobes.c | 62 ------------------------------------------- 2 files changed, 64 deletions(-) diff --git a/include/tracefs.h b/include/tracefs.h index e7d545c..c7b9179 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -262,8 +262,6 @@ int tracefs_kretprobe_raw(const char *system, const char *event, char **tracefs_kprobes_get(enum tracefs_kprobe_type type); enum tracefs_kprobe_type tracefs_kprobe_info(const char *group, const char *event, char **type, char **addr, char **format); -int tracefs_kprobe_clear_all(bool force); -int tracefs_kprobe_clear_probe(const char *system, const char *event, bool force); enum tracefs_hist_key_type { TRACEFS_HIST_KEY_NORMAL = 0, diff --git a/src/tracefs-kprobes.c b/src/tracefs-kprobes.c index 80dc327..1e08b75 100644 --- a/src/tracefs-kprobes.c +++ b/src/tracefs-kprobes.c @@ -542,68 +542,6 @@ static int kprobe_clear_probes(const char *group, bool force) return ret; } -/** - * tracefs_kprobe_clear_all - clear kprobe events - * @force: Will attempt to disable all kprobe events and clear them - * - * Will remove all defined kprobe events. If any of them are enabled, - * and @force is not set, then it will error with -1 and errno to be - * EBUSY. If @force is set, then it will attempt to disable all the kprobe - * events in all instances, and try again. - * - * Returns zero on success, -1 otherwise. - */ -int tracefs_kprobe_clear_all(bool force) -{ - if (tracefs_instance_file_clear(NULL, KPROBE_EVENTS) == 0) - return 0; - - if (!force) - return -1; - - /* Attempt to disable all kprobe events */ - return kprobe_clear_probes(NULL, force); -} - -/** - * tracefs_kprobe_clear_all - clear kprobe events - * @system: System to clear (NULL means default) - * @event: Name of probe to clear in system (NULL for all probes in system) - * @force: Will attempt to disable all kprobe events and clear them - * - * Will remove the kprobes that match the @system and @event. If @system - * is NULL, then "kprobes" is used and will ignore all other system - * groups of kprobes. The @event is NULL then all events under the given - * @system are removed, otherwise only the event that matches. - * - * Returns zero on success, -1 otherwise. - */ -int tracefs_kprobe_clear_probe(const char *system, const char *event, bool force) -{ - char **instance_list; - int ret; - - if (!system) - system = "kprobes"; - - if (!event) - return kprobe_clear_probes(system, force); - - /* - * Since we know we are disabling a specific event, try - * to disable it first before clearing it. - */ - if (force) { - instance_list = tracefs_instances(NULL); - disable_events(system, event, instance_list); - tracefs_list_free(instance_list); - } - - ret = clear_kprobe(system, event); - - return ret < 0 ? -1 : 0; -} - /** * tracefs_kprobe_destroy - Remove a kprobe or kretprobe from the system * @kprobe: A kprobe context, describing the kprobe that will be deleted. From patchwork Thu Oct 28 12:09:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589975 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 759D8C433EF for ; Thu, 28 Oct 2021 12:09:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E9D1610CA for ; Thu, 28 Oct 2021 12:09:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230265AbhJ1MLq (ORCPT ); Thu, 28 Oct 2021 08:11:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbhJ1MLo (ORCPT ); Thu, 28 Oct 2021 08:11:44 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C259C061570 for ; Thu, 28 Oct 2021 05:09:17 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id g10so23644703edj.1 for ; Thu, 28 Oct 2021 05:09:17 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=fRAAQ15U8EMiL+7gPZYm4PDX3yI+I2zZVefNxYlW4K8=; b=iE4vjsQS0SKQjs+9jC8JtUUyfyjlKPmR+6ym2zXhP5pCUf/nVy0/soNXX4qEHBITOD CVT9KUBUlT8n7/Y9V9aETeSqZyY3kIQSS3k7f77qSQBVPatpn6MhRDe54sftpx1YLnbV u7jB5onuMP+MvuMMLyNIV1cNzywG1DIKJPAUyaY7GSl8kcz/O9WrJBAkofA6j8Murb6c xm4oHgZkGXPWsFXj8HZ8ysNL3emSAvEMkYVRDAHrduC9adMSRqBDFRHY7nyFDDrLppC2 HcdhWIDnZ29nVyEy4EjrdTZPg0Nnw6oj95uWEmyfKc2QZtYu4BRzlPL7fEqBpcnuHFDJ imaA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=fRAAQ15U8EMiL+7gPZYm4PDX3yI+I2zZVefNxYlW4K8=; b=iElZdBSigemu90BYsv/Cn2cxDFoXrrrUCUffqjL/WnlLowbXYSkWnln6GRWJiqxvM9 BKeU98WlLecYuyXUyhCA8SzwHFyRC3/tP7d/OgFtkxI0JboWZVfhtGSB73Jkb+hS7VBT jI3HFcs1q9Geo3ZCGbk8eegjQ6edCJoeDDbqdvpcbZvNe9mOdv5TjqVfFATqBCL0cG6H WmPbkEGMs+nB0ljQ8LKt4ccRV6CAMxtV/SddKw9NI6tX9pmQWoHVw/OeWDdUYfttV2dg zgC2RWQKpuK8Ge9ZanU6/1v1oorMqi8LE/s9oqK/6jvwjDnxZUJL0CtVzJpSA/uIbiCa VtQA== X-Gm-Message-State: AOAM532lUp6mOce2ffjb40AQ2NKwDcTSvmPpcVehrzCIIjKudUgfrlYr CmSbXPr5yjQDPQ7he5Ke1wmFYEX3JwC19Q== X-Google-Smtp-Source: ABdhPJzOMd/U5/2e/O+4DWOWdvKniwiGY3bO7B5xM9N8dS+sUApS+oSKCDtk6dSmVCojpsxpkrfSBQ== X-Received: by 2002:a50:d8ce:: with SMTP id y14mr5692831edj.92.1635422955130; Thu, 28 Oct 2021 05:09:15 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:14 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 05/12] libtracefs: Reimplement tracefs_kprobes_get API Date: Thu, 28 Oct 2021 15:09:00 +0300 Message-Id: <20211028120907.101847-6-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In order to unify the code and reuse the internal helpers for dynamic events helpers, the tracefs_kprobes_get() API is reimplemented using the new dynamic events APIs. Signed-off-by: Tzvetomir Stoyanov (VMware) --- include/tracefs.h | 2 +- src/tracefs-kprobes.c | 127 +++++++++++------------------------------- 2 files changed, 33 insertions(+), 96 deletions(-) diff --git a/include/tracefs.h b/include/tracefs.h index c7b9179..d4ac8fb 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -259,7 +259,7 @@ int tracefs_kprobe_raw(const char *system, const char *event, const char *addr, const char *format); int tracefs_kretprobe_raw(const char *system, const char *event, const char *addr, const char *format); -char **tracefs_kprobes_get(enum tracefs_kprobe_type type); +int tracefs_kprobes_get(enum tracefs_kprobe_type type, struct tracefs_dynevent ***kprobes); enum tracefs_kprobe_type tracefs_kprobe_info(const char *group, const char *event, char **type, char **addr, char **format); diff --git a/src/tracefs-kprobes.c b/src/tracefs-kprobes.c index 1e08b75..2e24051 100644 --- a/src/tracefs-kprobes.c +++ b/src/tracefs-kprobes.c @@ -287,77 +287,32 @@ static int parse_kprobe(char *content, char **saveptr, } /** - * tracefs_kprobes_get - return a list kprobes (by group/event name) + * tracefs_kprobes_get - return an array of pointers to kprobes * @type: The type of kprobes to return. + * @kprobes: return, array of pointers to kprobes * - * If @type is TRACEFS_ALL_KPROBES all kprobes in the kprobe_events - * are returned. Otherwise if it is TRACEFS_KPROBE, then only + * If @type is TRACEFS_ALL_KPROBES all kprobes in the system are returned. + * Otherwise if it is TRACEFS_KPROBE, then only * normal kprobes (p:) are returned, or if type is TRACEFS_KRETPROBE * then only kretprobes (r:) are returned. * - * Returns a list of strings that contain the kprobes that exist - * in the kprobe_events files. The strings returned are in the - * "group/event" format. - * The list must be freed with tracefs_list_free(). - * If there are no kprobes, a list is still returned, but it contains - * only a NULL pointer. - * On error, NULL is returned. + * In case of an error, -1 is returned and @kprobes is not modified. + * In case of success, the count of requested kprobes is returned. An array of + * pointers to kprobes is allocated and returned in @kprobes. The size of this array + * is the returned count + 1, as the last element is a NULL pointer. The array must be + * freed with tracefs_dynevent_list_free(). + * The @kprobes parameter is optional. If NULL is passed, only the count of the kprobes is returned. */ -char **tracefs_kprobes_get(enum tracefs_kprobe_type type) +int tracefs_kprobes_get(enum tracefs_kprobe_type type, struct tracefs_dynevent ***kprobes) { - char **list = NULL; - char *content; - char *saveptr; - char *event; - char *ktype; - int ret; - - errno = 0; - content = tracefs_instance_file_read(NULL, KPROBE_EVENTS, NULL); - if (!content) { - if (errno) - return NULL; - /* content is NULL on empty file, return an empty list */ - return trace_list_create_empty(); - } + unsigned long mask = 0; - ret = parse_kprobe(content, &saveptr, &ktype, NULL, &event, NULL, NULL); - - while (!ret) { - char **tmp; - - if (type != TRACEFS_ALL_KPROBES) { - switch (*ktype) { - case 'p': - if (type != TRACEFS_KPROBE) - goto next; - break; - case 'r': - if (type != TRACEFS_KRETPROBE) - goto next; - break; - default: - goto next; - } - } - - tmp = tracefs_list_add(list, event); - if (!tmp) - goto fail; - list = tmp; - next: - ret = parse_kprobe(NULL, &saveptr, &ktype, NULL, &event, NULL, NULL); - } + if (type == TRACEFS_KPROBE || type == TRACEFS_ALL_KPROBES) + DYNEVENT_ADD_BIT(mask, TRACE_DYNEVENT_KPROBE); + if (type == TRACEFS_KRETPROBE || type == TRACEFS_ALL_KPROBES) + DYNEVENT_ADD_BIT(mask, TRACE_DYNEVENT_KRETPROBE); - if (!list) - list = trace_list_create_empty(); - out: - free(content); - return list; - fail: - tracefs_list_free(list); - list = NULL; - goto out; + return dynevent_get_all(mask, NULL, kprobes); } /** @@ -465,30 +420,17 @@ static void disable_events(const char *system, const char *event, return; } -static int clear_kprobe(const char *system, const char *event) -{ - /* '-' + ':' + '/' + '\n' + '\0' = 5 bytes */ - int len = strlen(system) + strlen(event) + 5; - char content[len]; - - sprintf(content, "-:%s/%s", system, event); - return tracefs_instance_file_append(NULL, KPROBE_EVENTS, content); -} - static int kprobe_clear_probes(const char *group, bool force) { + struct tracefs_dynevent **kprobes; char **instance_list; - char **kprobe_list; - char *saveptr; - char *system; - char *kprobe; - char *event; int ret; int i; - kprobe_list = tracefs_kprobes_get(TRACEFS_ALL_KPROBES); - if (!kprobe_list) - return -1; + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &kprobes); + /* No krpobes or error getting them */ + if (ret <= 0) + return ret; instance_list = tracefs_instances(NULL); /* @@ -504,26 +446,21 @@ static int kprobe_clear_probes(const char *group, bool force) */ ret = group ? 0 : -1; - for (i = 0; kprobe_list[i]; i++) { - kprobe = kprobe_list[i]; - - system = strtok_r(kprobe, "/", &saveptr); - if (!system) - goto out; - - event = strtok_r(NULL," ", &saveptr); - if (!event) - goto out; + for (i = 0; kprobes[i]; i++) { /* Skip if this does not match a given system */ - if (group && strcmp(system, group) != 0) - continue; + if (group) { + if (!kprobes[i]->system) + continue; + if (strcmp(kprobes[i]->system, group) != 0) + continue; + } if (force) - disable_events(system, event, instance_list); + disable_events(kprobes[i]->system, kprobes[i]->event, instance_list); if (group) { - ret = clear_kprobe(system, event); + ret = dynevent_destroy(kprobes[i]); if (ret < 0) goto out; } else { @@ -538,7 +475,7 @@ static int kprobe_clear_probes(const char *group, bool force) } out: tracefs_list_free(instance_list); - tracefs_list_free(kprobe_list); + tracefs_dynevent_list_free(&kprobes); return ret; } From patchwork Thu Oct 28 12:09:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589973 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A07AC433F5 for ; Thu, 28 Oct 2021 12:09:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1140460F90 for ; Thu, 28 Oct 2021 12:09:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230312AbhJ1MLq (ORCPT ); Thu, 28 Oct 2021 08:11:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230265AbhJ1MLo (ORCPT ); Thu, 28 Oct 2021 08:11:44 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC61EC061745 for ; Thu, 28 Oct 2021 05:09:17 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 5so23268835edw.7 for ; Thu, 28 Oct 2021 05:09:17 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=ljLr895lWmcYm6RXNoJYFeiQoE3w3w+TpM4R6A4GSTk=; b=UB8YwTlUx+39pN382W6Elg/6rDGVAwmAmDvCIrLcuKIfYJlnnX+LmHpoxmjDfLEf3G VGybdx4IQHKy5vsdRm35VBl5xfJzrxbtc7yjEVdIIoGjSBJGMmxb+fL4gp5zCWn7xCr6 iShMqrCSWXQnuXOb6CdBMcQZNOCO+JgC5tMIYTj2Z7nC9DBO4CGxEa/LPYsXtqkxWBnv WxZdrhCjhOXQnLueFgxHqNSKIzddsIE91QsWImvFcxK4BGqpRRYtBC24/wx3LGfC8GKz a0vM6Su+kKNwaMe2f6vFwjERGSTz+PVSm14WWqwHARGxR1Qb37eVRgXfxoyuB3kJ8k6e xGHg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ljLr895lWmcYm6RXNoJYFeiQoE3w3w+TpM4R6A4GSTk=; b=FZ2VzN1H+pdpyfiUz+43b/IffhzkU52nSWdJkv+PH/93uwrc6S9BZBK7gtjtz2sh8z k7U+seQopfLDUUmr6NJGqa/GDKNVVhEtIte2hWyMaKsUYwQiMtOYcuyHXiQ49Bl+Fmf2 xS7g3CdxevfThmmCmPq/0Xl9wMyNM99vIbq26zT139ekhhiIswc+NAavQ3o6l5eQrx4W vUBzSGZvS7Laso+/HdC8BnDEDpyEWYm4E41OFjRbIoHKilWgbe3/3i/d52tSko+Fjy5P 0ccFRVPMGlztdVoS+rTrOS0amSBCYOVhd1ZJXJq/24ZSF3CEYz8TpmpxOLn9TZxoWLxG kCPg== X-Gm-Message-State: AOAM530TzPILFDj5lC40ieVOqaEA48ufHDNnuXGpFIcxPd/8UjR55KC+ WyYcqQgEaRvDAfq9BoM2mBbKsTTkncP39g== X-Google-Smtp-Source: ABdhPJyKdJvMZ5oOivxKVLNxnxcyksa3UJAfrXcDn84fu7Cf2SSaPpExRqW8IKRmQ4Z3j9q2ivi7jw== X-Received: by 2002:a50:e006:: with SMTP id e6mr5715885edl.344.1635422956146; Thu, 28 Oct 2021 05:09:16 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:15 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 06/12] libtracefs: Change tracefs_kprobe_info API Date: Thu, 28 Oct 2021 15:09:01 +0300 Message-Id: <20211028120907.101847-7-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In order to make kprobe APIs consistent with the other libtracefs APIs, the tracefs_kprobe_info() API is reimplemented and changed to work with the library kprobe context structure. Signed-off-by: Tzvetomir Stoyanov (VMware) --- include/tracefs.h | 5 +- src/tracefs-kprobes.c | 175 ++++++++++++++++-------------------------- 2 files changed, 69 insertions(+), 111 deletions(-) diff --git a/include/tracefs.h b/include/tracefs.h index d4ac8fb..c65f21f 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -260,8 +260,9 @@ int tracefs_kprobe_raw(const char *system, const char *event, int tracefs_kretprobe_raw(const char *system, const char *event, const char *addr, const char *format); int tracefs_kprobes_get(enum tracefs_kprobe_type type, struct tracefs_dynevent ***kprobes); -enum tracefs_kprobe_type tracefs_kprobe_info(const char *group, const char *event, - char **type, char **addr, char **format); +enum tracefs_kprobe_type tracefs_kprobe_info(struct tracefs_dynevent *kprobe, + char **system, char **event, + char **prefix, char **addr, char **format); enum tracefs_hist_key_type { TRACEFS_HIST_KEY_NORMAL = 0, diff --git a/src/tracefs-kprobes.c b/src/tracefs-kprobes.c index 2e24051..083a3a9 100644 --- a/src/tracefs-kprobes.c +++ b/src/tracefs-kprobes.c @@ -234,58 +234,6 @@ int tracefs_kretprobe_raw(const char *system, const char *event, return insert_kprobe("r", system, event, addr, format); } -/* - * Helper function to parse kprobes. - * @content: The content of kprobe_events on the first iteration. - * NULL on next iterations. - * @saveptr: Same as saveptr for strtok_r - * @type: Where to store the type (before ':') - * @system: Store the system of the kprobe (NULL to have event contain - * both system and event, as in "kprobes/myprobe"). - * @event: Where to store the event. - * @addr: Where to store the addr (may be NULL to ignore) - * @format: Where to store the format (may be NULL to ignore) - */ -static int parse_kprobe(char *content, char **saveptr, - char **type, char **system, char **event, - char **addr, char **format) -{ - char *p; - - p = strtok_r(content, ":", saveptr); - if (!p) - return 1; /* eof */ - *type = p; - - if (system) { - p = strtok_r(NULL, "/", saveptr); - if (!p) - return -1; - *system = p; - } - - p = strtok_r(NULL, " ", saveptr); - if (!p) - return -1; - *event = p; - - if (addr || format) { - p = strtok_r(NULL, " ", saveptr); - if (!p) - return -1; - if (addr) - *addr = p; - } - - p = strtok_r(NULL, "\n", saveptr); - if (!p) - return -1; - if (format) - *format = p; - - return 0; -} - /** * tracefs_kprobes_get - return an array of pointers to kprobes * @type: The type of kprobes to return. @@ -316,74 +264,83 @@ int tracefs_kprobes_get(enum tracefs_kprobe_type type, struct tracefs_dynevent * } /** - * tracefs_kprobe_info - return the type of kprobe specified. - * @group: The group the kprobe is in (NULL for the default "kprobes") - * @event: The name of the kprobe to find. - * @type: String to return kprobe type (before ':') NULL to ignore. - * @addr: String to return address kprobe is attached to. NULL to ignore. - * @format: String to return kprobe format. NULL to ignore. + * tracefs_kprobe_info - return details of a kprobe + * @kprobe: A kprobe context, describing given kprobe. + * @group: return, group in which the kprobe is configured + * @event: return, name of the kprobe event + * @prefix: return, prefix string of the kprobe + * for kretprobes, the maxactive count is encoded in the prefix + * @addr: return, the function and offset (or address) of the kprobe + * @format: return, the format string of the kprobe * - * If @type, @addr, or @format is non NULL, then the returned string - * must be freed with free(). They will also be set to NULL, and - * even on error, they may contain strings to be freed. If they are - * not NULL, then they still need to be freed. - * - * Returns TRACEFS_ALL_KPROBES if an error occurs or the kprobe is not found, - * or the probe is of an unknown type. - * TRACEFS_KPROBE if the type of kprobe found is a normal kprobe. - * TRACEFS_KRETPROBE if the type of kprobe found is a kretprobe. + * Returns the type of the kprobe, or TRACEFS_ALL_KPROBES in case of an error. + * Any of the @group, @event, @prefix, @addr and @format parameters are optional. + * If a valid pointer is passed, in case of success - a string is allocated and returned. + * These strings must be freed with free(). */ -enum tracefs_kprobe_type tracefs_kprobe_info(const char *group, const char *event, - char **type, char **addr, char **format) +enum tracefs_kprobe_type tracefs_kprobe_info(struct tracefs_dynevent *kprobe, + char **system, char **event, + char **prefix, char **addr, char **format) { - enum tracefs_kprobe_type rtype = TRACEFS_ALL_KPROBES; - char *saveptr; - char *content; - char *system; - char *probe; - char *ktype; - char *kaddr; - char *kfmt; - int ret; - - if (!group) - group = KPROBE_DEFAULT_GROUP; - - if (type) - *type = NULL; + if (system) + *system = NULL; + if (event) + *event = NULL; + if (prefix) + *prefix = NULL; if (addr) *addr = NULL; if (format) *format = NULL; - content = tracefs_instance_file_read(NULL, KPROBE_EVENTS, NULL); - if (!content) - return rtype; - - ret = parse_kprobe(content, &saveptr, &ktype, &system, &probe, - &kaddr, &kfmt); - - while (!ret) { - - if (!strcmp(system, group) && !strcmp(probe, event)) { - if (type) - *type = strdup(ktype); - if (addr) - *addr = strdup(kaddr); - if (format) - *format = strdup(kfmt); + if (!kprobe) + return TRACEFS_ALL_KPROBES; - switch (*ktype) { - case 'p': rtype = TRACEFS_KPROBE; break; - case 'r': rtype = TRACEFS_KRETPROBE; break; - } - break; + if (system) { + if (kprobe->system) { + *system = strdup(kprobe->system); + if (!(*system)) + goto error; } - ret = parse_kprobe(NULL, &saveptr, &ktype, &system, &probe, - &kaddr, &kfmt); } - free(content); - return rtype; + if (event) { + *event = strdup(kprobe->event); + if (!(*event)) + goto error; + } + if (prefix) { + *prefix = strdup(kprobe->prefix); + if (!(*prefix)) + goto error; + } + if (addr && kprobe->address) { + *addr = strdup(kprobe->address); + if (!(*addr)) + goto error; + } + if (format && kprobe->format) { + *format = strdup(kprobe->format); + if (!(*format)) + goto error; + } + + if (kprobe->type == TRACE_DYNEVENT_KPROBE) + return TRACEFS_KPROBE; + if (kprobe->type == TRACE_DYNEVENT_KRETPROBE) + return TRACEFS_KRETPROBE; + +error: + if (system) + free(*system); + if (event) + free(*event); + if (prefix) + free(*prefix); + if (addr) + free(*addr); + if (format) + free(*format); + return TRACEFS_ALL_KPROBES; } static void disable_events(const char *system, const char *event, From patchwork Thu Oct 28 12:09:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589977 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01345C4332F for ; Thu, 28 Oct 2021 12:09:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB346610F8 for ; Thu, 28 Oct 2021 12:09:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230093AbhJ1MLq (ORCPT ); Thu, 28 Oct 2021 08:11:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230293AbhJ1MLp (ORCPT ); Thu, 28 Oct 2021 08:11:45 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 891FEC061767 for ; Thu, 28 Oct 2021 05:09:18 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id j21so801055edt.11 for ; Thu, 28 Oct 2021 05:09:18 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q6U++GRovHrbLxMfd6g9LLspUryAfjCsvlEZW6MTxFw=; b=S651mPWlufY822f8dWS5zo80+QssjrRvOk746EeeqRP1A731napjM6y2s0gCisz1+a IhZxDXDXbJeb9Mgl9C41LjW+HhlPdAk0/OKMTUHsZGldrIhI7UgQiEnFCEWq4+LUfJZO Irk4IHErpa8ao2UYflDjYL7utVyH3Kadh0nU1UjtyN0ixvXVtbLrmaOLc3zkuARf5XtB amsqU0Uig3JC83R4DwzFTYhL5cn76ijSMAWhg5KE+WTht5X84HVwa+DhVSMvipmDE8/Z gvImHj9IqYa2qaChFHAVX17yEPMQUS0byGXmI8T7Zoi8yptMwaN3+g492nNvk+G2dCmx sAbQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q6U++GRovHrbLxMfd6g9LLspUryAfjCsvlEZW6MTxFw=; b=vW0ljERjRWdEzEGs0J3qr8lC/ww7+MkU0ZVw/Y1sjrJYPvNWhP+Cf6oUERETtufwTL 8bP6cSP4w66S5tGqWgZ9BOPJXoxpAvwzNpqndepjw8MpvgNyQtdni+XnmtprmKvN3oF1 d6xN//KlzlRpSQhtEu3uzY55U7AS6LFD/yvB6sniwuX/gHIIkruIi+xuhe/CpFqni4kb jQ2xE6lT+ZDoE1cEnt/Gyh2Hq8VlB2plAEVgdzr9Mj4S34vzJk/FIyNRvWFx+PWsEMxF gHAApd/6wrcruxekFhYIUDEOiEpJDwao5+OPt2FGs1lGbXA/Wpq8KItn4/M++NCn3pJg RBJQ== X-Gm-Message-State: AOAM531jeSsZRFQyWFMWV0ReF2e5iBi0beVhDD/EGr/ht/K9RUkqwQjN uQwHF3uGVL5tGq4nSV65M4WqEyALVrnAyQ== X-Google-Smtp-Source: ABdhPJx7HSN7m94sip52AanKwYyzfonIYeSNWJpBwVerM7no2dDBhl7pWLaVVoabL9MZtbK1jDPWdQ== X-Received: by 2002:aa7:c555:: with SMTP id s21mr1549493edr.81.1635422957162; Thu, 28 Oct 2021 05:09:17 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:16 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 07/12] libtracefs: Reimplement kprobe raw APIs Date: Thu, 28 Oct 2021 15:09:02 +0300 Message-Id: <20211028120907.101847-8-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In order to unify the code and use the new dynamic event helpers, these kprobe APIs are rewritten: kracefs_kprobe_raw() kracefs_kretprobe_raw() The definition and logic of the APIs remain the same. Signed-off-by: Tzvetomir Stoyanov (VMware) --- src/tracefs-kprobes.c | 44 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/src/tracefs-kprobes.c b/src/tracefs-kprobes.c index 083a3a9..84a9903 100644 --- a/src/tracefs-kprobes.c +++ b/src/tracefs-kprobes.c @@ -148,38 +148,28 @@ void tracefs_kprobe_free(struct tracefs_dynevent *kprobe) dynevent_free(kprobe); } - -static int insert_kprobe(const char *type, const char *system, - const char *event, const char *addr, - const char *format) +static int kprobe_raw(enum trace_dynevent_type type, const char *system, + const char *event, const char *addr, const char *format) { - char *str; + static struct tracefs_dynevent *kp; int ret; - if (!tracefs_file_exists(NULL, KPROBE_EVENTS)) - return -1; - - errno = EBADMSG; - if (!addr || !format) + kp = kprobe_alloc(type, system, event, addr, format); + if (!kp) return -1; - if (!event) - event = addr; - - if (system) - ret = asprintf(&str, "%s:%s/%s %s %s\n", - type, system, event, addr, format); - else - ret = asprintf(&str, "%s:%s %s %s\n", - type, event, addr, format); - - if (ret < 0) - return -1; + if (type == TRACE_DYNEVENT_KRETPROBE) { + free(kp->prefix); + kp->prefix = NULL; + ret = asprintf(&kp->prefix, "r:"); + if (ret < 0) + return ret; + } - ret = tracefs_instance_file_append(NULL, KPROBE_EVENTS, str); - free(str); + ret = dynevent_create(kp); + dynevent_free(kp); - return ret < 0 ? ret : 0; + return ret; } /** @@ -205,7 +195,7 @@ static int insert_kprobe(const char *type, const char *system, int tracefs_kprobe_raw(const char *system, const char *event, const char *addr, const char *format) { - return insert_kprobe("p", system, event, addr, format); + return kprobe_raw(TRACE_DYNEVENT_KPROBE, system, event, addr, format); } /** @@ -231,7 +221,7 @@ int tracefs_kprobe_raw(const char *system, const char *event, int tracefs_kretprobe_raw(const char *system, const char *event, const char *addr, const char *format) { - return insert_kprobe("r", system, event, addr, format); + return kprobe_raw(TRACE_DYNEVENT_KRETPROBE, system, event, addr, format); } /** From patchwork Thu Oct 28 12:09:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589989 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B46A8C433FE for ; Thu, 28 Oct 2021 12:09:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B58E610CA for ; Thu, 28 Oct 2021 12:09:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230329AbhJ1MLw (ORCPT ); Thu, 28 Oct 2021 08:11:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbhJ1MLw (ORCPT ); Thu, 28 Oct 2021 08:11:52 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E575C061570 for ; Thu, 28 Oct 2021 05:09:25 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id r4so23323648edi.5 for ; Thu, 28 Oct 2021 05:09:25 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=WTq5qOpvUu2XG/2+rj8uij1oz6f3NYw8QIxfVbATNUc=; b=nuENlEwwcNLIz9//6NysaHnM3TiaXK5y9PF7DodjMCah51b1ZhYHYfkn4TG0uM/D9X WhQYHJOlBt5yiubwQuGrWvn+JEGJUPmQX7gjaxxOvLV3c8XETIgRrqtBRywgF7BBGwup 0T+0DLc9E+9qe674RFEqpRGEfQOOnDeYOFyKCOru6vw73AE6ZDqhS4zbJr3s7ImOj5Bt Hw3QNuEgcCDzTWaeY3GghMCaZhPtihYen5Zr45RrSN6S9GMC3uSKC2/HUvm8J7V9r0kf 59xJfrBnZeQQd0se2lM2TF0axB1tA2xIlyoCJ4Sk/7diA/XLJV2/uVN2yEoOHl7Bz8pb /ijw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WTq5qOpvUu2XG/2+rj8uij1oz6f3NYw8QIxfVbATNUc=; b=HHSz8NULqAerFqUmdONRZJQzjvXmy68jmAN2d3juEy93tzSl70QYjMpsuuzrjGxxiD Y/k3EUAjs/7uAIxGxT8eIHi94nWTSgZy3+k41XnWdDx93LQUSyBL2UhI3SGa61ysyW6S VJBzVxZqcKym3Z+ScgYniPzwJQD7kU93RozzUthdrSTt6D2A1K2LuVqLxTCgM+woxzIg MNPjZwR28yCaGW3c6sF9Pz3JMdbx0ftZ01O6zHVL8IZnxGQVPyZbEdRFzTX2oDyy2sKO z6JJmvDsi71/CqgK9cClsfr/pGbyfD83HzPmXQe5l27SKx7rSuqsKH/H38VBv82Izp4f /OsA== X-Gm-Message-State: AOAM533yoMLQv45wwuRECn3T0tJLixJLrxc5LpRaYBormwG0acjJxeJP baFx0VIV0jQ2O8zh7lz6UBc= X-Google-Smtp-Source: ABdhPJz9IXGumcCfxf7xQ/wJGH9fj9kk1mUMVxU/fmENf0Yuk5dofD8mo2l74kCNd1No/774mLNb+g== X-Received: by 2002:a17:907:ea5:: with SMTP id ho37mr4865160ejc.355.1635422958219; Thu, 28 Oct 2021 05:09:18 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:17 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 08/12] libtracefs: Extend kprobes unit test Date: Thu, 28 Oct 2021 15:09:03 +0300 Message-Id: <20211028120907.101847-9-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org As there are a lot of changes in the libtracefs kprobes APIs, the unit test of that functionality should be updated. A new test section is added, for testing the all kprobes APIs. Signed-off-by: Tzvetomir Stoyanov (VMware) --- utest/tracefs-utest.c | 414 +++++++++++++++++++++++++----------------- 1 file changed, 244 insertions(+), 170 deletions(-) diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c index 7c1a84e..0a17b82 100644 --- a/utest/tracefs-utest.c +++ b/utest/tracefs-utest.c @@ -28,22 +28,6 @@ #define TRACE_ON "tracing_on" #define TRACE_CLOCK "trace_clock" -#define KPROBE_EVENTS "kprobe_events" - -#define KPROBE_1_NAME "mkdir" -#define KPROBE_1_GROUP "kprobes" -#define KPROBE_1_ADDR "do_mkdirat" -#define KPROBE_1_FMT "path=+u0($arg2):ustring" - -#define KPROBE_2_NAME "open" -#define KPROBE_2_GROUP "myprobe" -#define KPROBE_2_ADDR "do_sys_openat2" -#define KPROBE_2_FMT "file=+u0($arg2):ustring flags=+0($arg3):x64" - -#define KRETPROBE_NAME "retopen" -#define KRETPROBE_ADDR "do_sys_openat2" -#define KRETPROBE_FMT "ret=$retval" - #define SQL_1_EVENT "wakeup_1" #define SQL_1_SQL "select sched_switch.next_pid as woke_pid, sched_waking.common_pid as waking_pid from sched_waking join sched_switch on sched_switch.next_pid = sched_waking.pid" @@ -457,28 +441,264 @@ static void test_instance_file_read(struct tracefs_instance *inst, const char *f free(file); } +#define KPROBE_DEFAULT_GROUP "kprobes" +struct kprobe_test { + enum tracefs_kprobe_type type; + char *prefix; + char *system; + char *event; + char *address; + char *format; +}; + +static bool check_kprobes(struct kprobe_test *kprobes, int count, + struct tracefs_dynevent **devents, bool in_system) +{ + + enum tracefs_kprobe_type ktype; + char *ename; + char *kaddress; + char *kevent; + char *ksystem; + char *kformat; + char *kprefix; + int found = 0; + int ret; + int i, j; + + for (i = 0; devents[i]; i++) { + ktype = tracefs_kprobe_info(devents[i], &ksystem, + &kevent, &kprefix, &kaddress, &kformat); + for (j = 0; j < count; j++) { + if (ktype != kprobes[j].type) + continue; + if (kprobes[j].event) + ename = kprobes[j].event; + else + ename = kprobes[j].address; + if (strcmp(ename, kevent)) + continue; + if (kprobes[j].system) { + CU_TEST(strcmp(kprobes[j].system, ksystem) == 0); + } else { + CU_TEST(strcmp(KPROBE_DEFAULT_GROUP, ksystem) == 0); + } + CU_TEST(strcmp(kprobes[j].address, kaddress) == 0); + CU_TEST(strcmp(kprobes[j].format, kformat) == 0); + if (kprobes[j].prefix) + CU_TEST(strcmp(kprobes[j].prefix, kprefix) == 0); + ret = tracefs_event_enable(test_instance, ksystem, kevent); + if (in_system) { + CU_TEST(ret == 0); + } else { + CU_TEST(ret != 0); + } + ret = tracefs_event_disable(test_instance, ksystem, kevent); + if (in_system) { + CU_TEST(ret == 0); + } else { + CU_TEST(ret != 0); + } + + found++; + break; + } + free(ksystem); + free(kevent); + free(kprefix); + free(kaddress); + free(kformat); + } + + CU_TEST(found == count); + if (found != count) + return false; + + return true; +} + +#define KPROBE_COUNT 2 +#define KRETPROBE_COUNT 2 +static void test_kprobes(void) +{ + char *tmp; + + struct kprobe_test ktests[KPROBE_COUNT] = { + { TRACEFS_KPROBE, "p:", NULL, "mkdir", "do_mkdirat", "path=+u0($arg2):ustring" }, + { TRACEFS_KPROBE, "p:", "ptest", "open", "do_sys_openat2", + "file=+u0($arg2):ustring flags=+0($arg3):x64" }, + }; + struct kprobe_test kretests[KRETPROBE_COUNT] = { + { TRACEFS_KRETPROBE, NULL, NULL, "retopen", "do_sys_openat2", "ret=$retval" }, + { TRACEFS_KRETPROBE, NULL, NULL, NULL, "do_sys_open", "ret=$retval" }, + }; + struct tracefs_dynevent *dkretprobe[KRETPROBE_COUNT + 1]; + struct tracefs_dynevent *dkprobe[KPROBE_COUNT + 1]; + struct tracefs_dynevent **devents; + int ret; + int i; + + /* Invalid parameters */ + CU_TEST(tracefs_kprobe_alloc("test", NULL, NULL, "test") == NULL); + CU_TEST(tracefs_kretprobe_alloc("test", NULL, NULL, "test", 0) == NULL); + CU_TEST(tracefs_kprobe_alloc("test", NULL, "test", NULL) == NULL); + CU_TEST(tracefs_kretprobe_alloc("test", NULL, "test", NULL, 0) == NULL); + CU_TEST(tracefs_kprobe_create(NULL) != 0); + CU_TEST(tracefs_kprobe_info(NULL, &tmp, &tmp, &tmp, &tmp, &tmp) == TRACEFS_ALL_KPROBES); + CU_TEST(tracefs_kprobe_raw("test", "test", NULL, "test") != 0); + CU_TEST(tracefs_kretprobe_raw("test", "test", NULL, "test") != 0); + CU_TEST(tracefs_kprobe_raw("test", "test", "test", NULL) != 0); + CU_TEST(tracefs_kretprobe_raw("test", "test", "test", NULL) != 0); + + /* kprobes APIs */ + ret = tracefs_kprobe_destroy(NULL, true); + CU_TEST(ret == 0); + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == 0); + CU_TEST(devents == NULL); + + for (i = 0; i < KPROBE_COUNT; i++) { + dkprobe[i] = tracefs_kprobe_alloc(ktests[i].system, ktests[i].event, + ktests[i].address, ktests[i].format); + CU_TEST(dkprobe[i] != NULL); + } + dkprobe[i] = NULL; + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == 0); + CU_TEST(devents == NULL); + CU_TEST(check_kprobes(ktests, KPROBE_COUNT, dkprobe, false)); + + for (i = 0; i < KRETPROBE_COUNT; i++) { + dkretprobe[i] = tracefs_kretprobe_alloc(kretests[i].system, kretests[i].event, + kretests[i].address, kretests[i].format, 0); + CU_TEST(dkretprobe[i] != NULL); + } + dkretprobe[i] = NULL; + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == 0); + CU_TEST(devents == NULL); + CU_TEST(check_kprobes(kretests, KRETPROBE_COUNT, dkretprobe, false)); + + for (i = 0; i < KPROBE_COUNT; i++) { + CU_TEST(tracefs_kprobe_create(dkprobe[i]) == 0); + } + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == KPROBE_COUNT); + CU_TEST(devents != NULL); + CU_TEST(check_kprobes(ktests, KPROBE_COUNT, devents, true)); + CU_TEST(check_kprobes(kretests, KRETPROBE_COUNT, dkretprobe, false)); + tracefs_dynevent_list_free(&devents); + devents = NULL; + + for (i = 0; i < KRETPROBE_COUNT; i++) { + CU_TEST(tracefs_kprobe_create(dkretprobe[i]) == 0); + } + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == (KPROBE_COUNT + KRETPROBE_COUNT)); + CU_TEST(devents != NULL); + CU_TEST(check_kprobes(ktests, KPROBE_COUNT, devents, true)); + CU_TEST(check_kprobes(kretests, KRETPROBE_COUNT, devents, true)); + tracefs_dynevent_list_free(&devents); + devents = NULL; + + for (i = 0; i < KRETPROBE_COUNT; i++) { + CU_TEST(tracefs_kprobe_destroy(dkretprobe[i], false) == 0); + } + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == KPROBE_COUNT); + CU_TEST(devents != NULL); + CU_TEST(check_kprobes(ktests, KPROBE_COUNT, devents, true)); + CU_TEST(check_kprobes(kretests, KRETPROBE_COUNT, dkretprobe, false)); + tracefs_dynevent_list_free(&devents); + devents = NULL; + + for (i = 0; i < KPROBE_COUNT; i++) { + CU_TEST(tracefs_kprobe_destroy(dkprobe[i], false) == 0); + } + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == 0); + CU_TEST(devents == NULL); + CU_TEST(check_kprobes(ktests, KPROBE_COUNT, dkprobe, false)); + CU_TEST(check_kprobes(kretests, KRETPROBE_COUNT, dkretprobe, false)); + tracefs_dynevent_list_free(&devents); + devents = NULL; + + for (i = 0; i < KPROBE_COUNT; i++) + tracefs_kprobe_free(dkprobe[i]); + for (i = 0; i < KRETPROBE_COUNT; i++) + tracefs_kprobe_free(dkretprobe[i]); + + /* kprobes raw APIs */ + ret = tracefs_kprobe_destroy(NULL, true); + CU_TEST(ret == 0); + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == 0); + CU_TEST(devents == NULL); + + for (i = 0; i < KPROBE_COUNT; i++) { + ret = tracefs_kprobe_raw(ktests[i].system, ktests[i].event, + ktests[i].address, ktests[i].format); + CU_TEST(ret == 0); + } + + ret = tracefs_kprobes_get(TRACEFS_KPROBE, &devents); + CU_TEST(ret == KPROBE_COUNT); + CU_TEST(devents != NULL); + CU_TEST(check_kprobes(ktests, KPROBE_COUNT, devents, true)); + tracefs_dynevent_list_free(&devents); + devents = NULL; + + for (i = 0; i < KRETPROBE_COUNT; i++) { + ret = tracefs_kretprobe_raw(kretests[i].system, kretests[i].event, + kretests[i].address, kretests[i].format); + CU_TEST(ret == 0); + } + + ret = tracefs_kprobes_get(TRACEFS_KPROBE, &devents); + CU_TEST(ret == KPROBE_COUNT); + CU_TEST(devents != NULL); + CU_TEST(check_kprobes(ktests, KPROBE_COUNT, devents, true)); + tracefs_dynevent_list_free(&devents); + devents = NULL; + + ret = tracefs_kprobes_get(TRACEFS_KRETPROBE, &devents); + CU_TEST(ret == KRETPROBE_COUNT); + CU_TEST(devents != NULL); + CU_TEST(check_kprobes(kretests, KRETPROBE_COUNT, devents, true)); + tracefs_dynevent_list_free(&devents); + devents = NULL; + + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == (KPROBE_COUNT + KRETPROBE_COUNT)); + CU_TEST(devents != NULL); + CU_TEST(check_kprobes(ktests, KPROBE_COUNT, devents, true)); + CU_TEST(check_kprobes(kretests, KRETPROBE_COUNT, devents, true)); + tracefs_dynevent_list_free(&devents); + devents = NULL; + + ret = tracefs_kprobe_destroy(NULL, true); + CU_TEST(ret == 0); + ret = tracefs_kprobes_get(TRACEFS_ALL_KPROBES, &devents); + CU_TEST(ret == 0); + CU_TEST(devents == NULL); +} + static void test_instance_file(void) { struct tracefs_instance *instance = NULL; struct tracefs_instance *second = NULL; - enum tracefs_kprobe_type type; const char *name = get_rand_str(); const char *inst_name = NULL; const char *tdir; char *inst_file; char *inst_dir; struct stat st; - char **kprobes; - char *kformat; - char *ktype; - char *kaddr; - char *fname; char *file1; char *file2; char *tracer; + char *fname; int size; int ret; - int i; tdir = tracefs_tracing_dir(); CU_TEST(tdir != NULL); @@ -541,153 +761,6 @@ static void test_instance_file(void) free(file1); free(file2); - ret = tracefs_kprobe_clear_all(true); - CU_TEST(ret == 0); - ret = tracefs_kprobe_raw(NULL, KPROBE_1_NAME, KPROBE_1_ADDR, KPROBE_1_FMT); - CU_TEST(ret == 0); - ret = tracefs_kprobe_raw(KPROBE_2_GROUP, KPROBE_2_NAME, KPROBE_2_ADDR, - KPROBE_2_FMT); - CU_TEST(ret == 0); - - ret = tracefs_kretprobe_raw(KPROBE_2_GROUP, KRETPROBE_NAME, KRETPROBE_ADDR, - KRETPROBE_FMT); - CU_TEST(ret == 0); - - type = tracefs_kprobe_info(KPROBE_1_GROUP, KPROBE_1_NAME, &ktype, - &kaddr, &kformat); - CU_TEST(type == TRACEFS_KPROBE); - CU_TEST(ktype && *ktype == 'p'); - CU_TEST(kaddr && !strcmp(kaddr, KPROBE_1_ADDR)); - CU_TEST(kformat && !strcmp(kformat, KPROBE_1_FMT)); - free(ktype); - free(kaddr); - free(kformat); - - type = tracefs_kprobe_info(KPROBE_2_GROUP, KPROBE_2_NAME, &ktype, - &kaddr, &kformat); - CU_TEST(type == TRACEFS_KPROBE); - CU_TEST(ktype && *ktype == 'p'); - CU_TEST(kaddr && !strcmp(kaddr, KPROBE_2_ADDR)); - CU_TEST(kformat && !strcmp(kformat, KPROBE_2_FMT)); - free(ktype); - free(kaddr); - free(kformat); - - type = tracefs_kprobe_info(KPROBE_2_GROUP, KRETPROBE_NAME, &ktype, - &kaddr, &kformat); - CU_TEST(type == TRACEFS_KRETPROBE); - CU_TEST(ktype && *ktype == 'r'); - CU_TEST(kaddr && !strcmp(kaddr, KRETPROBE_ADDR)); - CU_TEST(kformat && !strcmp(kformat, KRETPROBE_FMT)); - free(ktype); - free(kaddr); - free(kformat); - - kprobes = tracefs_kprobes_get(TRACEFS_ALL_KPROBES); - CU_TEST(kprobes != NULL); - - for (i = 0; kprobes[i]; i++) { - char *system = strtok(kprobes[i], "/"); - char *event = strtok(NULL, ""); - bool found = false; - if (!strcmp(system, KPROBE_1_GROUP)) { - CU_TEST(!strcmp(event, KPROBE_1_NAME)); - found = true; - } else if (!strcmp(system, KPROBE_2_GROUP)) { - switch (tracefs_kprobe_info(system, event, NULL, NULL, NULL)) { - case TRACEFS_KPROBE: - CU_TEST(!strcmp(event, KPROBE_2_NAME)); - found = true; - break; - case TRACEFS_KRETPROBE: - CU_TEST(!strcmp(event, KRETPROBE_NAME)); - found = true; - break; - default: - break; - } - } - CU_TEST(found); - } - tracefs_list_free(kprobes); - CU_TEST(i == 3); - - kprobes = tracefs_kprobes_get(TRACEFS_KPROBE); - CU_TEST(kprobes != NULL); - - for (i = 0; kprobes[i]; i++) { - char *system = strtok(kprobes[i], "/"); - char *event = strtok(NULL, ""); - bool found = false; - if (!strcmp(system, KPROBE_1_GROUP)) { - CU_TEST(!strcmp(event, KPROBE_1_NAME)); - found = true; - } else if (!strcmp(system, KPROBE_2_GROUP)) { - CU_TEST(!strcmp(event, KPROBE_2_NAME)); - found = true; - } - CU_TEST(found); - } - tracefs_list_free(kprobes); - CU_TEST(i == 2); - - kprobes = tracefs_kprobes_get(TRACEFS_KRETPROBE); - CU_TEST(kprobes != NULL); - - for (i = 0; kprobes[i]; i++) { - char *system = strtok(kprobes[i], "/"); - char *event = strtok(NULL, ""); - bool found = false; - if (!strcmp(system, KPROBE_2_GROUP)) { - CU_TEST(!strcmp(event, KRETPROBE_NAME)); - found = true; - } - CU_TEST(found); - } - tracefs_list_free(kprobes); - CU_TEST(i == 1); - - ret = tracefs_event_enable(instance, KPROBE_1_GROUP, KPROBE_1_NAME); - CU_TEST(ret == 0); - ret = tracefs_event_enable(instance, KPROBE_2_GROUP, KPROBE_2_NAME); - CU_TEST(ret == 0); - ret = tracefs_event_enable(instance, KPROBE_2_GROUP, KRETPROBE_NAME); - CU_TEST(ret == 0); - - ret = tracefs_kprobe_clear_all(false); - CU_TEST(ret < 0); - - ret = tracefs_kprobe_clear_probe(KPROBE_2_GROUP, NULL, false); - CU_TEST(ret < 0); - - ret = tracefs_kprobe_clear_probe(KPROBE_2_GROUP, NULL, true); - CU_TEST(ret == 0); - - kprobes = tracefs_kprobes_get(TRACEFS_ALL_KPROBES); - CU_TEST(kprobes != NULL); - - for (i = 0; kprobes[i]; i++) { - char *system = strtok(kprobes[i], "/"); - char *event = strtok(NULL, ""); - bool found = false; - if (!strcmp(system, KPROBE_1_GROUP)) { - CU_TEST(!strcmp(event, KPROBE_1_NAME)); - found = true; - } - CU_TEST(found); - } - tracefs_list_free(kprobes); - CU_TEST(i == 1); - - ret = tracefs_kprobe_clear_all(true); - CU_TEST(ret == 0); - - kprobes = tracefs_kprobes_get(TRACEFS_ALL_KPROBES); - CU_TEST(kprobes != NULL); - - CU_TEST(kprobes[0] == NULL); - tracefs_list_free(kprobes); - tracefs_put_tracing_file(inst_file); free(fname); @@ -1442,4 +1515,5 @@ void test_tracefs_lib(void) test_custom_trace_dir); CU_add_test(suite, "ftrace marker", test_ftrace_marker); + CU_add_test(suite, "kprobes", test_kprobes); } From patchwork Thu Oct 28 12:09:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589987 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEC14C433EF for ; Thu, 28 Oct 2021 12:09:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5A76610CA for ; Thu, 28 Oct 2021 12:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230325AbhJ1MLw (ORCPT ); Thu, 28 Oct 2021 08:11:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbhJ1MLv (ORCPT ); Thu, 28 Oct 2021 08:11:51 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EC97C061570 for ; Thu, 28 Oct 2021 05:09:24 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id r4so23323556edi.5 for ; Thu, 28 Oct 2021 05:09:24 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=LLgu0pTh5aNZXI0VMzPHrVqAeNkE6vx4RGu3/+0aF3E=; b=cwrHMaS0maLfNIJvIGQi4qVrP4Gkp+82eOc6KmGElkLGdOyHoBHhY7Thv/m0wo0JRz L0OnDmuybwo9sh1EOppXj1HW/kVsvBjZsqHBUuu3SRMPx8TNTA9Cxel/86/wCEy/4mLs BohdpocsQJ4v/0vrZ3ZX6Wta6pFpKWFJ88lCGeWqWLrxsNPouKE4hPskLYIRig8wie74 31yTuNu5AUbO3ti4qDw7d1RxyUtfztt+y8OOO+jD+9P5JJbpOcvgRYEPUZ3+pPzWK2D8 DgTVK0QiED/mHXIptiJDEl5GILrkiVRfUZRJvOb35yx2OZu8Wrwitm5yUVvhb938lvuO pafA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=LLgu0pTh5aNZXI0VMzPHrVqAeNkE6vx4RGu3/+0aF3E=; b=nLKB043FMHx4EpFuyEvNWUxG+T0ZfG3elp5d/HoUKh4Wv9ctyStIuYAeipd4wavW0w wjtciltfDKKKuUwCsh/cFargeimlNIoIs0alUiEKD8yoY+GDh8TWiNR9u84XFDq1WKWS djH+WiPW5VLvCPbyWWJxu/oqjb1fLlLXGrHsrAFeEvaDacqbemdXhZScBGqmkn3i1E1Z 2kQuDEIsi8zWkoWH3T+a4QCxLrhF/1X7MnQwe4Jc8Axs8VPFN+OKStyzCQiG0/prcDCz aZdOOYYo5PEP0s3sr5HrPDoUcRBaaQZV7kW4oPjhAI2jyfYClXiP04cnmOKEk1Hl0tyf OJmQ== X-Gm-Message-State: AOAM5316YrM2EwwTWXwUHCFq/Ip0rHuwuHYAOudvjKCg4Ynsg5cUm+Ga czZIQ8qrKyiGpCZaABbJT1qF3TRxZIzkyw== X-Google-Smtp-Source: ABdhPJyYZXWKM41xbtv2wHWXl8kRfJJ3e0d76bMRG6XsPkkV5Eksq9tctUbhH4NLUKgrkbxrrvNaNQ== X-Received: by 2002:a05:6402:438f:: with SMTP id o15mr5358965edc.301.1635422959263; Thu, 28 Oct 2021 05:09:19 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:18 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 09/12] libtracefs: Update kprobes man pages Date: Thu, 28 Oct 2021 15:09:04 +0300 Message-Id: <20211028120907.101847-10-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org As there are a lot of changes in the libtracefs kprobes APIs, the documentation of library should be updated. Signed-off-by: Tzvetomir Stoyanov (VMware) --- Documentation/libtracefs-kprobes.txt | 135 ++++++++++++++++----------- 1 file changed, 79 insertions(+), 56 deletions(-) diff --git a/Documentation/libtracefs-kprobes.txt b/Documentation/libtracefs-kprobes.txt index ca48fa9..c11cd5c 100644 --- a/Documentation/libtracefs-kprobes.txt +++ b/Documentation/libtracefs-kprobes.txt @@ -3,7 +3,10 @@ libtracefs(3) NAME ---- -tracefs_kprobe_raw, tracefs_kretprobe_raw, tracefs_kprobes_get, tracefs_kprobe_info, tracefs_kprobe_clear_all, tracefs_kprobe_clear_probe - Create, list, and destroy kprobes +tracefs_kprobe_alloc, tracefs_kretprobe_alloc, tracefs_kprobe_create, +tracefs_kprobe_destroy, tracefs_kprobe_free, tracefs_kprobes_get, +tracefs_kprobe_info, tracefs_kprobe_raw, tracefs_kretprobe_raw - Create, get, and destroy kprobes + SYNOPSIS -------- @@ -11,18 +14,67 @@ SYNOPSIS -- *#include * -int tracefs_kprobe_raw(const char pass:[*]system, const char pass:[*]event, const char pass:[*]addr, const char pass:[*]format); -int tracefs_kretprobe_raw(const char pass:[*]system, const char pass:[*]event, const char pass:[*]addr, const char pass:[*]format); -char pass:[*]pass:[*]tracefs_kprobes_get(enum tracefs_kprobe_type type); -enum tracefs_kprobe_type tracefs_kprobe_info(const char pass:[*]group, const char pass:[*]event, - char pass:[*]pass:[*]type, char pass:[*]pass:[*]addr, char pass:[*]pass:[*]format); -enum tracefs_kprobe_type tracefs_kprobe_type(const char pass:[*]group, const char pass:[*]event) -int tracefs_kprobe_clear_all(bool force); -int tracefs_kprobe_clear_probe(const char pass:[*]system, const char pass:[*]event, bool force); +struct tracefs_dynevent pass:[*] +*tracefs_kprobe_alloc*(const char pass:[*]_system_, const char pass:[*]_event_, + const char pass:[*]_addr_, const char pass:[*]_format_); +struct tracefs_dynevent pass:[*] +*tracefs_kretprobe_alloc*(const char pass:[*]_system_, const char pass:[*]_event_, + const char pass:[*]_addr_, const char pass:[*]_format_, int _max_); +void *tracefs_kprobe_free*(struct tracefs_dynevent pass:[*]_kprobe_); +int *tracefs_kprobe_create*(struct tracefs_dynevent pass:[*]_kprobe_); +int *tracefs_kprobe_destroy*(struct tracefs_dynevent pass:[*]_kprobe_, bool _force_); +int *tracefs_kprobes_get*(enum tracefs_kprobe_type _type_, + struct tracefs_dynevent pass:[*]pass:[*]pass:[*]_kprobes_); +enum tracefs_kprobe_type *tracefs_kprobe_info*(struct tracefs_dynevent pass:[*]_kprobe_, + char pass:[*]pass:[*]_system_, char pass:[*]pass:[*]_event_, + char pass:[*]pass:[*]_prefix_, char pass:[*]pass:[*]_addr_, + char pass:[*]pass:[*]_format_); +int tracefs_kprobe_raw(const char pass:[*]system, const char pass:[*]event, + const char pass:[*]addr, const char pass:[*]format); +int tracefs_kretprobe_raw(const char pass:[*]system, const char pass:[*]event, + const char pass:[*]addr, const char pass:[*]format); -- DESCRIPTION ----------- +*tracefs_kprobe_alloc*() allocates a new kprobe context. The kbrobe is not configured in the system. +The new kprobe will be in the _system_ group (or kprobes if _system_ is NULL). Have the name of +_event_ (or _addr_ if _event_ is NULL). Will be inserted to _addr_ (function name, with or without +offset, or a address). And the _format_ will define the format of the kprobe. See the Linux +documentation file under: Documentation/trace/kprobetrace.rst + +*tracefs_kretprobe_alloc*() is the same as *tracefs_kprobe_alloc*, but allocates context for +kretprobe. It has one additional parameter, which is optional, _max_ - maxactive count. +See description of kretprobes in the Documentation/trace/kprobetrace.rst file. + +*tracefs_kprobe_free*() frees a kprobe context, allocated with *tracefs_kprobe_alloc*() or +*tracefs_kretprobe_alloc*(). The kprobe is not removed from the system. + +*tracefs_kprobe_create*() creates a kprobe or kretprobe in the system. The probe is described by the +given _kprobe_ context. + +*tracefs_kprobe_destroy*() will try to remove the specified _kprobe_ from the system. If _kprobe_ +is NULL, all kprobes and kretprobes in the system will be removed. If the _force_ flag is set, then +it will disable the given kprobe events before removing them. + +*tracefs_kprobes_get*() returns the count of the registered kprobes and kretprobes in the system, +depending on the given _type_. If _type_ is TRACEFS_ALL_KPROBES, then all kprobes found are +counted. If _type_ is TRACEFS_KPROBE, then only normal kprobes are counted. If _type_ is +TRACEFS_KRETPROBE, then only kretprobes are counted. If the _kprobes_ parameter in not NULL, then +an array of pointers to kprobe contexts is allocated and passed back via _kprobes_. The size of this +array is the returned count + 1, as the last element is a NULL pointer. The array must be freed with +*tracefs_dynevent_list_free*(3). + +*tracefs_kprobe_info*() returns the type and information of a given _kprobe_. If any of the +_system_, _event_, _prefix_, _addr_ or _format_ arguments are not NULL, then strings are allocated +and returned back via these arguments. The _system_ and _event_ holds the system and the name of the +kprobe. If _prefix_ is non NULL, then it will hold an allocated string that holds the prefix portion +of the kprobe in the kprobe_events file (the content up to the ":", including it). Note that for +kretprobes, the max active count is encoded in the prefix srting. If _addr_ is non NULL, it will +hold the address or function that the kprobe is attached to. If _format_ is non NULL, it will hold +the format string of the kprobe. Note, that the content in _group_, _event_, _prefix_, _addr_, and +_format_ must be freed with free(3) if they are set. + *tracefs_kprobe_raw*() will create a kprobe event. If _system_ is NULL, then the default "kprobes" is used for the group (event system). Otherwise if _system_ is specified then the kprobe will be created under the group by that name. The @@ -36,55 +88,25 @@ document. creates a kretprobe instead of a kprobe. The difference is also described in the Linux kernel source in the Documentation/trace/kprobetrace.rst file. -*tracefs_kprobes_get*() returns an array of strings (char pass:[*]) that contain -the registered kprobes and kretprobes depending on the given _type_. If _type_ is -TRACEFS_ALL_KPROBES, then all kprobes found are returned. If _type_ is -TRACEFS_KPROBE, then only normal kprobes are returned. If _type_ is -TRACEFS_KRETPROBE, then only kretprobes are returned. -The names are in the "system/event" format. -That is, one string holds both the kprobe's name as well as the group it is -defined under. These strings are allocated and may be modified with the -*strtok*(3) and *strtok_r*(3) functions. The string returned must be freed with -*tracefs_list_free*(3). - -*tracefs_kprobe_info*() returns the type of the given kprobe. If _group_ is -NULL, then the default "kprobes" is used. If _type_ is non NULL, then it will -hold an allocated string that holds the type portion of the kprobe in the -kprobe_events file (the content before the ":"). If _addr_ is non NULL, it will -hold the address or function that the kprobe is attached to. If _format_ is non -NULL, it will hold the format string of the kprobe. Note, that the content in -_type_, _addr_, and _format_ must be freed with free(3) if they are set. Even -in the case of an error, as they may hold information of what caused the error. - -*tracefs_kprobe_clear_all*() will try to remove all kprobes that have been -registered. If the @force flag is set, it will then disable those kprobe events -if they are enabled and then try to clear the kprobes. - -*tracefs_kprobe_clear_probe*() will try to clear specified kprobes. If _system_ -is NULL, then it will only clear the default kprobes under the "kprobes" group. -If _event_ is NULL, it will clear all kprobes under the given _system_. If the -_force_ flag is set, then it will disable the given kprobe events before clearing -them. - RETURN VALUE ------------ -*tracefs_kprobe_raw*(), *tracefs_kretprobe_raw*(), *tracefs_kprobe_clear_all*(), -and *tracefs_kprobe_clear_probe*() return 0 on success, or -1 on error. +*tracefs_kprobe_raw*(), *tracefs_kretprobe_raw*(), *tracefs_kprobe_create*(), +and *tracefs_kprobe_destroy*() return 0 on success, or -1 on error. -If a parsing error occurs on *tracefs_kprobe_raw*() or *tracefs_kretprobe_raw*() -then *tracefs_error_last*(3) may be used to retrieve the error message explaining -the parsing issue. +If a parsing error occurs on *tracefs_kprobe_raw*(), *tracefs_kretprobe_raw*() or +*tracefs_kprobe_create*() then *tracefs_error_last*(3) may be used to retrieve the error message +explaining the parsing issue. -*tracefs_kprobes_get*() returns an allocate string list of allocated strings -on success that must be freed with *tracefs_list_free*(3) and returns -NULL on error. +*tracefs_kprobes_get*() returns a count of the requested krpobe types, or -1 in case of an error. +If the _kprobes_ parameter in not NULL, then an array of pointers to kprobe contexts is allocated +and passed back via _kprobes_. The size of this array is the returned count + 1, as the last element +is a NULL pointer. The array must be freed with *tracefs_dynevent_list_free*(3). -*tracefs_kprobe_info*() returns the type of the given kprobe. It returns -TRACEFS_KPROBE for normal kprobes, TRACEFS_KRETPROBE for kretprobes, and -on error, or if the kprobe is not found TRACEFS_ALL_KPROBES is returned. -If _type_, _addr_, or _format_ are non NULL, they will contain allocated -strings that must be freed by free(3) even in the case of error. +*tracefs_kprobe_info*() returns the type of the given kprobe. It returns TRACEFS_KPROBE for normal +kprobes, TRACEFS_KRETPROBE for kretprobes or TRACEFS_ALL_KPROBES on error. If _system_, _event_, +_prefix_, _addr_, or _format_ are non NULL, they will contain allocated strings that must be freed +by free(3). ERRORS ------ @@ -96,7 +118,8 @@ The following errors are for all the above calls: *ENOMEM* Memory allocation error. -*tracefs_kprobe_raw*(), *tracefs_kretprobe_raw*() can fail with the following errors: +*tracefs_kprobe_raw*(), *tracefs_kretprobe_raw*(), *tracefs_kprobe_alloc*(), +*tracefs_kretprobe_alloc*() and *tracefs_kprobe_create*() can fail with the following errors: *EBADMSG* Either _addr_ or _format_ are NULL. @@ -217,7 +240,7 @@ int main (int argc, char **argv, char **env) exit(-1); } - tracefs_kprobe_clear_probe(mykprobe, NULL, true); + tracefs_kprobe_destroy(NULL, true); kprobe_create("open", "do_sys_openat2", "file=+0($arg2):ustring flags=+0($arg3):x64 mode=+8($arg3):x64\n"); @@ -247,7 +270,7 @@ int main (int argc, char **argv, char **env) } while (waitpid(pid, NULL, WNOHANG) != pid); /* Will disable the events */ - tracefs_kprobe_clear_probe(mykprobe, NULL, true); + tracefs_kprobe_destroy(NULL, true); tracefs_instance_destroy(instance); tep_free(tep); @@ -293,5 +316,5 @@ https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/ COPYING ------- -Copyright \(C) 2020 VMware, Inc. Free use of this software is granted under +Copyright \(C) 2021 VMware, Inc. Free use of this software is granted under the terms of the GNU Public License (GPL). From patchwork Thu Oct 28 12:09:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589981 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE31FC433EF for ; Thu, 28 Oct 2021 12:09:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9A11610F8 for ; Thu, 28 Oct 2021 12:09:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230315AbhJ1MLt (ORCPT ); Thu, 28 Oct 2021 08:11:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbhJ1MLs (ORCPT ); Thu, 28 Oct 2021 08:11:48 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4A35C061570 for ; Thu, 28 Oct 2021 05:09:21 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id f8so2279720edy.4 for ; Thu, 28 Oct 2021 05:09:21 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=IPDQsRtAXSDRnHDQZgFADw+YNirUzbK2pV4QawNYHYs=; b=HZPLzGJhwFJV+jarTJ5U9P2QA8mwZ8yXrSGnAajqgdhBVbbUIa6wefhgIICGiYPbxo QDOjUVtbfOFgq/7DAWmcBQeNPePx6/e3IZpakONPnoCf5j7D9eS3CGr+utGI6GPPX/p8 NVUo4Vg2hIRguJ8MIPRHKk41OnoApy1izkNl4VfpCpcHGRtNwJbRuYvt1Mi3XJx5lIti r1g/xUGj8cwgMhAvlV42CptiLcOECo587bKRrBivIGtMtvUzDGhhYe+mu8FrCsfS60wH qzZ+YG2oHXyPBKrJbdSWGZHhIX5KQz3vwRciYHZJQrMh5KxeIZI2wD+YTaly+7jDwGaz sjww== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=IPDQsRtAXSDRnHDQZgFADw+YNirUzbK2pV4QawNYHYs=; b=bwk3ep5FJWlTGHln2dLRbOzlgg6n8GUqdjzfAqsLtz6nZfzkyINkkYrq5D5TcEAz8e 57Vo3kAey7EVJJsoYs8X4ggjtwhRVgEnyzKtZSSFsJM3dVpC2SIgDaLImVNTgrU5r74m Q8X0zreXKQsebtBKuXHm0pv9XLWHEDg2Gn2rVtmQ2at34qwJHINaTWWYRqg4Xkt6bwSs gg0yhZnq/tJozrUYr8M4hNjJmOCq7jaPDLPkPTh02M7igNM3FNahZ0i0vP0PgFDP7lqa KLPD9uopLswZi/VhssnK+dVuNUanQ2YN2ROQv5Pj33ryeJDRSnaJg0F/d/uAG8lfGFsi M9tg== X-Gm-Message-State: AOAM533N4N+NGEAntyDMktwAUfvP/PNvzMuUT6PBrNmqPfIA8Kdazc+S 5CzIWWyp40n1CPNZGXSkjL+Kvq+Xg9mDqw== X-Google-Smtp-Source: ABdhPJzpPWCg4V6B7g4mWoHcfN6vUJnDgz28Mpz+BsUcTVh5UQtogGCSQc50goZJenP3aGdej4JrUw== X-Received: by 2002:a17:906:4c58:: with SMTP id d24mr4932343ejw.510.1635422960170; Thu, 28 Oct 2021 05:09:20 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:19 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 10/12] libtracefs: Rename tracefs_synth_init API Date: Thu, 28 Oct 2021 15:09:05 +0300 Message-Id: <20211028120907.101847-11-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In order to be consistent with the others library APIs, the tracefs_synth_init() is renamed to tracefs_synth_alloc(). Signed-off-by: Tzvetomir Stoyanov (VMware) --- Documentation/libtracefs-synth.txt | 20 ++++++++++---------- Documentation/libtracefs-synth2.txt | 10 +++++----- include/tracefs.h | 18 +++++++++--------- src/tracefs-hist.c | 22 +++++++++++----------- src/tracefs-sqlhist.c | 6 +++--- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Documentation/libtracefs-synth.txt b/Documentation/libtracefs-synth.txt index 77076e1..2fd9019 100644 --- a/Documentation/libtracefs-synth.txt +++ b/Documentation/libtracefs-synth.txt @@ -3,7 +3,7 @@ libtracefs(3) NAME ---- -tracefs_synth_init, tracefs_synth_add_match_field, tracefs_synth_add_compare_field, tracefs_synth_add_start_field, +tracefs_synth_alloc, tracefs_synth_add_match_field, tracefs_synth_add_compare_field, tracefs_synth_add_start_field, tracefs_synth_add_end_field, tracefs_synth_append_start_filter, tracefs_synth_append_end_filter, tracefs_synth_free, - Creation of a synthetic event descriptor @@ -13,7 +13,7 @@ SYNOPSIS -- *#include * -struct tracefs_synth pass:[*]tracefs_synth_init(struct tep_handle pass:[*]tep, +struct tracefs_synth pass:[*]tracefs_synth_alloc(struct tep_handle pass:[*]tep, const char pass:[*]name, const char pass:[*]start_system, const char pass:[*]start_event, @@ -69,7 +69,7 @@ as a field for both events to calculate the delta in nanoseconds, or use *TRACEFS_TIMESTAMP_USECS" as the compare fields for both events to calculate the delta in microseconds. This is used as the example below. -*tracefs_synth_init*() allocates and initializes a synthetic event. +*tracefs_synth_alloc*() allocates and initializes a synthetic event. It does not create the synthetic event, but supplies the minimal information to do so. See *tracefs_synth_create*(3) for how to create the synthetic event in the system. It requires a _tep_ handler that can be created by @@ -156,11 +156,11 @@ _field_, _compare_, and _val_ are ignored unless _type_ is equal to filters on the ending event. *tracefs_synth_free*() frees the allocated descriptor returned by -*tracefs_synth_init*(). +*tracefs_synth_alloc*(). RETURN VALUE ------------ -*tracefs_synth_init*() returns an allocated struct tracefs_synth descriptor +*tracefs_synth_alloc*() returns an allocated struct tracefs_synth descriptor on sucess or NULL on error. All other functions that return an integer returns zero on success or -1 @@ -209,11 +209,11 @@ static void make_event(void) tep = tracefs_local_events(NULL); /* Initialize the synthetic event */ - synth = tracefs_synth_init(tep, "wakeup_lat", - NULL, start_event, - NULL, end_event, - start_field, end_field, - match_name); + synth = tracefs_synth_alloc(tep, "wakeup_lat", + NULL, start_event, + NULL, end_event, + start_field, end_field, + match_name); /* The tep is no longer needed */ tep_free(tep); diff --git a/Documentation/libtracefs-synth2.txt b/Documentation/libtracefs-synth2.txt index 4c44253..f734b44 100644 --- a/Documentation/libtracefs-synth2.txt +++ b/Documentation/libtracefs-synth2.txt @@ -142,11 +142,11 @@ static void make_event(void) tep = tracefs_local_events(NULL); /* Initialize the synthetic event */ - synth = tracefs_synth_init(tep, "wakeup_lat", - NULL, start_event, - NULL, end_event, - start_field, end_field, - match_name); + synth = tracefs_synth_alloc(tep, "wakeup_lat", + NULL, start_event, + NULL, end_event, + start_field, end_field, + match_name); /* The tep is no longer needed */ tep_free(tep); diff --git a/include/tracefs.h b/include/tracefs.h index c65f21f..418725e 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -472,15 +472,15 @@ enum tracefs_synth_handler { TRACEFS_SYNTH_HANDLE_CHANGE, }; -struct tracefs_synth *tracefs_synth_init(struct tep_handle *tep, - const char *name, - const char *start_system, - const char *start_event, - const char *end_system, - const char *end_event, - const char *start_match_field, - const char *end_match_field, - const char *match_name); +struct tracefs_synth *tracefs_synth_alloc(struct tep_handle *tep, + const char *name, + const char *start_system, + const char *start_event, + const char *end_system, + const char *end_event, + const char *start_match_field, + const char *end_match_field, + const char *match_name); int tracefs_synth_add_match_field(struct tracefs_synth *synth, const char *start_match_field, const char *end_match_field, diff --git a/src/tracefs-hist.c b/src/tracefs-hist.c index 27bab00..9009dba 100644 --- a/src/tracefs-hist.c +++ b/src/tracefs-hist.c @@ -692,7 +692,7 @@ static void action_free(struct action *action) * @synth: The tracefs_synth descriptor * * Frees the resources allocated for a @synth created with - * tracefs_synth_init(). It does not touch the system. That is, + * tracefs_synth_alloc(). It does not touch the system. That is, * any synthetic event created, will not be destroyed by this * function. */ @@ -890,7 +890,7 @@ synth_init_from(struct tep_handle *tep, const char *start_system, } /** - * tracefs_synth_init - create a new tracefs_synth instance + * tracefs_synth_alloc - create a new tracefs_synth instance * @tep: The tep handle that holds the events to work on * @name: The name of the synthetic event being created * @start_system: The name of the system of the start event (can be NULL) @@ -933,15 +933,15 @@ synth_init_from(struct tep_handle *tep, const char *start_system, * event on the system is not created. That needs to be done with * tracefs_synth_create(). */ -struct tracefs_synth *tracefs_synth_init(struct tep_handle *tep, - const char *name, - const char *start_system, - const char *start_event_name, - const char *end_system, - const char *end_event_name, - const char *start_match_field, - const char *end_match_field, - const char *match_name) +struct tracefs_synth *tracefs_synth_alloc(struct tep_handle *tep, + const char *name, + const char *start_system, + const char *start_event_name, + const char *end_system, + const char *end_event_name, + const char *start_match_field, + const char *end_match_field, + const char *match_name) { struct tep_event *end_event; struct tracefs_synth *synth; diff --git a/src/tracefs-sqlhist.c b/src/tracefs-sqlhist.c index d77ce86..016f3eb 100644 --- a/src/tracefs-sqlhist.c +++ b/src/tracefs-sqlhist.c @@ -1419,9 +1419,9 @@ static struct tracefs_synth *build_synth(struct tep_handle *tep, assign_match(start_system, start_event, match, &start_match, &end_match); - synth = tracefs_synth_init(tep, name, start_system, - start_event, end_system, end_event, - start_match, end_match, NULL); + synth = tracefs_synth_alloc(tep, name, start_system, + start_event, end_system, end_event, + start_match, end_match, NULL); if (!synth) return synth_init_error(tep, table); From patchwork Thu Oct 28 12:09:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589983 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F32FDC433F5 for ; Thu, 28 Oct 2021 12:09:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DFBA660F90 for ; Thu, 28 Oct 2021 12:09:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230188AbhJ1MLt (ORCPT ); Thu, 28 Oct 2021 08:11:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbhJ1MLt (ORCPT ); Thu, 28 Oct 2021 08:11:49 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74756C061570 for ; Thu, 28 Oct 2021 05:09:22 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id w1so4941529edd.0 for ; Thu, 28 Oct 2021 05:09:22 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=PuD6jSrPmqYggXjSyruuq5W1e3gv/9KJaGmkfv5dVdc=; b=pZcE1UfP/wAXnZkJsmTT9SP5BPb59Gy0Xm651IZe24cqqtYimvP23rQgDEQGhgbRd2 y0/aPxPKCrqty08s5w4201tYJaaau+1CUIUMi9i4migGu4SRHcXFHERE6EBx33rv1CtO 1rncazE9aXRSIyCl4XvgJYp/bfH+D7MrcDS/lidNmf1iE9Uu+yuoY1+c7AFfNX6a/pVt 2yCgLNtw7y3Z8JMZVXfESPArfZAV14yzXWq3JnEvqQfhO5mgV3GDE0q5GgrjvbXxavrH oD835K5QtdrEVG7+x4KRoNKwfs69dV4kmhq6OKBAe/rgm/gT4fdN1DFVmBZizk4Y5Ygh VRFg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=PuD6jSrPmqYggXjSyruuq5W1e3gv/9KJaGmkfv5dVdc=; b=UZ6MLV1D7mL5Ng9G7sKW2Z59+FVlwzxs/B9Kw0AGFUT1A2oxlemN3t14nvyMEIxKWZ A1l1DNKCrr+E+mW71jb5PS9qU+aaxerY+XGMX7/HN4O1zoYOz7jLNc0ms1JpHs5ta0jl SwxVRkhGQLS//wotlmZQpHqnwdkOxpp+ik5S+9PvQ85SrsskagzxFG1DV8BFNXfQwbKX dAtRzsqT35umCeqKBh7WHjz6O9evGLCNVuD5/3T/pU44N4vMdn0W38TytSYpi0IohcJ4 pg95TXlF6qS/h3eP4grr5QP1XPSnVtc9y0X4ef3eUwaJz8EDQxW9fSOf1zeFZMnWaxd1 M87Q== X-Gm-Message-State: AOAM530rq5RxZGjr4LM7XOwjD9oNQMSrWOCv7XrzpDii01IuHmAokwWL At2U6J6SQwDE85PPc0371T/4/DAo0qcr7Q== X-Google-Smtp-Source: ABdhPJxWGjK9uY+Q4mV5Nzwr94FL0EY6EJgL9Qdh5iftKZc6rpj+hHfDNWSTe1qiOTJEP2UZakOeIw== X-Received: by 2002:a05:6402:158:: with SMTP id s24mr5677152edu.189.1635422961091; Thu, 28 Oct 2021 05:09:21 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:20 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 11/12] libtracefs: Use the internal dynamic events API when creating synthetic events Date: Thu, 28 Oct 2021 15:09:06 +0300 Message-Id: <20211028120907.101847-12-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Synthetic events are type of ftrace dynamic events. The tracefs library has an internal helper APIs to manage dynamic events of all types. In order the code to be consistent, the creation of synthetic events inside the library is reimplemented with these new dynamic events APIs. Signed-off-by: Tzvetomir Stoyanov (VMware) --- src/tracefs-hist.c | 88 +++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 55 deletions(-) diff --git a/src/tracefs-hist.c b/src/tracefs-hist.c index 9009dba..7ac0023 100644 --- a/src/tracefs-hist.c +++ b/src/tracefs-hist.c @@ -661,6 +661,7 @@ struct tracefs_synth { struct tep_event *end_event; struct action *actions; struct action **next_action; + struct tracefs_dynevent *dyn_event; char *name; char **synthetic_fields; char **synthetic_args; @@ -719,6 +720,7 @@ void tracefs_synth_free(struct tracefs_synth *synth) synth->actions = action->next; action_free(action); } + dynevent_free(synth->dyn_event); free(synth); } @@ -889,6 +891,28 @@ synth_init_from(struct tep_handle *tep, const char *start_system, return synth; } +static int alloc_synthetic_event(struct tracefs_synth *synth) +{ + char *synthetic_format; + const char *field; + int i; + + synthetic_format = strdup(""); + if (!synthetic_format) + return -1; + + for (i = 0; synth->synthetic_fields && synth->synthetic_fields[i]; i++) { + field = synth->synthetic_fields[i]; + synthetic_format = append_string(synthetic_format, " ", field); + } + + synth->dyn_event = dynevent_alloc(TRACE_DYNEVENT_SYNTH, NULL, + synth->name, NULL, synthetic_format); + free(synthetic_format); + + return synth->dyn_event ? 0 : -1; +} + /** * tracefs_synth_alloc - create a new tracefs_synth instance * @tep: The tep handle that holds the events to work on @@ -1609,38 +1633,6 @@ int tracefs_synth_save(struct tracefs_synth *synth, return 0; } -static char *create_synthetic_event(struct tracefs_synth *synth) -{ - char *synthetic_event; - const char *field; - int i; - - synthetic_event = strdup(synth->name); - if (!synthetic_event) - return NULL; - - for (i = 0; synth->synthetic_fields && synth->synthetic_fields[i]; i++) { - field = synth->synthetic_fields[i]; - synthetic_event = append_string(synthetic_event, " ", field); - } - - return synthetic_event; -} - -static int remove_synthetic(const char *synthetic) -{ - char *str; - int ret; - - ret = asprintf(&str, "!%s", synthetic); - if (ret < 0) - return -1; - - ret = tracefs_instance_file_append(NULL, "synthetic_events", str); - free(str); - return ret < 0 ? -1 : 0; -} - static int remove_hist(struct tracefs_instance *instance, struct tep_event *event, const char *hist) { @@ -1919,7 +1911,6 @@ tracefs_synth_get_start_hist(struct tracefs_synth *synth) int tracefs_synth_create(struct tracefs_instance *instance, struct tracefs_synth *synth) { - char *synthetic_event; char *start_hist = NULL; char *end_hist = NULL; int ret; @@ -1937,14 +1928,10 @@ int tracefs_synth_create(struct tracefs_instance *instance, if (verify_state(synth) < 0) return -1; - synthetic_event = create_synthetic_event(synth); - if (!synthetic_event) + if (!synth->dyn_event && alloc_synthetic_event(synth)) + return -1; + if (!dynevent_create(synth->dyn_event)) return -1; - - ret = tracefs_instance_file_append(NULL, "synthetic_events", - synthetic_event); - if (ret < 0) - goto free_synthetic; start_hist = create_hist(synth->start_keys, synth->start_vars); start_hist = append_filter(start_hist, synth->start_filter, @@ -1980,9 +1967,7 @@ int tracefs_synth_create(struct tracefs_instance *instance, remove_synthetic: free(end_hist); free(start_hist); - remove_synthetic(synthetic_event); - free_synthetic: - free(synthetic_event); + dynevent_destroy(synth->dyn_event); return -1; } @@ -2007,7 +1992,6 @@ int tracefs_synth_create(struct tracefs_instance *instance, int tracefs_synth_destroy(struct tracefs_instance *instance, struct tracefs_synth *synth) { - char *synthetic_event; char *hist; int ret; @@ -2041,11 +2025,7 @@ int tracefs_synth_destroy(struct tracefs_instance *instance, ret = remove_hist(instance, synth->start_event, hist); free(hist); - synthetic_event = create_synthetic_event(synth); - if (!synthetic_event) - return -1; - - ret = remove_synthetic(synthetic_event); + ret = dynevent_destroy(synth->dyn_event); return ret ? -1 : 0; } @@ -2067,7 +2047,6 @@ int tracefs_synth_show(struct trace_seq *seq, struct tracefs_instance *instance, struct tracefs_synth *synth) { - char *synthetic_event = NULL; char *hist = NULL; char *path; int ret = -1; @@ -2082,16 +2061,16 @@ int tracefs_synth_show(struct trace_seq *seq, return -1; } - synthetic_event = create_synthetic_event(synth); - if (!synthetic_event) + if (!synth->dyn_event && alloc_synthetic_event(synth)) return -1; path = trace_find_tracing_dir(); if (!path) goto out_free; - trace_seq_printf(seq, "echo '%s' > %s/synthetic_events\n", - synthetic_event, path); + trace_seq_printf(seq, "echo '%s%s %s' > %s/%s\n", + synth->dyn_event->prefix, synth->dyn_event->event, + synth->dyn_event->format, path, synth->dyn_event->trace_file); tracefs_put_tracing_file(path); path = tracefs_instance_get_dir(instance); @@ -2118,7 +2097,6 @@ int tracefs_synth_show(struct trace_seq *seq, ret = 0; out_free: - free(synthetic_event); free(hist); tracefs_put_tracing_file(path); return ret; From patchwork Thu Oct 28 12:09:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12589985 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93B9FC4332F for ; Thu, 28 Oct 2021 12:09:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C1BA610CA for ; Thu, 28 Oct 2021 12:09:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230318AbhJ1MLu (ORCPT ); Thu, 28 Oct 2021 08:11:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbhJ1MLu (ORCPT ); Thu, 28 Oct 2021 08:11:50 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 690ABC061570 for ; Thu, 28 Oct 2021 05:09:23 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id r12so23967475edt.6 for ; Thu, 28 Oct 2021 05:09:23 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=akQzZgBjI6nbqVpWTSjXjrsovzXSpLnqRfVY2Y/4Fho=; b=OoKdVpWhHDzGW6R7tmoBGoxZje+jM4bUzQ67/UqwARj5Nhz+AlAaWF4P+OW14Es5qs 8JW0zaPcfc/GGlwqSTUV/Y5550ONx1OwQKCjoFDvVY1js22ex9J0+0yjszk4IQbjd5QA UWZPDhMxpD5x2nN+1hPiVumeQv9Gymd3zc8rwZxRWshGV1aIRsi+PnHe6bPHrNP9FH/Y A475IFVKa5tqfB8gndeCmeCb1x3Y75djrSU+Quj91eY8StdmAS6i6uEysVg1xuUXMyNR F/viEnPUlmqCFdxewnMj5xqcUi9GZ5/oVYTmp0BV776Optq0Y0v7rVJk18fEIDWOKB3a Hyew== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=akQzZgBjI6nbqVpWTSjXjrsovzXSpLnqRfVY2Y/4Fho=; b=dMwCbwvf3UgGC0yPxxTBgdHEVwuCWod+NnAiLN5TkOYgRRzgcW+dt3Wy8rrA3yyDqX u7MwBRnCdBoA1tmXIuzbz/GGWSMlW8wzQzT4Ba3EwHpCSSQ7ZHeinYWgt8l07AgpAAnC XeXjf+pVHJdLVNlWpTCceuPGkNEmLe9BAU6kIUkO0Zuci0LtBOLuu+OvWIoH59HADtCq gGOZSss0E8Cg7JfmrAfaLmsWjee1bHgVQH6i9bZLpvEYFUBzza08atTicQgw02wBaU82 x8CRxrnNajoRbEeBbJDHG+JVVGtrBpLHI/HpjbuySK9p4JYB6Jx/8sX4HJnhUhBqBHDv kfQQ== X-Gm-Message-State: AOAM530UiS4iOK0/t4elCxcNYjl8C90CghBAZt1eTEoPoXlJA/g7kT8H s6Usah9UH+o+BBFr7duRZEc9vAXsUjP1HA== X-Google-Smtp-Source: ABdhPJzVkajY4R3QdcjGSGetf+tCgeCA3alTgAVfPOmfVrDZNxMgimsi1yBUPDzuTxkNJvTKIG1Exw== X-Received: by 2002:a05:6402:14cc:: with SMTP id f12mr5632023edx.242.1635422962031; Thu, 28 Oct 2021 05:09:22 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id v6sm1803003edc.52.2021.10.28.05.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 05:09:21 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 12/12] libtracefs: Document tracefs_dynevent_list_free() API Date: Thu, 28 Oct 2021 15:09:07 +0300 Message-Id: <20211028120907.101847-13-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028120907.101847-1-tz.stoyanov@gmail.com> References: <20211028120907.101847-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The newly added tracefs_dynevent_list_free() should be documented in the library man pages. Signed-off-by: Tzvetomir Stoyanov (VMware) --- Documentation/libtracefs-utils.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/libtracefs-utils.txt b/Documentation/libtracefs-utils.txt index 41544ab..2908d41 100644 --- a/Documentation/libtracefs-utils.txt +++ b/Documentation/libtracefs-utils.txt @@ -3,7 +3,7 @@ libtracefs(3) NAME ---- -tracefs_tracers, tracefs_get_clock, tracefs_list_free - +tracefs_tracers, tracefs_get_clock, tracefs_list_free, tracefs_dynevent_list_free - Helper functions for working with trace file system. SYNOPSIS @@ -15,6 +15,7 @@ SYNOPSIS char pass:[*]pass:[*]*tracefs_tracers*(const char pass:[*]_tracing_dir_); char pass:[*]*tracefs_get_clock*(struct tracefs_instance pass:[*]_instance_); void *tracefs_list_free*(char pass:[*]pass:[*]_list_); +void *tracefs_dynevent_list_free*(struct tracefs_dynevent pass:[*]pass:[*]pass:[*]events); -- DESCRIPTION @@ -36,6 +37,9 @@ The _tracefs_list_free()_ function frees an array of strings, returned by _tracefs_event_systems()_, _tracefs_system_events()_ and _tracefs_tracers()_ APIs. +The _tracefs_dynevent_list_free()_ functions frees an array of pointers to dynamic event contexts, +returned by_tracefs_kprobes_get()_ API. + RETURN VALUE ------------ The _tracefs_tracers()_ returns array of strings. The last element in that