From: Amir Goldstein <amir73il@gmail.com>
To: Petr Vorel <pvorel@suse.cz>
Cc: Matthew Bobrowski <repnop@google.com>, Jan Kara <jack@suse.cz>,
LTP List <ltp@lists.linux.it>
Subject: Re: [LTP] [PATCH 1/5] syscalls/inotify12: Introduce test for inotify mask flags
Date: Mon, 13 Jun 2022 17:58:54 +0300 [thread overview]
Message-ID: <CAOQ4uxjfuQ5oj8V8weD+-ChvXZ9nXy=MB285dAn1zQKV6dn2cA@mail.gmail.com> (raw)
In-Reply-To: <20220613143826.1328830-2-amir73il@gmail.com>
On Mon, Jun 13, 2022 at 5:38 PM Amir Goldstein <amir73il@gmail.com> wrote:
>
> Test behavior of IN_ONESHOT and IN_EXCL_UNLINK.
>
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
> ---
> runtest/syscalls | 1 +
> testcases/kernel/syscalls/inotify/.gitignore | 1 +
> testcases/kernel/syscalls/inotify/inotify12.c | 168 ++++++++++++++++++
> 3 files changed, 170 insertions(+)
> create mode 100644 testcases/kernel/syscalls/inotify/inotify12.c
>
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 3b26d19e6..1259e41f1 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -588,6 +588,7 @@ inotify08 inotify08
> inotify09 inotify09
> inotify10 inotify10
> inotify11 inotify11
> +inotify12 inotify12
>
> fanotify01 fanotify01
> fanotify02 fanotify02
> diff --git a/testcases/kernel/syscalls/inotify/.gitignore b/testcases/kernel/syscalls/inotify/.gitignore
> index 593cf6c04..f6e5c546a 100644
> --- a/testcases/kernel/syscalls/inotify/.gitignore
> +++ b/testcases/kernel/syscalls/inotify/.gitignore
> @@ -9,3 +9,4 @@
> /inotify09
> /inotify10
> /inotify11
> +/inotify12
> diff --git a/testcases/kernel/syscalls/inotify/inotify12.c b/testcases/kernel/syscalls/inotify/inotify12.c
> new file mode 100644
> index 000000000..fe72771c5
> --- /dev/null
> +++ b/testcases/kernel/syscalls/inotify/inotify12.c
> @@ -0,0 +1,168 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) 2022 CTERA Networks. All Rights Reserved.
> + *
> + * Author: Amir Goldstein <amir73il@gmail.com>
> + */
> +
> +/*\
> + * [Description]
> + * Test special inotify mask flags.
> + *
> + * Regression test for kernel commit a32e697cda27:
> + *
> + * inotify: show inotify mask flags in proc fdinfo
> + */
> +
> +#include "config.h"
> +
> +#include <stdio.h>
> +#include <unistd.h>
> +#include <fcntl.h>
> +#include <signal.h>
> +#include <sys/wait.h>
> +
> +#include "tst_test.h"
> +#include "tst_safe_macros.h"
> +#include "inotify.h"
> +
> +#if defined(HAVE_SYS_INOTIFY_H)
> +#include <sys/inotify.h>
> +
> +#define EVENT_MAX 32
> +/* Size of the event structure, not including the name */
> +#define EVENT_SIZE (sizeof(struct inotify_event))
> +#define EVENT_BUF_LEN (EVENT_MAX * (EVENT_SIZE + 16))
> +
> +#define TEST_FILE "test_file"
> +
> +static char event_buf[EVENT_BUF_LEN];
> +
> +static struct tcase {
> + const char *tname;
> + unsigned int mask;
> + int expect_events;
> +} tcases[] = {
> + {
> + "Watch for multi events",
> + IN_MODIFY,
> + 2,
> + },
> + {
> + "Watch for single event",
> + IN_MODIFY | IN_ONESHOT,
> + 1,
> + },
> + {
> + "Watch for events on linked file",
> + IN_MODIFY | IN_EXCL_UNLINK,
> + 1,
> + },
> +};
> +
> +int fd_notify;
> +
> +static void verify_inotify(unsigned int n)
> +{
> + struct tcase *tc = &tcases[n];
> + int fd, len;
> + unsigned int tmpmask;
> + char procfdinfo[100];
> + struct inotify_event *event = (struct inotify_event *)event_buf;
> +
> + tst_res(TINFO, "Test #%d: %s", n, tc->tname);
> +
> + fd_notify = SAFE_MYINOTIFY_INIT1(O_NONBLOCK);
> +
> + SAFE_FILE_PRINTF(TEST_FILE, "1");
> +
> + SAFE_MYINOTIFY_ADD_WATCH(fd_notify, ".", tc->mask);
> +
> + sprintf(procfdinfo, "/proc/%d/fdinfo/%d", (int)getpid(), fd_notify);
> + if (FILE_LINES_SCANF(procfdinfo, "inotify wd:%*d ino:%*x sdev:%*x mask:%x",
> + &tmpmask)) {
> + tst_res(TFAIL, "Could not parse inotify fdinfo");
> + } else if (tmpmask != tc->mask) {
> + tst_res(TFAIL, "Incorrect mask %x in inotify fdinfo (expected %x)",
> + tmpmask, tc->mask);
> + } else {
> + tst_res(TPASS, "Correct mask in inotify fdinfo");
> + }
> +
> + fd = SAFE_OPEN(TEST_FILE, O_RDWR);
> + SAFE_WRITE(1, fd, "2", 1);
> +
> + /*
> + * Read the 1st IN_MODIFY event
> + */
> + len = SAFE_READ(0, fd_notify, event_buf, EVENT_BUF_LEN);
> +
> + if (len < (int)sizeof(*event)) {
> + tst_res(TFAIL, "Got no events");
> + } else if (event->mask == IN_MODIFY) {
> + tst_res(TPASS, "Got 1st event as expected");
> + } else {
> + tst_res(TFAIL, "Got event 0x%x (expected 0x%x)",
> + event->mask, IN_MODIFY);
> + }
> +
> + /*
> + * Unlink file so IN_EXCL_UNLINK won't get IN_ACCESS event.
> + * IN_ONESHOT won't get IN_ACCESS event because IN_MODIFY
> + * was already generated.
> + */
> + SAFE_UNLINK(TEST_FILE);
> + SAFE_WRITE(1, fd, "3", 1);
> + SAFE_CLOSE(fd);
> +
> + /*
> + * Possibly read the 2nd IN_MODIFY event
> + */
> + errno = 0;
> + len = read(fd_notify, event_buf, EVENT_BUF_LEN);
> + SAFE_CLOSE(fd_notify);
> + if (len < 0 && errno == EAGAIN) {
> + /* Treat no event same as we treat IN_IGNORED */
> + event->mask = IN_IGNORED;
> + } else if (len < (int)sizeof(*event)) {
> + tst_res(TFAIL | TERRNO, "Failed to read events");
> + return;
> + }
> +
> + if (event->mask == IN_MODIFY) {
> + if (tc->expect_events > 1)
> + tst_res(TPASS, "Got 2nd event as expected");
> + else
> + tst_res(TFAIL, "Got unexpected 2nd event");
> + } else if (event->mask == IN_IGNORED) {
> + if (tc->expect_events == 1)
> + tst_res(TPASS, "Got no more events as expected");
> + else
> + tst_res(TFAIL, "Got only one event (expected %d)",
> + tc->expect_events);
> + } else {
> + tst_res(TFAIL, "Got unexpected event 0x%x",
> + event->mask);
> + }
> +}
> +
> +static void cleanup(void)
> +{
> + if (fd_notify > 0)
> + SAFE_CLOSE(fd_notify);
> +}
> +
> +static struct tst_test test = {
> + .timeout = 10,
OOPS should be changed to .max_runtime = 10
> + .needs_tmpdir = 1,
> + .cleanup = cleanup,
> + .test = verify_inotify,
> + .tcnt = ARRAY_SIZE(tcases),
> + .tags = (const struct tst_tag[]) {
> + {"linux-git", "a32e697cda27"},
> + {}
Missing }
Sorry, I hadn't notice this build failure before posting.
Thanks,
Amir.
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2022-06-13 14:59 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-13 14:38 [LTP] [PATCH 0/5] Fanotify tests for FAN_MARK_EVICTABLE Amir Goldstein
2022-06-13 14:38 ` [LTP] [PATCH 1/5] syscalls/inotify12: Introduce test for inotify mask flags Amir Goldstein
2022-06-13 14:58 ` Amir Goldstein [this message]
2022-06-13 15:23 ` Petr Vorel
2022-06-13 16:03 ` Amir Goldstein
2022-06-13 16:05 ` Petr Vorel
2022-06-13 15:48 ` Petr Vorel
2022-06-14 10:19 ` Jan Kara
2022-06-14 11:28 ` Petr Vorel
2022-06-13 14:38 ` [LTP] [PATCH 2/5] syscalls/fanotify23: Introduce FAN_MARK_EVICTABLE test Amir Goldstein
2022-06-14 10:19 ` Jan Kara
2022-06-16 8:36 ` Petr Vorel
2022-06-16 8:50 ` Amir Goldstein
2022-06-16 13:28 ` Petr Vorel
2022-06-13 14:38 ` [LTP] [PATCH 3/5] syscalls/fanotify10: Watch directory that is not the mount path Amir Goldstein
2022-06-14 10:26 ` Jan Kara
2022-06-14 11:10 ` Amir Goldstein
2022-06-16 13:31 ` Petr Vorel
2022-06-16 13:46 ` Amir Goldstein
2022-06-16 16:57 ` Petr Vorel
2022-06-13 14:38 ` [LTP] [PATCH 4/5] syscalls/fanotify10: Mount cycle between test cases Amir Goldstein
2022-06-14 10:47 ` Jan Kara
2022-06-13 14:38 ` [LTP] [PATCH 5/5] syscalls/fanotify10: Add test cases for evictable ignore mark Amir Goldstein
2022-06-14 13:04 ` Jan Kara
2022-06-30 6:27 ` Jan Stancek
2022-06-30 8:20 ` Amir Goldstein
2022-07-07 12:49 ` Jan Stancek
2022-07-09 10:09 ` Amir Goldstein
2022-07-12 8:19 ` Jan Stancek
2022-08-24 15:24 ` Jan Kara
2022-08-24 18:13 ` Amir Goldstein
2022-08-25 9:33 ` Jan Kara
2022-08-25 12:53 ` Jan Stancek
2022-08-25 13:47 ` Amir Goldstein
2022-08-25 14:03 ` Jan Kara
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='CAOQ4uxjfuQ5oj8V8weD+-ChvXZ9nXy=MB285dAn1zQKV6dn2cA@mail.gmail.com' \
--to=amir73il@gmail.com \
--cc=jack@suse.cz \
--cc=ltp@lists.linux.it \
--cc=pvorel@suse.cz \
--cc=repnop@google.com \
/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;
as well as URLs for NNTP newsgroup(s).