From: Gao Xiang <gaoxiang25@huawei.com> To: <linux-fsdevel@vger.kernel.org>, <devel@driverdev.osuosl.org>, "Alexander Viro" <viro@zeniv.linux.org.uk> Cc: LKML <linux-kernel@vger.kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Andrew Morton <akpm@linux-foundation.org>, Stephen Rothwell <sfr@canb.auug.org.au>, Theodore Ts'o <tytso@mit.edu>, Pavel Machek <pavel@denx.de>, David Sterba <dsterba@suse.cz>, "Amir Goldstein" <amir73il@gmail.com>, Christoph Hellwig <hch@infradead.org>, "Darrick J . Wong" <darrick.wong@oracle.com>, Dave Chinner <david@fromorbit.com>, Jaegeuk Kim <jaegeuk@kernel.org>, Jan Kara <jack@suse.cz>, Richard Weinberger <richard@nod.at>, Linus Torvalds <torvalds@linux-foundation.org>, <linux-erofs@lists.ozlabs.org>, Chao Yu <yuchao0@huawei.com>, Miao Xie <miaoxie@huawei.com>, Li Guifu <bluce.liguifu@huawei.com>, Fang Wei <fangwei1@huawei.com>, Gao Xiang <gaoxiang25@huawei.com> Subject: [PATCH v8 07/24] erofs: add directory operations Date: Thu, 15 Aug 2019 12:41:38 +0800 [thread overview] Message-ID: <20190815044155.88483-8-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190815044155.88483-1-gaoxiang25@huawei.com> This adds functions for directory, mainly readdir. Signed-off-by: Gao Xiang <gaoxiang25@huawei.com> --- fs/erofs/dir.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 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..c52d27bedff4 --- /dev/null +++ b/fs/erofs/dir.c @@ -0,0 +1,148 @@ +// 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@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 inode *dir, 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)) { + errln("bogus dirent @ nid %llu", EROFS_V(dir)->nid); + DBG_BUGON(1); + return -EFSCORRUPTED; + } + + 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 @ nid %llu", + __func__, nameoff, EROFS_V(dir)->nid); + err = -EFSCORRUPTED; + 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(dir, 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
WARNING: multiple messages have this Message-ID (diff)
From: gaoxiang25@huawei.com (Gao Xiang) Subject: [PATCH v8 07/24] erofs: add directory operations Date: Thu, 15 Aug 2019 12:41:38 +0800 [thread overview] Message-ID: <20190815044155.88483-8-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190815044155.88483-1-gaoxiang25@huawei.com> This adds functions for directory, mainly readdir. Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com> --- fs/erofs/dir.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 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..c52d27bedff4 --- /dev/null +++ b/fs/erofs/dir.c @@ -0,0 +1,148 @@ +// 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 inode *dir, 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)) { + errln("bogus dirent @ nid %llu", EROFS_V(dir)->nid); + DBG_BUGON(1); + return -EFSCORRUPTED; + } + + 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 @ nid %llu", + __func__, nameoff, EROFS_V(dir)->nid); + err = -EFSCORRUPTED; + 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(dir, 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 other threads:[~2019-08-15 4:44 UTC|newest] Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-15 4:41 [PATCH v8 00/24] erofs: promote erofs from staging v8 Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 01/24] erofs: add on-disk layout Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 02/24] erofs: add erofs in-memory stuffs Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 03/24] erofs: add super block operations Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 04/24] erofs: add raw address_space operations Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 05/24] erofs: add inode operations Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 06/24] erofs: support special inode Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` Gao Xiang [this message] 2019-08-15 4:41 ` [PATCH v8 07/24] erofs: add directory operations Gao Xiang 2019-08-15 16:13 ` Linus Torvalds 2019-08-15 16:13 ` Linus Torvalds 2019-08-15 16:46 ` Gao Xiang 2019-08-15 16:46 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 08/24] erofs: add namei functions Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 09/24] erofs: support tracepoint Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 10/24] erofs: update Kconfig and Makefile Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 11/24] erofs: introduce xattr & posixacl support Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-09-02 12:57 ` Christoph Hellwig 2019-09-02 12:57 ` Christoph Hellwig 2019-09-02 12:57 ` Christoph Hellwig 2019-09-02 13:05 ` Gao Xiang 2019-09-02 13:05 ` Gao Xiang 2019-09-02 13:05 ` Gao Xiang 2019-09-02 13:06 ` David Sterba 2019-09-02 13:06 ` David Sterba 2019-09-02 13:06 ` David Sterba 2019-09-02 13:51 ` Chao Yu 2019-09-02 13:51 ` Chao Yu 2019-09-02 14:20 ` David Sterba 2019-09-02 14:20 ` David Sterba 2019-09-02 14:20 ` David Sterba 2019-09-02 15:06 ` Christoph Hellwig 2019-09-02 15:06 ` Christoph Hellwig 2019-09-02 15:10 ` Gao Xiang 2019-09-02 15:10 ` Gao Xiang 2019-09-02 15:10 ` Gao Xiang 2019-09-02 15:21 ` Gao Xiang 2019-09-02 15:21 ` Gao Xiang 2019-09-02 15:21 ` Gao Xiang 2019-09-03 6:30 ` Chao Yu 2019-09-03 6:30 ` Chao Yu 2019-08-15 4:41 ` [PATCH v8 12/24] erofs: introduce tagged pointer Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 13/24] erofs: add compression indexes support Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 14/24] erofs: introduce superblock registration Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 15/24] erofs: introduce erofs shrinker Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 16/24] erofs: introduce workstation for decompression Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 17/24] erofs: introduce per-CPU buffers implementation Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 18/24] erofs: introduce pagevec for decompression subsystem Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 19/24] erofs: add erofs_allocpage() Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 20/24] erofs: introduce generic decompression backend Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-30 16:35 ` Christoph Hellwig 2019-08-30 16:35 ` Christoph Hellwig 2019-08-30 16:35 ` Christoph Hellwig 2019-08-30 16:52 ` Gao Xiang 2019-08-30 16:52 ` Gao Xiang 2019-08-30 16:52 ` Gao Xiang 2019-08-30 16:55 ` Christoph Hellwig 2019-08-30 16:55 ` Christoph Hellwig 2019-08-30 16:55 ` Christoph Hellwig 2019-08-15 4:41 ` [PATCH v8 21/24] erofs: introduce LZ4 decompression inplace Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 22/24] erofs: introduce the decompression frontend Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 23/24] erofs: introduce cached decompression Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 4:41 ` [PATCH v8 24/24] erofs: add document Gao Xiang 2019-08-15 4:41 ` Gao Xiang 2019-08-15 9:06 ` [PATCH v8 00/24] erofs: promote erofs from staging v8 Greg Kroah-Hartman 2019-08-15 9:06 ` Greg Kroah-Hartman 2019-08-15 16:18 ` Linus Torvalds 2019-08-15 16:18 ` Linus Torvalds 2019-08-15 17:04 ` Gao Xiang 2019-08-15 17:04 ` Gao Xiang 2019-08-22 14:16 ` Gao Xiang 2019-08-22 14:16 ` Gao Xiang 2019-08-22 21:36 ` [PATCH v2] erofs: move erofs out of staging Gao Xiang 2019-08-22 21:36 ` Gao Xiang via Linux-erofs 2019-08-29 17:11 ` [PATCH v8 00/24] erofs: promote erofs from staging v8 Miao Xie 2019-08-29 17:11 ` Miao Xie 2019-08-30 7:48 ` Chao Yu 2019-08-30 7:48 ` Chao Yu
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=20190815044155.88483-8-gaoxiang25@huawei.com \ --to=gaoxiang25@huawei.com \ --cc=akpm@linux-foundation.org \ --cc=amir73il@gmail.com \ --cc=bluce.liguifu@huawei.com \ --cc=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=devel@driverdev.osuosl.org \ --cc=dsterba@suse.cz \ --cc=fangwei1@huawei.com \ --cc=gregkh@linuxfoundation.org \ --cc=hch@infradead.org \ --cc=jack@suse.cz \ --cc=jaegeuk@kernel.org \ --cc=linux-erofs@lists.ozlabs.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=miaoxie@huawei.com \ --cc=pavel@denx.de \ --cc=richard@nod.at \ --cc=sfr@canb.auug.org.au \ --cc=torvalds@linux-foundation.org \ --cc=tytso@mit.edu \ --cc=viro@zeniv.linux.org.uk \ --cc=yuchao0@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.