[PATCH 7/7] nvme-fcloop: use a device for lport

[James Smart]

On 9/22/2020 5:15 AM, Hannes Reinecke wrote:
> Add a 'struct device' to the lport such that the lport will show
> up in sysfs and we get a valid name in the logging output.
>
> Signed-off-by: Hannes Reinecke <hare at suse.de>
> ---
>   drivers/nvme/target/fcloop.c | 53 ++++++++++++++++++++++++++++++++------------
>   1 file changed, 39 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
> index b84f8754b3a3..1af1917ddf4c 100644
> --- a/drivers/nvme/target/fcloop.c
> +++ b/drivers/nvme/target/fcloop.c
> @@ -214,6 +214,7 @@ static LIST_HEAD(fcloop_nports);
>   static DEFINE_IDA(fcloop_portid_ida);
>   
>   struct fcloop_lport {
> +	struct device dev;
>   	struct nvme_fc_local_port *localport;
>   	struct list_head lport_list;
>   	struct completion unreg_done;
> @@ -1053,6 +1054,16 @@ static struct nvmet_fc_target_template tgttemplate = {
>   	.lsrqst_priv_sz		= sizeof(struct fcloop_lsreq),
>   };
>   
> +static void fcloop_release_lport(struct device *dev)
> +{
> +	struct fcloop_lport *lport =
> +		container_of(dev, struct fcloop_lport, dev);
> +
> +	ida_free(&fcloop_portid_ida, lport->port_id);
> +
> +	kfree(lport);
> +}
> +
>   static ssize_t
>   fcloop_create_local_port(struct device *dev, struct device_attribute *attr,
>   		const char *buf, size_t count)
> @@ -1063,7 +1074,7 @@ fcloop_create_local_port(struct device *dev, struct device_attribute *attr,
>   	struct fcloop_lport *lport;
>   	struct fcloop_lport_priv *lport_priv;
>   	unsigned long flags;
> -	int ret = -ENOMEM, port_id;
> +	int ret = -ENOMEM, port_id, port_num;
>   
>   	lport = kzalloc(sizeof(*lport), GFP_KERNEL);
>   	if (!lport)
> @@ -1094,25 +1105,39 @@ fcloop_create_local_port(struct device *dev, struct device_attribute *attr,
>   		goto out_free_ida;
>   	}
>   
> +	lport->port_id = port_id;
> +	lport->dev.class = fcloop_class;
> +	lport->dev.release = fcloop_release_lport;
> +	dev_set_name(&lport->dev, "lport%d", lport->port_id);
> +	device_initialize(&lport->dev);
> +
>   	memset(&pinfo, 0, sizeof(pinfo));
>   	pinfo.node_name = opts->wwnn;
>   	pinfo.port_name = opts->wwpn;
>   	pinfo.port_role = opts->roles;
>   	pinfo.port_id = port_id;
>   
> -	ret = nvme_fc_register_localport(&pinfo, &fctemplate, NULL, &localport);
> -	if (!ret) {
> -		/* success */
> -		lport_priv = localport->private;
> -		lport_priv->lport = lport;
> +	ret = nvme_fc_register_localport(&pinfo, &fctemplate,
> +					 &lport->dev, &localport);
> +	if (ret)
> +		goto out_free_ida;
>   
> -		lport->localport = localport;
> -		INIT_LIST_HEAD(&lport->lport_list);
> +	/* success */
> +	lport_priv = localport->private;
> +	lport_priv->lport = lport;
>   
> -		spin_lock_irqsave(&fcloop_lock, flags);
> -		list_add_tail(&lport->lport_list, &fcloop_lports);
> -		spin_unlock_irqrestore(&fcloop_lock, flags);
> +	lport->localport = localport;
> +	INIT_LIST_HEAD(&lport->lport_list);
> +
> +	ret = device_add(&lport->dev);
> +	if (ret) {
> +		nvme_fc_unregister_localport(lport->localport);
> +		goto out_free_ida;
>   	}
> +	spin_lock_irqsave(&fcloop_lock, flags);
> +	list_add_tail(&lport->lport_list, &fcloop_lports);
> +	spin_unlock_irqrestore(&fcloop_lock, flags);
> +
>   out_free_ida:
>   	if (ret)
>   		ida_free(&fcloop_portid_ida, port_id);
> @@ -1138,15 +1163,15 @@ __wait_localport_unreg(struct fcloop_lport *lport)
>   {
>   	int ret;
>   
> +	device_del(&lport->dev);
> +
>   	init_completion(&lport->unreg_done);
>   
>   	ret = nvme_fc_unregister_localport(lport->localport);
>   
>   	wait_for_completion(&lport->unreg_done);
>   
> -	ida_free(&fcloop_portid_ida, lport->port_id);
> -
> -	kfree(lport);
> +	put_device(&lport->dev);
>   
>   	return ret;
>   }
ok.

Reviewed-by: James Smart <james.smart at broadcom.com>

-- james
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4163 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.infradead.org/pipermail/linux-nvme/attachments/20201005/4e2da7e8/attachment.p7s>