On Wed, Jul 31, 2019 at 04:12:43PM +0200, Carlos Maiolino wrote:
> As a goal to enable fiemap infrastructure to be used by fibmap too, we need a
> way to use different helpers to fill extent data, depending on its usage. One
> helper to fill extent data stored in user address space (used in fiemap), and
> another fo fill extent data stored in kernel address space (will be used in
> fibmap).
>
> This patch sets up the usage of a callback to be used to fill in the extents.
> It transforms the current fiemap_fill_next_extent, into a simple helper to call
> the callback, avoiding unneeded changes on any filesystem, and reutilizes the
> original function as the callback used by FIEMAP.
>
> Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
>
> Changelog:
>
> V3:
> - Rebase to current linux-next
> - Fix conflict on rebase
> - Merge this patch into patch 07 from V2
> - Rename fi_extents_start to fi_cb_data
>
> V2:
> - Now based on the rework on fiemap_extent_info (previous was
> based on fiemap_ctx)
>
> fs/ioctl.c | 45 ++++++++++++++++++++++++++-------------------
> include/linux/fs.h | 12 +++++++++---
> 2 files changed, 35 insertions(+), 22 deletions(-)
>
> diff --git a/fs/ioctl.c b/fs/ioctl.c
> index ad8edcb10dc9..d72696c222de 100644
> --- a/fs/ioctl.c
> +++ b/fs/ioctl.c
> @@ -77,29 +77,14 @@ static int ioctl_fibmap(struct file *filp, int __user *p)
> return error;
> }
>
> -/**
> - * fiemap_fill_next_extent - Fiemap helper function
> - * @fieinfo: Fiemap context passed into ->fiemap
> - * @logical: Extent logical start offset, in bytes
> - * @phys: Extent physical start offset, in bytes
> - * @len: Extent length, in bytes
> - * @flags: FIEMAP_EXTENT flags that describe this extent
> - *
> - * Called from file system ->fiemap callback. Will populate extent
> - * info as passed in via arguments and copy to user memory. On
> - * success, extent count on fieinfo is incremented.
> - *
> - * Returns 0 on success, -errno on error, 1 if this was the last
> - * extent that will fit in user array.
> - */
> #define SET_UNKNOWN_FLAGS (FIEMAP_EXTENT_DELALLOC)
> #define SET_NO_UNMOUNTED_IO_FLAGS (FIEMAP_EXTENT_DATA_ENCRYPTED)
> #define SET_NOT_ALIGNED_FLAGS (FIEMAP_EXTENT_DATA_TAIL|FIEMAP_EXTENT_DATA_INLINE)
> -int fiemap_fill_next_extent(struct fiemap_extent_info *fieinfo, u64 logical,
> +int fiemap_fill_user_extent(struct fiemap_extent_info *fieinfo, u64 logical,
> u64 phys, u64 len, u32 flags)
> {
> struct fiemap_extent extent;
> - struct fiemap_extent __user *dest = fieinfo->fi_extents_start;
> + struct fiemap_extent __user *dest = fieinfo->fi_cb_data;
>
> /* only count the extents */
> if (fieinfo->fi_extents_max == 0) {
> @@ -132,6 +117,27 @@ int fiemap_fill_next_extent(struct fiemap_extent_info *fieinfo, u64 logical,
> return 1;
> return (flags & FIEMAP_EXTENT_LAST) ? 1 : 0;
> }
> +
> +/**
> + * fiemap_fill_next_extent - Fiemap helper function
> + * @fieinfo: Fiemap context passed into ->fiemap
> + * @logical: Extent logical start offset, in bytes
> + * @phys: Extent physical start offset, in bytes
> + * @len: Extent length, in bytes
> + * @flags: FIEMAP_EXTENT flags that describe this extent
> + *
> + * Called from file system ->fiemap callback. Will populate extent
> + * info as passed in via arguments and copy to user memory. On
> + * success, extent count on fieinfo is incremented.
> + *
> + * Returns 0 on success, -errno on error, 1 if this was the last
> + * extent that will fit in user array.
> + */
> +int fiemap_fill_next_extent(struct fiemap_extent_info *fieinfo, u64 logical,
> + u64 phys, u64 len, u32 flags)
> +{
> + return fieinfo->fi_cb(fieinfo, logical, phys, len, flags);
> +}
> EXPORT_SYMBOL(fiemap_fill_next_extent);
>
> /**
> @@ -209,12 +215,13 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
>
> fieinfo.fi_flags = fiemap.fm_flags;
> fieinfo.fi_extents_max = fiemap.fm_extent_count;
> - fieinfo.fi_extents_start = ufiemap->fm_extents;
> + fieinfo.fi_cb_data = ufiemap->fm_extents;
> fieinfo.fi_start = fiemap.fm_start;
> fieinfo.fi_len = len;
> + fieinfo.fi_cb = fiemap_fill_user_extent;
>
> if (fiemap.fm_extent_count != 0 &&
> - !access_ok(fieinfo.fi_extents_start,
> + !access_ok(fieinfo.fi_cb_data,
> fieinfo.fi_extents_max * sizeof(struct fiemap_extent)))
> return -EFAULT;
>
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 7b744b7de24e..a8bd3c4f6d86 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -66,6 +66,7 @@ struct fscrypt_info;
> struct fscrypt_operations;
> struct fs_context;
> struct fs_parameter_description;
> +struct fiemap_extent_info;
>
> extern void __init inode_init(void);
> extern void __init inode_init_early(void);
> @@ -1704,16 +1705,21 @@ extern bool may_open_dev(const struct path *path);
> /*
> * VFS FS_IOC_FIEMAP helper definitions.
> */
> +
> +typedef int (*fiemap_fill_cb)(struct fiemap_extent_info *fieinfo, u64 logical,
> + u64 phys, u64 len, u32 flags);
> +
> struct fiemap_extent_info {
> unsigned int fi_flags; /* Flags as passed from user */
> u64 fi_start;
> u64 fi_len;
> unsigned int fi_extents_mapped; /* Number of mapped extents */
> unsigned int fi_extents_max; /* Size of fiemap_extent array */
> - struct fiemap_extent __user *fi_extents_start; /* Start of
> - fiemap_extent
> - array */
> + void *fi_cb_data; /* Start of fiemap_extent
> + array */
> + fiemap_fill_cb fi_cb;
> };
> +
> int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
> u64 phys, u64 len, u32 flags);
> int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);
> --
> 2.20.1
>
