From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753831AbZIXOoy (ORCPT ); Thu, 24 Sep 2009 10:44:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752666AbZIXOkg (ORCPT ); Thu, 24 Sep 2009 10:40:36 -0400 Received: from brick.kernel.dk ([93.163.65.50]:44106 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752566AbZIXOkf (ORCPT ); Thu, 24 Sep 2009 10:40:35 -0400 From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: fengguang.wu@intel.com, shaohua.li@intel.com, chris.mason@oracle.com, jack@suse.cz, Jens Axboe Subject: [PATCH 01/10] fs: Fix busyloop in wb_writeback() Date: Thu, 24 Sep 2009 16:40:27 +0200 Message-Id: <1253803236-20760-2-git-send-email-jens.axboe@oracle.com> X-Mailer: git-send-email 1.6.3.3.385.g60647 In-Reply-To: <1253803236-20760-1-git-send-email-jens.axboe@oracle.com> References: <1253803236-20760-1-git-send-email-jens.axboe@oracle.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kara If all inodes are under writeback (e.g. in case when there's only one inode with dirty pages), wb_writeback() with WB_SYNC_NONE work basically degrades to busylooping until I_SYNC flags of the inode is cleared. Fix the problem by waiting on I_SYNC flags of an inode on b_more_io list in case we failed to write anything. CC: Wu Fengguang Signed-off-by: Jan Kara Signed-off-by: Jens Axboe --- fs/fs-writeback.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 8e1e5e1..c59d673 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -706,6 +706,7 @@ static long wb_writeback(struct bdi_writeback *wb, }; unsigned long oldest_jif; long wrote = 0; + struct inode *inode; if (wbc.for_kupdate) { wbc.older_than_this = &oldest_jif; @@ -747,8 +748,24 @@ static long wb_writeback(struct bdi_writeback *wb, * If we ran out of stuff to write, bail unless more_io got set */ if (wbc.nr_to_write > 0 || wbc.pages_skipped > 0) { - if (wbc.more_io && !wbc.for_kupdate) + if (wbc.more_io && !wbc.for_kupdate) { + if (wbc.nr_to_write < MAX_WRITEBACK_PAGES) + continue; + /* + * Nothing written. Wait for some inode to + * become available for writeback. Otherwise + * we'll just busyloop. + */ + spin_lock(&inode_lock); + if (!list_empty(&wb->b_more_io)) { + inode = list_entry( + wb->b_more_io.prev, + struct inode, i_list); + inode_wait_for_writeback(inode); + } + spin_unlock(&inode_lock); continue; + } break; } } -- 1.6.4.1.207.g68ea