On Sat, Mar 27, 2021 at 12:18:53PM +0100, Christian Brauner wrote:
> From: Christian Brauner <christian.brauner@xxxxxxxxxx>
>
> They will be used in follow-up patches for xfs quota tests but might be
> useful for other tests in the future.
>
> Cc: Eryu Guan <guan@xxxxxxx>
> Cc: Christoph Hellwig <hch@xxxxxx>
> Cc: David Howells <dhowells@xxxxxxxxxx>
> Cc: fstests@xxxxxxxxxxxxxxx
> Signed-off-by: Christian Brauner <christian.brauner@xxxxxxxxxx>
> ---
> /* v1 - v9 */
> patch not present
>
> /* v10 */
> patch introduced
>
> /* v11 */
> - Amir Goldstein <amir73il@xxxxxxxxx>:
> - Minor Makefile style nit.
> - Add missing "/" when calculating maxium path length.
> - Handle the case where user gives us a path to userns.
> ---
> .gitignore | 1 +
> common/rc | 35 +++
> src/idmapped-mounts/Makefile | 14 +-
> src/idmapped-mounts/mount-idmapped.c | 431 +++++++++++++++++++++++++++
> src/idmapped-mounts/utils.c | 2 +-
> src/idmapped-mounts/utils.h | 1 +
> 6 files changed, 479 insertions(+), 5 deletions(-)
> create mode 100644 src/idmapped-mounts/mount-idmapped.c
>
> diff --git a/.gitignore b/.gitignore
> index 3229bb26..4cc9c807 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -179,6 +179,7 @@
> /src/aio-dio-regress/aiocp
> /src/aio-dio-regress/aiodio_sparse2
> /src/idmapped-mounts/idmapped-mounts
> +/src/idmapped-mounts/mount-idmapped
> /src/log-writes/replay-log
> /src/perf/*.pyc
>
> diff --git a/common/rc b/common/rc
> index a8b375a2..351996fc 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -342,6 +342,36 @@ _scratch_mount()
> _try_scratch_mount $* || _fail "mount failed"
> }
>
> +_scratch_mount_idmapped()
> +{
> + local type="$1"
> + local id="$2"
> +
> + if [ "$type" = "u" ]; then
> + # This means root will be able to create files as uid %id in
> + # the underlying filesystem by going through the idmapped mount.
> + $here/src/idmapped-mounts/mount-idmapped --map-mount u:0:$id:1 \
> + --map-mount u:$id:0:1 \
> + --map-mount g:0:0:1 \
> + "$SCRATCH_MNT" "$SCRATCH_MNT" || _fail "mount-idmapped failed"
> + elif [ "$type" = "g" ]; then
> + # This means root will be able to create files as gid %id in
> + # the underlying filesystem by going through the idmapped mount.
> + $here/src/idmapped-mounts/mount-idmapped --map-mount g:0:$id:1 \
> + --map-mount g:$id:0:1 \
> + --map-mount u:0:0:1 \
> + "$SCRATCH_MNT" "$SCRATCH_MNT" || _fail "mount-idmapped failed"
> + elif [ "$type" = "b" ]; then
> + # This means root will be able to create files as uid and gid
> + # %id in the underlying filesystem by going through the idmapped mount.
> + $here/src/idmapped-mounts/mount-idmapped --map-mount b:0:$id:1 \
> + --map-mount b:$id:0:1 \
> + "$SCRATCH_MNT" "$SCRATCH_MNT" || _fail "mount-idmapped failed"
> + else
> + _fail "usage: either \"u\" (uid), \"g\" (gid), or \"b\" (uid and gid) must be specified "
> + fi
> +}
> +
> _scratch_unmount()
> {
> case "$FSTYP" in
> @@ -357,6 +387,11 @@ _scratch_unmount()
> esac
> }
>
> +_scratch_umount_idmapped()
> +{
> + $UMOUNT_PROG $SCRATCH_MNT
> +}
> +
> _scratch_remount()
> {
> local opts="$1"
> diff --git a/src/idmapped-mounts/Makefile b/src/idmapped-mounts/Makefile
> index 6a934146..b2bff854 100644
> --- a/src/idmapped-mounts/Makefile
> +++ b/src/idmapped-mounts/Makefile
> @@ -3,9 +3,10 @@
> TOPDIR = ../..
> include $(TOPDIR)/include/builddefs
>
> -TARGETS = idmapped-mounts
> +TARGETS = idmapped-mounts mount-idmapped
> +CFILES_IDMAPPED_MOUNTS = idmapped-mounts.c utils.c
> +CFILES_MOUNT_IDMAPPED = mount-idmapped.c utils.c
>
> -CFILES = idmapped-mounts.c utils.c
> HFILES = missing.h utils.h
> LLDLIBS += -pthread
> LDIRT = $(TARGETS)
> @@ -24,12 +25,17 @@ depend: .dep
>
> include $(BUILDRULES)
>
> -$(TARGETS): $(CFILES)
> +idmapped-mounts: $(CFILES_IDMAPPED_MOUNTS)
> @echo " [CC] $@"
> - $(Q)$(LTLINK) $(CFILES) -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
> + $(Q)$(LTLINK) $(CFILES_IDMAPPED_MOUNTS) -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
> +
> +mount-idmapped: $(CFILES_MOUNT_IDMAPPED)
> + @echo " [CC] $@"
> + $(Q)$(LTLINK) $(CFILES_MOUNT_IDMAPPED) -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
>
> install:
> $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/src/idmapped-mounts
> $(INSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/src/idmapped-mounts
> + $(INSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/src/mount-idmapped
This is not needed, and causes 'Make install' failure
/usr/bin/gmake -C idmapped-mounts install
../../install-sh -o root -g root -m 755 -d /var/lib/xfstests/src/idmapped-mounts
../../install-sh -o root -g root -m 755 idmapped-mounts mount-idmapped /var/lib/xfstests/src/idmapped-mounts
../../install-sh -o root -g root -m 755 idmapped-mounts mount-idmapped /var/lib/xfstests/src/mount-idmapped
chmod: cannot access '//var/lib/xfstests/src/mount-idmapped/idmapped-mounts': Not a directory
gmake[2]: *** [Makefile:39: install] Error 1
Thanks,
Eryu
