From patchwork Mon Sep 12 10:03:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxiao Bi X-Patchwork-Id: 9326089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F4586048B for ; Mon, 12 Sep 2016 10:05:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F0E728B85 for ; Mon, 12 Sep 2016 10:05:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7144928CCC; Mon, 12 Sep 2016 10:05:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D281428B85 for ; Mon, 12 Sep 2016 10:05:07 +0000 (UTC) Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8CA4CpK029247 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Sep 2016 10:04:13 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u8CA46CE000554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Sep 2016 10:04:06 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1bjO5u-0004oO-AA; Mon, 12 Sep 2016 03:04:06 -0700 Received: from aserv0021.oracle.com ([141.146.126.233]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1bjO5W-0004nf-R8 for ocfs2-devel@oss.oracle.com; Mon, 12 Sep 2016 03:03:42 -0700 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u8CA3gOd001135 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Sep 2016 10:03:42 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u8CA3fGi019195; Mon, 12 Sep 2016 10:03:41 GMT Received: from bijx-OptiPlex-780.cn.oracle.com (/10.182.64.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Sep 2016 03:03:41 -0700 From: Junxiao Bi To: ocfs2-devel@oss.oracle.com, akpm@linux-foundation.org Date: Mon, 12 Sep 2016 18:03:42 +0800 Message-Id: <1473674623-11810-1-git-send-email-junxiao.bi@oracle.com> X-Mailer: git-send-email 1.7.9.5 Cc: mfasheh@suse.de Subject: [Ocfs2-devel] [PATCH 1/2] ocfs2: fix trans extend while flush truncate log X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: userv0021.oracle.com [156.151.31.71] X-Virus-Scanned: ClamAV using ClamSMTP Every time, ocfs2_extend_trans() included a credit for truncate log inode, but as that inode had been managed by jbd2 running transaction first time, it will not consume that credit until jbd2_journal_restart(). Since total credits to extend always included the un-consumed ones, there will be more and more un-consumed credit, at last jbd2_journal_restart() will fail due to credit number over the half of max transction credit. The following error was caught when unlink a large file with many extents. [233096.013936] ------------[ cut here ]------------ [233096.018586] WARNING: CPU: 0 PID: 13626 at fs/jbd2/transaction.c:269 start_this_handle+0x4c3/0x510 [jbd2]() [233096.028335] Modules linked in: ocfs2 nfsd lockd grace nfs_acl auth_rpcgss sunrpc autofs4 ocfs2_dlmfs ocfs2_stack_o2cb ocfs2_dlm ocfs2_nodemanager ocfs2_stackglue configfs sd_mod sg ip6t_REJECT nf_reject_ipv6 nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables be2iscsi iscsi_boot_sysfs bnx2i cnic uio cxgb4i cxgb4 cxgb3i libcxgbi cxgb3 mdio ib_iser rdma_cm ib_cm iw_cm ib_sa ib_mad ib_core ib_addr ipv6 iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi ppdev xen_kbdfront xen_netfront fb_sys_fops sysimgblt sysfillrect syscopyarea parport_pc parport pcspkr i2c_piix4 i2c_core acpi_cpufreq ext4 jbd2 mbcache xen_blkfront floppy pata_acpi ata_generic ata_piix dm_mirror dm_region_hash dm_log dm_mod [233096.081751] CPU: 0 PID: 13626 Comm: unlink Tainted: G W 4.1.12-37.6.3.el6uek.x86_64 #2 [233096.088556] Hardware name: Xen HVM domU, BIOS 4.4.4OVM 02/11/2016 [233096.093125] 000000000000010d ffff88000018b768 ffffffff816bc5bc 000000000000010d [233096.099082] 0000000000000000 ffff88000018b7a8 ffffffff81081475 ffff88000018b788 [233096.105038] ffff88007a99a000 ffff88007b573390 00000000000000fb 0000000000000050 [233096.110540] Call Trace: [233096.111893] [] dump_stack+0x48/0x5c [233096.114637] [] warn_slowpath_common+0x95/0xe0 [233096.117797] [] warn_slowpath_null+0x1a/0x20 [233096.120984] [] start_this_handle+0x4c3/0x510 [jbd2] [233096.124505] [] ? __jbd2_log_start_commit+0xe5/0xf0 [jbd2] [233096.128115] [] ? __wake_up+0x53/0x70 [233096.130924] [] jbd2__journal_restart+0x161/0x1b0 [jbd2] [233096.134523] [] jbd2_journal_restart+0x13/0x20 [jbd2] [233096.137986] [] ocfs2_extend_trans+0x74/0x220 [ocfs2] [233096.141407] [] ? ocfs2_journal_dirty+0x3a/0x90 [ocfs2] [233096.144921] [] ocfs2_replay_truncate_records+0x93/0x360 [ocfs2] [233096.148819] [] __ocfs2_flush_truncate_log+0x13e/0x3a0 [ocfs2] [233096.152644] [] ? ocfs2_reserve_blocks_for_rec_trunc.clone.0+0x44/0x1f0 [ocfs2] [233096.157310] [] ocfs2_remove_btree_range+0x458/0x7f0 [ocfs2] [233096.161099] [] ? __ocfs2_find_path+0x187/0x2d0 [ocfs2] [233096.164612] [] ocfs2_commit_truncate+0x1b3/0x6f0 [ocfs2] [233096.168204] [] ? ocfs2_xattr_tree_et_ops+0x60/0xfffffffffffe8c20 [ocfs2] [233096.172539] [] ? ocfs2_journal_access_eb+0x20/0x20 [ocfs2] [233096.176285] [] ? __sb_end_write+0x33/0x70 [233096.179226] [] ocfs2_truncate_for_delete+0xbd/0x380 [ocfs2] [233096.183009] [] ? ocfs2_query_inode_wipe+0xf4/0x320 [ocfs2] [233096.186738] [] ocfs2_wipe_inode+0x136/0x6a0 [ocfs2] [233096.190165] [] ? ocfs2_query_inode_wipe+0xf4/0x320 [ocfs2] [233096.193846] [] ocfs2_delete_inode+0x2a2/0x3e0 [ocfs2] [233096.197274] [] ? __inode_wait_for_writeback+0x69/0xc0 [233096.200736] [] ? __PRETTY_FUNCTION__.112282+0x20/0xffffffffffffb520 [ocfs2] [233096.205146] [] ocfs2_evict_inode+0x28/0x60 [ocfs2] [233096.208462] [] evict+0xab/0x1a0 [233096.211020] [] ? __PRETTY_FUNCTION__.112282+0x20/0xffffffffffffb520 [ocfs2] [233096.215396] [] iput_final+0xf6/0x190 [233096.218169] [] iput+0xc8/0xe0 [233096.220586] [] do_unlinkat+0x1b7/0x310 [233096.223487] [] ? __do_page_fault+0x18b/0x480 [233096.226655] [] ? __audit_syscall_entry+0xac/0x110 [233096.230009] [] ? do_audit_syscall_entry+0x6c/0x70 [233096.233346] [] ? syscall_trace_enter_phase1+0x153/0x180 [233096.237103] [] SyS_unlink+0x16/0x20 [233096.239800] [] system_call_fastpath+0x12/0x71 [233096.244346] ---[ end trace 28aa7410e69369cf ]--- [233096.247798] JBD2: unlink wants too many credits (251 > 128) Signed-off-by: Junxiao Bi Reviewed-by: Joseph Qi --- fs/ocfs2/alloc.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 7dabbc31060e..51128789a661 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -5922,7 +5922,6 @@ bail: } static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, - handle_t *handle, struct inode *data_alloc_inode, struct buffer_head *data_alloc_bh) { @@ -5935,11 +5934,19 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, struct ocfs2_truncate_log *tl; struct inode *tl_inode = osb->osb_tl_inode; struct buffer_head *tl_bh = osb->osb_tl_bh; + handle_t *handle; di = (struct ocfs2_dinode *) tl_bh->b_data; tl = &di->id2.i_dealloc; i = le16_to_cpu(tl->tl_used) - 1; while (i >= 0) { + handle = ocfs2_start_trans(osb, OCFS2_TRUNCATE_LOG_FLUSH_ONE_REC); + if (IS_ERR(handle)) { + status = PTR_ERR(handle); + mlog_errno(status); + goto bail; + } + /* Caller has given us at least enough credits to * update the truncate log dinode */ status = ocfs2_journal_access_di(handle, INODE_CACHE(tl_inode), tl_bh, @@ -5974,12 +5981,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, } } - status = ocfs2_extend_trans(handle, - OCFS2_TRUNCATE_LOG_FLUSH_ONE_REC); - if (status < 0) { - mlog_errno(status); - goto bail; - } + ocfs2_commit_trans(osb, handle); i--; } @@ -5994,7 +5996,6 @@ int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) { int status; unsigned int num_to_flush; - handle_t *handle; struct inode *tl_inode = osb->osb_tl_inode; struct inode *data_alloc_inode = NULL; struct buffer_head *tl_bh = osb->osb_tl_bh; @@ -6038,21 +6039,11 @@ int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) goto out_mutex; } - handle = ocfs2_start_trans(osb, OCFS2_TRUNCATE_LOG_FLUSH_ONE_REC); - if (IS_ERR(handle)) { - status = PTR_ERR(handle); - mlog_errno(status); - goto out_unlock; - } - - status = ocfs2_replay_truncate_records(osb, handle, data_alloc_inode, + status = ocfs2_replay_truncate_records(osb, data_alloc_inode, data_alloc_bh); if (status < 0) mlog_errno(status); - ocfs2_commit_trans(osb, handle); - -out_unlock: brelse(data_alloc_bh); ocfs2_inode_unlock(data_alloc_inode, 1);