From: Khazhismel Kumykov <khazhy@google.com>
To: tj@kernel.org, axboe@kernel.dk, viro@zeniv.linux.org.uk
Cc: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Khazhismel Kumykov <khazhy@google.com>
Subject: [RFC PATCH] blkcg: rewind seq_file if no stats
Date: Thu, 12 May 2022 16:29:07 -0700 [thread overview]
Message-ID: <20220512232907.312855-1-khazhy@google.com> (raw)
In-Reply-To: <CACGdZYLMW2KHVebfyJZVn9G=15N+Jt4+8oF5gq3wdDTOcXbk9A@mail.gmail.com>
In lieu of get_seq_buf + seq_commit, provide a way to "undo" writes if
we use seq_printf
Fixes: 252c651a4c85 ("blk-cgroup: stop using seq_get_buf")
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
---
block/blk-cgroup.c | 5 +++++
fs/seq_file.c | 14 ++++++++++++++
include/linux/seq_file.h | 2 ++
3 files changed, 21 insertions(+)
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 8dfe62786cd5..50043a742c48 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -909,6 +909,7 @@ static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s)
const char *dname;
unsigned seq;
int i;
+ int scookie;
if (!blkg->online)
return;
@@ -917,6 +918,8 @@ static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s)
if (!dname)
return;
+ scookie = seq_checkpoint(s);
+
seq_printf(s, "%s ", dname);
do {
@@ -956,6 +959,8 @@ static void blkcg_print_one_stat(struct blkcg_gq *blkg, struct seq_file *s)
if (has_stats)
seq_printf(s, "\n");
+ else
+ seq_restore(s, scookie);
}
static int blkcg_print_stat(struct seq_file *sf, void *v)
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 7ab8a58c29b6..c3ec6b57334e 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -408,6 +408,20 @@ void seq_printf(struct seq_file *m, const char *f, ...)
}
EXPORT_SYMBOL(seq_printf);
+int seq_checkpoint(struct seq_file *m)
+{
+ return m->count;
+}
+EXPORT_SYMBOL(seq_checkpoint);
+
+void seq_restore(struct seq_file *m, int count)
+{
+ if (WARN_ON_ONCE(count > m->count || count > m->size))
+ return;
+ m->count = count;
+}
+EXPORT_SYMBOL(seq_restore);
+
#ifdef CONFIG_BINARY_PRINTF
void seq_bprintf(struct seq_file *m, const char *f, const u32 *binary)
{
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 60820ab511d2..d3a05f7c2750 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -117,6 +117,8 @@ __printf(2, 0)
void seq_vprintf(struct seq_file *m, const char *fmt, va_list args);
__printf(2, 3)
void seq_printf(struct seq_file *m, const char *fmt, ...);
+int seq_checkpoint(struct seq_file *m);
+void seq_restore(struct seq_file *m, int count);
void seq_putc(struct seq_file *m, char c);
void seq_puts(struct seq_file *m, const char *s);
void seq_put_decimal_ull_width(struct seq_file *m, const char *delimiter,
--
2.36.0.550.gb090851708-goog
next parent reply other threads:[~2022-05-12 23:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CACGdZYLMW2KHVebfyJZVn9G=15N+Jt4+8oF5gq3wdDTOcXbk9A@mail.gmail.com>
2022-05-12 23:29 ` Khazhismel Kumykov [this message]
2022-05-13 16:30 ` [RFC PATCH] blkcg: rewind seq_file if no stats Tejun Heo
2022-05-13 17:40 ` [RESEND][RFC " Khazhismel Kumykov
2022-05-13 18:06 ` Khazhy Kumykov
2022-05-17 6:12 ` Christoph Hellwig
2022-05-17 6:27 ` Khazhy Kumykov
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=20220512232907.312855-1-khazhy@google.com \
--to=khazhy@google.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tj@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).