From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Chris Zankel <chris@zankel.net>,
Max Filippov <jcmvbkbc@gmail.com>,
Philipp Reisner <philipp.reisner@linbit.com>,
Lars Ellenberg <lars.ellenberg@linbit.com>,
Jim Paris <jim@jtan.com>,
Joshua Morris <josh.h.morris@us.ibm.com>,
Philip Kelleher <pjk1939@linux.ibm.com>,
Minchan Kim <minchan@kernel.org>, Nitin Gupta <ngupta@vflare.org>,
Matias Bjorling <mb@lightnvm.io>, Coly Li <colyli@suse.de>,
Mike Snitzer <snitzer@redhat.com>, Song Liu <song@kernel.org>,
Maxim Levitsky <maximlevitsky@gmail.com>,
Alex Dubov <oakad@yahoo.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>
Cc: linux-block@vger.kernel.org, dm-devel@redhat.com,
linux-m68k@lists.linux-m68k.org, linux-xtensa@linux-xtensa.org,
drbd-dev@lists.linbit.com, linuxppc-dev@lists.ozlabs.org,
linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org,
linux-mmc@vger.kernel.org, nvdimm@lists.linux.dev,
linux-nvme@lists.infradead.org, linux-s390@vger.kernel.org
Subject: [PATCH 05/26] block: add blk_alloc_disk and blk_cleanup_disk APIs
Date: Fri, 21 May 2021 07:50:55 +0200 [thread overview]
Message-ID: <20210521055116.1053587-6-hch@lst.de> (raw)
In-Reply-To: <20210521055116.1053587-1-hch@lst.de>
Add two new APIs to allocate and free a gendisk including the
request_queue for use with BIO based drivers. This is to avoid
boilerplate code in drivers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/genhd.c | 35 +++++++++++++++++++++++++++++++++++
include/linux/genhd.h | 22 ++++++++++++++++++++++
2 files changed, 57 insertions(+)
diff --git a/block/genhd.c b/block/genhd.c
index e4974af3d729..6d4ce962866d 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1302,6 +1302,25 @@ struct gendisk *__alloc_disk_node(int minors, int node_id)
}
EXPORT_SYMBOL(__alloc_disk_node);
+struct gendisk *__blk_alloc_disk(int node)
+{
+ struct request_queue *q;
+ struct gendisk *disk;
+
+ q = blk_alloc_queue(node);
+ if (!q)
+ return NULL;
+
+ disk = __alloc_disk_node(0, node);
+ if (!disk) {
+ blk_cleanup_queue(q);
+ return NULL;
+ }
+ disk->queue = q;
+ return disk;
+}
+EXPORT_SYMBOL(__blk_alloc_disk);
+
/**
* put_disk - decrements the gendisk refcount
* @disk: the struct gendisk to decrement the refcount for
@@ -1319,6 +1338,22 @@ void put_disk(struct gendisk *disk)
}
EXPORT_SYMBOL(put_disk);
+/**
+ * blk_cleanup_disk - shutdown a gendisk allocated by blk_alloc_disk
+ * @disk: gendisk to shutdown
+ *
+ * Mark the queue hanging off @disk DYING, drain all pending requests, then mark
+ * the queue DEAD, destroy and put it and the gendisk structure.
+ *
+ * Context: can sleep
+ */
+void blk_cleanup_disk(struct gendisk *disk)
+{
+ blk_cleanup_queue(disk->queue);
+ put_disk(disk);
+}
+EXPORT_SYMBOL(blk_cleanup_disk);
+
static void set_disk_ro_uevent(struct gendisk *gd, int ro)
{
char event[] = "DISK_RO=1";
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index a5443f0b139d..03aa12730634 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -278,6 +278,28 @@ extern void put_disk(struct gendisk *disk);
#define alloc_disk(minors) alloc_disk_node(minors, NUMA_NO_NODE)
+/**
+ * blk_alloc_disk - allocate a gendisk structure
+ * @node_id: numa node to allocate on
+ *
+ * Allocate and pre-initialize a gendisk structure for use with BIO based
+ * drivers.
+ *
+ * Context: can sleep
+ */
+#define blk_alloc_disk(node_id) \
+({ \
+ struct gendisk *__disk = __blk_alloc_disk(node_id); \
+ static struct lock_class_key __key; \
+ \
+ if (__disk) \
+ lockdep_init_map(&__disk->lockdep_map, \
+ "(bio completion)", &__key, 0); \
+ __disk; \
+})
+struct gendisk *__blk_alloc_disk(int node);
+void blk_cleanup_disk(struct gendisk *disk);
+
int __register_blkdev(unsigned int major, const char *name,
void (*probe)(dev_t devt));
#define register_blkdev(major, name) \
--
2.30.2
next prev parent reply other threads:[~2021-05-21 5:51 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 5:50 simplify gendisk and request_queue allocation for bio based drivers Christoph Hellwig
2021-05-21 5:50 ` [PATCH 01/26] block: refactor device number setup in __device_add_disk Christoph Hellwig
2021-05-21 17:16 ` [dm-devel] " Luis Chamberlain
2021-05-24 7:20 ` Christoph Hellwig
2021-05-23 7:46 ` Hannes Reinecke
2021-05-24 7:22 ` Christoph Hellwig
2021-05-21 5:50 ` [PATCH 02/26] block: move the DISK_MAX_PARTS sanity check into __device_add_disk Christoph Hellwig
2021-05-21 17:18 ` [dm-devel] " Luis Chamberlain
2021-05-23 7:48 ` Hannes Reinecke
2021-05-21 5:50 ` [PATCH 03/26] block: automatically enable GENHD_FL_EXT_DEVT Christoph Hellwig
2021-05-21 17:22 ` [dm-devel] " Luis Chamberlain
2021-05-23 7:50 ` Hannes Reinecke
2021-05-21 5:50 ` [PATCH 04/26] block: add a flag to make put_disk on partially initalized disks safer Christoph Hellwig
2021-05-21 17:28 ` [dm-devel] " Luis Chamberlain
2021-05-23 7:54 ` Hannes Reinecke
2021-05-21 5:50 ` Christoph Hellwig [this message]
2021-05-21 17:44 ` [dm-devel] [PATCH 05/26] block: add blk_alloc_disk and blk_cleanup_disk APIs Luis Chamberlain
2021-05-24 7:24 ` Christoph Hellwig
2021-05-23 7:55 ` Hannes Reinecke
2021-05-21 5:50 ` [PATCH 06/26] brd: convert to blk_alloc_disk/blk_cleanup_disk Christoph Hellwig
2021-05-23 7:58 ` Hannes Reinecke
2021-05-24 7:24 ` Christoph Hellwig
2021-05-21 5:50 ` [PATCH 07/26] drbd: " Christoph Hellwig
2021-05-23 7:59 ` Hannes Reinecke
2021-05-21 5:50 ` [PATCH 08/26] pktcdvd: " Christoph Hellwig
2021-05-23 8:00 ` Hannes Reinecke
2021-05-21 5:50 ` [PATCH 09/26] rsxx: " Christoph Hellwig
2021-05-23 8:01 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 10/26] zram: " Christoph Hellwig
2021-05-23 8:01 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 11/26] lightnvm: " Christoph Hellwig
2021-05-23 8:02 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 12/26] bcache: " Christoph Hellwig
2021-05-21 6:15 ` Coly Li
2021-05-21 6:23 ` Christoph Hellwig
2021-05-23 16:19 ` Coly Li
2021-05-23 8:04 ` Hannes Reinecke
2021-05-23 16:20 ` Coly Li
2021-05-21 5:51 ` [PATCH 13/26] dm: " Christoph Hellwig
2021-05-23 8:10 ` Hannes Reinecke
2021-05-24 7:25 ` Christoph Hellwig
2021-05-21 5:51 ` [PATCH 14/26] md: " Christoph Hellwig
2021-05-23 8:12 ` Hannes Reinecke
2021-05-24 7:26 ` Christoph Hellwig
2021-05-24 8:27 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 15/26] nvdimm-blk: " Christoph Hellwig
2021-05-23 8:13 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 16/26] nvdimm-btt: " Christoph Hellwig
2021-05-23 8:14 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 17/26] nvdimm-pmem: " Christoph Hellwig
2021-05-23 8:14 ` Hannes Reinecke
2021-06-07 4:43 ` Dan Williams
2021-05-21 5:51 ` [PATCH 18/26] nvme-multipath: " Christoph Hellwig
2021-05-23 8:20 ` Hannes Reinecke
2021-05-24 7:29 ` Christoph Hellwig
2021-05-21 5:51 ` [PATCH 19/26] nfblock: " Christoph Hellwig
2021-05-21 8:37 ` Geert Uytterhoeven
2021-05-23 8:21 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 20/26] simdisk: " Christoph Hellwig
2021-05-23 8:22 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 21/26] n64cart: convert to blk_alloc_disk Christoph Hellwig
2021-05-23 8:22 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 22/26] ps3vram: convert to blk_alloc_disk/blk_cleanup_disk Christoph Hellwig
2021-05-23 8:23 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 23/26] dcssblk: " Christoph Hellwig
2021-05-23 8:23 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 24/26] xpram: " Christoph Hellwig
2021-05-23 8:24 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 25/26] null_blk: " Christoph Hellwig
2021-05-23 8:25 ` Hannes Reinecke
2021-05-21 5:51 ` [PATCH 26/26] block: unexport blk_alloc_queue Christoph Hellwig
2021-05-23 8:26 ` Hannes Reinecke
2021-05-25 22:41 ` simplify gendisk and request_queue allocation for bio based drivers Ulf Hansson
2021-05-26 4:49 ` Christoph Hellwig
2021-05-26 8:07 ` Ulf Hansson
2021-06-01 13:48 ` 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=20210521055116.1053587-6-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=borntraeger@de.ibm.com \
--cc=chris@zankel.net \
--cc=colyli@suse.de \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=geert@linux-m68k.org \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=jim@jtan.com \
--cc=josh.h.morris@us.ibm.com \
--cc=lars.ellenberg@linbit.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maximlevitsky@gmail.com \
--cc=mb@lightnvm.io \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
--cc=nvdimm@lists.linux.dev \
--cc=oakad@yahoo.com \
--cc=philipp.reisner@linbit.com \
--cc=pjk1939@linux.ibm.com \
--cc=snitzer@redhat.com \
--cc=song@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=vishal.l.verma@intel.com \
/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).