block: skip media change event handling if unsupported
Subsystems (3)
v2 cover block: skip media change event handling if unsupported
The block layer currently can't distinguish between gendisk devices that don't support any media change events, and devices that do support them, but only for internal purposes. Therefore the check_events() function is called e.g. for ordinary non-removable SCSI disks. While these devices are not polled under normal conditions, the check_events function is called on certain synchronization points, in particular while the device is opened, closed, or probed.
Under unfavorable conditions this can lead to processes being stalled on a blocked queue: a close() schedules a work item for check_events() which gets blocked in the work queue, and subsequent open() tries to flush the workqueue. The flush then stalls too, as long as the the blocked work item can't finish.
In principle, the gendisk->events field would make it very easy for the block layer to check only for events actually supported by the device. Currently this is impossible, because there are lots of drivers which don't set gendisk->events although they implement the check_events() method. This was introduced in commit 7c88a168da80 ("block: don't propagate unlisted DISK_EVENTs to userland") and follow-up patches because uevent generation by these drivers was found to possibly generate infinite event loops between kernel and user space. A side effect of these patches was that the distinction between such devices and devices supporting no events at all was lost.
This series implements a slightly different approach to event handling and uevent suppression. The drivers are changed to set the events field again. Whether or not uevents should be generated is controlled by a separate flag bit, which is only set by the drivers that are known to generate proper uevents (sd and sr). Once this is done, devices that don't support any media change events can be clearly identified, and the whole events checking code path can be skipped. This simplifies handling of non-removable SCSI disks.
I have tested this with removable and non-removable SCSI disks, SCSI cdrom, and ide-cd.
This patch set targets the same problem as Hannes' late submission "sd:
skip non-removable devices in sd_check_events()".
Changes in v2:
Removed the unused async_events field from struct gendisk. This simplifies the event handling logic a bit.
Martin Wilck (5):
block: genhd: remove async_events field
block: disk_events: introduce event flags
Revert "ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd" Revert "block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe
drivers"
block: check_events: don't bother with events if unsupported
block/genhd.c | 51 ++++++++++++++++++++++---------------- drivers/block/amiflop.c | 1 + drivers/block/ataflop.c | 1 + drivers/block/floppy.c | 1 + drivers/block/paride/pcd.c | 1 + drivers/block/paride/pd.c | 1 + drivers/block/paride/pf.c | 1 + drivers/block/pktcdvd.c | 1 - drivers/block/swim.c | 1 + drivers/block/swim3.c | 1 + drivers/block/xsysace.c | 1 + drivers/cdrom/gdrom.c | 1 + drivers/ide/ide-cd.c | 1 + drivers/ide/ide-cd_ioctl.c | 5 ++-- drivers/ide/ide-gd.c | 6 +++-- drivers/scsi/sd.c | 3 ++- drivers/scsi/sr.c | 3 ++- include/linux/genhd.h | 8 +++++- 18 files changed, 59 insertions(+), 29 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/5 block: genhd: remove async_events field
The async_events field, intended to be used for drivers that support asynchronous notifications about disk events (aka media change events), isn't currently used by any driver, and apparently that has been that way for a long time (if not forever). Remove it.
--- block/genhd.c | 10 ++++------ drivers/block/pktcdvd.c | 1 - include/linux/genhd.h | 1 - 3 files changed, 4 insertions(+), 8 deletions(-)
block/genhd.c +4 -6
@@ -1626,12 +1626,11 @@ static unsigned long disk_events_poll_jiffies(struct gendisk *disk)/* * If device-specific poll interval is set, always use it. If -* the default is being used, poll iff there are events which -* can't be monitored asynchronously. +* the default is being used, poll if the POLL flag is set. */ if (ev->poll_msecs >=0 ) intv_msecs = ev->poll_msecs; -else if (disk->events & ~disk->async_events) +else if (disk->events) intv_msecs = disk_events_dfl_poll_msecs;return msecs_to_jiffies (intv_msecs);
@@ -1858,6 +1857,7 @@ static void disk_check_events(struct disk_events *ev,* * events : list of all supported events * events_async : list of events which can be detected w/o polling +* (always empty, only for backwards compatibility) * events_poll_msecs : polling interval, 0: disable, -1: system default */ static ssize_t __disk_events_show (unsigned int events,char *buf)
@@ -1888,9 +1888,7 @@ static ssize_t disk_events_show(struct device *dev,static ssize_t disk_events_async_show (struct device *dev,struct device_attribute *attr,char *buf) { -struct gendisk *disk =dev_to_disk (dev); - -return __disk_events_show (disk->async_events, buf); +return 0 ; } static ssize_t disk_events_poll_msecs_show(struct device *dev,
drivers/block/pktcdvd.c +0 -1
@@ -2761,7 +2761,6 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)/* inherit events of the host device */ disk->events = pd->bdev->bd_disk->events; - disk->async_events = pd->bdev->bd_disk->async_events;add_disk (disk);
include/linux/genhd.h +0 -1
@@ -185,7 +185,6 @@ struct gendisk {char *(*devnode)(struct gendisk *gd,umode_t *mode);unsigned int events;/* supported events */ -unsigned int async_events;/* async events, subset of all */ /* Array of pointers to partitions indexed by partno. * Protected with matching bdev lock but stat and other
Signature · 1 line
2.20.1
PATCH v2 2/5 block: disk_events: introduce event flags
In reply to Martin WilckCurrently, an empty disk->events field tells the block layer not to forward media change events to user space. This was done in
commit 7c88a168da80 ("block: don't propagate unlisted DISK_EVENTs to userland") in order to avoid events from "fringe" drivers to be forwarded to user space. By doing so, the block layer lost the information which events were supported by a particular block device, and most importantly, whether or not a given device supports media change events at all.
Prepare for not interpreting the "events" field this way in the future any more. This is done by adding two flag bits that can be set to have the device treated like one that has the "events" field set to a non-zero value before. This applies only to the sd and sr drivers, which are changed to set the new flags.
The new flags are DISK_EVENT_FLAG_POLL to enforce polling of the device for synchronous events, and DISK_EVENT_FLAG_UEVENT to tell the blocklayer to generate udev events from kernel events. They can easily be fit in the int reserved for event bits.
This patch doesn't change behavior.
--- block/genhd.c | 15 ++++++++++----- drivers/scsi/sd.c | 3 ++- drivers/scsi/sr.c | 3 ++- include/linux/genhd.h | 7 +++++++ 4 files changed, 21 insertions(+), 7 deletions(-)
block/genhd.c +10 -5
@@ -1630,7 +1630,7 @@ static unsigned long disk_events_poll_jiffies(struct gendisk *disk)*/ if (ev->poll_msecs >=0 ) intv_msecs = ev->poll_msecs; -else if (disk->events) +else if (disk->events &DISK_EVENT_FLAG_POLL ) intv_msecs = disk_events_dfl_poll_msecs;return msecs_to_jiffies (intv_msecs);
@@ -1840,11 +1840,13 @@ static void disk_check_events(struct disk_events *ev,/* * Tell userland about new events. Only the events listed in -* @disk->events are reported. Unlisted events are processed the -* same internally but never get reported to userland. +* @disk->events are reported, and only if DISK_EVENT_FLAG_UEVENT +* is set. Otherwise, events are processed internally but never +* get reported to userland. */ for (i =0 ; i <ARRAY_SIZE (disk_uevents); i++) -if (events & disk->events & (1 << i)) +if (events & disk->events & (1 << i) && + disk->events &DISK_EVENT_FLAG_UEVENT ) envp[nr_events++] = disk_uevents[i];if (nr_events)
@@ -1882,7 +1884,10 @@ static ssize_t disk_events_show(struct device *dev, {struct gendisk *disk =dev_to_disk (dev); -return __disk_events_show (disk->events, buf); +if (!(disk->events &DISK_EVENT_FLAG_UEVENT )) +return 0 ; + +return __disk_events_show (disk->events &DISK_EVENT_TYPES_MASK , buf); } static ssize_t disk_events_async_show(struct device *dev,
drivers/scsi/sd.c +2 -1
@@ -3262,7 +3262,8 @@ static void sd_probe_async(void *data, async_cookie_t cookie) gd->flags =GENHD_FL_EXT_DEVT ;if (sdp->removable) { gd->flags |=GENHD_FL_REMOVABLE ; - gd->events |=DISK_EVENT_MEDIA_CHANGE ; + gd->events |=DISK_EVENT_MEDIA_CHANGE | +DISK_EVENT_FLAG_POLL |DISK_EVENT_FLAG_UEVENT ; }blk_pm_runtime_init (sdp->request_queue, dev);
drivers/scsi/sr.c +2 -1
@@ -716,7 +716,8 @@ static int sr_probe(struct device *dev)sprintf (disk->disk_name,"sr%d" , minor); disk->fops = &sr_bdops; disk->flags =GENHD_FL_CD |GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE ; - disk->events =DISK_EVENT_MEDIA_CHANGE |DISK_EVENT_EJECT_REQUEST ; + disk->events =DISK_EVENT_MEDIA_CHANGE |DISK_EVENT_EJECT_REQUEST + |DISK_EVENT_FLAG_POLL |DISK_EVENT_FLAG_UEVENT ;blk_queue_rq_timeout (sdev->request_queue,SR_TIMEOUT );
include/linux/genhd.h +7 -0
@@ -148,8 +148,15 @@ struct hd_struct {enum {DISK_EVENT_MEDIA_CHANGE =1 <<0 ,/* media changed */ DISK_EVENT_EJECT_REQUEST =1 <<1 ,/* eject requested */ +/* Poll even if events_poll_msecs is unset */ +DISK_EVENT_FLAG_POLL =1 <<16 , +/* Forward events to udev */ +DISK_EVENT_FLAG_UEVENT =1 <<17 , }; +#define DISK_EVENT_TYPES_MASK \ + (DISK_EVENT_MEDIA_CHANGE | DISK_EVENT_EJECT_REQUEST) +struct disk_part_tbl {struct rcu_head rcu_head;int len;
Signature · 1 line
2.20.1
PATCH v2 3/5 Revert "ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd"
In reply to Martin WilckThis reverts commit 7eec77a1816a7042591a6cbdb4820e9e7ebffe0e.
Instead of leaving disk->events completely empty, we now export the supported events again, and tell the block layer not to forward events to user space by not setting DISK_EVENT_FLAG_UEVENT. This allows the block layer to distinguish between devices that for which events should be handled in kernel only, and devices which don't support any meda change events at all.
--- drivers/ide/ide-cd.c | 1 + drivers/ide/ide-cd_ioctl.c | 5 +++-- drivers/ide/ide-gd.c | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-)
drivers/ide/ide-cd.c +1 -0
@@ -1797,6 +1797,7 @@ static int ide_cd_probe(ide_drive_t *drive)ide_cd_read_toc (drive); g->fops = &idecd_ops; g->flags |=GENHD_FL_REMOVABLE |GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE ; + g->events =DISK_EVENT_MEDIA_CHANGE ;device_add_disk (&drive->gendev, g,NULL );return 0 ;
drivers/ide/ide-cd_ioctl.c +3 -2
@@ -82,8 +82,9 @@ int ide_cdrom_drive_status(struct cdrom_device_info *cdi, int slot_nr)/* * ide-cd always generates media changed event if media is missing, which -* makes it impossible to use for proper event reporting, so disk->events -* is cleared to 0 and the following function is used only to trigger +* makes it impossible to use for proper event reporting, so +* DISK_EVENT_FLAG_UEVENT is cleared in disk->events +* and the following function is used only to trigger * revalidation and never propagated to userland. */ unsigned int ide_cdrom_check_events_real(struct cdrom_device_info *cdi,
drivers/ide/ide-gd.c +4 -2
@@ -299,8 +299,9 @@ static unsigned int ide_gd_check_events(struct gendisk *disk,/* * The following is used to force revalidation on the first open on * removeable devices, and never gets reported to userland as -* genhd->events is 0. This is intended as removeable ide disk -* can't really detect MEDIA_CHANGE events. +* DISK_EVENT_FLAG_UEVENT isn't set in genhd->events. +* This is intended as removable ide disk can't really detect +* MEDIA_CHANGE events. */ ret = drive->dev_flags &IDE_DFLAG_MEDIA_CHANGED ; drive->dev_flags &= ~IDE_DFLAG_MEDIA_CHANGED ;
@@ -416,6 +417,7 @@ static int ide_gd_probe(ide_drive_t *drive)if (drive->dev_flags &IDE_DFLAG_REMOVABLE ) g->flags =GENHD_FL_REMOVABLE ; g->fops = &ide_gd_ops; + g->events =DISK_EVENT_MEDIA_CHANGE ;device_add_disk (&drive->gendev, g,NULL );return 0 ;
Signature · 1 line
2.20.1
PATCH v2 4/5 Revert "block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers"
In reply to Martin WilckThis reverts commit 9fd097b14918875bd6f125ed699d7bbbba5893ee.
Instead of leaving disk->events completely empty, we now export the supported events again, and tell the block layer not to forward events to user space by not setting DISK_EVENT_FLAG_UEVENT. This allows the block layer to distinguish between devices that for which events should be handled in kernel only, and devices which don't support any meda change events at all.
--- drivers/block/amiflop.c | 1 + drivers/block/ataflop.c | 1 + drivers/block/floppy.c | 1 + drivers/block/paride/pcd.c | 1 + drivers/block/paride/pd.c | 1 + drivers/block/paride/pf.c | 1 + drivers/block/swim.c | 1 + drivers/block/swim3.c | 1 + drivers/block/xsysace.c | 1 + drivers/cdrom/gdrom.c | 1 + 10 files changed, 10 insertions(+)
drivers/block/amiflop.c +1 -0
@@ -1829,6 +1829,7 @@ static int __init fd_probe_drives(void) disk->major =FLOPPY_MAJOR ; disk->first_minor = drive; disk->fops = &floppy_fops; + disk->events =DISK_EVENT_MEDIA_CHANGE ;sprintf (disk->disk_name,"fd%d" , drive); disk->private_data = &unit[drive];set_capacity (disk,880 *2 );
drivers/block/ataflop.c +1 -0
@@ -2028,6 +2028,7 @@ static int __init atari_floppy_init (void) unit[i].disk->first_minor = i;sprintf (unit[i].disk->disk_name,"fd%d" , i); unit[i].disk->fops = &floppy_fops; + unit[i].disk->events =DISK_EVENT_MEDIA_CHANGE ; unit[i].disk->private_data = &unit[i];set_capacity (unit[i].disk,MAX_DISK_SIZE *2 );add_disk (unit[i].disk);
drivers/block/floppy.c +1 -0
@@ -4543,6 +4543,7 @@ static int __init do_floppy_init(void) disks[drive]->major =FLOPPY_MAJOR ; disks[drive]->first_minor =TOMINOR (drive); disks[drive]->fops = &floppy_fops; + disks[drive]->events =DISK_EVENT_MEDIA_CHANGE ;sprintf (disks[drive]->disk_name,"fd%d" , drive);timer_setup (&motor_off_timer[drive], motor_off_callback,0 );
drivers/block/paride/pcd.c +1 -0
@@ -342,6 +342,7 @@ static void pcd_init_units(void)strcpy (disk->disk_name, cd->name);/* umm... */ disk->fops = &pcd_bdops; disk->flags =GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE ; + disk->events =DISK_EVENT_MEDIA_CHANGE ; } }
drivers/block/paride/pd.c +1 -0
@@ -897,6 +897,7 @@ static void pd_probe_drive(struct pd_unit *disk) p->fops = &pd_fops; p->major = major; p->first_minor = (disk - pd) <<PD_BITS ; + p->events =DISK_EVENT_MEDIA_CHANGE ; disk->gd = p; p->private_data = disk;
drivers/block/paride/pf.c +1 -0
@@ -319,6 +319,7 @@ static void __init pf_init_units(void) disk->first_minor = unit;strcpy (disk->disk_name, pf->name); disk->fops = &pf_fops; + disk->events =DISK_EVENT_MEDIA_CHANGE ;if (!(*drives[unit])[D_PRT ]) pf_drive_count++; }
drivers/block/swim.c +1 -0
@@ -862,6 +862,7 @@ static int swim_floppy_init(struct swim_priv *swd) swd->unit[drive].disk->first_minor = drive;sprintf (swd->unit[drive].disk->disk_name,"fd%d" , drive); swd->unit[drive].disk->fops = &floppy_fops; + swd->unit[drive].disk->events =DISK_EVENT_MEDIA_CHANGE ; swd->unit[drive].disk->private_data = &swd->unit[drive];set_capacity (swd->unit[drive].disk,2880 );add_disk (swd->unit[drive].disk);
drivers/block/swim3.c +1 -0
@@ -1216,6 +1216,7 @@ static int swim3_attach(struct macio_dev *mdev, disk->first_minor = floppy_count; disk->fops = &floppy_fops; disk->private_data = fs; + disk->events =DISK_EVENT_MEDIA_CHANGE ; disk->flags |=GENHD_FL_REMOVABLE ;sprintf (disk->disk_name,"fd%d" , floppy_count);set_capacity (disk,2880 );
drivers/block/xsysace.c +1 -0
@@ -1032,6 +1032,7 @@ static int ace_setup(struct ace_device *ace) ace->gd->major = ace_major; ace->gd->first_minor = ace->id *ACE_NUM_MINORS ; ace->gd->fops = &ace_fops; + ace->gd->events =DISK_EVENT_MEDIA_CHANGE ; ace->gd->queue = ace->queue; ace->gd->private_data = ace;snprintf (ace->gd->disk_name,32 ,"xs%c" , ace->id +'a' );
drivers/cdrom/gdrom.c +1 -0
@@ -786,6 +786,7 @@ static int probe_gdrom(struct platform_device *devptr) goto probe_fail_cdrom_register; } gd.disk->fops = &gdrom_bdops; + gd.disk->events =DISK_EVENT_MEDIA_CHANGE ;/* latch on to the interrupt */ err =gdrom_set_interrupt_handlers ();if (err)
Signature · 1 line
2.20.1
PATCH v2 5/5 block: check_events: don't bother with events if unsupported
In reply to Martin WilckDrivers now report to the block layer if they support media change events. If this is not the case, there's no need to allocate the event structure, and all event handling code can effectively be skipped. This simplifies code flow in particular for non-removable sd devices.
This effectively reverts commit 75e3f3ee3c64 ("block: always allocate genhd->ev if check_events is implemented").
The sysfs files for the events are kept in place even if no events are supported, as user space may rely on them being present. The only difference is that an error code is now returned if the user tries to set poll_msecs.
--- block/genhd.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
block/genhd.c +17 -11
@@ -1902,6 +1902,9 @@ static ssize_t disk_events_poll_msecs_show(struct device *dev, {struct gendisk *disk =dev_to_disk (dev); +if (!disk->ev) +return sprintf (buf,"-1\n" ); +return sprintf (buf,"%ld\n" , disk->ev->poll_msecs); }
@@ -1918,6 +1921,9 @@ static ssize_t disk_events_poll_msecs_store(struct device *dev,if (intv <0 && intv !=-1 )return -EINVAL ; +if (!disk->ev) +return -ENODEV ; +disk_block_events (disk); disk->ev->poll_msecs = intv;__disk_unblock_events (disk, true);
@@ -1982,7 +1988,8 @@ static void disk_alloc_events(struct gendisk *disk) {struct disk_events *ev; -if (!disk->fops->check_events) +if (!disk->fops->check_events || + !(disk->events &DISK_EVENT_TYPES_MASK ))return ; ev =kzalloc (sizeof (*ev),GFP_KERNEL );
@@ -2004,14 +2011,14 @@ static void disk_alloc_events(struct gendisk *disk)static void disk_add_events (struct gendisk *disk) { -if (!disk->ev) -return ; -/* FIXME: error handling */ if (sysfs_create_files (&disk_to_dev (disk)->kobj, disk_events_attrs) <0 )pr_warn ("%s: failed to create sysfs files for events\n" , disk->disk_name); +if (!disk->ev) +return ; +mutex_lock (&disk_events_mutex);list_add_tail (&disk->ev->node, &disk_events);mutex_unlock (&disk_events_mutex);
@@ -2025,14 +2032,13 @@ static void disk_add_events(struct gendisk *disk)static void disk_del_events (struct gendisk *disk) { -if (!disk->ev) -return ; +if (disk->ev) { +disk_block_events (disk); -disk_block_events (disk); - -mutex_lock (&disk_events_mutex); -list_del_init (&disk->ev->node); -mutex_unlock (&disk_events_mutex); +mutex_lock (&disk_events_mutex); +list_del_init (&disk->ev->node); +mutex_unlock (&disk_events_mutex); + }sysfs_remove_files (&disk_to_dev (disk)->kobj, disk_events_attrs); }
Signature · 1 line
2.20.1
Reminder: [PATCH v2 0/5] block: skip media change event handling if unsupported
In reply to Martin WilckQuoted 16 lines · Martin Wilck
[...]
This series implements a slightly different approach to event handling and
uevent suppression. The drivers are changed to set the events field again.
Whether or not uevents should be generated is controlled by a separate flag
bit, which is only set by the drivers that are known to generate proper
uevents (sd and sr). Once this is done, devices that don't support any
media change events can be clearly identified, and the whole events checking code path can be skipped. This simplifies handling of non-removable SCSI disks.
Quoted 7 lines
I have tested this with removable and non-removable SCSI disks, SCSI cdrom,
and ide-cd.This patch set targets the same problem as Hannes' late submission "sd:
skip non-removable devices insd_check_events()".
Gentle review reminder.
Regards
Martin
Signature · 3 lines
Dr. Martin Wilck <[email protected]>, Tel. +49 (0)911 74053 2107 SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg)
Re: Reminder: [PATCH v2 0/5] block: skip media change event handling if unsupported
Martin,
Quoted 1 line
Gentle review reminder.
Please resubmit.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering