From mboxrd@z Thu Jan 1 00:00:00 1970 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 988A0C4332F for ; Mon, 7 Nov 2022 02:54:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DAA158E0003; Sun, 6 Nov 2022 21:54:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D0B738E0001; Sun, 6 Nov 2022 21:54:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B5EB68E0003; Sun, 6 Nov 2022 21:54:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9D10A8E0001 for ; Sun, 6 Nov 2022 21:54:06 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7ABF7C056B for ; Mon, 7 Nov 2022 02:54:06 +0000 (UTC) X-FDA: 80105126892.05.0AE9F9D Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf04.hostedemail.com (Postfix) with ESMTP id 1A40540003 for ; Mon, 7 Nov 2022 02:54:05 +0000 (UTC) Received: by mail-pl1-f202.google.com with SMTP id n12-20020a170902e54c00b00188515e81a6so8295131plf.23 for ; Sun, 06 Nov 2022 18:54:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Q53egOa9s8GHnL7E4S0vUY8uHGLO5baQAdDsrvB2Wuw=; b=tKID9n/m4zuqctVm0RxjjcYoVTvyB997zdCjUopYdEETpbdJDNwVFUhRTFenRyNdgG Sru/J5B+CrA+Za/ukplNOM8slRL9ol4A5gIWV0dJzc3KnXr+ZuZh2HHLTLraSuJ3zIxp NV3z9aAsnSXmk9+VJSgYqk/WCDcCnwxjduycrcAQiANH1Yg0WHF8sFLnAAF+qivsfTzO +72zT0UiI+Edf9vq09azHBgXYJ6E4DFDJ0DHnk2w6i6GOlvvG2LVEBS4Yu7bpuF4g6Ka JCT6uVOYj7zQkXc3rUJfh9dgS/zh8c07OTRRYwz+CeOppspnzif+JCle4mV7Rv2+Ckm2 Ba3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Q53egOa9s8GHnL7E4S0vUY8uHGLO5baQAdDsrvB2Wuw=; b=LkgakbMsA9l7O6Q0MXF/MTfqtDx1bDAksJwxAIOq7eXDhxGIETHHpeuOw8xLoga6LE Gr9jIE94nDN8MzlBSPtyNSLfSE07qZpdqZOV2duLReVs3Xe6L1kMbjYlI1wgB7ppNLqu rt0zkMl13eG3IidwN2N+85fb6trDOPs1Lmij9STlUrRQxPmv2R/qyQn4yQ32TlnqI6NW pkic+/T+haxj+pNCNQO0OmEtMWqvir5ud2y8CQB4duXUpHx++ND6nOR3tXivKzVXHRid 5f/qq6P/ZEQ00ozTRPE4X4qqt5FjxX5isyVE2I9XTjla8p+vzRfih8iDwBWF360OOdnF t/Uw== X-Gm-Message-State: ACrzQf2E74VVM67wMDyChZc9Wl+rgPfcIQYgst06gUujuG9Dj6o+K0bt ngRUhz7X4Oj47FQLis0eyIjvxpQJulS7Zg== X-Google-Smtp-Source: AMsMyM603uE2FNPj95BxNV/sSxEa6dhrcPeI9dirZ5/LgDs3g9mCrRsz1FUz3JqIEEtv/Ziz4j83DUSr3sEzJQ== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a62:ea09:0:b0:562:a86f:63af with SMTP id t9-20020a62ea09000000b00562a86f63afmr48924615pfh.71.1667789644950; Sun, 06 Nov 2022 18:54:04 -0800 (PST) Date: Sun, 6 Nov 2022 18:53:58 -0800 In-Reply-To: <20221107025359.2911028-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20221107025359.2911028-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Message-ID: <20221107025359.2911028-2-jiaqiyan@google.com> Subject: [PATCH v6 1/2] mm/khugepaged: recover from poisoned anonymous memory From: Jiaqi Yan To: kirill.shutemov@linux.intel.com, kirill@shutemov.name, shy828301@gmail.com, tongtiangen@huawei.com Cc: tony.luck@intel.com, naoya.horiguchi@nec.com, linmiaohe@huawei.com, jiaqiyan@google.com, linux-mm@kvack.org, akpm@linux-foundation.org Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667789646; a=rsa-sha256; cv=none; b=JtY/06Ns1+aRA0YwUmHvLmDEhk65f2ftStjgzWhyddCzdyGG+1SfLEPpWe7Zx1zjzwi78r KNejqbSMt7wMPvqNEUrRe/bhGvHGaWfQ82fdb8gDNetUwUG8LqtiECs6YP4Znph+UkSA6T grertGUHKkzwKx17OjK46pX1hxni+hQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="tKID9n/m"; spf=pass (imf04.hostedemail.com: domain of 3THNoYwgKCPUgfXnfvXkdlldib.Zljifkru-jjhsXZh.lod@flex--jiaqiyan.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3THNoYwgKCPUgfXnfvXkdlldib.Zljifkru-jjhsXZh.lod@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667789646; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Q53egOa9s8GHnL7E4S0vUY8uHGLO5baQAdDsrvB2Wuw=; b=axRBlEFZYkjTH351XFYqOpudbcEL0mHupBvqBKKtDxPJh4LZXescqrxLc9SBG9DrU96JHG rt3oXCysUG6I5Y89fuLHaevOeNQw1/60UxFVLqvVeuhdY3Lfa5q+EZW+uVKkk5eSSb3wYE g7+1acrZRX5skMxZFCXOkgwsriInysw= Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="tKID9n/m"; spf=pass (imf04.hostedemail.com: domain of 3THNoYwgKCPUgfXnfvXkdlldib.Zljifkru-jjhsXZh.lod@flex--jiaqiyan.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3THNoYwgKCPUgfXnfvXkdlldib.Zljifkru-jjhsXZh.lod@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1A40540003 X-Stat-Signature: p4ditn8ufdp1fzb4wtnhtxc1ith5fi1z X-HE-Tag: 1667789645-622678 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 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. If copying all pages succeeds, the second loop releases and clears up these normal pages. Otherwise, the second loop rolls back the page table and page states by: - re-establishing the original PTEs-to-PMD connection. - releasing source pages back to their LRU list. Tested manually: 0. Enable khugepaged on system under test. 1. Start a two-thread application. Each thread allocates a chunk of non-huge anonymous memory buffer. 2. Pick 4 random buffer locations (2 in each thread) and inject uncorrectable memory errors at corresponding physical addresses. 3. Signal both threads to make their memory buffer collapsible, i.e. calling madvise(MADV_HUGEPAGE). 4. Wait and check kernel log: khugepaged is able to recover from poisoned pages and skips collapsing them. 5. Signal both threads to inspect their buffer contents and make sure no data corruption. Signed-off-by: Jiaqi Yan --- include/linux/highmem.h | 19 ++++ include/trace/events/huge_memory.h | 3 +- mm/khugepaged.c | 159 +++++++++++++++++++++-------- 3 files changed, 138 insertions(+), 43 deletions(-) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 44242268f53bd..bcd317998e4bb 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -361,6 +361,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/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 35d759d3b0104..5743ae970af31 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -36,7 +36,8 @@ EM( SCAN_ALLOC_HUGE_PAGE_FAIL, "alloc_huge_page_failed") \ EM( SCAN_CGROUP_CHARGE_FAIL, "ccgroup_charge_failed") \ EM( SCAN_TRUNCATED, "truncated") \ - EMe(SCAN_PAGE_HAS_PRIVATE, "page_has_private") \ + EM( SCAN_PAGE_HAS_PRIVATE, "page_has_private") \ + EMe(SCAN_COPY_MC, "copy_poisoned_page") \ #undef EM #undef EMe diff --git a/mm/khugepaged.c b/mm/khugepaged.c index ea0d186bc9d4c..c1f225327bc05 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -55,6 +55,7 @@ enum scan_result { SCAN_CGROUP_CHARGE_FAIL, SCAN_TRUNCATED, SCAN_PAGE_HAS_PRIVATE, + SCAN_COPY_MC, }; #define CREATE_TRACE_POINTS @@ -670,56 +671,125 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, return result; } -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 page table and release isolated normal pages. + * 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 pages' PMD + * @vma: the original normal pages' virtual memory area + * @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))) { - clear_user_highpage(page, address); - add_mm_counter(vma->vm_mm, MM_ANONPAGES, 1); - if (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); + else { + src_page = pte_page(pteval); + if (copy_highpage_mc(page, src_page)) { + copy_succeeded = false; + break; + } + } + } + + if (copy_succeeded) { + 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))) { + add_mm_counter(vma->vm_mm, MM_ANONPAGES, 1); + if (is_zero_pfn(pte_pfn(pteval))) { + /* + * pte_ptl mostly unnecessary. + */ + spin_lock(pte_ptl); + pte_clear(vma->vm_mm, _address, _pte); + spin_unlock(pte_ptl); + } + } else { + src_page = pte_page(pteval); + if (!PageCompound(src_page)) + release_pte_page(src_page); /* - * ptl mostly unnecessary. + * pte_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); - spin_unlock(ptl); + spin_lock(pte_ptl); + ptep_clear(vma->vm_mm, _address, _pte); + page_remove_rmap(src_page, vma, false); + spin_unlock(pte_ptl); + free_page_and_swap_cache(src_page); } - } 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, vma, false); - spin_unlock(ptl); - free_page_and_swap_cache(src_page); + } + list_for_each_entry_safe(src_page, tmp, compound_pagelist, lru) { + list_del(&src_page->lru); + mod_node_page_state(page_pgdat(src_page), + NR_ISOLATED_ANON + page_is_file_lru(src_page), + -compound_nr(src_page)); + unlock_page(src_page); + free_swap_cache(src_page); + putback_lru_page(src_page); + } + } else { + /* + * Re-establish the regular PMD that points to the regular + * page table. Restoring PMD needs to be done prior to + * releasing pages. Since pages are still isolated and + * locked here, acquiring anon_vma_lock_write is unnecessary. + */ + pmd_ptl = pmd_lock(vma->vm_mm, pmd); + pmd_populate(vma->vm_mm, pmd, pmd_pgtable(rollback)); + spin_unlock(pmd_ptl); + /* + * Release both raw and compound pages isolated + * in __collapse_huge_page_isolate. + */ + 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))) { + src_page = pte_page(pteval); + if (!PageCompound(src_page)) + release_pte_page(src_page); + } + } + list_for_each_entry_safe(src_page, tmp, compound_pagelist, lru) { + list_del(&src_page->lru); + release_pte_page(src_page); } } - list_for_each_entry_safe(src_page, tmp, compound_pagelist, lru) { - list_del(&src_page->lru); - mod_node_page_state(page_pgdat(src_page), - NR_ISOLATED_ANON + page_is_file_lru(src_page), - -compound_nr(src_page)); - unlock_page(src_page); - free_swap_cache(src_page); - putback_lru_page(src_page); - } + return copy_succeeded; } static void khugepaged_alloc_sleep(void) @@ -981,6 +1051,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, int result = SCAN_FAIL; struct vm_area_struct *vma; struct mmu_notifier_range range; + bool copied = false; VM_BUG_ON(address & ~HPAGE_PMD_MASK); @@ -1084,9 +1155,13 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, */ anon_vma_unlock_write(vma->anon_vma); - __collapse_huge_page_copy(pte, hpage, vma, address, pte_ptl, - &compound_pagelist); + copied = __collapse_huge_page_copy(pte, hpage, 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 -- 2.38.1.431.g37b22c650d-goog