Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 063cc6d5 authored by Matthew Wilcox's avatar Matthew Wilcox
Browse files

NVMe: Abstract out sector to block number conversion 



Introduce nvme_block_nr() to help convert sectors to block numbers.
This fixes an integer overflow in the SCSI conversion layer, and it's
slightly less typing than opencoding it.

Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
Acked-by: default avatarKeith Busch <keith.busch@intel.com>
parent acb7aa0d

drivers/block/nvme-core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -477,7 +477,7 @@ static int nvme_submit_discard(struct nvme_queue *nvmeq, struct nvme_ns *ns, 




	range->cattr = cpu_to_le32(0);

	range->cattr = cpu_to_le32(0);

	range->nlb = cpu_to_le32(bio->bi_size >> ns->lba_shift);

	range->nlb = cpu_to_le32(bio->bi_size >> ns->lba_shift);

	range->slba = cpu_to_le64(bio->bi_sector >> (ns->lba_shift - 9));

	range->slba = cpu_to_le64(nvme_block_nr(ns, bio->bi_sector));





	memset(cmnd, 0, sizeof(*cmnd));

	memset(cmnd, 0, sizeof(*cmnd));

	cmnd->dsm.opcode = nvme_cmd_dsm;

	cmnd->dsm.opcode = nvme_cmd_dsm;
@@ -590,7 +590,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns, 
	cmnd->rw.nsid = cpu_to_le32(ns->ns_id);

	cmnd->rw.nsid = cpu_to_le32(ns->ns_id);

	length = nvme_setup_prps(nvmeq->dev, &cmnd->common, iod, length,

	length = nvme_setup_prps(nvmeq->dev, &cmnd->common, iod, length,

								GFP_ATOMIC);

								GFP_ATOMIC);

	cmnd->rw.slba = cpu_to_le64(bio->bi_sector >> (ns->lba_shift - 9));

	cmnd->rw.slba = cpu_to_le64(nvme_block_nr(ns, bio->bi_sector));

	cmnd->rw.length = cpu_to_le16((length >> ns->lba_shift) - 1);

	cmnd->rw.length = cpu_to_le16((length >> ns->lba_shift) - 1);

	cmnd->rw.control = cpu_to_le16(control);

	cmnd->rw.control = cpu_to_le16(control);

	cmnd->rw.dsmgmt = cpu_to_le32(dsmgmt);

	cmnd->rw.dsmgmt = cpu_to_le32(dsmgmt);

drivers/block/nvme-scsi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2040,7 +2040,7 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr, 
	struct nvme_command c;

	struct nvme_command c;

	u8 opcode = (is_write ? nvme_cmd_write : nvme_cmd_read);

	u8 opcode = (is_write ? nvme_cmd_write : nvme_cmd_read);

	u16 control;

	u16 control;

	u32 max_blocks = (dev->max_hw_sectors << 9) >> ns->lba_shift;

	u32 max_blocks = nvme_block_nr(ns, dev->max_hw_sectors);





	num_cmds = nvme_trans_io_get_num_cmds(hdr, cdb_info, max_blocks);

	num_cmds = nvme_trans_io_get_num_cmds(hdr, cdb_info, max_blocks);

include/linux/nvme.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -566,6 +566,11 @@ struct nvme_iod { 
	struct scatterlist sg[0];

	struct scatterlist sg[0];

};

};





static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector)

{

	return (sector >> (ns->lba_shift - 9));

}



/**

/**

 * nvme_free_iod - frees an nvme_iod

 * nvme_free_iod - frees an nvme_iod

 * @dev: The device that the I/O was submitted to

 * @dev: The device that the I/O was submitted to