From: Christian Brauner <brauner@kernel.org>
To: tjackson9431@gmail.com, "Darrick J. Wong" <djwong@kernel.org>
Cc: fstests@vger.kernel.org, Seth Forshee <sforshee@kernel.org>,
kernel test robot <oliver.sang@intel.com>,
Dave Chinner <david@fromorbit.com>,
Taylor Jackson <taylor.a.jackson@me.com>,
oe-lkp@lists.linux.dev, lkp@intel.com,
Linux Memory Management List <linux-mm@kvack.org>,
linux-fsdevel@vger.kernel.org, xfs <linux-xfs@vger.kernel.org>
Subject: Re: [PATCH 2/2] vfs/idmapped_mounts.c: Change mount_setattr expected output
Date: Wed, 27 Mar 2024 11:33:41 +0100 [thread overview]
Message-ID: <20240327-baubeginn-wahljahr-f4ee7484ec48@brauner> (raw)
In-Reply-To: <20240326-mount-setattr-test-v1-2-c061b040d0f7@gmail.com> <20240326152228.GC6379@frogsfrogsfrogs>
On Tue, Mar 26, 2024 at 08:33:52PM +0000, Taylor Jackson via B4 Relay wrote:
> From: Taylor Jackson <tjackson9431@gmail.com>
>
> In kernel commit dacfd001eaf2 (“fs/mnt_idmapping.c: Return -EINVAL
> when no map is written”), the behavior of mount_setattr changed to
> return EINVAL when attempting to create an idmapped mount when using
> a user namespace with no mappings. The following commit updates the test
> to expect no mount to be created in that case. And since no mount is created,
> this commit also removes the check for overflow IDs because it does not make
> sense to check for overflow IDs for a mount that was not created.
>
> Signed-off-by: Taylor Jackson <tjackson9431@gmail.com>
> ---
Thanks for fixing this!
Reviewed-by: Christian Brauner <brauner@kernel.org>
> src/vfs/idmapped-mounts.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/src/vfs/idmapped-mounts.c b/src/vfs/idmapped-mounts.c
> index 34052ca3..f4dfc3f3 100644
> --- a/src/vfs/idmapped-mounts.c
> +++ b/src/vfs/idmapped-mounts.c
> @@ -6667,7 +6667,7 @@ static int nested_userns(const struct vfstest_info *info)
> }
>
> if (sys_mount_setattr(fd_open_tree_level4, "", AT_EMPTY_PATH,
> - &attr_level4, sizeof(attr_level4))) {
> + &attr_level4, sizeof(attr_level4)) != -1 || errno != EINVAL) {
> log_stderr("failure: sys_mount_setattr");
> goto out;
> }
> @@ -6706,11 +6706,6 @@ static int nested_userns(const struct vfstest_info *info)
> log_stderr("failure: check ownership %s", file);
> goto out;
> }
> -
> - if (!expected_uid_gid(fd_open_tree_level4, file, 0, info->t_overflowuid, info->t_overflowgid)) {
> - log_stderr("failure: check ownership %s", file);
> - goto out;
> - }
> }
>
> /* Verify that ownership looks correct for callers in the first userns. */
>
> --
> 2.34.1
>
>
On Tue, Mar 26, 2024 at 08:22:28AM -0700, Darrick J. Wong wrote:
> On Tue, Mar 26, 2024 at 12:43:27PM +0100, Christian Brauner wrote:
> > On Mon, Mar 25, 2024 at 09:58:09AM -0700, Darrick J. Wong wrote:
> > > On Tue, Feb 20, 2024 at 09:57:30AM +0100, Christian Brauner wrote:
> > > > On Mon, Feb 19, 2024 at 02:55:42PM +0800, kernel test robot wrote:
> > > > >
> > > > >
> > > > > Hello,
> > > > >
> > > > > kernel test robot noticed "xfstests.generic.645.fail" on:
> > > > >
> > > > > commit: b4291c7fd9e550b91b10c3d7787b9bf5be38de67 ("fs/mnt_idmapping.c: Return -EINVAL when no map is written")
> > > > > https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git master
> > > >
> > > > The test needs to be updated. We now explicitly fail when no map is
> > > > written.
> > >
> > > Has there been any progress on updating generic/645? 6.9-rc1 is out,
> > > and Dave and I have both noticed this regressing.
> >
> > Iirc, Taylor wanted to fix this but it seems that hasn't happened yet.
> > I'll ping again and if nothing's happened until tomorrow I'll send a
> > patch.
>
> Ok, glad to hear that this is still on your radar. Thank you for
> following up!
@Darrick, Taylor sent fixes for this now (I've took the liberty to
respond to both mails combined.).
prev parent reply other threads:[~2024-03-27 10:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <202402191416.17ec9160-oliver.sang@intel.com>
[not found] ` <20240220-fungieren-nutzen-311ef3e57e8a@brauner>
2024-03-25 16:58 ` [linux-next:master] [fs/mnt_idmapping.c] b4291c7fd9: xfstests.generic.645.fail Darrick J. Wong
2024-03-26 11:43 ` Christian Brauner
2024-03-26 15:22 ` Darrick J. Wong
2024-03-27 10:33 ` Christian Brauner [this message]
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=20240327-baubeginn-wahljahr-f4ee7484ec48@brauner \
--to=brauner@kernel.org \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.kernel.org \
--cc=lkp@intel.com \
--cc=oe-lkp@lists.linux.dev \
--cc=oliver.sang@intel.com \
--cc=sforshee@kernel.org \
--cc=taylor.a.jackson@me.com \
--cc=tjackson9431@gmail.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).