From: Daniel Walter <dwalter@sigma-star.at>
To: linux-mtd@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, computersforpeace@gmail.com,
dwmw2@infradead.org, boris.brezillon@free-electrons.com,
Richard Weinberger <richard@nod.at>
Subject: [PATCH v2 39/46] mtd: nandsim: Rework init error paths
Date: Wed, 21 Sep 2016 11:56:18 +0200 [thread overview]
Message-ID: <ccd893f94447e771b3ca6b7b37d915f2520d07b0.1474450296.git.dwalter@sigma-star.at> (raw)
In-Reply-To: <cover.1474450295.git.dwalter@sigma-star.at>
From: Richard Weinberger <richard@nod.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
drivers/mtd/nand/nandsim.c | 97 +++++++++++++++++++++++++++-------------------
1 file changed, 57 insertions(+), 40 deletions(-)
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 6b7570b..92f5efc 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -871,12 +871,14 @@ static int init_nandsim(struct mtd_info *mtd, struct nandsim_params *nsparam)
if (!part_sz || part_sz > remains) {
pr_err("bad partition size.\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_names;
}
ns->partitions[i].name = get_partition_name(ns, i);
if (!ns->partitions[i].name) {
pr_err("unable to allocate memory.\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_names;
}
ns->partitions[i].offset = next_offset;
ns->partitions[i].size = part_sz;
@@ -887,12 +889,14 @@ static int init_nandsim(struct mtd_info *mtd, struct nandsim_params *nsparam)
if (remains) {
if (nsparam->parts_num + 1 > ARRAY_SIZE(ns->partitions)) {
pr_err("too many partitions.\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_names;
}
ns->partitions[i].name = get_partition_name(ns, i);
if (!ns->partitions[i].name) {
pr_err("unable to allocate memory.\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_names;
}
ns->partitions[i].offset = next_offset;
ns->partitions[i].size = remains;
@@ -921,22 +925,24 @@ static int init_nandsim(struct mtd_info *mtd, struct nandsim_params *nsparam)
ns->bops = nsparam->bops;
- pr_info("Using backend: %s\n", ns->bops->name);
- if ((ret = ns->bops->init(ns, nsparam)) != 0) {
- pr_err("Unable to initialize simulator backend: %i\n", ret);
- return ret;
- }
-
/* Allocate / initialize the internal buffer */
ns->buf.byte = kmalloc(ns->geom.pgszoob, GFP_KERNEL);
if (!ns->buf.byte) {
pr_err("unable to allocate %u bytes for the internal buffer\n",
ns->geom.pgszoob);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_buf;
}
memset(ns->buf.byte, 0xFF, ns->geom.pgszoob);
return 0;
+
+err_buf:
+ kfree(ns->buf.byte);
+err_names:
+ for (i = 0; i < ARRAY_SIZE(ns->partitions); i++)
+ kfree(ns->partitions[i].name);
+ return ret;
}
/*
@@ -944,8 +950,11 @@ static int init_nandsim(struct mtd_info *mtd, struct nandsim_params *nsparam)
*/
static void free_nandsim(struct nandsim *ns)
{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(ns->partitions); i++)
+ kfree(ns->partitions[i].name);
kfree(ns->buf.byte);
- ns->bops->destroy(ns);
}
static int parse_badblocks(struct nandsim *ns, struct mtd_info *mtd,
@@ -2751,7 +2760,7 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
pr_err("Cannot allocate more than %i instances!\n", NANDSIM_MAX_DEVICES);
retval = -ENFILE;
mutex_unlock(&ns_mtd_mutex);
- goto error;
+ goto err_chip;
}
nsmtd = ns_mtds[i] = nand_to_mtd(chip);
@@ -2789,7 +2798,7 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
default:
pr_err("bbt has to be 0..2\n");
retval = -EINVAL;
- goto error;
+ goto err_mtds;
}
/*
* Perform minimum nandsim structure initialization to handle
@@ -2817,13 +2826,13 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
nsmtd->_put_device = ns_put_device;
if ((retval = parse_weakblocks(nand, nsparam->weakblocks)) != 0)
- goto error;
+ goto err_lists;
if ((retval = parse_weakpages(nand, nsparam->weakpages)) != 0)
- goto error;
+ goto err_lists;
if ((retval = parse_gravepages(nand, nsparam->gravepages)) != 0)
- goto error;
+ goto err_lists;
nand->do_delays = nsparam->do_delays;
nand->access_delay = nsparam->access_delay;
@@ -2838,14 +2847,14 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
pr_err("cannot scan NAND Simulator device\n");
if (retval > 0)
retval = -ENXIO;
- goto error;
+ goto err_lists;
}
if (nsparam->no_oob) {
if (nsparam->bch) {
pr_err("Cannot use ECC without OOB\n");
retval = -EINVAL;
- goto error;
+ goto err_lists;
}
chip->ecc.mode = NAND_ECC_NONE;
@@ -2855,7 +2864,7 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
if (!mtd_nand_has_bch()) {
pr_err("BCH ECC support is disabled\n");
retval = -EINVAL;
- goto error;
+ goto err_lists;
}
/* use 512-byte ecc blocks */
eccsteps = nsmtd->writesize/512;
@@ -2864,12 +2873,12 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
if ((nsmtd->oobsize < 64) || !eccsteps) {
pr_err("bch not available on small page devices\n");
retval = -EINVAL;
- goto error;
+ goto err_lists;
}
if ((eccbytes*eccsteps+2) > nsmtd->oobsize) {
pr_err("invalid bch value %u\n", nsparam->bch);
retval = -EINVAL;
- goto error;
+ goto err_lists;
}
chip->ecc.mode = NAND_ECC_SOFT;
chip->ecc.algo = NAND_ECC_BCH;
@@ -2887,7 +2896,7 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
pr_err("can't register NAND Simulator\n");
if (retval > 0)
retval = -ENXIO;
- goto error;
+ goto err_lists;
}
if (nsparam->overridesize) {
@@ -2895,7 +2904,7 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
if (new_size >> nsparam->overridesize != nsmtd->erasesize) {
pr_err("overridesize is too big\n");
retval = -EINVAL;
- goto err_exit;
+ goto err_nand;
}
/* N.B. This relies on nand_scan not doing anything with the size before we change it */
nsmtd->size = new_size;
@@ -2905,35 +2914,45 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
}
if ((retval = setup_wear_reporting(nsmtd)) != 0)
- goto err_exit;
+ goto err_nand;
if ((retval = nandsim_debugfs_create(nand)) != 0)
- goto err_exit;
+ goto err_nand;
if ((retval = init_nandsim(nsmtd, nsparam)) != 0)
- goto err_exit;
+ goto err_debugfs;
+
+ pr_info("Using backend: %s\n", nand->bops->name);
+ if ((retval = nand->bops->init(nand, nsparam)) != 0) {
+ pr_err("Unable to initialize simulator backend: %i\n", retval);
+ goto err_nandsim;
+ }
if ((retval = chip->scan_bbt(nsmtd)) != 0)
- goto err_exit;
+ goto err_nandsim;
if ((retval = parse_badblocks(nand, nsmtd, nsparam->badblocks)) != 0)
- goto err_exit;
+ goto err_nandsim;
/* Register NAND partitions */
retval = mtd_device_register(nsmtd, &nand->partitions[0],
nand->nbparts);
if (retval != 0)
- goto err_exit;
+ goto err_nandsim;
return nsmtd;
-err_exit:
+err_nandsim:
free_nandsim(nand);
+err_debugfs:
+ nandsim_debugfs_remove(nand);
+err_nand:
nand_release(nsmtd);
- for (i = 0;i < ARRAY_SIZE(nand->partitions); ++i)
- kfree(nand->partitions[i].name);
-error:
+err_lists:
free_lists(nand);
+err_mtds:
+ ns_mtds[nand->index] = NULL;
+err_chip:
kfree(chip);
return ERR_PTR(retval);
@@ -2942,7 +2961,7 @@ EXPORT_SYMBOL_GPL(ns_new_instance);
int ns_destroy_instance(struct mtd_info *nsmtd)
{
- int i, ret;
+ int ret;
struct nand_chip *chip = mtd_to_nand(nsmtd);
struct nandsim *ns = nand_get_controller_data(chip);
@@ -2952,12 +2971,10 @@ int ns_destroy_instance(struct mtd_info *nsmtd)
nand_cleanup(nsmtd);
nandsim_debugfs_remove(ns);
+ ns->bops->destroy(ns);
+ free_nandsim(ns);
free_lists(ns);
- free_nandsim(ns); /* Free nandsim private resources */
- nand_release(nsmtd); /* Unregister driver */
- for (i = 0;i < ARRAY_SIZE(ns->partitions); ++i)
- kfree(ns->partitions[i].name);
- kfree(mtd_to_nand(nsmtd)); /* Free other structures */
+ kfree(chip);
return 0;
}
--
2.8.3
next prev parent reply other threads:[~2016-09-21 9:56 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-21 9:43 [PATCH v2 00/46] Nandsim facelift (part I of II) Daniel Walter
2016-09-21 9:43 ` [PATCH v2 01/46] mtdpart: Propagate _get/put_device() Daniel Walter
2016-09-21 10:15 ` Boris Brezillon
2016-09-28 20:16 ` Brian Norris
2016-12-14 19:24 ` Karl Beldan
2016-12-14 21:09 ` Brian Norris
2016-12-14 21:12 ` Richard Weinberger
2016-12-14 23:40 ` Brian Norris
2016-12-15 7:09 ` Karl Beldan
2016-12-15 7:51 ` Richard Weinberger
2016-12-28 18:53 ` Karl Beldan
2016-09-21 9:44 ` [PATCH v2 02/46] mtd: nand: Provide nand_cleanup() function to free NAND related resources Daniel Walter
2016-09-21 9:58 ` Boris Brezillon
2016-09-21 12:43 ` kbuild test robot
2016-09-21 14:25 ` Boris Brezillon
2016-09-21 14:38 ` Daniel Walter
2016-09-21 14:42 ` Boris Brezillon
2016-09-21 9:45 ` [PATCH v2 03/46] mtd: Don't unconditionally unregister reboot notifier Daniel Walter
2016-09-21 14:31 ` Boris Brezillon
2016-09-21 14:33 ` Daniel Walter
2016-10-09 5:20 ` Brian Norris
2016-09-21 9:45 ` [PATCH v2 04/46] mtd: Don't unconditionally execute remove notifiers Daniel Walter
2016-09-21 9:46 ` [PATCH v2 05/46] mtd: Don't print a scary message when trying to remove a busy MTD Daniel Walter
2016-09-21 9:46 ` [PATCH v2 06/46] mtd: nandsim: Add basic control file support Daniel Walter
2016-09-21 9:47 ` [PATCH v2 07/46] mtd: nandsim: Begin with removal of global state Daniel Walter
2016-09-21 9:47 ` [PATCH v2 08/46] mtd: nandsim: Kill global nsmtd Daniel Walter
2016-09-21 9:47 ` [PATCH v2 09/46] mtd: nandsim: Don't directly use module parameters Daniel Walter
2016-09-21 9:48 ` [PATCH v2 10/46] mtd: nandsim: Add helper functions for pointer magic Daniel Walter
2016-09-21 9:48 ` [PATCH v2 11/46] mtd: nandsim: Factor out nandsim parameters Daniel Walter
2016-09-21 9:48 ` [PATCH v2 12/46] mtd: nandsim: Make debugfs logic multi instance capable Daniel Walter
2016-09-21 9:49 ` [PATCH v2 13/46] mtd: nandsim: Add final logic for multiple instances Daniel Walter
2016-09-21 9:49 ` [PATCH v2 14/46] mtd: nandsim: Add simulator id to MTD parition name Daniel Walter
2016-09-21 9:49 ` [PATCH v2 15/46] mtd: nandsim: Introduce backend operations Daniel Walter
2016-09-21 9:49 ` [PATCH v2 16/46] mtd: nandsim: Print error when backend init failed Daniel Walter
2016-09-21 9:50 ` [PATCH v2 17/46] mtd: nandsim: Allow external backends Daniel Walter
2016-09-21 9:50 ` [PATCH v2 18/46] mtd: nandsim: Add basic support for a file backend Daniel Walter
2016-09-21 9:50 ` [PATCH v2 19/46] mtd: nandsim: UAPI v1 Daniel Walter
2016-11-20 10:13 ` Boris Brezillon
2016-09-21 9:51 ` [PATCH v2 20/46] mtd: nandsim: Implement preliminary constructor function Daniel Walter
2016-09-21 9:51 ` [PATCH v2 21/46] mtd: nandsim: Implement preliminary destructor function Daniel Walter
2016-09-21 12:56 ` kbuild test robot
2016-09-21 9:51 ` [PATCH v2 22/46] mtd: nandsim: Cleanup destroy handlers Daniel Walter
2016-09-21 9:51 ` [PATCH v2 23/46] mtd: nandsim: Unify file backend init logic Daniel Walter
2016-09-21 9:51 ` [PATCH v2 24/46] mtd: nandsim: Wire up NANDSIM_MODE_CACHEFILE ioctl mode Daniel Walter
2016-09-21 9:52 ` [PATCH v2 25/46] mtd: nandsim: Print backend name Daniel Walter
2016-09-21 9:52 ` [PATCH v2 26/46] mtd: nandsim: use the existing output macros Daniel Walter
2016-09-21 9:52 ` [PATCH v2 27/46] mtd: nandsim: Add no_oob mode Daniel Walter
2016-09-21 9:52 ` [PATCH v2 28/46] mtd: nandsim: Refine exports Daniel Walter
2016-09-21 9:54 ` [PATCH v2 29/46] um: Add nandsim backend driver Daniel Walter
2016-09-21 9:54 ` [PATCH v2 30/46] mtd: nandsim: Use pr_ style logging Daniel Walter
2016-09-21 9:54 ` [PATCH v2 31/46] mtd: nandsim: Remove NS_RAW_OFFSET_OOB Daniel Walter
2016-09-21 9:54 ` [PATCH v2 32/46] mtd: nandsim: Remove NS_IS_INITIALIZED Daniel Walter
2016-09-21 9:55 ` [PATCH v2 33/46] mtd: nandsim: Relax page size restrictions Daniel Walter
2016-09-21 9:55 ` [PATCH v2 34/46] mtd: nandsim: Support bitflip and read error emulation in file backend Daniel Walter
2016-09-21 9:55 ` [PATCH v2 35/46] mtd: nandsim: Make NANDSIM_MAX_DEVICES part of uapi Daniel Walter
2016-09-21 9:55 ` [PATCH v2 36/46] mtd: nandsim: Cleanup constants Daniel Walter
2016-09-21 9:55 ` [PATCH v2 37/46] mtd: nandsim: Turn parts[] into a integer Daniel Walter
2016-09-21 9:56 ` [PATCH v2 38/46] mtd: nandsim: Expose partition creation logic to user space Daniel Walter
2016-09-21 9:56 ` Daniel Walter [this message]
2016-09-21 9:56 ` [PATCH v2 40/46] mtd: nandsim: Expose BBT, delays, etc.. to userspace Daniel Walter
2016-09-21 9:56 ` [PATCH v2 41/46] mtd: nandsim: Expose support for weakpages/blocks " Daniel Walter
2016-09-21 9:57 ` [PATCH v2 42/46] mtd: nandsim: Don't printk on ENOMEM Daniel Walter
2016-09-21 9:57 ` [PATCH v2 43/46] mtd: nandsim: Wire up NANDSIM_IOC_NEW_INSTANCE Daniel Walter
2016-09-21 9:57 ` [PATCH v2 44/46] mtd: nandsim: Wire up NANDSIM_IOC_DESTROY_INSTANCE Daniel Walter
2016-09-21 9:57 ` [PATCH v2 45/46] mtd: nandsim: Always answer all 8 bytes from NAND_CMD_READID Daniel Walter
2016-09-21 9:57 ` [PATCH v2 46/46] mtd/nandsim: Add ioctl for info Daniel Walter
2016-10-16 16:24 ` [PATCH v2 00/46] Nandsim facelift (part I of II) Boris Brezillon
2016-11-14 16:24 ` Richard Weinberger
2016-11-20 10:26 ` Boris Brezillon
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=ccd893f94447e771b3ca6b7b37d915f2520d07b0.1474450296.git.dwalter@sigma-star.at \
--to=dwalter@sigma-star.at \
--cc=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/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).