From: Steven Rostedt <rostedt@goodmis.org>
To: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: Re: [PATCH] tracing: Fix to avoid wakeup loop in splice read of per-cpu buffer
Date: Tue, 22 Aug 2023 04:59:37 -0400 [thread overview]
Message-ID: <20230822045937.3fc0da54@rorschach.local.home> (raw)
In-Reply-To: <169262755804.106231.8245792908363050528.stgit@devnote2>
On Mon, 21 Aug 2023 23:19:18 +0900
"Masami Hiramatsu (Google)" <mhiramat@kernel.org> wrote:
> if (!spd.nr_pages) {
> long wait_index;
> + size_t nr_pages;
> + size_t full;
size_t is usually considered "long" (machine word length).
>
> if (ret)
> goto out;
> @@ -8472,7 +8474,15 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
>
> wait_index = READ_ONCE(iter->wait_index);
>
> - ret = wait_on_pipe(iter, iter->tr->buffer_percent);
> + /* For splice, we have to ensure at least 1 page is filled */
> + nr_pages = ring_buffer_nr_pages(iter->array_buffer->buffer, iter->cpu_file);
> + if (nr_pages * iter->tr->buffer_percent < 100) {
> + full = nr_pages + 99;
> + do_div(full, nr_pages);
No need for do_div() as full is not 64 bit on 32 bit machines.
That's why the kernel test robot is complaining.
-- Steve
> + } else
> + full = iter->tr->buffer_percent;
> +
> + ret = wait_on_pipe(iter, full);
next prev parent reply other threads:[~2023-08-22 8:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-21 14:19 [PATCH] tracing: Fix to avoid wakeup loop in splice read of per-cpu buffer Masami Hiramatsu (Google)
2023-08-21 15:16 ` Masami Hiramatsu
2023-08-21 15:27 ` Steven Rostedt
2023-08-21 23:50 ` Masami Hiramatsu
2023-08-22 0:15 ` Masami Hiramatsu
2023-08-22 4:00 ` kernel test robot
2023-08-22 6:56 ` kernel test robot
2023-08-22 8:59 ` Steven Rostedt [this message]
2023-08-22 12:51 ` Masami Hiramatsu
2023-08-23 12:18 ` kernel test robot
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=20230822045937.3fc0da54@rorschach.local.home \
--to=rostedt@goodmis.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
/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