Commit 61789765 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-3.16/core' into for-3.16/drivers 



mtip32xx uses blk_mq_alloc_reserved_request(), so pull in the
core changes so we have a properly merged end result.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parents 6314a108 d852564f

Documentation/DocBook/filesystems.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
!Efs/mpage.c

!Efs/namei.c

!Efs/buffer.c

!Efs/bio.c

!Eblock/bio.c

!Efs/seq_file.c

!Efs/filesystems.c

!Efs/fs-writeback.c

block/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -2,13 +2,15 @@ 
# Makefile for the kernel block layer

#



obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \

obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \

			blk-flush.o blk-settings.o blk-ioc.o blk-map.o \

			blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \

			blk-iopoll.o blk-lib.o blk-mq.o blk-mq-tag.o \

			blk-mq-sysfs.o blk-mq-cpu.o blk-mq-cpumap.o ioctl.o \

			genhd.o scsi_ioctl.o partition-generic.o partitions/

			genhd.o scsi_ioctl.o partition-generic.o ioprio.o \

			partitions/



obj-$(CONFIG_BOUNCE)	+= bounce.o

obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o

obj-$(CONFIG_BLK_DEV_BSGLIB)	+= bsg-lib.o

obj-$(CONFIG_BLK_CGROUP)	+= blk-cgroup.o
@@ -20,3 +22,4 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o 
obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o

obj-$(CONFIG_BLK_DEV_INTEGRITY)	+= blk-integrity.o

obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o

obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o

