* [LTP] [PATCH] fanotify06: create a mount for test
@ 2016-06-29 8:49 Jan Stancek
2016-06-29 10:14 ` Li Wang
2016-06-29 19:50 ` Jan Kara
0 siblings, 2 replies; 5+ messages in thread
From: Jan Stancek @ 2016-06-29 8:49 UTC (permalink / raw)
To: ltp
This testcase can rarely fail, when there is a background process
modifying files on same mountpoint as is LTP's tmpdir:
fanotify06 1 TFAIL : fanotify06.c:212: group 0 got more than one event (48 > 24)
fanotify06 2 TFAIL : fanotify06.c:212: group 1 got more than one event (48 > 24)
fanotify06 3 TFAIL : fanotify06.c:212: group 2 got more than one event (48 > 24)
fanotify06 4 TFAIL : fanotify06.c:222: group 3 got event
fanotify06 5 TFAIL : fanotify06.c:222: group 4 got event
fanotify06 6 TPASS : group 5 got no event
fanotify06 7 TPASS : group 6 got no event
fanotify06 8 TPASS : group 7 got no event
fanotify06 9 TPASS : group 8 got no event
This patch creates a mount, which should be only used by this
test to limit interference from rest of OS. It also adds missing
tst_require_root().
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
testcases/kernel/syscalls/fanotify/fanotify06.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c
index 93c960268b57..cdbc7a16c0d7 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify06.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify06.c
@@ -42,6 +42,7 @@
#include <sys/fcntl.h>
#include <errno.h>
#include <string.h>
+#include <sys/mount.h>
#include <sys/syscall.h>
#include "test.h"
#include "linux_syscall_numbers.h"
@@ -80,6 +81,9 @@ static int fd_notify[FANOTIFY_PRIORITIES][GROUPS_PER_PRIO];
static char event_buf[EVENT_BUF_LEN];
+#define MOUNT_NAME "mntpoint"
+static int mount_created;
+
static void create_fanotify_groups(void)
{
unsigned int p, i;
@@ -245,8 +249,15 @@ static void setup(void)
TEST_PAUSE;
+ tst_require_root();
tst_tmpdir();
+ SAFE_MKDIR(cleanup, MOUNT_NAME, 0755);
+ if (mount(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL) < 0)
+ tst_brkm(TBROK | TERRNO, cleanup, "bind mount failed");
+ mount_created = 1;
+ SAFE_CHDIR(cleanup, MOUNT_NAME);
+
sprintf(fname, "tfile_%d", getpid());
fd = SAFE_OPEN(cleanup, fname, O_RDWR | O_CREAT, 0700);
SAFE_WRITE(cleanup, 1, fd, fname, 1);
@@ -258,6 +269,13 @@ static void setup(void)
static void cleanup(void)
{
cleanup_fanotify_groups();
+
+ if (chdir(tst_get_tmpdir()) < 0)
+ tst_brkm(TBROK, NULL, "chdir(tmpdir) failed");
+
+ if (mount_created && tst_umount(MOUNT_NAME) < 0)
+ tst_brkm(TBROK | TERRNO, NULL, "umount failed");
+
tst_rmdir();
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [LTP] [PATCH] fanotify06: create a mount for test
2016-06-29 8:49 [LTP] [PATCH] fanotify06: create a mount for test Jan Stancek
@ 2016-06-29 10:14 ` Li Wang
2016-06-29 11:03 ` Jan Stancek
2016-06-29 19:50 ` Jan Kara
1 sibling, 1 reply; 5+ messages in thread
From: Li Wang @ 2016-06-29 10:14 UTC (permalink / raw)
To: ltp
On Wed, Jun 29, 2016 at 10:49:11AM +0200, Jan Stancek wrote:
> This testcase can rarely fail, when there is a background process
> modifying files on same mountpoint as is LTP's tmpdir:
>
> fanotify06 1 TFAIL : fanotify06.c:212: group 0 got more than one event (48 > 24)
> fanotify06 2 TFAIL : fanotify06.c:212: group 1 got more than one event (48 > 24)
> fanotify06 3 TFAIL : fanotify06.c:212: group 2 got more than one event (48 > 24)
> fanotify06 4 TFAIL : fanotify06.c:222: group 3 got event
> fanotify06 5 TFAIL : fanotify06.c:222: group 4 got event
> fanotify06 6 TPASS : group 5 got no event
> fanotify06 7 TPASS : group 6 got no event
> fanotify06 8 TPASS : group 7 got no event
> fanotify06 9 TPASS : group 8 got no event
>
> This patch creates a mount, which should be only used by this
> test to limit interference from rest of OS. It also adds missing
> tst_require_root().
>
> Signed-off-by: Jan Stancek <jstancek@redhat.com>
> ---
> testcases/kernel/syscalls/fanotify/fanotify06.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c
> index 93c960268b57..cdbc7a16c0d7 100644
> --- a/testcases/kernel/syscalls/fanotify/fanotify06.c
> +++ b/testcases/kernel/syscalls/fanotify/fanotify06.c
> @@ -42,6 +42,7 @@
> #include <sys/fcntl.h>
> #include <errno.h>
> #include <string.h>
> +#include <sys/mount.h>
> #include <sys/syscall.h>
> #include "test.h"
> #include "linux_syscall_numbers.h"
> @@ -80,6 +81,9 @@ static int fd_notify[FANOTIFY_PRIORITIES][GROUPS_PER_PRIO];
>
> static char event_buf[EVENT_BUF_LEN];
>
> +#define MOUNT_NAME "mntpoint"
> +static int mount_created;
> +
> static void create_fanotify_groups(void)
> {
> unsigned int p, i;
> @@ -245,8 +249,15 @@ static void setup(void)
>
> TEST_PAUSE;
>
> + tst_require_root();
> tst_tmpdir();
>
> + SAFE_MKDIR(cleanup, MOUNT_NAME, 0755);
> + if (mount(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL) < 0)
why not SAFE_MOUNT() here?
SAFE_MOUNT(cleanup, MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL);
> + tst_brkm(TBROK | TERRNO, cleanup, "bind mount failed");
> + mount_created = 1;
> + SAFE_CHDIR(cleanup, MOUNT_NAME);
> +
> sprintf(fname, "tfile_%d", getpid());
> fd = SAFE_OPEN(cleanup, fname, O_RDWR | O_CREAT, 0700);
> SAFE_WRITE(cleanup, 1, fd, fname, 1);
> @@ -258,6 +269,13 @@ static void setup(void)
> static void cleanup(void)
> {
> cleanup_fanotify_groups();
> +
> + if (chdir(tst_get_tmpdir()) < 0)
> + tst_brkm(TBROK, NULL, "chdir(tmpdir) failed");
> +
> + if (mount_created && tst_umount(MOUNT_NAME) < 0)
> + tst_brkm(TBROK | TERRNO, NULL, "umount failed");
> +
> tst_rmdir();
> }
>
> --
> 1.8.3.1
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH] fanotify06: create a mount for test
2016-06-29 10:14 ` Li Wang
@ 2016-06-29 11:03 ` Jan Stancek
0 siblings, 0 replies; 5+ messages in thread
From: Jan Stancek @ 2016-06-29 11:03 UTC (permalink / raw)
To: ltp
----- Original Message -----
> From: "Li Wang" <liwang@redhat.com>
> To: "Jan Stancek" <jstancek@redhat.com>
> Cc: ltp@lists.linux.it, jack@suse.cz
> Sent: Wednesday, 29 June, 2016 12:14:17 PM
> Subject: Re: [LTP] [PATCH] fanotify06: create a mount for test
>
> On Wed, Jun 29, 2016 at 10:49:11AM +0200, Jan Stancek wrote:
> > This testcase can rarely fail, when there is a background process
> > modifying files on same mountpoint as is LTP's tmpdir:
> >
> > fanotify06 1 TFAIL : fanotify06.c:212: group 0 got more than one
> > event (48 > 24)
> > fanotify06 2 TFAIL : fanotify06.c:212: group 1 got more than one
> > event (48 > 24)
> > fanotify06 3 TFAIL : fanotify06.c:212: group 2 got more than one
> > event (48 > 24)
> > fanotify06 4 TFAIL : fanotify06.c:222: group 3 got event
> > fanotify06 5 TFAIL : fanotify06.c:222: group 4 got event
> > fanotify06 6 TPASS : group 5 got no event
> > fanotify06 7 TPASS : group 6 got no event
> > fanotify06 8 TPASS : group 7 got no event
> > fanotify06 9 TPASS : group 8 got no event
> >
> > This patch creates a mount, which should be only used by this
> > test to limit interference from rest of OS. It also adds missing
> > tst_require_root().
> >
> > Signed-off-by: Jan Stancek <jstancek@redhat.com>
> > ---
> > testcases/kernel/syscalls/fanotify/fanotify06.c | 18 ++++++++++++++++++
> > 1 file changed, 18 insertions(+)
> >
> > diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c
> > b/testcases/kernel/syscalls/fanotify/fanotify06.c
> > index 93c960268b57..cdbc7a16c0d7 100644
> > --- a/testcases/kernel/syscalls/fanotify/fanotify06.c
> > +++ b/testcases/kernel/syscalls/fanotify/fanotify06.c
> > @@ -42,6 +42,7 @@
> > #include <sys/fcntl.h>
> > #include <errno.h>
> > #include <string.h>
> > +#include <sys/mount.h>
> > #include <sys/syscall.h>
> > #include "test.h"
> > #include "linux_syscall_numbers.h"
> > @@ -80,6 +81,9 @@ static int
> > fd_notify[FANOTIFY_PRIORITIES][GROUPS_PER_PRIO];
> >
> > static char event_buf[EVENT_BUF_LEN];
> >
> > +#define MOUNT_NAME "mntpoint"
> > +static int mount_created;
> > +
> > static void create_fanotify_groups(void)
> > {
> > unsigned int p, i;
> > @@ -245,8 +249,15 @@ static void setup(void)
> >
> > TEST_PAUSE;
> >
> > + tst_require_root();
> > tst_tmpdir();
> >
> > + SAFE_MKDIR(cleanup, MOUNT_NAME, 0755);
> > + if (mount(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL) < 0)
>
> why not SAFE_MOUNT() here?
> SAFE_MOUNT(cleanup, MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL);
Good point, I replaced it for SAFE_MOUNT locally
(holding off from sending v2 for now).
Thanks,
Jan
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH] fanotify06: create a mount for test
2016-06-29 8:49 [LTP] [PATCH] fanotify06: create a mount for test Jan Stancek
2016-06-29 10:14 ` Li Wang
@ 2016-06-29 19:50 ` Jan Kara
2016-07-01 11:16 ` Jan Stancek
1 sibling, 1 reply; 5+ messages in thread
From: Jan Kara @ 2016-06-29 19:50 UTC (permalink / raw)
To: ltp
On Wed 29-06-16 10:49:11, Jan Stancek wrote:
> This testcase can rarely fail, when there is a background process
> modifying files on same mountpoint as is LTP's tmpdir:
>
> fanotify06 1 TFAIL : fanotify06.c:212: group 0 got more than one event (48 > 24)
> fanotify06 2 TFAIL : fanotify06.c:212: group 1 got more than one event (48 > 24)
> fanotify06 3 TFAIL : fanotify06.c:212: group 2 got more than one event (48 > 24)
> fanotify06 4 TFAIL : fanotify06.c:222: group 3 got event
> fanotify06 5 TFAIL : fanotify06.c:222: group 4 got event
> fanotify06 6 TPASS : group 5 got no event
> fanotify06 7 TPASS : group 6 got no event
> fanotify06 8 TPASS : group 7 got no event
> fanotify06 9 TPASS : group 8 got no event
>
> This patch creates a mount, which should be only used by this
> test to limit interference from rest of OS. It also adds missing
> tst_require_root().
>
> Signed-off-by: Jan Stancek <jstancek@redhat.com>
Yeah, that is a good idea. The patch looks good to me so feel free to add:
Acked-by: Jan Kara <jack@suse.cz>
Honza
> ---
> testcases/kernel/syscalls/fanotify/fanotify06.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c
> index 93c960268b57..cdbc7a16c0d7 100644
> --- a/testcases/kernel/syscalls/fanotify/fanotify06.c
> +++ b/testcases/kernel/syscalls/fanotify/fanotify06.c
> @@ -42,6 +42,7 @@
> #include <sys/fcntl.h>
> #include <errno.h>
> #include <string.h>
> +#include <sys/mount.h>
> #include <sys/syscall.h>
> #include "test.h"
> #include "linux_syscall_numbers.h"
> @@ -80,6 +81,9 @@ static int fd_notify[FANOTIFY_PRIORITIES][GROUPS_PER_PRIO];
>
> static char event_buf[EVENT_BUF_LEN];
>
> +#define MOUNT_NAME "mntpoint"
> +static int mount_created;
> +
> static void create_fanotify_groups(void)
> {
> unsigned int p, i;
> @@ -245,8 +249,15 @@ static void setup(void)
>
> TEST_PAUSE;
>
> + tst_require_root();
> tst_tmpdir();
>
> + SAFE_MKDIR(cleanup, MOUNT_NAME, 0755);
> + if (mount(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL) < 0)
> + tst_brkm(TBROK | TERRNO, cleanup, "bind mount failed");
> + mount_created = 1;
> + SAFE_CHDIR(cleanup, MOUNT_NAME);
> +
> sprintf(fname, "tfile_%d", getpid());
> fd = SAFE_OPEN(cleanup, fname, O_RDWR | O_CREAT, 0700);
> SAFE_WRITE(cleanup, 1, fd, fname, 1);
> @@ -258,6 +269,13 @@ static void setup(void)
> static void cleanup(void)
> {
> cleanup_fanotify_groups();
> +
> + if (chdir(tst_get_tmpdir()) < 0)
> + tst_brkm(TBROK, NULL, "chdir(tmpdir) failed");
> +
> + if (mount_created && tst_umount(MOUNT_NAME) < 0)
> + tst_brkm(TBROK | TERRNO, NULL, "umount failed");
> +
> tst_rmdir();
> }
>
> --
> 1.8.3.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH] fanotify06: create a mount for test
2016-06-29 19:50 ` Jan Kara
@ 2016-07-01 11:16 ` Jan Stancek
0 siblings, 0 replies; 5+ messages in thread
From: Jan Stancek @ 2016-07-01 11:16 UTC (permalink / raw)
To: ltp
----- Original Message -----
> From: "Jan Kara" <jack@suse.cz>
> To: "Jan Stancek" <jstancek@redhat.com>
> Cc: ltp@lists.linux.it, jack@suse.cz
> Sent: Wednesday, 29 June, 2016 9:50:40 PM
> Subject: Re: [PATCH] fanotify06: create a mount for test
>
> On Wed 29-06-16 10:49:11, Jan Stancek wrote:
> > This testcase can rarely fail, when there is a background process
> > modifying files on same mountpoint as is LTP's tmpdir:
> >
> > fanotify06 1 TFAIL : fanotify06.c:212: group 0 got more than one
> > event (48 > 24)
> > fanotify06 2 TFAIL : fanotify06.c:212: group 1 got more than one
> > event (48 > 24)
> > fanotify06 3 TFAIL : fanotify06.c:212: group 2 got more than one
> > event (48 > 24)
> > fanotify06 4 TFAIL : fanotify06.c:222: group 3 got event
> > fanotify06 5 TFAIL : fanotify06.c:222: group 4 got event
> > fanotify06 6 TPASS : group 5 got no event
> > fanotify06 7 TPASS : group 6 got no event
> > fanotify06 8 TPASS : group 7 got no event
> > fanotify06 9 TPASS : group 8 got no event
> >
> > This patch creates a mount, which should be only used by this
> > test to limit interference from rest of OS. It also adds missing
> > tst_require_root().
> >
> > Signed-off-by: Jan Stancek <jstancek@redhat.com>
>
> Yeah, that is a good idea. The patch looks good to me so feel free to add:
>
> Acked-by: Jan Kara <jack@suse.cz>
>
> Honza
Pushed.
Regards,
Jan
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-07-01 11:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-29 8:49 [LTP] [PATCH] fanotify06: create a mount for test Jan Stancek
2016-06-29 10:14 ` Li Wang
2016-06-29 11:03 ` Jan Stancek
2016-06-29 19:50 ` Jan Kara
2016-07-01 11:16 ` Jan Stancek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox