Commit 513a4bef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block layer updates from Jens Axboe:
 "This is the main pull request for block layer changes in 4.9.

  As mentioned at the last merge window, I've changed things up and now
  do just one branch for core block layer changes, and driver changes.
  This avoids dependencies between the two branches. Outside of this
  main pull request, there are two topical branches coming as well.

  This pull request contains:

   - A set of fixes, and a conversion to blk-mq, of nbd. From Josef.

   - Set of fixes and updates for lightnvm from Matias, Simon, and Arnd.
     Followup dependency fix from Geert.

   - General fixes from Bart, Baoyou, Guoqing, and Linus W.

   - CFQ async write starvation fix from Glauber.

   - Add supprot for delayed kick of the requeue list, from Mike.

   - Pull out the scalable bitmap code from blk-mq-tag.c and make it
     generally available under the name of sbitmap. Only blk-mq-tag uses
     it for now, but the blk-mq scheduling bits will use it as well.
     From Omar.

   - bdev thaw error progagation from Pierre.

   - Improve the blk polling statistics, and allow the user to clear
     them. From Stephen.

   - Set of minor cleanups from Christoph in block/blk-mq.

   - Set of cleanups and optimizations from me for block/blk-mq.

   - Various nvme/nvmet/nvmeof fixes from the various folks"

* 'for-4.9/block' of git://git.kernel.dk/linux-block: (54 commits)
  fs/block_dev.c: return the right error in thaw_bdev()
  nvme: Pass pointers, not dma addresses, to nvme_get/set_features()
  nvme/scsi: Remove power management support
  nvmet: Make dsm number of ranges zero based
  nvmet: Use direct IO for writes
  admin-cmd: Added smart-log command support.
  nvme-fabrics: Add host_traddr options field to host infrastructure
  nvme-fabrics: revise host transport option descriptions
  nvme-fabrics: rework nvmf_get_address() for variable options
  nbd: use BLK_MQ_F_BLOCKING
  blkcg: Annotate blkg_hint correctly
  cfq: fix starvation of asynchronous writes
  blk-mq: add flag for drivers wanting blocking ->queue_rq()
  blk-mq: remove non-blocking pass in blk_mq_map_request
  blk-mq: get rid of manual run of queue with __blk_mq_run_hw_queue()
  block: export bio_free_pages to other modules
  lightnvm: propagate device_add() error code
  lightnvm: expose device geometry through sysfs
  lightnvm: control life of nvm_dev in driver
  blk-mq: register device instead of disk
  ...
parents 87840a2b 997198ba

Documentation/block/biodoc.txt

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ i. Per-queue limits/values exported to the generic layer by the driver 


Various parameters that the generic i/o scheduler logic uses are set at

a per-queue level (e.g maximum request size, maximum number of segments in

a scatter-gather list, hardsect size)

a scatter-gather list, logical block size)



Some parameters that were earlier available as global arrays indexed by

major/minor are now directly associated with the queue. Some of these may
@@ -156,7 +156,7 @@ Some new queue property settings: 
	blk_queue_max_segment_size(q, max_seg_size)

		Maximum size of a clustered segment, 64kB default.



	blk_queue_hardsect_size(q, hardsect_size)

	blk_queue_logical_block_size(q, logical_block_size)

		Lowest possible sector size that the hardware can operate

		on, 512 bytes default.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2472,6 +2472,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git 
S:	Maintained

F:	block/

F:	kernel/trace/blktrace.c

F:	lib/sbitmap.c



BLOCK2MTD DRIVER

M:	Joern Engel <joern@lazybastard.org>

block/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
menuconfig BLOCK

       bool "Enable the block layer" if EXPERT

       default y

       select SBITMAP

       help

	 Provide block layer support for the kernel.

block/bio.c

+3 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static int bio_copy_to_iter(struct bio *bio, struct iov_iter iter) 
	return 0;

}



static void bio_free_pages(struct bio *bio)

void bio_free_pages(struct bio *bio)

{

	struct bio_vec *bvec;

	int i;
@@ -1076,6 +1076,7 @@ static void bio_free_pages(struct bio *bio) 
	bio_for_each_segment_all(bvec, bio, i)

		__free_page(bvec->bv_page);

}

EXPORT_SYMBOL(bio_free_pages);



/**

 *	bio_uncopy_user	-	finish previously mapped bio
@@ -1274,7 +1275,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, 


		nr_pages += end - start;

		/*

		 * buffer must be aligned to at least hardsector size for now

		 * buffer must be aligned to at least logical block size for now

		 */

		if (uaddr & queue_dma_alignment(q))

			return ERR_PTR(-EINVAL);

block/blk-core.c

+13 −3
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ void blk_sync_queue(struct request_queue *q) 
		int i;



		queue_for_each_hw_ctx(q, hctx, i) {

			cancel_delayed_work_sync(&hctx->run_work);

			cancel_work_sync(&hctx->run_work);

			cancel_delayed_work_sync(&hctx->delay_work);

		}

	} else {
@@ -3097,6 +3097,12 @@ int kblockd_schedule_work(struct work_struct *work) 
}

EXPORT_SYMBOL(kblockd_schedule_work);



int kblockd_schedule_work_on(int cpu, struct work_struct *work)

{

	return queue_work_on(cpu, kblockd_workqueue, work);

}

EXPORT_SYMBOL(kblockd_schedule_work_on);



int kblockd_schedule_delayed_work(struct delayed_work *dwork,

				  unsigned long delay)

{
@@ -3301,19 +3307,23 @@ bool blk_poll(struct request_queue *q, blk_qc_t cookie) 
{

	struct blk_plug *plug;

	long state;

	unsigned int queue_num;

	struct blk_mq_hw_ctx *hctx;



	if (!q->mq_ops || !q->mq_ops->poll || !blk_qc_t_valid(cookie) ||

	    !test_bit(QUEUE_FLAG_POLL, &q->queue_flags))

		return false;



	queue_num = blk_qc_t_to_queue_num(cookie);

	hctx = q->queue_hw_ctx[queue_num];

	hctx->poll_considered++;



	plug = current->plug;

	if (plug)

		blk_flush_plug_list(plug, false);



	state = current->state;

	while (!need_resched()) {

		unsigned int queue_num = blk_qc_t_to_queue_num(cookie);

		struct blk_mq_hw_ctx *hctx = q->queue_hw_ctx[queue_num];

		int ret;



		hctx->poll_invoked++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE