From nobody Thu Feb 12 22:05:38 2026 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8777A15AABB for ; Fri, 7 Jun 2024 04:27:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717734451; cv=none; b=anfONSljYYja7Np2PoRH6R+c6nB2/xuUkZWJPdN/WYCyFKa5ZVxVdNb92Cjg/ncPYma7rPic1FsVHIovj/L+JccpO+SYCZJYktqBamBBC7K6Vcpic/7S0FiKkAnQ41OWnnGWAhJQLblJY7QeTIq9pFqsyrtGeqauX3byx2tyf14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717734451; c=relaxed/simple; bh=wsNY3Hv62vS170S6rgAswOaPj3HzzFhFu+dVaxHav8Q=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ENM2qlZhkcjGPUkipk2BcTi+9mtlGDVw/mRXaV2uMXlN/pqsvaBxf2gsqgOgiozUVWetzJ3oJz+Nh0Y1WBkzwz1+sPfQjHk5GKh0f6AuHpboa1EHlCn51RWYITcE0PIK4/mZ4F7hHdDFTPgxmQcROTdsdg/GM0yBxyzVUn3yWzI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4VwSn46w8QzdZdG; Fri, 7 Jun 2024 12:26:00 +0800 (CST) Received: from kwepemm600013.china.huawei.com (unknown [7.193.23.68]) by mail.maildlp.com (Postfix) with ESMTPS id D8923180085; Fri, 7 Jun 2024 12:27:25 +0800 (CST) Received: from huawei.com (10.175.104.67) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 7 Jun 2024 12:27:11 +0800 From: Zhihao Cheng To: , , , , , CC: , Subject: [RFC PATCH mtd-utils 060/110] fsck.ubifs: Load filesystem information from UBI volume Date: Fri, 7 Jun 2024 12:25:25 +0800 Message-ID: <20240607042615.2069840-61-chengzhihao1@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240607042615.2069840-1-chengzhihao1@huawei.com> References: <20240607042615.2069840-1-chengzhihao1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600013.china.huawei.com (7.193.23.68) Content-Type: text/plain; charset="utf-8" Load filesystem information from UBI volume (Similar to UBIFS mounting process), initialize kinds of buffers and read superblock. This is the base step for both fsck and rebuild_fs. Subsequent pacthes will complete this step by adding more steps(eg. read master, replay journal, etc.) which are only used in fsck. Signed-off-by: Zhihao Cheng --- ubifs-utils/Makemodule.am | 3 +- ubifs-utils/fsck.ubifs/fsck.ubifs.c | 7 ++ ubifs-utils/fsck.ubifs/fsck.ubifs.h | 7 ++ ubifs-utils/fsck.ubifs/load_fs.c | 127 ++++++++++++++++++++++++++++++++= ++++ ubifs-utils/fsck.ubifs/problem.c | 4 +- 5 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 ubifs-utils/fsck.ubifs/load_fs.c diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am index faff911f..864271ab 100644 --- a/ubifs-utils/Makemodule.am +++ b/ubifs-utils/Makemodule.am @@ -80,7 +80,8 @@ fsck_ubifs_SOURCES =3D \ $(libubifs_SOURCES) \ ubifs-utils/fsck.ubifs/fsck.ubifs.h \ ubifs-utils/fsck.ubifs/fsck.ubifs.c \ - ubifs-utils/fsck.ubifs/problem.c + ubifs-utils/fsck.ubifs/problem.c \ + ubifs-utils/fsck.ubifs/load_fs.c =20 fsck_ubifs_LDADD =3D libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIB= S) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) -lm -lpthread fsck_ubifs_CPPFLAGS =3D $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD= _CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \ diff --git a/ubifs-utils/fsck.ubifs/fsck.ubifs.c b/ubifs-utils/fsck.ubifs/f= sck.ubifs.c index 36a8e061..9bc9c259 100644 --- a/ubifs-utils/fsck.ubifs/fsck.ubifs.c +++ b/ubifs-utils/fsck.ubifs/fsck.ubifs.c @@ -423,8 +423,15 @@ int main(int argc, char *argv[]) goto out_destroy_fsck; } =20 + /* Init: Read superblock */ + err =3D ubifs_load_filesystem(c); + if (err) + goto out_close; + err =3D do_fsck(); =20 + ubifs_destroy_filesystem(c); +out_close: ubifs_close_volume(c); out_destroy_fsck: destroy_fsck_info(c); diff --git a/ubifs-utils/fsck.ubifs/fsck.ubifs.h b/ubifs-utils/fsck.ubifs/f= sck.ubifs.h index 53dc5ff0..eb365b1a 100644 --- a/ubifs-utils/fsck.ubifs/fsck.ubifs.h +++ b/ubifs-utils/fsck.ubifs/fsck.ubifs.h @@ -36,6 +36,9 @@ enum { NORMAL_MODE =3D 0, SAFE_MODE, DANGER_MODE0, DANGER_MODE1, REBUILD_MODE, CHECK_MODE }; =20 +/* Types of inconsistent problems */ +enum { SB_CORRUPTED =3D 0 }; + /** * struct ubifs_fsck_info - UBIFS fsck information. * @mode: working mode @@ -96,4 +99,8 @@ extern int exit_code; /* problem.c */ bool fix_problem(const struct ubifs_info *c, int problem_type); =20 +/* load_fs.c */ +int ubifs_load_filesystem(struct ubifs_info *c); +void ubifs_destroy_filesystem(struct ubifs_info *c); + #endif diff --git a/ubifs-utils/fsck.ubifs/load_fs.c b/ubifs-utils/fsck.ubifs/load= _fs.c new file mode 100644 index 00000000..4a06b4c2 --- /dev/null +++ b/ubifs-utils/fsck.ubifs/load_fs.c @@ -0,0 +1,127 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2024, Huawei Technologies Co, Ltd. + * + * Authors: Zhihao Cheng + */ + +#include +#include + +#include "bitops.h" +#include "kmem.h" +#include "ubifs.h" +#include "defs.h" +#include "debug.h" +#include "key.h" +#include "misc.h" +#include "fsck.ubifs.h" + +int ubifs_load_filesystem(struct ubifs_info *c) +{ + int err; + size_t sz; + + err =3D init_constants_early(c); + if (err) { + exit_code |=3D FSCK_ERROR; + return err; + } + + err =3D check_volume_empty(c); + if (err <=3D 0) { + exit_code |=3D FSCK_ERROR; + log_err(c, 0, "%s UBI volume!", err < 0 ? "bad" : "empty"); + return -EINVAL; + } + + if (c->ro_media && !c->ro_mount) { + exit_code |=3D FSCK_ERROR; + log_err(c, 0, "cannot read-write on read-only media"); + return -EROFS; + } + + err =3D -ENOMEM; + c->bottom_up_buf =3D kmalloc_array(BOTTOM_UP_HEIGHT, sizeof(int), + GFP_KERNEL); + if (!c->bottom_up_buf) { + exit_code |=3D FSCK_ERROR; + log_err(c, errno, "cannot allocate bottom_up_buf"); + goto out_free; + } + + c->sbuf =3D vmalloc(c->leb_size); + if (!c->sbuf) { + exit_code |=3D FSCK_ERROR; + log_err(c, errno, "cannot allocate sbuf"); + goto out_free; + } + + if (!c->ro_mount) { + c->ileb_buf =3D vmalloc(c->leb_size); + if (!c->ileb_buf) { + exit_code |=3D FSCK_ERROR; + log_err(c, errno, "cannot allocate ileb_buf"); + goto out_free; + } + } + + c->mounting =3D 1; + + log_out(c, "Read superblock"); + err =3D ubifs_read_superblock(c); + if (err) { + if (test_and_clear_failure_reason_callback(c, FR_DATA_CORRUPTED)) + fix_problem(c, SB_CORRUPTED); + exit_code |=3D FSCK_ERROR; + goto out_mounting; + } + + err =3D init_constants_sb(c); + if (err) { + exit_code |=3D FSCK_ERROR; + goto out_mounting; + } + + sz =3D ALIGN(c->max_idx_node_sz, c->min_io_size) * 2; + c->cbuf =3D kmalloc(sz, GFP_NOFS); + if (!c->cbuf) { + err =3D -ENOMEM; + exit_code |=3D FSCK_ERROR; + log_err(c, errno, "cannot allocate cbuf"); + goto out_mounting; + } + + err =3D alloc_wbufs(c); + if (err) { + exit_code |=3D FSCK_ERROR; + log_err(c, 0, "cannot allocate wbuf"); + goto out_mounting; + } + + c->mounting =3D 0; + + return 0; + +out_mounting: + c->mounting =3D 0; +out_free: + kfree(c->cbuf); + kfree(c->ileb_buf); + kfree(c->sbuf); + kfree(c->bottom_up_buf); + kfree(c->sup_node); + + return err; +} + +void ubifs_destroy_filesystem(struct ubifs_info *c) +{ + free_wbufs(c); + + kfree(c->cbuf); + kfree(c->ileb_buf); + kfree(c->sbuf); + kfree(c->bottom_up_buf); + kfree(c->sup_node); +} diff --git a/ubifs-utils/fsck.ubifs/problem.c b/ubifs-utils/fsck.ubifs/prob= lem.c index 9a8c2e06..acb9e45e 100644 --- a/ubifs-utils/fsck.ubifs/problem.c +++ b/ubifs-utils/fsck.ubifs/problem.c @@ -34,7 +34,9 @@ struct fsck_problem { const char *desc; }; =20 -static const struct fsck_problem problem_table[] =3D {}; +static const struct fsck_problem problem_table[] =3D { + {0, "Corrupted superblock"}, // SB_CORRUPTED +}; =20 static void print_problem(const struct ubifs_info *c, const struct fsck_problem *problem) --=20 2.13.6