From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933294Ab0KQELr (ORCPT ); Tue, 16 Nov 2010 23:11:47 -0500 Received: from mga01.intel.com ([192.55.52.88]:31238 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759534Ab0KQEIJ (ORCPT ); Tue, 16 Nov 2010 23:08:09 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,209,1288594800"; d="scan'208";a="627554498" Message-Id: <20101117035906.960519160@intel.com> User-Agent: quilt/0.48-1 Date: Wed, 17 Nov 2010 11:58:34 +0800 From: Wu Fengguang To: Andrew Morton CC: "Theodore Ts'o" , Jan Kara , Wu Fengguang CC: Dave Chinner CC: Peter Zijlstra CC: Mel Gorman CC: Rik van Riel CC: KOSAKI Motohiro CC: Chris Mason CC: Christoph Hellwig Cc: linux-mm Cc: Cc: LKML Subject: [PATCH 13/13] writeback: make nr_to_write a per-file limit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andrew, References: <20101117035821.000579293@intel.com> Content-Disposition: inline; filename=writeback-single-file-limit.patch This ensures full 4MB (or larger) writeback size for large dirty files. CC: Jan Kara Signed-off-by: Wu Fengguang --- fs/fs-writeback.c | 11 +++++++++++ include/linux/writeback.h | 1 + 2 files changed, 12 insertions(+) --- linux-next.orig/fs/fs-writeback.c 2010-11-15 19:52:39.000000000 +0800 +++ linux-next/fs/fs-writeback.c 2010-11-15 21:31:50.000000000 +0800 @@ -330,6 +330,8 @@ static int writeback_single_inode(struct inode *inode, struct writeback_control *wbc) { struct address_space *mapping = inode->i_mapping; + long per_file_limit = wbc->per_file_limit; + long nr_to_write; unsigned dirty; int ret; @@ -365,8 +367,16 @@ writeback_single_inode(struct inode *ino inode->i_state &= ~I_DIRTY_PAGES; spin_unlock(&inode_lock); + if (per_file_limit) { + nr_to_write = wbc->nr_to_write; + wbc->nr_to_write = per_file_limit; + } + ret = do_writepages(mapping, wbc); + if (per_file_limit) + wbc->nr_to_write += nr_to_write - per_file_limit; + /* * Make sure to wait on the data before writing out the metadata. * This is important for filesystems that modify metadata on data @@ -698,6 +708,7 @@ static long wb_writeback(struct bdi_writ wbc.more_io = 0; wbc.nr_to_write = write_chunk; + wbc.per_file_limit = write_chunk; wbc.pages_skipped = 0; trace_wbc_writeback_start(&wbc, wb->bdi); --- linux-next.orig/include/linux/writeback.h 2010-11-15 19:52:39.000000000 +0800 +++ linux-next/include/linux/writeback.h 2010-11-15 21:31:50.000000000 +0800 @@ -43,6 +43,7 @@ struct writeback_control { extra jobs and livelock */ long nr_to_write; /* Write this many pages, and decrement this for each page written */ + long per_file_limit; /* Write this many pages for one file */ long pages_skipped; /* Pages which were not written */ /* From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wu Fengguang Subject: [PATCH 13/13] writeback: make nr_to_write a per-file limit Date: Wed, 17 Nov 2010 11:58:34 +0800 Message-ID: <20101117035906.960519160@intel.com> Cc: Theodore Ts'o , Jan Kara , Wu Fengguang To: Andrew Morton Return-path: CC: Dave Chinner CC: Peter Zijlstra CC: Mel Gorman CC: Rik van Riel CC: KOSAKI Motohiro CC: Chris Mason CC: Christoph Hellwig Cc: linux-mm Cc: Cc: LKML Sender: owner-linux-mm@kvack.org List-Id: linux-fsdevel.vger.kernel.org Andrew, References: <20101117035821.000579293@intel.com> Content-Disposition: inline; filename=writeback-single-file-limit.patch This ensures full 4MB (or larger) writeback size for large dirty files. CC: Jan Kara Signed-off-by: Wu Fengguang --- fs/fs-writeback.c | 11 +++++++++++ include/linux/writeback.h | 1 + 2 files changed, 12 insertions(+) --- linux-next.orig/fs/fs-writeback.c 2010-11-15 19:52:39.000000000 +0800 +++ linux-next/fs/fs-writeback.c 2010-11-15 21:31:50.000000000 +0800 @@ -330,6 +330,8 @@ static int writeback_single_inode(struct inode *inode, struct writeback_control *wbc) { struct address_space *mapping = inode->i_mapping; + long per_file_limit = wbc->per_file_limit; + long nr_to_write; unsigned dirty; int ret; @@ -365,8 +367,16 @@ writeback_single_inode(struct inode *ino inode->i_state &= ~I_DIRTY_PAGES; spin_unlock(&inode_lock); + if (per_file_limit) { + nr_to_write = wbc->nr_to_write; + wbc->nr_to_write = per_file_limit; + } + ret = do_writepages(mapping, wbc); + if (per_file_limit) + wbc->nr_to_write += nr_to_write - per_file_limit; + /* * Make sure to wait on the data before writing out the metadata. * This is important for filesystems that modify metadata on data @@ -698,6 +708,7 @@ static long wb_writeback(struct bdi_writ wbc.more_io = 0; wbc.nr_to_write = write_chunk; + wbc.per_file_limit = write_chunk; wbc.pages_skipped = 0; trace_wbc_writeback_start(&wbc, wb->bdi); --- linux-next.orig/include/linux/writeback.h 2010-11-15 19:52:39.000000000 +0800 +++ linux-next/include/linux/writeback.h 2010-11-15 21:31:50.000000000 +0800 @@ -43,6 +43,7 @@ struct writeback_control { extra jobs and livelock */ long nr_to_write; /* Write this many pages, and decrement this for each page written */ + long per_file_limit; /* Write this many pages for one file */ long pages_skipped; /* Pages which were not written */ /* -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wu Fengguang Subject: [PATCH 13/13] writeback: make nr_to_write a per-file limit Date: Wed, 17 Nov 2010 11:58:34 +0800 Message-ID: <20101117035906.960519160@intel.com> Return-path: Received: from kanga.kvack.org ([205.233.56.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PIZJc-0007Q9-RU for glkm-linux-mm-2@m.gmane.org; Wed, 17 Nov 2010 05:08:13 +0100 Received: from mail144.messagelabs.com (mail144.messagelabs.com [216.82.254.51]) by kanga.kvack.org (Postfix) with SMTP id 8DD606B0106 for ; Tue, 16 Nov 2010 23:08:09 -0500 (EST) Sender: owner-linux-mm@kvack.org To: Andrew Morton Cc: Theodore Ts'o , Jan Kara , Wu Fengguang , Dave Chinner , Peter Zijlstra , Mel Gorman , Rik van Riel , KOSAKI Motohiro , Chris Mason , Christoph Hellwig , linux-mm , linux-fsdevel@vger.kernel.org, LKML List-Id: linux-mm.kvack.org Andrew, References: <20101117035821.000579293@intel.com> Content-Disposition: inline; filename=writeback-single-file-limit.patch This ensures full 4MB (or larger) writeback size for large dirty files. CC: Jan Kara Signed-off-by: Wu Fengguang --- fs/fs-writeback.c | 11 +++++++++++ include/linux/writeback.h | 1 + 2 files changed, 12 insertions(+) --- linux-next.orig/fs/fs-writeback.c 2010-11-15 19:52:39.000000000 +0800 +++ linux-next/fs/fs-writeback.c 2010-11-15 21:31:50.000000000 +0800 @@ -330,6 +330,8 @@ static int writeback_single_inode(struct inode *inode, struct writeback_control *wbc) { struct address_space *mapping = inode->i_mapping; + long per_file_limit = wbc->per_file_limit; + long nr_to_write; unsigned dirty; int ret; @@ -365,8 +367,16 @@ writeback_single_inode(struct inode *ino inode->i_state &= ~I_DIRTY_PAGES; spin_unlock(&inode_lock); + if (per_file_limit) { + nr_to_write = wbc->nr_to_write; + wbc->nr_to_write = per_file_limit; + } + ret = do_writepages(mapping, wbc); + if (per_file_limit) + wbc->nr_to_write += nr_to_write - per_file_limit; + /* * Make sure to wait on the data before writing out the metadata. * This is important for filesystems that modify metadata on data @@ -698,6 +708,7 @@ static long wb_writeback(struct bdi_writ wbc.more_io = 0; wbc.nr_to_write = write_chunk; + wbc.per_file_limit = write_chunk; wbc.pages_skipped = 0; trace_wbc_writeback_start(&wbc, wb->bdi); --- linux-next.orig/include/linux/writeback.h 2010-11-15 19:52:39.000000000 +0800 +++ linux-next/include/linux/writeback.h 2010-11-15 21:31:50.000000000 +0800 @@ -43,6 +43,7 @@ struct writeback_control { extra jobs and livelock */ long nr_to_write; /* Write this many pages, and decrement this for each page written */ + long per_file_limit; /* Write this many pages for one file */ long pages_skipped; /* Pages which were not written */ /* -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: email@kvack.org