From: Chao Yu <yuchao0@huawei.com>
To: Gao Xiang <gaoxiang25@huawei.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<devel@driverdev.osuosl.org>
Cc: <linux-erofs@lists.ozlabs.org>,
LKML <linux-kernel@vger.kernel.org>, <weidu.du@huawei.com>,
Miao Xie <miaoxie@huawei.com>
Subject: Re: [PATCH 13/22] staging: erofs: kill CONFIG_EROFS_FS_USE_VM_MAP_RAM
Date: Wed, 31 Jul 2019 16:27:07 +0800 [thread overview]
Message-ID: <20868d59-a563-a14c-7dca-8e2a15bdb9d6@huawei.com> (raw)
In-Reply-To: <20190729065159.62378-14-gaoxiang25@huawei.com>
On 2019/7/29 14:51, Gao Xiang wrote:
> Turn into a module parameter ("use_vmap") as it
> can be set at runtime.
>
> Suggested-by: David Sterba <dsterba@suse.cz>
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
> ---
> drivers/staging/erofs/Kconfig | 8 ------
> drivers/staging/erofs/decompressor.c | 37 +++++++++++++++-------------
> 2 files changed, 20 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/staging/erofs/Kconfig b/drivers/staging/erofs/Kconfig
> index 747e9eebfaa5..788beebf3f7d 100644
> --- a/drivers/staging/erofs/Kconfig
> +++ b/drivers/staging/erofs/Kconfig
> @@ -63,14 +63,6 @@ config EROFS_FS_SECURITY
>
> If you are not using a security module, say N.
>
> -config EROFS_FS_USE_VM_MAP_RAM
> - bool "EROFS VM_MAP_RAM Support"
> - depends on EROFS_FS
> - help
> - use vm_map_ram/vm_unmap_ram instead of vmap/vunmap.
> -
> - If you don't know what these are, say N.
> -
> config EROFS_FAULT_INJECTION
> bool "EROFS fault injection facility"
> depends on EROFS_FS
> diff --git a/drivers/staging/erofs/decompressor.c b/drivers/staging/erofs/decompressor.c
> index 744c43a456e9..5352a50981cb 100644
> --- a/drivers/staging/erofs/decompressor.c
> +++ b/drivers/staging/erofs/decompressor.c
> @@ -7,6 +7,7 @@
> * Created by Gao Xiang <gaoxiang25@huawei.com>
> */
> #include "compress.h"
> +#include <linux/module.h>
> #include <linux/lz4.h>
>
> #ifndef LZ4_DISTANCE_MAX /* history window size */
> @@ -29,6 +30,10 @@ struct z_erofs_decompressor {
> char *name;
> };
>
> +static bool use_vmap;
> +module_param(use_vmap, bool, 0444);
> +MODULE_PARM_DESC(use_vmap, "Use vmap() instead of vm_map_ram() (default 0)");
This should be documented in erofs.txt simply.
> +
> static int lz4_prepare_destpages(struct z_erofs_decompress_req *rq,
> struct list_head *pagepool)
> {
> @@ -219,29 +224,27 @@ static void copy_from_pcpubuf(struct page **out, const char *dst,
>
> static void *erofs_vmap(struct page **pages, unsigned int count)
> {
> -#ifdef CONFIG_EROFS_FS_USE_VM_MAP_RAM
> - int i = 0;
> -
> - while (1) {
> - void *addr = vm_map_ram(pages, count, -1, PAGE_KERNEL);
> - /* retry two more times (totally 3 times) */
> - if (addr || ++i >= 3)
> - return addr;
> - vm_unmap_aliases();
> + if (!use_vmap) {
Minor thing.
if (use_vmap)
return vmap(pages, count, VM_MAP, PAGE_KERNEL);
while (1) {
}
return NULL;
Otherwise, it looks good to me.
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Thanks,
> + int i = 0;
> +
> + while (1) {
> + void *addr = vm_map_ram(pages, count, -1, PAGE_KERNEL);
> + /* retry two more times (totally 3 times) */
> + if (addr || ++i >= 3)
> + return addr;
> + vm_unmap_aliases();
> + }
> + return NULL;
> }
> - return NULL;
> -#else
> return vmap(pages, count, VM_MAP, PAGE_KERNEL);
> -#endif
> }
>
> static void erofs_vunmap(const void *mem, unsigned int count)
> {
> -#ifdef CONFIG_EROFS_FS_USE_VM_MAP_RAM
> - vm_unmap_ram(mem, count);
> -#else
> - vunmap(mem);
> -#endif
> + if (!use_vmap)
> + vm_unmap_ram(mem, count);
> + else
> + vunmap(mem);
> }
>
> static int decompress_generic(struct z_erofs_decompress_req *rq,
>
next prev parent reply other threads:[~2019-07-31 8:27 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 6:51 [PATCH 00/22] staging: erofs: updates according to erofs-outofstaging v4 Gao Xiang
2019-07-29 6:51 ` [PATCH 01/22] staging: erofs: update source file headers Gao Xiang
2019-07-30 7:20 ` Greg Kroah-Hartman
2019-07-30 7:26 ` Gao Xiang
2019-07-31 6:36 ` Chao Yu
2019-07-29 6:51 ` [PATCH 02/22] staging: erofs: rename source files for better understanding Gao Xiang
2019-07-31 6:43 ` Chao Yu
2019-07-29 6:51 ` [PATCH 03/22] staging: erofs: fix dummy functions erofs_{get,list}xattr Gao Xiang
2019-07-31 6:44 ` [PATCH 03/22] staging: erofs: fix dummy functions erofs_{get, list}xattr Chao Yu
2019-07-29 6:51 ` [PATCH 04/22] staging: erofs: keep up erofs_fs.h with erofs-outofstaging patchset Gao Xiang
2019-07-31 6:46 ` Chao Yu
2019-07-29 6:51 ` [PATCH 05/22] staging: erofs: sunset erofs_workstn_{lock,unlock} Gao Xiang
2019-07-31 6:49 ` Chao Yu
2019-07-29 6:51 ` [PATCH 06/22] staging: erofs: clean up internal.h Gao Xiang
2019-07-31 6:53 ` Chao Yu
2019-07-29 6:51 ` [PATCH 07/22] staging: erofs: remove redundant #include "internal.h" Gao Xiang
2019-07-31 7:03 ` Chao Yu
2019-07-31 7:08 ` Gao Xiang
2019-07-31 12:07 ` Chao Yu
2019-07-31 12:54 ` Gao Xiang
2019-08-01 1:31 ` Chao Yu
2019-07-29 6:51 ` [PATCH 08/22] staging: erofs: kill CONFIG_EROFS_FS_IO_MAX_RETRIES Gao Xiang
2019-07-31 7:05 ` Chao Yu
2019-07-31 7:11 ` Gao Xiang
2019-07-31 12:10 ` Chao Yu
2019-07-31 12:55 ` Gao Xiang
2019-07-29 6:51 ` [PATCH 09/22] staging: erofs: clean up shrinker stuffs Gao Xiang
2019-07-31 7:41 ` Chao Yu
2019-07-29 6:51 ` [PATCH 10/22] staging: erofs: kill sbi->dev_name Gao Xiang
2019-07-31 7:46 ` Chao Yu
2019-07-29 6:51 ` [PATCH 11/22] staging: erofs: kill all failure handling in fill_super() Gao Xiang
2019-07-31 8:15 ` Chao Yu
2019-07-31 12:52 ` Gao Xiang
2019-07-29 6:51 ` [PATCH 12/22] staging: erofs: refine erofs_allocpage() Gao Xiang
2019-07-31 8:20 ` Chao Yu
2019-07-29 6:51 ` [PATCH 13/22] staging: erofs: kill CONFIG_EROFS_FS_USE_VM_MAP_RAM Gao Xiang
2019-07-31 8:27 ` Chao Yu [this message]
2019-07-29 6:51 ` [PATCH 14/22] staging: erofs: tidy up zpvec.h Gao Xiang
2019-07-31 8:28 ` Chao Yu
2019-07-29 6:51 ` [PATCH 15/22] staging: erofs: remove redundant braces in inode.c Gao Xiang
2019-07-31 8:29 ` Chao Yu
2019-07-29 6:51 ` [PATCH 16/22] staging: erofs: tidy up decompression frontend Gao Xiang
2019-07-31 9:07 ` Chao Yu
2019-07-29 6:51 ` [PATCH 17/22] staging: erofs: remove clusterbits in sbi Gao Xiang
2019-07-31 9:12 ` Chao Yu
2019-07-29 6:51 ` [PATCH 18/22] staging: erofs: turn cache strategies into mount options Gao Xiang
2019-07-31 9:23 ` Chao Yu
2019-07-29 6:51 ` [PATCH 19/22] staging: erofs: tidy up utils.c Gao Xiang
2019-07-31 9:24 ` Chao Yu
2019-07-29 6:51 ` [PATCH 20/22] staging: erofs: tidy up internal.h Gao Xiang
2019-07-31 9:25 ` Chao Yu
2019-07-29 6:51 ` [PATCH 21/22] staging: erofs: update super.c Gao Xiang
2019-07-31 9:40 ` Chao Yu
2019-07-29 6:51 ` [PATCH 22/22] staging: erofs: update Kconfig Gao Xiang
2019-07-31 9:44 ` 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=20868d59-a563-a14c-7dca-8e2a15bdb9d6@huawei.com \
--to=yuchao0@huawei.com \
--cc=devel@driverdev.osuosl.org \
--cc=gaoxiang25@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miaoxie@huawei.com \
--cc=weidu.du@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
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).