[GIT,PULL,19/26] lightnvm: pblk: remove internal IO timeout

Message ID	20190504183811.18725-20-mb@lightnvm.io (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-block-owner@kernel.org> From: =?utf-8?q?Matias_Bj=C3=B8rling?= <mb@lightnvm.io> To: axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Konopko <igor.j.konopko@intel.com>, =?utf-8?q?Matias_Bj=C3=B8rling?= <mb@lightnvm.io> Subject: [GIT PULL 19/26] lightnvm: pblk: remove internal IO timeout Date: Sat, 4 May 2019 20:38:04 +0200 Message-Id: <20190504183811.18725-20-mb@lightnvm.io> In-Reply-To: <20190504183811.18725-1-mb@lightnvm.io> References: <20190504183811.18725-1-mb@lightnvm.io> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-block-owner@vger.kernel.org Precedence: bulk
Series	lightnvm updates for 5.2 \| expand [GIT,PULL,00/26] lightnvm updates for 5.2 [GIT,PULL,01/26] lightnvm: pblk: line reference fix in GC [GIT,PULL,02/26] lightnvm: pblk: rollback on error during gc read [GIT,PULL,03/26] lightnvm: pblk: reduce L2P memory footprint [GIT,PULL,04/26] lightnvm: pblk: remove unused smeta_ssec field [GIT,PULL,05/26] lightnvm: pblk: gracefully handle GC vmalloc fail [GIT,PULL,06/26] lightnvm: pblk: fix race during put line [GIT,PULL,07/26] lightnvm: pblk: ensure that erase is chunk aligned [GIT,PULL,08/26] lightnvm: pblk: cleanly fail when there is not enough memory [GIT,PULL,09/26] lightnvm: pblk: set proper read status in bio [GIT,PULL,10/26] lightnvm: Inherit mdts from the parent nvme device [GIT,PULL,11/26] lightnvm: pblk: fix bio leak when bio is split [GIT,PULL,12/26] lightnvm: pblk: set propper line as data_line after gc [GIT,PULL,13/26] lightnvm: prevent race condition on pblk remove [GIT,PULL,14/26] lightnvm: pblk: fix lock order in pblk_rb_tear_down_check [GIT,PULL,15/26] lightnvm: pblk: kick writer on write recovery path [GIT,PULL,16/26] lightnvm: pblk: fix update line wp in OOB recovery [GIT,PULL,17/26] lightnvm: pblk: propagate errors when reading meta [GIT,PULL,18/26] lightnvm: pblk: wait for inflight IOs in recovery [GIT,PULL,19/26] lightnvm: pblk: remove internal IO timeout [GIT,PULL,20/26] lightnvm: pblk: GC error handling [GIT,PULL,21/26] lightnvm: pblk: IO path reorganization [GIT,PULL,22/26] lightnvm: pblk: recover only written metadata [GIT,PULL,23/26] lightnvm: track inflight target creations [GIT,PULL,24/26] lightnvm: do not remove instance under global lock [GIT,PULL,25/26] lightnvm: pblk: simplify partial read path [GIT,PULL,26/26] lightnvm: pblk: use nvm_rq_to_ppa_list()

Message ID

20190504183811.18725-20-mb@lightnvm.io (mailing list archive)

State

New, archived

Headers

From: =?utf-8?q?Matias_Bj=C3=B8rling?= <mb@lightnvm.io>
To: axboe@fb.com
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
 Igor Konopko <igor.j.konopko@intel.com>,
 =?utf-8?q?Matias_Bj=C3=B8rling?= <mb@lightnvm.io>
Subject: [GIT PULL 19/26] lightnvm: pblk: remove internal IO timeout
Date: Sat,  4 May 2019 20:38:04 +0200
Message-Id: <20190504183811.18725-20-mb@lightnvm.io>
In-Reply-To: <20190504183811.18725-1-mb@lightnvm.io>
References: <20190504183811.18725-1-mb@lightnvm.io>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-block-owner@vger.kernel.org
Precedence: bulk

Series

lightnvm updates for 5.2 | expand

Commit Message

Matias Bjorling May 4, 2019, 6:38 p.m. UTC

From: Igor Konopko <igor.j.konopko@intel.com>

Currently during pblk padding, there is internal IO timeout introduced,
which is smaller than default NVMe timeout. This can lead to various
use-after-free issues. Since in case of any IO timeouts NVMe and block
layer will handle timeout by themselves and report it back to use,
there is no need to keep this internal timeout in pblk.

Signed-off-by: Igor Konopko <igor.j.konopko@intel.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
---
 drivers/lightnvm/pblk-recovery.c | 7 +------
 drivers/lightnvm/pblk.h          | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
index 137e963cd51d..865fe310cab4 100644
--- a/drivers/lightnvm/pblk-recovery.c
+++ b/drivers/lightnvm/pblk-recovery.c
@@ -290,12 +290,7 @@  static int pblk_recov_pad_line(struct pblk *pblk, struct pblk_line *line,
 
 fail_complete:
 	kref_put(&pad_rq->ref, pblk_recov_complete);
-
-	if (!wait_for_completion_io_timeout(&pad_rq->wait,
-				msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
-		pblk_err(pblk, "pad write timed out\n");
-		ret = -ETIME;
-	}
+	wait_for_completion(&pad_rq->wait);
 
 	if (!pblk_line_is_full(line))
 		pblk_err(pblk, "corrupted padded line: %d\n", line->id);
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index 381f0746a9cf..90c703d3f84c 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -43,8 +43,6 @@ 
 
 #define PBLK_CACHE_NAME_LEN (DISK_NAME_LEN + 16)
 
-#define PBLK_COMMAND_TIMEOUT_MS 30000
-
 /* Max 512 LUNs per device */
 #define PBLK_MAX_LUNS_BITMAP (4)

[GIT,PULL,19/26] lightnvm: pblk: remove internal IO timeout

Commit Message

Patch