From patchwork Wed Apr 6 22:23:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 12804146 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 C4EC4C433F5 for ; Wed, 6 Apr 2022 22:24:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B1FB06B0073; Wed, 6 Apr 2022 18:24:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AD0436B0074; Wed, 6 Apr 2022 18:24:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 970526B0075; Wed, 6 Apr 2022 18:24:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0212.hostedemail.com [216.40.44.212]) by kanga.kvack.org (Postfix) with ESMTP id 898626B0073 for ; Wed, 6 Apr 2022 18:24:12 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 3C993ACB79 for ; Wed, 6 Apr 2022 22:24:02 +0000 (UTC) X-FDA: 79327883124.22.E93E633 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf29.hostedemail.com (Postfix) with ESMTP id BEF3A120003 for ; Wed, 6 Apr 2022 22:24:01 +0000 (UTC) Received: by mail-pl1-f202.google.com with SMTP id w14-20020a1709027b8e00b0015386056d2bso1786695pll.5 for ; Wed, 06 Apr 2022 15:24:01 -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=T+2tCxAeKmEiyZhdqMtu3r7WhPXDkViJJMNjkYn9+b++/9g3XrCUBjB1UF/m67dOOw YtMeufUsLkxIRyh/0YEa+XHbMTxrj09fik5ljSLKltIDOqMoM7oJTsmqlV1VzgOVJamU Cd7aLQiKOmxHJaAo1gTII9+3uiVV3rzkOwMLNf+uhMa66y/BA8b6HfmQZNUb4I0WU76b g6ASLi9uQeyahzcreJSC+rgsYEtqqKnGQXPbTOaMtp1Eo0zpXMWs1uHfYtPJSQsRDUOB /yL/odFRN2rZhgCwwkt35SZjGFlhJ18p6vbGLPWL0RYNlVEE8IUs40AIZJFQSRTdAexM P+jw== 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=t/cEr8xwfAZ8w8NIRbUCuAYe8nwuut+UTuNTqUhppZEX2IHbSThk2qOx6p1QQmjUCH XsxcC1zeCriMHbJPR4o8WBNebR9cIgeobgSLCtwqMcXD6xq9WgdD4X5nhplNeyE/j96h vPzB3b4SF7qSv84sFxsA6xBixUKPW6k6XiDpJaFuOi72btVhC17diONjBp33G30PhO9v jECTzoxo4hhkuzMOTidNZdatSFvvAeRCxjHhWXiiNmGujEkJrchriQsWERV8bZ8TEKmO IYTg9YdbbuV/+WnaQ0XS+H9qD9Y+/aXICezVyO7qVM8h/GK2WzvQ1+pXQ674AG2hQsHj fESw== X-Gm-Message-State: AOAM531uijN35WV5ZKRDYgEYDpyjZ1Y8/TTlt6N6/RBVsG6AEueSF1JL cyiubZd2z1cWBGUk7oM4hvouL21OzBi4BQ== X-Google-Smtp-Source: ABdhPJzD2S+TsZ8bcpXuNQGAN5QqJb83dJQWLvPavNZHa7L6ALH4Nts6cVfrrx5vK6yI0KnFyfR4Pg4MkXm5yw== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a05:6a00:2311:b0:4e1:52bf:e466 with SMTP id h17-20020a056a00231100b004e152bfe466mr11124650pfh.77.1649283840746; Wed, 06 Apr 2022 15:24:00 -0700 (PDT) Date: Wed, 6 Apr 2022 15:23:50 -0700 In-Reply-To: <20220406222351.949927-1-jiaqiyan@google.com> Message-Id: <20220406222351.949927-2-jiaqiyan@google.com> Mime-Version: 1.0 References: <20220406222351.949927-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.35.1.1178.g4f1659d476-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, linux-mm@kvack.org, Jiaqi Yan X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: BEF3A120003 X-Rspam-User: Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=T+2tCxAe; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3ABNOYggKCHcedVldtVibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jiaqiyan.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3ABNOYggKCHcedVldtVibjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--jiaqiyan.bounces.google.com X-Stat-Signature: zrnsrz8x9fgbzcsriwh81mx1akhi8oa3 X-HE-Tag: 1649283841-905239 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 Wed Apr 6 22:23:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 12804147 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 7B05EC433EF for ; Wed, 6 Apr 2022 22:25:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDE7C6B0074; Wed, 6 Apr 2022 18:24:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8D466B0075; Wed, 6 Apr 2022 18:24:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2F086B0078; Wed, 6 Apr 2022 18:24:14 -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 B62096B0074 for ; Wed, 6 Apr 2022 18:24:14 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7894B2AAE for ; Wed, 6 Apr 2022 22:24:04 +0000 (UTC) X-FDA: 79327883208.04.C3A1995 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf25.hostedemail.com (Postfix) with ESMTP id 1EE77A0003 for ; Wed, 6 Apr 2022 22:24:03 +0000 (UTC) Received: by mail-yb1-f201.google.com with SMTP id b6-20020a5b0b46000000b0063dcbfa6dd3so2850042ybr.2 for ; Wed, 06 Apr 2022 15:24:03 -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=jjVU4Vm+RsqF9L/LF5nXzqLTazBoslxAU4P/IivPRT8ilNYtOIzUeI+a1kJkg0z3/M zj1h55tVXQug27Mh9TJSUYP6wj8OpdkKKY68Un5xso9LFX9YslfH+CKQqFQmKZrQnIsK GvV9OREOq9UTiHkE+Bk2C9Wz0buvZVaaVO8Mu3oDVJjdAIBpEkxwhFVJIXTeTfX/3/hu tKjacH6HhW3xPOe2B2tYLpc4XdKyv3jjdMIZJfROkVHDK2c2seKk0XiX8ApuoAV/y6sP 5e9tugVGbiAk1Tq0kvaOXZgJ79SJ8cumCGkXu45W8SqLzK9LYXieV0i3W7kZyy5dls3n 3APw== 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=GvGYVQ1Ls7lftYJhPVgwfjIYBobNUCF2NM0tEZ7A4MNOImdgqK0wjOBCWMNEXTmldC maey/bBgc/VgFHS9wnbOh3OMz7ThmlMMGBrt5FWFqOQZ0ufkxz2NFvjVEIGOen1aaeVU ASu47s99CE2DZ82yq9y98h/dIlQAq6P6xmwQ/VgRlvpMUjn5InOoVeRxsA3N9C3Dqb9P bx3l2/XZWJdQergpwlIn5NQm9W5REJEan1Btxnrhqg6fTH8Fpw7itUtEWr83HGCaGtfP H14jhW34fiRQ5Or6BB2V+OSRfa+0H5BVwr8pmUbZUdj0qO7k/huQQ6lwVKcdiX8mfHLR xFkA== X-Gm-Message-State: AOAM530UMg8wn5YIZeEIfPITeBjeZEjfIPyS8mjya0FO42uWRU4o1ZGM qlaJoqh5QtV4ex0c3xV/rhY9wyGfztsYxw== X-Google-Smtp-Source: ABdhPJytV6cQol5RyGYdizHu4DR27VeEgSYzSOZBsULea2N+xGlJxmGwHcKDGwmT+gjqj9kQwhx+I9qL8XYc7A== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a05:6902:1146:b0:63d:cbfa:2e9f with SMTP id p6-20020a056902114600b0063dcbfa2e9fmr9070890ybu.592.1649283843345; Wed, 06 Apr 2022 15:24:03 -0700 (PDT) Date: Wed, 6 Apr 2022 15:23:51 -0700 In-Reply-To: <20220406222351.949927-1-jiaqiyan@google.com> Message-Id: <20220406222351.949927-3-jiaqiyan@google.com> Mime-Version: 1.0 References: <20220406222351.949927-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.35.1.1178.g4f1659d476-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, linux-mm@kvack.org, Jiaqi Yan X-Rspam-User: X-Stat-Signature: b6i7dpio5r5gqi9syrxk457rhqnb6w9j Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jjVU4Vm+; spf=pass (imf25.hostedemail.com: domain of 3AxNOYggKCHohgYogwYlemmejc.amkjglsv-kkitYai.mpe@flex--jiaqiyan.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3AxNOYggKCHohgYogwYlemmejc.amkjglsv-kkitYai.mpe@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1EE77A0003 X-HE-Tag: 1649283843-377407 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, 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;