Skip to content

Commit e7faf56

Browse files
Damenlyharshimogalapalli
authored andcommitted
md/md-bitmap: fix wrong bitmap_limit for clustermd when write sb
commit 6130825 upstream. In clustermd, separate write-intent-bitmaps are used for each cluster node: 0 4k 8k 12k ------------------------------------------------------------------- | idle | md super | bm super [0] + bits | | bm bits[0, contd] | bm super[1] + bits | bm bits[1, contd] | | bm super[2] + bits | bm bits [2, contd] | bm super[3] + bits | | bm bits [3, contd] | | | So in node 1, pg_index in __write_sb_page() could equal to bitmap->storage.file_pages. Then bitmap_limit will be calculated to 0. md_super_write() will be called with 0 size. That means the first 4k sb area of node 1 will never be updated through filemap_write_page(). This bug causes hang of mdadm/clustermd_tests/01r1_Grow_resize. Here use (pg_index % bitmap->storage.file_pages) to make calculation of bitmap_limit correct. Fixes: ab99a87 ("md/md-bitmap: fix writing non bitmap pages") Signed-off-by: Su Yue <[email protected]> Reviewed-by: Heming Zhao <[email protected]> Link: https://lore.kernel.org/linux-raid/[email protected] Signed-off-by: Yu Kuai <[email protected]> Signed-off-by: Harshit Mogalapalli <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 60196f92bbc7901eb5cfa5d456651b87ea50a4a3) Signed-off-by: Harshit Mogalapalli <[email protected]>
1 parent 5942994 commit e7faf56

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/md/md-bitmap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ static int __write_sb_page(struct md_rdev *rdev, struct bitmap *bitmap,
426426
struct block_device *bdev;
427427
struct mddev *mddev = bitmap->mddev;
428428
struct bitmap_storage *store = &bitmap->storage;
429-
unsigned int bitmap_limit = (bitmap->storage.file_pages - pg_index) <<
430-
PAGE_SHIFT;
429+
unsigned long num_pages = bitmap->storage.file_pages;
430+
unsigned int bitmap_limit = (num_pages - pg_index % num_pages) << PAGE_SHIFT;
431431
loff_t sboff, offset = mddev->bitmap_info.offset;
432432
sector_t ps = pg_index * PAGE_SIZE / SECTOR_SIZE;
433433
unsigned int size = PAGE_SIZE;
@@ -436,7 +436,7 @@ static int __write_sb_page(struct md_rdev *rdev, struct bitmap *bitmap,
436436

437437
bdev = (rdev->meta_bdev) ? rdev->meta_bdev : rdev->bdev;
438438
/* we compare length (page numbers), not page offset. */
439-
if ((pg_index - store->sb_index) == store->file_pages - 1) {
439+
if ((pg_index - store->sb_index) == num_pages - 1) {
440440
unsigned int last_page_size = store->bytes & (PAGE_SIZE - 1);
441441

442442
if (last_page_size == 0)

0 commit comments

Comments
 (0)