From: Petr Mladek <pmladek@suse.cz>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jan Kara <jack@suse.cz>, Jiri Kosina <jkosina@suse.cz>,
Kay Sievers <kay@vrfy.org>,
linux-kernel@vger.kernel.org, Petr Mladek <pmladek@suse.cz>
Subject: [PATCH 1/5] printk: Split code for making free space in the log buffer
Date: Thu, 10 Apr 2014 11:43:12 +0200 [thread overview]
Message-ID: <1397122996-15136-2-git-send-email-pmladek@suse.cz> (raw)
In-Reply-To: <1397122996-15136-1-git-send-email-pmladek@suse.cz>
There will be needed some fixes in the check for free space. They will
be easier if the code is moved outside of the quite long log_store()
function.
This patch does not change the existing behavior.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
---
kernel/printk/printk.c | 44 +++++++++++++++++++++++++++++---------------
1 file changed, 29 insertions(+), 15 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a45b50962295..cc7d7defce24 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -297,6 +297,34 @@ static u32 log_next(u32 idx)
return idx + msg->len;
}
+/* check whether there is enough free space for the given message */
+static int logbuf_has_space(u32 msg_size)
+{
+ u32 free;
+
+ if (log_next_idx > log_first_idx)
+ free = max(log_buf_len - log_next_idx, log_first_idx);
+ else
+ free = log_first_idx - log_next_idx;
+
+ /*
+ * We need space also for an empty header that signalizes wrapping
+ * of the buffer.
+ */
+ return free >= msg_size + sizeof(struct printk_log);
+}
+
+static void log_make_free_space(u32 msg_size)
+{
+ while (log_first_seq < log_next_seq) {
+ if (logbuf_has_space(msg_size))
+ return;
+ /* drop old messages until we have enough continuous space */
+ log_first_idx = log_next(log_first_idx);
+ log_first_seq++;
+ }
+}
+
/* insert record into the buffer, discard old ones, update heads */
static void log_store(int facility, int level,
enum log_flags flags, u64 ts_nsec,
@@ -311,21 +339,7 @@ static void log_store(int facility, int level,
pad_len = (-size) & (LOG_ALIGN - 1);
size += pad_len;
- while (log_first_seq < log_next_seq) {
- u32 free;
-
- if (log_next_idx > log_first_idx)
- free = max(log_buf_len - log_next_idx, log_first_idx);
- else
- free = log_first_idx - log_next_idx;
-
- if (free >= size + sizeof(struct printk_log))
- break;
-
- /* drop old messages until we have enough contiuous space */
- log_first_idx = log_next(log_first_idx);
- log_first_seq++;
- }
+ log_make_free_space(size);
if (log_next_idx + size + sizeof(struct printk_log) > log_buf_len) {
/*
--
1.8.4
next prev parent reply other threads:[~2014-04-10 9:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-10 9:43 [PATCH 0/5] printk: Check for too long messages Petr Mladek
2014-04-10 9:43 ` Petr Mladek [this message]
2014-04-10 9:43 ` [PATCH 2/5] printk: Ignore " Petr Mladek
2014-04-10 9:43 ` [PATCH 3/5] printk: Split message size computation Petr Mladek
2014-04-10 9:43 ` [PATCH 4/5] printk: Shrink too long messages Petr Mladek
2014-04-10 9:43 ` [PATCH 5/5] printk: Return really stored message length Petr Mladek
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=1397122996-15136-2-git-send-email-pmladek@suse.cz \
--to=pmladek@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=jkosina@suse.cz \
--cc=kay@vrfy.org \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®