From: Christoph Hellwig <hch@lst.de>
To: Minwoo Im <minwoo.im.dev@gmail.com>,
Keith Busch <kbusch@kernel.org>, Sagi Grimberg <sagi@grimberg.me>
Cc: Kanchan Joshi <joshiiitr@gmail.com>,
Javier Gonz??lez <javier.gonz@samsung.com>,
linux-nvme@lists.infradead.org
Subject: [PATCH 07/13] nvme: don't bother to look up a namespace for controller ioctls
Date: Thu, 8 Apr 2021 14:08:36 +0200 [thread overview]
Message-ID: <20210408120842.1450092-8-hch@lst.de> (raw)
In-Reply-To: <20210408120842.1450092-1-hch@lst.de>
Don't bother to look up a namespace just to drop if after retreiving the
controller for the multipath case. Just look up a live controller for
the subsystem directly.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/nvme/host/core.c | 66 +++++++++++++++++++++++++---------------
1 file changed, 42 insertions(+), 24 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index edf7d7fc8e4bbb..75e230dcbfef06 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2336,42 +2336,60 @@ static void nvme_ns_head_release(struct gendisk *disk, fmode_t mode)
nvme_put_ns_head(disk->private_data);
}
-static int nvme_ns_head_ctrl_ioctl(struct nvme_ns *ns, unsigned int cmd,
- void __user *argp, struct nvme_ns_head *head, int srcu_idx)
+static struct nvme_ctrl *nvme_find_get_live_ctrl(struct nvme_subsystem *subsys)
{
- struct nvme_ctrl *ctrl = ns->ctrl;
+ struct nvme_ctrl *ctrl;
int ret;
- nvme_get_ctrl(ns->ctrl);
- nvme_put_ns_from_disk(head, srcu_idx);
- ret = nvme_ctrl_ioctl(ns->ctrl, cmd, argp);
+ ret = mutex_lock_killable(&nvme_subsystems_lock);
+ if (ret)
+ return ERR_PTR(ret);
+ list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry) {
+ if (ctrl->state == NVME_CTRL_LIVE)
+ goto found;
+ }
+ mutex_unlock(&nvme_subsystems_lock);
+ return ERR_PTR(-EWOULDBLOCK);
+found:
+ nvme_get_ctrl(ctrl);
+ mutex_unlock(&nvme_subsystems_lock);
+ return ctrl;
+}
+
+static int nvme_ns_head_ctrl_ioctl(struct nvme_ns_head *head,
+ unsigned int cmd, void __user *argp)
+{
+ struct nvme_ctrl *ctrl = nvme_find_get_live_ctrl(head->subsys);
+ int ret;
+
+ if (IS_ERR(ctrl))
+ return PTR_ERR(ctrl);
+ ret = nvme_ctrl_ioctl(ctrl, cmd, argp);
nvme_put_ctrl(ctrl);
return ret;
}
+static int nvme_ns_head_ns_ioctl(struct nvme_ns_head *head,
+ unsigned int cmd, void __user *argp)
+{
+ int srcu_idx = srcu_read_lock(&head->srcu);
+ struct nvme_ns *ns = nvme_find_path(head);
+ int ret = -EWOULDBLOCK;
+
+ if (ns)
+ ret = nvme_ns_ioctl(ns, cmd, argp);
+ srcu_read_unlock(&head->srcu, srcu_idx);
+ return ret;
+}
+
static int nvme_ns_head_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
- struct nvme_ns_head *head = NULL;
- void __user *argp = (void __user *)arg;
- struct nvme_ns *ns;
- int srcu_idx, ret;
-
- ns = nvme_get_ns_from_disk(bdev->bd_disk, &head, &srcu_idx);
- if (unlikely(!ns))
- return -EWOULDBLOCK;
+ struct nvme_ns_head *head = bdev->bd_disk->private_data;
- /*
- * Handle ioctls that apply to the controller instead of the namespace
- * seperately and drop the ns SRCU reference early. This avoids a
- * deadlock when deleting namespaces using the passthrough interface.
- */
if (is_ctrl_ioctl(cmd))
- return nvme_ns_head_ctrl_ioctl(ns, cmd, argp, head, srcu_idx);
-
- ret = nvme_ns_ioctl(ns, cmd, argp);
- nvme_put_ns_from_disk(head, srcu_idx);
- return ret;
+ return nvme_ns_head_ctrl_ioctl(head, cmd, (void __user *)arg);
+ return nvme_ns_head_ns_ioctl(head, cmd, (void __user *)arg);
}
const struct block_device_operations nvme_ns_head_ops = {
--
2.30.1
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-04-08 12:20 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20210408121108eucas1p1fb60de8498a7461b453295497c206246@eucas1p1.samsung.com>
2021-04-08 12:08 ` nvme ioctl refactor and generic per-namespace char device Christoph Hellwig
2021-04-08 12:08 ` [PATCH 01/13] nvme: add a nvme_ns_head_multipath helper Christoph Hellwig
2021-04-09 2:33 ` Chaitanya Kulkarni
2021-04-08 12:08 ` [PATCH 02/13] nvme: cleanup setting the disk name Christoph Hellwig
2021-04-08 12:08 ` [PATCH 03/13] nvme: pass a user pointer to nvme_nvm_ioctl Christoph Hellwig
2021-04-08 12:08 ` [PATCH 04/13] nvme: factor out a nvme_ns_ioctl helper Christoph Hellwig
2021-04-09 2:40 ` Chaitanya Kulkarni
2021-04-08 12:08 ` [PATCH 05/13] nvme: simplify the compat ioctl handling Christoph Hellwig
2021-04-09 2:42 ` Chaitanya Kulkarni
2021-04-09 5:39 ` Christoph Hellwig
2021-04-08 12:08 ` [PATCH 06/13] nvme: simplify block device ioctl handling for the !multipath case Christoph Hellwig
2021-04-08 12:08 ` Christoph Hellwig [this message]
2021-04-08 12:08 ` [PATCH 08/13] nvme: move the ioctl code to a separate file Christoph Hellwig
2021-04-09 2:45 ` Chaitanya Kulkarni
2021-04-08 12:08 ` [PATCH 09/13] nvme: factor out a nvme_tryget_ns_head helper Christoph Hellwig
2021-04-09 2:46 ` Chaitanya Kulkarni
2021-04-09 5:39 ` Christoph Hellwig
2021-04-09 5:40 ` Chaitanya Kulkarni
2021-04-09 9:18 ` Kanchan Joshi
2021-04-09 9:49 ` Christoph Hellwig
2021-04-08 12:08 ` [PATCH 10/13] nvme: move nvme_ns_head_ops to multipath.c Christoph Hellwig
2021-04-09 2:47 ` Chaitanya Kulkarni
2021-04-08 12:08 ` [PATCH 11/13] nvme: factor out nvme_ns_open and nvme_ns_release helpers Christoph Hellwig
2021-04-09 2:48 ` Chaitanya Kulkarni
2021-04-08 12:08 ` [PATCH 12/13] nvme: let namespace probing continue for unsupported features Christoph Hellwig
2021-04-08 22:42 ` Keith Busch
2021-04-09 5:39 ` Christoph Hellwig
2021-04-09 5:47 ` Keith Busch
2021-04-09 5:53 ` Christoph Hellwig
2021-04-08 12:08 ` [PATCH 13/13] nvme: introduce generic per-namespace chardev Christoph Hellwig
2021-04-08 16:56 ` Keith Busch
2021-04-08 17:00 ` Christoph Hellwig
2021-04-09 6:14 ` Christoph Hellwig
2021-04-09 14:29 ` Keith Busch
2021-04-09 14:35 ` Christoph Hellwig
2021-04-09 7:29 ` Minwoo Im
2021-04-09 7:54 ` Christoph Hellwig
2021-04-09 8:02 ` Minwoo Im
2021-04-09 9:52 ` Christoph Hellwig
2021-04-09 11:24 ` Minwoo Im
2021-04-12 7:44 ` Christoph Hellwig
2021-04-12 11:52 ` Javier Gonz??lez
2021-04-08 22:43 ` nvme ioctl refactor and generic per-namespace char device Keith Busch
2021-04-09 17:45 ` Javier Gonz??lez
2021-04-10 6:46 ` Christoph Hellwig
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=20210408120842.1450092-8-hch@lst.de \
--to=hch@lst.de \
--cc=javier.gonz@samsung.com \
--cc=joshiiitr@gmail.com \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=minwoo.im.dev@gmail.com \
--cc=sagi@grimberg.me \
/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).