Skip to contentSkip to conversation

CDROM ioctl bug (fwd)

DISCUSSION Douglas Gilbert 1 participant 1 message Nov 29, 2001 SCSI

lore
Share & tools
lore
#0 lore raw

Peter,
That patch is flawed as Jens and I found out the hard way in the sg driver. The scsi_do_req() can lead to the pointer chain on the following assignment into q being invalid (in the worst case).

The easy fix is to move the assignment into q _before_ the call to scsi_do_req().

Doug Gilbert

vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Peter Osterlund <[email protected]> wrote:

Quoted 4 lines · Ron Lawrence

busy. Here are the symptoms of my problem : doing reads from a CDROM device intermingled with CDROM_MEDIA_CHANGED ioctls causes long pauses during the ioctl. This behavior started in 2.4.10. The ioctl can take a very long time to return, especially if reading large chunks.

This patch fixes the problem for my USB CDROM device. Maybe a similar patch is needed for the IDE case, I haven't looked yet.

In general, who is responsible for unplugging the request queue after queuing an ioctl command?

drivers/scsi/scsi.c Thu Nov 29 00:32:28 2001 renamed from drivers/scsi/scsi.c.old Thu Nov 29 00:42:16 2001 +3 -0
@@ -767,14 +767,17 @@
 void scsi_wait_req (Scsi_Request * SRpnt, const void *cmnd ,
                  void *buffer, unsigned bufflen, 
                  int timeout, int retries)
 {
+       request_queue_t *q;
        DECLARE_COMPLETION(wait);
        
        SRpnt->sr_request.waiting = &wait;
        SRpnt->sr_request.rq_status = RQ_SCSI_BUSY;
        scsi_do_req (SRpnt, (void *) cmnd,
                buffer, bufflen, scsi_wait_done, timeout, retries);
+       q = &SRpnt->sr_device->request_queue;
+       generic_unplug_device(q);
        wait_for_completion(&wait);
        SRpnt->sr_request.waiting = NULL;
        if( SRpnt->sr_command != NULL )
        {