From: Paul Moore <paul@paul-moore.com>
To: jack@suse.cz
Cc: linux-audit@redhat.com, linux-fsdevel@vger.kernel.org,
viro@zeniv.linux.org.uk, rgb@redhat.com, amir73il@gmail.com
Subject: Re: [PATCH 01/10] audit_tree: Remove mark->lock locking
Date: Fri, 27 Jul 2018 00:47:04 -0400 [thread overview]
Message-ID: <CAHC9VhT5M6BZaMrOqsJkWrOGkZrmYEcuLEXJRAz5zV3UUb32qw@mail.gmail.com> (raw)
In-Reply-To: <20180710100217.12866-2-jack@suse.cz>
On Tue, Jul 10, 2018 at 6:02 AM Jan Kara <jack@suse.cz> wrote:
> Currently, audit_tree code uses mark->lock to protect against detaching
> of mark from an inode. In most places it however also uses
> mark->group->mark_mutex (as we need to atomically replace attached
> marks) and this provides protection against mark detaching as well. So
> just remove protection with mark->lock from audit tree code and replace
> it with mark->group->mark_mutex protection in all the places. It
> simplifies the code and gets rid of some ugly catches like calling
> fsnotify_add_mark_locked() with mark->lock held (which cannot sleep only
> because we hold a reference to another mark attached to the same inode).
>
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
> kernel/audit_tree.c | 24 ++++--------------------
> 1 file changed, 4 insertions(+), 20 deletions(-)
...
> diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
> index 02feef939560..1c82eb6674c4 100644
> --- a/kernel/audit_tree.c
> +++ b/kernel/audit_tree.c
> @@ -360,12 +355,12 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree)
> return -ENOSPC;
> }
>
> - spin_lock(&entry->lock);
> + mutex_lock(&entry->group->mark_mutex);
I wonder if we could move the lock up above the
fsnotify_add_inode_mark() earlier in create_chunk() and use
fsnotify_add_mark_locked()?
--
paul moore
www.paul-moore.com
next prev parent reply other threads:[~2018-07-27 6:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 10:02 [PATCH 0/10 v2] audit: Fix various races when tagging and untagging mounts Jan Kara
2018-07-10 10:02 ` [PATCH 01/10] audit_tree: Remove mark->lock locking Jan Kara
2018-07-27 4:47 ` Paul Moore [this message]
2018-09-04 9:53 ` Jan Kara
2018-07-10 10:02 ` [PATCH 02/10] audit: Fix possible spurious -ENOSPC error Jan Kara
2018-07-27 4:47 ` Paul Moore
2018-09-04 10:00 ` Jan Kara
2018-07-10 10:02 ` [PATCH 03/10] audit: Fix possible tagging failures Jan Kara
2018-07-10 10:02 ` [PATCH 04/10] audit: Embed key into chunk Jan Kara
2018-07-27 4:47 ` Paul Moore
2018-07-10 10:02 ` [PATCH 05/10] audit: Make hash table insertion safe against concurrent lookups Jan Kara
2018-07-10 10:02 ` [PATCH 06/10] audit: Factor out chunk replacement code Jan Kara
2018-07-11 7:58 ` Amir Goldstein
2018-07-11 8:26 ` Jan Kara
2018-07-11 9:01 ` Amir Goldstein
2018-07-11 9:23 ` Jan Kara
2018-07-27 4:47 ` Paul Moore
2018-07-10 10:02 ` [PATCH 07/10] audit: Remove pointless check in insert_hash() Jan Kara
2018-07-27 4:47 ` Paul Moore
2018-07-10 10:02 ` [PATCH 08/10] audit: Provide helper for dropping mark's chunk reference Jan Kara
2018-07-10 10:02 ` [PATCH 09/10] audit: Allocate fsnotify mark independently of chunk Jan Kara
2018-07-11 8:57 ` Amir Goldstein
2018-07-11 10:48 ` Amir Goldstein
2018-07-16 15:13 ` Jan Kara
2018-07-27 4:47 ` Paul Moore
2018-09-04 14:03 ` Jan Kara
2018-09-04 14:07 ` Jan Kara
2018-07-10 10:02 ` [PATCH 10/10] audit: Replace chunk attached to mark instead of replacing mark Jan Kara
2018-07-11 14:17 ` Amir Goldstein
2018-07-27 4:47 ` Paul Moore
2018-09-04 14:11 ` Jan Kara
2018-07-10 10:02 ` [PATCH 11/10 TESTSUITE] audit_testsuite: Add stress test for tree watches 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=CAHC9VhT5M6BZaMrOqsJkWrOGkZrmYEcuLEXJRAz5zV3UUb32qw@mail.gmail.com \
--to=paul@paul-moore.com \
--cc=amir73il@gmail.com \
--cc=jack@suse.cz \
--cc=linux-audit@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--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).