The patch titled
ext4: mballoc: fix hot spins after err_freebuddy and err_freemeta
has been added to the -mm tree. Its filename is
ext4-mballoc-fix-hot-spins-after-err_freebuddy-and-err_freemeta.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ext4: mballoc: fix hot spins after err_freebuddy and err_freemeta
From: Roel Kluin <12o3l@xxxxxxxxxx>
ext4_mb_init_backend() has a variable i of type ext4_group_t. which is
typedefined in include/linux/ext4_fs_i.h:34 to unsigned long. Since unsigned,
i >= 0 is always true, so fix hot spins after err_freebuddy and err_freemeta.
Also when meta_group_info cannot be allocated prevent a decrement of i when
zero.
Signed-off-by: Roel Kluin <12o3l@xxxxxxxxxx>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Cc: Theodore Ts'o <tytso@xxxxxxx>
Cc: Mingming Cao <cmm@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ext4/mballoc.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff -puN fs/ext4/mballoc.c~ext4-mballoc-fix-hot-spins-after-err_freebuddy-and-err_freemeta fs/ext4/mballoc.c
--- a/fs/ext4/mballoc.c~ext4-mballoc-fix-hot-spins-after-err_freebuddy-and-err_freemeta
+++ a/fs/ext4/mballoc.c
@@ -2572,8 +2572,13 @@ static int ext4_mb_init_backend(struct s
meta_group_info[j] = kzalloc(len, GFP_KERNEL);
if (meta_group_info[j] == NULL) {
printk(KERN_ERR "EXT4-fs: can't allocate buddy mem\n");
- i--;
- goto err_freebuddy;
+ if (i != 0) {
+ i--;
+ goto err_freebuddy;
+ } else {
+ i = num_meta_group_infos - 1;
+ goto err_freemeta;
+ }
}
desc = ext4_get_group_desc(sb, i, NULL);
if (desc == NULL) {
@@ -2618,14 +2623,14 @@ static int ext4_mb_init_backend(struct s
return 0;
err_freebuddy:
- while (i >= 0) {
+ do {
kfree(ext4_get_group_info(sb, i));
- i--;
- }
- i = num_meta_group_infos;
+ } while (i-- != 0);
+ i = num_meta_group_infos - 1;
err_freemeta:
- while (--i >= 0)
+ do {
kfree(sbi->s_group_info[i]);
+ } while (i-- != 0);
iput(sbi->s_buddy_cache);
err_freesgi:
kfree(sbi->s_group_info);
_
Patches currently in -mm which might be from 12o3l@xxxxxxxxxx are
mm-fix-possible-off-by-one-in-walk_pte_range.patch
dz-test-after-postfix-decrement-fails-in-dz_console_putchar.patch
git-alsa-tiwai.patch
git-powerpc.patch
git-dvb.patch
adt746x-logical-bitwise-confusion-in-set_max_duty_at_crit.patch
git-net.patch
smc911x-test-after-postfix-decrement-fails-in-smc911x_resetdrop_pkt.patch
smc911x-test-after-postfix-decrement-fails-in-smc911x_resetdrop_pkt-checkpatch-fixes.patch
git-scsi-misc.patch
block-blk-mergec-inverted-likeliness-in-ll_back_merge_fn.patch
git-cryptodev.patch
free-when-fb-cant-be-registered-in-video-aty-atyfb_basec.patch
drivers-video-aty-aty128fbc-fix-incorrect-usage-of-strncat-in-aty128_init.patch
drivers-video-imsttfbc-add-missing-curly-brackets.patch
likeliness-accounting-change-and-cleanup.patch
likely_prof-update-to-test_and_set_bit_lock-clear_bit_unlock.patch
ext4-mballoc-fix-hot-spins-after-err_freebuddy-and-err_freemeta.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
