From patchwork Tue Apr 5 20:51:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 12801949 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BA6CC433EF for ; Tue, 5 Apr 2022 20:52:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E2088D0001; Tue, 5 Apr 2022 16:52:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 48F626B0074; Tue, 5 Apr 2022 16:52:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 308F88D0001; Tue, 5 Apr 2022 16:52:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id 23DF46B0073 for ; Tue, 5 Apr 2022 16:52:03 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D80111E44 for ; Tue, 5 Apr 2022 20:51:52 +0000 (UTC) X-FDA: 79324022064.14.42FDD8A Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf14.hostedemail.com (Postfix) with ESMTP id 6D13B10001E for ; Tue, 5 Apr 2022 20:51:52 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id i13-20020a056902068d00b0063da6c20dccso215743ybt.10 for ; Tue, 05 Apr 2022 13:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Uld97CUVDeKpI7YCgqmUQvS0IGT+6Gm86pMoV3kbgxQ=; b=XBD0luPDWXG4ycN80j7LZseHtdzfaPk9rpzXNjn6ZH9Y++ZVHN85FWVlnwAED65P4m GdOSThL9Yf80Q11Jv1Rchy2AeaZ8X2NkF7onu5ZhrQbeT/+lkCMD/e2uQj+NS7Q+fafq 9Ch5Fsil6EJP7De/mb80YLpw6IBrEzMTCiP8T4V0An/XkxZgLSkVrWQtVB1WS0/kkzPW uUKX99Hc6LIi1KdGRRXd9AFU8Uxj4MEoEawN5T6XJ8n0YTXknKAnXP2fQ2VK1bGJD/mp JZfJkKXdb2JexiXw5hHn6RDAqcoGSecrHARyRUjfNpDEb/HT+XJe4g7s4/sm64PT5Lip 1oLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Uld97CUVDeKpI7YCgqmUQvS0IGT+6Gm86pMoV3kbgxQ=; b=dX35Yr4p0cvp/tbPv4Js1HVcn5n/QNK+pcGIS3KlUcWmnQ7mzkqwvrEXAYv/vFIKwS XOqUPoLriyYjSNPqh1mefJhKbdAshBMwX2H+UcsPF/+/nJaqoCYdO5s6CYOS6YCLx1Ha kASoU6vB+RvmepaqXU/SlzTXJbf8pvCeDi5VOjGcc/t+N+we6VjO59UenYX4otCqdZLf PH+nF/4IgMb4y98kE9klZ9UDBiyUM3/PLdUzf04HDs0GuCjweUoqYgVQ4QcBlyLKYHPi HyD3Wwruz9tIHCR5IOX8oyg261jeHh4IqrjPEASnpAlDbmjkTlaD19f5wxATUtU1g9g3 2rMA== X-Gm-Message-State: AOAM530AEKOTQ21td4rXiJeM9U56wvqbSkdjz7EndR9qfoujA0oq3nlN 3FZz1G/bvdWNxBu4us+6kY76A1FcWPDLXw== X-Google-Smtp-Source: ABdhPJx4AoJct3z8/SLRlLi73KhPCnWSY33sMmzuQTTOGUOWU7YHxUhNw5C+B131GMA8gL/ly0Z0bsjnYgKuMw== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a81:8507:0:b0:2eb:9715:78d3 with SMTP id v7-20020a818507000000b002eb971578d3mr4531200ywf.304.1649191911577; Tue, 05 Apr 2022 13:51:51 -0700 (PDT) Date: Tue, 5 Apr 2022 13:51:45 -0700 In-Reply-To: <20220405205146.411595-1-jiaqiyan@google.com> Message-Id: <20220405205146.411595-2-jiaqiyan@google.com> Mime-Version: 1.0 References: <20220405205146.411595-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [RFC v2 1/2] mm: khugepaged: recover from poisoned anonymous memory From: Jiaqi Yan To: shy828301@gmail.com, tongtiangen@huawei.com Cc: tony.luck@intel.com, naoya.horiguchi@nec.com, kirill.shutemov@linux.intel.com, linmiaohe@huawei.com, juew@google.com, jiaqiyan@google.com, linux-mm@kvack.org X-Stat-Signature: r95es9wmk15g9wp3idqy6pzejpo5ufx6 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6D13B10001E Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=XBD0luPD; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf14.hostedemail.com: domain of 356tMYggKCIoxwo4wCo1u22uzs.q20zw18B-00y9oqy.25u@flex--jiaqiyan.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=356tMYggKCIoxwo4wCo1u22uzs.q20zw18B-00y9oqy.25u@flex--jiaqiyan.bounces.google.com X-Rspam-User: X-HE-Tag: 1649191912-177115 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: Make __collapse_huge_page_copy return whether collapsing/copying anonymous pages succeeded, and make collapse_huge_page handle the return status. Break existing PTE scan loop into two for-loops. The first loop copies source pages into target huge page, and can fail gracefully when running into memory errors in source pages. Roll back the page table and page states in the 2nd loop when copy failed: 1) re-establish the PTEs-to-PMD connection. 2) release pages back to their LRU list. Signed-off-by: Jiaqi Yan Signed-off-by: Jiaqi Yan --- include/linux/highmem.h | 18 ++++++ mm/khugepaged.c | 138 ++++++++++++++++++++++++++++++---------- 2 files changed, 123 insertions(+), 33 deletions(-) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 39bb9b47fa9cd..5d4b2af113496 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -296,6 +296,24 @@ static inline void copy_highpage(struct page *to, struct page *from) kunmap_local(vfrom); } +/* + * Machine check exception handled version of copy_highpage. + * Return true if copying page content failed; otherwise false. + */ +static inline bool copy_highpage_mc(struct page *to, struct page *from) +{ + char *vfrom, *vto; + unsigned long ret; + + vfrom = kmap_local_page(from); + vto = kmap_local_page(to); + ret = copy_mc_to_kernel(vto, vfrom, PAGE_SIZE); + kunmap_local(vto); + kunmap_local(vfrom); + + return ret > 0; +} + #endif static inline void memcpy_page(struct page *dst_page, size_t dst_off, diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 131492fd1148b..eecaeaf6eaebe 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -52,6 +52,7 @@ enum scan_result { SCAN_CGROUP_CHARGE_FAIL, SCAN_TRUNCATED, SCAN_PAGE_HAS_PRIVATE, + SCAN_COPY_MC, }; #define CREATE_TRACE_POINTS @@ -739,44 +740,98 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, return 0; } -static void __collapse_huge_page_copy(pte_t *pte, struct page *page, - struct vm_area_struct *vma, - unsigned long address, - spinlock_t *ptl, - struct list_head *compound_pagelist) +/* + * __collapse_huge_page_copy - attempts to copy memory contents from normal + * pages to a hugepage. Cleanup the normal pages if copy succeeds; + * otherwise restore the original pmd page table. Returns true if copy + * succeeds, otherwise returns false. + * + * @pte: starting of the PTEs to copy from + * @page: the new hugepage to copy contents to + * @pmd: pointer to the new hugepage's PMD + * @rollback: the original normal PTEs' PMD + * @address: starting address to copy + * @pte_ptl: lock on normal pages' PTEs + * @compound_pagelist: list that stores compound pages + */ +static bool __collapse_huge_page_copy(pte_t *pte, + struct page *page, + pmd_t *pmd, + pmd_t rollback, + struct vm_area_struct *vma, + unsigned long address, + spinlock_t *pte_ptl, + struct list_head *compound_pagelist) { struct page *src_page, *tmp; pte_t *_pte; - for (_pte = pte; _pte < pte + HPAGE_PMD_NR; - _pte++, page++, address += PAGE_SIZE) { - pte_t pteval = *_pte; + pte_t pteval; + unsigned long _address; + spinlock_t *pmd_ptl; + bool copy_succeeded = true; - if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) { + /* + * Copying pages' contents is subject to memory poison at any iteration. + */ + for (_pte = pte, _address = address; + _pte < pte + HPAGE_PMD_NR; + _pte++, page++, _address += PAGE_SIZE) { + pteval = *_pte; + + if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) clear_user_highpage(page, address); - add_mm_counter(vma->vm_mm, MM_ANONPAGES, 1); - if (is_zero_pfn(pte_pfn(pteval))) { - /* - * ptl mostly unnecessary. - */ - spin_lock(ptl); - ptep_clear(vma->vm_mm, address, _pte); - spin_unlock(ptl); + else { + src_page = pte_page(pteval); + if (copy_highpage_mc(page, src_page)) { + copy_succeeded = false; + break; + } + } + } + + if (!copy_succeeded) { + /* + * Copying failed, re-establish the regular PMD that + * points to regular page table. Since PTEs are still + * isolated and locked, acquiring anon_vma_lock is unnecessary. + */ + pmd_ptl = pmd_lock(vma->vm_mm, pmd); + pmd_populate(vma->vm_mm, pmd, pmd_pgtable(rollback)); + spin_unlock(pmd_ptl); + } + + for (_pte = pte, _address = address; _pte < pte + HPAGE_PMD_NR; + _pte++, _address += PAGE_SIZE) { + pteval = *_pte; + if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) { + if (copy_succeeded) { + add_mm_counter(vma->vm_mm, MM_ANONPAGES, 1); + if (is_zero_pfn(pte_pfn(pteval))) { + /* + * ptl mostly unnecessary. + */ + spin_lock(pte_ptl); + pte_clear(vma->vm_mm, _address, _pte); + spin_unlock(pte_ptl); + } } } else { src_page = pte_page(pteval); - copy_user_highpage(page, src_page, address, vma); if (!PageCompound(src_page)) release_pte_page(src_page); - /* - * ptl mostly unnecessary, but preempt has to - * be disabled to update the per-cpu stats - * inside page_remove_rmap(). - */ - spin_lock(ptl); - ptep_clear(vma->vm_mm, address, _pte); - page_remove_rmap(src_page, false); - spin_unlock(ptl); - free_page_and_swap_cache(src_page); + + if (copy_succeeded) { + /* + * ptl mostly unnecessary, but preempt has to + * be disabled to update the per-cpu stats + * inside page_remove_rmap(). + */ + spin_lock(pte_ptl); + pte_clear(vma->vm_mm, _address, _pte); + page_remove_rmap(src_page, false); + spin_unlock(pte_ptl); + free_page_and_swap_cache(src_page); + } } } @@ -784,6 +839,8 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page, list_del(&src_page->lru); release_pte_page(src_page); } + + return copy_succeeded; } static void khugepaged_alloc_sleep(void) @@ -1066,6 +1123,7 @@ static void collapse_huge_page(struct mm_struct *mm, struct vm_area_struct *vma; struct mmu_notifier_range range; gfp_t gfp; + bool copied = false; VM_BUG_ON(address & ~HPAGE_PMD_MASK); @@ -1177,9 +1235,13 @@ static void collapse_huge_page(struct mm_struct *mm, */ anon_vma_unlock_write(vma->anon_vma); - __collapse_huge_page_copy(pte, new_page, vma, address, pte_ptl, - &compound_pagelist); + copied = __collapse_huge_page_copy(pte, new_page, pmd, _pmd, + vma, address, pte_ptl, &compound_pagelist); pte_unmap(pte); + if (!copied) { + result = SCAN_COPY_MC; + goto out_up_write; + } /* * spin_lock() below is not the equivalent of smp_wmb(), but * the smp_wmb() inside __SetPageUptodate() can be reused to @@ -1364,9 +1426,14 @@ static int khugepaged_scan_pmd(struct mm_struct *mm, pte_unmap_unlock(pte, ptl); if (ret) { node = khugepaged_find_target_node(); - /* collapse_huge_page will return with the mmap_lock released */ - collapse_huge_page(mm, address, hpage, node, - referenced, unmapped); + /* + * collapse_huge_page will return with the mmap_r+w_lock released. + * It is uncertain if *hpage is NULL or not when collapse_huge_page + * returns, so keep ret=1 to jump to breakouterloop_mmap_lock + * in khugepaged_scan_mm_slot, then *hpage will be freed + * if collapse failed. + */ + collapse_huge_page(mm, address, hpage, node, referenced, unmapped); } out: trace_mm_khugepaged_scan_pmd(mm, page, writable, referenced, @@ -2168,6 +2235,11 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, khugepaged_scan_file(mm, file, pgoff, hpage); fput(file); } else { + /* + * mmap_read_lock is + * 1) released if both scan and collapse succeeded; + * 2) still held if either scan or collapse failed. + */ ret = khugepaged_scan_pmd(mm, vma, khugepaged_scan.address, hpage); From patchwork Tue Apr 5 20:51:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 12801952 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FE7EC433EF for ; Tue, 5 Apr 2022 20:53:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8FF478D0002; Tue, 5 Apr 2022 16:52:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8ADFA6B0074; Tue, 5 Apr 2022 16:52:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 728C18D0002; Tue, 5 Apr 2022 16:52:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0083.hostedemail.com [216.40.44.83]) by kanga.kvack.org (Postfix) with ESMTP id 548686B0073 for ; Tue, 5 Apr 2022 16:52:05 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id F26D8AB9B7 for ; Tue, 5 Apr 2022 20:51:54 +0000 (UTC) X-FDA: 79324022190.30.130BB51 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf03.hostedemail.com (Postfix) with ESMTP id 814622000D for ; Tue, 5 Apr 2022 20:51:54 +0000 (UTC) Received: by mail-pj1-f74.google.com with SMTP id lr15-20020a17090b4b8f00b001c646e432baso2407073pjb.3 for ; Tue, 05 Apr 2022 13:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=kS4uon/vzKSFHkD3fE+oJGoGYW5gRPVFsbz2CaKwVOA=; b=nQ2JUlrPSUA/IIgnR+TcEgaSj2Mu0cDaYsJCE0R2TYP7FD8b+wSKJNh0Epk1a6s0SU 2gPjq0u2DJHE50RYV6tFAqp+dIPpC+kK10uCu42fHK/Xrbj1KJsY60zVK67+ZyRm7cob it4q2BGqvrfDsYojODON1QogBwb4d+tkA9J5sC3vmAQjZcyJHOJ1IFkfXdMs0K9gLohs uiR9Vfmp7TOo/0Ysfv7gKDzEjU1qOKPt5kh0sVH+HZj8M3TpcxCEnKo4jWtATk4N1pih 5zTh6jBfgEXdeJS7M8i6ci2sl20DqVDLnrC4fNwxSff9N24K5snIOBNM48w+s19+gxPH P0xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=kS4uon/vzKSFHkD3fE+oJGoGYW5gRPVFsbz2CaKwVOA=; b=FpybZnQHhmIvmBU4Qrt+CqAXZAsFFkH5vbBP1HMyCZBPaszPzvP3dVx7XGKi1A+jWE RGUARFLFOymmlENTm3fdnvkkIA30kJkM3pu4gMY3C065Pmz5Gnafi2MdDNK6pzmi/d67 e6Xt+iODIv2+1Id95M31mmvQ0mTNmSYGzJ5pyCL5NCvCgze1IR6Y0ikZuUc0dtbs77RG p0JyDhd3uZy4bQJoBu3C5vKiZJHt+092eMfKTRE0wMQ68BPW0MBUtAC8yHwgblc24Eoo 0Q532V9uYqZWw0raVxVy3VMFpVzy5xx7R09JXa7JeY8Zv+xIcwSYOwaMaMFyCji6AueZ mu7Q== X-Gm-Message-State: AOAM531nxHsfRLOtYdvSTl7xe1OCqYHM767Sgo0ULXz3l8+dNPrLCZb/ pVxFFXK3UZBcozDWL0+nldJXf88eArId+w== X-Google-Smtp-Source: ABdhPJykUsIqisjVgWko3q+IP+1aZuR8slAKyLNkpORl11H2jlNroQNOWc4dNKYrZjdXpHXaBSSx8AttWGkAeg== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a17:903:246:b0:153:87f0:a93e with SMTP id j6-20020a170903024600b0015387f0a93emr5316809plh.171.1649191913405; Tue, 05 Apr 2022 13:51:53 -0700 (PDT) Date: Tue, 5 Apr 2022 13:51:46 -0700 In-Reply-To: <20220405205146.411595-1-jiaqiyan@google.com> Message-Id: <20220405205146.411595-3-jiaqiyan@google.com> Mime-Version: 1.0 References: <20220405205146.411595-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [RFC v2 2/2] mm: khugepaged: recover from poisoned file-backed memory From: Jiaqi Yan To: shy828301@gmail.com, tongtiangen@huawei.com Cc: tony.luck@intel.com, naoya.horiguchi@nec.com, kirill.shutemov@linux.intel.com, linmiaohe@huawei.com, juew@google.com, jiaqiyan@google.com, linux-mm@kvack.org X-Rspam-User: X-Stat-Signature: c8dr53n9gw7c5wrbokbtob6ose75euuy Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=nQ2JUlrP; spf=pass (imf03.hostedemail.com: domain of 36atMYggKCIwzyq6yEq3w44w1u.s421y3AD-220Bqs0.47w@flex--jiaqiyan.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=36atMYggKCIwzyq6yEq3w44w1u.s421y3AD-220Bqs0.47w@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 814622000D X-HE-Tag: 1649191914-905300 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: Make collapse_file roll back when copying pages failed. More concretely: * extract copy operations into a separate loop * postpone the updates for nr_none until both scan and copy succeeded * postpone joining small xarray entries until both scan and copy succeeded * postpone the update operations to NR_XXX_THPS * for non-SHMEM file, roll back filemap_nr_thps_inc if scan succeeded but copy failed Signed-off-by: Jiaqi Yan --- mm/khugepaged.c | 77 ++++++++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index eecaeaf6eaebe..0c06758395931 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1710,7 +1710,7 @@ static void collapse_file(struct mm_struct *mm, { struct address_space *mapping = file->f_mapping; gfp_t gfp; - struct page *new_page; + struct page *new_page, *page, *tmp; pgoff_t index, end = start + HPAGE_PMD_NR; LIST_HEAD(pagelist); XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER); @@ -1766,7 +1766,7 @@ static void collapse_file(struct mm_struct *mm, xas_set(&xas, start); for (index = start; index < end; index++) { - struct page *page = xas_next(&xas); + page = xas_next(&xas); VM_BUG_ON(index != xas.xa_index); if (is_shmem) { @@ -1938,10 +1938,7 @@ static void collapse_file(struct mm_struct *mm, } nr = thp_nr_pages(new_page); - if (is_shmem) - __mod_lruvec_page_state(new_page, NR_SHMEM_THPS, nr); - else { - __mod_lruvec_page_state(new_page, NR_FILE_THPS, nr); + if (!is_shmem) { filemap_nr_thps_inc(mapping); /* * Paired with smp_mb() in do_dentry_open() to ensure @@ -1952,40 +1949,44 @@ static void collapse_file(struct mm_struct *mm, smp_mb(); if (inode_is_open_for_write(mapping->host)) { result = SCAN_FAIL; - __mod_lruvec_page_state(new_page, NR_FILE_THPS, -nr); filemap_nr_thps_dec(mapping); goto xa_locked; } } - if (nr_none) { - __mod_lruvec_page_state(new_page, NR_FILE_PAGES, nr_none); - if (is_shmem) - __mod_lruvec_page_state(new_page, NR_SHMEM, nr_none); - } - - /* Join all the small entries into a single multi-index entry */ - xas_set_order(&xas, start, HPAGE_PMD_ORDER); - xas_store(&xas, new_page); xa_locked: xas_unlock_irq(&xas); xa_unlocked: if (result == SCAN_SUCCEED) { - struct page *page, *tmp; - /* * Replacing old pages with new one has succeeded, now we - * need to copy the content and free the old pages. + * attempt to copy the contents. */ index = start; - list_for_each_entry_safe(page, tmp, &pagelist, lru) { + list_for_each_entry(page, &pagelist, lru) { while (index < page->index) { clear_highpage(new_page + (index % HPAGE_PMD_NR)); index++; } - copy_highpage(new_page + (page->index % HPAGE_PMD_NR), - page); + if (copy_highpage_mc(new_page + (page->index % HPAGE_PMD_NR), page)) { + result = SCAN_COPY_MC; + break; + } + index++; + } + while (result == SCAN_SUCCEED && index < end) { + clear_highpage(new_page + (page->index % HPAGE_PMD_NR)); + index++; + } + } + + if (result == SCAN_SUCCEED) { + /* + * Copying old pages to huge one has succeeded, now we + * need to free the old pages. + */ + list_for_each_entry_safe(page, tmp, &pagelist, lru) { list_del(&page->lru); page->mapping = NULL; page_ref_unfreeze(page, 1); @@ -1993,12 +1994,23 @@ static void collapse_file(struct mm_struct *mm, ClearPageUnevictable(page); unlock_page(page); put_page(page); - index++; } - while (index < end) { - clear_highpage(new_page + (index % HPAGE_PMD_NR)); - index++; + + xas_lock_irq(&xas); + if (is_shmem) + __mod_lruvec_page_state(new_page, NR_SHMEM_THPS, nr); + else + __mod_lruvec_page_state(new_page, NR_FILE_THPS, nr); + + if (nr_none) { + __mod_lruvec_page_state(new_page, NR_FILE_PAGES, nr_none); + if (is_shmem) + __mod_lruvec_page_state(new_page, NR_SHMEM, nr_none); } + /* Join all the small entries into a single multi-index entry. */ + xas_set_order(&xas, start, HPAGE_PMD_ORDER); + xas_store(&xas, new_page); + xas_unlock_irq(&xas); SetPageUptodate(new_page); page_ref_add(new_page, HPAGE_PMD_NR - 1); @@ -2014,9 +2026,9 @@ static void collapse_file(struct mm_struct *mm, khugepaged_pages_collapsed++; } else { - struct page *page; - - /* Something went wrong: roll back page cache changes */ + /* + * Something went wrong: roll back page cache changes + */ xas_lock_irq(&xas); mapping->nrpages -= nr_none; @@ -2049,6 +2061,13 @@ static void collapse_file(struct mm_struct *mm, xas_lock_irq(&xas); } VM_BUG_ON(nr_none); + /* + * Undo the updates of filemap_nr_thps_inc for non-SHMEM file only. + * This undo is not needed unless failure is due to SCAN_COPY_MC. + */ + if (!is_shmem && result == SCAN_COPY_MC) + filemap_nr_thps_dec(mapping); + xas_unlock_irq(&xas); new_page->mapping = NULL;