Skip to content

Commit 625d344

Browse files
zx2c4torvalds
authored andcommitted
Revert "kernel/printk: add kmsg SEEK_CUR handling"
This reverts commit 8ece3b3. This commit broke userspace. Bash uses ESPIPE to determine whether or not the file should be read using "unbuffered I/O", which means reading 1 byte at a time instead of 128 bytes at a time. I used to use bash to read through kmsg in a really quite nasty way: while read -t 0.1 -r line 2>/dev/null || [[ $? -ne 142 ]]; do echo "SARU $line" done < /dev/kmsg This will show all lines that can fit into the 128 byte buffer, and skip lines that don't. That's pretty awful, but at least it worked. With this change, bash now tries to do 1-byte reads, which means it skips all the lines, which is worse than before. Now, I don't really care very much about this, and I'm already look for a workaround. But I did just spend an hour trying to figure out why my scripts were broken. Either way, it makes no difference to me personally whether this is reverted, but it might be something to consider. If you declare that "trying to read /dev/kmsg with bash is terminally stupid anyway," I might be inclined to agree with you. But do note that bash uses lseek(fd, 0, SEEK_CUR)==>ESPIPE to determine whether or not it's reading from a pipe. Cc: Bruno Meneguele <[email protected]> Cc: Sergey Senozhatsky <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: David Laight <[email protected]> Cc: Sergey Senozhatsky <[email protected]> Cc: Petr Mladek <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 4877846 commit 625d344

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

Documentation/ABI/testing/dev-kmsg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ Description: The /dev/kmsg character device node provides userspace access
5656
seek after the last record available at the time
5757
the last SYSLOG_ACTION_CLEAR was issued.
5858

59-
Due to the record nature of this interface with a "read all"
60-
behavior and the specific positions each seek operation sets,
61-
SEEK_CUR is not supported, returning -ESPIPE (invalid seek) to
62-
errno whenever requested.
63-
6459
The output format consists of a prefix carrying the syslog
6560
prefix including priority and facility, the 64 bit message
6661
sequence number and the monotonic timestamp in microseconds,

kernel/printk/printk.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -974,16 +974,6 @@ static loff_t devkmsg_llseek(struct file *file, loff_t offset, int whence)
974974
user->idx = log_next_idx;
975975
user->seq = log_next_seq;
976976
break;
977-
case SEEK_CUR:
978-
/*
979-
* It isn't supported due to the record nature of this
980-
* interface: _SET _DATA and _END point to very specific
981-
* record positions, while _CUR would be more useful in case
982-
* of a byte-based log. Because of that, return the default
983-
* errno value for invalid seek operation.
984-
*/
985-
ret = -ESPIPE;
986-
break;
987977
default:
988978
ret = -EINVAL;
989979
}

0 commit comments

Comments
 (0)