linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] fix softlockups in ext2/3 when trying to allocate blocks
@ 2009-07-06 19:47 Josef Bacik
  2009-07-08 20:26 ` Valerie Aurora
  2009-07-21  6:37 ` Andrew Morton
  0 siblings, 2 replies; 6+ messages in thread
From: Josef Bacik @ 2009-07-06 19:47 UTC (permalink / raw)
  To: linux-ext4; +Cc: emcnabb, linux-kernel, linux-fsdevel

This isn't a huge deal, but using a big beefy box with more CPUs than what is
sane, you can get a nice flood of softlockup messages when running heavy
multi-threaded io tests on ext2/3.  The processors compete for blocks from the
allocator, so they will loop quite a bit trying to get their allocation.  This
patch simply makes sure that we reschedule if need be.  This made the softlockup
messages disappear whereas before they happened almost immediately.  Thanks,

Tested-by: Evan McNabb <emcnabb@redhat.com>
Signed-off-by: Josef Bacik <josef@redhat.com>
---
 fs/ext2/balloc.c |    1 +
 fs/ext3/balloc.c |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 7f8d2e5..17dd55f 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -1176,6 +1176,7 @@ ext2_try_to_allocate_with_rsv(struct super_block *sb, unsigned int group,
 			break;				/* succeed */
 		}
 		num = *count;
+		cond_resched();
 	}
 	return ret;
 }
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 27967f9..cffc8cd 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -735,6 +735,7 @@ bitmap_search_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh,
 	struct journal_head *jh = bh2jh(bh);
 
 	while (start < maxblocks) {
+		cond_resched();
 		next = ext3_find_next_zero_bit(bh->b_data, maxblocks, start);
 		if (next >= maxblocks)
 			return -1;
@@ -1391,6 +1392,7 @@ ext3_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle,
 			break;				/* succeed */
 		}
 		num = *count;
+		cond_resched();
 	}
 out:
 	if (ret >= 0) {
-- 
1.6.2.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2009-07-21 16:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-06 19:47 [PATCH] fix softlockups in ext2/3 when trying to allocate blocks Josef Bacik
2009-07-08 20:26 ` Valerie Aurora
2009-07-21  6:37 ` Andrew Morton
2009-07-21 15:15   ` Josef Bacik
2009-07-21 15:50     ` Jan Kara
2009-07-21 16:06       ` Josef Bacik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).