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

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

Pull block fixes from Jens Axboe:
 "A few fixes for this merge window, where some of them should go in
  sooner rather than later, hence a new pull this week. This pull
  request contains:

   - Set of NVMe fixes, mostly follow up cleanups/fixes to the queue
     changes, but also teardown/removal and misc changes (Christop/Dan/
     Johannes/Sagi/Steve).

   - Two lightnvm fixes for issues that showed up in this window
     (Colin/Wei).

   - Failfast/driver flags inheritance for flush requests (Hannes).

   - The md device put sanitization and fix (Kent).

   - dm bio_set inheritance fix (me).

   - nbd discard granularity fix (Josef).

   - nbd consistency in command printing (Kevin).

   - Loop recursion validation fix (Ted).

   - Partition overlap check (Wang)"

[ .. and now my build is warning-free again thanks to the md fix  - Linus ]

* tag 'for-linus-20180608' of git://git.kernel.dk/linux-block: (22 commits)
  nvme: cleanup double shift issue
  nvme-pci: make CMB SQ mod-param read-only
  nvme-pci: unquiesce dead controller queues
  nvme-pci: remove HMB teardown on reset
  nvme-pci: queue creation fixes
  nvme-pci: remove unnecessary completion doorbell check
  nvme-pci: remove unnecessary nested locking
  nvmet: filter newlines from user input
  nvme-rdma: correctly check for target keyed sgl support
  nvme: don't hold nvmf_transports_rwsem for more than transport lookups
  nvmet: return all zeroed buffer when we can't find an active namespace
  md: Unify mddev destruction paths
  dm: use bioset_init_from_src() to copy bio_set
  block: add bioset_init_from_src() helper
  block: always set partition number to '0' in blk_partition_remap()
  block: pass failfast and driver-specific flags to flush requests
  nbd: set discard_alignment to the granularity
  nbd: Consistently use request pointer in debug messages.
  block: add verifier for cmdline partition
  lightnvm: pblk: fix resource leak of invalid_bitmap
  ...
parents 68cc38ff 77016199

block/bio.c

+18 −0
Original line number Diff line number Diff line
@@ -1997,6 +1997,24 @@ bad: 
}

EXPORT_SYMBOL(bioset_init);



/*

 * Initialize and setup a new bio_set, based on the settings from

 * another bio_set.

 */

int bioset_init_from_src(struct bio_set *bs, struct bio_set *src)

{

	int flags;



	flags = 0;

	if (src->bvec_pool.min_nr)

		flags |= BIOSET_NEED_BVECS;

	if (src->rescue_workqueue)

		flags |= BIOSET_NEED_RESCUER;



	return bioset_init(bs, src->bio_pool.min_nr, src->front_pad, flags);

}

EXPORT_SYMBOL(bioset_init_from_src);



#ifdef CONFIG_BLK_CGROUP



/**

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2220,10 +2220,10 @@ static inline int blk_partition_remap(struct bio *bio) 
		if (bio_check_eod(bio, part_nr_sects_read(p)))

			goto out;

		bio->bi_iter.bi_sector += p->start_sect;

		bio->bi_partno = 0;

		trace_block_bio_remap(bio->bi_disk->queue, bio, part_devt(p),

				      bio->bi_iter.bi_sector - p->start_sect);

	}

	bio->bi_partno = 0;

	ret = 0;

out:

	rcu_read_unlock();

block/blk-flush.c

+6 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ enum { 
};



static bool blk_kick_flush(struct request_queue *q,

			   struct blk_flush_queue *fq);

			   struct blk_flush_queue *fq, unsigned int flags);



static unsigned int blk_flush_policy(unsigned long fflags, struct request *rq)

{
@@ -212,7 +212,7 @@ static bool blk_flush_complete_seq(struct request *rq, 
		BUG();

	}



	kicked = blk_kick_flush(q, fq);

	kicked = blk_kick_flush(q, fq, rq->cmd_flags);

	return kicked | queued;

}
@@ -281,6 +281,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error) 
 * blk_kick_flush - consider issuing flush request

 * @q: request_queue being kicked

 * @fq: flush queue

 * @flags: cmd_flags of the original request

 *

 * Flush related states of @q have changed, consider issuing flush request.

 * Please read the comment at the top of this file for more info.
@@ -291,7 +292,8 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error) 
 * RETURNS:

 * %true if flush was issued, %false otherwise.

 */

static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq)

static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq,

			   unsigned int flags)

{

	struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx];

	struct request *first_rq =
@@ -346,6 +348,7 @@ static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq) 
	}



	flush_rq->cmd_flags = REQ_OP_FLUSH | REQ_PREFLUSH;

	flush_rq->cmd_flags |= (flags & REQ_DRV) | (flags & REQ_FAILFAST_MASK);

	flush_rq->rq_flags |= RQF_FLUSH_SEQ;

	flush_rq->rq_disk = first_rq->rq_disk;

	flush_rq->end_io = flush_end_io;

block/partitions/cmdline.c

+57 −0
Original line number Diff line number Diff line
@@ -58,6 +58,62 @@ static int __init cmdline_parts_setup(char *s) 
}

