linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: Richard Guy Briggs <rgb@redhat.com>
Cc: Jan Kara <jack@suse.cz>, Paul Moore <paul@paul-moore.com>,
	Al Viro <viro@zeniv.linux.org.uk>,
	linux-audit@redhat.com, linux-fsdevel@vger.kernel.org,
	Amir Goldstein <amir73il@gmail.com>
Subject: Re: [PATCH 12/11 TESTSUITE] audit_testsuite: Add stress test for tree watches
Date: Mon, 17 Sep 2018 18:56:04 +0200	[thread overview]
Message-ID: <20180917165604.GD10257@quack2.suse.cz> (raw)
In-Reply-To: <20180914182104.roqwfh6dqln5ur7o@madcap2.tricolour.ca>

On Fri 14-09-18 14:21:04, Richard Guy Briggs wrote:
> On 2018-09-04 18:06, Jan Kara wrote:
> > Add stress test for stressing audit tree watches by adding and deleting
> > rules while events are generated and watched filesystems are mounted and
> > unmounted in parallel.
> 
> A couple of minor comments below, but otherwise looks reasonable to me.
> Reviewed-by: Richard Guy Briggs <rgb@redhat.com>
> 
> I assume you've tested this with more than $dirs = 4 and sleep(60)?

I've tested it to run for longer time (couple hours) but I don't think I've
tested more directories. I can try that out.

