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

Merge tag 'block-5.18-2022-04-15' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Moving of lower_48_bits() to the block layer and a fix for the
   unaligned_be48 added with that originally (Alexander, Keith)

 - Fix a bad WARN_ON() for trim size checking (Ming)

 - A polled IO timeout fix for null_blk (Ming)

 - Silence IO error printing for dead disks (Christoph)

 - Compat mode range fix (Khazhismel)

 - NVMe pull request via Christoph:
     - Tone down the error logging added this merge window a bit
       (Chaitanya Kulkarni)
     - Quirk devices with non-unique unique identifiers (Christoph)

* tag 'block-5.18-2022-04-15' of git://git.kernel.dk/linux-block:
  block: don't print I/O error warning for dead disks
  block/compat_ioctl: fix range check in BLKGETSIZE
  nvme-pci: disable namespace identifiers for Qemu controllers
  nvme-pci: disable namespace identifiers for the MAXIO MAP1002/1202
  nvme: add a quirk to disable namespace identifiers
  nvme: don't print verbose errors for internal passthrough requests
  block: null_blk: end timed out poll request
  block: fix offset/size check in bio_trim()
  asm-generic: fix __get_unaligned_be48() on 32 bit platforms
  block: move lower_48_bits() to block
parents 0647b9cc 89a2ee91

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -1598,7 +1598,7 @@ EXPORT_SYMBOL(bio_split); 
void bio_trim(struct bio *bio, sector_t offset, sector_t size)

{

	if (WARN_ON_ONCE(offset > BIO_MAX_SECTORS || size > BIO_MAX_SECTORS ||

			 offset + size > bio->bi_iter.bi_size))

			 offset + size > bio_sectors(bio)))

		return;



	size <<= 9;

block/blk-mq.c

+2 −1
Original line number Diff line number Diff line
@@ -794,7 +794,8 @@ bool blk_update_request(struct request *req, blk_status_t error, 
#endif



	if (unlikely(error && !blk_rq_is_passthrough(req) &&

		     !(req->rq_flags & RQF_QUIET))) {

		     !(req->rq_flags & RQF_QUIET)) &&

		     !test_bit(GD_DEAD, &req->q->disk->state)) {

		blk_print_req_error(req, error);

		trace_block_rq_error(req, error, nr_bytes);

	}

block/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
		return compat_put_long(argp,

			(bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512);

	case BLKGETSIZE:

		if (bdev_nr_sectors(bdev) > ~0UL)

		if (bdev_nr_sectors(bdev) > ~(compat_ulong_t)0)

			return -EFBIG;

		return compat_put_ulong(argp, bdev_nr_sectors(bdev));

drivers/block/null_blk/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1600,7 +1600,7 @@ static enum blk_eh_timer_return null_timeout_rq(struct request *rq, bool res) 
	 * Only fake timeouts need to execute blk_mq_complete_request() here.

	 */

	cmd->error = BLK_STS_TIMEOUT;

	if (cmd->fake_timeout)

	if (cmd->fake_timeout || hctx->type == HCTX_TYPE_POLL)

		blk_mq_complete_request(rq);

	return BLK_EH_DONE;

}

drivers/nvme/host/core.c

+20 −7
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static inline void nvme_end_req(struct request *req) 
{

	blk_status_t status = nvme_error_status(nvme_req(req)->status);



	if (unlikely(nvme_req(req)->status != NVME_SC_SUCCESS))

	if (unlikely(nvme_req(req)->status && !(req->rq_flags & RQF_QUIET)))

		nvme_log_error(req);

	nvme_end_req_zoned(req);

	nvme_trace_bio_complete(req);
@@ -1015,6 +1015,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
			goto out;

	}



	req->rq_flags |= RQF_QUIET;

	ret = nvme_execute_rq(req, at_head);

	if (result && ret >= 0)

		*result = nvme_req(req)->result;
@@ -1287,6 +1288,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, 
				 warn_str, cur->nidl);

			return -1;

		}

		if (ctrl->quirks & NVME_QUIRK_BOGUS_NID)

			return NVME_NIDT_EUI64_LEN;

		memcpy(ids->eui64, data + sizeof(*cur), NVME_NIDT_EUI64_LEN);

		return NVME_NIDT_EUI64_LEN;

	case NVME_NIDT_NGUID:
@@ -1295,6 +1298,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, 
				 warn_str, cur->nidl);

			return -1;

		}

		if (ctrl->quirks & NVME_QUIRK_BOGUS_NID)

			return NVME_NIDT_NGUID_LEN;

		memcpy(ids->nguid, data + sizeof(*cur), NVME_NIDT_NGUID_LEN);

		return NVME_NIDT_NGUID_LEN;

	case NVME_NIDT_UUID:
@@ -1303,6 +1308,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, 
				 warn_str, cur->nidl);

			return -1;

		}

		if (ctrl->quirks & NVME_QUIRK_BOGUS_NID)

			return NVME_NIDT_UUID_LEN;

		uuid_copy(&ids->uuid, data + sizeof(*cur));

		return NVME_NIDT_UUID_LEN;

	case NVME_NIDT_CSI:
@@ -1399,12 +1406,18 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
	if ((*id)->ncap == 0) /* namespace not allocated or attached */

		goto out_free_id;





	if (ctrl->quirks & NVME_QUIRK_BOGUS_NID) {

		dev_info(ctrl->device,

			 "Ignoring bogus Namespace Identifiers\n");

	} else {

		if (ctrl->vs >= NVME_VS(1, 1, 0) &&

		    !memchr_inv(ids->eui64, 0, sizeof(ids->eui64)))

			memcpy(ids->eui64, (*id)->eui64, sizeof(ids->eui64));

		if (ctrl->vs >= NVME_VS(1, 2, 0) &&

		    !memchr_inv(ids->nguid, 0, sizeof(ids->nguid)))

			memcpy(ids->nguid, (*id)->nguid, sizeof(ids->nguid));

	}



	return 0;