* [LTP] [PATCH] kmsg01: fix race in SEEK_SET 0 test
@ 2017-03-02 9:42 Jan Stancek
2017-03-03 14:36 ` Cyril Hrubis
0 siblings, 1 reply; 4+ messages in thread
From: Jan Stancek @ 2017-03-02 9:42 UTC (permalink / raw)
To: ltp
This test does following:
1. open /dev/kmsg
2. read seqno
3. calls SEEK_SET 0
4. read seqno again
5. compare if they match
Problem is that SEEK_SET resets index and sequence number to first
record stored in the buffer (see devkmsg_llseek() in kernel/printk.c).
So, if first record gets overwritten between 2) and 3) we don't get
EPIPE from second read, test doesn't retry and fails.
This patch opens one more file descriptor (fd2) at the beginning
of test, solely for the purpose to check if first record went away.
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
testcases/kernel/logging/kmsg/kmsg01.c | 98 +++++++++++++++++++++-------------
1 file changed, 61 insertions(+), 37 deletions(-)
diff --git a/testcases/kernel/logging/kmsg/kmsg01.c b/testcases/kernel/logging/kmsg/kmsg01.c
index 07419da05de0..bc418660e9eb 100644
--- a/testcases/kernel/logging/kmsg/kmsg01.c
+++ b/testcases/kernel/logging/kmsg/kmsg01.c
@@ -473,63 +473,87 @@ static void test_messages_overwritten(void)
SAFE_CLOSE(cleanup, fd);
}
+static int read_msg_seqno(int fd, unsigned long *seqno)
+{
+ char msg[MAX_MSGSIZE];
+
+ TEST(read(fd, msg, sizeof(msg)));
+ if (TEST_RETURN == -1 && TEST_ERRNO != EPIPE) {
+ tst_brkm(TBROK|TTERRNO, cleanup,
+ "failed to read /dev/kmsg");
+ }
+
+ if (get_msg_fields(msg, NULL, seqno) != 0) {
+ tst_resm(TFAIL, "failed to parse seqid: %s", msg);
+ return -1;
+ }
+
+ return 0;
+}
+
static void test_seek(void)
{
- int k, j = NUM_READ_RETRY, fd;
+ int j, fd, fd2;
char msg[MAX_MSGSIZE];
- unsigned long seqno[2];
+ unsigned long seqno[2], tmp;
+ int done = 0;
/* 1. read() after SEEK_SET 0 returns same (first) message */
tst_resm(TINFO, "TEST: seek SEEK_SET 0");
- fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
- if (fd < 0)
- tst_brkm(TBROK|TERRNO, cleanup, "failed to open /dev/kmsg");
-
- while (j) {
- for (k = 0; k < 2; k++) {
- TEST(read(fd, msg, sizeof(msg)));
- if (TEST_RETURN == -1) {
- if (errno == EPIPE)
- break;
- else
- tst_brkm(TBROK|TTERRNO, cleanup,
- "failed to read /dev/kmsg");
- }
- if (get_msg_fields(msg, NULL, &seqno[k]) != 0)
- tst_resm(TFAIL, "failed to parse seqid: %s",
- msg);
- if (k == 0)
- if (lseek(fd, 0, SEEK_SET) == -1)
- tst_resm(TFAIL|TERRNO,
- "SEEK_SET 0 failed");
+ for (j = 0; j < NUM_READ_RETRY && !done; j++) {
+ /*
+ * j > 0 means we are trying again, because we most likely
+ * failed on read returning EPIPE - first message in buffer
+ * has been overwrittern. Give a second to whoever overwrote
+ * first message to finish.
+ */
+ if (j)
+ sleep(1);
+
+ /*
+ * Open 2 fds. Use fd1 to read seqno1, then seek to
+ * begininng and read seqno2. Use fd2 to check if
+ * first entry in buffer got overwritten. If so,
+ * we'll have to repeat the test.
+ */
+ fd = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
+ fd2 = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
+
+ if (read_msg_seqno(fd, &seqno[0]))
+ goto close_fds;
+
+ if (lseek(fd, 0, SEEK_SET) == -1) {
+ tst_resm(TFAIL|TERRNO, "SEEK_SET 0 failed");
+ goto done;
}
- if (TEST_RETURN != -1)
- break;
+ if (read_msg_seqno(fd, &seqno[1]))
+ goto close_fds;
- /* give a second to whoever overwrote first message to finish */
- sleep(1);
- j--;
+ if (read_msg_seqno(fd2, &tmp))
+ goto close_fds;
- /* read above has returned EPIPE, reopen fd and try again */
+done:
+ done = 1;
+close_fds:
SAFE_CLOSE(cleanup, fd);
- fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
- if (fd < 0)
- tst_brkm(TBROK|TERRNO, cleanup,
- "failed to open /dev/kmsg");
+ SAFE_CLOSE(cleanup, fd2);
}
- if (!j) {
+ if (j == NUM_READ_RETRY) {
tst_resm(TWARN, "exceeded: %d attempts", NUM_READ_RETRY);
} else {
- if (seqno[0] != seqno[1])
- tst_resm(TFAIL, "SEEK_SET 0");
- else
+ if (seqno[0] != seqno[1]) {
+ tst_resm(TFAIL, "SEEK_SET 0, %lu != %lu",
+ seqno[0], seqno[1]);
+ } else {
tst_resm(TPASS, "SEEK_SET 0");
+ }
}
/* 2. messages after SEEK_END 0 shouldn't contain MSG_PREFIX */
+ fd = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
tst_resm(TINFO, "TEST: seek SEEK_END 0");
if (lseek(fd, 0, SEEK_END) == -1)
tst_resm(TFAIL|TERRNO, "lseek SEEK_END 0 failed");
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH] kmsg01: fix race in SEEK_SET 0 test
2017-03-02 9:42 [LTP] [PATCH] kmsg01: fix race in SEEK_SET 0 test Jan Stancek
@ 2017-03-03 14:36 ` Cyril Hrubis
2017-03-06 8:18 ` Jan Stancek
0 siblings, 1 reply; 4+ messages in thread
From: Cyril Hrubis @ 2017-03-03 14:36 UTC (permalink / raw)
To: ltp
Hi!
> +static int read_msg_seqno(int fd, unsigned long *seqno)
> +{
> + char msg[MAX_MSGSIZE];
> +
> + TEST(read(fd, msg, sizeof(msg)));
> + if (TEST_RETURN == -1 && TEST_ERRNO != EPIPE) {
> + tst_brkm(TBROK|TTERRNO, cleanup,
> + "failed to read /dev/kmsg");
> + }
Shouldn't we return -1 here on EPIPE as well?
if (TEST_ERRNO == EPIPE)
return -1;
> + if (get_msg_fields(msg, NULL, seqno) != 0) {
> + tst_resm(TFAIL, "failed to parse seqid: %s", msg);
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> static void test_seek(void)
> {
> - int k, j = NUM_READ_RETRY, fd;
> + int j, fd, fd2;
> char msg[MAX_MSGSIZE];
> - unsigned long seqno[2];
> + unsigned long seqno[2], tmp;
> + int done = 0;
>
> /* 1. read() after SEEK_SET 0 returns same (first) message */
> tst_resm(TINFO, "TEST: seek SEEK_SET 0");
>
> - fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
> - if (fd < 0)
> - tst_brkm(TBROK|TERRNO, cleanup, "failed to open /dev/kmsg");
> -
> - while (j) {
> - for (k = 0; k < 2; k++) {
> - TEST(read(fd, msg, sizeof(msg)));
> - if (TEST_RETURN == -1) {
> - if (errno == EPIPE)
> - break;
> - else
> - tst_brkm(TBROK|TTERRNO, cleanup,
> - "failed to read /dev/kmsg");
> - }
> - if (get_msg_fields(msg, NULL, &seqno[k]) != 0)
> - tst_resm(TFAIL, "failed to parse seqid: %s",
> - msg);
> - if (k == 0)
> - if (lseek(fd, 0, SEEK_SET) == -1)
> - tst_resm(TFAIL|TERRNO,
> - "SEEK_SET 0 failed");
> + for (j = 0; j < NUM_READ_RETRY && !done; j++) {
> + /*
> + * j > 0 means we are trying again, because we most likely
> + * failed on read returning EPIPE - first message in buffer
> + * has been overwrittern. Give a second to whoever overwrote
> + * first message to finish.
> + */
> + if (j)
> + sleep(1);
What about changing it to 0.1s here? Or are there processes that keeps
feeding the kernel log buffer for a second or more?
> + /*
> + * Open 2 fds. Use fd1 to read seqno1, then seek to
> + * begininng and read seqno2. Use fd2 to check if
> + * first entry in buffer got overwritten. If so,
> + * we'll have to repeat the test.
> + */
> + fd = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
> + fd2 = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
> +
> + if (read_msg_seqno(fd, &seqno[0]))
> + goto close_fds;
> +
> + if (lseek(fd, 0, SEEK_SET) == -1) {
> + tst_resm(TFAIL|TERRNO, "SEEK_SET 0 failed");
> + goto done;
I wonder if this should be tst_brkm() rather than tst_resm(), since as
it is we would end up printing the TFAIL message below, or am I
mistaken?
> }
>
> - if (TEST_RETURN != -1)
> - break;
> + if (read_msg_seqno(fd, &seqno[1]))
> + goto close_fds;
>
> - /* give a second to whoever overwrote first message to finish */
> - sleep(1);
> - j--;
> + if (read_msg_seqno(fd2, &tmp))
> + goto close_fds;
>
> - /* read above has returned EPIPE, reopen fd and try again */
> +done:
> + done = 1;
> +close_fds:
> SAFE_CLOSE(cleanup, fd);
> - fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
> - if (fd < 0)
> - tst_brkm(TBROK|TERRNO, cleanup,
> - "failed to open /dev/kmsg");
> + SAFE_CLOSE(cleanup, fd2);
> }
>
> - if (!j) {
> + if (j == NUM_READ_RETRY) {
> tst_resm(TWARN, "exceeded: %d attempts", NUM_READ_RETRY);
> } else {
> - if (seqno[0] != seqno[1])
> - tst_resm(TFAIL, "SEEK_SET 0");
> - else
> + if (seqno[0] != seqno[1]) {
> + tst_resm(TFAIL, "SEEK_SET 0, %lu != %lu",
> + seqno[0], seqno[1]);
> + } else {
> tst_resm(TPASS, "SEEK_SET 0");
> + }
> }
>
> /* 2. messages after SEEK_END 0 shouldn't contain MSG_PREFIX */
> + fd = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
> tst_resm(TINFO, "TEST: seek SEEK_END 0");
> if (lseek(fd, 0, SEEK_END) == -1)
> tst_resm(TFAIL|TERRNO, "lseek SEEK_END 0 failed");
Otherwise it looks OK.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 4+ messages in thread
* [LTP] [PATCH] kmsg01: fix race in SEEK_SET 0 test
2017-03-03 14:36 ` Cyril Hrubis
@ 2017-03-06 8:18 ` Jan Stancek
2017-03-06 8:29 ` Cyril Hrubis
0 siblings, 1 reply; 4+ messages in thread
From: Jan Stancek @ 2017-03-06 8:18 UTC (permalink / raw)
To: ltp
----- Original Message -----
> From: "Cyril Hrubis" <chrubis@suse.cz>
> To: "Jan Stancek" <jstancek@redhat.com>
> Cc: ltp@lists.linux.it
> Sent: Friday, 3 March, 2017 3:36:44 PM
> Subject: Re: [LTP] [PATCH] kmsg01: fix race in SEEK_SET 0 test
>
> Hi!
> > +static int read_msg_seqno(int fd, unsigned long *seqno)
> > +{
> > + char msg[MAX_MSGSIZE];
> > +
> > + TEST(read(fd, msg, sizeof(msg)));
> > + if (TEST_RETURN == -1 && TEST_ERRNO != EPIPE) {
> > + tst_brkm(TBROK|TTERRNO, cleanup,
> > + "failed to read /dev/kmsg");
> > + }
>
> Shouldn't we return -1 here on EPIPE as well?
>
> if (TEST_ERRNO == EPIPE)
> return -1;
Yes, you're right. I had it returning -1 by default,
but then switched it to 0 and missed this case.
>
> > + if (get_msg_fields(msg, NULL, seqno) != 0) {
> > + tst_resm(TFAIL, "failed to parse seqid: %s", msg);
> > + return -1;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > static void test_seek(void)
> > {
> > - int k, j = NUM_READ_RETRY, fd;
> > + int j, fd, fd2;
> > char msg[MAX_MSGSIZE];
> > - unsigned long seqno[2];
> > + unsigned long seqno[2], tmp;
> > + int done = 0;
> >
> > /* 1. read() after SEEK_SET 0 returns same (first) message */
> > tst_resm(TINFO, "TEST: seek SEEK_SET 0");
> >
> > - fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
> > - if (fd < 0)
> > - tst_brkm(TBROK|TERRNO, cleanup, "failed to open /dev/kmsg");
> > -
> > - while (j) {
> > - for (k = 0; k < 2; k++) {
> > - TEST(read(fd, msg, sizeof(msg)));
> > - if (TEST_RETURN == -1) {
> > - if (errno == EPIPE)
> > - break;
> > - else
> > - tst_brkm(TBROK|TTERRNO, cleanup,
> > - "failed to read /dev/kmsg");
> > - }
> > - if (get_msg_fields(msg, NULL, &seqno[k]) != 0)
> > - tst_resm(TFAIL, "failed to parse seqid: %s",
> > - msg);
> > - if (k == 0)
> > - if (lseek(fd, 0, SEEK_SET) == -1)
> > - tst_resm(TFAIL|TERRNO,
> > - "SEEK_SET 0 failed");
> > + for (j = 0; j < NUM_READ_RETRY && !done; j++) {
> > + /*
> > + * j > 0 means we are trying again, because we most likely
> > + * failed on read returning EPIPE - first message in buffer
> > + * has been overwrittern. Give a second to whoever overwrote
> > + * first message to finish.
> > + */
> > + if (j)
> > + sleep(1);
>
> What about changing it to 0.1s here? Or are there processes that keeps
> feeding the kernel log buffer for a second or more?
Yes, we can go with 0.1.
>
> > + /*
> > + * Open 2 fds. Use fd1 to read seqno1, then seek to
> > + * begininng and read seqno2. Use fd2 to check if
> > + * first entry in buffer got overwritten. If so,
> > + * we'll have to repeat the test.
> > + */
> > + fd = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
> > + fd2 = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
> > +
> > + if (read_msg_seqno(fd, &seqno[0]))
> > + goto close_fds;
> > +
> > + if (lseek(fd, 0, SEEK_SET) == -1) {
> > + tst_resm(TFAIL|TERRNO, "SEEK_SET 0 failed");
> > + goto done;
>
> I wonder if this should be tst_brkm() rather than tst_resm(), since as
> it is we would end up printing the TFAIL message below, or am I
> mistaken?
I can skip the TFAIL message below, but I find TFAIL here more fitting,
because it is directly related to what's being tested.
>
> > }
> >
> > - if (TEST_RETURN != -1)
> > - break;
> > + if (read_msg_seqno(fd, &seqno[1]))
> > + goto close_fds;
> >
> > - /* give a second to whoever overwrote first message to finish */
> > - sleep(1);
> > - j--;
> > + if (read_msg_seqno(fd2, &tmp))
> > + goto close_fds;
> >
> > - /* read above has returned EPIPE, reopen fd and try again */
> > +done:
> > + done = 1;
> > +close_fds:
> > SAFE_CLOSE(cleanup, fd);
> > - fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
> > - if (fd < 0)
> > - tst_brkm(TBROK|TERRNO, cleanup,
> > - "failed to open /dev/kmsg");
> > + SAFE_CLOSE(cleanup, fd2);
> > }
> >
> > - if (!j) {
> > + if (j == NUM_READ_RETRY) {
> > tst_resm(TWARN, "exceeded: %d attempts", NUM_READ_RETRY);
> > } else {
> > - if (seqno[0] != seqno[1])
> > - tst_resm(TFAIL, "SEEK_SET 0");
> > - else
> > + if (seqno[0] != seqno[1]) {
> > + tst_resm(TFAIL, "SEEK_SET 0, %lu != %lu",
> > + seqno[0], seqno[1]);
> > + } else {
> > tst_resm(TPASS, "SEEK_SET 0");
> > + }
> > }
> >
> > /* 2. messages after SEEK_END 0 shouldn't contain MSG_PREFIX */
> > + fd = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
> > tst_resm(TINFO, "TEST: seek SEEK_END 0");
> > if (lseek(fd, 0, SEEK_END) == -1)
> > tst_resm(TFAIL|TERRNO, "lseek SEEK_END 0 failed");
>
> Otherwise it looks OK.
>
> --
> Cyril Hrubis
> chrubis@suse.cz
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [LTP] [PATCH] kmsg01: fix race in SEEK_SET 0 test
2017-03-06 8:18 ` Jan Stancek
@ 2017-03-06 8:29 ` Cyril Hrubis
0 siblings, 0 replies; 4+ messages in thread
From: Cyril Hrubis @ 2017-03-06 8:29 UTC (permalink / raw)
To: ltp
Hi!
> > > + /*
> > > + * Open 2 fds. Use fd1 to read seqno1, then seek to
> > > + * begininng and read seqno2. Use fd2 to check if
> > > + * first entry in buffer got overwritten. If so,
> > > + * we'll have to repeat the test.
> > > + */
> > > + fd = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
> > > + fd2 = SAFE_OPEN(cleanup, "/dev/kmsg", O_RDONLY | O_NONBLOCK);
> > > +
> > > + if (read_msg_seqno(fd, &seqno[0]))
> > > + goto close_fds;
> > > +
> > > + if (lseek(fd, 0, SEEK_SET) == -1) {
> > > + tst_resm(TFAIL|TERRNO, "SEEK_SET 0 failed");
> > > + goto done;
> >
> > I wonder if this should be tst_brkm() rather than tst_resm(), since as
> > it is we would end up printing the TFAIL message below, or am I
> > mistaken?
>
> I can skip the TFAIL message below, but I find TFAIL here more fitting,
> because it is directly related to what's being tested.
Sounds reasonable, let's go with that.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-06 8:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-02 9:42 [LTP] [PATCH] kmsg01: fix race in SEEK_SET 0 test Jan Stancek
2017-03-03 14:36 ` Cyril Hrubis
2017-03-06 8:18 ` Jan Stancek
2017-03-06 8:29 ` Cyril Hrubis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox