Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28507135 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "A collection of fixes from the past few weeks that should go into 4.5.
  This contains:

   - Overflow fix for sysfs discard show function from Alan.

   - A stacking limit init fix for max_dev_sectors, so we don't end up
     artificially capping some use cases.  From Keith.

   - Have blk-mq proper end unstarted requests on a dying queue, instead
     of pushing that to the driver.  From Keith.

   - NVMe:
        - Update to Kconfig description for NVME_SCSI, since it was
          vague and having it on is important for some SUSE distros.
          From Christoph.
        - Set of fixes from Keith, around surprise removal. Also kills
          the no-merge flag, so it supports merging.

   - Set of fixes for lightnvm from Matias, Javier, and Wenwei.

   - Fix null_blk oops when asked for lightnvm, but not available.  From
     Matias.

   - Copy-to-user EINTR fix from Hannes, fixing a case where SG_IO fails
     if interrupted by a signal.

   - Two floppy fixes from Jiri, fixing signal handling and blocking
     open.

   - A use-after-free fix for O_DIRECT, from Mike Krinkin.

   - A block module ref count fix from Roman Pen.

   - An fs IO wait accounting fix for O_DSYNC from Stephane Gasparini.

   - Smaller reallo fix for xen-blkfront from Bob Liu.

   - Removal of an unused struct member in the deadline IO scheduler,
     from Tahsin.

   - Also from Tahsin, properly initialize inode struct members
     associated with cgroup writeback, if enabled.

   - From Tejun, ensure that we keep the superblock pinned during cgroup
     writeback"

* 'for-linus' of git://git.kernel.dk/linux-block: (25 commits)
  blk: fix overflow in queue_discard_max_hw_show
  writeback: initialize inode members that track writeback history
  writeback: keep superblock pinned during cgroup writeback association switches
  bio: return EINTR if copying to user space got interrupted
  NVMe: Rate limit nvme IO warnings
  NVMe: Poll device while still active during remove
  NVMe: Requeue requests on suspended queues
  NVMe: Allow request merges
  NVMe: Fix io incapable return values
  blk-mq: End unstarted requests on dying queue
  block: Initialize max_dev_sectors to 0
  null_blk: oops when initializing without lightnvm
  block: fix module reference leak on put_disk() call for cgroups throttle
  nvme: fix Kconfig description for BLK_DEV_NVME_SCSI
  kernel/fs: fix I/O wait not accounted for RW O_DSYNC
  floppy: refactor open() flags handling
  lightnvm: allow to force mm initialization
  lightnvm: check overflow and correct mlc pairs
  lightnvm: fix request intersection locking in rrpc
  lightnvm: warn if irqs are disabled in lock laddr
  ...
parents c28b947d 18f922d0

block/bio.c

+6 −3
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ int submit_bio_wait(int rw, struct bio *bio) 
	bio->bi_private = &ret;

	bio->bi_end_io = submit_bio_wait_endio;

	submit_bio(rw, bio);

	wait_for_completion(&ret.event);

	wait_for_completion_io(&ret.event);



	return ret.error;

}
@@ -1090,9 +1090,12 @@ int bio_uncopy_user(struct bio *bio) 
	if (!bio_flagged(bio, BIO_NULL_MAPPED)) {

		/*

		 * if we're in a workqueue, the request is orphaned, so

		 * don't copy into a random user address space, just free.

		 * don't copy into a random user address space, just free

		 * and return -EINTR so user space doesn't expect any data.

		 */

		if (current->mm && bio_data_dir(bio) == READ)

		if (!current->mm)

			ret = -EINTR;

		else if (bio_data_dir(bio) == READ)

			ret = bio_copy_to_iter(bio, bmd->iter);

		if (bmd->is_our_pages)

			bio_free_pages(bio);

block/blk-cgroup.c

+9 −0
Original line number Diff line number Diff line
@@ -788,6 +788,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, 
{

	struct gendisk *disk;

	struct blkcg_gq *blkg;

	struct module *owner;

	unsigned int major, minor;

	int key_len, part, ret;

	char *body;
@@ -804,7 +805,9 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, 
	if (!disk)

		return -ENODEV;

	if (part) {

		owner = disk->fops->owner;

		put_disk(disk);

		module_put(owner);

		return -ENODEV;

	}
@@ -820,7 +823,9 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, 
		ret = PTR_ERR(blkg);

		rcu_read_unlock();

		spin_unlock_irq(disk->queue->queue_lock);

		owner = disk->fops->owner;

		put_disk(disk);

		module_put(owner);

		/*

		 * If queue was bypassing, we should retry.  Do so after a

		 * short msleep().  It isn't strictly necessary but queue
@@ -851,9 +856,13 @@ EXPORT_SYMBOL_GPL(blkg_conf_prep); 
void blkg_conf_finish(struct blkg_conf_ctx *ctx)

	__releases(ctx->disk->queue->queue_lock) __releases(rcu)

{

	struct module *owner;



	spin_unlock_irq(ctx->disk->queue->queue_lock);

	rcu_read_unlock();

	owner = ctx->disk->fops->owner;

	put_disk(ctx->disk);

	module_put(owner);

}

EXPORT_SYMBOL_GPL(blkg_conf_finish);

block/blk-mq.c

+4 −2
Original line number Diff line number Diff line
@@ -599,8 +599,10 @@ static void blk_mq_check_expired(struct blk_mq_hw_ctx *hctx, 
		 * If a request wasn't started before the queue was

		 * marked dying, kill it here or it'll go unnoticed.

		 */

		if (unlikely(blk_queue_dying(rq->q)))

			blk_mq_complete_request(rq, -EIO);

		if (unlikely(blk_queue_dying(rq->q))) {

			rq->errors = -EIO;

			blk_mq_end_request(rq, rq->errors);

		}

		return;

	}

block/blk-settings.c

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ void blk_set_default_limits(struct queue_limits *lim) 
	lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;

	lim->virt_boundary_mask = 0;

	lim->max_segment_size = BLK_MAX_SEGMENT_SIZE;

	lim->max_sectors = lim->max_dev_sectors = lim->max_hw_sectors =

		BLK_SAFE_MAX_SECTORS;

	lim->max_sectors = lim->max_hw_sectors = BLK_SAFE_MAX_SECTORS;

	lim->max_dev_sectors = 0;

	lim->chunk_sectors = 0;

	lim->max_write_same_sectors = 0;

	lim->max_discard_sectors = 0;

block/blk-sysfs.c

+2 −3
Original line number Diff line number Diff line
@@ -147,10 +147,9 @@ static ssize_t queue_discard_granularity_show(struct request_queue *q, char *pag 


static ssize_t queue_discard_max_hw_show(struct request_queue *q, char *page)

{

	unsigned long long val;



	val = q->limits.max_hw_discard_sectors << 9;

	return sprintf(page, "%llu\n", val);

	return sprintf(page, "%llu\n",

		(unsigned long long)q->limits.max_hw_discard_sectors << 9);

}



static ssize_t queue_discard_max_show(struct request_queue *q, char *page)