From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Denis Efremov <efremov@linux.com>,
"David S. Miller" <davem@davemloft.net>,
Song Liu <song@kernel.org>, Al Viro <viro@zeniv.linux.org.uk>,
Finn Thain <fthain@telegraphics.com.au>,
Michael Schmitz <schmitzmic@gmail.com>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-ide@vger.kernel.org, linux-raid@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 08/18] sd: use __register_blkdev to avoid a modprobe for an unregistered dev_t
Date: Thu, 29 Oct 2020 15:58:31 +0100 [thread overview]
Message-ID: <20201029145841.144173-9-hch@lst.de> (raw)
In-Reply-To: <20201029145841.144173-1-hch@lst.de>
Switch from using blk_register_region to the probe callback passed to
__register_blkdev to disable the request_module call for an unclaimed
dev_t in the SD majors.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/sd.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 656bcf4940d6d1..106a9cda0eb7ed 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -630,13 +630,11 @@ static struct scsi_driver sd_template = {
};
/*
- * Dummy kobj_map->probe function.
- * The default ->probe function will call modprobe, which is
- * pointless as this module is already loaded.
+ * Don't request a new module, as that could deadlock in multipath
+ * environment.
*/
-static struct kobject *sd_default_probe(dev_t devt, int *partno, void *data)
+static void sd_default_probe(dev_t devt)
{
- return NULL;
}
/*
@@ -3528,9 +3526,6 @@ static int sd_remove(struct device *dev)
free_opal_dev(sdkp->opal_dev);
- blk_register_region(devt, SD_MINORS, NULL,
- sd_default_probe, NULL, NULL);
-
mutex_lock(&sd_ref_mutex);
dev_set_drvdata(dev, NULL);
put_device(&sdkp->dev);
@@ -3720,11 +3715,9 @@ static int __init init_sd(void)
SCSI_LOG_HLQUEUE(3, printk("init_sd: sd driver entry point\n"));
for (i = 0; i < SD_MAJORS; i++) {
- if (register_blkdev(sd_major(i), "sd") != 0)
+ if (__register_blkdev(sd_major(i), "sd", sd_default_probe))
continue;
majors++;
- blk_register_region(sd_major(i), SD_MINORS, NULL,
- sd_default_probe, NULL, NULL);
}
if (!majors)
@@ -3797,10 +3790,8 @@ static void __exit exit_sd(void)
class_unregister(&sd_disk_class);
- for (i = 0; i < SD_MAJORS; i++) {
- blk_unregister_region(sd_major(i), SD_MINORS);
+ for (i = 0; i < SD_MAJORS; i++)
unregister_blkdev(sd_major(i), "sd");
- }
}
module_init(init_sd);
--
2.28.0
next prev parent reply other threads:[~2020-10-29 15:18 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 14:58 simplify gendisk lookup and remove struct block_device aliases v4 Christoph Hellwig
2020-10-29 14:58 ` [PATCH 01/18] block: cleanup del_gendisk a bit Christoph Hellwig
2020-10-29 14:58 ` [PATCH 02/18] block: open code kobj_map into in block/genhd.c Christoph Hellwig
2020-10-29 19:22 ` Greg Kroah-Hartman
2020-10-29 19:32 ` Christoph Hellwig
2020-10-30 10:40 ` Greg Kroah-Hartman
2020-10-30 10:49 ` Geert Uytterhoeven
2020-10-30 11:06 ` Greg Kroah-Hartman
2020-10-31 8:53 ` Christoph Hellwig
2020-10-29 14:58 ` [PATCH 03/18] block: split block_class_lock Christoph Hellwig
2020-10-29 14:58 ` [PATCH 04/18] block: rework requesting modules for unclaimed devices Christoph Hellwig
2020-10-29 14:58 ` [PATCH 05/18] block: add an optional probe callback to major_names Christoph Hellwig
2020-10-29 14:58 ` [PATCH 06/18] ide: remove ide_{,un}register_region Christoph Hellwig
2020-10-29 14:58 ` [PATCH 07/18] swim: don't call blk_register_region Christoph Hellwig
2020-10-29 14:58 ` Christoph Hellwig [this message]
2020-10-30 2:13 ` [PATCH 08/18] sd: use __register_blkdev to avoid a modprobe for an unregistered dev_t Martin K. Petersen
2020-10-29 14:58 ` [PATCH 09/18] brd: use __register_blkdev to allocate devices on demand Christoph Hellwig
2020-10-29 14:58 ` [PATCH 10/18] loop: " Christoph Hellwig
2020-10-29 14:58 ` [PATCH 11/18] md: " Christoph Hellwig
2020-10-29 14:58 ` [PATCH 12/18] ide: switch to __register_blkdev for command set probing Christoph Hellwig
2020-10-29 14:58 ` [PATCH 13/18] floppy: use a separate gendisk for each media format Christoph Hellwig
2020-10-29 14:58 ` [PATCH 14/18] amiflop: use separate gendisks for Amiga vs MS-DOS mode Christoph Hellwig
2020-10-29 14:58 ` [PATCH 15/18] ataflop: use a separate gendisk for each media format Christoph Hellwig
2020-10-29 14:58 ` [PATCH 16/18] z2ram: reindent Christoph Hellwig
2020-10-29 14:58 ` [PATCH 17/18] z2ram: use separate gendisk for the different modes Christoph Hellwig
2020-10-30 0:11 ` [PATCH] z2ram: MODULE_LICENSE update and neatening Joe Perches
2020-10-30 1:01 ` James Bottomley
2020-10-30 1:23 ` Joe Perches
2020-10-29 14:58 ` [PATCH 18/18] block: switch gendisk lookup to a simple xarray Christoph Hellwig
2020-11-11 7:57 ` simplify gendisk lookup and remove struct block_device aliases v4 Christoph Hellwig
2020-11-11 16:17 ` 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=20201029145841.144173-9-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=efremov@linux.com \
--cc=fthain@telegraphics.com.au \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=schmitzmic@gmail.com \
--cc=song@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).