From patchwork Tue Sep 10 02:02:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 273745 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0333A2C009D for ; Tue, 10 Sep 2013 12:03:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752426Ab3IJCD2 (ORCPT ); Mon, 9 Sep 2013 22:03:28 -0400 Received: from mga09.intel.com ([134.134.136.24]:48814 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751595Ab3IJCD2 (ORCPT ); Mon, 9 Sep 2013 22:03:28 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 09 Sep 2013 19:00:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,875,1371106800"; d="scan'208";a="400938784" Received: from zyan5-mobl.sh.intel.com ([10.239.13.1]) by orsmga002.jf.intel.com with ESMTP; 09 Sep 2013 19:03:01 -0700 From: "Yan, Zheng" To: linux-ext4@vger.kernel.org Cc: jack@suse.cz, tytso@mit.edu, lkp@linux.intel.com, "Yan, Zheng" Subject: [PATCH] ext4: fix dirty pages writback regression. Date: Tue, 10 Sep 2013 10:02:58 +0800 Message-Id: <1378778578-5000-1-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.8.1.4 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: "Yan, Zheng" Our Linux Kernel Performance project found that commit 4e7ea81db5 (ext4: restructure writeback path) indroduced regression. After the commit, ext4 does not merge adjacent mapped dirty pages during writeback. The "!buffer_delay(bh) && !buffer_unwritten(bh)" check in mpage_add_bh_to_extent() prevents the merging. Signed-off-by: Yan, Zheng --- fs/ext4/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c79fd7d..bfeb8b2 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1944,8 +1944,7 @@ static bool mpage_add_bh_to_extent(struct mpage_da_data *mpd, ext4_lblk_t lblk, struct ext4_map_blocks *map = &mpd->map; /* Buffer that doesn't need mapping for writeback? */ - if (!buffer_dirty(bh) || !buffer_mapped(bh) || - (!buffer_delay(bh) && !buffer_unwritten(bh))) { + if (!buffer_dirty(bh) || !buffer_mapped(bh)) { /* So far no extent to map => we write the buffer right away */ if (map->m_len == 0) return true;