From nobody Wed Dec 17 12:04:53 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 155832080E3 for ; Tue, 18 Mar 2025 10:40:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742294444; cv=none; b=tO+tJIb4SpXQ5QEghmR6GKG60d6SMIR1l9MH5TU1VUJOEMj8K1lhsjvSrp38vnEhWx5A3iCzi9V2Eb3P+1AXjMNKk4zqO6ITEO/EAEGGzQNXLEoIkJa5jgqsOhqUBb18rWxe9HuDZCvtKt5N4b9r+LwK3yQRi3ZxMII2UrV7jJo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742294444; c=relaxed/simple; bh=LsxWRr6DZwClzttPCXevbMAdxFVVZCkmwtITF4CNm6E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KYpHHfAchWR9OvwK9nDceB3ZDw1Fjqdals5YtgS/6UlpX2txV8GTS474a+6+lS5a+VYZAAFKtkCG74WNW3AM7CdcKWEJ1XKcGoXh/tzQG2CVbRVE7qnbwxg1f9P3jzSnvGGD6rC3Ztb4DiFX7KLEVOuTIjVjMCqIzQdiR8CjrDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=soz2KTn7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="soz2KTn7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30BF3C4CEF3; Tue, 18 Mar 2025 10:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742294442; bh=LsxWRr6DZwClzttPCXevbMAdxFVVZCkmwtITF4CNm6E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=soz2KTn7sSTwHvisSf3FNLsnFKA3B5v7bXlcXTsytIt+LuILWxJi1CAkbp0INx/Mi 9lBzZs4QjhlN55kCwTGjN4K8Y1hg9Uf8M4HWOhpXEt/zW673csJnwG8xN+2IJrI3Pf XxdMJraGkm/3Wp1CZARbe2egbaRUq2kG2ilr+FrlxjpzrTQMPwGfT03cxiJkenEtne BWYx7xgtbUrPa4w29Lui2ipMqwTHhebJDpxWZy1OTP5z68F1TEDB4NyWF3QxEd1amW hj/MLWsF3pah3rXipL6qNq5BHM2gbY/VUuyzFE7+gYa1bofaySoUidyY4YKuAl+TqL lmqX+oyvQ9kyA== From: Daniel Wagner Date: Tue, 18 Mar 2025 11:40:10 +0100 Subject: [PATCH v3 16/18] nvmet-fc: take tgtport refs for portentry Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250318-nvmet-fcloop-v3-16-05fec0fc02f6@kernel.org> References: <20250318-nvmet-fcloop-v3-0-05fec0fc02f6@kernel.org> In-Reply-To: <20250318-nvmet-fcloop-v3-0-05fec0fc02f6@kernel.org> To: James Smart , Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni Cc: Hannes Reinecke , Keith Busch , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Wagner X-Mailer: b4 0.14.2 Ensure that the tgtport is not going away as long portentry has a pointer on it. Signed-off-by: Daniel Wagner Reviewed-by: Hannes Reinecke --- drivers/nvme/target/fc.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c index d10ddcb57c1b09d871152f0d9a48f93ec6dc8685..649afce908bbade0a843efc4b8b= 76105c164b035 100644 --- a/drivers/nvme/target/fc.c +++ b/drivers/nvme/target/fc.c @@ -1265,6 +1265,7 @@ nvmet_fc_portentry_bind(struct nvmet_fc_tgtport *tgtp= ort, { lockdep_assert_held(&nvmet_fc_tgtlock); =20 + nvmet_fc_tgtport_get(tgtport); pe->tgtport =3D tgtport; tgtport->pe =3D pe; =20 @@ -1284,8 +1285,10 @@ nvmet_fc_portentry_unbind(struct nvmet_fc_port_entry= *pe) unsigned long flags; =20 spin_lock_irqsave(&nvmet_fc_tgtlock, flags); - if (pe->tgtport) + if (pe->tgtport) { + nvmet_fc_tgtport_put(pe->tgtport); pe->tgtport->pe =3D NULL; + } list_del(&pe->pe_list); spin_unlock_irqrestore(&nvmet_fc_tgtlock, flags); } @@ -1303,8 +1306,10 @@ nvmet_fc_portentry_unbind_tgt(struct nvmet_fc_tgtpor= t *tgtport) =20 spin_lock_irqsave(&nvmet_fc_tgtlock, flags); pe =3D tgtport->pe; - if (pe) + if (pe) { + nvmet_fc_tgtport_put(pe->tgtport); pe->tgtport =3D NULL; + } tgtport->pe =3D NULL; spin_unlock_irqrestore(&nvmet_fc_tgtlock, flags); } @@ -1327,6 +1332,9 @@ nvmet_fc_portentry_rebind_tgt(struct nvmet_fc_tgtport= *tgtport) list_for_each_entry(pe, &nvmet_fc_portentry_list, pe_list) { if (tgtport->fc_target_port.node_name =3D=3D pe->node_name && tgtport->fc_target_port.port_name =3D=3D pe->port_name) { + if (!nvmet_fc_tgtport_get(tgtport)) + continue; + WARN_ON(pe->tgtport); tgtport->pe =3D pe; pe->tgtport =3D tgtport; @@ -1664,7 +1672,6 @@ nvmet_fc_unregister_targetport(struct nvmet_fc_target= _port *target_port) } EXPORT_SYMBOL_GPL(nvmet_fc_unregister_targetport); =20 - /* ********************** FC-NVME LS RCV Handling ************************= * */ =20 =20 @@ -2901,12 +2908,17 @@ nvmet_fc_add_port(struct nvmet_port *port) list_for_each_entry(tgtport, &nvmet_fc_target_list, tgt_list) { if ((tgtport->fc_target_port.node_name =3D=3D traddr.nn) && (tgtport->fc_target_port.port_name =3D=3D traddr.pn)) { + if (!nvmet_fc_tgtport_get(tgtport)) + continue; + /* a FC port can only be 1 nvmet port id */ if (!tgtport->pe) { nvmet_fc_portentry_bind(tgtport, pe, port); ret =3D 0; } else ret =3D -EALREADY; + + nvmet_fc_tgtport_put(tgtport); break; } } @@ -2922,11 +2934,21 @@ static void nvmet_fc_remove_port(struct nvmet_port *port) { struct nvmet_fc_port_entry *pe =3D port->priv; + struct nvmet_fc_tgtport *tgtport =3D NULL; + unsigned long flags; + + spin_lock_irqsave(&nvmet_fc_tgtlock, flags); + if (pe->tgtport && nvmet_fc_tgtport_get(pe->tgtport)) + tgtport =3D pe->tgtport; + spin_unlock_irqrestore(&nvmet_fc_tgtlock, flags); =20 nvmet_fc_portentry_unbind(pe); =20 - /* terminate any outstanding associations */ - __nvmet_fc_free_assocs(pe->tgtport); + if (tgtport) { + /* terminate any outstanding associations */ + __nvmet_fc_free_assocs(tgtport); + nvmet_fc_tgtport_put(tgtport); + } =20 kfree(pe); } @@ -2935,10 +2957,21 @@ static void nvmet_fc_discovery_chg(struct nvmet_port *port) { struct nvmet_fc_port_entry *pe =3D port->priv; - struct nvmet_fc_tgtport *tgtport =3D pe->tgtport; + struct nvmet_fc_tgtport *tgtport =3D NULL; + unsigned long flags; + + spin_lock_irqsave(&nvmet_fc_tgtlock, flags); + if (pe->tgtport && nvmet_fc_tgtport_get(pe->tgtport)) + tgtport =3D pe->tgtport; + spin_unlock_irqrestore(&nvmet_fc_tgtlock, flags); + + if (!tgtport) + return; =20 if (tgtport && tgtport->ops->discovery_event) tgtport->ops->discovery_event(&tgtport->fc_target_port); + + nvmet_fc_tgtport_put(tgtport); } =20 static ssize_t --=20 2.48.1