Commit 38adf94e authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

nvme: consolidate chunk_sectors settings 



Move the quirked chunk_sectors setting to the same location as noiob so
one place registers this setting. And since the noiob value is only used
locally, remove the member from struct nvme_ns.

Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b2b2de7c

drivers/nvme/host/core.c

+10 −12
Original line number Diff line number Diff line
@@ -1725,12 +1725,6 @@ static void nvme_init_integrity(struct gendisk *disk, u16 ms, u8 pi_type) 
}

#endif /* CONFIG_BLK_DEV_INTEGRITY */



static void nvme_set_chunk_size(struct nvme_ns *ns)

{

	u32 chunk_size = nvme_lba_to_sect(ns, ns->noiob);

	blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(chunk_size));

}



static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)

{

	struct nvme_ctrl *ctrl = ns->ctrl;
@@ -1885,6 +1879,7 @@ static void nvme_update_disk_info(struct gendisk *disk, 
static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)

{

	struct nvme_ns *ns = disk->private_data;

	u32 iob;



	/*

	 * If identify namespace failed, use default 512 byte block size so
@@ -1893,7 +1888,13 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) 
	ns->lba_shift = id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ds;

	if (ns->lba_shift == 0)

		ns->lba_shift = 9;

	ns->noiob = le16_to_cpu(id->noiob);



	if ((ns->ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) &&

	    is_power_of_2(ns->ctrl->max_hw_sectors))

		iob = ns->ctrl->max_hw_sectors;

	else

		iob = nvme_lba_to_sect(ns, le16_to_cpu(id->noiob));



	ns->ms = le16_to_cpu(id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ms);

	ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT);

	/* the PI implementation requires metadata equal t10 pi tuple size */
@@ -1902,8 +1903,8 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) 
	else

		ns->pi_type = 0;



	if (ns->noiob)

		nvme_set_chunk_size(ns);

	if (iob)

		blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(iob));

	nvme_update_disk_info(disk, ns, id);

#ifdef CONFIG_NVME_MULTIPATH

	if (ns->head->disk) {
@@ -2255,9 +2256,6 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, 
		blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);

		blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));

	}

	if ((ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) &&

	    is_power_of_2(ctrl->max_hw_sectors))

		blk_queue_chunk_sectors(q, ctrl->max_hw_sectors);

	blk_queue_virt_boundary(q, ctrl->page_size - 1);

	if (ctrl->vwc & NVME_CTRL_VWC_PRESENT)

		vwc = true;

drivers/nvme/host/nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -389,7 +389,6 @@ struct nvme_ns { 
#define NVME_NS_REMOVING	0

#define NVME_NS_DEAD     	1

#define NVME_NS_ANA_PENDING	2

	u16 noiob;



	struct nvme_fault_inject fault_inject;

CRA Git | Maintained and supported by SUSTech CRA and CCSE