From: Richard Weinberger <richard@nod.at>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: linux-mtd@lists.infradead.org, David Gstir <david@sigma-star.at>,
kernel@pengutronix.de, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 07/25] ubifs: Store read superblock node
Date: Mon, 27 Aug 2018 14:50:42 +0200 [thread overview]
Message-ID: <3035437.xZzU3PcdnO@blindfold> (raw)
In-Reply-To: <20180704124137.13396-8-s.hauer@pengutronix.de>
Am Mittwoch, 4. Juli 2018, 14:41:19 CEST schrieb Sascha Hauer:
> The superblock node is read/modified/written several times throughout
> the UBIFS code. Instead of reading it from the device each time just
> keep a copy in memory and write back the modified copy when necessary.
> This patch helps for authentication support, here we not only have to
> read the superblock node, but also have to authenticate it, which
> is easier if we do it once during initialization.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> fs/ubifs/sb.c | 19 +++++--------------
> fs/ubifs/super.c | 8 +-------
> fs/ubifs/ubifs.h | 3 ++-
> 3 files changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
> index a32408f2f5c3..2fabd441d74a 100644
> --- a/fs/ubifs/sb.c
> +++ b/fs/ubifs/sb.c
> @@ -497,7 +497,7 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup)
> * code. Note, the user of this function is responsible of kfree()'ing the
> * returned superblock buffer.
> */
> -struct ubifs_sb_node *ubifs_read_sb_node(struct ubifs_info *c)
> +static struct ubifs_sb_node *ubifs_read_sb_node(struct ubifs_info *c)
> {
> struct ubifs_sb_node *sup;
> int err;
> @@ -554,6 +554,8 @@ int ubifs_read_superblock(struct ubifs_info *c)
> if (IS_ERR(sup))
> return PTR_ERR(sup);
>
> + c->superblock = sup;
> +
> c->fmt_version = le32_to_cpu(sup->fmt_version);
> c->ro_compat_version = le32_to_cpu(sup->ro_compat_version);
>
> @@ -685,7 +687,6 @@ int ubifs_read_superblock(struct ubifs_info *c)
>
> err = validate_sb(c, sup);
> out:
> - kfree(sup);
> return err;
> }
>
> @@ -814,7 +815,7 @@ static int fixup_free_space(struct ubifs_info *c)
> int ubifs_fixup_free_space(struct ubifs_info *c)
> {
> int err;
> - struct ubifs_sb_node *sup;
> + struct ubifs_sb_node *sup = c->superblock;
>
> ubifs_assert(c->space_fixup);
> ubifs_assert(!c->ro_mount);
> @@ -825,16 +826,11 @@ int ubifs_fixup_free_space(struct ubifs_info *c)
> if (err)
> return err;
>
> - sup = ubifs_read_sb_node(c);
> - if (IS_ERR(sup))
> - return PTR_ERR(sup);
> -
> /* Free-space fixup is no longer required */
> c->space_fixup = 0;
> sup->flags &= cpu_to_le32(~UBIFS_FLG_SPACE_FIXUP);
>
> err = ubifs_write_sb_node(c, sup);
> - kfree(sup);
> if (err)
> return err;
>
> @@ -845,7 +841,7 @@ int ubifs_fixup_free_space(struct ubifs_info *c)
> int ubifs_enable_encryption(struct ubifs_info *c)
> {
> int err;
> - struct ubifs_sb_node *sup;
> + struct ubifs_sb_node *sup = c->superblock;
>
> if (c->encrypted)
> return 0;
> @@ -858,16 +854,11 @@ int ubifs_enable_encryption(struct ubifs_info *c)
> return -EINVAL;
> }
>
> - sup = ubifs_read_sb_node(c);
> - if (IS_ERR(sup))
> - return PTR_ERR(sup);
> -
> sup->flags |= cpu_to_le32(UBIFS_FLG_ENCRYPTION);
>
> err = ubifs_write_sb_node(c, sup);
> if (!err)
> c->encrypted = 1;
> - kfree(sup);
>
> return err;
> }
> diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
> index c5466c70d620..9e44baec30a3 100644
> --- a/fs/ubifs/super.c
> +++ b/fs/ubifs/super.c
> @@ -1580,16 +1580,10 @@ static int ubifs_remount_rw(struct ubifs_info *c)
> goto out;
>
> if (c->old_leb_cnt != c->leb_cnt) {
> - struct ubifs_sb_node *sup;
> + struct ubifs_sb_node *sup = c->superblock;
>
> - sup = ubifs_read_sb_node(c);
> - if (IS_ERR(sup)) {
> - err = PTR_ERR(sup);
> - goto out;
> - }
> sup->leb_cnt = cpu_to_le32(c->leb_cnt);
> err = ubifs_write_sb_node(c, sup);
> - kfree(sup);
> if (err)
> goto out;
> }
> diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
> index 83c5e75ed3b6..92574045e030 100644
> --- a/fs/ubifs/ubifs.h
> +++ b/fs/ubifs/ubifs.h
> @@ -971,6 +971,7 @@ struct ubifs_debug_info;
> * struct ubifs_info - UBIFS file-system description data structure
> * (per-superblock).
> * @vfs_sb: VFS @struct super_block object
> + * @superblock: The super block node as read from the device
Please name it sup_node to have consistent naming scheme.
We already store the master node, @mst_node.
Thanks,
//richard
next prev parent reply other threads:[~2018-08-27 12:50 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 12:41 [PATCH 00/25] UBIFS authentication support Sascha Hauer
2018-07-04 12:41 ` [PATCH 01/25] ubifs: refactor create_default_filesystem() Sascha Hauer
2018-07-04 12:41 ` [PATCH 02/25] ubifs: pass ubifs_zbranch to try_read_node() Sascha Hauer
2018-07-04 12:41 ` [PATCH 03/25] ubifs: pass ubifs_zbranch to read_znode() Sascha Hauer
2018-07-04 12:41 ` [PATCH 04/25] ubifs: export pnode_lookup as ubifs_pnode_lookup Sascha Hauer
2018-07-04 12:41 ` [PATCH 05/25] ubifs: implement ubifs_lpt_lookup using ubifs_pnode_lookup Sascha Hauer
2018-08-13 6:31 ` Sascha Hauer
2018-08-13 6:34 ` Richard Weinberger
2018-08-13 8:12 ` Sascha Hauer
2018-08-13 11:30 ` Richard Weinberger
2018-08-26 20:59 ` Richard Weinberger
2018-07-04 12:41 ` [PATCH 06/25] ubifs: drop write_node Sascha Hauer
2018-07-04 12:41 ` [PATCH 07/25] ubifs: Store read superblock node Sascha Hauer
2018-08-27 12:50 ` Richard Weinberger [this message]
2018-07-04 12:41 ` [PATCH 08/25] ubifs: Format changes for authentication support Sascha Hauer
2018-07-04 12:41 ` [PATCH 09/25] ubifs: add separate functions to init/crc a node Sascha Hauer
2018-07-04 12:41 ` [PATCH 10/25] ubifs: add helper functions for authentication support Sascha Hauer
2018-08-27 12:50 ` Richard Weinberger
2018-08-29 6:30 ` Sascha Hauer
2018-07-04 12:41 ` [PATCH 11/25] ubifs: Create functions to embed a HMAC in a node Sascha Hauer
2018-07-04 12:41 ` [PATCH 12/25] ubifs: Add hashes to the tree node cache Sascha Hauer
2018-08-27 19:18 ` Richard Weinberger
2018-08-29 11:16 ` Sascha Hauer
2018-07-04 12:41 ` [PATCH 13/25] ubifs: authentication: Add hashes to index nodes Sascha Hauer
2018-08-27 19:36 ` Richard Weinberger
2018-09-07 10:25 ` Sascha Hauer
2018-07-04 12:41 ` [PATCH 14/25] ubifs: Add authentication nodes to journal Sascha Hauer
2018-07-08 2:59 ` kbuild test robot
2018-08-27 20:48 ` Richard Weinberger
2018-08-29 14:38 ` Sascha Hauer
2018-08-29 14:54 ` Richard Weinberger
2018-08-30 13:41 ` Sascha Hauer
2018-09-02 19:45 ` Richard Weinberger
2018-07-04 12:41 ` [PATCH 15/25] ubifs: Add auth nodes to garbage collector journal head Sascha Hauer
2018-08-27 20:51 ` Richard Weinberger
2018-08-30 14:43 ` Sascha Hauer
2018-07-04 12:41 ` [PATCH 16/25] ubifs: authenticate replayed journal Sascha Hauer
2018-07-08 6:08 ` kbuild test robot
2018-08-27 21:16 ` Richard Weinberger
2018-07-04 12:41 ` [PATCH 17/25] ubifs: authentication: authenticate LPT Sascha Hauer
2018-07-04 12:41 ` [PATCH 18/25] ubfis: authentication: authenticate master node Sascha Hauer
2018-07-04 12:41 ` [PATCH 19/25] ubifs: Create hash for default LPT Sascha Hauer
2018-07-04 12:41 ` [PATCH 20/25] ubifs: authentication: Authenticate super block node Sascha Hauer
2018-07-04 12:41 ` [PATCH 21/25] ubifs: Add hashes and HMACs to default filesystem Sascha Hauer
2018-07-04 12:41 ` [PATCH 22/25] ubifs: do not update inode size in-place in authenticated mode Sascha Hauer
2018-07-04 12:41 ` [PATCH 23/25] ubifs: Enable authentication support Sascha Hauer
2018-07-04 12:41 ` [PATCH 24/25] ubifs: support offline signed images Sascha Hauer
2018-07-04 12:41 ` [PATCH 25/25] Documentation: ubifs: Add authentication whitepaper Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3035437.xZzU3PcdnO@blindfold \
--to=richard@nod.at \
--cc=david@sigma-star.at \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).