Commit 17d084c8 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 for this series. This contains:

   - NVMe pull request from Christoph, one uuid attribute fix, and one
     fix for the controller memory buffer address for remapped BARs.

   - use-after-free fix for bsg, from Benjamin Block.

   - bcache race/use-after-free fix for a list traversal, fixing a
     regression in this merge window. From Coly Li.

   - null_blk change configfs dependency change from a 'depends' to a
     'select'. This is a change from this merge window as well. From me.

   - nbd signal fix from Josef, fixing a regression introduced with the
     status code changes.

   - nbd MAINTAINERS mailing list entry update.

   - blk-throttle stall fix from Joseph Qi.

   - blk-mq-debugfs fix from Omar, fixing an issue where we don't
     register the IO scheduler debugfs directory, if the driver is
     loaded with it. Only shows up if you switch through the sysfs
     interface"

* 'for-linus' of git://git.kernel.dk/linux-block:
  bsg-lib: fix use-after-free under memory-pressure
  nvme-pci: Use PCI bus address for data/queues in CMB
  blk-mq-debugfs: fix device sched directory for default scheduler
  null_blk: change configfs dependency to select
  blk-throttle: fix possible io stall when upgrade to max
  MAINTAINERS: update list for NBD
  nbd: fix -ERESTARTSYS handling
  nvme: fix visibility of "uuid" ns attribute
  bcache: use llist_for_each_entry_safe() in __closure_wake_up()
parents 80cf1f8c d7b544de

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9360,7 +9360,7 @@ NETWORK BLOCK DEVICE (NBD) 
M:	Josef Bacik <jbacik@fb.com>

S:	Maintained

L:	linux-block@vger.kernel.org

L:	nbd-general@lists.sourceforge.net

L:	nbd@other.debian.org

F:	Documentation/blockdev/nbd.txt

F:	drivers/block/nbd.c

F:	include/uapi/linux/nbd.h

block/blk-mq-debugfs.c

+5 −1
Original line number Diff line number Diff line
@@ -815,10 +815,14 @@ int blk_mq_debugfs_register(struct request_queue *q) 
		goto err;



	/*

	 * blk_mq_init_hctx() attempted to do this already, but q->debugfs_dir

	 * blk_mq_init_sched() attempted to do this already, but q->debugfs_dir

	 * didn't exist yet (because we don't know what to name the directory

	 * until the queue is registered to a gendisk).

	 */

	if (q->elevator && !q->sched_debugfs_dir)

		blk_mq_debugfs_register_sched(q);



	/* Similarly, blk_mq_init_hctx() couldn't do this previously. */

	queue_for_each_hw_ctx(q, hctx, i) {

		if (!hctx->debugfs_dir && blk_mq_debugfs_register_hctx(q, hctx))

			goto err;

block/blk-throttle.c

+2 −2
Original line number Diff line number Diff line
@@ -1911,11 +1911,11 @@ static void throtl_upgrade_state(struct throtl_data *td) 


		tg->disptime = jiffies - 1;

		throtl_select_dispatch(sq);

		throtl_schedule_next_dispatch(sq, false);

		throtl_schedule_next_dispatch(sq, true);

	}

	rcu_read_unlock();

	throtl_select_dispatch(&td->service_queue);

	throtl_schedule_next_dispatch(&td->service_queue, false);

	throtl_schedule_next_dispatch(&td->service_queue, true);

	queue_work(kthrotld_workqueue, &td->dispatch_work);

}

block/bsg-lib.c

+21 −6
Original line number Diff line number Diff line
@@ -207,20 +207,34 @@ static int bsg_init_rq(struct request_queue *q, struct request *req, gfp_t gfp) 
	struct bsg_job *job = blk_mq_rq_to_pdu(req);

	struct scsi_request *sreq = &job->sreq;



	/* called right after the request is allocated for the request_queue */



	sreq->sense = kzalloc(SCSI_SENSE_BUFFERSIZE, gfp);

	if (!sreq->sense)

		return -ENOMEM;



	return 0;

}



static void bsg_initialize_rq(struct request *req)

{

	struct bsg_job *job = blk_mq_rq_to_pdu(req);

	struct scsi_request *sreq = &job->sreq;

	void *sense = sreq->sense;



	/* called right before the request is given to the request_queue user */



	memset(job, 0, sizeof(*job));



	scsi_req_init(sreq);



	sreq->sense = sense;

	sreq->sense_len = SCSI_SENSE_BUFFERSIZE;

	sreq->sense = kzalloc(sreq->sense_len, gfp);

	if (!sreq->sense)

		return -ENOMEM;



	job->req = req;

	job->reply = sreq->sense;

	job->reply = sense;

	job->reply_len = sreq->sense_len;

	job->dd_data = job + 1;



	return 0;

}



static void bsg_exit_rq(struct request_queue *q, struct request *req)
@@ -251,6 +265,7 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name, 
	q->cmd_size = sizeof(struct bsg_job) + dd_job_size;

	q->init_rq_fn = bsg_init_rq;

	q->exit_rq_fn = bsg_exit_rq;

	q->initialize_rq_fn = bsg_initialize_rq;

	q->request_fn = bsg_request_fn;



	ret = blk_init_allocated_queue(q);

drivers/block/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ if BLK_DEV 


config BLK_DEV_NULL_BLK

	tristate "Null test block driver"

	depends on CONFIGFS_FS

	select CONFIGFS_FS



config BLK_DEV_FD

	tristate "Normal floppy disk support"

CRA Git | Maintained and supported by SUSTech CRA and CCSE