btrfs: raid56: properly unmap parity page in finish_parity_scrub()
PATCH 1/1 btrfs: raid56: properly unmap parity page in finish_parity_scrub()
Parity page is incorrectly unmapped in finish_parity_scrub(), triggering a reference counter bug on i386, i.e.:
[ 157.662401] kernel BUG at mm/highmem.c:349! [ 157.666725] invalid opcode: 0000 [#1] SMP PTI
Steps to reproduce the bug:
- create a raid5 btrfs filesystem:
# mkfs.btrfs -m raid5 -d raid5 /dev/sdb /dev/sdc /dev/sdd /dev/sde
- mount it:
# mount /dev/sdb /mnt
- run btrfs scrub in a loop:
# while :; do btrfs scrub start -BR /mnt; done
--- fs/btrfs/raid56.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/raid56.c +2 -1
@@ -2430,8 +2430,9 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,bitmap_clear (rbio->dbitmap, pagenr,1 );kunmap (p); -for (stripe =0 ; stripe < rbio->real_stripes; stripe++) +for (stripe =0 ; stripe < nr_data; stripe++)kunmap (page_in_rbio (rbio, stripe, pagenr,0 )); +kunmap (p_page); }__free_page (p_page);
Signature · 1 line
2.19.1
Quoted 28 lines · Andrea Righi
Parity page is incorrectly unmapped in
finish_parity_scrub(), triggering a reference counter bug on i386, i.e.:[ 157.662401] kernel BUG at mm/highmem.c:349! [ 157.666725] invalid opcode: 0000 [#1] SMP PTISteps to reproduce the bug:
- create a raid5 btrfs filesystem:# mkfs.btrfs -m raid5 -d raid5 /dev/sdb /dev/sdc /dev/sdd /dev/sde- mount it:
# mount /dev/sdb /mnt- run btrfs scrub in a loop:
# while :; do btrfs scrub start -BR /mnt; doneSigned-off-by Andrea Righi <[email protected]>--- fs/btrfs/raid56.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/btrfs/raid56.c +0
-0
fs/btrfs/raid56.c static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio, · line 2438
Quoted 10 lines
fs/btrfs/raid56.c +2
-1@@ -2430,8 +2430,9 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,bitmap_clear (rbio->dbitmap, pagenr,1 );kunmap (p); -for (stripe =0 ; stripe < rbio->real_stripes; stripe++) +for (stripe =0 ; stripe < nr_data; stripe++)kunmap (page_in_rbio (rbio, stripe, pagenr,0 )); +kunmap (p_page); }__free_page (p_page);
Code wise this looks ok, but the changelog could really describe what you're changing and why it is correct.
I.e. the kunmap(p_page) was completely left out, so we never did an unmap for the p_page and the loop unmapping the rbio page was iterating over the wrong number of stripes, the map is done with nr_data vs rbio->real_stripes for the unmap.
With the above (roughly) placed in the changelog:
Signature · 6 lines
Johannes Thumshirn SUSE Labs Filesystems [email protected] +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
PATCH v2 1/1 btrfs: raid56: properly unmap parity page in finish_parity_scrub()
In reply to Andrea RighiParity page is incorrectly unmapped in finish_parity_scrub(), triggering a reference counter bug on i386, i.e.:
[ 157.662401] kernel BUG at mm/highmem.c:349! [ 157.666725] invalid opcode: 0000 [#1] SMP PTI
The reason is that kunmap(p_page) was completely left out, so we never did an unmap for the p_page and the loop unmapping the rbio page was iterating over the wrong number of stripes: unmapping should be done with nr_data instead of rbio->real_stripes.
Test case to reproduce the bug:
- create a raid5 btrfs filesystem:
# mkfs.btrfs -m raid5 -d raid5 /dev/sdb /dev/sdc /dev/sdd /dev/sde
- mount it:
# mount /dev/sdb /mnt
- run btrfs scrub in a loop:
# while :; do btrfs scrub start -BR /mnt; done
---
Changes in v2:
- added a better description about this fix (thanks to Johannes)
fs/btrfs/raid56.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/raid56.c +2 -1
@@ -2430,8 +2430,9 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,bitmap_clear (rbio->dbitmap, pagenr,1 );kunmap (p); -for (stripe =0 ; stripe < rbio->real_stripes; stripe++) +for (stripe =0 ; stripe < nr_data; stripe++)kunmap (page_in_rbio (rbio, stripe, pagenr,0 )); +kunmap (p_page); }__free_page (p_page);
Signature · 1 line
2.19.1
Quoted 17 lines · Andrea Righi
Parity page is incorrectly unmapped in
finish_parity_scrub(), triggering a reference counter bug on i386, i.e.:[ 157.662401] kernel BUG at mm/highmem.c:349! [ 157.666725] invalid opcode: 0000 [#1] SMP PTIThe reason is that
kunmap(p_page)was completely left out, so we never did an unmap for thep_pageand the loop unmapping the rbio page was iterating over the wrong number of stripes: unmapping should be done withnr_datainstead ofrbio->real_stripes.Test case to reproduce the bug:
- create a raid5 btrfs filesystem:
# mkfs.btrfs -m raid5 -d raid5 /dev/sdb /dev/sdc /dev/sdd /dev/sde- mount it:
Quoted 8 lines
# mount /dev/sdb /mnt- run btrfs scrub in a loop:
# while :; do btrfs scrub start -BR /mnt; doneReviewed-by Johannes Thumshirn <[email protected]>Signed-off-by Andrea Righi <[email protected]>
Thanks.