From patchwork Mon Sep 6 12:12:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Wang X-Patchwork-Id: 12476895 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AB94C433F5 for ; Mon, 6 Sep 2021 12:12:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9491B60F45 for ; Mon, 6 Sep 2021 12:12:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9491B60F45 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 2E1326B0075; Mon, 6 Sep 2021 08:12:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 260356B0073; Mon, 6 Sep 2021 08:12:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10045900002; Mon, 6 Sep 2021 08:12:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0211.hostedemail.com [216.40.44.211]) by kanga.kvack.org (Postfix) with ESMTP id 029606B0071 for ; Mon, 6 Sep 2021 08:12:08 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 9C2848249980 for ; Mon, 6 Sep 2021 12:12:07 +0000 (UTC) X-FDA: 78557035494.10.8F6E37C Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by imf23.hostedemail.com (Postfix) with ESMTP id 74B6290000A0 for ; Mon, 6 Sep 2021 12:12:06 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R841e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=rongwei.wang@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0UnRyn5B_1630930321; Received: from localhost.localdomain(mailfrom:rongwei.wang@linux.alibaba.com fp:SMTPD_---0UnRyn5B_1630930321) by smtp.aliyun-inc.com(127.0.0.1); Mon, 06 Sep 2021 20:12:03 +0800 From: Rongwei Wang To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, cfijalkovich@google.com, song@kernel.org, william.kucharski@oracle.com, hughd@google.com Subject: [PATCH 2/2] mm, thp: bail out early in collapse_file for writeback page Date: Mon, 6 Sep 2021 20:12:00 +0800 Message-Id: <20210906121200.57905-3-rongwei.wang@linux.alibaba.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210906121200.57905-1-rongwei.wang@linux.alibaba.com> References: <20210906121200.57905-1-rongwei.wang@linux.alibaba.com> MIME-Version: 1.0 Authentication-Results: imf23.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf23.hostedemail.com: domain of rongwei.wang@linux.alibaba.com designates 115.124.30.132 as permitted sender) smtp.mailfrom=rongwei.wang@linux.alibaba.com X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 74B6290000A0 X-Stat-Signature: rt8ewupheznf4za1ogi4p5pj9mmtpn16 X-HE-Tag: 1630930326-858289 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Currently collapse_file does not explicitly check PG_writeback, instead, page_has_private and try_to_release_page are used to filter writeback pages. This does not work for xfs with blocksize equal to or larger than pagesize, because in such case xfs has no page->private. This makes collapse_file bail out early for writeback page. Otherwise, xfs end_page_writeback will panic as follows. [ 6411.448211] page:fffffe00201bcc80 refcount:0 mapcount:0 mapping:ffff0003f88c86a8 index:0x0 pfn:0x84ef32 [ 6411.448304] aops:xfs_address_space_operations [xfs] ino:30000b7 dentry name:"libtest.so" [ 6411.448312] flags: 0x57fffe0000008027(locked|referenced|uptodate|active|writeback) [ 6411.448317] raw: 57fffe0000008027 ffff80001b48bc28 ffff80001b48bc28 ffff0003f88c86a8 [ 6411.448321] raw: 0000000000000000 0000000000000000 00000000ffffffff ffff0000c3e9a000 [ 6411.448324] page dumped because: VM_BUG_ON_PAGE(((unsigned int) page_ref_count(page) + 127u <= 127u)) [ 6411.448327] page->mem_cgroup:ffff0000c3e9a000 [ 6411.448340] ------------[ cut here ]------------ [ 6411.448343] kernel BUG at include/linux/mm.h:1212! [ 6411.449288] Internal error: Oops - BUG: 0 [#1] SMP [ 6411.449786] Modules linked in: [ 6411.449790] BUG: Bad page state in process khugepaged pfn:84ef32 [ 6411.450143] xfs(E) [ 6411.450459] page:fffffe00201bcc80 refcount:0 mapcount:0 mapping:0 index:0x0 pfn:0x84ef32 [ 6411.451361] libcrc32c(E) rfkill(E) aes_ce_blk(E) crypto_simd(E) cryptd(E) aes_ce_cipher(E) crct10dif_ce(E) ghash_ce(E) sha1_ce(E) uio_pdrv_genirq(E) uio(E) vfat(E) nfsd(E) fat(E) auth_rpcgss(E) nfs_acl(E) lockd(E) grace(E) sunrpc(E) sch_fq_codel(E) ip_tables(E) ext4(E) mbcache(E) jbd2(E) virtio_net(E) net_failover(E) virtio_blk(E) failover(E) sha2_ce(E) sha256_arm64(E) virtio_mmio(E) virtio_pci(E) virtio_ring(E) virtio(E) [ 6411.451387] CPU: 25 PID: 0 Comm: swapper/25 Kdump: loaded Tainted: G W E [ 6411.451389] pstate: 60400005 (nZCv daif +PAN -UAO -TCO BTYPE=--) [ 6411.451393] pc : end_page_writeback+0x1c0/0x214 [ 6411.451394] lr : end_page_writeback+0x1c0/0x214 [ 6411.451395] sp : ffff800011ce3cc0 [ 6411.451396] x29: ffff800011ce3cc0 x28: 0000000000000000 [ 6411.451398] x27: ffff000c04608040 x26: 0000000000000000 [ 6411.451399] x25: ffff000c04608040 x24: 0000000000001000 [ 6411.451401] x23: ffff0003f88c8530 x22: 0000000000001000 [ 6411.451403] x21: ffff0003f88c8530 x20: 0000000000000000 [ 6411.451404] x19: fffffe00201bcc80 x18: 0000000000000030 [ 6411.451406] x17: 0000000000000000 x16: 0000000000000000 [ 6411.451407] x15: ffff000c018f9760 x14: ffffffffffffffff [ 6411.451409] x13: ffff8000119d72b0 x12: ffff8000119d6ee3 [ 6411.451410] x11: ffff8000117b69b8 x10: 00000000ffff8000 [ 6411.451412] x9 : ffff800010617534 x8 : 0000000000000000 [ 6411.451413] x7 : ffff8000114f69b8 x6 : 000000000000000f [ 6411.451415] x5 : 0000000000000000 x4 : 0000000000000000 [ 6411.451416] x3 : 0000000000000400 x2 : 0000000000000000 [ 6411.451418] x1 : 0000000000000000 x0 : 0000000000000000 [ 6411.451420] Call trace: [ 6411.451421] end_page_writeback+0x1c0/0x214 [ 6411.451424] iomap_finish_page_writeback+0x13c/0x204 [ 6411.451425] iomap_finish_ioend+0xe8/0x19c [ 6411.451426] iomap_writepage_end_bio+0x38/0x50 [ 6411.451427] bio_endio+0x168/0x1ec [ 6411.451430] blk_update_request+0x278/0x3f0 [ 6411.451432] blk_mq_end_request+0x34/0x15c [ 6411.451435] virtblk_request_done+0x38/0x74 [virtio_blk] [ 6411.451437] blk_done_softirq+0xc4/0x110 [ 6411.451439] __do_softirq+0x128/0x38c [ 6411.451441] __irq_exit_rcu+0x118/0x150 [ 6411.451442] irq_exit+0x1c/0x30 [ 6411.451445] __handle_domain_irq+0x8c/0xf0 [ 6411.451446] gic_handle_irq+0x84/0x108 [ 6411.451447] el1_irq+0xcc/0x180 [ 6411.451448] arch_cpu_idle+0x18/0x40 [ 6411.451450] default_idle_call+0x4c/0x1a0 [ 6411.451453] cpuidle_idle_call+0x168/0x1e0 [ 6411.451454] do_idle+0xb4/0x104 [ 6411.451455] cpu_startup_entry+0x30/0x9c [ 6411.451458] secondary_start_kernel+0x104/0x180 [ 6411.451460] Code: d4210000 b0006161 910c8021 94013f4d (d4210000) [ 6411.451462] ---[ end trace 4a88c6a074082f8c ]--- [ 6411.451464] Kernel panic - not syncing: Oops - BUG: Fatal exception in interrupt Fixes: eb6ecbed0aa2 ("mm, thp: relax the VM_DENYWRITE constraint on file-backed THPs") Signed-off-by: Xu Yu Signed-off-by: Rongwei Wang --- mm/khugepaged.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 045cc57..529b117 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1798,7 +1798,8 @@ static void collapse_file(struct mm_struct *mm, goto out_unlock; } - if (!is_shmem && PageDirty(page)) { + if (!is_shmem && (PageDirty(page) || + PageWriteback(page))) { /* * khugepaged only works on read-only fd, so this * page is dirty because it hasn't been flushed