From: Sagi Grimberg <sagi@grimberg.me>
Date: Thu, 13 Dec 2018 20:34:07 +0000 (-0800)
Subject: nvme: fix kernel paging oops
X-Git-Tag: v4.19.88~225
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3331e61b23b1c7d1b62e1b882650992fc6f364b5;p=thirdparty%2Fkernel%2Fstable.git

nvme: fix kernel paging oops

[ Upstream commit 092ff0520070fad8407b196f3bb6156ce77a6f98 ]

free the controller discard_page correctly.

Fixes: cb5b7262b011 ("nvme: provide fallback for discard alloc failure")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

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);