block,scsi: fixup blk_get_request dead queue scenarios
authorJoe Lawrence <joe.lawrence@stratus.com>
Thu, 28 Aug 2014 14:15:21 +0000 (08:15 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 28 Aug 2014 16:03:46 +0000 (10:03 -0600)
The blk_get_request function may fail in low-memory conditions or during
device removal (even if __GFP_WAIT is set). To distinguish between these
errors, modify the blk_get_request call stack to return the appropriate
ERR_PTR. Verify that all callers check the return status and consider
IS_ERR instead of a simple NULL pointer check.

For consistency, make a similar change to the blk_mq_alloc_request leg
of blk_get_request.  It may fail if the queue is dead, or the caller was
unwilling to wait.

Signed-off-by: Joe Lawrence <joe.lawrence@stratus.com>
Acked-by: Jiri Kosina <jkosina@suse.cz> [for pktdvd]
Acked-by: Boaz Harrosh <bharrosh@panasas.com> [for osd]
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
20 files changed:
block/blk-core.c
block/blk-mq.c
block/bsg.c
block/scsi_ioctl.c
drivers/block/paride/pd.c
drivers/block/pktcdvd.c
drivers/block/sx8.c
drivers/cdrom/cdrom.c
drivers/ide/ide-park.c
drivers/scsi/device_handler/scsi_dh_alua.c
drivers/scsi/device_handler/scsi_dh_emc.c
drivers/scsi/device_handler/scsi_dh_hp_sw.c
drivers/scsi/device_handler/scsi_dh_rdac.c
drivers/scsi/osd/osd_initiator.c
drivers/scsi/osst.c
drivers/scsi/scsi_error.c
drivers/scsi/scsi_lib.c
drivers/scsi/sg.c
drivers/scsi/st.c
drivers/target/target_core_pscsi.c

index c359d72e9d76f24a44b7c4b6b8c36c6677436191..93603e6ff479df3ea38a8e8925e429c2a096e504 100644 (file)
@@ -933,9 +933,9 @@ static struct io_context *rq_ioc(struct bio *bio)
  * Get a free request from @q.  This function may fail under memory
  * pressure or if @q is dead.
  *
- * Must be callled with @q->queue_lock held and,
- * Returns %NULL on failure, with @q->queue_lock held.
- * Returns !%NULL on success, with @q->queue_lock *not held*.
+ * Must be called with @q->queue_lock held and,
+ * Returns ERR_PTR on failure, with @q->queue_lock held.
+ * Returns request pointer on success, with @q->queue_lock *not held*.
  */
 static struct request *__get_request(struct request_list *rl, int rw_flags,
                                     struct bio *bio, gfp_t gfp_mask)
@@ -949,7 +949,7 @@ static struct request *__get_request(struct request_list *rl, int rw_flags,
        int may_queue;
 
        if (unlikely(blk_queue_dying(q)))
-               return NULL;
+               return ERR_PTR(-ENODEV);
 
        may_queue = elv_may_queue(q, rw_flags);
        if (may_queue == ELV_MQUEUE_NO)
@@ -974,7 +974,7 @@ static struct request *__get_request(struct request_list *rl, int rw_flags,
                                         * process is not a "batcher", and not
                                         * exempted by the IO scheduler
                                         */
-                                       return NULL;
+                                       return ERR_PTR(-ENOMEM);
                                }
                        }
                }
@@ -992,7 +992,7 @@ static struct request *__get_request(struct request_list *rl, int rw_flags,
         * allocated with any setting of ->nr_requests
         */
        if (rl->count[is_sync] >= (3 * q->nr_requests / 2))
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        q->nr_rqs[is_sync]++;
        rl->count[is_sync]++;
@@ -1097,7 +1097,7 @@ fail_alloc:
 rq_starved:
        if (unlikely(rl->count[is_sync] == 0))
                rl->starved[is_sync] = 1;
-       return NULL;
+       return ERR_PTR(-ENOMEM);
 }
 
 /**
@@ -1110,9 +1110,9 @@ rq_starved:
  * Get a free request from @q.  If %__GFP_WAIT is set in @gfp_mask, this
  * function keeps retrying under memory pressure and fails iff @q is dead.
  *
- * Must be callled with @q->queue_lock held and,
- * Returns %NULL on failure, with @q->queue_lock held.
- * Returns !%NULL on success, with @q->queue_lock *not held*.
+ * Must be called with @q->queue_lock held and,
+ * Returns ERR_PTR on failure, with @q->queue_lock held.
+ * Returns request pointer on success, with @q->queue_lock *not held*.
  */
 static struct request *get_request(struct request_queue *q, int rw_flags,
                                   struct bio *bio, gfp_t gfp_mask)
