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 4D31D2AF07; Mon, 28 Oct 2024 06:48:17 +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=1730098097; cv=none; b=G4C0CKYaUQOxmFuFGuAmLje7VPbvc7ipqlLPHax2YWkvWCYRf9Wf+k9nAjLTIpzhuIHicOLx9z+65bj6+lUOjGnGWa6MjRf9xrt4BKdE+N+FXmVSdSI4aErUkVnsPMXde8Ajaw7Lk27c8dtaj6U40ELLXCF7ohcUlJ3w0MeH9ZE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730098097; c=relaxed/simple; bh=DZRIhyol6UAcTzO7rIy9qxMclg2laubqvd8Q4dTkBCw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aS9xJst9QXZKhr6cWPX6dbLadYWRqEMqZmnl6EiIm57iJJPO/dnNllVlkjBZF2T/iH6jjk/Cl6WRGRf94Ejv/nEXTazxeI40m+fa6dI337gR4zUFh7WZHwFrmIidkg+Ft4Ll3NZpFnajChDRGKv5HOTevcIlKaeXjPU9aGQdknU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZtbHZTkV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZtbHZTkV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E068BC4CEC3; Mon, 28 Oct 2024 06:48:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730098097; bh=DZRIhyol6UAcTzO7rIy9qxMclg2laubqvd8Q4dTkBCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZtbHZTkVG086R9dy1FOZobEX9IGY2fPEz99iPxUEG+YGE2fFfIxerh7Uobe1ive04 J3IFXp6j0IZguK242KbHCq+wxSfAcVEBt76qKyhdGvBKf8/+LyENvT8SNJfPWluzOD gARZNjw2oh+3Ex5JxfZxlMvNOjUOC9iSWOShFkKQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kai Shen , Dust Li , Wenjia Zhang , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.11 058/261] net/smc: Fix memory leak when using percpu refs Date: Mon, 28 Oct 2024 07:23:20 +0100 Message-ID: <20241028062313.478097687@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062312.001273460@linuxfoundation.org> References: <20241028062312.001273460@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kai Shen [ Upstream commit 25c12b459db8365fee84b63f3dd7910f70627f29 ] This patch adds missing percpu_ref_exit when releasing percpu refs. When releasing percpu refs, percpu_ref_exit should be called. Otherwise, memory leak happens. Fixes: 79a22238b4f2 ("net/smc: Use percpu ref for wr tx reference") Signed-off-by: Kai Shen Reviewed-by: Dust Li Reviewed-by: Wenjia Zhang Link: https://patch.msgid.link/20241010115624.7769-1-KaiShen@linux.alibaba.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/smc/smc_wr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c index 0021065a600a0..994c0cd4fddbf 100644 --- a/net/smc/smc_wr.c +++ b/net/smc/smc_wr.c @@ -648,8 +648,10 @@ void smc_wr_free_link(struct smc_link *lnk) smc_wr_tx_wait_no_pending_sends(lnk); percpu_ref_kill(&lnk->wr_reg_refs); wait_for_completion(&lnk->reg_ref_comp); + percpu_ref_exit(&lnk->wr_reg_refs); percpu_ref_kill(&lnk->wr_tx_refs); wait_for_completion(&lnk->tx_ref_comp); + percpu_ref_exit(&lnk->wr_tx_refs); if (lnk->wr_rx_dma_addr) { ib_dma_unmap_single(ibdev, lnk->wr_rx_dma_addr, @@ -912,11 +914,13 @@ int smc_wr_create_link(struct smc_link *lnk) init_waitqueue_head(&lnk->wr_reg_wait); rc = percpu_ref_init(&lnk->wr_reg_refs, smcr_wr_reg_refs_free, 0, GFP_KERNEL); if (rc) - goto dma_unmap; + goto cancel_ref; init_completion(&lnk->reg_ref_comp); init_waitqueue_head(&lnk->wr_rx_empty_wait); return rc; +cancel_ref: + percpu_ref_exit(&lnk->wr_tx_refs); dma_unmap: if (lnk->wr_rx_v2_dma_addr) { ib_dma_unmap_single(ibdev, lnk->wr_rx_v2_dma_addr, -- 2.43.0