From patchwork Fri Nov 18 01:31:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13047582 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 85BF7C4332F for ; Fri, 18 Nov 2022 01:32:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2252B6B0075; Thu, 17 Nov 2022 20:32:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1ADA36B0078; Thu, 17 Nov 2022 20:32:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F19BA8E0001; Thu, 17 Nov 2022 20:32:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DF00B6B0075 for ; Thu, 17 Nov 2022 20:32:07 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B76B5A084E for ; Fri, 18 Nov 2022 01:32:07 +0000 (UTC) X-FDA: 80144837094.16.686A9CA Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf02.hostedemail.com (Postfix) with ESMTP id 50ED18000A for ; Fri, 18 Nov 2022 01:32:07 +0000 (UTC) Received: by mail-pl1-f201.google.com with SMTP id p18-20020a170902a41200b00188e87d0f04so2639326plq.14 for ; Thu, 17 Nov 2022 17:32:07 -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=qAsK0IyE5hmpuxuTwdX3uL425dXeoV0TILCmQbHEO1M=; b=QkptU6oqc0rpJgiMtZk7KsvMgVEg7GxJ0n5bkaFbRReuhq9Gnvn5ofs4KSYFfH/WB9 3Twz0YTyhLdWURC6ItOLubN2zlsvH7YHh7TUd+xqtbsylrirJF1i1wZGvRBegztJXkFj ZVTADKZ6OIVlaB5K9Oiby2Sr0rnyR9v/80fNzyKu3X9Dc41EVDSvxus+ubHZfyeJ5a3Q XkYUoO5A6hwRzwxLsRVmjTJoqvPmg4www1jxS+qG5npWI40tDO/+JXb+dyX/aJUe6u0n PkPWGMjP/XUycZ+pdBtYi++ap32ZGlZLfEbLftTD3jYUr62jbIq/0bq1WuH4wfF6aOzT 4ymQ== 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=qAsK0IyE5hmpuxuTwdX3uL425dXeoV0TILCmQbHEO1M=; b=LQJkSvsUQqZuxbXKigsiJFwGiAq/MzdjpJdM6gOTOXknVUvKWH3/Vh7w/x3zJgP3BO Kf1En9JJq6kAuY+kzqr/1ilW80oSrkoJ0jsDRt22/GUdcgIzMLnzttPm3PN9lDdZ7Znk uwVunl9LXyGVErHGXjP3U/SmpF7DwZdztVAwcHVtMZAxPzUidAvOe26Z9d7171O/Rl3U CPzhwoNLKvJNYOa8TeGLwbBV5bIyAnhjfcRs7FENQ8hXv+jLoSuFqQ5cCERHPf0DmiSx 9HkN5M5X6Ko7l7+ucN1gUQrm7tkVSPz+AC8l6H2Fzs126Cr9oVTMH6eaOl3Q18NdiRjM 3NrQ== X-Gm-Message-State: ANoB5pmpE0TtKutrANjQmxFrUPkg/JW1CE2cd66YISc6uwU1pW1Su75y 6RwU1qanl8hQTHE5OylDGPneU6hlunjhyQ== X-Google-Smtp-Source: AA0mqf53oUWGQE58xBVUEheUrDSH4qZxFVDruwtQ5xaTnjNZpun31XbyroVFtmN4GUkTtwE8OOVcEp7IEo3QFg== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a05:6a00:b84:b0:563:4643:db33 with SMTP id g4-20020a056a000b8400b005634643db33mr5552242pfj.22.1668735126193; Thu, 17 Nov 2022 17:32:06 -0800 (PST) Date: Thu, 17 Nov 2022 17:31:56 -0800 In-Reply-To: <20221118013157.1333622-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20221118013157.1333622-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221118013157.1333622-2-jiaqiyan@google.com> Subject: [PATCH v7 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, akpm@linux-foundation.org Cc: tony.luck@intel.com, naoya.horiguchi@nec.com, linmiaohe@huawei.com, juew@google.com, jiaqiyan@google.com, linux-mm@kvack.org, osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668735127; a=rsa-sha256; cv=none; b=3RQMXDqpg5OUZ06aOltb6+ZQ24clMvTuD+S3QsksgNeXHOUzyAbK78k3zJVFDWd6lWeQNM nFUu4nY3a5IkkM2waL4gxDmxXCKqLE91HGncsSUQEkt6QkahNWXXf1SVthpD03MHcIDDU5 wTKAAvieQ7fsv78t2GAOkXNGdLBqdr4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=QkptU6oq; spf=pass (imf02.hostedemail.com: domain of 3luB2YwgKCFU65xD5LxA3BB381.zB985AHK-997Ixz7.BE3@flex--jiaqiyan.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3luB2YwgKCFU65xD5LxA3BB381.zB985AHK-997Ixz7.BE3@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=1668735127; 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=qAsK0IyE5hmpuxuTwdX3uL425dXeoV0TILCmQbHEO1M=; b=cBDRk1ULxiySnlSHrrHdT3PzGCwUPBr0ZhS5dxwcNqaewsDOMZQBle1QZMyRIzvkM4RwnQ xjOz7IHBp2tL3hvPnNdOY0APIXSETnp1vC3NPHA42OiNwu36D8no1BG2hv0xYiWsFU94nn uPTdDXQL5C6i7XX1zmNm8V53c51RBOg= X-Stat-Signature: cqfiwjmwt5pbpf4k9kp97h98ogs84sif X-Rspamd-Queue-Id: 50ED18000A Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=QkptU6oq; spf=pass (imf02.hostedemail.com: domain of 3luB2YwgKCFU65xD5LxA3BB381.zB985AHK-997Ixz7.BE3@flex--jiaqiyan.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3luB2YwgKCFU65xD5LxA3BB381.zB985AHK-997Ixz7.BE3@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1668735127-496638 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 From patchwork Fri Nov 18 01:31:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13047583 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 1BF5CC433FE for ; Fri, 18 Nov 2022 01:32:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C4A76B0078; Thu, 17 Nov 2022 20:32:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 94D876B007B; Thu, 17 Nov 2022 20:32:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C8558E0001; Thu, 17 Nov 2022 20:32:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6EA6D6B0078 for ; Thu, 17 Nov 2022 20:32:25 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 491F3C0367 for ; Fri, 18 Nov 2022 01:32:25 +0000 (UTC) X-FDA: 80144837850.25.977AE6A Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by imf29.hostedemail.com (Postfix) with ESMTP id EE2E2120012 for ; Fri, 18 Nov 2022 01:32:24 +0000 (UTC) Received: by mail-pg1-f202.google.com with SMTP id y9-20020a63e249000000b00476aad2eb4aso2215038pgj.17 for ; Thu, 17 Nov 2022 17:32:24 -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=X3e5jC7h9awIX99sxD8I+UBHtQfnz5RCLC9SbQikEwk=; b=cYD4amwn9y7cVKu1KFLKIR+R7gkkTAzxoiXhMIjSQhqTUAY97l9LzXUjrnmOugun12 5b1mGMaL/q4dOAhilD9MYRtgAehXqJbJpN9eiebCdzG40lKX4YEHdmrDmxugYhQvQCQG XeWec0SEhu+sh5D4UJ8EVl5/0z30fVW/LdTA1Cqg123iXMVjNaNwXvjjpS8UhOc+pard lnV63W7Sq/nfo7MO759O51PxMY2Opxo4Erg3Y43QDTqQnl7PUJ7x2G1M/SThuT2bQLBM hwBFiFfPEsGpj5YoKTdUw093QJhnX7IkgoPA6lhwgaKQ/Zm3a3OTZaaOGIHl0WS68YxG S/NA== 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=X3e5jC7h9awIX99sxD8I+UBHtQfnz5RCLC9SbQikEwk=; b=dxPIZE0m4v60U1i9UMFaAEyE1RaT7yuoLabsLfjHIKaFrdF6bV3aJpHTEnS7DLlpWp 6fM/WLu5rHH0Z0A56V/s4DEYYrNL91rTIQBUMz8nWlk5kH+aXstJ/Vkh+yFXK4K76r6q HfjZEV8g7pMaJbUxjs46ksR+2gFmudU0XZpSGWbJxz+Z3Ugv1sqHXErf0ANXZB34gp6H 5ZQuvOQSmYWdC4U3tA57ui/HKz9yaW74R4ZVtYn77pil9ssFwQ+oXmQT++VKOq+EVZnQ 5uwgulEwHWoARZ4ELKuMuNJIcbQ744eoyYdmmWkkreLpeDc0e2m3dx3eR+sB2U04YVZa bPog== X-Gm-Message-State: ANoB5plyQROdRmshM+MIB1iwk83KY50zPuJPw00rWQRrdBWuZORGZUlP gDc/pgd9mvFxuMvNWbjR/C0n0f3niNudtw== X-Google-Smtp-Source: AA0mqf4tj6saXkqYA0YZhtn/oY5bNj2bQ9d04xxijeQEOaTiv5fMTv1MFNyOduhF4GuR0ckTqtnnmJKFewTsBA== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a62:148f:0:b0:560:ee47:81e1 with SMTP id 137-20020a62148f000000b00560ee4781e1mr5597741pfu.63.1668735143995; Thu, 17 Nov 2022 17:32:23 -0800 (PST) Date: Thu, 17 Nov 2022 17:31:57 -0800 In-Reply-To: <20221118013157.1333622-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20221118013157.1333622-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221118013157.1333622-3-jiaqiyan@google.com> Subject: [PATCH v7 2/2] mm/khugepaged: recover from poisoned file-backed memory From: Jiaqi Yan To: kirill.shutemov@linux.intel.com, kirill@shutemov.name, shy828301@gmail.com, tongtiangen@huawei.com, akpm@linux-foundation.org Cc: tony.luck@intel.com, naoya.horiguchi@nec.com, linmiaohe@huawei.com, juew@google.com, jiaqiyan@google.com, linux-mm@kvack.org, osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668735145; a=rsa-sha256; cv=none; b=TSG8Fwrt2Yhi2u7KOFKa7VbGYMsTKBcKXzjkhJZZ+55SfP7REp20U04BHr0QE0lUL7rbce UKCnX9HFy9iN1R94ifA5otHAM6HdVgnu73oYdLX/gqEnjxCDU1mmYP0tUkHYK7RVsAh9+1 F8S6qlegHNr6ClWtAvmxRklyLEQEnCU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=cYD4amwn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3p-B2YwgKCGYNMEUMcERKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--jiaqiyan.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3p-B2YwgKCGYNMEUMcERKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--jiaqiyan.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668735145; 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=X3e5jC7h9awIX99sxD8I+UBHtQfnz5RCLC9SbQikEwk=; b=RKMyh1TWNGfBj/tRov6v8tNpVHSUHdhJHwDfPeFBCCJitWCzBMPTsfacl7bYEmXJf6GK6p xeyEV9+e2OUzzSp1mtv0LU9tbKQcvydQ7xuU/TeDn4Iln1/IcSzH5tAjVyNIxbFdRoLCYM 75UtxCaISRcFmhZD3cErkgjYSAOUr7I= Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=cYD4amwn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3p-B2YwgKCGYNMEUMcERKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--jiaqiyan.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3p-B2YwgKCGYNMEUMcERKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--jiaqiyan.bounces.google.com X-Rspam-User: X-Stat-Signature: fx4cwus4agr8e67mp1hud9hctqt1qryb X-Rspamd-Queue-Id: EE2E2120012 X-Rspamd-Server: rspam11 X-HE-Tag: 1668735144-257369 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 until both scanning and copying succeeded - for non-SHMEM file, roll back filemap_nr_thps_inc if scan succeeded but copying failed Tested manually: 0. Enable khugepaged on system under test. Mount tmpfs at /mnt/ramdisk. 1. Start a two-thread application. Each thread allocates a chunk of non-huge memory buffer from /mnt/ramdisk. 2. Pick 4 random buffer address (2 in each thread) and inject uncorrectable memory errors at physical addresses. 3. Signal both threads to make their memory buffer collapsible, i.e. calling madvise(MADV_HUGEPAGE). 4. Wait and then check kernel log: khugepaged is able to recover from poisoned pages by skipping them. 5. Signal both thread to inspect their buffer contents and make sure no data corruption. Signed-off-by: Jiaqi Yan --- mm/khugepaged.c | 74 ++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index c1f225327bc05..434423e5e35da 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1776,7 +1776,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, struct collapse_control *cc) { struct address_space *mapping = file->f_mapping; - struct page *hpage; + struct page *hpage, *page, *tmp; pgoff_t index = 0, end = start + HPAGE_PMD_NR; LIST_HEAD(pagelist); XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER); @@ -1821,7 +1821,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, 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) { @@ -2003,10 +2003,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, } nr = thp_nr_pages(hpage); - if (is_shmem) - __mod_lruvec_page_state(hpage, NR_SHMEM_THPS, nr); - else { - __mod_lruvec_page_state(hpage, NR_FILE_THPS, nr); + if (!is_shmem) { filemap_nr_thps_inc(mapping); /* * Paired with smp_mb() in do_dentry_open() to ensure @@ -2017,21 +2014,10 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, smp_mb(); if (inode_is_open_for_write(mapping->host)) { result = SCAN_FAIL; - __mod_lruvec_page_state(hpage, NR_FILE_THPS, -nr); filemap_nr_thps_dec(mapping); goto xa_locked; } } - - if (nr_none) { - __mod_lruvec_page_state(hpage, NR_FILE_PAGES, nr_none); - /* nr_none is always 0 for non-shmem. */ - __mod_lruvec_page_state(hpage, 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, hpage); xa_locked: xas_unlock_irq(&xas); xa_unlocked: @@ -2044,20 +2030,34 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, try_to_unmap_flush(); 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(hpage + (index % HPAGE_PMD_NR)); index++; } - copy_highpage(hpage + (page->index % HPAGE_PMD_NR), - page); + if (copy_highpage_mc(hpage + (page->index % HPAGE_PMD_NR), page)) { + result = SCAN_COPY_MC; + break; + } + index++; + } + while (result == SCAN_SUCCEED && index < end) { + clear_highpage(hpage + (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); @@ -2065,12 +2065,23 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, ClearPageUnevictable(page); unlock_page(page); put_page(page); - index++; } - while (index < end) { - clear_highpage(hpage + (index % HPAGE_PMD_NR)); - index++; + + xas_lock_irq(&xas); + if (is_shmem) + __mod_lruvec_page_state(hpage, NR_SHMEM_THPS, nr); + else + __mod_lruvec_page_state(hpage, NR_FILE_THPS, nr); + + if (nr_none) { + __mod_lruvec_page_state(hpage, NR_FILE_PAGES, nr_none); + /* nr_none is always 0 for non-shmem. */ + __mod_lruvec_page_state(hpage, 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, hpage); + xas_unlock_irq(&xas); SetPageUptodate(hpage); page_ref_add(hpage, HPAGE_PMD_NR - 1); @@ -2086,8 +2097,6 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, unlock_page(hpage); hpage = NULL; } else { - struct page *page; - /* Something went wrong: roll back page cache changes */ xas_lock_irq(&xas); if (nr_none) { @@ -2121,6 +2130,13 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, 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); hpage->mapping = NULL;