Delayed metadata writeback results in a hang, disable
it until it is fixed. Pios end in the waiting list of
md and get stuck there never to complete.
Signed-off-by: Alexander Atanasov <alexander.atana...@virtuozzo.com>
---
drivers/md/dm-ploop-map.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c
index 037d7806b179..fac338e31c80 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -818,9 +818,10 @@ static void ploop_advance_local_after_bat_wb(struct ploop
*ploop,
/* holes bit map requires bat_lock */
spin_lock_irqsave(&ploop->bat_lock, flags);
spin_lock(&md->md_lock);
+#ifdef PLOOP_DELAYWB
if (piwb->type == PIWB_TYPE_ALLOC)
goto skip_apply;
-
+#endif
for (; i < last; i++) {
if (piwb->type == PIWB_TYPE_DISCARD) {
ploop_piwb_discard_completed(ploop, success, i + off,
dst_clu[i]);
@@ -837,7 +838,9 @@ static void ploop_advance_local_after_bat_wb(struct ploop
*ploop,
ploop_hole_set_bit(i + off, ploop);
}
}
+#ifdef PLOOP_DELAYWB
skip_apply:
+#endif
WARN_ON_ONCE(!test_bit(MD_WRITEBACK, &md->status));
/* protect piwb */
@@ -1200,8 +1203,10 @@ static int ploop_alloc_cluster(struct ploop *ploop,
struct ploop_index_wb *piwb,
WRITE_ONCE(piwb->md->bat_levels[clu], ploop_top_level(ploop));
spin_unlock_irqrestore(&piwb->md->md_lock, flags);
kunmap_local(to);
+#ifdef PLOOP_DELAYWB
to = piwb->md->kmpage;
WRITE_ONCE(to[clu], *dst_clu);
+#endif
out:
return ret;
}
@@ -1492,6 +1497,7 @@ static void ploop_submit_cow_index_wb(struct ploop_cow
*cow)
WRITE_ONCE(to[clu], cow->dst_clu);
kunmap_local(to);
+#ifdef PLOOP_DELAYWB
spin_lock_irqsave(&md->md_lock, flags);
to = md->kmpage;
WRITE_ONCE(to[clu], cow->dst_clu);
@@ -1499,7 +1505,7 @@ static void ploop_submit_cow_index_wb(struct ploop_cow
*cow)
spin_unlock_irqrestore(&md->md_lock, flags);
ploop_md_up_prio(ploop, md);
-
+#endif
/* Prevent double clearing of holes_bitmap bit on complete_cow() */
cow->dst_clu = BAT_ENTRY_NONE;
spin_lock_irq(&ploop->deferred_lock);
@@ -1593,12 +1599,19 @@ static bool
ploop_locate_new_cluster_and_attach_pio(struct ploop *ploop,
goto error;
}
+#ifdef PLOOP_DELAYWB
if (pio->bi_op & REQ_FUA) {
piwb->pio->bi_op |= REQ_FUA;
ploop_attach_end_action(pio, piwb);
ploop_md_up_prio(ploop, md);
}
-
+#else
+ if (pio->bi_op & REQ_FUA) {
+ piwb->pio->bi_op |= REQ_FUA;
+ ploop_md_up_prio(ploop, md);
+ }
+ ploop_attach_end_action(pio, piwb);
+#endif
attached = true;
out:
return attached;
@@ -1871,7 +1884,8 @@ static inline int ploop_submit_metadata_writeback(struct
ploop *ploop, int force
*/
llist_for_each_safe(pos, t, ll_wb_batch) {
md = list_entry((struct list_head *)pos, typeof(*md), wb_link);
- if (!llist_empty(&md->wait_llist) || force ||
+ /* XXX: fixme delay results in a hang - TBD */
+ if (1 || !llist_empty(&md->wait_llist) || force ||
test_bit(MD_HIGHPRIO, &md->status) ||
time_before(md->dirty_timeout, timeout) ||
ploop->force_md_writeback) {
--
2.43.0
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
