Commit f29886c2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Keith Busch
Browse files

nvme: fix max_discard_sectors calculation 



ctrl->max_discard_sectors stores a value that is potentially based of
the DMRSL field in Identify Controller, which is in units of LBAs and
thus dependent on the Format of a namespace.

Fix this by moving the calculation of max_discard_sectors entirely
into nvme_config_discard and replacing the ctrl->max_discard_sectors
value with a local variable so that the calculation is always
namespace-specific.

Fixes: 1a86924e ("nvme: fix interpretation of DMRSL")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent a4be9679

drivers/nvme/host/core.c

+9 −11
Original line number Diff line number Diff line
@@ -1727,12 +1727,13 @@ static void nvme_config_discard(struct nvme_ctrl *ctrl, struct gendisk *disk, 
		struct nvme_ns_head *head)

{

	struct request_queue *queue = disk->queue;

	u32 max_discard_sectors;



	if (ctrl->dmrsl && ctrl->dmrsl <= nvme_sect_to_lba(head, UINT_MAX))

		ctrl->max_discard_sectors =

			nvme_lba_to_sect(head, ctrl->dmrsl);



	if (ctrl->max_discard_sectors == 0) {

	if (ctrl->dmrsl && ctrl->dmrsl <= nvme_sect_to_lba(head, UINT_MAX)) {

		max_discard_sectors = nvme_lba_to_sect(head, ctrl->dmrsl);

	} else if (ctrl->oncs & NVME_CTRL_ONCS_DSM) {

		max_discard_sectors = UINT_MAX;

	} else {

		blk_queue_max_discard_sectors(queue, 0);

		return;

	}
@@ -1750,7 +1751,7 @@ static void nvme_config_discard(struct nvme_ctrl *ctrl, struct gendisk *disk, 
	if (queue->limits.max_discard_sectors)

		return;



	blk_queue_max_discard_sectors(queue, ctrl->max_discard_sectors);

	blk_queue_max_discard_sectors(queue, max_discard_sectors);

	blk_queue_max_discard_segments(queue, ctrl->max_discard_segments);

	queue->limits.discard_granularity = queue_logical_block_size(queue);
@@ -2911,13 +2912,10 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl) 
	struct nvme_id_ctrl_nvm *id;

	int ret;



	if (ctrl->oncs & NVME_CTRL_ONCS_DSM) {

		ctrl->max_discard_sectors = UINT_MAX;

	if (ctrl->oncs & NVME_CTRL_ONCS_DSM)

		ctrl->max_discard_segments = NVME_DSM_MAX_RANGES;

	} else {

		ctrl->max_discard_sectors = 0;

	else

		ctrl->max_discard_segments = 0;

	}



	/*

	 * Even though NVMe spec explicitly states that MDTS is not applicable

drivers/nvme/host/nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ struct nvme_ctrl { 
	u32 max_hw_sectors;

	u32 max_segments;

	u32 max_integrity_segments;

	u32 max_discard_sectors;

	u32 max_discard_segments;

	u32 max_zeroes_sectors;

#ifdef CONFIG_BLK_DEV_ZONED