On Wed, Mar 19, 2025 at 11:11:44PM +0800, Zorro Lang wrote:
> On Tue, Mar 18, 2025 at 07:58:05PM -0500, Eric Sandeen wrote:
> > On 3/18/25 6:51 PM, Theodore Ts'o wrote:
> > > On Tue, Mar 18, 2025 at 03:39:33PM -0500, Eric Sandeen wrote:
> > >> generic/699 fails because _overlay_mount_dirs() uses _common_dev_mount_options(),
> > >> and when FSTYP is ext4, that yields "-o acl,user_xattr" and acl is not a valid
> > >> option for overlayfs.
> > >
> > > Hmm, I hadn't noticed because the test is getting skipped for me:
> > >
> > > BEGIN TEST 4k (1 test): Ext4 4k block Tue Mar 18 19:44:51 EDT 2025
> > > DEVICE: /dev/vdb
> > > EXT_MKFS_OPTIONS: -b 4096
> > > EXT_MOUNT_OPTIONS: -o block_validity
> > > FSTYP -- ext4
> > > PLATFORM -- Linux/x86_64 kvm-xfstests 6.14.0-rc2-xfstests-00063-g6630cf085eb0 #14 SMP PREEMPT_DYNAMIC Mon Mar 17 11:19:56 EDT 2025
> > > MKFS_OPTIONS -- -F -q -b 4096 /dev/vdc
> > > MOUNT_OPTIONS -- -o acl,user_xattr -o block_validity /dev/vdc /vdc
> > >
> > > generic/699 [19:44:51][ 12.536740] run fstests generic/699 at 2025-03-18 19:44:51
> > > [ 12.794084] overlay: Unknown parameter 'acl'
> > > [19:44:52] [not run]
> > > generic/699 -- overlayfs doesn't support idmappped layers
> > > Ran: generic/699
> > >
> > > I haven't really played with idmapped mount. Is there some CONFIG
> > > option I need to enable this test to run?
> > >
> > > - Ted
> >
> > I shouldn't have said "failed" - you're seeing what I'm seeing, it's
> > skipped (not failed) because it tries to test overlayfs idmapped layers
> > using the ext4 default options, and acl mounts fail, skipping the test.
>
> How about changing as below?
>
> diff --git a/tests/generic/699 b/tests/generic/699
> index 620a40aa..3ca92254 100755
> --- a/tests/generic/699
> +++ b/tests/generic/699
> @@ -100,7 +100,8 @@ reset_ownership()
> setup_overlayfs_idmapped_lower_metacopy_off()
> {
> mkdir -p $upper $work $merge
> - _overlay_mount_dirs $lower $upper $work \
> + # Ignore the MOUNT_OPTIONS isn't for overlay
> + MOUNT_OPTIONS="" _overlay_mount_dirs $lower $upper $work \
> overlay $merge -ometacopy=off || \
> _notrun "overlayfs doesn't support idmappped layers"
> }
> @@ -109,7 +110,8 @@ setup_overlayfs_idmapped_lower_metacopy_off()
> setup_overlayfs_idmapped_lower_metacopy_on()
> {
> mkdir -p $upper $work $merge
> - _overlay_mount_dirs $lower $upper $work overlay $merge -ometacopy=on
> + # Ignore the MOUNT_OPTIONS isn't for overlay
> + MOUNT_OPTIONS="" _overlay_mount_dirs $lower $upper $work overlay $merge -ometacopy=on
> }
>
> reset_overlayfs()
Oh, I rememeber this case now. Christian wrote a big test case to test idmapped
mount:
https://lore.kernel.org/fstests/20220615092826.2333847-1-brauner@xxxxxxxxxx/
That case tests underlying fs and overlay fs together. I helped to split it
to two cases, one for basic fs, one for overlay fs:
https://lore.kernel.org/fstests/20220920115035.2472076-1-zlang@xxxxxxxxxx/
I've forgotten why I left g/699 to generic, not in overlay. Maybe Christian hope to
run these two cases together in one FSTYP test round (don't need to run overlay test
once). I'm good to move this case to tests/overlay/, cc Christian to check his
review point.
Hi Christian, do you hope to move this case to overlay, or just roughly change it
as above patch?
Thanks,
Zorro
>
> >
> > -Eric
> >