@@ -1125,12 +1125,12 @@ static struct request *get_request(struct request_queue *q, int rw_flags,
        rl = blk_get_rl(q, bio);        /* transferred to @rq on success */
 retry:
        rq = __get_request(rl, rw_flags, bio, gfp_mask);
-       if (rq)
+       if (!IS_ERR(rq))
                return rq;
 
        if (!(gfp_mask & __GFP_WAIT) || unlikely(blk_queue_dying(q))) {
                blk_put_rl(rl);
-               return NULL;
+               return rq;
        }
 
        /* wait on @rl and retry */
@@ -1167,7 +1167,7 @@ static struct request *blk_old_get_request(struct request_queue *q, int rw,
 
        spin_lock_irq(q->queue_lock);
        rq = get_request(q, rw, NULL, gfp_mask);
-       if (!rq)
+       if (IS_ERR(rq))
                spin_unlock_irq(q->queue_lock);
        /* q->queue_lock is unlocked at this point */
 
@@ -1219,8 +1219,8 @@ struct request *blk_make_request(struct request_queue *q, struct bio *bio,
 {
        struct request *rq = blk_get_request(q, bio_data_dir(bio), gfp_mask);
 
-       if (unlikely(!rq))
-               return ERR_PTR(-ENOMEM);
+       if (IS_ERR(rq))
+               return rq;
 
        blk_rq_set_block_pc(rq);
 
@@ -1615,8 +1615,8 @@ get_rq:
         * Returns with the queue unlocked.
         */
        req = get_request(q, rw_flags, bio, GFP_NOIO);
-       if (unlikely(!req)) {
-               bio_endio(bio, -ENODEV);        /* @q is dead */
+       if (IS_ERR(req)) {
+               bio_endio(bio, PTR_ERR(req));   /* @q is dead */
                goto out_unlock;
        }
 
index 5189cb1e478a6b283609006364c01f9f8e31d082..940aa8a34b70b656d5babca89ad2fd7ac5ad2849 100644 (file)
@@ -218,9 +218,11 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw, gfp_t gfp,
        struct blk_mq_hw_ctx *hctx;
        struct request *rq;
        struct blk_mq_alloc_data alloc_data;
+       int ret;
 
-       if (blk_mq_queue_enter(q))
-               return NULL;
+       ret = blk_mq_queue_enter(q);
+       if (ret)
+               return ERR_PTR(ret);
 
        ctx = blk_mq_get_ctx(q);
        hctx = q->mq_ops->map_queue(q, ctx->cpu);
@@ -240,6 +242,8 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw, gfp_t gfp,
                ctx = alloc_data.ctx;
        }
        blk_mq_put_ctx(ctx);
+       if (!rq)
+               return ERR_PTR(-EWOULDBLOCK);
        return rq;
 }
 EXPORT_SYMBOL(blk_mq_alloc_request);
index ff46addde5d8e0877d390901bb6a91bac591bb13..73c78fd12cc1c8dc33b4ee3cc560c8f2d811a04a 100644 (file)
@@ -270,8 +270,8 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
         * map scatter-gather elements separately and string them to request
         */
        rq = blk_get_request(q, rw, GFP_KERNEL);
-       if (!rq)
-               return ERR_PTR(-ENOMEM);
+       if (IS_ERR(rq))
+               return rq;
        blk_rq_set_block_pc(rq);
 
        ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd, has_write_perm);
@@ -285,8 +285,8 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
                }
 
                next_rq = blk_get_request(q, READ, GFP_KERNEL);
-               if (!next_rq) {
-                       ret = -ENOMEM;
+               if (IS_ERR(next_rq)) {
+                       ret = PTR_ERR(next_rq);
                        goto out;
                }
                rq->next_rq = next_rq;
index 29d056782833f1504fd2d10b402679fd63682f09..a8b0d02084485d933d4fb6b490411e2874621c86 100644 (file)
@@ -318,8 +318,8 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
                at_head = 1;
 
        rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
-       if (!rq)
-               return -ENOMEM;
+       if (IS_ERR(rq))
+               return PTR_ERR(rq);
        blk_rq_set_block_pc(rq);
 
        if (blk_fill_sghdr_rq(q, rq, hdr, mode)) {
@@ -448,8 +448,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
        }
 
        rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);
-       if (!rq) {
-               err = -ENODEV;
+       if (IS_ERR(rq)) {
+               err = PTR_ERR(rq);
                goto error_free_buffer;
        }
 
@@ -539,8 +539,8 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk,
        int err;
 
        rq = blk_get_request(q, WRITE, __GFP_WAIT);
-       if (!rq)
-               return -ENODEV;
+       if (IS_ERR(rq))
+               return PTR_ERR(rq);
        blk_rq_set_block_pc(rq);
        rq->timeout = BLK_DEFAULT_SG_TIMEOUT;
        rq->cmd[0] = cmd;
index ca831f741d8937e29a7c8a96d9f1661aa3811f8f..d48715b287e667bea5205ec75f6e6c40792149a4 100644 (file)
@@ -722,8 +722,8 @@ static int pd_special_command(struct pd_unit *disk,
        int err = 0;
 
        rq = blk_get_request(disk->gd->queue, READ, __GFP_WAIT);
-       if (!rq)
-               return -ENODEV;
+       if (IS_ERR(rq))
+               return PTR_ERR(rq);
 
        rq->cmd_type = REQ_TYPE_SPECIAL;
        rq->special = func;
index 7fa8c80e8982604d8650b2469a53252c4727f020..09e628dafd9d829eadd9abb68c6956d182a582f8 100644 (file)
@@ -704,8 +704,8 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
 
        rq = blk_get_request(q, (cgc->data_direction == CGC_DATA_WRITE) ?
                             WRITE : READ, __GFP_WAIT);
-       if (!rq)
-               return -ENODEV;
+       if (IS_ERR(rq))
+               return PTR_ERR(rq);
        blk_rq_set_block_pc(rq);
 
        if (cgc->buflen) {
index d5e2d12b9d9e329d77fb21560b8f21e5e98a11f4..5d552857de412e32864ba4378a2313014c7b3564 100644 (file)
@@ -568,7 +568,7 @@ static struct carm_request *carm_get_special(struct carm_host *host)
                return NULL;
 
        rq = blk_get_request(host->oob_q, WRITE /* bogus */, GFP_KERNEL);
-       if (!rq) {
+       if (IS_ERR(rq)) {
                spin_lock_irqsave(&host->lock, flags);
                carm_put_request(host, crq);
                spin_unlock_irqrestore(&host->lock, flags);
index 898b84bba28a88b3b61e7cfda3e43f2f7fabb16a..5d28a45d2960c6a40945b134c755ff03a1117c76 100644 (file)
@@ -2180,8 +2180,8 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                len = nr * CD_FRAMESIZE_RAW;
 
                rq = blk_get_request(q, READ, GFP_KERNEL);
-               if (!rq) {
-                       ret = -ENOMEM;
+               if (IS_ERR(rq)) {
+                       ret = PTR_ERR(rq);
                        break;
                }
                blk_rq_set_block_pc(rq);
index f41558a0bcd1742a75503a52028399e093d46403..ca958604cda21217f6d6a1bce6240fbf07fb2d7f 100644 (file)
@@ -46,7 +46,7 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)
         * timeout has expired, so power management will be reenabled.
         */
        rq = blk_get_request(q, READ, GFP_NOWAIT);
-       if (unlikely(!rq))
+       if (IS_ERR(rq))
                goto out;
 
        rq->cmd[0] = REQ_UNPARK_HEADS;
index 7bcf67eec921e5fb0fde14b6cc2097c09b1b4879..e99507ed0e3c9ab5ad36cf19f26814d61a78ec76 100644 (file)
@@ -115,7 +115,7 @@ static struct request *get_alua_req(struct scsi_device *sdev,
 
        rq = blk_get_request(q, rw, GFP_NOIO);
 
-       if (!rq) {
+       if (IS_ERR(rq)) {
                sdev_printk(KERN_INFO, sdev,
                            "%s: blk_get_request failed\n", __func__);
                return NULL;
index 6f07f7fe3aa11e3603bad3858a817a0c485f26e0..84765384c47ca4486caf3a7e4366521af193be3f 100644 (file)
@@ -275,7 +275,7 @@ static struct request *get_req(struct scsi_device *sdev, int cmd,
 
        rq = blk_get_request(sdev->request_queue,
                        (cmd != INQUIRY) ? WRITE : READ, GFP_NOIO);
-       if (!rq) {
+       if (IS_ERR(rq)) {
                sdev_printk(KERN_INFO, sdev, "get_req: blk_get_request failed");
                return NULL;
        }
index e9d9fea9e272baf797bf5e95d5f729e29eae90eb..4ee2759f5299a531b62ff15e24eb89079bffb7e7 100644 (file)
@@ -117,7 +117,7 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)
 
 retry:
        req = blk_get_request(sdev->request_queue, WRITE, GFP_NOIO);
-       if (!req)
+       if (IS_ERR(req))
                return SCSI_DH_RES_TEMP_UNAVAIL;
 
        blk_rq_set_block_pc(req);
@@ -247,7 +247,7 @@ static int hp_sw_start_stop(struct hp_sw_dh_data *h)
        struct request *req;
 
        req = blk_get_request(h->sdev->request_queue, WRITE, GFP_ATOMIC);
-       if (!req)
+       if (IS_ERR(req))
                return SCSI_DH_RES_TEMP_UNAVAIL;
 
        blk_rq_set_block_pc(req);
index 826069db9848e08d1b928986387484f23da5abdb..1b5bc9293e37d416769974055dbe122d38ef0c8c 100644 (file)
@@ -274,7 +274,7 @@ static struct request *get_rdac_req(struct scsi_device *sdev,
 
        rq = blk_get_request(q, rw, GFP_NOIO);
 
-       if (!rq) {
+       if (IS_ERR(rq)) {
                sdev_printk(KERN_INFO, sdev,
                                "get_rdac_req: blk_get_request failed.\n");
                return NULL;
index 5f4cbf0c47592287fbc3c1a5208fbb15fc9a4b05..fd19fd8468acf37a895d09121a62326cc0911f90 100644 (file)
@@ -1567,8 +1567,8 @@ static struct request *_make_request(struct request_queue *q, bool has_write,
                struct request *req;
 
                req = blk_get_request(q, has_write ? WRITE : READ, flags);
-               if (unlikely(!req))
-                       return ERR_PTR(-ENOMEM);
+               if (IS_ERR(req))
+                       return req;
 
                blk_rq_set_block_pc(req);
                return req;
index 0727ea7cc3874633c863702794a90c36024af98e..dff37a250d7906ab7c203099e6938bd197d1bb04 100644 (file)
@@ -362,7 +362,7 @@ static int osst_execute(struct osst_request *SRpnt, const unsigned char *cmd,
        int write = (data_direction == DMA_TO_DEVICE);
 
        req = blk_get_request(SRpnt->stp->device->request_queue, write, GFP_KERNEL);
-       if (!req)
+       if (IS_ERR(req))
                return DRIVER_ERROR << 24;
 
        blk_rq_set_block_pc(req);
index 4c433bf47a06931a2d4416427574c9c828d97f4a..a2c3d3d255a1ad845e867bb8415a76547427b212 100644 (file)
@@ -1960,7 +1960,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev)
         * request becomes available
         */
        req = blk_get_request(sdev->request_queue, READ, GFP_KERNEL);
-       if (!req)
+       if (IS_ERR(req))
                return;
 
        blk_rq_set_block_pc(req);
index ce62e8798cc80da072b452bced0a26fb44b5eb11..972d0a8adf2ec677488834e3939c35fe2304f4cd 100644 (file)
@@ -221,7 +221,7 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
        int ret = DRIVER_ERROR << 24;
 
        req = blk_get_request(sdev->request_queue, write, __GFP_WAIT);
-       if (!req)
+       if (IS_ERR(req))
                return ret;
        blk_rq_set_block_pc(req);
 
index 01cf88888797898de231bc9a8dac484be598ee6a..60354449d9ed1cc16f7ca43fdef340c935d2b1c8 100644 (file)
@@ -1711,9 +1711,9 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)
        }
 
        rq = blk_get_request(q, rw, GFP_ATOMIC);
-       if (!rq) {
+       if (IS_ERR(rq)) {
                kfree(long_cmdp);
-               return -ENOMEM;
+               return PTR_ERR(rq);
        }
 
        blk_rq_set_block_pc(rq);
index aff9689de0f7079690e0a81653138469fa01bb68..59db5bfc11db3cc2a2b243bb8a99dd18db6d807c 100644 (file)
@@ -490,7 +490,7 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd,
 
        req = blk_get_request(SRpnt->stp->device->request_queue, write,
                              GFP_KERNEL);
-       if (!req)
+       if (IS_ERR(req))
                return DRIVER_ERROR << 24;
 
        blk_rq_set_block_pc(req);
index 943b1dbe859afc1c34ef6c9a7c9cbb2caa091527..70d9f6dabba067b66c8b66fafa79242339315294 100644 (file)
@@ -1050,7 +1050,7 @@ pscsi_execute_cmd(struct se_cmd *cmd)
                req = blk_get_request(pdv->pdv_sd->request_queue,
                                (data_direction == DMA_TO_DEVICE),
                                GFP_KERNEL);
-               if (!req) {
+               if (IS_ERR(req)) {
                        pr_err("PSCSI: blk_get_request() failed\n");
                        ret = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
                        goto fail;