From: gaoxiang25@huawei.com (Gao Xiang) Subject: [PATCH v6 07/24] erofs: add directory operations Date: Fri, 2 Aug 2019 20:53:30 +0800 Message-ID: <20190802125347.166018-8-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190802125347.166018-1-gaoxiang25@huawei.com> This adds functions for directory, mainly readdir. Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com> --- fs/erofs/dir.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 fs/erofs/dir.c diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c new file mode 100644 index 000000000000..7cf7da8574c4 --- /dev/null +++ b/fs/erofs/dir.c @@ -0,0 +1,147 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * linux/fs/erofs/dir.c + * + * Copyright (C) 2017-2018 HUAWEI, Inc. + * http://www.huawei.com/ + * Created by Gao Xiang <gaoxiang25 at huawei.com> + */ +#include "internal.h" + +static const unsigned char erofs_filetype_table[EROFS_FT_MAX] = { + [EROFS_FT_UNKNOWN] = DT_UNKNOWN, + [EROFS_FT_REG_FILE] = DT_REG, + [EROFS_FT_DIR] = DT_DIR, + [EROFS_FT_CHRDEV] = DT_CHR, + [EROFS_FT_BLKDEV] = DT_BLK, + [EROFS_FT_FIFO] = DT_FIFO, + [EROFS_FT_SOCK] = DT_SOCK, + [EROFS_FT_SYMLINK] = DT_LNK, +}; + +static void debug_one_dentry(unsigned char d_type, const char *de_name, + unsigned int de_namelen) +{ +#ifdef CONFIG_EROFS_FS_DEBUG + /* since the on-disk name could not have the trailing '\0' */ + unsigned char dbg_namebuf[EROFS_NAME_LEN + 1]; + + memcpy(dbg_namebuf, de_name, de_namelen); + dbg_namebuf[de_namelen] = '\0'; + + debugln("found dirent %s de_len %u d_type %d", dbg_namebuf, + de_namelen, d_type); +#endif +} + +static int erofs_fill_dentries(struct dir_context *ctx, + void *dentry_blk, unsigned int *ofs, + unsigned int nameoff, unsigned int maxsize) +{ + struct erofs_dirent *de = dentry_blk + *ofs; + const struct erofs_dirent *end = dentry_blk + nameoff; + + while (de < end) { + const char *de_name; + unsigned int de_namelen; + unsigned char d_type; + + if (de->file_type < EROFS_FT_MAX) + d_type = erofs_filetype_table[de->file_type]; + else + d_type = DT_UNKNOWN; + + nameoff = le16_to_cpu(de->nameoff); + de_name = (char *)dentry_blk + nameoff; + + /* the last dirent in the block? */ + if (de + 1 >= end) + de_namelen = strnlen(de_name, maxsize - nameoff); + else + de_namelen = le16_to_cpu(de[1].nameoff) - nameoff; + + /* a corrupted entry is found */ + if (unlikely(nameoff + de_namelen > maxsize || + de_namelen > EROFS_NAME_LEN)) { + DBG_BUGON(1); + return -EIO; + } + + debug_one_dentry(d_type, de_name, de_namelen); + if (!dir_emit(ctx, de_name, de_namelen, + le64_to_cpu(de->nid), d_type)) + /* stopped by some reason */ + return 1; + ++de; + *ofs += sizeof(struct erofs_dirent); + } + *ofs = maxsize; + return 0; +} + +static int erofs_readdir(struct file *f, struct dir_context *ctx) +{ + struct inode *dir = file_inode(f); + struct address_space *mapping = dir->i_mapping; + const size_t dirsize = i_size_read(dir); + unsigned int i = ctx->pos / EROFS_BLKSIZ; + unsigned int ofs = ctx->pos % EROFS_BLKSIZ; + int err = 0; + bool initial = true; + + while (ctx->pos < dirsize) { + struct page *dentry_page; + struct erofs_dirent *de; + unsigned int nameoff, maxsize; + + dentry_page = read_mapping_page(mapping, i, NULL); + if (IS_ERR(dentry_page)) + continue; + + de = (struct erofs_dirent *)kmap(dentry_page); + + nameoff = le16_to_cpu(de->nameoff); + + if (unlikely(nameoff < sizeof(struct erofs_dirent) || + nameoff >= PAGE_SIZE)) { + errln("%s, invalid de[0].nameoff %u", + __func__, nameoff); + + err = -EIO; + goto skip_this; + } + + maxsize = min_t(unsigned int, + dirsize - ctx->pos + ofs, PAGE_SIZE); + + /* search dirents at the arbitrary position */ + if (unlikely(initial)) { + initial = false; + + ofs = roundup(ofs, sizeof(struct erofs_dirent)); + if (unlikely(ofs >= nameoff)) + goto skip_this; + } + + err = erofs_fill_dentries(ctx, de, &ofs, nameoff, maxsize); +skip_this: + kunmap(dentry_page); + + put_page(dentry_page); + + ctx->pos = blknr_to_addr(i) + ofs; + + if (unlikely(err)) + break; + ++i; + ofs = 0; + } + return err < 0 ? err : 0; +} + +const struct file_operations erofs_dir_fops = { + .llseek = generic_file_llseek, + .read = generic_read_dir, + .iterate_shared = erofs_readdir, +}; + -- 2.17.1
next prev parent reply index Thread overview: 141+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-02 12:53 [PATCH v6 00/24] erofs: promote erofs from staging Gao Xiang 2019-08-02 12:53 ` [PATCH v6 01/24] erofs: add on-disk layout Gao Xiang [not found] ` <20190829095954.GB20598@infradead.org> 2019-09-01 7:54 ` Gao Xiang 2019-09-02 12:45 ` Christoph Hellwig 2019-09-02 13:02 ` Gao Xiang 2019-09-02 8:40 ` Pavel Machek 2019-09-02 10:35 ` Gao Xiang [not found] ` <20190829103252.GA64893@architecture4> [not found] ` <67d6efbbc9ac6db23215660cb970b7ef29dc0c1d.camel@perches.com> [not found] ` <20190830120714.GN2752@twin.jikos.cz> 2019-09-02 8:43 ` Pavel Machek 2019-09-02 14:07 ` David Sterba 2019-09-03 11:27 ` Pavel Machek 2019-08-02 12:53 ` [PATCH v6 02/24] erofs: add erofs in-memory stuffs Gao Xiang 2019-08-02 12:53 ` [PATCH v6 03/24] erofs: add super block operations Gao Xiang [not found] ` <20190829101545.GC20598@infradead.org> [not found] ` <20190829105048.GB64893@architecture4> 2019-08-30 16:39 ` Christoph Hellwig 2019-08-30 17:15 ` Gao Xiang 2019-08-31 0:54 ` Gao Xiang 2019-08-31 6:34 ` Amir Goldstein 2019-08-31 6:48 ` Gao Xiang 2019-09-01 8:54 ` Gao Xiang 2019-09-02 12:51 ` Christoph Hellwig 2019-09-02 14:43 ` Gao Xiang 2019-09-02 15:19 ` Christoph Hellwig 2019-09-02 15:24 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 04/24] erofs: add raw address_space operations Gao Xiang [not found] ` <20190829101721.GD20598@infradead.org> [not found] ` <20190829114610.GF64893@architecture4> 2019-08-30 16:40 ` Christoph Hellwig 2019-08-30 17:23 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 05/24] erofs: add inode operations Gao Xiang [not found] ` <20190829102426.GE20598@infradead.org> [not found] ` <20190829115922.GG64893@architecture4> 2019-08-30 16:42 ` Christoph Hellwig 2019-08-30 18:46 ` Gao Xiang 2019-09-01 9:34 ` Gao Xiang 2019-09-02 12:53 ` Christoph Hellwig 2019-09-02 13:43 ` David Sterba 2019-09-02 13:55 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 06/24] erofs: support special inode Gao Xiang [not found] ` <20190829102503.GF20598@infradead.org> 2019-09-01 9:39 ` Gao Xiang 2019-08-02 12:53 ` Gao Xiang [this message] 2019-08-02 12:53 ` [PATCH v6 08/24] erofs: add namei functions Gao Xiang 2019-08-02 12:53 ` [PATCH v6 09/24] erofs: support tracepoint Gao Xiang 2019-08-02 12:53 ` [PATCH v6 10/24] erofs: update Kconfig and Makefile Gao Xiang 2019-08-02 12:53 ` [PATCH v6 11/24] erofs: introduce xattr & posixacl support Gao Xiang 2019-08-02 12:53 ` [PATCH v6 12/24] erofs: introduce tagged pointer Gao Xiang 2019-08-02 12:53 ` [PATCH v6 13/24] erofs: add compression indexes support Gao Xiang 2019-08-02 12:53 ` [PATCH v6 14/24] erofs: introduce superblock registration Gao Xiang 2019-08-02 12:53 ` [PATCH v6 15/24] erofs: introduce erofs shrinker Gao Xiang 2019-08-02 12:53 ` [PATCH v6 16/24] erofs: introduce workstation for decompression Gao Xiang 2019-08-02 12:53 ` [PATCH v6 17/24] erofs: introduce per-CPU buffers implementation Gao Xiang 2019-08-02 12:53 ` [PATCH v6 18/24] erofs: introduce pagevec for decompression subsystem Gao Xiang 2019-08-02 12:53 ` [PATCH v6 19/24] erofs: add erofs_allocpage() Gao Xiang 2019-08-02 12:53 ` [PATCH v6 20/24] erofs: introduce generic decompression backend Gao Xiang 2019-08-02 12:53 ` [PATCH v6 21/24] erofs: introduce LZ4 decompression inplace Gao Xiang 2019-08-02 12:53 ` [PATCH v6 22/24] erofs: introduce the decompression frontend Gao Xiang 2019-08-02 12:53 ` [PATCH v6 23/24] erofs: introduce cached decompression Gao Xiang 2019-08-02 12:53 ` [PATCH v6 24/24] erofs: add document Gao Xiang 2019-09-01 5:51 ` [PATCH 00/21] erofs: patchset addressing Christoph's comments Gao Xiang 2019-09-01 5:51 ` [PATCH 01/21] erofs: remove all the byte offset comments Gao Xiang 2019-09-02 12:05 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 02/21] erofs: on-disk format should have explicitly assigned numbers Gao Xiang 2019-09-02 12:05 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 03/21] erofs: some macros are much more readable as a function Gao Xiang 2019-09-02 12:06 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 04/21] erofs: kill __packed for on-disk structures Gao Xiang 2019-09-02 12:06 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 05/21] erofs: update erofs_inode_is_data_compressed helper Gao Xiang 2019-09-02 12:07 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 06/21] erofs: kill erofs_{init,exit}_inode_cache Gao Xiang 2019-09-02 12:09 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 07/21] erofs: use erofs_inode naming Gao Xiang 2019-09-02 12:10 ` Christoph Hellwig 2019-09-02 12:13 ` Gao Xiang 2019-09-02 12:47 ` Christoph Hellwig 2019-09-02 13:33 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 08/21] erofs: update comments in inode.c Gao Xiang 2019-09-01 5:51 ` [PATCH 09/21] erofs: update erofs symlink stuffs Gao Xiang 2019-09-02 12:11 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 10/21] erofs: kill is_inode_layout_compression() Gao Xiang 2019-09-02 12:11 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 11/21] erofs: use dsb instead of layout for ondisk super_block Gao Xiang 2019-09-02 12:12 ` Christoph Hellwig 2019-09-02 12:15 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 12/21] erofs: kill verbose debug info in erofs_fill_super Gao Xiang 2019-09-02 12:14 ` Christoph Hellwig 2019-09-02 12:18 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 13/21] erofs: simplify erofs_grab_bio() since bio_alloc() never fail Gao Xiang 2019-09-02 12:20 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 14/21] erofs: kill prio and nofail of erofs_get_meta_page() Gao Xiang 2019-09-02 12:21 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 15/21] erofs: kill __submit_bio() Gao Xiang 2019-09-01 5:51 ` [PATCH 16/21] erofs: kill magic underscores Gao Xiang 2019-09-02 12:26 ` Christoph Hellwig 2019-09-02 12:39 ` Gao Xiang 2019-09-02 12:54 ` Christoph Hellwig 2019-09-02 13:38 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 17/21] erofs: use a switch statement when dealing with the file modes Gao Xiang 2019-09-02 12:27 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 18/21] erofs: add "erofs_" prefix for common and short functions Gao Xiang 2019-09-02 12:28 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 19/21] erofs: kill all erofs specific fault injection Gao Xiang 2019-09-02 12:28 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 20/21] erofs: kill use_vmap module parameter Gao Xiang 2019-09-02 12:31 ` Christoph Hellwig 2019-09-02 12:43 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 21/21] erofs: save one level of indentation Gao Xiang 2019-09-02 12:31 ` Christoph Hellwig 2019-09-02 12:46 ` [PATCH 00/21] erofs: patchset addressing Christoph's comments Christoph Hellwig 2019-09-02 14:24 ` Gao Xiang 2019-09-02 15:23 ` Christoph Hellwig 2019-09-02 15:50 ` Gao Xiang 2019-09-03 6:58 ` Christoph Hellwig 2019-09-03 8:17 ` Gao Xiang 2019-09-03 15:37 ` Christoph Hellwig 2019-09-03 15:43 ` Gao Xiang 2019-09-04 2:08 ` [PATCH v2 00/25] " Gao Xiang 2019-09-04 2:08 ` [PATCH v2 01/25] erofs: remove all the byte offset comments Gao Xiang 2019-09-04 2:08 ` [PATCH v2 02/25] erofs: on-disk format should have explicitly assigned numbers Gao Xiang 2019-09-04 2:08 ` [PATCH v2 03/25] erofs: some macros are much more readable as a function Gao Xiang 2019-09-04 2:08 ` [PATCH v2 04/25] erofs: kill __packed for on-disk structures Gao Xiang 2019-09-04 2:08 ` [PATCH v2 05/25] erofs: update erofs_inode_is_data_compressed helper Gao Xiang 2019-09-04 2:08 ` [PATCH v2 06/25] erofs: use feature_incompat rather than requirements Gao Xiang 2019-09-04 2:08 ` [PATCH v2 07/25] erofs: better naming for erofs inode related stuffs Gao Xiang 2019-09-04 2:08 ` [PATCH v2 08/25] erofs: kill erofs_{init,exit}_inode_cache Gao Xiang 2019-09-04 2:08 ` [PATCH v2 09/25] erofs: use erofs_inode naming Gao Xiang 2019-09-04 2:08 ` [PATCH v2 10/25] erofs: update erofs_fs.h comments Gao Xiang 2019-09-04 2:08 ` [PATCH v2 11/25] erofs: update comments in inode.c Gao Xiang 2019-09-04 2:08 ` [PATCH v2 12/25] erofs: better erofs symlink stuffs Gao Xiang 2019-09-04 2:09 ` [PATCH v2 13/25] erofs: use dsb instead of layout for ondisk super_block Gao Xiang 2019-09-04 2:09 ` [PATCH v2 14/25] erofs: kill verbose debug info in erofs_fill_super Gao Xiang 2019-09-04 2:09 ` [PATCH v2 15/25] erofs: localize erofs_grab_bio() Gao Xiang 2019-09-04 2:09 ` [PATCH v2 16/25] erofs: kill prio and nofail of erofs_get_meta_page() Gao Xiang 2019-09-04 2:09 ` [PATCH v2 17/25] erofs: kill __submit_bio() Gao Xiang 2019-09-04 2:09 ` [PATCH v2 18/25] erofs: add "erofs_" prefix for common and short functions Gao Xiang 2019-09-04 2:09 ` [PATCH v2 19/25] erofs: kill all erofs specific fault injection Gao Xiang 2019-09-04 2:09 ` [PATCH v2 20/25] erofs: kill use_vmap module parameter Gao Xiang 2019-09-04 2:09 ` [PATCH v2 21/25] erofs: save one level of indentation Gao Xiang 2019-09-04 2:09 ` [PATCH v2 22/25] erofs: rename errln/infoln/debugln to erofs_{err, info, dbg} Gao Xiang 2019-09-04 2:09 ` [PATCH v2 23/25] erofs: use read_mapping_page instead of sb_bread Gao Xiang 2019-09-04 2:09 ` [PATCH v2 24/25] erofs: always use iget5_locked Gao Xiang 2019-09-04 2:09 ` [PATCH v2 25/25] erofs: use read_cache_page_gfp for erofs_get_meta_page Gao Xiang 2019-09-04 3:27 ` [PATCH v2 00/25] erofs: patchset addressing Christoph's comments Chao Yu 2019-09-05 1:03 ` Gao Xiang 2019-09-05 11:30 ` Christoph Hellwig 2019-09-04 5:16 ` Christoph Hellwig 2019-09-04 6:08 ` Gao Xiang
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=20190802125347.166018-8-gaoxiang25@huawei.com \ --to=gaoxiang25@huawei.com \ /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
DriverDev-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/driverdev-devel/0 driverdev-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 driverdev-devel driverdev-devel/ https://lore.kernel.org/driverdev-devel \ driverdev-devel@linuxdriverproject.org devel@driverdev.osuosl.org public-inbox-index driverdev-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.linuxdriverproject.driverdev-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git