From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bart Van Assche Subject: [PATCH] Fix a bdi reregistration race, v3 Date: Mon, 28 Mar 2016 14:29:19 -0700 Message-ID: <56F9A22F.7020002@sandisk.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-bn1on0074.outbound.protection.outlook.com ([157.56.110.74]:64592 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752252AbcC1V3m (ORCPT ); Mon, 28 Mar 2016 17:29:42 -0400 Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James Bottomley , "Martin K. Petersen" Cc: Christoph Hellwig , Hannes Reinecke , "linux-scsi@vger.kernel.org" Avoid that the sd driver registers a BDI device with a name that is still in use. This patch avoids that the following warning gets triggered: WARNING: CPU: 7 PID: 203 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x68/0x80() sysfs: cannot create duplicate filename '/devices/virtual/bdi/8:32' Workqueue: events_unbound async_run_entry_fn Call Trace: [] dump_stack+0x4c/0x65 [] warn_slowpath_common+0x8a/0xc0 [] warn_slowpath_fmt+0x46/0x50 [] sysfs_warn_dup+0x68/0x80 [] sysfs_create_dir_ns+0x7e/0x90 [] kobject_add_internal+0xa8/0x320 [] kobject_add+0x60/0xb0 [] device_add+0x107/0x5e0 [] device_create_groups_vargs+0xd8/0x100 [] device_create_vargs+0x1c/0x20 [] bdi_register+0x63/0x2a0 [] bdi_register_dev+0x27/0x30 [] add_disk+0x1a9/0x4e0 [] sd_probe_async+0x119/0x1d0 [sd_mod] [] async_run_entry_fn+0x4a/0x140 [] process_one_work+0x1d8/0x7c0 [] worker_thread+0x114/0x460 [] kthread+0xf8/0x110 [] ret_from_fork+0x3f/0x70 Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: --- drivers/scsi/scsi_sysfs.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 2b642b1..567f2a0 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1272,9 +1272,26 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) return error; } +static int scsi_return_dev(struct device *dev, void *data) +{ + struct device **childp = data; + + *childp = dev; + return 0; +} + +/* Caller must call put_device() if this function does not return NULL. */ +static struct device *scsi_get_child_dev(struct device *dev) +{ + struct device *child = NULL; + + device_for_each_child(dev, &child, scsi_return_dev); + return get_device(child); +} + void __scsi_remove_device(struct scsi_device *sdev) { - struct device *dev = &sdev->sdev_gendev; + struct device *dev = &sdev->sdev_gendev, *sdkp = NULL; /* * This cleanup path is not reentrant and while it is impossible @@ -1289,6 +1306,7 @@ void __scsi_remove_device(struct scsi_device *sdev) return; bsg_unregister_queue(sdev->request_queue); + sdkp = scsi_get_child_dev(dev); device_unregister(&sdev->sdev_dev); transport_remove_device(dev); scsi_dh_remove_device(sdev); @@ -1305,6 +1323,16 @@ void __scsi_remove_device(struct scsi_device *sdev) blk_cleanup_queue(sdev->request_queue); cancel_work_sync(&sdev->requeue_work); + /* + * blk_cleanup_queue() unregisters the BDI device. The name of the + * BDI device is derived from the dev_t of the /dev/sd device. + * Keep a reference to the /dev/sd device until the BDI device + * has been unregistered to avoid that a BDI device with the same + * name gets registered before blk_cleanup_queue() has finished. + */ + if (sdkp) + put_device(sdkp); + if (sdev->host->hostt->slave_destroy) sdev->host->hostt->slave_destroy(sdev); transport_destroy_device(dev); -- 2.7.3