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

Merge tag 'block-5.10-2020-10-24' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - NVMe pull request from Christoph
     - rdma error handling fixes (Chao Leng)
     - fc error handling and reconnect fixes (James Smart)
     - fix the qid displace when tracing ioctl command (Keith Busch)
     - don't use BLK_MQ_REQ_NOWAIT for passthru (Chaitanya Kulkarni)
     - fix MTDT for passthru (Logan Gunthorpe)
     - blacklist Write Same on more devices (Kai-Heng Feng)
     - fix an uninitialized work struct (zhenwei pi)"

 - lightnvm out-of-bounds fix (Colin)

 - SG allocation leak fix (Doug)

 - rnbd fixes (Gioh, Guoqing, Jack)

 - zone error translation fixes (Keith)

 - kerneldoc markup fix (Mauro)

 - zram lockdep fix (Peter)

 - Kill unused io_context members (Yufen)

 - NUMA memory allocation cleanup (Xianting)

 - NBD config wakeup fix (Xiubo)

* tag 'block-5.10-2020-10-24' of git://git.kernel.dk/linux-block: (27 commits)
  block: blk-mq: fix a kernel-doc markup
  nvme-fc: shorten reconnect delay if possible for FC
  nvme-fc: wait for queues to freeze before calling update_hr_hw_queues
  nvme-fc: fix error loop in create_hw_io_queues
  nvme-fc: fix io timeout to abort I/O
  null_blk: use zone status for max active/open
  nvmet: don't use BLK_MQ_REQ_NOWAIT for passthru
  nvmet: cleanup nvmet_passthru_map_sg()
  nvmet: limit passthru MTDS by BIO_MAX_PAGES
  nvmet: fix uninitialized work for zero kato
  nvme-pci: disable Write Zeroes on Sandisk Skyhawk
  nvme: use queuedata for nvme_req_qid
  nvme-rdma: fix crash due to incorrect cqe
  nvme-rdma: fix crash when connect rejected
  block: remove unused members for io_context
  blk-mq: remove the calling of local_memory_node()
  zram: Fix __zram_bvec_{read,write}() locking order
  skd_main: remove unused including <linux/version.h>
  sgl_alloc_order: fix memory leak
  lightnvm: fix out-of-bounds write to array devices->info[]
  ...
parents af004187 24f7bb88

Documentation/block/queue-sysfs.rst

+8 −0
Original line number Diff line number Diff line
@@ -124,6 +124,10 @@ For zoned block devices (zoned attribute indicating "host-managed" or 
EXPLICIT OPEN, IMPLICIT OPEN or CLOSED, is limited by this value.

If this value is 0, there is no limit.



If the host attempts to exceed this limit, the driver should report this error

with BLK_STS_ZONE_ACTIVE_RESOURCE, which user space may see as the EOVERFLOW

errno.



max_open_zones (RO)

-------------------

For zoned block devices (zoned attribute indicating "host-managed" or
@@ -131,6 +135,10 @@ For zoned block devices (zoned attribute indicating "host-managed" or 
EXPLICIT OPEN or IMPLICIT OPEN, is limited by this value.

If this value is 0, there is no limit.



If the host attempts to exceed this limit, the driver should report this error

with BLK_STS_ZONE_OPEN_RESOURCE, which user space may see as the ETOOMANYREFS

errno.



max_sectors_kb (RW)

-------------------

This is the maximum number of kilobytes that the block layer will allow

block/blk-core.c

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ static const struct { 
	/* device mapper special case, should not leak out: */

	[BLK_STS_DM_REQUEUE]	= { -EREMCHG, "dm internal retry" },



	/* zone device specific errors */

	[BLK_STS_ZONE_OPEN_RESOURCE]	= { -ETOOMANYREFS, "open zones exceeded" },

	[BLK_STS_ZONE_ACTIVE_RESOURCE]	= { -EOVERFLOW, "active zones exceeded" },



	/* everything else not covered above: */

	[BLK_STS_IOERR]		= { -EIO,	"I/O" },

};

block/blk-mq-cpumap.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ int blk_mq_hw_queue_to_node(struct blk_mq_queue_map *qmap, unsigned int index) 


	for_each_possible_cpu(i) {

		if (index == qmap->mq_map[i])

			return local_memory_node(cpu_to_node(i));

			return cpu_to_node(i);

	}



	return NUMA_NO_NODE;

block/blk-mq.c

+2 −2
Original line number Diff line number Diff line
@@ -1664,7 +1664,7 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) 
EXPORT_SYMBOL(blk_mq_run_hw_queue);



/**

 * blk_mq_run_hw_queue - Run all hardware queues in a request queue.

 * blk_mq_run_hw_queues - Run all hardware queues in a request queue.

 * @q: Pointer to the request queue to run.

 * @async: If we want to run the queue asynchronously.

 */
@@ -2743,7 +2743,7 @@ static void blk_mq_init_cpu_queues(struct request_queue *q, 
		for (j = 0; j < set->nr_maps; j++) {

			hctx = blk_mq_map_queue_type(q, j, i);

			if (nr_hw_queues > 1 && hctx->numa_node == NUMA_NO_NODE)

				hctx->numa_node = local_memory_node(cpu_to_node(i));

				hctx->numa_node = cpu_to_node(i);

		}

	}

}

drivers/block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -802,9 +802,9 @@ static void recv_work(struct work_struct *work) 
		if (likely(!blk_should_fake_timeout(rq->q)))

			blk_mq_complete_request(rq);

	}

	nbd_config_put(nbd);

	atomic_dec(&config->recv_threads);

	wake_up(&config->recv_wq);

	nbd_config_put(nbd);

	kfree(args);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE