From: Daniel Bristot de Oliveira <bristot@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Phil Auld <pauld@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Kate Carcia <kcarcia@redhat.com>,
Daniel Bristot de Oliveira <bristot@redhat.com>,
Jonathan Corbet <corbet@lwn.net>,
Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Alexandre Chartre <alexandre.chartre@oracle.com>,
Clark Willaims <williams@redhat.com>,
John Kacur <jkacur@redhat.com>,
Juri Lelli <juri.lelli@redhat.com>,
linux-doc@vger.kernel.org
Subject: [PATCH V3 6/9] trace/hwlat: Use the generic function to read/write width and window
Date: Fri, 14 May 2021 22:51:15 +0200 [thread overview]
Message-ID: <bf0c568ddaf9e75e3d2e77b0ffd5ad1508c47afc.1621024265.git.bristot@redhat.com> (raw)
In-Reply-To: <cover.1621024265.git.bristot@redhat.com>
Use the trace_ull_config generic implementation to reducing the code of
hwlat detector.
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Alexandre Chartre <alexandre.chartre@oracle.com>
Cc: Clark Willaims <williams@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Daniel Bristot de Oliveira <bristot@redhat.com>
---
kernel/trace/trace_hwlat.c | 135 ++++---------------------------------
1 file changed, 14 insertions(+), 121 deletions(-)
diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c
index 84689fa14d9a..02247263d94a 100644
--- a/kernel/trace/trace_hwlat.c
+++ b/kernel/trace/trace_hwlat.c
@@ -504,115 +504,6 @@ static int start_per_cpu_kthreads(struct trace_array *tr)
return 0;
}
-/*
- * hwlat_read - Wrapper read function for reading both window and width
- * @filp: The active open file structure
- * @ubuf: The userspace provided buffer to read value into
- * @cnt: The maximum number of bytes to read
- * @ppos: The current "file" position
- *
- * This function provides a generic read implementation for the global state
- * "hwlat_data" structure filesystem entries.
- */
-static ssize_t hwlat_read(struct file *filp, char __user *ubuf,
- size_t cnt, loff_t *ppos)
-{
- char buf[U64STR_SIZE];
- u64 *entry = filp->private_data;
- u64 val;
- int len;
-
- if (!entry)
- return -EFAULT;
-
- if (cnt > sizeof(buf))
- cnt = sizeof(buf);
-
- val = *entry;
-
- len = snprintf(buf, sizeof(buf), "%llu\n", val);
-
- return simple_read_from_buffer(ubuf, cnt, ppos, buf, len);
-}
-
-/**
- * hwlat_width_write - Write function for "width" entry
- * @filp: The active open file structure
- * @ubuf: The user buffer that contains the value to write
- * @cnt: The maximum number of bytes to write to "file"
- * @ppos: The current position in @file
- *
- * This function provides a write implementation for the "width" interface
- * to the hardware latency detector. It can be used to configure
- * for how many us of the total window us we will actively sample for any
- * hardware-induced latency periods. Obviously, it is not possible to
- * sample constantly and have the system respond to a sample reader, or,
- * worse, without having the system appear to have gone out to lunch. It
- * is enforced that width is less that the total window size.
- */
-static ssize_t
-hwlat_width_write(struct file *filp, const char __user *ubuf,
- size_t cnt, loff_t *ppos)
-{
- u64 val;
- int err;
-
- err = kstrtoull_from_user(ubuf, cnt, 10, &val);
- if (err)
- return err;
-
- mutex_lock(&hwlat_data.lock);
- if (val < hwlat_data.sample_window)
- hwlat_data.sample_width = val;
- else
- err = -EINVAL;
- mutex_unlock(&hwlat_data.lock);
-
- if (err)
- return err;
-
- return cnt;
-}
-
-/**
- * hwlat_window_write - Write function for "window" entry
- * @filp: The active open file structure
- * @ubuf: The user buffer that contains the value to write
- * @cnt: The maximum number of bytes to write to "file"
- * @ppos: The current position in @file
- *
- * This function provides a write implementation for the "window" interface
- * to the hardware latency detector. The window is the total time
- * in us that will be considered one sample period. Conceptually, windows
- * occur back-to-back and contain a sample width period during which
- * actual sampling occurs. Can be used to write a new total window size. It
- * is enforced that any value written must be greater than the sample width
- * size, or an error results.
- */
-static ssize_t
-hwlat_window_write(struct file *filp, const char __user *ubuf,
- size_t cnt, loff_t *ppos)
-{
- u64 val;
- int err;
-
- err = kstrtoull_from_user(ubuf, cnt, 10, &val);
- if (err)
- return err;
-
- mutex_lock(&hwlat_data.lock);
- if (hwlat_data.sample_width < val)
- hwlat_data.sample_window = val;
- else
- err = -EINVAL;
- mutex_unlock(&hwlat_data.lock);
-
- if (err)
- return err;
-
- return cnt;
-}
-
static void *s_mode_start(struct seq_file *s, loff_t *pos)
{
int mode = *pos;
@@ -733,16 +624,18 @@ static ssize_t hwlat_mode_write(struct file *filp, const char __user *ubuf,
return ret;
}
-static const struct file_operations width_fops = {
- .open = tracing_open_generic,
- .read = hwlat_read,
- .write = hwlat_width_write,
+static struct trace_ull_config hwlat_width = {
+ .lock = &hwlat_data.lock,
+ .val = &hwlat_data.sample_width,
+ .max = &hwlat_data.sample_window,
+ .min = NULL,
};
-static const struct file_operations window_fops = {
- .open = tracing_open_generic,
- .read = hwlat_read,
- .write = hwlat_window_write,
+static struct trace_ull_config hwlat_window = {
+ .lock = &hwlat_data.lock,
+ .val = &hwlat_data.sample_window,
+ .max = NULL,
+ .min = &hwlat_data.sample_width,
};
static const struct file_operations thread_mode_fops = {
@@ -775,15 +668,15 @@ static int init_tracefs(void)
hwlat_sample_window = tracefs_create_file("window", 0640,
top_dir,
- &hwlat_data.sample_window,
- &window_fops);
+ &hwlat_window,
+ &trace_ull_config_fops);
if (!hwlat_sample_window)
goto err;
hwlat_sample_width = tracefs_create_file("width", 0644,
top_dir,
- &hwlat_data.sample_width,
- &width_fops);
+ &hwlat_width,
+ &trace_ull_config_fops);
if (!hwlat_sample_width)
goto err;
--
2.26.3
next prev parent reply other threads:[~2021-05-14 20:52 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 20:51 [PATCH V3 0/9] hwlat improvements and osnoise/timerlat tracers Daniel Bristot de Oliveira
2021-05-14 20:51 ` [PATCH V3 1/9] tracing/hwlat: Fix Clark's email Daniel Bristot de Oliveira
2021-05-14 20:51 ` [PATCH V3 2/9] tracing/hwlat: Implement the mode config option Daniel Bristot de Oliveira
2021-06-03 20:11 ` Steven Rostedt
2021-05-14 20:51 ` [PATCH V3 3/9] tracing/hwlat: Switch disable_migrate to mode none Daniel Bristot de Oliveira
2021-05-14 20:51 ` [PATCH V3 4/9] tracing/hwlat: Implement the per-cpu mode Daniel Bristot de Oliveira
2021-05-27 11:58 ` Juri Lelli
2021-05-27 12:29 ` Daniel Bristot de Oliveira
2021-06-03 21:17 ` Steven Rostedt
2021-06-04 15:31 ` Daniel Bristot de Oliveira
2021-05-14 20:51 ` [PATCH V3 5/9] tracing/trace: Add a generic function to read/write u64 values from tracefs Daniel Bristot de Oliveira
2021-06-03 21:22 ` Steven Rostedt
2021-06-04 16:05 ` Daniel Bristot de Oliveira
2021-06-04 16:18 ` Steven Rostedt
2021-06-04 16:34 ` Daniel Bristot de Oliveira
2021-05-14 20:51 ` Daniel Bristot de Oliveira [this message]
2021-06-03 21:27 ` [PATCH V3 6/9] trace/hwlat: Use the generic function to read/write width and window Steven Rostedt
2021-06-04 16:36 ` Daniel Bristot de Oliveira
2021-06-04 20:50 ` Steven Rostedt
2021-05-14 20:51 ` [PATCH V3 7/9] tracing: Add __print_ns_to_secs() and __print_ns_without_secs() helpers Daniel Bristot de Oliveira
2021-06-03 21:29 ` Steven Rostedt
2021-06-04 4:19 ` Joe Perches
2021-06-04 16:21 ` Steven Rostedt
2021-06-04 19:09 ` [PATCH] treewide: Add missing semicolons to __assign_str uses Joe Perches
2021-06-04 19:38 ` Joe Perches
2021-06-07 23:18 ` Jason Gunthorpe
2021-06-12 15:42 ` [PATCH V2] " Joe Perches
2021-06-12 23:11 ` Steven Rostedt
2021-06-30 11:28 ` Joe Perches
2021-06-30 12:22 ` Steven Rostedt
2021-06-04 16:07 ` [PATCH V3 7/9] tracing: Add __print_ns_to_secs() and __print_ns_without_secs() helpers Daniel Bristot de Oliveira
2021-05-14 20:51 ` [PATCH V3 8/9] tracing: Add osnoise tracer Daniel Bristot de Oliveira
2021-06-03 21:31 ` Steven Rostedt
2021-06-04 21:28 ` Steven Rostedt
2021-06-07 12:00 ` Daniel Bristot de Oliveira
2021-06-07 15:47 ` Steven Rostedt
2021-06-08 15:24 ` Daniel Bristot de Oliveira
2021-06-08 17:17 ` Daniel Bristot de Oliveira
2021-06-08 17:39 ` Steven Rostedt
2021-06-08 19:33 ` Daniel Bristot de Oliveira
2021-06-08 19:42 ` Steven Rostedt
2021-06-09 12:14 ` Daniel Bristot de Oliveira
2021-06-09 13:03 ` Steven Rostedt
2021-06-09 13:44 ` Daniel Bristot de Oliveira
2021-05-14 20:51 ` [PATCH V3 9/9] tracing: Add timerlat tracer Daniel Bristot de Oliveira
2021-06-08 1:36 ` Steven Rostedt
2021-06-11 12:59 ` Daniel Bristot de Oliveira
2021-06-11 20:03 ` Steven Rostedt
2021-06-12 9:41 ` Daniel Bristot de Oliveira
2021-06-12 23:06 ` Steven Rostedt
2021-06-11 14:13 ` Daniel Bristot de Oliveira
2021-06-11 20:48 ` Steven Rostedt
2021-06-12 8:47 ` Daniel Bristot de Oliveira
2021-06-12 23:09 ` Steven Rostedt
2021-06-15 8:18 ` Daniel Bristot de Oliveira
2021-05-27 12:07 ` [PATCH V3 0/9] hwlat improvements and osnoise/timerlat tracers Juri Lelli
2021-05-29 2:16 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bf0c568ddaf9e75e3d2e77b0ffd5ad1508c47afc.1621024265.git.bristot@redhat.com \
--to=bristot@redhat.com \
--cc=alexandre.chartre@oracle.com \
--cc=bigeasy@linutronix.de \
--cc=corbet@lwn.net \
--cc=jkacur@redhat.com \
--cc=juri.lelli@redhat.com \
--cc=kcarcia@redhat.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pauld@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).