From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 596ADC433B4 for ; Fri, 9 Apr 2021 04:27:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2832661168 for ; Fri, 9 Apr 2021 04:27:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229613AbhDIE1z (ORCPT ); Fri, 9 Apr 2021 00:27:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbhDIE1z (ORCPT ); Fri, 9 Apr 2021 00:27:55 -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 A693AC061760 for ; Thu, 8 Apr 2021 21:27:42 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id 18so4961402edx.3 for ; Thu, 08 Apr 2021 21:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Uj3LIt72G6bpqd0R7UO3Uf23T0TrENooxI6zcJPIFGY=; b=dg3+4fXmJk7y3BhuYOtZpRI0g8kt2/cGZTv+DFC5YaJwECF5hLDAsm/5LeKfg1UiCd lENLS7HE+dNQB9uRObi8jEb9S8RZr+qU5+1gZl8DcUYguOJcNr6UA0NE7roj4pNErA3C bfxD1g+YJuPI/xc8KLKB20eYBY5xuJInZWLlMvPVXfO2aJU8QmyuzsixwJ8xRjGkOKGZ qPKGa3DXG3yJxdvYsMy7ksbXCVG/IcCH7JTgehLBHuK6iKW0coYCn6Z3JSw9Lm50ovyG aNvyL+0jId+sSmQhbS96S7ZbroXj0C9m7EAISU9yLww2ciqmM7GvoRB8DBunbSlitq/H eaXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Uj3LIt72G6bpqd0R7UO3Uf23T0TrENooxI6zcJPIFGY=; b=ZqQu+dZGZXDbzmxPCtgp+biiqqqNQA4PE5QtuIa/ObMq/YOkv8tUJ1v4sePMAtBY23 xTXhzAr659z6i96sEbekJFQqY3DwvTD7es/ZIbSW1Ft/tJRq1Yh0m0MflvfYml01k6yN 6RjGsvmgv94I+xw2QqPvEvWm4GPOInL7UgROuJotHTOf0HJO6bxThr83itDojPNbc+Cx k735ubiUzxqsX46HenHJsCabXTwrXaETYgMs4a7IPMLKEYvjwHW4yK9CdFKfPcDj4rcs wxllA2Uk/FMl4+xQCY0q1tvMgLGESgzdbGoeT4D7UJ3Xa4R2KMWGQiNrAQlgKxG+v5Ob 7ekg== X-Gm-Message-State: AOAM533qhRS+FNyopRXpmbjWVaps9p9kG9r9n1HPEG4D5fcxD0mso/l5 /5uefNDdILD0q/ri8PcAp/BSuizDdGEKng== X-Google-Smtp-Source: ABdhPJzyYvlsXBaEjWNdZO4S3nXi14l24J6o37wDhRfB9LovnhsaRQHdL6NKDVNA5+0nGxXhNlGWFA== X-Received: by 2002:a50:fb8c:: with SMTP id e12mr15878748edq.295.1617942461326; Thu, 08 Apr 2021 21:27:41 -0700 (PDT) Received: from oberon.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id u13sm618390ejj.16.2021.04.08.21.27.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 21:27:40 -0700 (PDT) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v3] libtracefs: Add new API for open trace marker file Date: Fri, 9 Apr 2021 07:27:39 +0300 Message-Id: <20210409042739.3179257-1-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Added new APIs for working with trace marker files of given instance. Write strings in the trace_marker file: tracefs_print_init(); tracefs_printf(); tracefs_vprintf(); tracefs_print_close(); Write binary data in trace_marker_raw file: tracefs_binary_init(); tracefs_binary_write(); tracefs_binary_close(); Signed-off-by: Tzvetomir Stoyanov (VMware) --- v3 changes: - Split the APIs in two groups - printing formated strings and writing binary data v2 changes: - Added set of new APIs, instead of the previously proposed API for just opening the file. include/tracefs-local.h | 2 + include/tracefs.h | 11 +++ src/Makefile | 1 + src/tracefs-instance.c | 6 ++ src/tracefs-marker.c | 175 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 195 insertions(+) create mode 100644 src/tracefs-marker.c diff --git a/include/tracefs-local.h b/include/tracefs-local.h index 5a69ef7..d9bbf6e 100644 --- a/include/tracefs-local.h +++ b/include/tracefs-local.h @@ -20,6 +20,8 @@ struct tracefs_instance { char *name; int flags; int ftrace_filter_fd; + int ftrace_marker_fd; + int ftrace_marker_raw_fd; }; /* Can be overridden */ diff --git a/include/tracefs.h b/include/tracefs.h index befcc48..7181b75 100644 --- a/include/tracefs.h +++ b/include/tracefs.h @@ -63,6 +63,17 @@ static inline int tracefs_trace_on_get_fd(struct tracefs_instance *instance) return tracefs_instance_file_open(instance, "tracing_on", O_RDWR); } +/* trace print string*/ +int tracefs_print_init(struct tracefs_instance *instance); +int tracefs_printf(struct tracefs_instance *instance, const char *fmt, ...); +int tracefs_vprintf(struct tracefs_instance *instance, const char *fmt, va_list ap); +void tracefs_print_close(struct tracefs_instance *instance); + +/* trace write binary data*/ +int tracefs_binary_init(struct tracefs_instance *instance); +int tracefs_binary_write(struct tracefs_instance *instance, void *data, int len); +void tracefs_binary_close(struct tracefs_instance *instance); + /* events */ void tracefs_list_free(char **list); char **tracefs_event_systems(const char *tracing_dir); diff --git a/src/Makefile b/src/Makefile index dabdbb4..b4cff07 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,6 +7,7 @@ OBJS += tracefs-utils.o OBJS += tracefs-instance.o OBJS += tracefs-events.o OBJS += tracefs-tools.o +OBJS += tracefs-marker.o OBJS := $(OBJS:%.o=$(bdir)/%.o) DEPS := $(OBJS:$(bdir)/%.o=$(bdir)/.%.d) diff --git a/src/tracefs-instance.c b/src/tracefs-instance.c index e87b360..bedf000 100644 --- a/src/tracefs-instance.c +++ b/src/tracefs-instance.c @@ -44,6 +44,8 @@ static struct tracefs_instance *instance_alloc(const char *trace_dir, const char } instance->ftrace_filter_fd = -1; + instance->ftrace_marker_fd = -1; + instance->ftrace_marker_raw_fd = -1; return instance; @@ -68,6 +70,10 @@ void tracefs_instance_free(struct tracefs_instance *instance) return; free(instance->trace_dir); free(instance->name); + if (instance->ftrace_marker_fd >= 0) + close(instance->ftrace_marker_fd); + if (instance->ftrace_marker_raw_fd >= 0) + close(instance->ftrace_marker_raw_fd); free(instance); } diff --git a/src/tracefs-marker.c b/src/tracefs-marker.c new file mode 100644 index 0000000..0dc72f6 --- /dev/null +++ b/src/tracefs-marker.c @@ -0,0 +1,175 @@ +// SPDX-License-Identifier: LGPL-2.1 +/* + * Copyright (C) 2021, VMware, Tzvetomir Stoyanov + * + */ + +#include +#include +#include + +#include "tracefs.h" +#include "tracefs-local.h" + +/* File descriptors for Top level trace markers */ +static int ftrace_marker_fd = -1; +static int ftrace_marker_raw_fd = -1; + +static inline int *get_marker_fd(struct tracefs_instance *instance, bool raw) +{ + if (raw) + return instance ? &instance->ftrace_marker_raw_fd : &ftrace_marker_raw_fd; + return instance ? &instance->ftrace_marker_fd : &ftrace_marker_fd; +} + +static int marker_init(struct tracefs_instance *instance, bool raw) +{ + int *fd = get_marker_fd(instance, raw); + + if (*fd >= 0) + return 0; + if (raw) + *fd = tracefs_instance_file_open(instance, "trace_marker_raw", O_WRONLY | O_CLOEXEC); + else + *fd = tracefs_instance_file_open(instance, "trace_marker", O_WRONLY | O_CLOEXEC); + + return *fd < 0 ? -1 : 0; +} + +static void marker_close(struct tracefs_instance *instance, bool raw) +{ + int *fd = get_marker_fd(instance, raw); + + if (*fd < 0) + return; + close(*fd); + *fd = -1; +} + +static int marker_write(struct tracefs_instance *instance, bool raw, void *data, int len) +{ + int *fd = get_marker_fd(instance, raw); + int ret; + + if (!data || len < 1) + return -1; + if (*fd < 0) { + ret = marker_init(instance, raw); + if (ret < 0) + return ret; + } + + ret = write(*fd, data, len); + + return ret == len ? 0 : -1; +} + +/** + * tracefs_print_init - Open trace marker of selected instance for writing + * @instance: ftrace instance, can be NULL for top tracing instance. + * + * Returns 0 if the trace marker is opened successfully, or -1 in case of an error + */ +int tracefs_print_init(struct tracefs_instance *instance) +{ + return marker_init(instance, false); +} + +/** + * tracefs_vprintf - Write a formatted string in the trace marker + * @instance: ftrace instance, can be NULL for top tracing instance. + * @fmt: pritnf formatted string + * @ap: list of arguments for the formatted string + * + * If the trace marker of the desired instance is not open already, + * this API will open it for writing. It will stay open until + * tracefs_print_close() is called. + * + * Returns 0 if the string is written correctly, or -1 in case of an error + */ +int tracefs_vprintf(struct tracefs_instance *instance, const char *fmt, va_list ap) +{ + char *str = NULL; + int ret; + + ret = vasprintf(&str, fmt, ap); + if (ret < 0) + return ret; + ret = marker_write(instance, false, str, strlen(str) + 1); + free(str); + + return ret; +} + +/** + * tracefs_printf - Write a formatted string in the trace marker + * @instance: ftrace instance, can be NULL for top tracing instance. + * @fmt: pritnf formatted string with variable arguments ... + * + * If the trace marker of the desired instance is not open already, + * this API will open it for writing. It will stay open until + * tracefs_print_close() is called. + * + * Returns 0 if the string is written correctly, or -1 in case of an error + */ +int tracefs_printf(struct tracefs_instance *instance, const char *fmt, ...) +{ + va_list ap; + int ret; + + va_start(ap, fmt); + ret = tracefs_vprintf(instance, fmt, ap); + va_end(ap); + + return ret; +} + +/** + * tracefs_print_close - Close trace marker of selected instance + * @instance: ftrace instance, can be NULL for top tracing instance. + * + * Closes the trace marker, previously opened with any of the other tracefs_print APIs + */ +void tracefs_print_close(struct tracefs_instance *instance) +{ + marker_close(instance, false); +} + +/** + * tracefs_binary_init - Open raw trace marker of selected instance for writing + * @instance: ftrace instance, can be NULL for top tracing instance. + * + * Returns 0 if the raw trace marker is opened successfully, or -1 in case of an error + */ +int tracefs_binary_init(struct tracefs_instance *instance) +{ + return marker_init(instance, true); +} + +/** + * tracefs_binary_write - Write binary data in the raw trace marker + * @instance: ftrace instance, can be NULL for top tracing instance. + * @data: binary data, that is going to be written in the trace marker + * @len: length of the @data + * + * If the raw trace marker of the desired instance is not open already, + * this API will open it for writing. It will stay open until + * tracefs_binary_close() is called. + * + * Returns 0 if the data is written correctly, or -1 in case of an error + */ +int tracefs_binary_write(struct tracefs_instance *instance, void *data, int len) +{ + return marker_write(instance, true, data, len); +} + +/** + * tracefs_binary_close - Close raw trace marker of selected instance + * @instance: ftrace instance, can be NULL for top tracing instance. + * + * Closes the raw trace marker, previously opened with any of the other tracefs_binary APIs + */ +void tracefs_binary_close(struct tracefs_instance *instance) +{ + marker_close(instance, true); +} -- 2.30.2