Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46fec487 authored by Connor O'Brien's avatar Connor O'Brien
Browse files

Add eraseblk and logicalblk fs_mgr flags 



When doing a factory reset in recovery, flash erase & logical block
sizes are needed for tuning the parameters of the new userdata image.
Add flags to allow this information to be stored in recovery.fstab

Test: Factory reset marlin & confirm userdata is rebuilt correctly
Bug: 33243520
Change-Id: I6c4414d4e9026be4a3646523656ac151e93015e7
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
parent 22b7f76a

fs_mgr/fs_mgr_fstab.c

+22 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ struct fs_mgr_flag_values { 
    unsigned int zram_size;

    uint64_t reserved_size;

    unsigned int file_encryption_mode;

    unsigned int erase_blk_size;

    unsigned int logical_blk_size;

};



struct flag_list {
@@ -85,6 +87,8 @@ static struct flag_list fs_mgr_flags[] = { 
    { "latemount",          MF_LATEMOUNT },

    { "reservedsize=",      MF_RESERVEDSIZE },

    { "quota",              MF_QUOTA },

    { "eraseblk=",          MF_ERASEBLKSIZE },

    { "logicalblk=",        MF_LOGICALBLKSIZE },

    { "defaults",           0 },

    { 0,                    0 },

};
@@ -239,6 +243,22 @@ static int parse_flags(char *flags, struct flag_list *fl, 
                     * reserved size of the partition.  Get it and return it.

                     */

                    flag_vals->reserved_size = parse_size(strchr(p, '=') + 1);

                } else if ((fl[i].flag == MF_ERASEBLKSIZE) && flag_vals) {

                    /* The erase block size flag is followed by an = and the flash

                     * erase block size. Get it, check that it is a power of 2 and

                     * at least 4096, and return it.

                     */

                    unsigned int val = strtoul(strchr(p, '=') + 1, NULL, 0);

                    if (val >= 4096 && (val & (val - 1)) == 0)

                        flag_vals->erase_blk_size = val;

                } else if ((fl[i].flag == MF_LOGICALBLKSIZE) && flag_vals) {

                    /* The logical block size flag is followed by an = and the flash

                     * logical block size. Get it, check that it is a power of 2 and

                     * at least 4096, and return it.

                     */

                    unsigned int val = strtoul(strchr(p, '=') + 1, NULL, 0);

                    if (val >= 4096 && (val & (val - 1)) == 0)

                        flag_vals->logical_blk_size = val;

                }

                break;

            }
@@ -385,6 +405,8 @@ struct fstab *fs_mgr_read_fstab_file(FILE *fstab_file) 
        fstab->recs[cnt].zram_size = flag_vals.zram_size;

        fstab->recs[cnt].reserved_size = flag_vals.reserved_size;

        fstab->recs[cnt].file_encryption_mode = flag_vals.file_encryption_mode;

        fstab->recs[cnt].erase_blk_size = flag_vals.erase_blk_size;

        fstab->recs[cnt].logical_blk_size = flag_vals.logical_blk_size;

        cnt++;

    }

    /* If an A/B partition, modify block device to be the real block device */

fs_mgr/fs_mgr_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ __BEGIN_DECLS 
#define MF_MAX_COMP_STREAMS 0x100000

#define MF_RESERVEDSIZE     0x200000

#define MF_QUOTA            0x400000

#define MF_ERASEBLKSIZE     0x800000

#define MF_LOGICALBLKSIZE  0X1000000



#define DM_BUF_SIZE 4096

fs_mgr/include/fs_mgr.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ struct fstab_rec { 
    unsigned int zram_size;

    uint64_t reserved_size;

    unsigned int file_encryption_mode;

    unsigned int erase_blk_size;

    unsigned int logical_blk_size;

};



// Callback function for verity status