From: Gao Xiang <gaoxiang25@huawei.com> To: Alexander Viro <viro@zeniv.linux.org.uk>, 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>, "Linus Torvalds" <torvalds@linux-foundation.org> Cc: <linux-fsdevel@vger.kernel.org>, <devel@driverdev.osuosl.org>, LKML <linux-kernel@vger.kernel.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 v3 18/24] erofs: introduce pagevec for decompression subsystem Date: Mon, 22 Jul 2019 10:50:37 +0800 [thread overview] Message-ID: <20190722025043.166344-19-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190722025043.166344-1-gaoxiang25@huawei.com> For each physical cluster, there is a straight-forward way of allocating a fixed or variable-sized array to record the corresponding file pages for its decompression if we decide to decompress these pages asynchronously (eg. read-ahead case), however it will take variable-sized on-heap memory compared with traditional uncompressed filesystems. This patch introduces a pagevec solution to reuse some allocated file page in the time-sharing approach to store parts of the array itself in order to minimize the extra memory overhead, thus only a small-sized constant array used for booting the whole array itself up will be needed. Signed-off-by: Gao Xiang <gaoxiang25@huawei.com> --- fs/erofs/zpvec.h | 159 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 fs/erofs/zpvec.h diff --git a/fs/erofs/zpvec.h b/fs/erofs/zpvec.h new file mode 100644 index 000000000000..292aee36d380 --- /dev/null +++ b/fs/erofs/zpvec.h @@ -0,0 +1,159 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * linux/fs/erofs/zpvec.h + * + * Copyright (C) 2018 HUAWEI, Inc. + * http://www.huawei.com/ + * Created by Gao Xiang <gaoxiang25@huawei.com> + */ +#ifndef __EROFS_ZPVEC_H +#define __EROFS_ZPVEC_H + +#include "tagptr.h" + +/* page type in pagevec for decompress subsystem */ +enum z_erofs_page_type { + /* including Z_EROFS_VLE_PAGE_TAIL_EXCLUSIVE */ + Z_EROFS_PAGE_TYPE_EXCLUSIVE, + + Z_EROFS_VLE_PAGE_TYPE_TAIL_SHARED, + + Z_EROFS_VLE_PAGE_TYPE_HEAD, + Z_EROFS_VLE_PAGE_TYPE_MAX +}; + +extern void __compiletime_error("Z_EROFS_PAGE_TYPE_EXCLUSIVE != 0") + __bad_page_type_exclusive(void); + +/* pagevec tagged pointer */ +typedef tagptr2_t erofs_vtptr_t; + +/* pagevec collector */ +struct z_erofs_pagevec_ctor { + struct page *curr, *next; + erofs_vtptr_t *pages; + + unsigned int nr, index; +}; + +static inline void z_erofs_pagevec_ctor_exit(struct z_erofs_pagevec_ctor *ctor, + bool atomic) +{ + if (!ctor->curr) + return; + + if (atomic) + kunmap_atomic(ctor->pages); + else + kunmap(ctor->curr); +} + +static inline struct page * +z_erofs_pagevec_ctor_next_page(struct z_erofs_pagevec_ctor *ctor, + unsigned int nr) +{ + unsigned int index; + + /* keep away from occupied pages */ + if (ctor->next) + return ctor->next; + + for (index = 0; index < nr; ++index) { + const erofs_vtptr_t t = ctor->pages[index]; + const unsigned int tags = tagptr_unfold_tags(t); + + if (tags == Z_EROFS_PAGE_TYPE_EXCLUSIVE) + return tagptr_unfold_ptr(t); + } + DBG_BUGON(nr >= ctor->nr); + return NULL; +} + +static inline void +z_erofs_pagevec_ctor_pagedown(struct z_erofs_pagevec_ctor *ctor, + bool atomic) +{ + struct page *next = z_erofs_pagevec_ctor_next_page(ctor, ctor->nr); + + z_erofs_pagevec_ctor_exit(ctor, atomic); + + ctor->curr = next; + ctor->next = NULL; + ctor->pages = atomic ? + kmap_atomic(ctor->curr) : kmap(ctor->curr); + + ctor->nr = PAGE_SIZE / sizeof(struct page *); + ctor->index = 0; +} + +static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor, + unsigned int nr, + erofs_vtptr_t *pages, + unsigned int i) +{ + ctor->nr = nr; + ctor->curr = ctor->next = NULL; + ctor->pages = pages; + + if (i >= nr) { + i -= nr; + z_erofs_pagevec_ctor_pagedown(ctor, false); + while (i > ctor->nr) { + i -= ctor->nr; + z_erofs_pagevec_ctor_pagedown(ctor, false); + } + } + ctor->next = z_erofs_pagevec_ctor_next_page(ctor, i); + ctor->index = i; +} + +static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor, + struct page *page, + enum z_erofs_page_type type, + bool *occupied) +{ + *occupied = false; + if (unlikely(!ctor->next && type)) + if (ctor->index + 1 == ctor->nr) + return false; + + if (unlikely(ctor->index >= ctor->nr)) + z_erofs_pagevec_ctor_pagedown(ctor, false); + + /* exclusive page type must be 0 */ + if (Z_EROFS_PAGE_TYPE_EXCLUSIVE != (uintptr_t)NULL) + __bad_page_type_exclusive(); + + /* should remind that collector->next never equal to 1, 2 */ + if (type == (uintptr_t)ctor->next) { + ctor->next = page; + *occupied = true; + } + ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type); + return true; +} + +static inline struct page * +z_erofs_pagevec_dequeue(struct z_erofs_pagevec_ctor *ctor, + enum z_erofs_page_type *type) +{ + erofs_vtptr_t t; + + if (unlikely(ctor->index >= ctor->nr)) { + DBG_BUGON(!ctor->next); + z_erofs_pagevec_ctor_pagedown(ctor, true); + } + + t = ctor->pages[ctor->index]; + + *type = tagptr_unfold_tags(t); + + /* should remind that collector->next never equal to 1, 2 */ + if (*type == (uintptr_t)ctor->next) + ctor->next = tagptr_unfold_ptr(t); + + ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, NULL, 0); + return tagptr_unfold_ptr(t); +} +#endif + -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: gaoxiang25@huawei.com (Gao Xiang) Subject: [PATCH v3 18/24] erofs: introduce pagevec for decompression subsystem Date: Mon, 22 Jul 2019 10:50:37 +0800 [thread overview] Message-ID: <20190722025043.166344-19-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190722025043.166344-1-gaoxiang25@huawei.com> For each physical cluster, there is a straight-forward way of allocating a fixed or variable-sized array to record the corresponding file pages for its decompression if we decide to decompress these pages asynchronously (eg. read-ahead case), however it will take variable-sized on-heap memory compared with traditional uncompressed filesystems. This patch introduces a pagevec solution to reuse some allocated file page in the time-sharing approach to store parts of the array itself in order to minimize the extra memory overhead, thus only a small-sized constant array used for booting the whole array itself up will be needed. Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com> --- fs/erofs/zpvec.h | 159 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 fs/erofs/zpvec.h diff --git a/fs/erofs/zpvec.h b/fs/erofs/zpvec.h new file mode 100644 index 000000000000..292aee36d380 --- /dev/null +++ b/fs/erofs/zpvec.h @@ -0,0 +1,159 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * linux/fs/erofs/zpvec.h + * + * Copyright (C) 2018 HUAWEI, Inc. + * http://www.huawei.com/ + * Created by Gao Xiang <gaoxiang25 at huawei.com> + */ +#ifndef __EROFS_ZPVEC_H +#define __EROFS_ZPVEC_H + +#include "tagptr.h" + +/* page type in pagevec for decompress subsystem */ +enum z_erofs_page_type { + /* including Z_EROFS_VLE_PAGE_TAIL_EXCLUSIVE */ + Z_EROFS_PAGE_TYPE_EXCLUSIVE, + + Z_EROFS_VLE_PAGE_TYPE_TAIL_SHARED, + + Z_EROFS_VLE_PAGE_TYPE_HEAD, + Z_EROFS_VLE_PAGE_TYPE_MAX +}; + +extern void __compiletime_error("Z_EROFS_PAGE_TYPE_EXCLUSIVE != 0") + __bad_page_type_exclusive(void); + +/* pagevec tagged pointer */ +typedef tagptr2_t erofs_vtptr_t; + +/* pagevec collector */ +struct z_erofs_pagevec_ctor { + struct page *curr, *next; + erofs_vtptr_t *pages; + + unsigned int nr, index; +}; + +static inline void z_erofs_pagevec_ctor_exit(struct z_erofs_pagevec_ctor *ctor, + bool atomic) +{ + if (!ctor->curr) + return; + + if (atomic) + kunmap_atomic(ctor->pages); + else + kunmap(ctor->curr); +} + +static inline struct page * +z_erofs_pagevec_ctor_next_page(struct z_erofs_pagevec_ctor *ctor, + unsigned int nr) +{ + unsigned int index; + + /* keep away from occupied pages */ + if (ctor->next) + return ctor->next; + + for (index = 0; index < nr; ++index) { + const erofs_vtptr_t t = ctor->pages[index]; + const unsigned int tags = tagptr_unfold_tags(t); + + if (tags == Z_EROFS_PAGE_TYPE_EXCLUSIVE) + return tagptr_unfold_ptr(t); + } + DBG_BUGON(nr >= ctor->nr); + return NULL; +} + +static inline void +z_erofs_pagevec_ctor_pagedown(struct z_erofs_pagevec_ctor *ctor, + bool atomic) +{ + struct page *next = z_erofs_pagevec_ctor_next_page(ctor, ctor->nr); + + z_erofs_pagevec_ctor_exit(ctor, atomic); + + ctor->curr = next; + ctor->next = NULL; + ctor->pages = atomic ? + kmap_atomic(ctor->curr) : kmap(ctor->curr); + + ctor->nr = PAGE_SIZE / sizeof(struct page *); + ctor->index = 0; +} + +static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor, + unsigned int nr, + erofs_vtptr_t *pages, + unsigned int i) +{ + ctor->nr = nr; + ctor->curr = ctor->next = NULL; + ctor->pages = pages; + + if (i >= nr) { + i -= nr; + z_erofs_pagevec_ctor_pagedown(ctor, false); + while (i > ctor->nr) { + i -= ctor->nr; + z_erofs_pagevec_ctor_pagedown(ctor, false); + } + } + ctor->next = z_erofs_pagevec_ctor_next_page(ctor, i); + ctor->index = i; +} + +static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor, + struct page *page, + enum z_erofs_page_type type, + bool *occupied) +{ + *occupied = false; + if (unlikely(!ctor->next && type)) + if (ctor->index + 1 == ctor->nr) + return false; + + if (unlikely(ctor->index >= ctor->nr)) + z_erofs_pagevec_ctor_pagedown(ctor, false); + + /* exclusive page type must be 0 */ + if (Z_EROFS_PAGE_TYPE_EXCLUSIVE != (uintptr_t)NULL) + __bad_page_type_exclusive(); + + /* should remind that collector->next never equal to 1, 2 */ + if (type == (uintptr_t)ctor->next) { + ctor->next = page; + *occupied = true; + } + ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type); + return true; +} + +static inline struct page * +z_erofs_pagevec_dequeue(struct z_erofs_pagevec_ctor *ctor, + enum z_erofs_page_type *type) +{ + erofs_vtptr_t t; + + if (unlikely(ctor->index >= ctor->nr)) { + DBG_BUGON(!ctor->next); + z_erofs_pagevec_ctor_pagedown(ctor, true); + } + + t = ctor->pages[ctor->index]; + + *type = tagptr_unfold_tags(t); + + /* should remind that collector->next never equal to 1, 2 */ + if (*type == (uintptr_t)ctor->next) + ctor->next = tagptr_unfold_ptr(t); + + ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, NULL, 0); + return tagptr_unfold_ptr(t); +} +#endif + -- 2.17.1
next prev parent reply other threads:[~2019-07-22 2:51 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-22 2:50 [PATCH v3 00/24] erofs: promote erofs from staging Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 01/24] erofs: add on-disk layout Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 3:26 ` Stephen Rothwell 2019-07-22 3:26 ` Stephen Rothwell 2019-07-22 3:26 ` Stephen Rothwell 2019-07-22 3:29 ` Gao Xiang 2019-07-22 3:29 ` Gao Xiang 2019-07-22 5:05 ` Greg Kroah-Hartman 2019-07-22 5:05 ` Greg Kroah-Hartman 2019-07-22 5:24 ` Gao Xiang 2019-07-22 5:24 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 02/24] erofs: add erofs in-memory stuffs Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 03/24] erofs: add super block operations Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 04/24] erofs: add raw address_space operations Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 05/24] erofs: add inode operations Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 06/24] erofs: support special inode Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 07/24] erofs: add directory operations Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 08/24] erofs: add namei functions Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 09/24] erofs: support tracepoint Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 10/24] erofs: update Kconfig and Makefile Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 11/24] erofs: introduce xattr & posixacl support Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 12/24] erofs: introduce tagged pointer Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 4:39 ` Amir Goldstein 2019-07-22 4:39 ` Amir Goldstein 2019-07-22 5:01 ` Gao Xiang 2019-07-22 5:01 ` Gao Xiang 2019-07-22 6:16 ` Amir Goldstein 2019-07-22 6:16 ` Amir Goldstein 2019-07-22 6:31 ` Gao Xiang 2019-07-22 6:31 ` Gao Xiang 2019-07-22 14:40 ` Steven Rostedt 2019-07-22 14:40 ` Steven Rostedt 2019-07-22 15:33 ` Gao Xiang 2019-07-22 15:33 ` Gao Xiang 2019-07-22 16:35 ` Steven Rostedt 2019-07-22 16:35 ` Steven Rostedt 2019-07-22 16:52 ` Gao Xiang 2019-07-22 16:52 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 13/24] erofs: add compression indexes support Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 14/24] erofs: introduce superblock registration Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 15/24] erofs: introduce erofs shrinker Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 16/24] erofs: introduce workstation for decompression Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 17/24] erofs: introduce per-CPU buffers implementation Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` Gao Xiang [this message] 2019-07-22 2:50 ` [PATCH v3 18/24] erofs: introduce pagevec for decompression subsystem Gao Xiang 2019-07-22 2:50 ` [PATCH v3 19/24] erofs: add erofs_allocpage() Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 20/24] erofs: introduce generic decompression backend Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 21/24] erofs: introduce LZ4 decompression inplace Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 22/24] erofs: introduce the decompression frontend Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 23/24] erofs: introduce cached decompression Gao Xiang 2019-07-22 2:50 ` Gao Xiang 2019-07-22 10:18 ` David Sterba 2019-07-22 10:18 ` David Sterba 2019-07-22 10:58 ` Gao Xiang 2019-07-22 10:58 ` Gao Xiang 2019-07-22 13:25 ` Theodore Y. Ts'o 2019-07-22 13:25 ` Theodore Y. Ts'o 2019-07-22 14:16 ` Gao Xiang 2019-07-22 14:16 ` Gao Xiang 2019-07-22 15:12 ` Theodore Y. Ts'o 2019-07-22 15:12 ` Theodore Y. Ts'o 2019-07-22 16:27 ` Gao Xiang 2019-07-22 16:27 ` Gao Xiang 2019-07-23 12:31 ` David Sterba 2019-07-23 12:31 ` David Sterba 2019-07-23 13:30 ` Gao Xiang 2019-07-23 13:30 ` Gao Xiang 2019-07-22 2:50 ` [PATCH v3 24/24] erofs: add document Gao Xiang 2019-07-22 2:50 ` 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=20190722025043.166344-19-gaoxiang25@huawei.com \ --to=gaoxiang25@huawei.com \ --cc=akpm@linux-foundation.org \ --cc=bluce.liguifu@huawei.com \ --cc=devel@driverdev.osuosl.org \ --cc=fangwei1@huawei.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-erofs@lists.ozlabs.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=miaoxie@huawei.com \ --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.