[RFC v2 1/3] nvme: lookup ctrl from request instead from namespace

Daniel Wagner
2023-12-01T09:30:08Z

In preparation to use struct nvme_ns_head pointers instead of a struct
nvme_ns pointers, get the the ctrl pointer from a request. The reason is
that there is no easy and fast way to lookup the ctrl from struct
nvme_ns_head.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
drivers/nvme/host/core.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d699f0c8b13e..900c045fcae0 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -769,6 +769,7 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req,
struct nvme_command *cmnd)
{
unsigned short segments = blk_rq_nr_discard_segments(req), n = 0;
+ struct nvme_ctrl *ctrl = nvme_req(req)->ctrl;
struct nvme_dsm_range *range;
struct bio *bio;

@@ -786,10 +787,10 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req,
* discard page. If that's also busy, it's safe to return
* busy, as we know we can make progress once that's freed.
*/
- if (test_and_set_bit_lock(0, &ns->ctrl->discard_page_busy))
+ if (test_and_set_bit_lock(0, &ctrl->discard_page_busy))
return BLK_STS_RESOURCE;

- range = page_address(ns->ctrl->discard_page);
+ range = page_address(ctrl->discard_page);
}

if (queue_max_discard_segments(req->q) == 1) {
@@ -815,8 +816,8 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req,
}

if (WARN_ON_ONCE(n != segments)) {
- if (virt_to_page(range) == ns->ctrl->discard_page)
- clear_bit_unlock(0, &ns->ctrl->discard_page_busy);
+ if (virt_to_page(range) == ctrl->discard_page)
+ clear_bit_unlock(0, &ctrl->discard_page_busy);
else
kfree(range);
return BLK_STS_IOERR;
@@ -861,9 +862,11 @@ static void nvme_set_ref_tag(struct nvme_ns *ns, struct nvme_command *cmnd,
static inline blk_status_t nvme_setup_write_zeroes(struct nvme_ns *ns,
struct request *req, struct nvme_command *cmnd)
{
+ struct nvme_ctrl *ctrl = nvme_req(req)->ctrl;
+
memset(cmnd, 0, sizeof(*cmnd));

- if (ns->ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES)
+ if (ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES)
return nvme_setup_discard(ns, req, cmnd);

cmnd->write_zeroes.opcode = nvme_cmd_write_zeroes;
--
2.43.0