Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2827120pxb; Mon, 1 Nov 2021 02:38:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6gEhjknxnKP1P0Wu9iwbd2bh7nud+52G494oFU4E0ufMWu6WutmTePNFjnUvYIzVsdEJ/ X-Received: by 2002:a05:6402:350a:: with SMTP id b10mr40097630edd.345.1635759523540; Mon, 01 Nov 2021 02:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635759523; cv=none; d=google.com; s=arc-20160816; b=rSkOYwT1hFRtjELVsPZ/dOTbXuYVUptJP8kJxMRlAvYr5wdMPZT7uJ1INFDHPYsoqo 0yjvS/sdAgBvHANv3wHmcKKJet7ZO7biBxvPoVRVbPPzAbn3Rf0oPtsLAa1Cv26KwgsT NgQnCKs+1NCpNndQc3eSHeoO8Gt3ZsIZlEIAM3eNwZKK8GZ5qRM6w7TEDcLHYGxr+5Ri MhH0VRsNAIPvWPZSFUIXHmMqHpF51+IQuo8QF1GW4OP9ai5CCMLco1PEZTea5B3Gvy2q fwO3eQWB9XsLd/4ucVQO3hJz++mGBVMvgdFlwzfMqy/ZlBAlzS2QCw0V5iaJ+P0sJAti XXyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UBAADRYZ3e6vDsBAQwt5iRo3acPLbxP7zOtEiwqqSCg=; b=mgaLjhLrhmTcsSwu9ePM7d4Y85+waNsKEMi7izg29uESLTP1ivjQNyZRC8bOgyO1K+ NhNWF1EhBYB8pZvL8Yv6Bz4IN161WzWeVSF9yTYytmM698m5ISPsHTSNsYfyCDTuf8O0 Kfu6jADkeMFcySnEzsL+a9rNREIZ/NY8TBY62wph0vptIBXSlQ63KruZGQVJzhzKdEUB kCIql0d1m5fe1t7ATUFKl3SFBG19b3ilWoXsjyp81ZYnPMnsNYAS+MUxGRu6e8r9bF1/ VANIkuj33tRBnARsZCRQswtaQI0tW7JwbNj5mRQG6veBVjBF3bOFK5UAC9r8FutCNK4y tFKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OYwT27it; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s1si26414494ejn.348.2021.11.01.02.38.20; Mon, 01 Nov 2021 02:38:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OYwT27it; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233642AbhKAJhr (ORCPT + 99 others); Mon, 1 Nov 2021 05:37:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:43648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233671AbhKAJdx (ORCPT ); Mon, 1 Nov 2021 05:33:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 781CD61268; Mon, 1 Nov 2021 09:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635758725; bh=/TyS1YMMPqDG/u8/9VDcaouPBTPzKuhhL0I3QKTxEj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OYwT27itb5ezX8d6bVbS5jDDf/tZ+3gK/192VoCUzFIi/IfX9j5b7HgwaMvBUkMMv Kr3JCfSKUpGsRZwS6sAsqvOOXmpMGllNgg3U2lIPCjJCa7fwPrzOqGabWotR5h9p7W AX8BPoVk7pg/7w2yloFMnEvxdimqpHFVid9utsxo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rongwei Wang , Xu Yu , Yang Shi , "Matthew Wilcox (Oracle)" , "Kirill A. Shutemov" , Song Liu , William Kucharski , Hugh Dickins , Mike Kravetz , Andrew Morton , Linus Torvalds Subject: [PATCH 5.10 31/77] mm, thp: bail out early in collapse_file for writeback page Date: Mon, 1 Nov 2021 10:17:19 +0100 Message-Id: <20211101082518.470436428@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211101082511.254155853@linuxfoundation.org> References: <20211101082511.254155853@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rongwei Wang commit 74c42e1baacf206338b1dd6b6199ac964512b5bb upstream. 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. page:fffffe00201bcc80 refcount:0 mapcount:0 mapping:ffff0003f88c86a8 index:0x0 pfn:0x84ef32 aops:xfs_address_space_operations [xfs] ino:30000b7 dentry name:"libtest.so" flags: 0x57fffe0000008027(locked|referenced|uptodate|active|writeback) raw: 57fffe0000008027 ffff80001b48bc28 ffff80001b48bc28 ffff0003f88c86a8 raw: 0000000000000000 0000000000000000 00000000ffffffff ffff0000c3e9a000 page dumped because: VM_BUG_ON_PAGE(((unsigned int) page_ref_count(page) + 127u <= 127u)) page->mem_cgroup:ffff0000c3e9a000 ------------[ cut here ]------------ kernel BUG at include/linux/mm.h:1212! Internal error: Oops - BUG: 0 [#1] SMP Modules linked in: BUG: Bad page state in process khugepaged pfn:84ef32 xfs(E) page:fffffe00201bcc80 refcount:0 mapcount:0 mapping:0 index:0x0 pfn:0x84ef32 libcrc32c(E) rfkill(E) aes_ce_blk(E) crypto_simd(E) ... CPU: 25 PID: 0 Comm: swapper/25 Kdump: loaded Tainted: ... pstate: 60400005 (nZCv daif +PAN -UAO -TCO BTYPE=--) Call trace: end_page_writeback+0x1c0/0x214 iomap_finish_page_writeback+0x13c/0x204 iomap_finish_ioend+0xe8/0x19c iomap_writepage_end_bio+0x38/0x50 bio_endio+0x168/0x1ec blk_update_request+0x278/0x3f0 blk_mq_end_request+0x34/0x15c virtblk_request_done+0x38/0x74 [virtio_blk] blk_done_softirq+0xc4/0x110 __do_softirq+0x128/0x38c __irq_exit_rcu+0x118/0x150 irq_exit+0x1c/0x30 __handle_domain_irq+0x8c/0xf0 gic_handle_irq+0x84/0x108 el1_irq+0xcc/0x180 arch_cpu_idle+0x18/0x40 default_idle_call+0x4c/0x1a0 cpuidle_idle_call+0x168/0x1e0 do_idle+0xb4/0x104 cpu_startup_entry+0x30/0x9c secondary_start_kernel+0x104/0x180 Code: d4210000 b0006161 910c8021 94013f4d (d4210000) ---[ end trace 4a88c6a074082f8c ]--- Kernel panic - not syncing: Oops - BUG: Fatal exception in interrupt Link: https://lkml.kernel.org/r/20211022023052.33114-1-rongwei.wang@linux.alibaba.com Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS") Signed-off-by: Rongwei Wang Signed-off-by: Xu Yu Suggested-by: Yang Shi Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Yang Shi Acked-by: Kirill A. Shutemov Cc: Song Liu Cc: William Kucharski Cc: Hugh Dickins Cc: Mike Kravetz Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/khugepaged.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1758,6 +1758,10 @@ static void collapse_file(struct mm_stru filemap_flush(mapping); result = SCAN_FAIL; goto xa_unlocked; + } else if (PageWriteback(page)) { + xas_unlock_irq(&xas); + result = SCAN_FAIL; + goto xa_unlocked; } else if (trylock_page(page)) { get_page(page); xas_unlock_irq(&xas); @@ -1793,7 +1797,8 @@ static void collapse_file(struct mm_stru 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