* [PATCH 0/2] Small cleanups
@ 2019-10-20 23:42 Damien Le Moal
2019-10-20 23:42 ` [PATCH 1/2] nvme: Cleanup nvme_block_nr() Damien Le Moal
2019-10-20 23:42 ` [PATCH 2/2] nvme: Introduce nvme_block_sect() Damien Le Moal
0 siblings, 2 replies; 5+ messages in thread
From: Damien Le Moal @ 2019-10-20 23:42 UTC (permalink / raw)
To: linux-nvme, Christoph Hellwig, Keith Busch, Sagi Grimberg,
linux-block, Jens Axboe
This is series is a couple of cleanup patches. The first one cleans up
the helper function nvme_block_nr() using SECTOR_SHIFT instead of the
hard coded value 9. The second patch introduces the nvme_block_sect()
helper to convert a device block number into a 512B sector value.
Please consider this series for kernel 5.5.
Damien Le Moal (2):
nvme: Cleanup nvme_block_nr()
nvme: Introduce nvme_block_sect()
drivers/nvme/host/core.c | 14 +++++++-------
drivers/nvme/host/nvme.h | 13 ++++++++++++-
2 files changed, 19 insertions(+), 8 deletions(-)
--
2.21.0
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] nvme: Cleanup nvme_block_nr()
2019-10-20 23:42 [PATCH 0/2] Small cleanups Damien Le Moal
@ 2019-10-20 23:42 ` Damien Le Moal
2019-10-21 2:13 ` Bart Van Assche
2019-10-20 23:42 ` [PATCH 2/2] nvme: Introduce nvme_block_sect() Damien Le Moal
1 sibling, 1 reply; 5+ messages in thread
From: Damien Le Moal @ 2019-10-20 23:42 UTC (permalink / raw)
To: linux-nvme, Christoph Hellwig, Keith Busch, Sagi Grimberg,
linux-block, Jens Axboe
Use SECTOR_SHIFT instead of its hard coded value 9. Also add a comment
to decribe this helper.
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
drivers/nvme/host/nvme.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 22e8401352c2..a979b62ea4b2 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -419,9 +419,12 @@ static inline int nvme_reset_subsystem(struct nvme_ctrl *ctrl)
return ctrl->ops->reg_write32(ctrl, NVME_REG_NSSR, 0x4E564D65);
}
+/*
+ * Convert a 512B sector number to a block number.
+ */
static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector)
{
- return (sector >> (ns->lba_shift - 9));
+ return sector >> (ns->lba_shift - SECTOR_SHIFT);
}
static inline void nvme_end_request(struct request *req, __le16 status,
--
2.21.0
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] nvme: Introduce nvme_block_sect()
2019-10-20 23:42 [PATCH 0/2] Small cleanups Damien Le Moal
2019-10-20 23:42 ` [PATCH 1/2] nvme: Cleanup nvme_block_nr() Damien Le Moal
@ 2019-10-20 23:42 ` Damien Le Moal
2019-10-21 2:14 ` Bart Van Assche
1 sibling, 1 reply; 5+ messages in thread
From: Damien Le Moal @ 2019-10-20 23:42 UTC (permalink / raw)
To: linux-nvme, Christoph Hellwig, Keith Busch, Sagi Grimberg,
linux-block, Jens Axboe
Introduce the new helper function nvme_block_sect() to convert a device
logical block number to a 512B sector number. Use this new helper in
obvious places, cleaning up the code.
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
drivers/nvme/host/core.c | 14 +++++++-------
drivers/nvme/host/nvme.h | 8 ++++++++
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index fa7ba09dca77..1945c18d4b62 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1647,7 +1647,7 @@ static void nvme_init_integrity(struct gendisk *disk, u16 ms, u8 pi_type)
static void nvme_set_chunk_size(struct nvme_ns *ns)
{
- u32 chunk_size = (((u32)ns->noiob) << (ns->lba_shift - 9));
+ u32 chunk_size = nvme_block_sect(ns, ns->noiob);
blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(chunk_size));
}
@@ -1684,8 +1684,7 @@ static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)
static void nvme_config_write_zeroes(struct gendisk *disk, struct nvme_ns *ns)
{
- u32 max_sectors;
- unsigned short bs = 1 << ns->lba_shift;
+ u64 max_blocks;
if (!(ns->ctrl->oncs & NVME_CTRL_ONCS_WRITE_ZEROES) ||
(ns->ctrl->quirks & NVME_QUIRK_DISABLE_WRITE_ZEROES))
@@ -1701,11 +1700,12 @@ static void nvme_config_write_zeroes(struct gendisk *disk, struct nvme_ns *ns)
* nvme_init_identify() if available.
*/
if (ns->ctrl->max_hw_sectors == UINT_MAX)
- max_sectors = ((u32)(USHRT_MAX + 1) * bs) >> 9;
+ max_blocks = (u64)USHRT_MAX + 1;
else
- max_sectors = ((u32)(ns->ctrl->max_hw_sectors + 1) * bs) >> 9;
+ max_blocks = ns->ctrl->max_hw_sectors + 1;
- blk_queue_max_write_zeroes_sectors(disk->queue, max_sectors);
+ blk_queue_max_write_zeroes_sectors(disk->queue,
+ nvme_block_sect(ns, max_blocks));
}
static int nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,
@@ -1748,7 +1748,7 @@ static bool nvme_ns_ids_equal(struct nvme_ns_ids *a, struct nvme_ns_ids *b)
static void nvme_update_disk_info(struct gendisk *disk,
struct nvme_ns *ns, struct nvme_id_ns *id)
{
- sector_t capacity = le64_to_cpu(id->nsze) << (ns->lba_shift - 9);
+ sector_t capacity = nvme_block_sect(ns, le64_to_cpu(id->nsze));
unsigned short bs = 1 << ns->lba_shift;
u32 atomic_bs, phys_bs, io_opt;
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index a979b62ea4b2..c629a37bc778 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -427,6 +427,14 @@ static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector)
return sector >> (ns->lba_shift - SECTOR_SHIFT);
}
+/*
+ * Convert a logical block number to a 512B sector number.
+ */
+static inline sector_t nvme_block_sect(struct nvme_ns *ns, u64 lba)
+{
+ return lba << (ns->lba_shift - SECTOR_SHIFT);
+}
+
static inline void nvme_end_request(struct request *req, __le16 status,
union nvme_result result)
{
--
2.21.0
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] nvme: Cleanup nvme_block_nr()
2019-10-20 23:42 ` [PATCH 1/2] nvme: Cleanup nvme_block_nr() Damien Le Moal
@ 2019-10-21 2:13 ` Bart Van Assche
0 siblings, 0 replies; 5+ messages in thread
From: Bart Van Assche @ 2019-10-21 2:13 UTC (permalink / raw)
To: Damien Le Moal, linux-nvme, Christoph Hellwig, Keith Busch,
Sagi Grimberg, linux-block, Jens Axboe
On 2019-10-20 16:42, Damien Le Moal wrote:
> Use SECTOR_SHIFT instead of its hard coded value 9. Also add a comment
> to decribe this helper.
>
> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
> ---
> drivers/nvme/host/nvme.h | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index 22e8401352c2..a979b62ea4b2 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -419,9 +419,12 @@ static inline int nvme_reset_subsystem(struct nvme_ctrl *ctrl)
> return ctrl->ops->reg_write32(ctrl, NVME_REG_NSSR, 0x4E564D65);
> }
>
> +/*
> + * Convert a 512B sector number to a block number.
> + */
> static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector)
> {
> - return (sector >> (ns->lba_shift - 9));
> + return sector >> (ns->lba_shift - SECTOR_SHIFT);
> }
Has it been considered to rename nvme_block_nr() into
nvme_sect_to_lba()? I think the latter name is more clear.
Thanks,
Bart.
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] nvme: Introduce nvme_block_sect()
2019-10-20 23:42 ` [PATCH 2/2] nvme: Introduce nvme_block_sect() Damien Le Moal
@ 2019-10-21 2:14 ` Bart Van Assche
0 siblings, 0 replies; 5+ messages in thread
From: Bart Van Assche @ 2019-10-21 2:14 UTC (permalink / raw)
To: Damien Le Moal, linux-nvme, Christoph Hellwig, Keith Busch,
Sagi Grimberg, linux-block, Jens Axboe
On 2019-10-20 16:42, Damien Le Moal wrote:
> +/*
> + * Convert a logical block number to a 512B sector number.
> + */
> +static inline sector_t nvme_block_sect(struct nvme_ns *ns, u64 lba)
> +{
> + return lba << (ns->lba_shift - SECTOR_SHIFT);
> +}
How about renaming this function into nvme_lba_to_sect()?
Thanks,
Bart.
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-21 2:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-20 23:42 [PATCH 0/2] Small cleanups Damien Le Moal
2019-10-20 23:42 ` [PATCH 1/2] nvme: Cleanup nvme_block_nr() Damien Le Moal
2019-10-21 2:13 ` Bart Van Assche
2019-10-20 23:42 ` [PATCH 2/2] nvme: Introduce nvme_block_sect() Damien Le Moal
2019-10-21 2:14 ` Bart Van Assche
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).