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

Commit 24b9f0cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block driver updates from Jens Axboe:
 "On top of the core pull request, this is the drivers pull request for
  this merge window.  This contains:

   - Switch drivers to the new write back cache API, and kill off the
     flush flags.  From me.

   - Kill the discard support for the STEC pci-e flash driver.  It's
     trivially broken, and apparently unmaintained, so it's safer to
     just remove it.  From Jeff Moyer.

   - A set of lightnvm updates from the usual suspects (Matias/Javier,
     and Simon), and fixes from Arnd, Jeff Mahoney, Sagi, and Wenwei
     Tao.

   - A set of updates for NVMe:

        - Turn the controller state management into a proper state
          machine.  From Christoph.

        - Shuffling of code in preparation for NVMe-over-fabrics, also
          from Christoph.

        - Cleanup of the command prep part from Ming Lin.

        - Rewrite of the discard support from Ming Lin.

        - Deadlock fix for namespace removal from Ming Lin.

        - Use the now exported blk-mq tag helper for IO termination.
          From Sagi.

        - Various little fixes from Christoph, Guilherme, Keith, Ming
          Lin, Wang Sheng-Hui.

   - Convert mtip32xx to use the now exported blk-mq tag iter function,
     from Keith"

* 'for-4.7/drivers' of git://git.kernel.dk/linux-block: (74 commits)
  lightnvm: reserved space calculation incorrect
  lightnvm: rename nr_pages to nr_ppas on nvm_rq
  lightnvm: add is_cached entry to struct ppa_addr
  lightnvm: expose gennvm_mark_blk to targets
  lightnvm: remove mgt targets on mgt removal
  lightnvm: pass dma address to hardware rather than pointer
  lightnvm: do not assume sequential lun alloc.
  nvme/lightnvm: Log using the ctrl named device
  lightnvm: rename dma helper functions
  lightnvm: enable metadata to be sent to device
  lightnvm: do not free unused metadata on rrpc
  lightnvm: fix out of bound ppa lun id on bb tbl
  lightnvm: refactor set_bb_tbl for accepting ppa list
  lightnvm: move responsibility for bad blk mgmt to target
  lightnvm: make nvm_set_rqd_ppalist() aware of vblks
  lightnvm: remove struct factory_blks
  lightnvm: refactor device ops->get_bb_tbl()
  lightnvm: introduce nvm_for_each_lun_ppa() macro
  lightnvm: refactor dev->online_target to global nvm_targets
  lightnvm: rename nvm_targets to nvm_tgt_type
  ...
parents a4d1dbed 116f7d4a

Documentation/block/writeback_cache_control.txt

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ requests that have a payload. For devices with volatile write caches the 
driver needs to tell the block layer that it supports flushing caches by

doing:



	blk_queue_flush(sdkp->disk->queue, REQ_FLUSH);

	blk_queue_write_cache(sdkp->disk->queue, true, false);



and handle empty REQ_FLUSH requests in its prep_fn/request_fn.  Note that

REQ_FLUSH requests with a payload are automatically turned into a sequence
@@ -79,7 +79,7 @@ of an empty REQ_FLUSH request followed by the actual write by the block 
layer.  For devices that also support the FUA bit the block layer needs

to be told to pass through the REQ_FUA bit using:



	blk_queue_flush(sdkp->disk->queue, REQ_FLUSH | REQ_FUA);

	blk_queue_write_cache(sdkp->disk->queue, true, true);



and the driver must handle write requests that have the REQ_FUA bit set

in prep_fn/request_fn.  If the FUA bit is not natively supported the block

arch/um/drivers/ubd_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ static int ubd_add(int n, char **error_out) 
		goto out;

	}

	ubd_dev->queue->queuedata = ubd_dev;

	blk_queue_flush(ubd_dev->queue, REQ_FLUSH);

	blk_queue_write_cache(ubd_dev->queue, true, false);



	blk_queue_max_segments(ubd_dev->queue, MAX_SG);

	err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, &ubd_gendisk[n]);

block/blk-core.c

+2 −1
Original line number Diff line number Diff line
@@ -1964,7 +1964,8 @@ generic_make_request_checks(struct bio *bio) 
	 * drivers without flush support don't have to worry

	 * about them.

	 */

	if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) && !q->flush_flags) {

	if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) &&

	    !test_bit(QUEUE_FLAG_WC, &q->queue_flags)) {

		bio->bi_rw &= ~(REQ_FLUSH | REQ_FUA);

		if (!nr_sectors) {

			err = 0;

block/blk-flush.c

+6 −5
Original line number Diff line number Diff line
@@ -95,17 +95,18 @@ enum { 
static bool blk_kick_flush(struct request_queue *q,

			   struct blk_flush_queue *fq);



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

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

{

	unsigned int policy = 0;



	if (blk_rq_sectors(rq))

		policy |= REQ_FSEQ_DATA;



	if (fflags & REQ_FLUSH) {

	if (fflags & (1UL << QUEUE_FLAG_WC)) {

		if (rq->cmd_flags & REQ_FLUSH)

			policy |= REQ_FSEQ_PREFLUSH;

		if (!(fflags & REQ_FUA) && (rq->cmd_flags & REQ_FUA))

		if (!(fflags & (1UL << QUEUE_FLAG_FUA)) &&

		    (rq->cmd_flags & REQ_FUA))

			policy |= REQ_FSEQ_POSTFLUSH;

	}

	return policy;
@@ -384,7 +385,7 @@ static void mq_flush_data_end_io(struct request *rq, int error) 
void blk_insert_flush(struct request *rq)

{

	struct request_queue *q = rq->q;

	unsigned int fflags = q->flush_flags;	/* may change, cache */

	unsigned long fflags = q->queue_flags;	/* may change, cache */

	unsigned int policy = blk_flush_policy(fflags, rq);

	struct blk_flush_queue *fq = blk_get_flush_queue(q, rq->mq_ctx);
@@ -393,7 +394,7 @@ void blk_insert_flush(struct request *rq) 
	 * REQ_FLUSH and FUA for the driver.

	 */

	rq->cmd_flags &= ~REQ_FLUSH;

	if (!(fflags & REQ_FUA))

	if (!(fflags & (1UL << QUEUE_FLAG_FUA)))

		rq->cmd_flags &= ~REQ_FUA;



	/*

block/blk-mq-tag.c

+2 −3
Original line number Diff line number Diff line
@@ -464,15 +464,14 @@ static void bt_tags_for_each(struct blk_mq_tags *tags, 
	}

}



void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn,

		void *priv)

static void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags,

		busy_tag_iter_fn *fn, void *priv)

{

	if (tags->nr_reserved_tags)

		bt_tags_for_each(tags, &tags->breserved_tags, 0, fn, priv, true);

	bt_tags_for_each(tags, &tags->bitmap_tags, tags->nr_reserved_tags, fn, priv,

			false);

}

EXPORT_SYMBOL(blk_mq_all_tag_busy_iter);



void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset,

		busy_tag_iter_fn *fn, void *priv)