From patchwork Wed Apr 24 08:53:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 1090001 X-Patchwork-Delegate: petr.vorel@gmail.com 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="KhdESnfv"; 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 44pvHR3vQsz9s47 for ; Wed, 24 Apr 2019 18:53:38 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A6A143EA546 for ; Wed, 24 Apr 2019 10:53:27 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) by picard.linux.it (Postfix) with ESMTP id C73103EA503 for ; Wed, 24 Apr 2019 10:53:25 +0200 (CEST) Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 51E36140096D for ; Wed, 24 Apr 2019 10:53:24 +0200 (CEST) Received: by mail-wm1-x341.google.com with SMTP id h18so3846082wml.1 for ; Wed, 24 Apr 2019 01:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=5QECOGsSuxj6igeO9Y1QjClekImKPW9M/F9+f0Tsxfc=; b=KhdESnfvruSnwZ0t3yHAmZwsxb/bajcrS+KGAJ+QFVMC3GN5xY8IeHd3Ws8RJIZHn3 lfOc696iZUE2vVD36U5HWwMZWIGZE2cD3CaYn3PFJlwPJPZbyzgwH/HU0E4H2/X6B77b TbaEZzsUipmRbLgn3fWYAzmJj8o4cYzEtYrkMkV5MnWDoXIxfoI0qndIGfTYxhKCYFvo kEWoqx6VB+Qi6sTzgN+hPThh44fTqP2P6pJ1fygS+LvBePjDPHVks3k/5+6Dh0jORra6 bdgbcgqHOQs/TJ/F3twHr/OX/lkzQkdqAFlR+AdFlILLwlmU+uItIKr5tvgyWcxqtqni 1zYw== 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; bh=5QECOGsSuxj6igeO9Y1QjClekImKPW9M/F9+f0Tsxfc=; b=HRzKoU63/8kc5jI5daLgzAMmrzesORSjMWi0fzjtLZG8yBcU7G+Z9ZOJ0peaY6f++I haSPtJNSEzqh4sMEd9PY5JuO65SPtAgO3JcoYrb1XpUKXvDbLkvopheUtxTc58/ud2jj ZyAkYzfiW+8JYpF26oNA3c0id/KhImtl1bOWeWOWCoc1DYr6K+oqL9TclkrrUoPYYiah YK6xohi80PThQs79qwMgCSj5Q9hoM4Psw0aGtnek6iy0AXwMKbB69y5bbDJwtxoPUtxm QAxbd7TDPL8H6DRINBnie5rU9Jqqz+seAMBJEdF4NBKF2yDTH1ueJ+oImX0zK3ly5GjU 8TaQ== X-Gm-Message-State: APjAAAUFwTGl3WPH17ugsMutB6HB6MMkWrN6iaSUUHw40Mb3mc6d4mir JavOzE3jUYs4SQHstBziD/U= X-Google-Smtp-Source: APXvYqyO1YIYj62VqDZtRI8gzW7SGLYQl06f545ZIs2d9v8QOO9GRTpI0JtfbwWsw/IyJaU9tsNdSw== X-Received: by 2002:a7b:c844:: with SMTP id c4mr5517936wml.108.1556096003836; Wed, 24 Apr 2019 01:53:23 -0700 (PDT) Received: from localhost.localdomain ([5.102.238.208]) by smtp.gmail.com with ESMTPSA id n18sm14593923wrt.16.2019.04.24.01.53.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 01:53:22 -0700 (PDT) From: Amir Goldstein To: Cyril Hrubis Date: Wed, 24 Apr 2019 11:53:17 +0300 Message-Id: <20190424085317.409-1-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 X-Virus-Scanned: clamav-milter 0.99.2 at in-6.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-6.smtp.seeweb.it Cc: Murphy Zhou , Jan Kara , ltp@lists.linux.it Subject: [LTP] [PATCH] fanotify06: add a test case for overlayfs 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" This test fails on overlayfs since kernel v4.19. Added a test case for overlayfs mount. Signed-off-by: Amir Goldstein Reviewed-by: Petr Vorel --- Hi Cyril, The new test case covers a bug reported by Murphy Zhou: https://lore.kernel.org/linux-fsdevel/20190423065024.12695-1-jencce.kernel@gmail.com/ Once again, I tried looking at making overlayfs test variant generic. Once again, I gave it up. Thanks, Amir. .../kernel/syscalls/fanotify/fanotify06.c | 74 +++++++++++++++---- 1 file changed, 61 insertions(+), 13 deletions(-) diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c index 6a2e2494f..62defb23c 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify06.c +++ b/testcases/kernel/syscalls/fanotify/fanotify06.c @@ -54,8 +54,23 @@ static int fd_notify[FANOTIFY_PRIORITIES][GROUPS_PER_PRIO]; static char event_buf[EVENT_BUF_LEN]; -#define MOUNT_NAME "mntpoint" +#define MNTPOINT "mntpoint" +#define OVL_LOWER "ovl-lower" +#define OVL_UPPER "ovl-upper" +#define OVL_WORK "ovl-work" +#define OVL_MNT "ovl-mnt" + static int mount_created; +static int ovl_mounted; + +static struct tcase { + const char *tname; + const char *mnt; + int use_overlay; +} tcases[] = { + { "Fanotify merge mount mark", MNTPOINT, 0 }, + { "Fanotify merge overlayfs mount mark", OVL_MNT, 1 }, +}; static void create_fanotify_groups(void) { @@ -72,12 +87,12 @@ static void create_fanotify_groups(void) ret = fanotify_mark(fd_notify[p][i], FAN_MARK_ADD | FAN_MARK_MOUNT, FAN_MODIFY, - AT_FDCWD, "."); + AT_FDCWD, fname); if (ret < 0) { tst_brk(TBROK | TERRNO, "fanotify_mark(%d, FAN_MARK_ADD | " "FAN_MARK_MOUNT, FAN_MODIFY, AT_FDCWD," - " '.') failed", fd_notify[p][i]); + " %s) failed", fd_notify[p][i], fname); } /* Add ignore mark for groups with higher priority */ if (p == 0) @@ -130,11 +145,23 @@ static void verify_event(int group, struct fanotify_event_metadata *event) } } -void test01(void) +void test_fanotify(unsigned int n) { int ret; unsigned int p, i; struct fanotify_event_metadata *event; + struct tcase *tc = &tcases[n]; + + tst_res(TINFO, "Test #%d: %s", n, tc->tname); + + if (tc->use_overlay && !ovl_mounted) { + tst_res(TCONF, + "overlayfs is not configured in this kernel."); + return; + } + + sprintf(fname, "%s/tfile_%d", tc->mnt, getpid()); + SAFE_TOUCH(fname, 0644, NULL); create_fanotify_groups(); @@ -194,29 +221,50 @@ void test01(void) cleanup_fanotify_groups(); } +static void setup_overlay(void) +{ + int ret; + + SAFE_MKDIR(OVL_LOWER, 0755); + SAFE_MKDIR(OVL_UPPER, 0755); + SAFE_MKDIR(OVL_WORK, 0755); + SAFE_MKDIR(OVL_MNT, 0755); + ret = mount("overlay", OVL_MNT, "overlay", 0, "lowerdir="OVL_LOWER + ",upperdir="OVL_UPPER",workdir="OVL_WORK); + if (ret < 0) { + if (errno == ENODEV) { + tst_res(TINFO, + "overlayfs is not configured in this kernel."); + return; + } + tst_brk(TBROK | TERRNO, "overlayfs mount failed"); + } + ovl_mounted = 1; +} + static void setup(void) { - SAFE_MKDIR(MOUNT_NAME, 0755); - SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, "none", MS_BIND, NULL); + SAFE_MKDIR(MNTPOINT, 0755); + SAFE_MOUNT(MNTPOINT, MNTPOINT, "none", MS_BIND, NULL); mount_created = 1; - SAFE_CHDIR(MOUNT_NAME); - sprintf(fname, "tfile_%d", getpid()); - SAFE_FILE_PRINTF(fname, "1"); + setup_overlay(); } static void cleanup(void) { cleanup_fanotify_groups(); - SAFE_CHDIR("../"); + if (ovl_mounted) + SAFE_UMOUNT(OVL_MNT); - if (mount_created && tst_umount(MOUNT_NAME) < 0) - tst_brk(TBROK | TERRNO, "umount failed"); + if (mount_created) + SAFE_UMOUNT(MNTPOINT); } static struct tst_test test = { - .test_all = test01, + .test = test_fanotify, + .tcnt = ARRAY_SIZE(tcases), .setup = setup, .cleanup = cleanup, .needs_tmpdir = 1,