Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753463AbYCRFFc (ORCPT ); Tue, 18 Mar 2008 01:05:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752606AbYCRFFV (ORCPT ); Tue, 18 Mar 2008 01:05:21 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:45255 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752264AbYCRFFU (ORCPT ); Tue, 18 Mar 2008 01:05:20 -0400 Date: Mon, 17 Mar 2008 22:04:31 -0700 From: Andrew Morton To: Miklos Szeredi Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [patch 4/8] mm: allow not updating BDI stats in end_page_writeback() Message-Id: <20080317220431.a8507e29.akpm@linux-foundation.org> In-Reply-To: <20080317191945.122011759@szeredi.hu> References: <20080317191908.123631326@szeredi.hu> <20080317191945.122011759@szeredi.hu> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5107 Lines: 133 On Mon, 17 Mar 2008 20:19:12 +0100 Miklos Szeredi wrote: > From: Miklos Szeredi > > Fuse's writepage will need to clear page writeback separately from > updating the per BDI counters. > > This patch renames end_page_writeback() to __end_page_writeback() and > adds a boolean parameter to indicate if the per BDI stats need to be > updated. > > Regular callers get an inline end_page_writeback() without the boolean > parameter. > > ... > > Index: linux/include/linux/page-flags.h > =================================================================== > --- linux.orig/include/linux/page-flags.h 2008-03-17 18:24:13.000000000 +0100 > +++ linux/include/linux/page-flags.h 2008-03-17 18:25:53.000000000 +0100 > @@ -300,7 +300,7 @@ struct page; /* forward declaration */ > > extern void cancel_dirty_page(struct page *page, unsigned int account_size); > > -int test_clear_page_writeback(struct page *page); > +int test_clear_page_writeback(struct page *page, bool bdi_stats); > int test_set_page_writeback(struct page *page); > > static inline void set_page_writeback(struct page *page) > Index: linux/include/linux/pagemap.h > =================================================================== > --- linux.orig/include/linux/pagemap.h 2008-03-17 18:24:13.000000000 +0100 > +++ linux/include/linux/pagemap.h 2008-03-17 18:25:53.000000000 +0100 > @@ -223,7 +223,12 @@ static inline void wait_on_page_writebac > wait_on_page_bit(page, PG_writeback); > } > > -extern void end_page_writeback(struct page *page); > +extern void __end_page_writeback(struct page *page, bool bdi_stats); > + > +static inline void end_page_writeback(struct page *page) > +{ > + __end_page_writeback(page, true); > +} > > /* > * Fault a userspace page into pagetables. Return non-zero on a fault. > Index: linux/mm/filemap.c > =================================================================== > --- linux.orig/mm/filemap.c 2008-03-17 18:25:38.000000000 +0100 > +++ linux/mm/filemap.c 2008-03-17 18:25:53.000000000 +0100 > @@ -574,19 +574,20 @@ EXPORT_SYMBOL(unlock_page); > /** > * end_page_writeback - end writeback against a page > * @page: the page > + * @bdi_stats: update the per-bdi writeback counter > */ > -void end_page_writeback(struct page *page) > +void __end_page_writeback(struct page *page, bool bdi_stats) > { > if (TestClearPageReclaim(page)) > rotate_reclaimable_page(page); > > - if (!test_clear_page_writeback(page)) > + if (!test_clear_page_writeback(page, bdi_stats)) > BUG(); > > smp_mb__after_clear_bit(); > wake_up_page(page, PG_writeback); > } > -EXPORT_SYMBOL(end_page_writeback); > +EXPORT_SYMBOL(__end_page_writeback); > > /** > * __lock_page - get a lock on the page, assuming we need to sleep to get it > Index: linux/mm/page-writeback.c > =================================================================== > --- linux.orig/mm/page-writeback.c 2008-03-17 18:25:17.000000000 +0100 > +++ linux/mm/page-writeback.c 2008-03-17 18:25:53.000000000 +0100 > @@ -1242,7 +1242,7 @@ int clear_page_dirty_for_io(struct page > } > EXPORT_SYMBOL(clear_page_dirty_for_io); > > -int test_clear_page_writeback(struct page *page) > +int test_clear_page_writeback(struct page *page, bool bdi_stats) > { > struct address_space *mapping = page_mapping(page); > int ret; > @@ -1257,7 +1257,7 @@ int test_clear_page_writeback(struct pag > radix_tree_tag_clear(&mapping->page_tree, > page_index(page), > PAGECACHE_TAG_WRITEBACK); > - if (bdi_cap_writeback_dirty(bdi)) { > + if (bdi_stats && bdi_cap_writeback_dirty(bdi)) { > __dec_bdi_stat(bdi, BDI_WRITEBACK); > __bdi_writeout_inc(bdi); > } Adding `mode' flags to a core function is generally considered poor form. And it adds additional overhead and possibly stack utilisation for all callers. We generally prefer that a new function be created. After all, that's what you've done here, only the code has gone and wedged two different functions into one. Another approach might be to add a new bdi_cap_foo() flag. We could then do if (bdi_cap_writeback_dirty(bdi) && bdi_cap_mumble(bdi)) { here. But even better would be to create a new BDI capability which indicates that this address_space doesn't want this treatment in test_clear_page_writeback(), then go fix up all the !bdi_cap_writeback_dirty() address_spaces to set that flag. So then the code becomes if (!bdi_cap_account_writeback_in_test_clear_page_writeback(bdi)) { (good luck thinking up a better name ;)) Reason: bdi_cap_writeback_dirty() is kinda weirdly intrepreted to mean various different things in different places and we really should separate its multiple interpretations into separate flags. Note that this becomes a standalone VFS cleanup patch, and the fuse code can then just use it later on. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/