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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 359ABC282CE for ; Tue, 4 Jun 2019 23:29:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 050EE206B8 for ; Tue, 4 Jun 2019 23:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559690988; bh=rRUFUgu6RWhpeSUjD5nxuxTr0jklZ0IlhGg0Xfzv4SE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1dFCiEThMOO+vZQEu7jfFz2jmzptfk0tbhgxrDTKllhSCBvc6xrn5UjeNTgejcX6H t5CDWqiFij4G+9spwdTQ+/c5M9OnYIoR+fYZI+03Y6XKE8Vn60F86eDE+qP9pjYVUP ytvd1SC4WOm4nDDEviOpkizvfHCX+9EUmkD0GrZQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727921AbfFDX3q (ORCPT ); Tue, 4 Jun 2019 19:29:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:35004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727499AbfFDXYJ (ORCPT ); Tue, 4 Jun 2019 19:24:09 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C346920863; Tue, 4 Jun 2019 23:24:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559690648; bh=rRUFUgu6RWhpeSUjD5nxuxTr0jklZ0IlhGg0Xfzv4SE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=agG2kUwNmsBbYORsbRMYbACzTQu1ZC6NKZ5qu9nPEX8lrNa1ut0ERNMVoLLsKx1jg 36lrac/qG3r74xERzF8e9QxPTUIdkvBr5uKUQSq3mnonFTThs6KNrxqLSOtJLvCjOF MH5Yb7xAS8g1mlMVTBI9a/hafwAOcsJrlFf/xlRQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yufen Yu , Keith Busch , David Milburn , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 21/36] nvme: fix memory leak for power latency tolerance Date: Tue, 4 Jun 2019 19:23:16 -0400 Message-Id: <20190604232333.7185-21-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190604232333.7185-1-sashal@kernel.org> References: <20190604232333.7185-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yufen Yu [ Upstream commit 510a405d945bc985abc513fafe45890cac34fafa ] Unconditionally hide device pm latency tolerance when uninitializing the controller to ensure all qos resources are released so that we're not leaking this memory. This is safe to call if none were allocated in the first place, or were previously freed. Fixes: c5552fde102fc("nvme: Enable autonomous power state transitions") Suggested-by: Keith Busch Tested-by: David Milburn Signed-off-by: Yufen Yu [changelog] Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 818788275406..a867a139bb35 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3525,6 +3525,7 @@ EXPORT_SYMBOL_GPL(nvme_start_ctrl); void nvme_uninit_ctrl(struct nvme_ctrl *ctrl) { + dev_pm_qos_hide_latency_tolerance(ctrl->device); cdev_device_del(&ctrl->cdev, ctrl->device); } EXPORT_SYMBOL_GPL(nvme_uninit_ctrl); -- 2.20.1