From: Luis Chamberlain <mcgrof@kernel.org> To: axboe@kernel.dk, colyli@suse.de, kent.overstreet@gmail.com, kbusch@kernel.org, sagi@grimberg.me, vishal.l.verma@intel.com, dan.j.williams@intel.com, dave.jiang@intel.com, ira.weiny@intel.com, konrad.wilk@oracle.com, roger.pau@citrix.com, boris.ostrovsky@oracle.com, jgross@suse.com, sstabellini@kernel.org, minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org Cc: xen-devel@lists.xenproject.org, nvdimm@lists.linux.dev, linux-nvme@lists.infradead.org, linux-bcache@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain <mcgrof@kernel.org> Subject: [PATCH v2 03/10] nvme-multipath: add error handling support for add_disk() Date: Mon, 27 Sep 2021 15:00:32 -0700 [thread overview] Message-ID: <20210927220039.1064193-4-mcgrof@kernel.org> (raw) In-Reply-To: <20210927220039.1064193-1-mcgrof@kernel.org> We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. Since we now can tell for sure when a disk was added, move setting the bit NVME_NSHEAD_DISK_LIVE only when we did add the disk successfully. Nothing to do here as the cleanup is done elsewhere. We take care and use test_and_set_bit() because it is protects against two nvme paths simultaneously calling device_add_disk() on the same namespace head. Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/nvme/host/multipath.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index e8ccdd398f78..35cace4f3f5f 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -496,13 +496,22 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) static void nvme_mpath_set_live(struct nvme_ns *ns) { struct nvme_ns_head *head = ns->head; + int rc; if (!head->disk) return; + /* + * test_and_set_bit() is used because it is protecting against two nvme + * paths simultaneously calling device_add_disk() on the same namespace + * head. + */ if (!test_and_set_bit(NVME_NSHEAD_DISK_LIVE, &head->flags)) { - device_add_disk(&head->subsys->dev, head->disk, - nvme_ns_id_attr_groups); + rc = device_add_disk(&head->subsys->dev, head->disk, + nvme_ns_id_attr_groups); + if (rc) + return; + set_bit(NVME_NSHEAD_DISK_LIVE, &head->flags); nvme_add_ns_head_cdev(head); } -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Luis Chamberlain <mcgrof@kernel.org> To: axboe@kernel.dk, colyli@suse.de, kent.overstreet@gmail.com, kbusch@kernel.org, sagi@grimberg.me, vishal.l.verma@intel.com, dan.j.williams@intel.com, dave.jiang@intel.com, ira.weiny@intel.com, konrad.wilk@oracle.com, roger.pau@citrix.com, boris.ostrovsky@oracle.com, jgross@suse.com, sstabellini@kernel.org, minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org Cc: xen-devel@lists.xenproject.org, nvdimm@lists.linux.dev, linux-nvme@lists.infradead.org, linux-bcache@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain <mcgrof@kernel.org> Subject: [PATCH v2 03/10] nvme-multipath: add error handling support for add_disk() Date: Mon, 27 Sep 2021 15:00:32 -0700 [thread overview] Message-ID: <20210927220039.1064193-4-mcgrof@kernel.org> (raw) In-Reply-To: <20210927220039.1064193-1-mcgrof@kernel.org> We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. Since we now can tell for sure when a disk was added, move setting the bit NVME_NSHEAD_DISK_LIVE only when we did add the disk successfully. Nothing to do here as the cleanup is done elsewhere. We take care and use test_and_set_bit() because it is protects against two nvme paths simultaneously calling device_add_disk() on the same namespace head. Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/nvme/host/multipath.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index e8ccdd398f78..35cace4f3f5f 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -496,13 +496,22 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) static void nvme_mpath_set_live(struct nvme_ns *ns) { struct nvme_ns_head *head = ns->head; + int rc; if (!head->disk) return; + /* + * test_and_set_bit() is used because it is protecting against two nvme + * paths simultaneously calling device_add_disk() on the same namespace + * head. + */ if (!test_and_set_bit(NVME_NSHEAD_DISK_LIVE, &head->flags)) { - device_add_disk(&head->subsys->dev, head->disk, - nvme_ns_id_attr_groups); + rc = device_add_disk(&head->subsys->dev, head->disk, + nvme_ns_id_attr_groups); + if (rc) + return; + set_bit(NVME_NSHEAD_DISK_LIVE, &head->flags); nvme_add_ns_head_cdev(head); } -- 2.30.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-09-27 22:00 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-27 22:00 [PATCH v2 00/10] block: second batch of add_disk() error handling conversions Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:00 ` [PATCH v2 01/10] block/brd: add error handling support for add_disk() Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:00 ` [PATCH v2 02/10] bcache: " Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain [this message] 2021-09-27 22:00 ` [PATCH v2 03/10] nvme-multipath: " Luis Chamberlain 2021-09-27 22:13 ` Keith Busch 2021-09-27 22:13 ` Keith Busch 2021-09-28 5:39 ` Hannes Reinecke 2021-09-28 5:39 ` Hannes Reinecke 2021-09-27 22:00 ` [PATCH v2 04/10] nvdimm/btt: do not call del_gendisk() if not needed Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:00 ` [PATCH v2 05/10] nvdimm/btt: use goto error labels on btt_blk_init() Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:00 ` [PATCH v2 06/10] nvdimm/btt: add error handling support for add_disk() Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:00 ` [PATCH v2 07/10] nvdimm/blk: avoid calling del_gendisk() on early failures Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:00 ` [PATCH v2 08/10] nvdimm/blk: add error handling support for add_disk() Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:00 ` [PATCH v2 09/10] xen-blkfront: " Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-30 13:07 ` Juergen Gross 2021-09-30 13:07 ` Juergen Gross 2021-09-27 22:00 ` [PATCH v2 10/10] zram: " Luis Chamberlain 2021-09-27 22:00 ` Luis Chamberlain 2021-09-27 22:33 ` [PATCH v2 00/10] block: second batch of add_disk() error handling conversions Jens Axboe 2021-09-27 22:33 ` Jens Axboe
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=20210927220039.1064193-4-mcgrof@kernel.org \ --to=mcgrof@kernel.org \ --cc=axboe@kernel.dk \ --cc=boris.ostrovsky@oracle.com \ --cc=colyli@suse.de \ --cc=dan.j.williams@intel.com \ --cc=dave.jiang@intel.com \ --cc=ira.weiny@intel.com \ --cc=jgross@suse.com \ --cc=kbusch@kernel.org \ --cc=kent.overstreet@gmail.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-bcache@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=minchan@kernel.org \ --cc=ngupta@vflare.org \ --cc=nvdimm@lists.linux.dev \ --cc=roger.pau@citrix.com \ --cc=sagi@grimberg.me \ --cc=senozhatsky@chromium.org \ --cc=sstabellini@kernel.org \ --cc=vishal.l.verma@intel.com \ --cc=xen-devel@lists.xenproject.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.