From mboxrd@z Thu Jan 1 00:00:00 1970 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 03F1A2918F9; Mon, 14 Apr 2025 13:28:31 +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=1744637311; cv=none; b=mtlpzklpApSNG5+1BzAi5CY9pxkCAhnBAZ7vsQq6GCPhurVdNpEA2iQrVNXKgMVibkxWeJ8YF942qC+OS8i8suq3JbbKLDy6KG9f759HJKqU1W3dWoCIKIKdm7Hrp/6Su4HtMBi9lg2NA7crvPGy/3U28JeHajOI1gfMAL5vOcg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637311; c=relaxed/simple; bh=zoAf7BIuluC1txZ4yjQEbLP0gHpfXijkojicAkawmCM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LlFAiA/Fuy1VgAkjdKlKLUtP0vKiYIHY6sBbuvOBFFf/rXJgFYRJj68X4C+9SYQNZxZgkjjoeciCVzlQiq2Pqq/pwMl4+dxM77piNQbB+VEPHwFP7tQyI3UvoM2fOwgvNo1RdDS5KSotfj1gMYPpY6xuAsB5DKaCK/nAt0/phpw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rbrt1NmO; 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="rbrt1NmO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F908C4CEE2; Mon, 14 Apr 2025 13:28:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744637310; bh=zoAf7BIuluC1txZ4yjQEbLP0gHpfXijkojicAkawmCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rbrt1NmO+TulMelJ0ZCEKEFvpdN72txBczNvw7z9wsuUTCDX6Ad1fWv1F++V14pRs ckf4FvBF8NrEfrmTXoFXuAuIl8gk4k8T0gE6BTqRH7mwc/2g9AyScE6Gle98xGt84c /b26utShCqPELo8W5g/if61Nv/Exjb4lt7DOCVZhc7HZ+jc5iIhCggA9LEqWNSjHZz ScwjSc6ByypGOMH8XfppYMIbl1OEoOJeA3DP/8mLVdKaYrTF5Yn0B7B44zjhKFNKqo 8rG1HUSGIqOXkIwuPQHT4XABP3Uft/0p3EE9dxvZ+tH5uLvLY7dWa305+bKG4C2KpX y06VNC/hTYfig== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Wagner , Hannes Reinecke , Christoph Hellwig , Sasha Levin , james.smart@broadcom.com, sagi@grimberg.me, kch@nvidia.com, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.13 26/34] nvmet-fc: take tgtport reference only once Date: Mon, 14 Apr 2025 09:27:20 -0400 Message-Id: <20250414132729.679254-26-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414132729.679254-1-sashal@kernel.org> References: <20250414132729.679254-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13.11 Content-Transfer-Encoding: 8bit From: Daniel Wagner [ Upstream commit b0b26ad0e1943de25ce82a7e5af3574f31b1cf99 ] The reference counting code can be simplified. Instead taking a tgtport refrerence at the beginning of nvmet_fc_alloc_hostport and put it back if not a new hostport object is allocated, only take it when a new hostport object is allocated. Signed-off-by: Daniel Wagner Reviewed-by: Hannes Reinecke Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/target/fc.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c index 3ef4beacde325..a3a6dfe98d6fc 100644 --- a/drivers/nvme/target/fc.c +++ b/drivers/nvme/target/fc.c @@ -1042,33 +1042,24 @@ nvmet_fc_alloc_hostport(struct nvmet_fc_tgtport *tgtport, void *hosthandle) struct nvmet_fc_hostport *newhost, *match = NULL; unsigned long flags; + /* + * Caller holds a reference on tgtport. + */ + /* if LLDD not implemented, leave as NULL */ if (!hosthandle) return NULL; - /* - * 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); + if (match) return match; - } newhost = kzalloc(sizeof(*newhost), GFP_KERNEL); - if (!newhost) { - /* no new allocation - release reference */ - nvmet_fc_tgtport_put(tgtport); + if (!newhost) return ERR_PTR(-ENOMEM); - } spin_lock_irqsave(&tgtport->lock, flags); match = nvmet_fc_match_hostport(tgtport, hosthandle); @@ -1077,6 +1068,7 @@ nvmet_fc_alloc_hostport(struct nvmet_fc_tgtport *tgtport, void *hosthandle) kfree(newhost); newhost = match; } else { + nvmet_fc_tgtport_get(tgtport); newhost->tgtport = tgtport; newhost->hosthandle = hosthandle; INIT_LIST_HEAD(&newhost->host_list); -- 2.39.5