From: chunlei.wang <Chunlei.wang@mediatek.com> To: Petr Mladek <pmladek@suse.com>, Sergey Senozhatsky <senozhatsky@chromium.org> Cc: Steven Rostedt <rostedt@goodmis.org>, Matthias Brugger <matthias.bgg@gmail.com>, <linux-arm-kernel@lists.infradead.org>, <linux-mediatek@lists.infradead.org>, John Ogness <john.ogness@linutronix.de>, <wsd_upstream@medaitek.com>, Chunlei Wang <chunlei.wang@mediatek.com> Subject: [PATCH] Fix prb_next_seq() performance issue Date: Mon, 25 Oct 2021 13:51:07 +0800 [thread overview] Message-ID: <11f00d85b770e676cd0e06d87cc819ce82bb0beb.camel@mediatek.com> (raw) In-Reply-To: <20200424070219.GA543@jagdpanzerIV.localdomain> Subject: [PATCH] Fix prb_next_seq() performance issue. prb_next_seq() function have a performance issue, in bad case it will check all the seqs. If log buffer is 256K, the number of while loop is 8K, 512K is 16K, 2M is 64K, it will cause performance issue. we have a process use do_syslog poll&read method to read kernel log, sometime the cpu loading is 50%. So we add old_seq to reduce the loop time. It only check new log times. Signed-off-by: Chunlei Wang <chunlei.wang@mediatek.com> --- kernel/printk/printk.c | 12 ++++++------ kernel/printk/printk_ringbuffer.c | 4 ++-- kernel/printk/printk_ringbuffer.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index a8d0a58deebc..9c6d4d617a95 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -801,7 +801,7 @@ static loff_t devkmsg_llseek(struct file *file, loff_t offset, int whence) break; case SEEK_END: /* after the last record */ - atomic64_set(&user->seq, prb_next_seq(prb)); + atomic64_set(&user->seq, prb_next_seq(prb, latched_seq_read_nolock(&clear_seq))); break; default: ret = -EINVAL; @@ -1155,9 +1155,9 @@ void __init setup_log_buf(int early) free -= text_size; } - if (seq != prb_next_seq(&printk_rb_static)) { + if (seq != prb_next_seq(&printk_rb_static, seq)) { pr_err("dropped %llu messages\n", - prb_next_seq(&printk_rb_static) - seq); + prb_next_seq(&printk_rb_static, seq) - seq); } pr_info("log_buf_len: %u bytes\n", log_buf_len); @@ -1625,7 +1625,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) static void syslog_clear(void) { mutex_lock(&syslog_lock); - latched_seq_write(&clear_seq, prb_next_seq(prb)); + latched_seq_write(&clear_seq, prb_next_seq(prb, 0)); mutex_unlock(&syslog_lock); } @@ -1714,7 +1714,7 @@ int do_syslog(int type, char __user *buf, int len, int source) * for pending data, not the size; return the count of * records, not the length. */ - error = prb_next_seq(prb) - syslog_seq; + error = prb_next_seq(prb, syslog_seq) - syslog_seq; } else { bool time = syslog_partial ? syslog_time : printk_time; unsigned int line_count; @@ -3573,7 +3573,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer); void kmsg_dump_rewind(struct kmsg_dump_iter *iter) { iter->cur_seq = latched_seq_read_nolock(&clear_seq); - iter->next_seq = prb_next_seq(prb); + iter->next_seq = prb_next_seq(prb, iter->cur_seq); } EXPORT_SYMBOL_GPL(kmsg_dump_rewind); diff --git a/kernel/printk/printk_ringbuffer.c b/kernel/printk/printk_ringbuffer.c index 8a7b7362c0dd..a910b79d9341 100644 --- a/kernel/printk/printk_ringbuffer.c +++ b/kernel/printk/printk_ringbuffer.c @@ -2003,9 +2003,9 @@ u64 prb_first_valid_seq(struct printk_ringbuffer *rb) * Return: The sequence number of the next newest (not yet available) record * for readers. */ -u64 prb_next_seq(struct printk_ringbuffer *rb) +u64 prb_next_seq(struct printk_ringbuffer *rb, u64 old_seq) { - u64 seq = 0; + u64 seq = old_seq; /* Search forward from the oldest descriptor. */ while (_prb_read_valid(rb, &seq, NULL, NULL)) diff --git a/kernel/printk/printk_ringbuffer.h b/kernel/printk/printk_ringbuffer.h index 73cc80e01cef..0729b21a9d34 100644 --- a/kernel/printk/printk_ringbuffer.h +++ b/kernel/printk/printk_ringbuffer.h @@ -377,6 +377,6 @@ bool prb_read_valid_info(struct printk_ringbuffer *rb, u64 seq, struct printk_info *info, unsigned int *line_count); u64 prb_first_valid_seq(struct printk_ringbuffer *rb); -u64 prb_next_seq(struct printk_ringbuffer *rb); +u64 prb_next_seq(struct printk_ringbuffer *rb, u64 seq); #endif /* _KERNEL_PRINTK_RINGBUFFER_H */ -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek
WARNING: multiple messages have this Message-ID (diff)
From: chunlei.wang <Chunlei.wang@mediatek.com> To: Petr Mladek <pmladek@suse.com>, Sergey Senozhatsky <senozhatsky@chromium.org> Cc: Steven Rostedt <rostedt@goodmis.org>, Matthias Brugger <matthias.bgg@gmail.com>, <linux-arm-kernel@lists.infradead.org>, <linux-mediatek@lists.infradead.org>, John Ogness <john.ogness@linutronix.de>, <wsd_upstream@medaitek.com>, Chunlei Wang <chunlei.wang@mediatek.com> Subject: [PATCH] Fix prb_next_seq() performance issue Date: Mon, 25 Oct 2021 13:51:07 +0800 [thread overview] Message-ID: <11f00d85b770e676cd0e06d87cc819ce82bb0beb.camel@mediatek.com> (raw) In-Reply-To: <20200424070219.GA543@jagdpanzerIV.localdomain> Subject: [PATCH] Fix prb_next_seq() performance issue. prb_next_seq() function have a performance issue, in bad case it will check all the seqs. If log buffer is 256K, the number of while loop is 8K, 512K is 16K, 2M is 64K, it will cause performance issue. we have a process use do_syslog poll&read method to read kernel log, sometime the cpu loading is 50%. So we add old_seq to reduce the loop time. It only check new log times. Signed-off-by: Chunlei Wang <chunlei.wang@mediatek.com> --- kernel/printk/printk.c | 12 ++++++------ kernel/printk/printk_ringbuffer.c | 4 ++-- kernel/printk/printk_ringbuffer.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index a8d0a58deebc..9c6d4d617a95 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -801,7 +801,7 @@ static loff_t devkmsg_llseek(struct file *file, loff_t offset, int whence) break; case SEEK_END: /* after the last record */ - atomic64_set(&user->seq, prb_next_seq(prb)); + atomic64_set(&user->seq, prb_next_seq(prb, latched_seq_read_nolock(&clear_seq))); break; default: ret = -EINVAL; @@ -1155,9 +1155,9 @@ void __init setup_log_buf(int early) free -= text_size; } - if (seq != prb_next_seq(&printk_rb_static)) { + if (seq != prb_next_seq(&printk_rb_static, seq)) { pr_err("dropped %llu messages\n", - prb_next_seq(&printk_rb_static) - seq); + prb_next_seq(&printk_rb_static, seq) - seq); } pr_info("log_buf_len: %u bytes\n", log_buf_len); @@ -1625,7 +1625,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) static void syslog_clear(void) { mutex_lock(&syslog_lock); - latched_seq_write(&clear_seq, prb_next_seq(prb)); + latched_seq_write(&clear_seq, prb_next_seq(prb, 0)); mutex_unlock(&syslog_lock); } @@ -1714,7 +1714,7 @@ int do_syslog(int type, char __user *buf, int len, int source) * for pending data, not the size; return the count of * records, not the length. */ - error = prb_next_seq(prb) - syslog_seq; + error = prb_next_seq(prb, syslog_seq) - syslog_seq; } else { bool time = syslog_partial ? syslog_time : printk_time; unsigned int line_count; @@ -3573,7 +3573,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer); void kmsg_dump_rewind(struct kmsg_dump_iter *iter) { iter->cur_seq = latched_seq_read_nolock(&clear_seq); - iter->next_seq = prb_next_seq(prb); + iter->next_seq = prb_next_seq(prb, iter->cur_seq); } EXPORT_SYMBOL_GPL(kmsg_dump_rewind); diff --git a/kernel/printk/printk_ringbuffer.c b/kernel/printk/printk_ringbuffer.c index 8a7b7362c0dd..a910b79d9341 100644 --- a/kernel/printk/printk_ringbuffer.c +++ b/kernel/printk/printk_ringbuffer.c @@ -2003,9 +2003,9 @@ u64 prb_first_valid_seq(struct printk_ringbuffer *rb) * Return: The sequence number of the next newest (not yet available) record * for readers. */ -u64 prb_next_seq(struct printk_ringbuffer *rb) +u64 prb_next_seq(struct printk_ringbuffer *rb, u64 old_seq) { - u64 seq = 0; + u64 seq = old_seq; /* Search forward from the oldest descriptor. */ while (_prb_read_valid(rb, &seq, NULL, NULL)) diff --git a/kernel/printk/printk_ringbuffer.h b/kernel/printk/printk_ringbuffer.h index 73cc80e01cef..0729b21a9d34 100644 --- a/kernel/printk/printk_ringbuffer.h +++ b/kernel/printk/printk_ringbuffer.h @@ -377,6 +377,6 @@ bool prb_read_valid_info(struct printk_ringbuffer *rb, u64 seq, struct printk_info *info, unsigned int *line_count); u64 prb_first_valid_seq(struct printk_ringbuffer *rb); -u64 prb_next_seq(struct printk_ringbuffer *rb); +u64 prb_next_seq(struct printk_ringbuffer *rb, u64 seq); #endif /* _KERNEL_PRINTK_RINGBUFFER_H */ -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-10-25 5:55 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-24 6:21 [PATCH] printk: Add printk log prefix information chunlei.wang 2020-04-24 6:21 ` chunlei.wang 2020-04-24 7:02 ` Sergey Senozhatsky 2020-04-24 7:02 ` Sergey Senozhatsky 2021-10-25 5:51 ` chunlei.wang [this message] 2021-10-25 5:51 ` [PATCH] Fix prb_next_seq() performance issue chunlei.wang 2021-10-25 13:18 ` Petr Mladek 2021-10-25 13:18 ` Petr Mladek 2021-10-25 13:20 ` [PATCH] printk: ringbuffer: Improve prb_next_seq() performance Petr Mladek 2021-10-25 13:20 ` Petr Mladek 2021-10-25 22:06 ` John Ogness 2021-10-25 22:06 ` John Ogness 2021-10-25 22:24 ` John Ogness 2021-10-25 22:24 ` John Ogness
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=11f00d85b770e676cd0e06d87cc819ce82bb0beb.camel@mediatek.com \ --to=chunlei.wang@mediatek.com \ --cc=john.ogness@linutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=matthias.bgg@gmail.com \ --cc=pmladek@suse.com \ --cc=rostedt@goodmis.org \ --cc=senozhatsky@chromium.org \ --cc=wsd_upstream@medaitek.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.