8 files changed, 22 insertions, 10 deletions

diff --git a/block/bio.c b/block/bio.c
index a50d59236b19..4f4d9884443b 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -605,6 +605,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)
         if (bio_flagged(bio_src, BIO_THROTTLED))
                 bio_set_flag(bio, BIO_THROTTLED);
         bio->bi_opf = bio_src->bi_opf;
+        bio->bi_ioprio = bio_src->bi_ioprio;
         bio->bi_write_hint = bio_src->bi_write_hint;
         bio->bi_iter = bio_src->bi_iter;
         bio->bi_io_vec = bio_src->bi_io_vec;
diff --git a/block/blk-core.c b/block/blk-core.c
index ce12515f9b9b..deb56932f8c4 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -798,9 +798,8 @@ void blk_cleanup_queue(struct request_queue *q)
          * dispatch may still be in-progress since we dispatch requests
          * from more than one contexts.
          *
-         * No need to quiesce queue if it isn't initialized yet since
-         * blk_freeze_queue() should be enough for cases of passthrough
-         * request.
+         * We rely on driver to deal with the race in case that queue
+         * initialization isn't done.
          */
         if (q->mq_ops && blk_queue_init_done(q))
                 blk_mq_quiesce_queue(q);
diff --git a/block/blk-lib.c b/block/blk-lib.c
index e8b3bb9bf375..5f2c429d4378 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -55,9 +55,11 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                 return -EINVAL;
 
         while (nr_sects) {
-                unsigned int req_sects = min_t(unsigned int, nr_sects,
+                sector_t req_sects = min_t(sector_t, nr_sects,
                                 bio_allowed_max_sectors(q));
 
+                WARN_ON_ONCE((req_sects << 9) > UINT_MAX);
+
                 bio = blk_next_bio(bio, 0, gfp_mask);
                 bio->bi_iter.bi_sector = sector;
                 bio_set_dev(bio, bdev);
diff --git a/block/bounce.c b/block/bounce.c
index 36869afc258c..559c55bda040 100644
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -248,6 +248,7 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask,
                 return NULL;
         bio->bi_disk            = bio_src->bi_disk;
         bio->bi_opf             = bio_src->bi_opf;
+        bio->bi_ioprio          = bio_src->bi_ioprio;
         bio->bi_write_hint      = bio_src->bi_write_hint;
         bio->bi_iter.bi_sector  = bio_src->bi_iter.bi_sector;
         bio->bi_iter.bi_size    = bio_src->bi_iter.bi_size;
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 6e594644cb1d..a7f5202a4815 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4553,7 +4553,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         /* These specific Samsung models/firmware-revs do not handle LPM well */
         { "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM, },
         { "SAMSUNG SSD PM830 mSATA *",  "CXM13D1Q", ATA_HORKAGE_NOLPM, },
-        { "SAMSUNG MZ7TD256HAFV-000L9", "DXT02L5Q", ATA_HORKAGE_NOLPM, },
+        { "SAMSUNG MZ7TD256HAFV-000L9", NULL,       ATA_HORKAGE_NOLPM, },
 
         /* devices that don't properly handle queued TRIM commands */
         { "Micron_M500IT_*",            "MU01", ATA_HORKAGE_NO_NCQ_TRIM |
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index a8cfa011c284..fb23578e9a41 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4148,10 +4148,11 @@ static int __floppy_read_block_0(struct block_device *bdev, int drive)
         bio.bi_end_io = floppy_rb0_cb;
         bio_set_op_attrs(&bio, REQ_OP_READ, 0);
 
+        init_completion(&cbdata.complete);
+
         submit_bio(&bio);
         process_fd_request();
 
-        init_completion(&cbdata.complete);
         wait_for_completion(&cbdata.complete);
 
         __free_page(page);
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index c7fccbb8f554..fa6e0c3b3aa6 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -697,6 +697,12 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
                  */
                 scsi_mq_uninit_cmd(cmd);
 
+                /*
+                 * queue is still alive, so grab the ref for preventing it
+                 * from being cleaned up during running queue.
+                 */
+                percpu_ref_get(&q->q_usage_counter);
+
                 __blk_mq_end_request(req, error);
 
                 if (scsi_target(sdev)->single_lun ||
@@ -704,6 +710,8 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
                         kblockd_schedule_work(&sdev->requeue_work);
                 else
                         blk_mq_run_hw_queues(q, true);
+
+                percpu_ref_put(&q->q_usage_counter);
         } else {
                 unsigned long flags;
 
diff --git a/include/trace/events/kyber.h b/include/trace/events/kyber.h
index a9834c37ac40..c0e7d24ca256 100644
--- a/include/trace/events/kyber.h
+++ b/include/trace/events/kyber.h
@@ -31,8 +31,8 @@ TRACE_EVENT(kyber_latency,
 
         TP_fast_assign(
                 __entry->dev            = disk_devt(dev_to_disk(kobj_to_dev(q->kobj.parent)));
-                strlcpy(__entry->domain, domain, DOMAIN_LEN);
-                strlcpy(__entry->type, type, DOMAIN_LEN);
+                strlcpy(__entry->domain, domain, sizeof(__entry->domain));
+                strlcpy(__entry->type, type, sizeof(__entry->type));
                 __entry->percentile     = percentile;
                 __entry->numerator      = numerator;
                 __entry->denominator    = denominator;
@@ -60,7 +60,7 @@ TRACE_EVENT(kyber_adjust,
 
         TP_fast_assign(
                 __entry->dev            = disk_devt(dev_to_disk(kobj_to_dev(q->kobj.parent)));
-                strlcpy(__entry->domain, domain, DOMAIN_LEN);
+                strlcpy(__entry->domain, domain, sizeof(__entry->domain));
                 __entry->depth          = depth;
         ),
 
@@ -82,7 +82,7 @@ TRACE_EVENT(kyber_throttled,
 
         TP_fast_assign(
                 __entry->dev            = disk_devt(dev_to_disk(kobj_to_dev(q->kobj.parent)));
-                strlcpy(__entry->domain, domain, DOMAIN_LEN);
+                strlcpy(__entry->domain, domain, sizeof(__entry->domain));
         ),
 
         TP_printk("%d,%d %s", MAJOR(__entry->dev), MINOR(__entry->dev),