__setup("blkdevparts=", cmdline_parts_setup);



static bool has_overlaps(sector_t from, sector_t size,

			 sector_t from2, sector_t size2)

{

	sector_t end = from + size;

	sector_t end2 = from2 + size2;



	if (from >= from2 && from < end2)

		return true;



	if (end > from2 && end <= end2)

		return true;



	if (from2 >= from && from2 < end)

		return true;



	if (end2 > from && end2 <= end)

		return true;



	return false;

}



static inline void overlaps_warns_header(void)

{

	pr_warn("Overlapping partitions are used in command line partitions.");

	pr_warn("Don't use filesystems on overlapping partitions:");

}



static void cmdline_parts_verifier(int slot, struct parsed_partitions *state)

{

	int i;

	bool header = true;



	for (; slot < state->limit && state->parts[slot].has_info; slot++) {

		for (i = slot+1; i < state->limit && state->parts[i].has_info;

		     i++) {

			if (has_overlaps(state->parts[slot].from,

					 state->parts[slot].size,

					 state->parts[i].from,

					 state->parts[i].size)) {

				if (header) {

					header = false;

					overlaps_warns_header();

				}

				pr_warn("%s[%llu,%llu] overlaps with "

					"%s[%llu,%llu].",

					state->parts[slot].info.volname,

					(u64)state->parts[slot].from << 9,

					(u64)state->parts[slot].size << 9,

					state->parts[i].info.volname,

					(u64)state->parts[i].from << 9,

					(u64)state->parts[i].size << 9);

			}

		}

	}

}



/*

 * Purpose: allocate cmdline partitions.

 * Returns:
@@ -93,6 +149,7 @@ int cmdline_partition(struct parsed_partitions *state) 
	disk_size = get_capacity(state->bdev->bd_disk) << 9;



	cmdline_parts_set(parts, disk_size, 1, add_part, (void *)state);

	cmdline_parts_verifier(1, state);



	strlcat(state->pp_buf, "\n", PAGE_SIZE);

drivers/block/loop.c

+38 −30
Original line number Diff line number Diff line
@@ -647,6 +647,36 @@ static void loop_reread_partitions(struct loop_device *lo, 
			__func__, lo->lo_number, lo->lo_file_name, rc);

}



static inline int is_loop_device(struct file *file)

{

	struct inode *i = file->f_mapping->host;



	return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;

}



static int loop_validate_file(struct file *file, struct block_device *bdev)

{

	struct inode	*inode = file->f_mapping->host;

	struct file	*f = file;



	/* Avoid recursion */

	while (is_loop_device(f)) {

		struct loop_device *l;



		if (f->f_mapping->host->i_bdev == bdev)

			return -EBADF;



		l = f->f_mapping->host->i_bdev->bd_disk->private_data;

		if (l->lo_state == Lo_unbound) {

			return -EINVAL;

		}

		f = l->lo_backing_file;

	}

	if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))

		return -EINVAL;

	return 0;

}



/*

 * loop_change_fd switched the backing store of a loopback device to

 * a new file. This is useful for operating system installers to free up
@@ -676,14 +706,15 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, 
	if (!file)

		goto out;



	error = loop_validate_file(file, bdev);

	if (error)

		goto out_putf;



	inode = file->f_mapping->host;

	old_file = lo->lo_backing_file;



	error = -EINVAL;



	if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))

		goto out_putf;



	/* size of the new backing store needs to be the same */

	if (get_loop_size(lo, file) != get_loop_size(lo, old_file))

		goto out_putf;
@@ -709,13 +740,6 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, 
	return error;

}



static inline int is_loop_device(struct file *file)

{

	struct inode *i = file->f_mapping->host;



	return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;

}



/* loop sysfs attributes */



static ssize_t loop_attr_show(struct device *dev, char *page,
@@ -881,7 +905,7 @@ static int loop_prepare_queue(struct loop_device *lo) 
static int loop_set_fd(struct loop_device *lo, fmode_t mode,

		       struct block_device *bdev, unsigned int arg)

{

	struct file	*file, *f;

	struct file	*file;

	struct inode	*inode;

	struct address_space *mapping;

	int		lo_flags = 0;
@@ -900,29 +924,13 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, 
	if (lo->lo_state != Lo_unbound)

		goto out_putf;



	/* Avoid recursion */

	f = file;

	while (is_loop_device(f)) {

		struct loop_device *l;



		if (f->f_mapping->host->i_bdev == bdev)

			goto out_putf;



		l = f->f_mapping->host->i_bdev->bd_disk->private_data;

		if (l->lo_state == Lo_unbound) {

			error = -EINVAL;

	error = loop_validate_file(file, bdev);

	if (error)

		goto out_putf;

		}

		f = l->lo_backing_file;

	}



	mapping = file->f_mapping;

	inode = mapping->host;



	error = -EINVAL;

	if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))

		goto out_putf;



	if (!(file->f_mode & FMODE_WRITE) || !(mode & FMODE_WRITE) ||

	    !file->f_op->write_iter)

		lo_flags |= LO_FLAGS_READ_ONLY;

CRA Git | Maintained and supported by SUSTech CRA and CCSE