From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9960C4361B for ; Fri, 4 Dec 2020 08:09:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E7FF22573 for ; Fri, 4 Dec 2020 08:09:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728925AbgLDIJO (ORCPT ); Fri, 4 Dec 2020 03:09:14 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:9377 "EHLO szxga07-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726122AbgLDIJO (ORCPT ); Fri, 4 Dec 2020 03:09:14 -0500 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4CnQLV3P6wz782X; Fri, 4 Dec 2020 16:08:02 +0800 (CST) Received: from DESKTOP-8N3QUD5.china.huawei.com (10.67.101.227) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.487.0; Fri, 4 Dec 2020 16:08:24 +0800 From: Guohua Zhong To: CC: , , , , , , , , , Subject: ping: [PATCH v2] phram: Allow the user to set the erase page size. Date: Fri, 4 Dec 2020 16:08:21 +0800 Message-ID: <20201204080821.46868-1-zhongguohua1@huawei.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20201125071132.39988-1-zhongguohua1@huawei.com> References: <20201125071132.39988-1-zhongguohua1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.101.227] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ping On 11/25/20, Guohua Zhong wrote: > Permit the user to specify the erase page size as a parameter. > This solves two problems: > > - phram can access images made by mkfs.jffs2. mkfs.jffs2 won't > create images with erase sizes less than 8KiB; many architectures > define PAGE_SIZE as 4KiB. > > - Allows more effective use of small capacity devices. JFFS2 > needs somewhere between 2 and 5 empty pages for garbage collection; > and for an NVRAM part with only 32KiB of space, a smaller erase page > allows much better utilization in applications where garbage collection > is important. > > Signed-off-by: Patrick O'Grady > Reviewed-by: Joern Engel > Link: https://lore.kernel.org/lkml/CAJ7m5OqYv_=JB9NhHsqBsa8YU0DFRoP7C+W10PY22wonAGJK=A@mail.gmail.com/ > [Guohua Zhong: fix token array index out of bounds and update patch for kernel master branch] > Signed-off-by: Guohua Zhong > Reported-by: kernel test robot > > ------- > v2: > fix build error which is reported by kernel test robot > > v1: https://lore.kernel.org/lkml/20201124061053.10812-1-zhongguohua1@huawei.com/ > 1.fix token array index out of bounds > 2.update patch for kernel master branch > --- > drivers/mtd/devices/phram.c | 52 +++++++++++++++++++++++++++++---------------- > 1 file changed, 34 insertions(+), 18 deletions(-) > > diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c > index 087b5e86d1bf..1729b94b2abf 100644 > --- a/drivers/mtd/devices/phram.c > +++ b/drivers/mtd/devices/phram.c > @@ -6,14 +6,14 @@ > * Usage: > * > * one commend line parameter per device, each in the form: > - * phram=,, > + * phram=,,[,] > * may be up to 63 characters. > - * and can be octal, decimal or hexadecimal. If followed > + * , , and can be octal, decimal or hexadecimal. If followed > * by "ki", "Mi" or "Gi", the numbers will be interpreted as kilo, mega or > - * gigabytes. > + * gigabytes. is optional and defaults to PAGE_SIZE. > * > * Example: > - * phram=swap,64Mi,128Mi phram=test,900Mi,1Mi > + * phram=swap,64Mi,128Mi phram=test,900Mi,1Mi,64Ki > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > > struct phram_mtd_list { > struct mtd_info mtd; > @@ -88,7 +89,7 @@ static void unregister_devices(void) > } > } > > -static int register_device(char *name, phys_addr_t start, size_t len) > +static int register_device(char *name, phys_addr_t start, size_t len, uint32_t erasesize) > { > struct phram_mtd_list *new; > int ret = -ENOMEM; > @@ -115,7 +116,7 @@ static int register_device(char *name, phys_addr_t start, size_t len) > new->mtd._write = phram_write; > new->mtd.owner = THIS_MODULE; > new->mtd.type = MTD_RAM; > - new->mtd.erasesize = PAGE_SIZE; > + new->mtd.erasesize = erasesize; > new->mtd.writesize = 1; > > ret = -EAGAIN; > @@ -204,22 +205,23 @@ static inline void kill_final_newline(char *str) > static int phram_init_called; > /* > * This shall contain the module parameter if any. It is of the form: > - * - phram=,
, for module case > - * - phram.phram=,
, for built-in case > - * We leave 64 bytes for the device name, 20 for the address and 20 for the > - * size. > - * Example: phram.phram=rootfs,0xa0000000,512Mi > + * - phram=,
,[,] for module case > + * - phram.phram=,
,[,] for built-in case > + * We leave 64 bytes for the device name, 20 for the address , 20 for the > + * size and 20 for the erasesize. > + * Example: phram.phram=rootfs,0xa0000000,512Mi,65536 > */ > -static char phram_paramline[64 + 20 + 20]; > +static char phram_paramline[64 + 20 + 20 + 20]; > #endif > > static int phram_setup(const char *val) > { > - char buf[64 + 20 + 20], *str = buf; > - char *token[3]; > + char buf[64 + 20 + 20 + 20], *str = buf; > + char *token[4]; > char *name; > uint64_t start; > uint64_t len; > + uint64_t erasesize = PAGE_SIZE; > int i, ret; > > if (strnlen(val, sizeof(buf)) >= sizeof(buf)) > @@ -228,7 +230,7 @@ static int phram_setup(const char *val) > strcpy(str, val); > kill_final_newline(str); > > - for (i = 0; i < 3; i++) > + for (i = 0; i < 4; i++) > token[i] = strsep(&str, ","); > > if (str) > @@ -253,11 +255,25 @@ static int phram_setup(const char *val) > goto error; > } > > - ret = register_device(name, start, len); > + if (token[3]) { > + ret = parse_num64(&erasesize, token[3]); > + if (ret) { > + parse_err("illegal erasesize\n"); > + goto error; > + } > + } > + > + if (len == 0 || erasesize == 0 || erasesize > len > + || erasesize > UINT_MAX || do_div(len, (uint32_t)erasesize) != 0) { > + parse_err("illegal erasesize or len\n"); > + goto error; > + } > + > + ret = register_device(name, start, len, (uint32_t)erasesize); > if (ret) > goto error; > > - pr_info("%s device: %#llx at %#llx\n", name, len, start); > + pr_info("%s device: %#llx at %#llx for erasesize %#llx\n", name, len, start, erasesize); > return 0; > > error: > @@ -298,7 +314,7 @@ static int phram_param_call(const char *val, const struct kernel_param *kp) > } > > module_param_call(phram, phram_param_call, NULL, NULL, 0200); > -MODULE_PARM_DESC(phram, "Memory region to map. \"phram=,,\""); > +MODULE_PARM_DESC(phram, "Memory region to map. \"phram=,,[,]\""); > > > static int __init init_phram(void) > -- > 2.12.3