Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
From:   Andreas Dilger <adilger@dilger.ca>
Mime-Version: 1.0 (1.0)
Subject: Re: [RFCv1 10/72] libext2fs: merge icounts after thread finishes
Date:   Fri, 18 Nov 2022 07:40:34 -0600
Message-Id: <FF80E002-C71D-437A-86F1-EA4FFB1C486C@dilger.ca>
References: <817a806b1c7ed161cb76da5f163a9aade60c8dfd.1667822611.git.ritesh.list@gmail.com>
Cc:     Theodore Ts'o <tytso@mit.edu>, linux-ext4@vger.kernel.org,
        Harshad Shirwadkar <harshadshirwadkar@gmail.com>,
        Wang Shilong <wshilong@ddn.com>,
        Andreas Dilger <adilger.kernel@dilger.ca>, Li Xi <lixi@ddn.com>
In-Reply-To: <817a806b1c7ed161cb76da5f163a9aade60c8dfd.1667822611.git.ritesh.list@gmail.com>
To:     "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Precedence: bulk

MOn Nov 7, 2022, at 06:23, Ritesh Harjani (IBM) <ritesh.list@gmail.com> wrot=
e:
>=20
> =EF=BB=BFFrom: Li Xi <lixi@ddn.com>
>=20
> Merge inode_count and inode_link_info properly after
> threads finish.
>=20
> Signed-off-by: Li Xi <lixi@ddn.com>
> Signed-off-by: Wang Shilong <wshilong@ddn.com>
> [Note: splitted the patch to seperate libext2fs changes from e2fsck]
> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> lib/ext2fs/ext2fs.h |   1 +
> lib/ext2fs/icount.c | 103 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 104 insertions(+)
>=20
> diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
> index 54aed5d1..139a25fc 100644
> --- a/lib/ext2fs/ext2fs.h
> +++ b/lib/ext2fs/ext2fs.h
> @@ -1546,6 +1546,7 @@ extern errcode_t ext2fs_icount_decrement(ext2_icount=
_t icount, ext2_ino_t ino,
>                     __u16 *ret);
> extern errcode_t ext2fs_icount_store(ext2_icount_t icount, ext2_ino_t ino,=

>                     __u16 count);
> +extern errcode_t ext2fs_icount_merge(ext2_icount_t src, ext2_icount_t des=
t);
> extern ext2_ino_t ext2fs_get_icount_size(ext2_icount_t icount);
> errcode_t ext2fs_icount_validate(ext2_icount_t icount, FILE *);
>=20
> diff --git a/lib/ext2fs/icount.c b/lib/ext2fs/icount.c
> index 888a90b2..766eccca 100644
> --- a/lib/ext2fs/icount.c
> +++ b/lib/ext2fs/icount.c
> @@ -13,6 +13,7 @@
> #if HAVE_UNISTD_H
> #include <unistd.h>
> #endif
> +#include <assert.h>
> #include <string.h>
> #include <stdio.h>
> #include <sys/stat.h>
> @@ -701,6 +702,108 @@ errcode_t ext2fs_icount_store(ext2_icount_t icount, e=
xt2_ino_t ino,
>    return 0;
> }
>=20
> +errcode_t ext2fs_icount_merge_full_map(ext2_icount_t src, ext2_icount_t d=
est)
> +{
> +    /* TODO: add the support for full map */
> +    return EOPNOTSUPP;
> +}
> +
> +errcode_t ext2fs_icount_merge_el(ext2_icount_t src, ext2_icount_t dest)
> +{
> +    int             src_count =3D src->count;
> +    int             dest_count =3D dest->count;
> +    int             size =3D src_count + dest_count;
> +    int             size_entry =3D sizeof(struct ext2_icount_el);
> +    struct ext2_icount_el    *array;
> +    struct ext2_icount_el    *array_ptr;
> +    struct ext2_icount_el    *src_array =3D src->list;
> +    struct ext2_icount_el    *dest_array =3D dest->list;
> +    int             src_index =3D 0;
> +    int             dest_index =3D 0;
> +    errcode_t         retval;
> +
> +    if (src_count =3D=3D 0)
> +        return 0;
> +
> +    retval =3D ext2fs_get_array(size, size_entry, &array);
> +    if (retval)
> +        return retval;
> +
> +    array_ptr =3D array;
> +    /*
> +     * This can be improved by binary search and memcpy, but codes
> +     * would be more complex. And if number of bad blocks is small,
> +     * the optimization won't improve performance a lot.
> +     */
> +    while (src_index < src_count || dest_index < dest_count) {
> +        if (src_index >=3D src_count) {
> +            memcpy(array_ptr, &dest_array[dest_index],
> +                   (dest_count - dest_index) * size_entry);
> +            break;
> +        }
> +        if (dest_index >=3D dest_count) {
> +            memcpy(array_ptr, &src_array[src_index],
> +                   (src_count - src_index) * size_entry);
> +            break;
> +        }
> +        if (src_array[src_index].ino < dest_array[dest_index].ino) {
> +            *array_ptr =3D src_array[src_index];
> +            src_index++;
> +        } else {
> +            assert(src_array[src_index].ino >
> +                   dest_array[dest_index].ino);
> +            *array_ptr =3D dest_array[dest_index];
> +            dest_index++;
> +        }
> +        array_ptr++;
> +    }
> +
> +    ext2fs_free_mem(&dest->list);
> +    dest->list =3D array;
> +    dest->count =3D src_count + dest_count;
> +    dest->size =3D size;
> +    dest->last_lookup =3D NULL;
> +    return 0;
> +}
> +
> +errcode_t ext2fs_icount_merge(ext2_icount_t src, ext2_icount_t dest)
> +{
> +    errcode_t    retval;
> +
> +    if (src->fullmap && !dest->fullmap)
> +        return EINVAL;
> +
> +    if (!src->fullmap && dest->fullmap)
> +        return EINVAL;
> +
> +    if (src->multiple && !dest->multiple)
> +        return EINVAL;
> +
> +    if (!src->multiple && dest->multiple)
> +        return EINVAL;
> +
> +    if (src->fullmap)
> +        return ext2fs_icount_merge_full_map(src, dest);
> +
> +    retval =3D ext2fs_merge_bitmap(src->single, dest->single, NULL,
> +                     NULL);
> +    if (retval)
> +        return retval;
> +
> +    if (src->multiple) {
> +        retval =3D ext2fs_merge_bitmap(src->multiple, dest->multiple,
> +                         NULL, NULL);
> +        if (retval)
> +            return retval;
> +    }
> +
> +    retval =3D ext2fs_icount_merge_el(src, dest);
> +    if (retval)
> +        return retval;
> +
> +    return 0;
> +}
> +
> ext2_ino_t ext2fs_get_icount_size(ext2_icount_t icount)
> {
>    if (!icount || icount->magic !=3D EXT2_ET_MAGIC_ICOUNT)
> --=20
> 2.37.3
>=20