From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A0200C4332F for ; Mon, 21 Nov 2022 15:08:08 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E04223CCBD7 for ; Mon, 21 Nov 2022 16:08:06 +0100 (CET) Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 8A2503CCBE2 for ; Mon, 21 Nov 2022 16:07:49 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id E2D0822CDDF for ; Mon, 21 Nov 2022 16:07:48 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 4C1A71F8CB; Mon, 21 Nov 2022 15:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1669043268; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4nlxMr5D8/9L849kVV9Ev0/iC/h/QJn+Zz2fwzaOFNA=; b=rgO4k2PyXq31z3SMC6W99OnuDQGGEBBcvoKvnX4NmbtBHcs1+vin3Ehp0en1M68OYmEkeq shHGmwSZdfFmvjHWYEon2/XpL22O4LUr7pIX5W5kwJaSQGnQH/JxAwN3cbMBe4Zcsim5jZ +eMi/5cIfWd2Nec1hkBuw0zNs/JZzXA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1669043268; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4nlxMr5D8/9L849kVV9Ev0/iC/h/QJn+Zz2fwzaOFNA=; b=1tbt0o7EacOW5ZKcVm4Y/CtzbC8eZlzzWvGd9NrouewXbQN+r6kzpu0JTfzFl9mhG5X8pz 4nHU3EJjjdvQ/eDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 381541376E; Mon, 21 Nov 2022 15:07:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ijdoC0SUe2P3MwAAMHmgww (envelope-from ); Mon, 21 Nov 2022 15:07:48 +0000 Date: Mon, 21 Nov 2022 16:09:11 +0100 From: Cyril Hrubis To: Jan Kara Message-ID: References: <20221115123721.12176-1-jack@suse.cz> <20221115124741.14400-3-jack@suse.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221115124741.14400-3-jack@suse.cz> X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH 3/3] fanotify10: Make evictable marks tests more reliable X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Hi! > Signed-off-by: Jan Kara > --- > .../kernel/syscalls/fanotify/fanotify10.c | 62 ++++++++++++++++--- > 1 file changed, 52 insertions(+), 10 deletions(-) > > diff --git a/testcases/kernel/syscalls/fanotify/fanotify10.c b/testcases/kernel/syscalls/fanotify/fanotify10.c > index e19bd907470f..cfbf4c31dd08 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify10.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify10.c > @@ -86,7 +86,10 @@ static int ignore_mark_unsupported; > #define TEST_APP "fanotify_child" > #define TEST_APP2 "fanotify_child2" > #define DIR_PATH MOUNT_PATH"/"DIR_NAME > +#define DIR_PATH_MULTI DIR_PATH"%d" > #define FILE_PATH DIR_PATH"/"FILE_NAME > +#define FILE_PATH_MULTI FILE_PATH"%d" > +#define FILE_PATH_MULTIDIR DIR_PATH_MULTI"/"FILE_NAME > #define FILE2_PATH DIR_PATH"/"FILE2_NAME > #define SUBDIR_PATH DIR_PATH"/"SUBDIR_NAME > #define FILE_EXEC_PATH MOUNT_PATH"/"TEST_APP > @@ -104,6 +107,7 @@ static int old_cache_pressure; > static pid_t child_pid; > static int bind_mount_created; > static unsigned int num_classes = NUM_CLASSES; > +static int max_file_multi; > > enum { > FANOTIFY_INODE, > @@ -378,9 +382,11 @@ static struct tcase { > .tname = "don't ignore mount events created on file with evicted ignore mark", > .mark_path_fmt = MOUNT_PATH, > .mark_type = FANOTIFY_MOUNT, > - .ignore_path_fmt = FILE_PATH, > + .ignore_path_cnt = 16, > + .ignore_path_fmt = FILE_PATH_MULTI, > .ignore_mark_type = FANOTIFY_EVICTABLE, > - .event_path_fmt = FILE_PATH, > + .event_path_cnt = 16, > + .event_path_fmt = FILE_PATH_MULTI, > .expected_mask_with_ignore = FAN_OPEN, > .expected_mask_without_ignore = FAN_OPEN > }, > @@ -388,9 +394,11 @@ static struct tcase { > .tname = "don't ignore fs events created on a file with evicted ignore mark", > .mark_path_fmt = MOUNT_PATH, > .mark_type = FANOTIFY_FILESYSTEM, > - .ignore_path_fmt = FILE_PATH, > + .ignore_path_cnt = 16, > + .ignore_path_fmt = FILE_PATH_MULTI, > .ignore_mark_type = FANOTIFY_EVICTABLE, > - .event_path_fmt = FILE_PATH, > + .event_path_cnt = 16, > + .event_path_fmt = FILE_PATH_MULTI, > .expected_mask_with_ignore = FAN_OPEN, > .expected_mask_without_ignore = FAN_OPEN > }, > @@ -398,10 +406,12 @@ static struct tcase { > .tname = "don't ignore mount events created inside a parent with evicted ignore mark", > .mark_path_fmt = MOUNT_PATH, > .mark_type = FANOTIFY_MOUNT, > - .ignore_path_fmt = DIR_PATH, > + .ignore_path_cnt = 16, > + .ignore_path_fmt = DIR_PATH_MULTI, > .ignore_mark_type = FANOTIFY_EVICTABLE, > .ignored_flags = FAN_EVENT_ON_CHILD, > - .event_path_fmt = FILE_PATH, > + .event_path_cnt = 16, > + .event_path_fmt = FILE_PATH_MULTIDIR, > .expected_mask_with_ignore = FAN_OPEN, > .expected_mask_without_ignore = FAN_OPEN > }, > @@ -409,10 +419,12 @@ static struct tcase { > .tname = "don't ignore fs events created inside a parent with evicted ignore mark", > .mark_path_fmt = MOUNT_PATH, > .mark_type = FANOTIFY_FILESYSTEM, > - .ignore_path_fmt = DIR_PATH, > + .ignore_path_cnt = 16, > + .ignore_path_fmt = DIR_PATH_MULTI, > .ignore_mark_type = FANOTIFY_EVICTABLE, > .ignored_flags = FAN_EVENT_ON_CHILD, > - .event_path_fmt = FILE_PATH, > + .event_path_cnt = 16, > + .event_path_fmt = FILE_PATH_MULTIDIR, > .expected_mask_with_ignore = FAN_OPEN, > .expected_mask_without_ignore = FAN_OPEN > }, > @@ -864,6 +876,8 @@ cleanup: > > static void setup(void) > { > + int i; > + > exec_events_unsupported = fanotify_events_supported_by_kernel(FAN_OPEN_EXEC, > FAN_CLASS_CONTENT, 0); > filesystem_mark_unsupported = fanotify_mark_supported_by_kernel(FAN_MARK_FILESYSTEM); > @@ -880,7 +894,24 @@ static void setup(void) > SAFE_MKDIR(DIR_PATH, 0755); > SAFE_MKDIR(SUBDIR_PATH, 0755); > SAFE_FILE_PRINTF(FILE_PATH, "1"); > - SAFE_FILE_PRINTF(FILE2_PATH, "1"); > + for (i = 0; i < (int)(sizeof(tcases)/sizeof(tcases[0])); i++) { ^ We do have the standard ARRAY_SIZE() macro defined in LTP > + if (tcases[i].mark_path_cnt > max_file_multi) > + max_file_multi = tcases[i].mark_path_cnt; > + if (tcases[i].ignore_path_cnt > max_file_multi) > + max_file_multi = tcases[i].ignore_path_cnt; > + if (tcases[i].event_path_cnt > max_file_multi) > + max_file_multi = tcases[i].event_path_cnt; > + } > + for (i = 0; i < max_file_multi; i++) { > + char path[PATH_MAX]; > + > + sprintf(path, FILE_PATH_MULTI, i); > + SAFE_FILE_PRINTF(path, "1"); > + sprintf(path, DIR_PATH_MULTI, i); > + SAFE_MKDIR(path, 0755); > + sprintf(path, FILE_PATH_MULTIDIR, i); > + SAFE_FILE_PRINTF(path, "1"); > + } > > SAFE_CP(TEST_APP, FILE_EXEC_PATH); > SAFE_CP(TEST_APP, FILE2_EXEC_PATH); > @@ -896,6 +927,8 @@ static void setup(void) > > static void cleanup(void) > { > + int i; > + > cleanup_fanotify_groups(); > > if (bind_mount_created) > @@ -903,8 +936,17 @@ static void cleanup(void) > > SAFE_FILE_PRINTF(CACHE_PRESSURE_FILE, "%d", old_cache_pressure); > > + for (i = 0; i < max_file_multi; i++) { > + char path[PATH_MAX]; > + > + sprintf(path, FILE_PATH_MULTIDIR, i); > + SAFE_UNLINK(path); > + sprintf(path, DIR_PATH_MULTI, i); > + SAFE_RMDIR(path); > + sprintf(path, FILE_PATH_MULTI, i); > + SAFE_UNLINK(path); > + } > SAFE_UNLINK(FILE_PATH); > - SAFE_UNLINK(FILE2_PATH); > SAFE_RMDIR(SUBDIR_PATH); > SAFE_RMDIR(DIR_PATH); > SAFE_RMDIR(MNT2_PATH); Do we have to unlink anything at all? As far as I can tell we create these files on a device that is reformatted after the test anyways. -- Cyril Hrubis chrubis@suse.cz -- Mailing list info: https://lists.linux.it/listinfo/ltp