scsi: sd: use mempool for discard special page

[mirror_ubuntu-bionic-kernel.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a028ab3322a9a4ed3b37530c19268dc90d9098f4..6ea3fe4533e5f58caf2eece289572fb68da03b77 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -133,6 +133,7 @@ static DEFINE_MUTEX(sd_ref_mutex);
 
 static struct kmem_cache *sd_cdb_cache;
 static mempool_t *sd_cdb_pool;
+static mempool_t *sd_page_pool;
 
 static const char *sd_cache_types[] = {
        "write through", "none", "write back",
@@ -759,9 +760,10 @@ static int sd_setup_unmap_cmnd(struct scsi_cmnd *cmd)
        unsigned int data_len = 24;
        char *buf;
 
-       rq->special_vec.bv_page = alloc_page(GFP_ATOMIC | __GFP_ZERO);
+       rq->special_vec.bv_page = mempool_alloc(sd_page_pool, GFP_ATOMIC);
        if (!rq->special_vec.bv_page)
                return BLKPREP_DEFER;
+       clear_highpage(rq->special_vec.bv_page);
        rq->special_vec.bv_offset = 0;
        rq->special_vec.bv_len = data_len;
        rq->rq_flags |= RQF_SPECIAL_PAYLOAD;
@@ -792,9 +794,10 @@ static int sd_setup_write_same16_cmnd(struct scsi_cmnd *cmd, bool unmap)
        u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9);
        u32 data_len = sdp->sector_size;
 
-       rq->special_vec.bv_page = alloc_page(GFP_ATOMIC | __GFP_ZERO);
+       rq->special_vec.bv_page = mempool_alloc(sd_page_pool, GFP_ATOMIC);
        if (!rq->special_vec.bv_page)
                return BLKPREP_DEFER;
+       clear_highpage(rq->special_vec.bv_page);
        rq->special_vec.bv_offset = 0;
        rq->special_vec.bv_len = data_len;
        rq->rq_flags |= RQF_SPECIAL_PAYLOAD;
@@ -822,9 +825,10 @@ static int sd_setup_write_same10_cmnd(struct scsi_cmnd *cmd, bool unmap)
        u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9);
        u32 data_len = sdp->sector_size;
 
-       rq->special_vec.bv_page = alloc_page(GFP_ATOMIC | __GFP_ZERO);
+       rq->special_vec.bv_page = mempool_alloc(sd_page_pool, GFP_ATOMIC);
        if (!rq->special_vec.bv_page)
                return BLKPREP_DEFER;
+       clear_highpage(rq->special_vec.bv_page);
        rq->special_vec.bv_offset = 0;
        rq->special_vec.bv_len = data_len;
        rq->rq_flags |= RQF_SPECIAL_PAYLOAD;
@@ -1305,7 +1309,8 @@ static int sd_init_command(struct scsi_cmnd *cmd)
        case REQ_OP_ZONE_RESET:
                return sd_zbc_setup_reset_cmnd(cmd);
        default:
-               BUG();
+               WARN_ON_ONCE(1);
+               return BLKPREP_KILL;
        }
 }
 
@@ -1318,7 +1323,7 @@ static void sd_uninit_command(struct scsi_cmnd *SCpnt)
                sd_zbc_write_unlock_zone(SCpnt);
 
        if (rq->rq_flags & RQF_SPECIAL_PAYLOAD)
-               __free_page(rq->special_vec.bv_page);
+               mempool_free(rq->special_vec.bv_page, sd_page_pool);
 
        if (SCpnt->cmnd != scsi_req(rq)->cmd) {
                cmnd = SCpnt->cmnd;
@@ -2152,6 +2157,8 @@ sd_spinup_disk(struct scsi_disk *sdkp)
                                break;  /* standby */
                        if (sshdr.asc == 4 && sshdr.ascq == 0xc)
                                break;  /* unavailable */
+                       if (sshdr.asc == 4 && sshdr.ascq == 0x1b)
+                               break;  /* sanitize in progress */
                        /*
                         * Issue command to spin up drive when not ready
                         */
@@ -2515,6 +2522,8 @@ sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer)
                                sector_size = old_sector_size;
                                goto got_data;
                        }
+                       /* Remember that READ CAPACITY(16) succeeded */
+                       sdp->try_rc_10_first = 0;
                }
        }
 
@@ -2626,6 +2635,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
        int res;
        struct scsi_device *sdp = sdkp->device;
        struct scsi_mode_data data;
+       int disk_ro = get_disk_ro(sdkp->disk);
        int old_wp = sdkp->write_prot;
 
        set_disk_ro(sdkp->disk, 0);
@@ -2666,7 +2676,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
                          "Test WP failed, assume Write Enabled\n");
        } else {
                sdkp->write_prot = ((data.device_specific & 0x80) != 0);
-               set_disk_ro(sdkp->disk, sdkp->write_prot);
+               set_disk_ro(sdkp->disk, sdkp->write_prot || disk_ro);
                if (sdkp->first_scan || old_wp != sdkp->write_prot) {
                        sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
                                  sdkp->write_prot ? "on" : "off");
@@ -3669,6 +3679,13 @@ static int __init init_sd(void)
                goto err_out_cache;
        }
 
+       sd_page_pool = mempool_create_page_pool(SD_MEMPOOL_SIZE, 0);
+       if (!sd_page_pool) {
+               printk(KERN_ERR "sd: can't init discard page pool\n");
+               err = -ENOMEM;
+               goto err_out_ppool;
+       }
+
        err = scsi_register_driver(&sd_template.gendrv);
        if (err)
                goto err_out_driver;
@@ -3676,6 +3693,9 @@ static int __init init_sd(void)
        return 0;
 
 err_out_driver:
+       mempool_destroy(sd_page_pool);
+
+err_out_ppool:
        mempool_destroy(sd_cdb_pool);
 
 err_out_cache:
@@ -3702,6 +3722,7 @@ static void __exit exit_sd(void)
 
        scsi_unregister_driver(&sd_template.gendrv);
        mempool_destroy(sd_cdb_pool);
+       mempool_destroy(sd_page_pool);
        kmem_cache_destroy(sd_cdb_cache);
 
        class_unregister(&sd_disk_class);