Commit 602079a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.10-20240607' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - Fix for null_blk block size validation (Andreas)

 - NVMe pull request via Keith:
      - Use reserved tags for special fabrics operations (Chunguang)
      - Persistent Reservation status masking fix (Weiwen)

* tag 'block-6.10-20240607' of git://git.kernel.dk/linux:
  null_blk: fix validation of block size
  nvme: fix nvme_pr_* status code parsing
  nvme-fabrics: use reserved tag for reg read/write command
parents e3391589 27d02423

drivers/block/null_blk/main.c

+2 −2
Original line number Diff line number Diff line
@@ -1824,8 +1824,8 @@ static int null_validate_conf(struct nullb_device *dev) 
		dev->queue_mode = NULL_Q_MQ;

	}



	dev->blocksize = round_down(dev->blocksize, 512);

	dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);

	if (blk_validate_block_size(dev->blocksize))

		return -EINVAL;



	if (dev->use_per_node_hctx) {

		if (dev->submit_queues != nr_online_nodes)

drivers/nvme/host/fabrics.c

+3 −3
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 *val) 
	cmd.prop_get.offset = cpu_to_le32(off);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0,

			NVME_QID_ANY, 0);

			NVME_QID_ANY, NVME_SUBMIT_RESERVED);



	if (ret >= 0)

		*val = le64_to_cpu(res.u64);
@@ -226,7 +226,7 @@ int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val) 
	cmd.prop_get.offset = cpu_to_le32(off);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0,

			NVME_QID_ANY, 0);

			NVME_QID_ANY, NVME_SUBMIT_RESERVED);



	if (ret >= 0)

		*val = le64_to_cpu(res.u64);
@@ -271,7 +271,7 @@ int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val) 
	cmd.prop_set.value = cpu_to_le64(val);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, NULL, NULL, 0,

			NVME_QID_ANY, 0);

			NVME_QID_ANY, NVME_SUBMIT_RESERVED);

	if (unlikely(ret))

		dev_err(ctrl->device,

			"Property Set error: %d, offset %#x\n",

drivers/nvme/host/pr.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int nvme_sc_to_pr_err(int nvme_sc) 
	if (nvme_is_path_error(nvme_sc))

		return PR_STS_PATH_FAILED;



	switch (nvme_sc) {

	switch (nvme_sc & 0x7ff) {

	case NVME_SC_SUCCESS:

		return PR_STS_SUCCESS;

	case NVME_SC_RESERVATION_CONFLICT: