From patchwork Fri Nov 16 06:51:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 998772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ji0Z6eOd"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42x8660lhrz9s8F for ; Fri, 16 Nov 2018 17:51:41 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 5494E3E6563 for ; Fri, 16 Nov 2018 07:51:39 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) by picard.linux.it (Postfix) with ESMTP id 21C4A3E652F for ; Fri, 16 Nov 2018 07:51:33 +0100 (CET) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 9F5B0600F96 for ; Fri, 16 Nov 2018 07:51:32 +0100 (CET) Received: by mail-wr1-x443.google.com with SMTP id l9so10795176wrt.13 for ; Thu, 15 Nov 2018 22:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cZuTuw8eGrnni9WDzMX8Yzr7F5oFgoI+QLoSbW8w2oU=; b=ji0Z6eOdPOP5y2ZoCbCV/QX6EoaQ/j99xmk8r6XE12SZHtxeL857URR4iXzcFVw/fx n9jiiXEV0zMOdhyTDi3KZpwYNzfla4y5KGCqUDQA9+wevk6yH1GMnfggolbqrYulcFaX 6dH0OA7YsAvmXu1aFJ8rvnpiz3f5n3QFczltzDCzsedD7Obzvo3UMCn0+dMmW1zU1irk y8Ut1RFQNfJA09337aknBY2caDWN9XI8SQigtRABf+sWFLvEQT/8yU9cX2OZ+HZwXzR4 7pVpFJ/zzb9TrL1i+a/lPw+m18/8oFXZGVkUSrdwnDOGAgpuY5VvaxijyKM2vTDCQ2AV aDQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cZuTuw8eGrnni9WDzMX8Yzr7F5oFgoI+QLoSbW8w2oU=; b=LSgQ+UY1tLqHS/Kg0ogTi612RqoLTA5+kiMR8C+cf1YpTNVztKv3oIPGyqXoK+AwtM omCkAIIqnUHnE2hd5zKvai19tHVycWQxxLVejpabFHTEEC/hOYYFKixUMNYyuJ5NZuk1 hObonv2+BSL5I7OUCcGjhcdudvrFIiNt33SuERRW2TR2chjoL9TRiMN2j+F9B60VZYyN nagg4wMzv6g0vThjfxPK91mgJkbYv092JhkU86gsBp9c6c6l1y5dMm1F+udE9/X5hGq2 BPT6L6BJrgK8YfNP802SI/rSyRKSD4jCvl3S2NHu4kCYKdgildpxe3gF/0rGah+uIT33 zqzg== X-Gm-Message-State: AGRZ1gLEW6JhXYa0sXixuIZGsZvmQKZ3GLKtJXt2h4gpShwDv2HZ6jIv bW7o7uXKp33ip+pdZCHkDxo= X-Google-Smtp-Source: AJdET5fMGc/5FPL9bbalLVtQMxT1kxegW/GqKHF5+/bcLAZKV2FpywFJZHapQavgYm42e7z7V3r4nw== X-Received: by 2002:a5d:4fcb:: with SMTP id h11mr8397854wrw.139.1542351092117; Thu, 15 Nov 2018 22:51:32 -0800 (PST) Received: from localhost.localdomain ([37.46.46.74]) by smtp.gmail.com with ESMTPSA id z8sm8200598wrr.52.2018.11.15.22.51.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 22:51:31 -0800 (PST) From: Amir Goldstein To: Cyril Hrubis Date: Fri, 16 Nov 2018 08:51:15 +0200 Message-Id: <20181116065119.6912-2-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181116065119.6912-1-amir73il@gmail.com> References: <20181116065119.6912-1-amir73il@gmail.com> X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Cc: Jan Kara , ltp@lists.linux.it Subject: [LTP] [PATCH 1/5] syscalls/fanotify01: check events also on mountpoint mark X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Add index to test and repeat it for mark types inode and mountpoint. Move fanotify_init() into the test to simplify setup/cleanup. Signed-off-by: Amir Goldstein --- .../kernel/syscalls/fanotify/fanotify01.c | 83 ++++++++++++------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/testcases/kernel/syscalls/fanotify/fanotify01.c b/testcases/kernel/syscalls/fanotify/fanotify01.c index e1210134b..5dfb67b61 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify01.c +++ b/testcases/kernel/syscalls/fanotify/fanotify01.c @@ -32,26 +32,46 @@ #define BUF_SIZE 256 #define TST_TOTAL 12 +static struct tcase { + const char *tname; + struct fanotify_mark_type mark; +} tcases[] = { + { + "inode mark events", + INIT_FANOTIFY_MARK_TYPE(INODE), + }, + { + "mount mark events", + INIT_FANOTIFY_MARK_TYPE(MOUNT), + }, +}; + static char fname[BUF_SIZE]; static char buf[BUF_SIZE]; -static int fd, fd_notify; +static int fd_notify; static unsigned long long event_set[EVENT_MAX]; static char event_buf[EVENT_BUF_LEN]; -void test01(void) +static void test_fanotify(unsigned int n) { - int ret, len, i = 0, test_num = 0; - + struct tcase *tc = &tcases[n]; + struct fanotify_mark_type *mark = &tc->mark; + int fd, ret, len, i = 0, test_num = 0; int tst_count = 0; - if (fanotify_mark(fd_notify, FAN_MARK_ADD, FAN_ACCESS | FAN_MODIFY | - FAN_CLOSE | FAN_OPEN, AT_FDCWD, fname) < 0) { + tst_res(TINFO, "Test #%d: %s", n, tc->tname); + + fd_notify = SAFE_FANOTIFY_INIT(FAN_CLASS_NOTIF, O_RDONLY); + + if (fanotify_mark(fd_notify, FAN_MARK_ADD | mark->flag, + FAN_ACCESS | FAN_MODIFY | FAN_CLOSE | FAN_OPEN, + AT_FDCWD, fname) < 0) { tst_brk(TBROK | TERRNO, - "fanotify_mark (%d, FAN_MARK_ADD, FAN_ACCESS | " + "fanotify_mark (%d, FAN_MARK_ADD, FAN_ACCESS | %s | " "FAN_MODIFY | FAN_CLOSE | FAN_OPEN, AT_FDCWD, %s) " - "failed", fd_notify, fname); + "failed", fd_notify, mark->name, fname); } /* @@ -101,12 +121,12 @@ void test01(void) /* Ignore access events */ if (fanotify_mark(fd_notify, - FAN_MARK_ADD | FAN_MARK_IGNORED_MASK, + FAN_MARK_ADD | mark->flag | FAN_MARK_IGNORED_MASK, FAN_ACCESS, AT_FDCWD, fname) < 0) { tst_brk(TBROK | TERRNO, - "fanotify_mark (%d, FAN_MARK_ADD | " - "FAN_MARK_IGNORED_MASK, FAN_ACCESS, " - "AT_FDCWD, %s) failed", fd_notify, fname); + "fanotify_mark (%d, FAN_MARK_ADD | %s | " + "FAN_MARK_IGNORED_MASK, FAN_ACCESS, AT_FDCWD, %s) " + "failed", fd_notify, mark->name, fname); } fd = SAFE_OPEN(fname, O_RDWR); @@ -150,15 +170,14 @@ void test01(void) * Now ignore open & close events regardless of file * modifications */ - if (fanotify_mark(fd_notify, - FAN_MARK_ADD | FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY, - FAN_OPEN | FAN_CLOSE, AT_FDCWD, fname) < 0) { + if (fanotify_mark(fd_notify, FAN_MARK_ADD | mark->flag | + FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY, + FAN_OPEN | FAN_CLOSE, AT_FDCWD, fname) < 0) { tst_brk(TBROK | TERRNO, - "fanotify_mark (%d, FAN_MARK_ADD | " - "FAN_MARK_IGNORED_MASK | " - "FAN_MARK_IGNORED_SURV_MODIFY, FAN_OPEN | " - "FAN_CLOSE, AT_FDCWD, %s) failed", fd_notify, - fname); + "fanotify_mark (%d, FAN_MARK_ADD | %s | " + "FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY, " + "FAN_OPEN | FAN_CLOSE, AT_FDCWD, %s) failed", + fd_notify, mark->name, fname); } /* This event should be ignored */ @@ -181,13 +200,13 @@ void test01(void) /* Now remove open and close from ignored mask */ if (fanotify_mark(fd_notify, - FAN_MARK_REMOVE | FAN_MARK_IGNORED_MASK, + FAN_MARK_REMOVE | mark->flag | FAN_MARK_IGNORED_MASK, FAN_OPEN | FAN_CLOSE, AT_FDCWD, fname) < 0) { tst_brk(TBROK | TERRNO, - "fanotify_mark (%d, FAN_MARK_REMOVE | " - "FAN_MARK_IGNORED_MASK, FAN_OPEN | " - "FAN_CLOSE, AT_FDCWD, %s) failed", fd_notify, - fname); + "fanotify_mark (%d, FAN_MARK_REMOVE | %s | " + "FAN_MARK_IGNORED_MASK, FAN_OPEN | FAN_CLOSE, " + "AT_FDCWD, %s) failed", fd_notify, + mark->name, fname); } SAFE_CLOSE(fd); @@ -283,12 +302,13 @@ pass: } /* Remove mark to clear FAN_MARK_IGNORED_SURV_MODIFY */ - if (fanotify_mark(fd_notify, FAN_MARK_REMOVE, FAN_ACCESS | FAN_MODIFY | - FAN_CLOSE | FAN_OPEN, AT_FDCWD, fname) < 0) { + if (fanotify_mark(fd_notify, FAN_MARK_REMOVE | mark->flag, + FAN_ACCESS | FAN_MODIFY | FAN_CLOSE | FAN_OPEN, + AT_FDCWD, fname) < 0) { tst_brk(TBROK | TERRNO, - "fanotify_mark (%d, FAN_MARK_REMOVE, FAN_ACCESS | " + "fanotify_mark (%d, FAN_MARK_REMOVE | %s, FAN_ACCESS | " "FAN_MODIFY | FAN_CLOSE | FAN_OPEN, AT_FDCWD, %s) " - "failed", fd_notify, fname); + "failed", fd_notify, mark->name, fname); } } @@ -296,8 +316,6 @@ static void setup(void) { sprintf(fname, "tfile_%d", getpid()); SAFE_FILE_PRINTF(fname, "1"); - - fd_notify = SAFE_FANOTIFY_INIT(FAN_CLASS_NOTIF, O_RDONLY); } static void cleanup(void) @@ -307,7 +325,8 @@ static void cleanup(void) } static struct tst_test test = { - .test_all = test01, + .test = test_fanotify, + .tcnt = ARRAY_SIZE(tcases), .setup = setup, .cleanup = cleanup, .needs_tmpdir = 1,