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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48754C388F2 for ; Mon, 2 Nov 2020 13:33:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EEC52223C6 for ; Mon, 2 Nov 2020 13:33:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725898AbgKBNdi (ORCPT ); Mon, 2 Nov 2020 08:33:38 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:48935 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725791AbgKBNdi (ORCPT ); Mon, 2 Nov 2020 08:33:38 -0500 Received: from ip5f5af0a0.dynamic.kabel-deutschland.de ([95.90.240.160] helo=wittgenstein) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kZZxl-0007ym-Lt; Mon, 02 Nov 2020 13:33:33 +0000 Date: Mon, 2 Nov 2020 14:33:31 +0100 From: Christian Brauner To: Christoph Hellwig Cc: Alexander Viro , linux-fsdevel@vger.kernel.org, John Johansen , James Morris , Mimi Zohar , Dmitry Kasatkin , Stephen Smalley , Casey Schaufler , Arnd Bergmann , Andreas Dilger , OGAWA Hirofumi , Geoffrey Thomas , Mrunal Patel , Josh Triplett , Andy Lutomirski , Amir Goldstein , Miklos Szeredi , Theodore Tso , Alban Crequy , Tycho Andersen , David Howells , James Bottomley , Jann Horn , Seth Forshee , St??phane Graber , Aleksa Sarai , Lennart Poettering , "Eric W. Biederman" , smbarber@chromium.org, Phil Estes , Serge Hallyn , Kees Cook , Todd Kjos , Jonathan Corbet , containers@lists.linux-foundation.org, linux-security-module@vger.kernel.org, linux-api@vger.kernel.org, linux-ext4@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-audit@redhat.com, linux-integrity@vger.kernel.org, selinux@vger.kernel.org Subject: Re: [PATCH 01/34] namespace: take lock_mount_hash() directly when changing flags Message-ID: <20201102133331.66v4hxtmlnjrucnn@wittgenstein> References: <20201029003252.2128653-1-christian.brauner@ubuntu.com> <20201029003252.2128653-2-christian.brauner@ubuntu.com> <20201101144108.GA23378@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201101144108.GA23378@infradead.org> Precedence: bulk List-ID: X-Mailing-List: linux-api@vger.kernel.org On Sun, Nov 01, 2020 at 02:41:08PM +0000, Christoph Hellwig wrote: > > index cebaa3e81794..20ee291a7af4 100644 > > --- a/fs/namespace.c > > +++ b/fs/namespace.c > > @@ -463,7 +463,6 @@ static int mnt_make_readonly(struct mount *mnt) > > { > > int ret = 0; > > > > - lock_mount_hash(); > > What about adding a lockdep_assert_lock_held in all the functions > that used to take the lock to document the assumptions? Good idea and will do. I wanted to do this but then didn't because I haven't seen widespread use of lockdep assert in fs/namespace.c. > > > static int __mnt_unmake_readonly(struct mount *mnt) > > { > > - lock_mount_hash(); > > mnt->mnt.mnt_flags &= ~MNT_READONLY; > > - unlock_mount_hash(); > > return 0; > > This helper is rather pointless now. Ok, will remove. > > > static void set_mount_attributes(struct mount *mnt, unsigned int mnt_flags) > > { > > - lock_mount_hash(); > > mnt_flags |= mnt->mnt.mnt_flags & ~MNT_USER_SETTABLE_MASK; > > mnt->mnt.mnt_flags = mnt_flags; > > touch_mnt_namespace(mnt->mnt_ns); > > - unlock_mount_hash(); > > In linux-next there is an additional notify_mount after the unlock here. Thanks! I can try rebasing on -next. > > Also while you touch this lock_mount_hash/unlock_mount_hash could be > moved to namespace.c and maked static now. Ok, will try to do that.