Skip to contentSkip to conversation

f2fs: fix long latency due to discard during umount

PATCH Superseded Sahitya Tummala 3 participants 14 messages Mar 18, 2020 – Mar 31, 2020 F2FS file system

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 f2fs: fix long latency due to discard during umount

F2FS already has a default timeout of 5 secs for discards that can be issued during umount, but it can take more than the 5 sec timeout if the underlying UFS device queue is already full and there are no more available free tags to be used. In that case, submit_bio() will wait for the already queued discard requests to complete to get a free tag, which can potentially take way more than 5 sec.

Fix this by submitting the discard requests with REQ_NOWAIT flags during umount. This will return -EAGAIN for UFS queue/tag full scenario without waiting in the context of submit_bio(). The FS can then handle these requests by retrying again within the stipulated discard timeout period to avoid long latencies.

---
v2:
- Handle the case where a dc can have multiple bios associated with it

 fs/f2fs/f2fs.h    |  1 +
 fs/f2fs/segment.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 10 deletions(-)
fs/f2fs/f2fs.h +1 -0
index 12a197e..67b8dcc 100644
@@ -340,6 +340,7 @@ struct discard_cmd_control {
 	struct list_head pend_list[MAX_PLIST_NUM];/* store pending entries */
 	struct list_head wait_list;		/* store on-flushing entries */
 	struct list_head fstrim_list;		/* in-flight discard from fstrim */
+	struct list_head retry_list;		/* list of cmds to retry */
 	wait_queue_head_t discard_wait_queue;	/* waiting queue for wake-up */
 	unsigned int discard_wake;		/* to wake up discard thread */
 	struct mutex cmd_lock;
fs/f2fs/segment.c +73 -10

152 lines not on this page · raw message

Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Sahitya Tummala

F2FS already has a default timeout of 5 secs for discards that can be issued during umount, but it can take more than the 5 sec timeout if the underlying UFS device queue is already full and there are no more available free tags to be used. In that case, submit_bio() will wait for the already queued discard requests to complete to get a free tag, which can potentially take way more than 5 sec.

Quoted 7 lines

Fix this by submitting the discard requests with REQ_NOWAIT flags during umount. This will return -EAGAIN for UFS queue/tag full scenario without waiting in the context of submit_bio(). The FS can then handle these requests by retrying again within the stipulated discard timeout period to avoid long latencies.

Thanks,

#2 lore raw
Quoted 8 lines · Chao Yu
Quoted 7 lines · Sahitya Tummala

F2FS already has a default timeout of 5 secs for discards that can be issued during umount, but it can take more than the 5 sec timeout if the underlying UFS device queue is already full and there are no more available free tags to be used. In that case, submit_bio() will wait for the already queued discard requests to complete to get a free tag, which can potentially take way more than 5 sec.

Quoted 5 lines
Quoted 5 lines

Fix this by submitting the discard requests with REQ_NOWAIT flags during umount. This will return -EAGAIN for UFS queue/tag full scenario without waiting in the context of submit_bio(). The FS can then handle these requests by retrying again within the stipulated discard timeout period to avoid long latencies.

BTW, I guess later we can add nowait logic as a sub policy of discard_policy, then DPOLICY_BG would be more configurable with this nowait policy support.

Thanks,

Quoted 14 lines
Quoted 2 lines

Thanks,

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
.

#3 lore raw
In reply to Sahitya Tummala

Hi Sahitya,

Quoted 86 lines · Sahitya Tummala

F2FS already has a default timeout of 5 secs for discards that can be issued during umount, but it can take more than the 5 sec timeout if the underlying UFS device queue is already full and there are no more available free tags to be used. In that case, submit_bio() will wait for the already queued discard requests to complete to get a free tag, which can potentially take way more than 5 sec.

Fix this by submitting the discard requests with REQ_NOWAIT flags during umount. This will return -EAGAIN for UFS queue/tag full scenario without waiting in the context of submit_bio(). The FS can then handle these requests by retrying again within the stipulated discard timeout period to avoid long latencies.

---
v2:
- Handle the case where a dc can have multiple bios associated with it

 fs/f2fs/f2fs.h    |  1 +
 fs/f2fs/segment.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 10 deletions(-)
fs/f2fs/f2fs.h +1 -0
index 12a197e..67b8dcc 100644
@@ -340,6 +340,7 @@ struct discard_cmd_control {
 	struct list_head pend_list[MAX_PLIST_NUM];/* store pending entries */
 	struct list_head wait_list;		/* store on-flushing entries */
 	struct list_head fstrim_list;		/* in-flight discard from fstrim */
+	struct list_head retry_list;		/* list of cmds to retry */
 	wait_queue_head_t discard_wait_queue;	/* waiting queue for wake-up */
 	unsigned int discard_wake;		/* to wake up discard thread */
 	struct mutex cmd_lock;
fs/f2fs/segment.c +14 -8
index fb3e531..4162c76 100644
@@ -1029,13 +1029,16 @@ static void f2fs_submit_discard_endio(struct bio *bio)
 	struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
 	unsigned long flags;
 
-	dc->error = blk_status_to_errno(bio->bi_status);
-
 	spin_lock_irqsave(&dc->lock, flags);
+	if (!dc->error)
+		dc->error = blk_status_to_errno(bio->bi_status);
+
 	dc->bio_ref--;
-	if (!dc->bio_ref && dc->state == D_SUBMIT) {
-		dc->state = D_DONE;
-		complete_all(&dc->wait);
+	if (!dc->bio_ref) {
+		if (dc->error || dc->state == D_SUBMIT) {
+			dc->state = D_DONE;
+			complete_all(&dc->wait);
+		}
 	}
 	spin_unlock_irqrestore(&dc->lock, flags);
 	bio_put(bio);
@@ -1124,10 +1127,13 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
 	struct list_head *wait_list = (dpolicy->type == DPOLICY_FSTRIM) ?
 					&(dcc->fstrim_list) : &(dcc->wait_list);
-	int flag = dpolicy->sync ? REQ_SYNC : 0;
-	block_t lstart, start, len, total_len;
+	int flag;
+	block_t lstart, start, len, total_len, orig_len;
 	int err = 0;
 
+	flag = dpolicy->sync ? REQ_SYNC : 0;
+	flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
+
 	if (dc->state != D_PREP)
 		return 0;
 
@@ -1139,7 +1145,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 	lstart = dc->lstart;
 	start = dc->start;
 	len = dc->len;
-	total_len = len;
+	orig_len = total_len = len;
 
 	dc->len = 0;
 

fs/f2fs/segment.c static int __submit_discard_cmd(struct f2fs_sb_info *sbi, · line 1216

Quoted 8 lines
fs/f2fs/segment.c +5 -0
@@ -1203,6 +1209,14 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 		bio->bi_end_io = f2fs_submit_discard_endio;
 		bio->bi_opf |= flag;
 		submit_bio(bio);
+		if (flag & REQ_NOWAIT) {
+			if (dc->error == -EAGAIN) {
+				dc->len = orig_len;
+				list_move(&dc->list, &dcc->retry_list);
+				err = dc->error;

I encounter lots of dmesg, which should be printed by __remove_discard_cmd()

F2FS-fs (dm-0): Issue discard(23552, 23552, 2) failed, ret: -11

This should happen only if we didn't handle all discard in 5 seconds during umount.

So I doubt we failed to move dc to retry_list, because after submit_bio(), end_io() is not called synchronously as the bio was just pluged?

Thanks,

Quoted 107 lines
fs/f2fs/segment.c +54 -2
+				break;
+			}
+		}
 
 		atomic_inc(&dcc->issued_discard);
 
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,
+		struct discard_policy *dpolicy)
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
#4 lore raw

Hi Chao,

Quoted 100 lines · Chao Yu

Hi Sahitya,

Quoted 86 lines · Sahitya Tummala

F2FS already has a default timeout of 5 secs for discards that can be issued during umount, but it can take more than the 5 sec timeout if the underlying UFS device queue is already full and there are no more available free tags to be used. In that case, submit_bio() will wait for the already queued discard requests to complete to get a free tag, which can potentially take way more than 5 sec.

Fix this by submitting the discard requests with REQ_NOWAIT flags during umount. This will return -EAGAIN for UFS queue/tag full scenario without waiting in the context of submit_bio(). The FS can then handle these requests by retrying again within the stipulated discard timeout period to avoid long latencies.

---
v2:
- Handle the case where a dc can have multiple bios associated with it

 fs/f2fs/f2fs.h    |  1 +
 fs/f2fs/segment.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 10 deletions(-)
fs/f2fs/f2fs.h +1 -0
index 12a197e..67b8dcc 100644
@@ -340,6 +340,7 @@ struct discard_cmd_control {
 	struct list_head pend_list[MAX_PLIST_NUM];/* store pending entries */
 	struct list_head wait_list;		/* store on-flushing entries */
 	struct list_head fstrim_list;		/* in-flight discard from fstrim */
+	struct list_head retry_list;		/* list of cmds to retry */
 	wait_queue_head_t discard_wait_queue;	/* waiting queue for wake-up */
 	unsigned int discard_wake;		/* to wake up discard thread */
 	struct mutex cmd_lock;
fs/f2fs/segment.c +14 -8
index fb3e531..4162c76 100644
@@ -1029,13 +1029,16 @@ static void f2fs_submit_discard_endio(struct bio *bio)
 	struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
 	unsigned long flags;
 
-	dc->error = blk_status_to_errno(bio->bi_status);
-
 	spin_lock_irqsave(&dc->lock, flags);
+	if (!dc->error)
+		dc->error = blk_status_to_errno(bio->bi_status);
+
 	dc->bio_ref--;
-	if (!dc->bio_ref && dc->state == D_SUBMIT) {
-		dc->state = D_DONE;
-		complete_all(&dc->wait);
+	if (!dc->bio_ref) {
+		if (dc->error || dc->state == D_SUBMIT) {
+			dc->state = D_DONE;
+			complete_all(&dc->wait);
+		}
 	}
 	spin_unlock_irqrestore(&dc->lock, flags);
 	bio_put(bio);
@@ -1124,10 +1127,13 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
 	struct list_head *wait_list = (dpolicy->type == DPOLICY_FSTRIM) ?
 					&(dcc->fstrim_list) : &(dcc->wait_list);
-	int flag = dpolicy->sync ? REQ_SYNC : 0;
-	block_t lstart, start, len, total_len;
+	int flag;
+	block_t lstart, start, len, total_len, orig_len;
 	int err = 0;
 
+	flag = dpolicy->sync ? REQ_SYNC : 0;
+	flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
+
 	if (dc->state != D_PREP)
 		return 0;
 
@@ -1139,7 +1145,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 	lstart = dc->lstart;
 	start = dc->start;
 	len = dc->len;
-	total_len = len;
+	orig_len = total_len = len;
 
 	dc->len = 0;
 

fs/f2fs/segment.c static int __submit_discard_cmd(struct f2fs_sb_info *sbi, · line 1216

Quoted 8 lines
fs/f2fs/segment.c +5 -0
@@ -1203,6 +1209,14 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 		bio->bi_end_io = f2fs_submit_discard_endio;
 		bio->bi_opf |= flag;
 		submit_bio(bio);
+		if (flag & REQ_NOWAIT) {
+			if (dc->error == -EAGAIN) {
+				dc->len = orig_len;
+				list_move(&dc->list, &dcc->retry_list);
+				err = dc->error;

I encounter lots of dmesg, which should be printed by __remove_discard_cmd()

Quoted 8 lines

F2FS-fs (dm-0): Issue discard(23552, 23552, 2) failed, ret: -11

This should happen only if we didn't handle all discard in 5 seconds during umount.

So I doubt we failed to move dc to retry_list, because after submit_bio(), end_io() is not called synchronously as the bio was just pluged?

This can happen if a discard cmd has multiple bios and at least 1 bio is already submitted and when submitting other bios, we encounter -EAGAIN. In this case, this dc will be moved to retry_list and will be moved back to dcc->pend_list only if the dc->bio_ref becomes 0 within 5 sec timeout. If it doesn't become zero, then it will be left in retry_list itself, which will be later removed from retry_list. Before removing from retry_list we will however ensure that submitted bio is done i.e., dc->bio_ref is 0, but dc->error will be -EAGAIN as this dc could not be requeued/retried.

So this is expected, where it only means that this dc could not be submitted/retried again within timeout. I think we can ignore this -EAGAIN error in __remove_discard_cmd().

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
fs/f2fs/segment.c +3 -0
+				break;
+			}
+		}
 
Quoted 7 lines

fs/f2fs/segment.c static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
fs/f2fs/segment.c +1 -0
 		atomic_inc(&dcc->issued_discard);
 
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
fs/f2fs/segment.c +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#5 lore raw
Quoted 120 lines · Sahitya Tummala

Hi Chao,

Quoted 100 lines · Chao Yu

Hi Sahitya,

Quoted 86 lines · Sahitya Tummala

F2FS already has a default timeout of 5 secs for discards that can be issued during umount, but it can take more than the 5 sec timeout if the underlying UFS device queue is already full and there are no more available free tags to be used. In that case, submit_bio() will wait for the already queued discard requests to complete to get a free tag, which can potentially take way more than 5 sec.

Fix this by submitting the discard requests with REQ_NOWAIT flags during umount. This will return -EAGAIN for UFS queue/tag full scenario without waiting in the context of submit_bio(). The FS can then handle these requests by retrying again within the stipulated discard timeout period to avoid long latencies.

---
v2:
- Handle the case where a dc can have multiple bios associated with it

 fs/f2fs/f2fs.h    |  1 +
 fs/f2fs/segment.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 10 deletions(-)
fs/f2fs/f2fs.h +1 -0
index 12a197e..67b8dcc 100644
@@ -340,6 +340,7 @@ struct discard_cmd_control {
 	struct list_head pend_list[MAX_PLIST_NUM];/* store pending entries */
 	struct list_head wait_list;		/* store on-flushing entries */
 	struct list_head fstrim_list;		/* in-flight discard from fstrim */
+	struct list_head retry_list;		/* list of cmds to retry */
 	wait_queue_head_t discard_wait_queue;	/* waiting queue for wake-up */
 	unsigned int discard_wake;		/* to wake up discard thread */
 	struct mutex cmd_lock;
fs/f2fs/segment.c +14 -8
index fb3e531..4162c76 100644
@@ -1029,13 +1029,16 @@ static void f2fs_submit_discard_endio(struct bio *bio)
 	struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
 	unsigned long flags;
 
-	dc->error = blk_status_to_errno(bio->bi_status);
-
 	spin_lock_irqsave(&dc->lock, flags);
+	if (!dc->error)
+		dc->error = blk_status_to_errno(bio->bi_status);
+
 	dc->bio_ref--;
-	if (!dc->bio_ref && dc->state == D_SUBMIT) {
-		dc->state = D_DONE;
-		complete_all(&dc->wait);
+	if (!dc->bio_ref) {
+		if (dc->error || dc->state == D_SUBMIT) {
+			dc->state = D_DONE;
+			complete_all(&dc->wait);
+		}
 	}
 	spin_unlock_irqrestore(&dc->lock, flags);
 	bio_put(bio);
@@ -1124,10 +1127,13 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
 	struct list_head *wait_list = (dpolicy->type == DPOLICY_FSTRIM) ?
 					&(dcc->fstrim_list) : &(dcc->wait_list);
-	int flag = dpolicy->sync ? REQ_SYNC : 0;
-	block_t lstart, start, len, total_len;
+	int flag;
+	block_t lstart, start, len, total_len, orig_len;
 	int err = 0;
 
+	flag = dpolicy->sync ? REQ_SYNC : 0;
+	flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
+
 	if (dc->state != D_PREP)
 		return 0;
 
@@ -1139,7 +1145,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 	lstart = dc->lstart;
 	start = dc->start;
 	len = dc->len;
-	total_len = len;
+	orig_len = total_len = len;
 
 	dc->len = 0;
 

fs/f2fs/segment.c static int __submit_discard_cmd(struct f2fs_sb_info *sbi, · line 1216

Quoted 8 lines
fs/f2fs/segment.c +5 -0
@@ -1203,6 +1209,14 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 		bio->bi_end_io = f2fs_submit_discard_endio;
 		bio->bi_opf |= flag;
 		submit_bio(bio);
+		if (flag & REQ_NOWAIT) {
+			if (dc->error == -EAGAIN) {
+				dc->len = orig_len;
+				list_move(&dc->list, &dcc->retry_list);
+				err = dc->error;

I encounter lots of dmesg, which should be printed by __remove_discard_cmd()

Quoted 8 lines

F2FS-fs (dm-0): Issue discard(23552, 23552, 2) failed, ret: -11

This should happen only if we didn't handle all discard in 5 seconds during umount.

So I doubt we failed to move dc to retry_list, because after submit_bio(), end_io() is not called synchronously as the bio was just pluged?

This can happen if a discard cmd has multiple bios and at least 1 bio is already submitted and when submitting other bios, we encounter -EAGAIN. In this case, this dc will be moved to retry_list and will be moved back to dcc->pend_list only if the dc->bio_ref becomes 0 within 5 sec timeout. If it doesn't become zero, then it will be left in retry_list itself, which will be later removed from retry_list. Before removing from retry_list we will however ensure that submitted bio is done i.e., dc->bio_ref is 0, but dc->error will be -EAGAIN as this dc could not be requeued/retried.

Quoted 3 lines

So this is expected, where it only means that this dc could not be submitted/retried again within timeout. I think we can ignore this -EAGAIN error in __remove_discard_cmd().

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11

Could you take a look at this issue?

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
fs/f2fs/segment.c +3 -0
+				break;
+			}
+		}
Quoted 7 lines

fs/f2fs/segment.c static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
fs/f2fs/segment.c +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
fs/f2fs/segment.c +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
#6 lore raw
Quoted 149 lines · Chao Yu
Quoted 120 lines · Sahitya Tummala

Hi Chao,

Quoted 100 lines · Chao Yu

Hi Sahitya,

Quoted 86 lines · Sahitya Tummala

F2FS already has a default timeout of 5 secs for discards that can be issued during umount, but it can take more than the 5 sec timeout if the underlying UFS device queue is already full and there are no more available free tags to be used. In that case, submit_bio() will wait for the already queued discard requests to complete to get a free tag, which can potentially take way more than 5 sec.

Fix this by submitting the discard requests with REQ_NOWAIT flags during umount. This will return -EAGAIN for UFS queue/tag full scenario without waiting in the context of submit_bio(). The FS can then handle these requests by retrying again within the stipulated discard timeout period to avoid long latencies.

---
v2:
- Handle the case where a dc can have multiple bios associated with it

 fs/f2fs/f2fs.h    |  1 +
 fs/f2fs/segment.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 10 deletions(-)
fs/f2fs/f2fs.h +1 -0
index 12a197e..67b8dcc 100644
@@ -340,6 +340,7 @@ struct discard_cmd_control {
 	struct list_head pend_list[MAX_PLIST_NUM];/* store pending entries */
 	struct list_head wait_list;		/* store on-flushing entries */
 	struct list_head fstrim_list;		/* in-flight discard from fstrim */
+	struct list_head retry_list;		/* list of cmds to retry */
 	wait_queue_head_t discard_wait_queue;	/* waiting queue for wake-up */
 	unsigned int discard_wake;		/* to wake up discard thread */
 	struct mutex cmd_lock;
fs/f2fs/segment.c +14 -8
index fb3e531..4162c76 100644
@@ -1029,13 +1029,16 @@ static void f2fs_submit_discard_endio(struct bio *bio)
 	struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
 	unsigned long flags;
 
-	dc->error = blk_status_to_errno(bio->bi_status);
-
 	spin_lock_irqsave(&dc->lock, flags);
+	if (!dc->error)
+		dc->error = blk_status_to_errno(bio->bi_status);
+
 	dc->bio_ref--;
-	if (!dc->bio_ref && dc->state == D_SUBMIT) {
-		dc->state = D_DONE;
-		complete_all(&dc->wait);
+	if (!dc->bio_ref) {
+		if (dc->error || dc->state == D_SUBMIT) {
+			dc->state = D_DONE;
+			complete_all(&dc->wait);
+		}
 	}
 	spin_unlock_irqrestore(&dc->lock, flags);
 	bio_put(bio);
@@ -1124,10 +1127,13 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
 	struct list_head *wait_list = (dpolicy->type == DPOLICY_FSTRIM) ?
 					&(dcc->fstrim_list) : &(dcc->wait_list);
-	int flag = dpolicy->sync ? REQ_SYNC : 0;
-	block_t lstart, start, len, total_len;
+	int flag;
+	block_t lstart, start, len, total_len, orig_len;
 	int err = 0;
 
+	flag = dpolicy->sync ? REQ_SYNC : 0;
+	flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
+
 	if (dc->state != D_PREP)
 		return 0;
 
@@ -1139,7 +1145,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 	lstart = dc->lstart;
 	start = dc->start;
 	len = dc->len;
-	total_len = len;
+	orig_len = total_len = len;
 
 	dc->len = 0;
 

fs/f2fs/segment.c static int __submit_discard_cmd(struct f2fs_sb_info *sbi, · line 1216

Quoted 8 lines
fs/f2fs/segment.c +5 -0
@@ -1203,6 +1209,14 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 		bio->bi_end_io = f2fs_submit_discard_endio;
 		bio->bi_opf |= flag;
 		submit_bio(bio);
+		if (flag & REQ_NOWAIT) {
+			if (dc->error == -EAGAIN) {
+				dc->len = orig_len;
+				list_move(&dc->list, &dcc->retry_list);
+				err = dc->error;

I encounter lots of dmesg, which should be printed by __remove_discard_cmd()

Quoted 8 lines

F2FS-fs (dm-0): Issue discard(23552, 23552, 2) failed, ret: -11

This should happen only if we didn't handle all discard in 5 seconds during umount.

So I doubt we failed to move dc to retry_list, because after submit_bio(), end_io() is not called synchronously as the bio was just pluged?

This can happen if a discard cmd has multiple bios and at least 1 bio is already submitted and when submitting other bios, we encounter -EAGAIN. In this case, this dc will be moved to retry_list and will be moved back to dcc->pend_list only if the dc->bio_ref becomes 0 within 5 sec timeout. If it doesn't become zero, then it will be left in retry_list itself, which will be later removed from retry_list. Before removing from retry_list we will however ensure that submitted bio is done i.e., dc->bio_ref is 0, but dc->error will be -EAGAIN as this dc could not be requeued/retried.

Quoted 3 lines

So this is expected, where it only means that this dc could not be submitted/retried again within timeout. I think we can ignore this -EAGAIN error in __remove_discard_cmd().

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11
Quoted 1 line

Could you take a look at this issue?

Let me check and get back on this.

Thanks,

Quoted 116 lines

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
fs/f2fs/segment.c +3 -0
+				break;
+			}
+		}
Quoted 7 lines

fs/f2fs/segment.c static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
fs/f2fs/segment.c +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
fs/f2fs/segment.c +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#7 lore raw

Hi Chao,

Quoted 26 lines · Sahitya Tummala
Quoted 25 lines · Chao Yu

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11
Quoted 3 lines
Quoted 1 line

Could you take a look at this issue?

Let me check and get back on this.

I found the issue. The dc with multiple bios is getting requeued again and again in case if one of its bio gets -EAGAIN error. Even the successfully completed bios are getting requeued again resulting into long latency. I have fixed it by splitting the dc in such case so that we can requeue only the leftover bios into a new dc and retry that later within the 5 sec timeout.

Please help to review v3 posted and if it looks good, I would like to request you to test the earlier regression scenario with it to check the result again?

thanks,

Quoted 124 lines

Thanks,

Quoted 116 lines

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
fs/f2fs/segment.c +3 -0
+				break;
+			}
+		}
Quoted 7 lines

fs/f2fs/segment.c static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
fs/f2fs/segment.c +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
fs/f2fs/segment.c +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#8 lore raw

Hi Sahitya,

Bad news, :( I guess we didn't catch the root cause, as after applying v3, I still can reproduce this issue:

generic/003 10s ... 30s

Thanks,

Quoted 169 lines · Sahitya Tummala

Hi Chao,

Quoted 26 lines · Sahitya Tummala
Quoted 25 lines · Chao Yu

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11
Quoted 3 lines
Quoted 1 line

Could you take a look at this issue?

Let me check and get back on this.

I found the issue. The dc with multiple bios is getting requeued again and again in case if one of its bio gets -EAGAIN error. Even the successfully completed bios are getting requeued again resulting into long latency. I have fixed it by splitting the dc in such case so that we can requeue only the leftover bios into a new dc and retry that later within the 5 sec timeout.

Please help to review v3 posted and if it looks good, I would like to request you to test the earlier regression scenario with it to check the result again?

thanks,

Quoted 124 lines

Thanks,

Quoted 116 lines

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
fs/f2fs/segment.c +3 -0
+				break;
+			}
+		}
Quoted 7 lines

fs/f2fs/segment.c static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
fs/f2fs/segment.c +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
fs/f2fs/segment.c +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#9 lore raw
Quoted 6 lines · Chao Yu

Hi Sahitya,

Bad news, :( I guess we didn't catch the root cause, as after applying v3, I still can reproduce this issue:

generic/003 10s ... 30s

I use zram as backend device of fstest,

Call Trace:
 dump_stack+0x66/0x8b
 f2fs_submit_discard_endio+0x88/0xa0 [f2fs]
 generic_make_request_checks+0x70/0x5f0
 generic_make_request+0x3e/0x2e0
 submit_bio+0x72/0x140
 __submit_discard_cmd.isra.50+0x4a8/0x710 [f2fs]
 __issue_discard_cmd+0x171/0x3a0 [f2fs]

Does this mean zram uses single queue, so we may always fail to submit 'nowait' IO due to below condition:

	/*
	 * Non-mq queues do not honor REQ_NOWAIT, so complete a bio
	 * with BLK_STS_AGAIN status in order to catch -EAGAIN and
	 * to give a chance to the caller to repeat request gracefully.
	 */
	if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) {
		status = BLK_STS_AGAIN;
		goto end_io;
	}
Quoted 181 lines

Thanks,

Quoted 39 lines · Sahitya Tummala

Hi Chao,

Quoted 26 lines · Sahitya Tummala
Quoted 25 lines · Chao Yu

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11
Quoted 3 lines
Quoted 1 line

Could you take a look at this issue?

Let me check and get back on this.

I found the issue. The dc with multiple bios is getting requeued again and again in case if one of its bio gets -EAGAIN error. Even the successfully completed bios are getting requeued again resulting into long latency. I have fixed it by splitting the dc in such case so that we can requeue only the leftover bios into a new dc and retry that later within the 5 sec timeout.

Quoted 130 lines

Please help to review v3 posted and if it looks good, I would like to request you to test the earlier regression scenario with it to check the result again?

thanks,

Quoted 124 lines

Thanks,

Quoted 116 lines

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
(quoted diff) +3 -0
+				break;
+			}
+		}
Quoted 7 lines

Review static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
(quoted diff) +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
(quoted diff) +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
.

#10 lore raw

Hi Chao,

Quoted 22 lines · Chao Yu
Quoted 6 lines · Chao Yu

Hi Sahitya,

Bad news, :( I guess we didn't catch the root cause, as after applying v3, I still can reproduce this issue:

generic/003 10s ... 30s

I use zram as backend device of fstest,

Call Trace:
 dump_stack+0x66/0x8b
 f2fs_submit_discard_endio+0x88/0xa0 [f2fs]
 generic_make_request_checks+0x70/0x5f0
 generic_make_request+0x3e/0x2e0
 submit_bio+0x72/0x140
 __submit_discard_cmd.isra.50+0x4a8/0x710 [f2fs]
 __issue_discard_cmd+0x171/0x3a0 [f2fs]

Does this mean zram uses single queue, so we may always fail to submit 'nowait' IO due to below condition:

Quoted 10 lines
	/*
	 * Non-mq queues do not honor REQ_NOWAIT, so complete a bio
	 * with BLK_STS_AGAIN status in order to catch -EAGAIN and
	 * to give a chance to the caller to repeat request gracefully.
	 */
	if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) {
		status = BLK_STS_AGAIN;
		goto end_io;
	}

Yes, I have also just figured out that as the reason. But most of the real block devic drivers support MQ. Can we thus fix this case by checking for MQ status before enabling REQ_NOWAIT as below? Please share your comments.

fs/f2fs/segment.c +3 -1
index cda7935..e7e2ffe 100644
@@ -1131,7 +1131,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 
        flag = dpolicy->sync ? REQ_SYNC : 0;
-       flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
+
+       if (sbi->sb->s_bdev->bd_queue && queue_is_mq(sbi->sb->s_bdev->bd_queue))
+               flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
 
        if (dc->state != D_PREP)
                return 0;
 

Thanks,

Quoted 183 lines
Quoted 183 lines

Thanks,

Quoted 39 lines · Sahitya Tummala

Hi Chao,

Quoted 26 lines · Sahitya Tummala
Quoted 25 lines · Chao Yu

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11
Quoted 3 lines
Quoted 1 line

Could you take a look at this issue?

Let me check and get back on this.

I found the issue. The dc with multiple bios is getting requeued again and again in case if one of its bio gets -EAGAIN error. Even the successfully completed bios are getting requeued again resulting into long latency. I have fixed it by splitting the dc in such case so that we can requeue only the leftover bios into a new dc and retry that later within the 5 sec timeout.

Quoted 130 lines

Please help to review v3 posted and if it looks good, I would like to request you to test the earlier regression scenario with it to check the result again?

thanks,

Quoted 124 lines

Thanks,

Quoted 116 lines

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
(quoted diff) +3 -0
+				break;
+			}
+		}
Quoted 7 lines

Review static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
(quoted diff) +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
(quoted diff) +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
.

Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
#11 lore raw

Hi Sahitya,

Quoted 45 lines · Sahitya Tummala

Hi Chao,

Quoted 22 lines · Chao Yu
Quoted 6 lines · Chao Yu

Hi Sahitya,

Bad news, :( I guess we didn't catch the root cause, as after applying v3, I still can reproduce this issue:

generic/003 10s ... 30s

I use zram as backend device of fstest,

Call Trace:
 dump_stack+0x66/0x8b
 f2fs_submit_discard_endio+0x88/0xa0 [f2fs]
 generic_make_request_checks+0x70/0x5f0
 generic_make_request+0x3e/0x2e0
 submit_bio+0x72/0x140
 __submit_discard_cmd.isra.50+0x4a8/0x710 [f2fs]
 __issue_discard_cmd+0x171/0x3a0 [f2fs]

Does this mean zram uses single queue, so we may always fail to submit 'nowait' IO due to below condition:

Quoted 10 lines
	/*
	 * Non-mq queues do not honor REQ_NOWAIT, so complete a bio
	 * with BLK_STS_AGAIN status in order to catch -EAGAIN and
	 * to give a chance to the caller to repeat request gracefully.
	 */
	if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) {
		status = BLK_STS_AGAIN;
		goto end_io;
	}

Yes, I have also just figured out that as the reason. But most of the real block devic drivers support MQ. Can we thus fix this case by checking for MQ status before enabling REQ_NOWAIT as below? Please share your comments.

fs/f2fs/segment.c +0 -0
index cda7935..e7e2ffe 100644

fs/f2fs/segment.c static int __submit_discard_cmd(struct f2fs_sb_info *sbi, · line 1135

Quoted 6 lines
fs/f2fs/segment.c +3 -1
@@ -1131,7 +1131,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 
        flag = dpolicy->sync ? REQ_SYNC : 0;
-       flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
+
+       if (sbi->sb->s_bdev->bd_queue && queue_is_mq(sbi->sb->s_bdev->bd_queue))
+               flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;

IMO, it's too tight to couple with block layer logic? however, I don't have any better idea about the solution.

Anyway, I guess we can Cc to Jan and block mailing list for comments to see whether there is a better solution.

Thoughts?

Thanks,

Quoted 190 lines
fs/f2fs/segment.c +0 -0
        if (dc->state != D_PREP)
                return 0;
 
 Thanks,
Quoted 184 lines
Quoted 184 lines

Thanks,

Quoted 39 lines · Sahitya Tummala

Hi Chao,

Quoted 26 lines · Sahitya Tummala
Quoted 25 lines · Chao Yu

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11
Quoted 3 lines
Quoted 1 line

Could you take a look at this issue?

Let me check and get back on this.

I found the issue. The dc with multiple bios is getting requeued again and again in case if one of its bio gets -EAGAIN error. Even the successfully completed bios are getting requeued again resulting into long latency. I have fixed it by splitting the dc in such case so that we can requeue only the leftover bios into a new dc and retry that later within the 5 sec timeout.

Quoted 130 lines

Please help to review v3 posted and if it looks good, I would like to request you to test the earlier regression scenario with it to check the result again?

thanks,

Quoted 124 lines

Thanks,

Quoted 116 lines

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
(quoted diff) +3 -0
+				break;
+			}
+		}
Quoted 7 lines

Review static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
(quoted diff) +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
(quoted diff) +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
.

#12 lore raw

Sure Chao. Let us put this patch on hold for now then.

Jaeguek,

Please drop this patch from your tree for time being as it needs further discussion.

Thanks,

Quoted 255 lines · Chao Yu

Hi Sahitya,

Quoted 45 lines · Sahitya Tummala

Hi Chao,

Quoted 22 lines · Chao Yu
Quoted 6 lines · Chao Yu

Hi Sahitya,

Bad news, :( I guess we didn't catch the root cause, as after applying v3, I still can reproduce this issue:

generic/003 10s ... 30s

I use zram as backend device of fstest,

Call Trace:
 dump_stack+0x66/0x8b
 f2fs_submit_discard_endio+0x88/0xa0 [f2fs]
 generic_make_request_checks+0x70/0x5f0
 generic_make_request+0x3e/0x2e0
 submit_bio+0x72/0x140
 __submit_discard_cmd.isra.50+0x4a8/0x710 [f2fs]
 __issue_discard_cmd+0x171/0x3a0 [f2fs]

Does this mean zram uses single queue, so we may always fail to submit 'nowait' IO due to below condition:

Quoted 10 lines
	/*
	 * Non-mq queues do not honor REQ_NOWAIT, so complete a bio
	 * with BLK_STS_AGAIN status in order to catch -EAGAIN and
	 * to give a chance to the caller to repeat request gracefully.
	 */
	if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) {
		status = BLK_STS_AGAIN;
		goto end_io;
	}

Yes, I have also just figured out that as the reason. But most of the real block devic drivers support MQ. Can we thus fix this case by checking for MQ status before enabling REQ_NOWAIT as below? Please share your comments.

fs/f2fs/segment.c +0 -0
index cda7935..e7e2ffe 100644

fs/f2fs/segment.c static int __submit_discard_cmd(struct f2fs_sb_info *sbi, · line 1135

Quoted 6 lines
fs/f2fs/segment.c +3 -1
@@ -1131,7 +1131,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 
        flag = dpolicy->sync ? REQ_SYNC : 0;
-       flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
+
+       if (sbi->sb->s_bdev->bd_queue && queue_is_mq(sbi->sb->s_bdev->bd_queue))
+               flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;

IMO, it's too tight to couple with block layer logic? however, I don't have any better idea about the solution.

Anyway, I guess we can Cc to Jan and block mailing list for comments to see whether there is a better solution.

Thoughts?

Thanks,

Quoted 190 lines
fs/f2fs/segment.c +0 -0
        if (dc->state != D_PREP)
                return 0;
 
 Thanks,
Quoted 184 lines
Quoted 184 lines

Thanks,

Quoted 39 lines · Sahitya Tummala

Hi Chao,

Quoted 26 lines · Sahitya Tummala
Quoted 25 lines · Chao Yu

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11
Quoted 3 lines
Quoted 1 line

Could you take a look at this issue?

Let me check and get back on this.

I found the issue. The dc with multiple bios is getting requeued again and again in case if one of its bio gets -EAGAIN error. Even the successfully completed bios are getting requeued again resulting into long latency. I have fixed it by splitting the dc in such case so that we can requeue only the leftover bios into a new dc and retry that later within the 5 sec timeout.

Quoted 130 lines

Please help to review v3 posted and if it looks good, I would like to request you to test the earlier regression scenario with it to check the result again?

thanks,

Quoted 124 lines

Thanks,

Quoted 116 lines

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
(quoted diff) +3 -0
+				break;
+			}
+		}
Quoted 7 lines

Review static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
(quoted diff) +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
(quoted diff) +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
.

Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
maintainer
#13 lore raw
Quoted 7 lines · Sahitya Tummala

Sure Chao. Let us put this patch on hold for now then.

Jaeguek,

Please drop this patch from your tree for time being as it needs further discussion.

Yeah, I dropped it.

Thanks,

Quoted 264 lines

Thanks,

Quoted 255 lines · Chao Yu

Hi Sahitya,

Quoted 45 lines · Sahitya Tummala

Hi Chao,

Quoted 22 lines · Chao Yu
Quoted 6 lines · Chao Yu

Hi Sahitya,

Bad news, :( I guess we didn't catch the root cause, as after applying v3, I still can reproduce this issue:

generic/003 10s ... 30s

I use zram as backend device of fstest,

Call Trace:
 dump_stack+0x66/0x8b
 f2fs_submit_discard_endio+0x88/0xa0 [f2fs]
 generic_make_request_checks+0x70/0x5f0
 generic_make_request+0x3e/0x2e0
 submit_bio+0x72/0x140
 __submit_discard_cmd.isra.50+0x4a8/0x710 [f2fs]
 __issue_discard_cmd+0x171/0x3a0 [f2fs]

Does this mean zram uses single queue, so we may always fail to submit 'nowait' IO due to below condition:

Quoted 10 lines
	/*
	 * Non-mq queues do not honor REQ_NOWAIT, so complete a bio
	 * with BLK_STS_AGAIN status in order to catch -EAGAIN and
	 * to give a chance to the caller to repeat request gracefully.
	 */
	if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) {
		status = BLK_STS_AGAIN;
		goto end_io;
	}

Yes, I have also just figured out that as the reason. But most of the real block devic drivers support MQ. Can we thus fix this case by checking for MQ status before enabling REQ_NOWAIT as below? Please share your comments.

fs/f2fs/segment.c +0 -0
index cda7935..e7e2ffe 100644

fs/f2fs/segment.c static int __submit_discard_cmd(struct f2fs_sb_info *sbi, · line 1135

Quoted 6 lines
fs/f2fs/segment.c +3 -1
@@ -1131,7 +1131,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 
        flag = dpolicy->sync ? REQ_SYNC : 0;
-       flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;
+
+       if (sbi->sb->s_bdev->bd_queue && queue_is_mq(sbi->sb->s_bdev->bd_queue))
+               flag |= dpolicy->type == DPOLICY_UMOUNT ? REQ_NOWAIT : 0;

IMO, it's too tight to couple with block layer logic? however, I don't have any better idea about the solution.

Anyway, I guess we can Cc to Jan and block mailing list for comments to see whether there is a better solution.

Thoughts?

Thanks,

Quoted 190 lines
fs/f2fs/segment.c +0 -0
        if (dc->state != D_PREP)
                return 0;
 
 Thanks,
Quoted 184 lines
Quoted 184 lines

Thanks,

Quoted 39 lines · Sahitya Tummala

Hi Chao,

Quoted 26 lines · Sahitya Tummala
Quoted 25 lines · Chao Yu

With this patch, most of xfstest cases cost 5 * n second longer than before.

E.g. generic/003, during umount(), we looped into retrying one bio submission.

[61279.829724] F2FS-fs (zram1): Found nat_bits in checkpoint
[61279.885337] F2FS-fs (zram1): Mounted with checkpoint version = 5cf3cb8e
[61281.912832] submit discard bio start [23555,1]
[61281.912835] f2fs_submit_discard_endio [23555,1] err:-11
[61281.912836] submit discard bio end [23555,1]
[61281.912836] move dc to retry list [23555,1]

...

[61286.881212] submit discard bio start [23555,1]
[61286.881217] f2fs_submit_discard_endio [23555,1] err:-11
[61286.881223] submit discard bio end [23555,1]
[61286.881224] move dc to retry list [23555,1]
[61286.905198] submit discard bio start [23555,1]
[61286.905203] f2fs_submit_discard_endio [23555,1] err:-11
[61286.905205] submit discard bio end [23555,1]
[61286.905206] move dc to retry list [23555,1]
[61286.929157] F2FS-fs (zram1): Issue discard(23555, 23555, 1) failed, ret: -11
Quoted 3 lines
Quoted 1 line

Could you take a look at this issue?

Let me check and get back on this.

I found the issue. The dc with multiple bios is getting requeued again and again in case if one of its bio gets -EAGAIN error. Even the successfully completed bios are getting requeued again resulting into long latency. I have fixed it by splitting the dc in such case so that we can requeue only the leftover bios into a new dc and retry that later within the 5 sec timeout.

Quoted 130 lines

Please help to review v3 posted and if it looks good, I would like to request you to test the earlier regression scenario with it to check the result again?

thanks,

Quoted 124 lines

Thanks,

Quoted 116 lines

Thanks,

Quoted 113 lines

Thanks,

Quoted 6 lines

Thanks,

Quoted 4 lines
(quoted diff) +3 -0
+				break;
+			}
+		}
Quoted 7 lines

Review static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi, · line 1480

Quoted 7 lines
(quoted diff) +1 -0
 		atomic_inc(&dcc->issued_discard);
@@ -1463,6 +1477,40 @@ static unsigned int __issue_discard_cmd_orderly(struct f2fs_sb_info *sbi,
 	return issued;
 }
 
+static bool __should_discard_retry(struct f2fs_sb_info *sbi,

s> > + struct discard_policy *dpolicy)

Quoted 95 lines
Quoted 95 lines
(quoted diff) +49 -2
+{
+	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+	struct discard_cmd *dc, *tmp;
+	bool retry = false;
+	unsigned long flags;
+
+	if (dpolicy->type != DPOLICY_UMOUNT)
+		f2fs_bug_on(sbi, 1);
+
+	mutex_lock(&dcc->cmd_lock);
+	list_for_each_entry_safe(dc, tmp, &(dcc->retry_list), list) {
+		if (dpolicy->timeout != 0 &&
+			f2fs_time_over(sbi, dpolicy->timeout)) {
+			retry = false;
+			break;
+		}
+
+		spin_lock_irqsave(&dc->lock, flags);
+		if (!dc->bio_ref) {
+			dc->state = D_PREP;
+			dc->error = 0;
+			reinit_completion(&dc->wait);
+			__relocate_discard_cmd(dcc, dc);
+			retry = true;
+		}
+		spin_unlock_irqrestore(&dc->lock, flags);
+	}
+	mutex_unlock(&dcc->cmd_lock);
+
+	return retry;
+}
+
 static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 					struct discard_policy *dpolicy)
 {
@@ -1470,12 +1518,13 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 	struct list_head *pend_list;
 	struct discard_cmd *dc, *tmp;
 	struct blk_plug plug;
-	int i, issued = 0;
+	int i, err, issued = 0;
 	bool io_interrupted = false;
 
 	if (dpolicy->timeout != 0)
 		f2fs_update_time(sbi, dpolicy->timeout);
 
+retry:
 	for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
 		if (dpolicy->timeout != 0 &&
 				f2fs_time_over(sbi, dpolicy->timeout))
@@ -1509,7 +1558,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 				break;
 			}
 
-			__submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			err = __submit_discard_cmd(sbi, dpolicy, dc, &issued);
+			if (err == -EAGAIN)
+				congestion_wait(BLK_RW_ASYNC,
+						DEFAULT_IO_TIMEOUT);
 
 			if (issued >= dpolicy->max_requests)
 				break;
@@ -1522,6 +1574,10 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 			break;
 	}
 
+	if (!list_empty(&dcc->retry_list) &&
+		__should_discard_retry(sbi, dpolicy))
+		goto retry;
+
 	if (!issued && io_interrupted)
 		issued = -1;
 
@@ -1613,6 +1669,12 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,
 		goto next;
 	}
 
+	if (dpolicy->type == DPOLICY_UMOUNT &&
+		!list_empty(&dcc->retry_list)) {
+		wait_list = &dcc->retry_list;
+		goto next;
+	}
+
 	return trimmed;
 }
 
@@ -2051,6 +2113,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	for (i = 0; i < MAX_PLIST_NUM; i++)
 		INIT_LIST_HEAD(&dcc->pend_list[i]);
 	INIT_LIST_HEAD(&dcc->wait_list);
+	INIT_LIST_HEAD(&dcc->retry_list);
 	INIT_LIST_HEAD(&dcc->fstrim_list);
 	mutex_init(&dcc->cmd_lock);
 	atomic_set(&dcc->issued_discard, 0);
Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
.

Signature · 3 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.