stop poking into the request queue in nvmet
Subsystems (2)
Christoph Hellwig
maintainerJust some minor cleanups for now.
Diffstat:
io-cmd-bdev.c | 11 +++++------ zns.c | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-)
Christoph Hellwig
maintainerPATCH 1/2 nvmet: don't look at the request_queue in nvmet_bdev_zone_mgmt_emulate_all
nvmet is a consumer of the block layer and should not directly look at the request_queue. Just use the NUMA node ID from the gendisk instead of the request_queue.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/nvme/target/zns.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvme/target/zns.c +1 -2
@@ -387,7 +387,6 @@ static u16 nvmet_bdev_zone_mgmt_emulate_all(struct nvmet_req *req) {struct block_device *bdev = req->ns->bdev;unsigned int nr_zones =bdev_nr_zones (bdev); -struct request_queue *q =bdev_get_queue (bdev);struct bio *bio =NULL ;sector_t sector =0 ;int ret;
@@ -396,7 +395,7 @@ static u16 nvmet_bdev_zone_mgmt_emulate_all(struct nvmet_req *req) }; d.zbitmap =kcalloc_node (BITS_TO_LONGS (nr_zones),sizeof (*(d.zbitmap)), -GFP_NOIO , q->node); +GFP_NOIO , bdev->bd_disk->node_id);if (!d.zbitmap) { ret = -ENOMEM ; goto out;
Signature · 1 line
2.30.2
Re: [PATCH 1/2] nvmet: don't look at the request_queue in nvmet_bdev_zone_mgmt_emulate_all
Reviewed-by Sagi Grimberg <[email protected]>
Christoph Hellwig
maintainerPATCH 2/2 nvmet: don't look at the request_queue in nvmet_bdev_set_limits
In reply to Christoph Hellwignvmet is a consumer of the block layer and should not directly look at the request_queue. Use the bdev_ helpers to retrieve the device limits instead.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/nvme/target/io-cmd-bdev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/nvme/target/io-cmd-bdev.c +5 -6
@@ -12,11 +12,9 @@void nvmet_bdev_set_limits (struct block_device *bdev,struct nvme_id_ns *id) { -const struct queue_limits *ql = &bdev_get_queue (bdev)->limits; -/* Number of logical blocks per physical block. */ -const u32 lpp = ql->physical_block_size / ql->logical_block_size;/* Logical blocks per physical block, 0's based. */ -const __le16 lpp0b =to0based (lpp); +const __le16 lpp0b =to0based (bdev_physical_block_size (bdev) / +bdev_logical_block_size (bdev));/* * For NVMe 1.2 and later, bit 1 indicates that the fields NAWUN,
@@ -42,11 +40,12 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)/* NPWA = Namespace Preferred Write Alignment. 0's based */ id->npwa = id->npwg;/* NPDG = Namespace Preferred Deallocate Granularity. 0's based */ - id->npdg =to0based (ql->discard_granularity / ql->logical_block_size); + id->npdg =to0based (bdev_discard_granularity (bdev) / +bdev_logical_block_size (bdev));/* NPDG = Namespace Preferred Deallocate Alignment */ id->npda = id->npdg;/* NOWS = Namespace Optimal Write Size */ - id->nows =to0based (ql->io_opt / ql->logical_block_size); + id->nows =to0based (bdev_io_opt (bdev) /bdev_logical_block_size (bdev)); }void nvmet_bdev_ns_disable (struct nvmet_ns *ns)
Signature · 1 line
2.30.2
Re: [PATCH 2/2] nvmet: don't look at the request_queue in nvmet_bdev_set_limits
Reviewed-by Sagi Grimberg <[email protected]>
Looks good.
Reviewed-by Keith Busch <[email protected]>