Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp259259ybv; Thu, 6 Feb 2020 22:28:37 -0800 (PST) X-Google-Smtp-Source: APXvYqyrkj+EpXptUWiNdedDyR1QjvLuuCLqvrmpwfo5YCOIlF++fjPNVeawc9f+aUFWA/cdRe2p X-Received: by 2002:aca:4ace:: with SMTP id x197mr1106656oia.23.1581056917302; Thu, 06 Feb 2020 22:28:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581056917; cv=none; d=google.com; s=arc-20160816; b=yNPVOUZ6wV/FJ9B7kRMHtcingrPbn/XLijgWj/bJOpKzowh6n8xy6UMZCIzON8u/l4 l6X9t0KX9QrOpXPs2j2EJJWlTH3m7mzQehd21IneBIBtLDuOLyDSAwIUhjeoblejnsrT QNHR7xKDlttXpwDTNMnJPhF/IDG7iRonKKpB4z81j+hlp89lKJNpdpQJcLo8ul1+4yuq 96p1x3QKFLlYR44xy8dNn/TeTiCxQy3USK3dnHFRCLR80MYSXSx1QQSDt51V/vHjw22O YlYimi6LNb83q6W2EK3KW8p9FXMguTuWekM1wE1ysdfi369idb5Iq1ssKGoUGHZDTS5b 5mFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=51WHOBtcGgKEpLf7t6FxVQ4JzXCUX9SU6XkxGkQHNBc=; b=m28JktI1Qjx4+nD8qc3Mfux79z6FJuSXtI6Doihk3S1bqnRi+VKDhRB3TT0h3DU2bI f94PEcF8sHrCrepDrnl13DhrDkYQpUhkjsmXsi3bOGLDOOmV5XM5UbOcIq+TD2vTD3PR 3wI9cCYBYMKPSdgrMgyGmqO5m6dwIi0K69bHdV+f4851N5xGB63SatqLjXveZiOtpn5q HkesmTnpaIIpJPFRBOkdUPKcNhX3YRf4XIs5V5Nmpos/bFlFWtb4wJdEfCeMUsVc4oZV 4NS9IowYgGYT2eCLag1BeLxfUc5Kzdh1ooVuy5bHPzjIT7JXa60110OfzRFmUzkIdkl3 SlWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a64si3532059oif.256.2020.02.06.22.28.20; Thu, 06 Feb 2020 22:28:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726451AbgBGG2Q (ORCPT + 99 others); Fri, 7 Feb 2020 01:28:16 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:58978 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726417AbgBGG2P (ORCPT ); Fri, 7 Feb 2020 01:28:15 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 760528F4932E45783125; Fri, 7 Feb 2020 14:28:04 +0800 (CST) Received: from huawei.com (10.175.104.225) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.439.0; Fri, 7 Feb 2020 14:27:56 +0800 From: Shijie Luo To: CC: , , , Subject: [PATCH] ext4: add cond_resched() to ext4_protect_reserved_inode Date: Fri, 7 Feb 2020 01:27:16 -0500 Message-ID: <20200207062716.3068-1-luoshijie1@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.104.225] X-CFilter-Loop: Reflected Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org When journal size is set too big by "mkfs.ext4 -J size=", or when we mount a crafted image to make journal inode->i_size too big, the loop, "while (i < num)", holds cpu too long. This could cause soft lockup. [ 529.357541] Call trace: [ 529.357551] dump_backtrace+0x0/0x198 [ 529.357555] show_stack+0x24/0x30 [ 529.357562] dump_stack+0xa4/0xcc [ 529.357568] watchdog_timer_fn+0x300/0x3e8 [ 529.357574] __hrtimer_run_queues+0x114/0x358 [ 529.357576] hrtimer_interrupt+0x104/0x2d8 [ 529.357580] arch_timer_handler_virt+0x38/0x58 [ 529.357584] handle_percpu_devid_irq+0x90/0x248 [ 529.357588] generic_handle_irq+0x34/0x50 [ 529.357590] __handle_domain_irq+0x68/0xc0 [ 529.357593] gic_handle_irq+0x6c/0x150 [ 529.357595] el1_irq+0xb8/0x140 [ 529.357599] __ll_sc_atomic_add_return_acquire+0x14/0x20 [ 529.357668] ext4_map_blocks+0x64/0x5c0 [ext4] [ 529.357693] ext4_setup_system_zone+0x330/0x458 [ext4] [ 529.357717] ext4_fill_super+0x2170/0x2ba8 [ext4] [ 529.357722] mount_bdev+0x1a8/0x1e8 [ 529.357746] ext4_mount+0x44/0x58 [ext4] [ 529.357748] mount_fs+0x50/0x170 [ 529.357752] vfs_kern_mount.part.9+0x54/0x188 [ 529.357755] do_mount+0x5ac/0xd78 [ 529.357758] ksys_mount+0x9c/0x118 [ 529.357760] __arm64_sys_mount+0x28/0x38 [ 529.357764] el0_svc_common+0x78/0x130 [ 529.357766] el0_svc_handler+0x38/0x78 [ 529.357769] el0_svc+0x8/0xc [ 541.356516] watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [mount:18674] Signed-off-by: Shijie Luo --- fs/ext4/block_validity.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c index 1ee04e76bbe0..0a734ffb4310 100644 --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c @@ -207,6 +207,7 @@ static int ext4_protect_reserved_inode(struct super_block *sb, return PTR_ERR(inode); num = (inode->i_size + sb->s_blocksize - 1) >> sb->s_blocksize_bits; while (i < num) { + cond_resched(); map.m_lblk = i; map.m_len = num - i; n = ext4_map_blocks(NULL, inode, &map, 0); -- 2.19.1