From patchwork Fri Apr 29 00:09: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: 12831341 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 D98BBC433EF for ; Fri, 29 Apr 2022 00:09:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EEF16B0073; Thu, 28 Apr 2022 20:09:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6776D6B0074; Thu, 28 Apr 2022 20:09:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 47C7B6B0075; Thu, 28 Apr 2022 20:09:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id 3777F6B0073 for ; Thu, 28 Apr 2022 20:09:53 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0C223633 for ; Fri, 29 Apr 2022 00:09:53 +0000 (UTC) X-FDA: 79407983466.12.7C40F0B Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf26.hostedemail.com (Postfix) with ESMTP id CC674140055 for ; Fri, 29 Apr 2022 00:09:50 +0000 (UTC) Received: by mail-pl1-f202.google.com with SMTP id k2-20020a170902ba8200b0015613b12004so3428423pls.22 for ; Thu, 28 Apr 2022 17:09: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=ocQ4QiG6Z1H71mtTf4/Vzq9scVVfYbY83xjr/pOOFc4=; b=RLuyTfp8sbUVhJUD3KhCpj4SmMuiEa4FbBJ8KitzV3FWImUggQ+A3N37Rv+rt70sj1 zsqnxprSCqarCUaWylf1B8dafJ5kq4BVgHKWuxGBwoV1UQVbnRKHe+w+/vp64f/74Gsl PmEcltfAynqZKJKrho+8eYaA3mShujkmbgLoKBlUp7Bjie8rkDXKaG7Je+Ov5dMYWSfR a+2RReg1SC2RtFtK+HrQltvp/oWRLG4gNk0fDwMJukmL7QsNCnMfI5KlREftnWaq7CbZ t3Lz7YjQZYUk5AK3dLrwD+VvpEP522JouYnicPJTdSpk3NaeTrc/fXgws6JY098KUTKh I8Cw== 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=ocQ4QiG6Z1H71mtTf4/Vzq9scVVfYbY83xjr/pOOFc4=; b=ds76dqTULZg6ZMHIbu0ylKAdMvgtwXd4DoDspiuJCduS9b77m1GVDfosZLpR7eMVM8 j0/zvfYAoUdx2nielYHOqM94hhNBfETdtzygBRDjZjljWbOiPGEO72ZNyCD5wiizH3DH D+54X08CwUkD1Tt/eKbM+dI4Tm0NXN2GycWxSZpv/kR4UgVMbhuWHpCDi1zHt1USpzG8 GhS0sSmODOlmjalVEJk9LAKREWUsjopZt67VoCa32OC2rInHB83PxXk2Z/btSFe2H45h 5egruzjumYjPUhZmG2hVT8kSiIer7//EZriQMyTRz1tPaQBVyjhgUfQUwlYvWMHSCGTi WB5w== X-Gm-Message-State: AOAM532wzuDJiHqNNFMMYpz6yWOFRAbfLNvUJ9LbaxNiZqgDFRcX60Ax yB+FFAKelBgY2C+41ZjiGId62lA6hTfSfA== X-Google-Smtp-Source: ABdhPJw2maSKJclzcNo3i+WP7FsLsrLckUexdVzGwJA8XJljxlXZ1mRxdVxRSNrxfmnYizwPyg5psMeyOSedsg== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a17:902:8f94:b0:151:64c5:7759 with SMTP id z20-20020a1709028f9400b0015164c57759mr36165288plo.4.1651190991428; Thu, 28 Apr 2022 17:09:51 -0700 (PDT) Date: Thu, 28 Apr 2022 17:09:46 -0700 In-Reply-To: <20220429000947.2172219-1-jiaqiyan@google.com> Message-Id: <20220429000947.2172219-2-jiaqiyan@google.com> Mime-Version: 1.0 References: <20220429000947.2172219-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [RFC v2 1/2] mm: khugepaged: recover from poisoned anonymous memory From: Jiaqi Yan To: shy828301@gmail.com, tongtiangen@huawei.com Cc: linux-mm@kvack.org, tony.luck@intel.com, naoya.horiguchi@nec.com, kirill.shutemov@linux.intel.com, linmiaohe@huawei.com, juew@google.com, jiaqiyan@google.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: CC674140055 X-Stat-Signature: m6rgcgfzsawkj5b9o8kokpuze6d7j7se Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=RLuyTfp8; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf26.hostedemail.com: domain of 3zyxrYggKCO4ZYQgYoQdWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jiaqiyan.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3zyxrYggKCO4ZYQgYoQdWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jiaqiyan.bounces.google.com X-Rspam-User: X-HE-Tag: 1651190990-959762 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 copying failed: 1) re-establish the PTEs-to-PMD connection. 2) release pages back to their LRU list. Signed-off-by: Jiaqi Yan --- include/linux/highmem.h | 19 ++++++ mm/khugepaged.c | 138 ++++++++++++++++++++++++++++++---------- 2 files changed, 124 insertions(+), 33 deletions(-) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 39bb9b47fa9cd..0ccb1e92c4b06 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -298,6 +298,25 @@ static inline void copy_highpage(struct page *to, struct page *from) #endif +/* + * Machine check exception handled version of copy_highpage. + * Return true if copying page content failed; otherwise false. + * Note handling #MC requires arch opt-in. + */ +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; +} + static inline void memcpy_page(struct page *dst_page, size_t dst_off, struct page *src_page, size_t src_off, size_t len) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 131492fd1148b..8e69a0640e551 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 copying succeeds; + * otherwise restore the original pmd page table. Returns true if copying + * 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 Fri Apr 29 00:09:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 12831342 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 6B846C433F5 for ; Fri, 29 Apr 2022 00:09:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BAA6B6B0074; Thu, 28 Apr 2022 20:09:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B58D46B0075; Thu, 28 Apr 2022 20:09:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9ACD86B0078; Thu, 28 Apr 2022 20:09:54 -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 8BC406B0074 for ; Thu, 28 Apr 2022 20:09:54 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 5758E6058D for ; Fri, 29 Apr 2022 00:09:54 +0000 (UTC) X-FDA: 79407983508.16.D5F9DBA Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by imf08.hostedemail.com (Postfix) with ESMTP id 22AD7160052 for ; Fri, 29 Apr 2022 00:09:46 +0000 (UTC) Received: by mail-pg1-f201.google.com with SMTP id t3-20020a656083000000b0039cf337edd6so3130871pgu.18 for ; Thu, 28 Apr 2022 17:09:53 -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=Pmjf3nzz96Ndcqn7fnfXcV8alC2DVDHgj4fB9IqFuDw=; b=Zw7sa4jHLUwgCVdlMA3uTQiJfhMVrBRYJs7EUwRkG9DoC6sC9HBJ7j8KPd1EVk92+1 1tbUVMe8rJWJecLFXDVqSZrdLQwT2SX6lhgv5gr4W+/3dSnXx4lwXBcYsNgvHcBSkXvl PGV/gTd+ltsKQ35ZNMxVinEmjMlQLJk3Yz7qQ++8yTj9GfWU5et23Ix8oxffjen9DAEf CWZNAdgI0silkhZVr0JB/Kr5F8e+YY+saHKlS6YhbcVPj8WPYBEk8tLXS9y/0Mcc5QZP pBugjBXQZdCacEhW54seUT3ASBtu7ZPLUO0jSGQJJKblq6bMK+/iSACNoiFIHWc+6hhS j9uQ== 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=Pmjf3nzz96Ndcqn7fnfXcV8alC2DVDHgj4fB9IqFuDw=; b=5GuKr6JUgdb3o7W4aYufucHWce1kIU4Uju2LE3kFI63mv+eOLRKsgSz+P5eGLdxy47 d/GRUxVKjmqzJSPpaAnOHp9l1nusNhybtbZUo7y6k5weg3mdQK8QXDFKUv531cjWKl6z tkdIXdY5XSOrf5y8rxVry+7I0ZfpvcVrbwgvMNc+TXVYLOIb66y9opKLooWSalyxRP3x ZcPJzgQMwmmwDe7bDuCdnmkcgGlXS2Dq9ak6Ck74O2Yydb8R5bnPx/5D1FcS/Ojsdi39 W6x2tDljnw+WNpFgkX9A3lnszYlDSYCcWqg+2XzaKysipEkf7sozBl1V4vRm0sP8VvxP N/Cg== X-Gm-Message-State: AOAM533qvLUY38puw5lEuSj8QF1MHF7y6LGPKwI996H3ozhrFSv8SRTl YjZmughZMv57F735KSTL4l6/qA9jsDjNaQ== X-Google-Smtp-Source: ABdhPJwDuvSFmFg2lz46R146ifDrCpn7kV3u15eXXuT/1Owbza/2Lh99kU5Pds0Fd0tHWZyJAL1pXNgP7Ij2Pg== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a17:90b:3903:b0:1d2:c8ea:4c9c with SMTP id ob3-20020a17090b390300b001d2c8ea4c9cmr910200pjb.210.1651190992943; Thu, 28 Apr 2022 17:09:52 -0700 (PDT) Date: Thu, 28 Apr 2022 17:09:47 -0700 In-Reply-To: <20220429000947.2172219-1-jiaqiyan@google.com> Message-Id: <20220429000947.2172219-3-jiaqiyan@google.com> Mime-Version: 1.0 References: <20220429000947.2172219-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-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: linux-mm@kvack.org, tony.luck@intel.com, naoya.horiguchi@nec.com, kirill.shutemov@linux.intel.com, linmiaohe@huawei.com, juew@google.com, jiaqiyan@google.com X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 22AD7160052 X-Stat-Signature: 5wteke1p9mdgpu599ysouqbgqp1wq8oy Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Zw7sa4jH; spf=pass (imf08.hostedemail.com: domain of 30CxrYggKCO8aZRhZpReXffXcV.TfdcZelo-ddbmRTb.fiX@flex--jiaqiyan.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=30CxrYggKCO8aZRhZpReXffXcV.TfdcZelo-ddbmRTb.fiX@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1651190986-396450 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 copying operations into a separate loop * postpone the updates for nr_none until both scanning and copying succeeded * postpone joining small xarray entries until both scanning and copying succeeded * postpone the update operations to NR_XXX_THPS * for non-SHMEM file, roll back filemap_nr_thps_inc if scan succeeded but copying 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 8e69a0640e551..08f93f2ea9712 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;