> > +sub umount_all {
> > +	my($dir,$dirs,$ignore_fail) = @_;
> > +
> > +	for (my $i=0; $i < $dirs; $i++) {
> > +		while (system("umount $dir/leaf$i >& /dev/null") > 0 &&
> > +		       $ignore_fail == 0) {
> > +			# Nothing - loop until umount succeeds
> > +		}
> > +	}
> 
> Shouldn't this set of tmpfs be unmounted after the bind mounts that
> follow, in reverse order to the way they were mounted?

The order does not really matter. Once bind mount is created, it is
independent entity from the original mount (well, except for possible mount
inheritance) so you can unmount them in arbitrary order.

> > +# create temp directory
> > +my $dir = tempdir( TEMPLATE => '/tmp/audit-testsuite-XXXX', CLEANUP => 1 );
> > +
> > +# create stdout/stderr sinks
> > +( my $fh_out, my $stdout ) = tempfile(
> > +	TEMPLATE => '/tmp/audit-testsuite-out-XXXX',
> > +	UNLINK   => 1
> > +);
> > +( my $fh_err, my $stderr ) = tempfile(
> > +	TEMPLATE => '/tmp/audit-testsuite-err-XXXX',
> > +	UNLINK   => 1
> > +);
> > +
> > +###
> > +# tests
> > +
> > +my $dirs = 4;
> > +
> > +# setup directory hierarchy
> > +for (my $i=0; $i < $dirs; $i++) {
> > +	mkdir $dir."/dir".$i;
> > +	for (my $j=0; $j < $dirs; $j++) {
> > +		mkdir $dir."/dir".$i."/subdir".$j;
> > +	}
> > +}
> > +mkdir "$dir/mnt";
> > +for (my $i=0; $i < $dirs; $i++) {
> > +	mkdir "$dir/mnt/mnt$i";
> > +	mkdir "$dir/leaf$i";
> > +}
> > +
> > +my $stat_pid = fork();
> > +
> > +if ($stat_pid == 0) {
> > +	run_stat($dir, $dirs);
> > +	# Never reached
> > +	exit;
> > +}
> > +
> > +my $mount_pid = fork();
> > +
> > +if ($mount_pid == 0) {
> > +	run_mount($dir, $dirs);
> > +	# Never reached
> > +	exit;
> > +}
> > +
> > +my $key = key_gen();
> > +
> > +my $audit_pid = fork();
> > +
> > +if ($audit_pid == 0) {
> > +	run_mark_audit($dir, $dirs, $key);
> > +	# Never reached
> > +	exit;
> > +}
> > +
> > +# Sleep for a minute to let stress test run...
> > +sleep(60);
> > +ok(1);
> > +
> > +###
> > +# cleanup
> > +
> > +kill('KILL', $stat_pid, $mount_pid, $audit_pid);
> > +# Wait for children to terminate
> > +waitpid($stat_pid, 0);
> > +waitpid($mount_pid, 0);
> > +waitpid($audit_pid, 0);
> > +system("auditctl -D >& /dev/null");
> > +umount_all($dir, $dirs, 1);
> 
> Should all the subdirectories in the temp directory be deleted, or are
> they all cleaned up recursively by the tempdir command?

The CLEANUP / UNLINK parameters to tempdir() and tempfile() functions
should make sure everything is removed on exit (including possible
subdirs).

								Honza
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

  reply	other threads:[~2018-09-17 22:24 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-04 16:06 [PATCH 0/11 v3] audit: Fix various races when tagging and untagging mounts Jan Kara
2018-09-04 16:06 ` [PATCH 01/11] audit_tree: Remove mark->lock locking Jan Kara
2018-09-04 16:06 ` [PATCH 02/11] audit: Fix possible spurious -ENOSPC error Jan Kara
2018-09-04 16:06 ` [PATCH 03/11] audit: Fix possible tagging failures Jan Kara
2018-09-04 16:06 ` [PATCH 04/11] audit: Embed key into chunk Jan Kara
2018-09-13 20:06   ` Richard Guy Briggs
2018-09-04 16:06 ` [PATCH 05/11] audit: Make hash table insertion safe against concurrent lookups Jan Kara
2018-09-04 16:06 ` [PATCH 06/11] audit: Factor out chunk replacement code Jan Kara
2018-09-04 16:06 ` [PATCH 07/11] audit: Remove pointless check in insert_hash() Jan Kara
2018-09-04 16:06 ` [PATCH 08/11] audit: Provide helper for dropping mark's chunk reference Jan Kara
2018-09-04 16:06 ` [PATCH 09/11] audit: Allocate fsnotify mark independently of chunk Jan Kara
2018-09-14 14:09   ` Richard Guy Briggs
2018-09-17 16:46     ` Jan Kara
2018-10-03 22:11       ` Paul Moore
2018-10-03 22:08   ` Paul Moore
2018-10-03 22:39     ` Richard Guy Briggs
2018-10-04  6:57     ` Jan Kara
2018-09-04 16:06 ` [PATCH 10/11] audit: Replace chunk attached to mark instead of replacing mark Jan Kara
2018-09-04 16:06 ` [PATCH 11/11] audit: Use 'mark' name for fsnotify_mark variables Jan Kara
2018-09-14 18:29   ` Richard Guy Briggs
2018-09-17 16:44     ` Jan Kara
2018-09-17 18:13       ` Richard Guy Briggs
2018-09-04 16:06 ` [PATCH 12/11 TESTSUITE] audit_testsuite: Add stress test for tree watches Jan Kara
2018-09-14 18:21   ` Richard Guy Briggs
2018-09-17 16:56     ` Jan Kara [this message]
2018-10-05 21:06   ` Paul Moore
2018-10-09  7:40     ` Jan Kara
2018-10-10  6:43       ` Paul Moore
2018-10-11 11:39         ` Jan Kara
2018-10-11 23:03           ` Paul Moore
2018-10-15 10:04             ` Jan Kara
2018-10-15 15:39               ` Paul Moore
2018-10-17 10:09                 ` Jan Kara
2018-11-14  0:34   ` Paul Moore
2018-11-14 12:16     ` Jan Kara
2018-11-19 15:19       ` Paul Moore
2018-09-14 19:13 ` [PATCH 0/11 v3] audit: Fix various races when tagging and untagging mounts Richard Guy Briggs
2018-09-17 16:57   ` Jan Kara
2018-10-04  1:20     ` Paul Moore
2018-10-04  6:59       ` 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=20180917165604.GD10257@quack2.suse.cz \
    --to=jack@suse.cz \
    --cc=amir73il@gmail.com \
    --cc=linux-audit@redhat.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=paul@paul-moore.com \
    --cc=rgb@redhat.com \
    --cc=viro@zeniv.linux.org.uk \
    /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).