nvmet-fc: simplify nvmet_fc_alloc_hostport
Subsystems (3)
PATCH 1/1 nvmet-fc: simplify nvmet_fc_alloc_hostport
From: Amit Engel <[email protected]>
Once a host is already created,
avoid allocate additional hostports that will be thrown away. add an helper function to handle host search.
--- drivers/nvme/target/fc.c | 76 ++++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 31 deletions(-)
drivers/nvme/target/fc.c +45 -31
@@ -1020,61 +1020,75 @@ nvmet_fc_free_hostport(struct nvmet_fc_hostport *hostport)nvmet_fc_hostport_put (hostport); } +static struct nvmet_fc_hostport * +nvmet_fc_match_hostport (struct nvmet_fc_tgtport *tgtport,void *hosthandle) +{ +struct nvmet_fc_hostport *host; + +/* tgtport->lock is held by caller */ + +list_for_each_entry (host, &tgtport->host_list, host_list) { +if (host->hosthandle == hosthandle && !host->invalid) { +if (nvmet_fc_hostport_get (host)) +return (host); + } + } + +return (NULL ); +} +static struct nvmet_fc_hostport *nvmet_fc_alloc_hostport (struct nvmet_fc_tgtport *tgtport,void *hosthandle) { -struct nvmet_fc_hostport *newhost, *host, *match =NULL ; +struct nvmet_fc_hostport *newhost, *match =NULL ;unsigned long flags;/* if LLDD not implemented, leave as NULL */ if (!hosthandle)return NULL ; -/* take reference for what will be the newly allocated hostport */ +/* take reference for what will be the newly allocated hostport if +* we end up using a new allocation +*/ if (!nvmet_fc_tgtport_get (tgtport))return ERR_PTR (-EINVAL ); +spin_lock_irqsave (&tgtport->lock, flags); + match =nvmet_fc_match_hostport (tgtport, hosthandle); +spin_unlock_irqrestore (&tgtport->lock, flags); + +if (match) { +/* no new allocation - release reference */ +nvmet_fc_tgtport_put (tgtport); +return match; + } + newhost =kzalloc (sizeof (*newhost),GFP_KERNEL );if (!newhost) { -spin_lock_irqsave (&tgtport->lock, flags); -list_for_each_entry (host, &tgtport->host_list, host_list) { -if (host->hosthandle == hosthandle && !host->invalid) { -if (nvmet_fc_hostport_get (host)) { - match = host; -break ; - } - } - } -spin_unlock_irqrestore (&tgtport->lock, flags); -/* no allocation - release reference */ +/* no new allocation - release reference */ nvmet_fc_tgtport_put (tgtport); -return (match) ? match :ERR_PTR (-ENOMEM ); +return ERR_PTR (-ENOMEM ); } - newhost->tgtport = tgtport; - newhost->hosthandle = hosthandle; -INIT_LIST_HEAD (&newhost->host_list); -kref_init (&newhost->ref); -spin_lock_irqsave (&tgtport->lock, flags); -list_for_each_entry (host, &tgtport->host_list, host_list) { -if (host->hosthandle == hosthandle && !host->invalid) { -if (nvmet_fc_hostport_get (host)) { - match = host; -break ; - } - } - } + match =nvmet_fc_match_hostport (tgtport, hosthandle);if (match) { +/* new allocation not needed */ kfree (newhost); - newhost =NULL ; -/* releasing allocation - release reference */ + newhost = match; +/* no new allocation - release reference */ nvmet_fc_tgtport_put (tgtport); - }else + }else { + newhost->tgtport = tgtport; + newhost->hosthandle = hosthandle; +INIT_LIST_HEAD (&newhost->host_list); +kref_init (&newhost->ref); +list_add_tail (&newhost->host_list, &tgtport->host_list); + }spin_unlock_irqrestore (&tgtport->lock, flags); -return (match) ? match : newhost; +return newhost; } static void
Signature · 7 lines
2.18.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 52 lines · On Mar 16, 2021, at 1:43 AM, [email protected] wrote:
From: Amit Engel <[email protected]>
Once a host is already created,
avoid allocate additional hostports that will be thrown away. add an helper function to handle host search.Signed-off-by Amit Engel <[email protected]>Signed-off-by James Smart <[email protected]>---
drivers/nvme/target/fc.c| 76 ++++++++++++++++++++++++----------------1 file changed, 45 insertions(+), 31 deletions(-)drivers/nvme/target/fc.c +17
-0@@ -1020,61 +1020,75 @@ nvmet_fc_free_hostport(struct nvmet_fc_hostport *hostport)nvmet_fc_hostport_put (hostport); } +static struct nvmet_fc_hostport * +nvmet_fc_match_hostport (struct nvmet_fc_tgtport *tgtport,void *hosthandle) +{ +struct nvmet_fc_hostport *host; + +/* tgtport->lock is held by caller */ + +list_for_each_entry (host, &tgtport->host_list, host_list) { +if (host->hosthandle == hosthandle && !host->invalid) { +if (nvmet_fc_hostport_get (host)) +return (host); + } + } + +return (NULL ); +} +static struct
nvmet_fc_hostport*nvmet_fc_alloc_hostport(struct nvmet_fc_tgtport *tgtport, void *hosthandle){drivers/nvme/target/fc.c +1
-1-struct nvmet_fc_hostport *newhost, *host, *match =NULL ; +struct nvmet_fc_hostport *newhost, *match =NULL ;unsigned long flags; /* if LLDD not implemented, leave as NULL */ if (!hosthandle) return NULL;
drivers/nvme/target/fc.c nvmet_fc_free_hostport(struct nvmet_fc_hostport *hostport) · line 1052
Quoted 4 lines
drivers/nvme/target/fc.c +3
-1-/* take reference for what will be the newly allocated hostport */ +/* take reference for what will be the newly allocated hostport if +* we end up using a new allocation +*/
Small nit.. Please fix the comment formatting for multi-line
Quoted 70 lines
if (!nvmet_fc_tgtport_get(tgtport)) return ERR_PTR(-EINVAL);drivers/nvme/target/fc.c +10
-0+spin_lock_irqsave (&tgtport->lock, flags); + match =nvmet_fc_match_hostport (tgtport, hosthandle); +spin_unlock_irqrestore (&tgtport->lock, flags); + +if (match) { +/* no new allocation - release reference */ +nvmet_fc_tgtport_put (tgtport); +return match; + } +newhost = kzalloc(sizeof(*newhost), GFP_KERNEL); if (!newhost) {drivers/nvme/target/fc.c +1
-11-spin_lock_irqsave (&tgtport->lock, flags); -list_for_each_entry (host, &tgtport->host_list, host_list) { -if (host->hosthandle == hosthandle && !host->invalid) { -if (nvmet_fc_hostport_get (host)) { - match = host; -break ; - } - } - } -spin_unlock_irqrestore (&tgtport->lock, flags); -/* no allocation - release reference */ +/* no new allocation - release reference */ nvmet_fc_tgtport_put(tgtport);drivers/nvme/target/fc.c +1
-1-return (match) ? match :ERR_PTR (-ENOMEM ); +return ERR_PTR (-ENOMEM );}drivers/nvme/target/fc.c +0
-5- newhost->tgtport = tgtport; - newhost->hosthandle = hosthandle; -INIT_LIST_HEAD (&newhost->host_list); -kref_init (&newhost->ref); -spin_lock_irqsave(&tgtport->lock, flags);drivers/nvme/target/fc.c +1
-8-list_for_each_entry (host, &tgtport->host_list, host_list) { -if (host->hosthandle == hosthandle && !host->invalid) { -if (nvmet_fc_hostport_get (host)) { - match = host; -break ; - } - } - } + match =nvmet_fc_match_hostport (tgtport, hosthandle);if (match) {drivers/nvme/target/fc.c +1
-0+/* new allocation not needed */ kfree(newhost);drivers/nvme/target/fc.c +2
-2- newhost =NULL ; -/* releasing allocation - release reference */ + newhost = match; +/* no new allocation - release reference */ nvmet_fc_tgtport_put(tgtport);drivers/nvme/target/fc.c +6
-1- }else + }else { + newhost->tgtport = tgtport; + newhost->hosthandle = hosthandle; +INIT_LIST_HEAD (&newhost->host_list); +kref_init (&newhost->ref); +list_add_tail(&newhost->host_list, &tgtport->host_list);drivers/nvme/target/fc.c +1
-0+ }spin_unlock_irqrestore(&tgtport->lock, flags);drivers/nvme/target/fc.c +1
-1-return (match) ? match : newhost; +return newhost;}
Quoted 9 lines
static void
Signature · 7 lines
2.18.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
code looks good.
--
Himanshu Madhani Oracle Linux Engineering
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme