Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753217Ab2KPRLD (ORCPT ); Fri, 16 Nov 2012 12:11:03 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:20523 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752371Ab2KPRLB (ORCPT ); Fri, 16 Nov 2012 12:11:01 -0500 Subject: [PATCH 14/14] mm: Account for WRITEBACK_TEMP in balance_dirty_pages To: miklos@szeredi.hu From: Maxim Patlasov Cc: dev@parallels.com, fuse-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, jbottomley@parallels.com, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, xemul@openvz.org Date: Fri, 16 Nov 2012 21:10:45 +0400 Message-ID: <20121116171039.3196.92186.stgit@maximpc.sw.ru> In-Reply-To: <20121116170123.3196.93431.stgit@maximpc.sw.ru> References: <20121116170123.3196.93431.stgit@maximpc.sw.ru> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1548 Lines: 37 Make balance_dirty_pages start the throttling when the WRITEBACK_TEMP counter is high enough. This prevents us from having too many dirty pages on fuse, thus giving the userspace part of it a chance to write stuff properly. Note, that the existing balance logic is per-bdi, i.e. if the fuse user task gets stuck in the function this means, that it either writes to the mountpoint it serves (but it can deadlock even without the writeback) or it is writing to some _other_ dirty bdi and in the latter case someone else will free the memory for it. Signed-off-by: Maxim Patlasov Signed-off-by: Pavel Emelyanov --- mm/page-writeback.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 830893b..499a606 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -1220,7 +1220,8 @@ static void balance_dirty_pages(struct address_space *mapping, */ nr_reclaimable = global_page_state(NR_FILE_DIRTY) + global_page_state(NR_UNSTABLE_NFS); - nr_dirty = nr_reclaimable + global_page_state(NR_WRITEBACK); + nr_dirty = nr_reclaimable + global_page_state(NR_WRITEBACK) + + global_page_state(NR_WRITEBACK_TEMP); global_dirty_limits(&background_thresh, &dirty_thresh); -- 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/