[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250512024935.64704-5-kerneljasonxing@gmail.com>
Date: Mon, 12 May 2025 10:49:34 +0800
From: Jason Xing <kerneljasonxing@...il.com>
To: axboe@...nel.dk,
rostedt@...dmis.org,
mhiramat@...nel.org,
mathieu.desnoyers@...icios.com,
akpm@...ux-foundation.org
Cc: linux-kernel@...r.kernel.org,
linux-block@...r.kernel.org,
linux-trace-kernel@...r.kernel.org,
Jason Xing <kernelxing@...cent.com>,
Yushan Zhou <katrinzhou@...cent.com>
Subject: [PATCH v1 4/5] relayfs: support a counter tracking if data is too big to write
From: Jason Xing <kernelxing@...cent.com>
It doesn't really matter to let the user/admin know what the last too
big value is. Just record how many times this case is triggered.
Also solve the issue where relay_reset() doesn't restore the value.
Store the counter in the per-cpu buffer structure instead of the global
buffer structure. It also solves the previous racy condition because
in terms of the global structure, it is likely to happen when a few of
per-cpu buffers encounter the too big data case.
Remove the printk in relay_close() since kernel module can directly call
relay_dump() as they want.
Reviewed-by: Yushan Zhou <katrinzhou@...cent.com>
Signed-off-by: Jason Xing <kernelxing@...cent.com>
---
include/linux/relay.h | 5 +++--
kernel/relay.c | 19 +++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/include/linux/relay.h b/include/linux/relay.h
index 7a442c4cbead..0f5f6ff17824 100644
--- a/include/linux/relay.h
+++ b/include/linux/relay.h
@@ -33,8 +33,9 @@
*/
enum {
RELAY_DUMP_BUF_FULL = (1 << 0),
+ RELAY_DUMP_WRT_BIG = (1 << 1),
- RELAY_DUMP_LAST = RELAY_DUMP_BUF_FULL,
+ RELAY_DUMP_LAST = RELAY_DUMP_WRT_BIG,
RELAY_DUMP_MASK = (RELAY_DUMP_LAST - 1) | RELAY_DUMP_LAST
};
@@ -43,6 +44,7 @@ enum {
struct rchan_buf_error_stats
{
unsigned int full; /* counter for buffer full */
+ unsigned int big; /* counter for too big to write */
};
/*
@@ -82,7 +84,6 @@ struct rchan
const struct rchan_callbacks *cb; /* client callbacks */
struct kref kref; /* channel refcount */
void *private_data; /* for user-defined data */
- size_t last_toobig; /* tried to log event > subbuf size */
struct rchan_buf * __percpu *buf; /* per-cpu channel buffers */
int is_global; /* One global buffer ? */
struct list_head list; /* for channel list */
diff --git a/kernel/relay.c b/kernel/relay.c
index 0e675a77285c..27f7e701724f 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -304,6 +304,7 @@ static void __relay_reset(struct rchan_buf *buf, unsigned int init)
buf->data = buf->start;
buf->offset = 0;
buf->stats.full = 0;
+ buf->stats.big = 0;
for (i = 0; i < buf->chan->n_subbufs; i++)
buf->padding[i] = 0;
@@ -712,7 +713,7 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
return length;
toobig:
- buf->chan->last_toobig = length;
+ buf->stats.big++;
return 0;
}
EXPORT_SYMBOL_GPL(relay_switch_subbuf);
@@ -772,11 +773,6 @@ void relay_close(struct rchan *chan)
if ((buf = *per_cpu_ptr(chan->buf, i)))
relay_close_buf(buf);
- if (chan->last_toobig)
- printk(KERN_WARNING "relay: one or more items not logged "
- "[item size (%zd) > sub-buffer size (%zd)]\n",
- chan->last_toobig, chan->subbuf_size);
-
list_del(&chan->list);
kref_put(&chan->kref, relay_destroy_channel);
mutex_unlock(&relay_channels_mutex);
@@ -819,7 +815,7 @@ EXPORT_SYMBOL_GPL(relay_flush);
*/
void relay_dump(struct rchan *chan, char *buf, int len, int flags)
{
- unsigned int i, full_counter = 0;
+ unsigned int i, full_counter = 0, big_counter = 0;
struct rchan_buf *rbuf;
int offset = 0;
@@ -832,15 +828,22 @@ void relay_dump(struct rchan *chan, char *buf, int len, int flags)
if (chan->is_global) {
rbuf = *per_cpu_ptr(chan->buf, 0);
full_counter = rbuf->stats.full;
+ big_counter = rbuf->stats.big;
} else {
for_each_possible_cpu(i) {
- if ((rbuf = *per_cpu_ptr(chan->buf, i)))
+ if ((rbuf = *per_cpu_ptr(chan->buf, i))) {
full_counter += rbuf->stats.full;
+ big_counter += rbuf->stats.big;
+ }
+ }
}
if (flags & RELAY_DUMP_BUF_FULL)
offset += snprintf(buf, sizeof(unsigned int), "%u", full_counter);
+ if (flags & RELAY_DUMP_WRT_BIG)
+ offset += snprintf(buf, sizeof(unsigned int), "%u", big_counter);
+
snprintf(buf + offset, 1, "\n");
}
EXPORT_SYMBOL_GPL(relay_dump);
--
2.43.5
Powered by blists - more mailing lists