drbd: interval tree: make removing an "empty" interval a no-op
authorLars Ellenberg <lars.ellenberg@linbit.com>
Fri, 13 Jan 2023 12:35:37 +0000 (13:35 +0100)
committerJens Axboe <axboe@kernel.dk>
Sun, 29 Jan 2023 22:18:33 +0000 (15:18 -0700)
Trying to remove an "empty" (just initialized, or "cleared") interval
from the tree, this results in an endless loop.

As we typically protect the tree with a spinlock_irq,
the result is a hung system.

Be nice to error cleanup code paths, ignore removal of empty intervals.

Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
Link: https://lore.kernel.org/r/20230113123538.144276-8-christoph.boehmwalder@linbit.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/drbd/drbd_interval.c

index 5024ffd..b6aaf0d 100644 (file)
@@ -95,6 +95,10 @@ drbd_contains_interval(struct rb_root *root, sector_t sector,
 void
 drbd_remove_interval(struct rb_root *root, struct drbd_interval *this)
 {
+       /* avoid endless loop */
+       if (drbd_interval_empty(this))
+               return;
+
        rb_erase_augmented(&this->rb, root, &augment_callbacks);
 }