From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755508AbXFLMNR (ORCPT ); Tue, 12 Jun 2007 08:13:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752572AbXFLMNH (ORCPT ); Tue, 12 Jun 2007 08:13:07 -0400 Received: from brick.kernel.dk ([80.160.20.94]:8850 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753888AbXFLMNG (ORCPT ); Tue, 12 Jun 2007 08:13:06 -0400 Date: Tue, 12 Jun 2007 14:10:48 +0200 From: Jens Axboe To: Peter Zijlstra Cc: Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: splice: move balance_dirty_pages_ratelimited() outside of splice actor Message-ID: <20070612121047.GB18832@kernel.dk> References: <200706112159.l5BLxF5x004043@hera.kernel.org> <20070611163433.dbc541ec.akpm@linux-foundation.org> <20070612063510.GO18832@kernel.dk> <20070612112059.GY18832@kernel.dk> <20070612113101.GZ18832@kernel.dk> <1181649983.7348.309.camel@twins> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1181649983.7348.309.camel@twins> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 12 2007, Peter Zijlstra wrote: > On Tue, 2007-06-12 at 13:31 +0200, Jens Axboe wrote: > > > Would you prefer this change, then? I'd prefer keeping the current code, > > unless it's absolutely critical that we call > > balance_dirty_pages_ratelimited() for each and every page instead of eg > > every 16 pages here. > > For that we should call: > balance_dirty_pages_ratelimited_nr(mapping, nr); > > Which is ok, for small nr. OK, then this should be better: diff --git a/fs/splice.c b/fs/splice.c index 25ec9c8..ed40967 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -844,6 +883,9 @@ generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out, sd.file = out; ret = __splice_from_pipe(pipe, &sd, pipe_to_file); if (ret > 0) { + unsigned long nr_pages; + + nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; *ppos += ret; /* @@ -857,7 +899,7 @@ generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out, if (err) ret = err; } - balance_dirty_pages_ratelimited(mapping); + balance_dirty_pages_ratelimited_nr(mapping, nr_pages); } return ret; @@ -898,6 +940,9 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, ret = splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_file); if (ret > 0) { + unsigned long nr_pages; + + nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; *ppos += ret; /* @@ -913,7 +958,7 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, if (err) ret = err; } - balance_dirty_pages_ratelimited(mapping); + balance_dirty_pages_ratelimited_nr(mapping, nr_pages); } return ret; -- Jens Axboe