Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Adam Manzanares <a.manzanares@samsung.com>
To:     "hch@lst.de" <hch@lst.de>
CC:     "kbusch@kernel.org" <kbusch@kernel.org>,
        "axboe@fb.com" <axboe@fb.com>,
        "sagi@grimberg.me" <sagi@grimberg.me>,
        "chaitanya.kulkarni@wdc.com" <chaitanya.kulkarni@wdc.com>,
        "linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org>,
        open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] nvmet: use passthru cntrl in nvmet_init_cap
Thread-Topic: [PATCH 2/2] nvmet: use passthru cntrl in nvmet_init_cap
Thread-Index: AQHXmr+I7P+Y0y9860Sip666Pz8m2quHVk+AgACoEwA=
Date:   Fri, 27 Aug 2021 16:19:10 +0000
Message-ID: <20210827161910.GA424766@bgt-140510-bm01>
In-Reply-To: <20210827061737.GA22583@lst.de>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <CFE9934767FAB54A901D892315AE667C@ssi.samsung.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
CMS-TYPE: 301P
References: <20210826211522.308649-1-a.manzanares@samsung.com>
        <CGME20210826211546uscas1p1e181ca820e506c7c195b933168301dd0@uscas1p1.samsung.com>
        <20210826211522.308649-3-a.manzanares@samsung.com>
        <20210827061737.GA22583@lst.de>
Precedence: bulk

On Fri, Aug 27, 2021 at 08:17:37AM +0200, hch@lst.de wrote:
> Technically this looks good, but the core target code should not have
> to poke into the host side data structures.  Does this version still look
> good to you?

Yup looks good, thanks for the help cleaning it up.

>=20
> ---
> From c5777caf1562df35150a71e5c91c5b272956beee Mon Sep 17 00:00:00 2001
> From: Adam Manzanares <a.manzanares@samsung.com>
> Date: Thu, 26 Aug 2021 21:15:45 +0000
> Subject: nvmet: looks at the passthrough controller when initializing CAP
>=20
> For a passthru controller make cap initialization dependent on the cap of
> the passthru controller, given that multiple Command Set support needs
> to be supported by the underlying controller.  For that move the
> initialization of CAP later so that it can use the fully initialized
> nvmet_ctrl structure.
>=20
> Fixes: ab5d0b38c047 (nvmet: add Command Set Identifier support)
> Signed-off-by: Adam Manzanares <a.manzanares@samsung.com>
> Reviewed-by: Keith Busch <kbusch@kernel.org>
> [hch: refactored the code a bit to keep it more contained in passthru.c]
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  drivers/nvme/target/core.c     |  6 ++++--
>  drivers/nvme/target/nvmet.h    |  2 ++
>  drivers/nvme/target/passthru.c | 10 ++++++++++
>  3 files changed, 16 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
> index 66d05eecc2a9..11c44706dc2d 100644
> --- a/drivers/nvme/target/core.c
> +++ b/drivers/nvme/target/core.c
> @@ -1206,6 +1206,9 @@ static void nvmet_init_cap(struct nvmet_ctrl *ctrl)
>  	ctrl->cap |=3D (15ULL << 24);
>  	/* maximum queue entries supported: */
>  	ctrl->cap |=3D NVMET_QUEUE_SIZE - 1;
> +
> +	if (nvmet_passthru_ctrl(ctrl->subsys))
> +		nvmet_passthrough_override_cap(ctrl);
>  }
> =20
>  struct nvmet_ctrl *nvmet_ctrl_find_get(const char *subsysnqn,
> @@ -1363,8 +1366,6 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const c=
har *hostnqn,
>  		goto out_put_subsystem;
>  	mutex_init(&ctrl->lock);
> =20
> -	nvmet_init_cap(ctrl);
> -
>  	ctrl->port =3D req->port;
> =20
>  	INIT_WORK(&ctrl->async_event_work, nvmet_async_event_work);
> @@ -1378,6 +1379,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const c=
har *hostnqn,
> =20
>  	kref_init(&ctrl->ref);
>  	ctrl->subsys =3D subsys;
> +	nvmet_init_cap(ctrl);
>  	WRITE_ONCE(ctrl->aen_enabled, NVMET_AEN_CFG_OPTIONAL);
> =20
>  	ctrl->changed_ns_list =3D kmalloc_array(NVME_MAX_CHANGED_NAMESPACES,
> diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
> index 06dd3d537f07..183119607968 100644
> --- a/drivers/nvme/target/nvmet.h
> +++ b/drivers/nvme/target/nvmet.h
> @@ -613,6 +613,8 @@ nvmet_req_passthru_ctrl(struct nvmet_req *req)
>  	return nvmet_passthru_ctrl(nvmet_req_subsys(req));
>  }
> =20
> +void nvmet_passthrough_override_cap(struct nvmet_ctrl *ctrl);
> +
>  u16 errno_to_nvme_status(struct nvmet_req *req, int errno);
>  u16 nvmet_report_invalid_opcode(struct nvmet_req *req);
> =20
> diff --git a/drivers/nvme/target/passthru.c b/drivers/nvme/target/passthr=
u.c
> index 225cd1ffbe45..8784c487e462 100644
> --- a/drivers/nvme/target/passthru.c
> +++ b/drivers/nvme/target/passthru.c
> @@ -20,6 +20,16 @@ MODULE_IMPORT_NS(NVME_TARGET_PASSTHRU);
>   */
>  static DEFINE_XARRAY(passthru_subsystems);
> =20
> +void nvmet_passthrough_override_cap(struct nvmet_ctrl *ctrl)
> +{
> +	/*
> +	 * Multiple command set support can only be declared if the underlying
> +	 * controller actually supports it.
> +	 */
> +	if (!nvme_multi_css(ctrl->subsys->passthru_ctrl))
> +		ctrl->cap &=3D ~(1ULL << 43);
> +}
> +
>  static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req)
>  {
>  	struct nvmet_ctrl *ctrl =3D req->sq->ctrl;
> --=20
> 2.30.2
> =