Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley
        Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United
        Kingdom.
        Registered in England and Wales under Company Registration No. 3798903
From:   David Howells <dhowells@redhat.com>
In-Reply-To: <4007797.1596055016@warthog.procyon.org.uk>
References: <4007797.1596055016@warthog.procyon.org.uk> <0b154b9b-728f-7d57-d4c5-ec25fc9dfdf3@toxicpanda.com>
Cc:     dhowells@redhat.com, Josef Bacik <josef@toxicpanda.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Al Viro <viro@zeniv.linux.org.uk>,
        Eric Sandeen <sandeen@redhat.com>,
        Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux FS Devel <linux-fsdevel@vger.kernel.org>,
        David Sterba <dsterba@suse.com>
Subject: Re: Inverted mount options completely broken (iversion,relatime)
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <4056339.1596056321.1@warthog.procyon.org.uk>
Content-Transfer-Encoding: quoted-printable
Date:   Wed, 29 Jul 2020 21:58:41 +0100
Message-ID: <4056340.1596056321@warthog.procyon.org.uk>
To:     unlisted-recipients:; (no To-header on input)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

David Howells <dhowells@redhat.com> wrote:

> > So my question is, what do we do here?
> =

> Hmmm...  As the code stands, MS_RDONLY, MS_SYNCHRONOUS, MS_MANDLOCK,
> MS_I_VERSION and MS_LAZYTIME should all be masked off before the new fla=
gs are
> set if called from mount(2) rather than fsconfig(2).
> =

> do_remount() gives MS_RMT_MASK to fs_context_for_reconfigure() to load i=
nto
> fc->sb_flags_mask, which should achieve the desired effect in
> reconfigure_super() on this line:
> =

> 	WRITE_ONCE(sb->s_flags, ((sb->s_flags & ~fc->sb_flags_mask) |
> 				 (fc->sb_flags & fc->sb_flags_mask)));

So applying the attached patch and then doing:

mount -t tmpfs none /mnt
mount -o remount,iversion /mnt
mount -o remount,noiversion /mnt
mount -o remount,norelatime /mnt
mount -o remount,relatime /mnt

prints:

sb=3D70010000 set=3D800000 mask=3D2800051
sb=3D70810000 set=3D0 mask=3D2800051
sb=3D70010000 set=3D0 mask=3D2800051
sb=3D70010000 set=3D0 mask=3D2800051

MS_RELATIME isn't included in MS_RMT_MASK, so remount shouldn't be able to
change it.

David
---
diff --git a/fs/super.c b/fs/super.c
index 904459b35119..540cb37c11e7 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -964,6 +964,7 @@ int reconfigure_super(struct fs_context *fc)
 		}
 	}
 =

+	printk("sb=3D%lx set=3D%x mask=3D%x\n", sb->s_flags, fc->sb_flags, fc->s=
b_flags_mask);
 	WRITE_ONCE(sb->s_flags, ((sb->s_flags & ~fc->sb_flags_mask) |
 				 (fc->sb_flags & fc->sb_flags_mask)));
 	/* Needs to be ordered wrt mnt_is_readonly() */