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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6060C4332F for ; Tue, 30 Nov 2021 14:55:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243502AbhK3O6x (ORCPT ); Tue, 30 Nov 2021 09:58:53 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:49704 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242849AbhK3Ozx (ORCPT ); Tue, 30 Nov 2021 09:55:53 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C1E86B81A50; Tue, 30 Nov 2021 14:52:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92348C8D181; Tue, 30 Nov 2021 14:52:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638283952; bh=VmyoxZVaXTv/mGJlJoRgaI+O62uylQFHQ0dFjn0JQEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aPExj2YOt0BooAQBhOOR737xox8oGRVAUon/UGmjp7J/3gmtqwnHrAOqFB8wvJYZx YloR5Leid3mk7GPprLgQhEQzRGUsh4Fh7OtGIrGM9PG6b3018AwV+tCKRDelsVC3/N gKGYSSHW+AAxw3DWR5V4QLo721X7rAb5aXzRQxtT7ohb3VRWVHgWGsm+2SPzkc94wJ f0wT6FuBq7/ioL8a19a29k8pdqpCEA5fuH1eB8jq8ealhvwYkiqGLgHX8YsRr7MJ3m gdDbPJfKCp8ONQ2esnHJx49I02oEPUoyiOxccuilHPdnwU8pG8VcQeMcnb/SBH31q7 H49AUCuOSePlg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maurizio Lombardi , Sagi Grimberg , John Meneghini , Christoph Hellwig , Sasha Levin , kbusch@kernel.org, axboe@fb.com, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 19/25] nvme-tcp: fix memory leak when freeing a queue Date: Tue, 30 Nov 2021 09:51:49 -0500 Message-Id: <20211130145156.946083-19-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211130145156.946083-1-sashal@kernel.org> References: <20211130145156.946083-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maurizio Lombardi [ Upstream commit a5053c92b3db71c3f7f9f13934ca620632828d06 ] Release the page frag cache when tearing down the io queues Signed-off-by: Maurizio Lombardi Reviewed-by: Sagi Grimberg Reviewed-by: John Meneghini Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/tcp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index ff0d06e8ebb53..a1c870e686549 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1134,6 +1134,7 @@ static int nvme_tcp_alloc_async_req(struct nvme_tcp_ctrl *ctrl) static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid) { + struct page *page; struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl); struct nvme_tcp_queue *queue = &ctrl->queues[qid]; @@ -1143,6 +1144,11 @@ static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid) if (queue->hdr_digest || queue->data_digest) nvme_tcp_free_crypto(queue); + if (queue->pf_cache.va) { + page = virt_to_head_page(queue->pf_cache.va); + __page_frag_cache_drain(page, queue->pf_cache.pagecnt_bias); + queue->pf_cache.va = NULL; + } sock_release(queue->sock); kfree(queue->pdu); } -- 2.33.0