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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 62CBDC432C0 for ; Tue, 3 Dec 2019 22:49:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D2AE20803 for ; Tue, 3 Dec 2019 22:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413362; bh=/vmX04MLemZY4vMaELPHl3ztTQcIKNH/er6LGe97v1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=P3JvFdQbb4d6iEHAbsh0XaBNHZVMLAAy/esbt2sbqJvgphbDRfF9e6zoBF4cRchMN O3Hbjnhmq5LvC7maYo72QEU+EZWBUrv4Gmubes1/xVSbpmVkWrpDbUJ1XDR+/ArdOo pcvv4bHgQ8NQtbak9rIa4G9N/2jZCqljK8Nzmn6A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729581AbfLCWtV (ORCPT ); Tue, 3 Dec 2019 17:49:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:40262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727790AbfLCWtS (ORCPT ); Tue, 3 Dec 2019 17:49:18 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E2B6320684; Tue, 3 Dec 2019 22:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413358; bh=/vmX04MLemZY4vMaELPHl3ztTQcIKNH/er6LGe97v1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/wfRhC+oXPl8xyLYhL7H8qvjhBfXerYyeS1DoHj6ynlsEMe2jtXDPiii41TDZ5r1 E3l/4BJL5d71tyk8RLoKpmwjrOnwt9vaPPyIx6/ao3I1fizWWxZ8yTDaq8YlM1fi2Z vIXyg71gh3akS0Df+vn0VK+5cckK3H5cUDxVkcE8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sagi Grimberg , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 098/321] nvme: fix kernel paging oops Date: Tue, 3 Dec 2019 23:32:44 +0100 Message-Id: <20191203223432.256097169@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sagi Grimberg [ Upstream commit 092ff0520070fad8407b196f3bb6156ce77a6f98 ] free the controller discard_page correctly. Fixes: cb5b7262b011 ("nvme: provide fallback for discard alloc failure") Signed-off-by: Sagi Grimberg Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 250ccf3108e98..c4ff4f079448e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3569,7 +3569,7 @@ static void nvme_free_ctrl(struct device *dev) ida_simple_remove(&nvme_instance_ida, ctrl->instance); kfree(ctrl->effects); nvme_mpath_uninit(ctrl); - kfree(ctrl->discard_page); + __free_page(ctrl->discard_page); if (subsys) { mutex_lock(&subsys->lock); -- 2.20.1