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 21/46] mtd: nandsim: Implement preliminary destructor function
Date: Wed, 21 Sep 2016 11:51:13 +0200 [thread overview]
Message-ID: <356f6bc6e887873e0011722a67a9436779013084.1474450296.git.dwalter@sigma-star.at> (raw)
In-Reply-To: <cover.1474450295.git.dwalter@sigma-star.at>
From: Richard Weinberger <richard@nod.at>
This function will be used via ioctl() to remove nandsim instances.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
drivers/mtd/nand/nandsim.c | 81 +++++++++++++++++++++++++++++++++++++++++++--
include/linux/mtd/nandsim.h | 2 +-
2 files changed, 79 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 344f5c4..bac3fde 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -39,6 +39,7 @@
#include <linux/mtd/nandsim.h>
#include <linux/delay.h>
#include <linux/list.h>
+#include <linux/spinlock.h>
#include <linux/random.h>
#include <linux/sched.h>
#include <linux/fs.h>
@@ -328,7 +329,10 @@ struct ns_file_data {
*/
struct nandsim {
unsigned int index;
+ unsigned int refcnt;
+ spinlock_t refcnt_lock;
struct mtd_partition partitions[CONFIG_NANDSIM_MAX_PARTS];
+ bool destroying;
unsigned int nbparts;
uint busw; /* flash chip bus width (8 or 16) */
@@ -2509,6 +2513,41 @@ static int ns_ctrl_new_instance(struct ns_new_instance_req *req)
return ns->index;
}
+static int ns_ctrl_destroy_instance(struct ns_destroy_instance_req *req)
+{
+ struct mtd_info *nsmtd;
+ int id = req->id, ret = 0;
+ struct nand_chip *chip;
+ struct nandsim *ns;
+
+ if (id < 0 || id >= NS_MAX_DEVICES)
+ return -EINVAL;
+
+ mutex_lock(&ns_mtd_mutex);
+ nsmtd = ns_mtds[id];
+ if (nsmtd) {
+ chip = mtd_to_nand(nsmtd);
+ ns = nand_get_controller_data(chip);
+ spin_lock(&ns->refcnt_lock);
+ if (ns->refcnt > 0) {
+ ret = -EBUSY;
+ spin_unlock(&ns->refcnt_lock);
+ goto out;
+ }
+ ns->destroying = true;
+ spin_unlock(&ns->refcnt_lock);
+ ret = ns_destroy_instance(nsmtd);
+ if (ret)
+ goto out;
+ ns_mtds[id] = NULL;
+ }
+
+out:
+ mutex_unlock(&ns_mtd_mutex);
+
+ return ret;
+}
+
static long ns_ctrl_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
@@ -2543,6 +2582,32 @@ static struct miscdevice nandsim_ctrl_cdev = {
.fops = &nansim_ctrl_fops,
};
+static void ns_put_device(struct mtd_info *mtd)
+{
+ struct nand_chip *chip = mtd_to_nand(mtd);
+ struct nandsim *ns = nand_get_controller_data(chip);
+
+ spin_lock(&ns->refcnt_lock);
+ ns->refcnt -= 1;
+ spin_unlock(&ns->refcnt_lock);
+}
+
+static int ns_get_device(struct mtd_info *mtd)
+{
+ int ret = 0;
+ struct nand_chip *chip = mtd_to_nand(mtd);
+ struct nandsim *ns = nand_get_controller_data(chip);
+
+ spin_lock(&ns->refcnt_lock);
+ if (ns->destroying)
+ ret = -EBUSY;
+ else
+ ns->refcnt += 1;
+ spin_unlock(&ns->refcnt_lock);
+
+ return ret;
+}
+
struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
{
struct nand_chip *chip;
@@ -2587,6 +2652,7 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
INIT_LIST_HEAD(&nand->grave_pages);
INIT_LIST_HEAD(&nand->weak_pages);
INIT_LIST_HEAD(&nand->weak_blocks);
+ spin_lock_init(&nand->refcnt_lock);
/*
* Register simulator's callbacks.
@@ -2637,6 +2703,8 @@ struct mtd_info *ns_new_instance(struct nandsim_params *nsparam)
}
nsmtd->owner = THIS_MODULE;
+ nsmtd->_get_device = ns_get_device;
+ nsmtd->_put_device = ns_put_device;
if ((retval = parse_weakblocks(nand, nsparam->weakblocks)) != 0)
goto error;
@@ -2750,11 +2818,16 @@ error:
}
EXPORT_SYMBOL_GPL(ns_new_instance);
-void ns_destroy_instance(struct mtd_info *nsmtd)
+int ns_destroy_instance(struct mtd_info *nsmtd)
{
+ int i, ret;
struct nand_chip *chip = mtd_to_nand(nsmtd);
struct nandsim *ns = nand_get_controller_data(chip);
- int i;
+
+ ret = mtd_device_unregister(nsmtd);
+ if (ret)
+ return ret;
+ nand_cleanup(nsmtd);
nandsim_debugfs_remove(ns);
free_lists(ns);
@@ -2763,6 +2836,8 @@ void ns_destroy_instance(struct mtd_info *nsmtd)
for (i = 0;i < ARRAY_SIZE(ns->partitions); ++i)
kfree(ns->partitions[i].name);
kfree(mtd_to_nand(nsmtd)); /* Free other structures */
+
+ return 0;
}
EXPORT_SYMBOL_GPL(ns_destroy_instance);
@@ -2773,7 +2848,7 @@ static void ns_destroy_all(void)
mutex_lock(&ns_mtd_mutex);
for (i = 0; i < NS_MAX_DEVICES; i++)
if (ns_mtds[i])
- ns_destroy_instance(ns_mtds[i]);
+ WARN_ON(ns_destroy_instance(ns_mtds[i]) != 0);
mutex_unlock(&ns_mtd_mutex);
}
diff --git a/include/linux/mtd/nandsim.h b/include/linux/mtd/nandsim.h
index 6e3b4a2..a0ca0fb 100644
--- a/include/linux/mtd/nandsim.h
+++ b/include/linux/mtd/nandsim.h
@@ -75,7 +75,7 @@ struct ns_backend_ops {
};
struct mtd_info *ns_new_instance(struct nandsim_params *nsparam);
-void ns_destroy_instance(struct mtd_info *nsmtd);
+int ns_destroy_instance(struct mtd_info *nsmtd);
struct nandsim_geom *nandsim_get_geom(struct nandsim *ns);
struct nandsim_regs *nandsim_get_regs(struct nandsim *ns);
void nandsim_set_backend_data(struct nandsim *ns, void *data);
--
2.8.3
next prev parent reply other threads:[~2016-09-21 9:51 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 ` Daniel Walter [this message]
2016-09-21 12:56 ` [PATCH v2 21/46] mtd: nandsim: Implement preliminary destructor function 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 ` [PATCH v2 39/46] mtd: nandsim: Rework init error paths Daniel Walter
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=356f6bc6e887873e0011722a67a9436779013084.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).