From nobody Tue Apr 7 15:56:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FB10C433FE for ; Tue, 18 Oct 2022 07:26:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229990AbiJRH0g (ORCPT ); Tue, 18 Oct 2022 03:26:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229966AbiJRH0a (ORCPT ); Tue, 18 Oct 2022 03:26:30 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD08D1BE8D for ; Tue, 18 Oct 2022 00:26:28 -0700 (PDT) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Ms5584t0mz4wqT; Tue, 18 Oct 2022 15:26:20 +0800 (CST) Received: from kwepemm600013.china.huawei.com (7.193.23.68) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 18 Oct 2022 15:26:26 +0800 Received: from huawei.com (10.175.127.227) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 18 Oct 2022 15:26:25 +0800 From: Zhihao Cheng To: , , , CC: , , Subject: [PATCH] ubiattach: introduce disable_fm in UBI_IOCATT Date: Tue, 18 Oct 2022 15:48:26 +0800 Message-ID: <20221018074826.2753019-1-chengzhihao1@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600013.china.huawei.com (7.193.23.68) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The ioctl UBI_IOCATT has been extended with disable_fm parameter after [1]. This parameter is used for disabling fastmap for target ubi device. If 'disable_fm' is set, ubi doesn't create new fastmap even the module param 'fm_autoconvert' is set, and existed old fastmap will be destroyed after attaching process. A simple test case in [2]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/comm= it/drivers/mtd?h=3Dv6.1-rc1&id=3D669d204469c46e91d99da24914130f78277a71d3. [2] https://bugzilla.kernel.org/show_bug.cgi?id=3D216278 Signed-off-by: Zhihao Cheng --- include/libubi.h | 3 +++ include/mtd/ubi-user.h | 7 ++++++- lib/libubi.c | 1 + ubi-utils/ubiattach.c | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/libubi.h b/include/libubi.h index 46c732a..8ea11e0 100644 --- a/include/libubi.h +++ b/include/libubi.h @@ -25,6 +25,7 @@ =20 #include #include +#include #include =20 #ifdef __cplusplus @@ -53,6 +54,7 @@ typedef void * libubi_t; * @vid_hdr_offset: VID header offset (%0 means default offset and this is= what * most of the users want) * @max_beb_per1024: Maximum expected bad eraseblocks per 1024 eraseblocks + * @disable_fm: whether disable fastmap */ struct ubi_attach_request { @@ -61,6 +63,7 @@ struct ubi_attach_request const char *mtd_dev_node; int vid_hdr_offset; int max_beb_per1024; + bool disable_fm; }; =20 /** diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index 707c4f2..309c29f 100644 --- a/include/mtd/ubi-user.h +++ b/include/mtd/ubi-user.h @@ -270,13 +270,18 @@ enum { * eraseblocks for new bad eraseblocks, but attempts to use available * eraseblocks (if any). The accepted range is 0-768. If 0 is given, the * default kernel value of %CONFIG_MTD_UBI_BEB_LIMIT will be used. + * + * If @disable_fm is not zero, ubi doesn't create new fastmap even the mod= ule + * param 'fm_autoconvert' is set, and existed old fastmap will be destroyed + * after doing full scanning. */ struct ubi_attach_req { int32_t ubi_num; int32_t mtd_num; int32_t vid_hdr_offset; int16_t max_beb_per1024; - int8_t padding[10]; + int8_t disable_fm; + int8_t padding[9]; }; =20 /* diff --git a/lib/libubi.c b/lib/libubi.c index baaca2f..410d104 100644 --- a/lib/libubi.c +++ b/lib/libubi.c @@ -767,6 +767,7 @@ int ubi_attach(libubi_t desc, const char *node, struct = ubi_attach_request *req) r.ubi_num =3D req->dev_num; r.mtd_num =3D req->mtd_num; r.vid_hdr_offset =3D req->vid_hdr_offset; + r.disable_fm =3D req->disable_fm ? 1 : 0; =20 if (req->max_beb_per1024) { /* diff --git a/ubi-utils/ubiattach.c b/ubi-utils/ubiattach.c index 09f85af..527a735 100644 --- a/ubi-utils/ubiattach.c +++ b/ubi-utils/ubiattach.c @@ -42,6 +42,7 @@ struct args { const char *node; const char *dev; int max_beb_per1024; + bool disable_fm; }; =20 static struct args args =3D { @@ -51,6 +52,7 @@ static struct args args =3D { .node =3D NULL, .dev =3D NULL, .max_beb_per1024 =3D 0, + .disable_fm =3D false, }; =20 static const char doc[] =3D PROGRAM_NAME " version " VERSION @@ -67,6 +69,8 @@ static const char optionsstr[] =3D "-b, --max-beb-per1024 maximum expected bad block number per 1024 eraseblo= ck.\n" " The default value is correct for most NAND devices.= \n" " Allowed range is 0-768, 0 means the default kernel = value.\n" +"-f, --disable-fastmap don't create new fastmap and do full scanning (exis= ted\n" +" fastmap will be destroyed) for the given ubi device= .\n" "-h, --help print help message\n" "-V, --version print program version"; =20 @@ -74,7 +78,7 @@ static const char usage[] =3D "Usage: " PROGRAM_NAME " []\n" "\t[-m ] [-d ] [-p ]= \n" "\t[--mtdn=3D] [--devn=3D]\n" -"\t[--dev-path=3D]\n" +"\t[--dev-path=3D] [-f] [--disable-fastmap]\n" "\t[--max-beb-per1024=3D]\n" "UBI control device defaults to " DEFAULT_CTRL_DEV " if not supplied.\n" "Example 1: " PROGRAM_NAME " -p /dev/mtd0 - attach /dev/mtd0 to UBI\n" @@ -93,6 +97,7 @@ static const struct option long_options[] =3D { { .name =3D "mtdn", .has_arg =3D 1, .flag =3D NULL, .val =3D '= m' }, { .name =3D "vid-hdr-offset", .has_arg =3D 1, .flag =3D NULL, .val =3D '= O' }, { .name =3D "max-beb-per1024", .has_arg =3D 1, .flag =3D NULL, .val =3D '= b' }, + { .name =3D "disable-fastmap", .has_arg =3D 0, .flag =3D NULL, .val =3D '= f' }, { .name =3D "help", .has_arg =3D 0, .flag =3D NULL, .val =3D '= h' }, { .name =3D "version", .has_arg =3D 0, .flag =3D NULL, .val =3D '= V' }, { NULL, 0, NULL, 0}, @@ -103,7 +108,7 @@ static int parse_opt(int argc, char * const argv[]) while (1) { int key, error =3D 0; =20 - key =3D getopt_long(argc, argv, "p:m:d:O:b:hV", long_options, NULL); + key =3D getopt_long(argc, argv, "p:m:d:O:b:fhV", long_options, NULL); if (key =3D=3D -1) break; =20 @@ -143,6 +148,10 @@ static int parse_opt(int argc, char * const argv[]) =20 break; =20 + case 'f': + args.disable_fm =3D true; + break; + case 'h': printf("%s\n\n", doc); printf("%s\n\n", usage); @@ -213,6 +222,7 @@ int main(int argc, char * const argv[]) req.vid_hdr_offset =3D args.vidoffs; req.mtd_dev_node =3D args.dev; req.max_beb_per1024 =3D args.max_beb_per1024; + req.disable_fm =3D args.disable_fm; =20 err =3D ubi_attach(libubi, args.node, &req); if (err < 0) { --=20 2.13.6