From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32DD3C25B78 for ; Tue, 4 Jun 2024 18:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Dhu6TCWa3tk1q8AARlMASfQnsq213fkraJ14QbZnsQo=; b=G6owMa9UMTDXElZy0U02CncoWn kcxsTx7L4Po5hQfXoMaT9/jtqrrl4B+uNAVvq8w9CctQG4C9akA/eRt8FFU6pI/HqfjjRN+VpRY7g bEgtlF6Sb0YMMk01yseED/QKljQzGvT9yGHbvdvltjuGMO9SLuLRQZcdnPG0zxV+tvhtjZV9P20Xv 6EVjVggIBRoNK6O90BOyN1k/SkpztdvCwbbP7tGU2qV2Vqzp8hEmcCxZpbQgSoWBII+VfT3Gcqmq5 fVmuRk6lb3NMRTphUX6X8ACEus3r2m2AgDTz+bULy+s4lYJ5WOFtwrolFWoWJDYnA6f87uEaczztf pP4GpHeA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEZNk-00000003W13-2Smb; Tue, 04 Jun 2024 18:59:40 +0000 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEZNh-00000003Vzz-1Sxs for linux-nvme@lists.infradead.org; Tue, 04 Jun 2024 18:59:38 +0000 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454HmiuJ020979 for ; Tue, 4 Jun 2024 11:59:37 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=cc : content-transfer-encoding : content-type : date : from : in-reply-to : message-id : mime-version : references : subject : to; s=s2048-2021-q4; bh=Dhu6TCWa3tk1q8AARlMASfQnsq213fkraJ14QbZnsQo=; b=eb1brYe4yY71AHjKmCNdHYDQ80A0bOYKOZyCkfUpG8NuNDnbJxsJ+ngTym1JPCH2VRDJ aCTm12g+LIssVN/dWVos0+NY1Uz+XaFps7m8Fy/c+2pKpH1MuBfrZlawz4qHSJPeznr5 79XbFmkmgvcIbecAikmWtQjOHWLooHLgaDB7TzJtzF9m8pG/DEY/JYBo01PmuJCaE1J2 GKpvk4fbTmpgIyhyn/W+MEtojYTLao7Ej9R9JgwRxGiJr2CfSpplUCyeAKMjWvrdtTFA qqrN/IH6NOZw1vfp7HpUTVXDwFadNnAB43CnIzRqvrrIPpAMTgenyvLjht1frTFZQTQh 6g== Received: from mail.thefacebook.com ([163.114.134.2]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3yhq0xxbr3-11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 04 Jun 2024 11:59:36 -0700 Received: from twshared25218.38.frc1.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c08b:78::2ac9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1544.11; Tue, 4 Jun 2024 18:59:35 +0000 Received: by devbig032.nao3.facebook.com (Postfix, from userid 544533) id 81D6A35076D4; Tue, 4 Jun 2024 11:59:26 -0700 (PDT) From: Keith Busch To: CC: , , , , , , Keith Busch Subject: [PATCHv2 4/5] nvme: fc: split controller bringup handling Date: Tue, 4 Jun 2024 11:59:07 -0700 Message-ID: <20240604185908.3703052-5-kbusch@meta.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240604185908.3703052-1-kbusch@meta.com> References: <20240604185908.3703052-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: u2iheNJLhR-aVdKiQ6fs8GwHSZYtiprV X-Proofpoint-ORIG-GUID: u2iheNJLhR-aVdKiQ6fs8GwHSZYtiprV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_02,2024-05-17_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240604_115937_417801_777DF0BE X-CRM114-Status: GOOD ( 16.21 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org From: Keith Busch Drivers must call nvme_uninit_ctrl after a successful nvme_init_ctrl. Split the allocation side out to make the error handling boundary easier to navigate. The nvme fc driver's error handling had different returns in the error goto label's, which harm readability. Signed-off-by: Keith Busch --- drivers/nvme/host/fc.c | 43 ++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index f0b0813327491..c52446013388f 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3444,12 +3444,11 @@ nvme_fc_existing_controller(struct nvme_fc_rport = *rport, return found; } =20 -static struct nvme_ctrl * -nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, +static struct nvme_fc_ctrl * +nvme_fc_alloc_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, struct nvme_fc_lport *lport, struct nvme_fc_rport *rport) { struct nvme_fc_ctrl *ctrl; - unsigned long flags; int ret, idx, ctrl_loss_tmo; =20 if (!(rport->remoteport.port_role & @@ -3538,7 +3537,31 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_= ctrl_options *opts, if (lport->dev) ctrl->ctrl.numa_node =3D dev_to_node(lport->dev); =20 - /* at this point, teardown path changes to ref counting on nvme ctrl */ + return ctrl; + +out_free_queues: + kfree(ctrl->queues); +out_free_ida: + put_device(ctrl->dev); + ida_free(&nvme_fc_ctrl_cnt, ctrl->cnum); +out_free_ctrl: + kfree(ctrl); +out_fail: + /* exit via here doesn't follow ctlr ref points */ + return ERR_PTR(ret); +} + +static struct nvme_ctrl * +nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, + struct nvme_fc_lport *lport, struct nvme_fc_rport *rport) +{ + struct nvme_fc_ctrl *ctrl; + unsigned long flags; + int ret; + + ctrl =3D nvme_fc_alloc_ctrl(dev, opts, lport, rport); + if (IS_ERR(ctrl)) + return ERR_CAST(ctrl); =20 ret =3D nvme_alloc_admin_tag_set(&ctrl->ctrl, &ctrl->admin_tag_set, &nvme_fc_admin_mq_ops, @@ -3597,20 +3620,8 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_= ctrl_options *opts, nvme_fc_rport_get(rport); =20 return ERR_PTR(-EIO); - -out_free_queues: - kfree(ctrl->queues); -out_free_ida: - put_device(ctrl->dev); - ida_free(&nvme_fc_ctrl_cnt, ctrl->cnum); -out_free_ctrl: - kfree(ctrl); -out_fail: - /* exit via here doesn't follow ctlr ref points */ - return ERR_PTR(ret); } =20 - struct nvmet_fc_traddr { u64 nn; u64 pn; --=20 2.43.0