Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 09:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tracing: Have seq_buf use full buffer

Browse Source 
Currently seq_buf is full when all but one byte of the buffer is
filled. Change it so that the seq_buf is full when all of the
buffer is filled.

Some of the functions would fill the buffer completely and report
everything was fine. This was inconsistent with the max of size - 1.
Changing this to be max of size makes all functions consistent.

Link: http://lkml.kernel.org/r/20141104160222.502133196@goodmis.org
Link: http://lkml.kernel.org/r/20141114011412.811957882@goodmis.org

Tested-by: Jiri Kosina <jkosina@suse.cz>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2014-10-29 15:26:09 -04:00 committed by Steven Rostedt
parent 9b77215382
commit 8cd709ae76
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/seq_buf.h
View File

@ -43,13 +43,13 @@ seq_buf_init(struct seq_buf *s, unsigned char *buf, unsigned int size)
static inline bool
seq_buf_has_overflowed(struct seq_buf *s)
{
return s->len == s->size;
return s->len > s->size;
}
static inline void
seq_buf_set_overflow(struct seq_buf *s)
{
s->len = s->size;
s->len = s->size + 1;
}
/*
@ -61,7 +61,7 @@ seq_buf_buffer_left(struct seq_buf *s)
if (seq_buf_has_overflowed(s))
return 0;
return (s->size - 1) - s->len;
return s->size - s->len;
}
/* How much buffer was written? */

9
kernel/trace/seq_buf.c
View File

@ -26,7 +26,7 @@
*/
static bool seq_buf_can_fit(struct seq_buf *s, size_t len)
{
return s->len + len < s->size;
return s->len + len <= s->size;
}
/**
@ -110,8 +110,11 @@ int seq_buf_bitmask(struct seq_buf *s, const unsigned long *maskp,
WARN_ON(s->size == 0);
/*
* The last byte of the buffer is used to determine if we
* overflowed or not.
* Note, because bitmap_scnprintf() only returns the number of bytes
* written and not the number that would be written, we use the last
* byte of the buffer to let us know if we overflowed. There's a small
* chance that the bitmap could have fit exactly inside the buffer, but
* it's not that critical if that does happen.
*/
if (len > 1) {
ret = bitmap_scnprintf(s->buffer + s->len, len, maskp, nmaskbits);