fs/bio-integrity.c→block/bio-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ int bioset_integrity_create(struct bio_set *bs, int pool_size) 
	if (!bs->bio_integrity_pool)

		return -1;



	bs->bvec_integrity_pool = biovec_create_pool(bs, pool_size);

	bs->bvec_integrity_pool = biovec_create_pool(pool_size);

	if (!bs->bvec_integrity_pool) {

		mempool_destroy(bs->bio_integrity_pool);

		return -1;

fs/bio.c→block/bio.c

+6 −5
Original line number Diff line number Diff line
@@ -305,6 +305,8 @@ static void bio_chain_endio(struct bio *bio, int error) 


/**

 * bio_chain - chain bio completions

 * @bio: the target bio

 * @parent: the @bio's parent bio

 *

 * The caller won't have a bi_end_io called when @bio completes - instead,

 * @parent's bi_end_io won't be called until both @parent and @bio have
@@ -1011,8 +1013,7 @@ static void bio_set_map_data(struct bio_map_data *bmd, struct bio *bio, 
	bio->bi_private = bmd;

}



static struct bio_map_data *bio_alloc_map_data(int nr_segs,

					       unsigned int iov_count,

static struct bio_map_data *bio_alloc_map_data(unsigned int iov_count,

					       gfp_t gfp_mask)

{

	if (iov_count > UIO_MAXIOV)
@@ -1154,7 +1155,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, 
	if (offset)

		nr_pages++;



	bmd = bio_alloc_map_data(nr_pages, iov_count, gfp_mask);

	bmd = bio_alloc_map_data(iov_count, gfp_mask);

	if (!bmd)

		return ERR_PTR(-ENOMEM);
@@ -1859,7 +1860,7 @@ EXPORT_SYMBOL_GPL(bio_trim); 
 * create memory pools for biovec's in a bio_set.

 * use the global biovec slabs created for general use.

 */

mempool_t *biovec_create_pool(struct bio_set *bs, int pool_entries)

mempool_t *biovec_create_pool(int pool_entries)

{

	struct biovec_slab *bp = bvec_slabs + BIOVEC_MAX_IDX;
@@ -1922,7 +1923,7 @@ struct bio_set *bioset_create(unsigned int pool_size, unsigned int front_pad) 
	if (!bs->bio_pool)

		goto bad;



	bs->bvec_pool = biovec_create_pool(bs, pool_size);

	bs->bvec_pool = biovec_create_pool(pool_size);

	if (!bs->bvec_pool)

		goto bad;

block/blk-core.c

+52 −13
Original line number Diff line number Diff line
@@ -576,12 +576,9 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 
	if (!q)

		return NULL;



	if (percpu_counter_init(&q->mq_usage_counter, 0))

		goto fail_q;



	q->id = ida_simple_get(&blk_queue_ida, 0, 0, gfp_mask);

	if (q->id < 0)

		goto fail_c;

		goto fail_q;



	q->backing_dev_info.ra_pages =

			(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
@@ -639,8 +636,6 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 
	bdi_destroy(&q->backing_dev_info);

fail_id:

	ida_simple_remove(&blk_queue_ida, q->id);

fail_c:

	percpu_counter_destroy(&q->mq_usage_counter);

fail_q:

	kmem_cache_free(blk_requestq_cachep, q);

	return NULL;
@@ -848,6 +843,47 @@ static void freed_request(struct request_list *rl, unsigned int flags) 
		__freed_request(rl, sync ^ 1);

}



int blk_update_nr_requests(struct request_queue *q, unsigned int nr)

{

	struct request_list *rl;



	spin_lock_irq(q->queue_lock);

	q->nr_requests = nr;

	blk_queue_congestion_threshold(q);



	/* congestion isn't cgroup aware and follows root blkcg for now */

	rl = &q->root_rl;



	if (rl->count[BLK_RW_SYNC] >= queue_congestion_on_threshold(q))

		blk_set_queue_congested(q, BLK_RW_SYNC);

	else if (rl->count[BLK_RW_SYNC] < queue_congestion_off_threshold(q))

		blk_clear_queue_congested(q, BLK_RW_SYNC);



	if (rl->count[BLK_RW_ASYNC] >= queue_congestion_on_threshold(q))

		blk_set_queue_congested(q, BLK_RW_ASYNC);

	else if (rl->count[BLK_RW_ASYNC] < queue_congestion_off_threshold(q))

		blk_clear_queue_congested(q, BLK_RW_ASYNC);



	blk_queue_for_each_rl(rl, q) {

		if (rl->count[BLK_RW_SYNC] >= q->nr_requests) {

			blk_set_rl_full(rl, BLK_RW_SYNC);

		} else {

			blk_clear_rl_full(rl, BLK_RW_SYNC);

			wake_up(&rl->wait[BLK_RW_SYNC]);

		}



		if (rl->count[BLK_RW_ASYNC] >= q->nr_requests) {

			blk_set_rl_full(rl, BLK_RW_ASYNC);

		} else {

			blk_clear_rl_full(rl, BLK_RW_ASYNC);

			wake_up(&rl->wait[BLK_RW_ASYNC]);

		}

	}



	spin_unlock_irq(q->queue_lock);

	return 0;

}



/*

 * Determine if elevator data should be initialized when allocating the

 * request associated with @bio.
@@ -1137,7 +1173,7 @@ static struct request *blk_old_get_request(struct request_queue *q, int rw, 
struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask)

{

	if (q->mq_ops)

		return blk_mq_alloc_request(q, rw, gfp_mask);

		return blk_mq_alloc_request(q, rw, gfp_mask, false);

	else

		return blk_old_get_request(q, rw, gfp_mask);

}
@@ -1233,12 +1269,15 @@ static void add_acct_request(struct request_queue *q, struct request *rq, 
static void part_round_stats_single(int cpu, struct hd_struct *part,

				    unsigned long now)

{

	int inflight;



	if (now == part->stamp)

		return;



	if (part_in_flight(part)) {

	inflight = part_in_flight(part);

	if (inflight) {

		__part_stat_add(cpu, part, time_in_queue,

				part_in_flight(part) * (now - part->stamp));

				inflight * (now - part->stamp));

		__part_stat_add(cpu, part, io_ticks, (now - part->stamp));

	}

	part->stamp = now;
@@ -1427,6 +1466,8 @@ bool bio_attempt_front_merge(struct request_queue *q, struct request *req, 
 * added on the elevator at this point.  In addition, we don't have

 * reliable access to the elevator outside queue lock.  Only check basic

 * merging parameters without querying the elevator.

 *

 * Caller must ensure !blk_queue_nomerges(q) beforehand.

 */

bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,

			    unsigned int *request_count)
@@ -1436,9 +1477,6 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, 
	bool ret = false;

	struct list_head *plug_list;



	if (blk_queue_nomerges(q))

		goto out;



	plug = current->plug;

	if (!plug)

		goto out;
@@ -1517,7 +1555,8 @@ void blk_queue_bio(struct request_queue *q, struct bio *bio) 
	 * Check if we can merge with the plugged list before grabbing

	 * any locks.

	 */

	if (blk_attempt_plug_merge(q, bio, &request_count))

	if (!blk_queue_nomerges(q) &&

	    blk_attempt_plug_merge(q, bio, &request_count))

		return;



	spin_lock_irq(q->queue_lock);