From patchwork Sun Mar 5 06:51:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13160065 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 2DDA1C6FA8E for ; Sun, 5 Mar 2023 06:51:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 986FD6B0073; Sun, 5 Mar 2023 01:51:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C34E6B0074; Sun, 5 Mar 2023 01:51:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 714B16B0075; Sun, 5 Mar 2023 01:51:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5D9EE6B0073 for ; Sun, 5 Mar 2023 01:51:21 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2BE2E1208F0 for ; Sun, 5 Mar 2023 06:51:21 +0000 (UTC) X-FDA: 80533923162.04.5A17AD9 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf18.hostedemail.com (Postfix) with ESMTP id 638821C000B for ; Sun, 5 Mar 2023 06:51:19 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=dM5+GpNk; spf=pass (imf18.hostedemail.com: domain of 35jsEZAgKCJU87zF7NzC5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--jiaqiyan.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=35jsEZAgKCJU87zF7NzC5DD5A3.1DBA7CJM-BB9Kz19.DG5@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=1677999079; 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=sLIuIxpZr7ag2cRUUeCAw9IIJ8JVH+T0aoqrowSwcWg=; b=6/NBxnMzTjKIJVRHh1yIHXAFcA1x2XuSHz0fsvbUOUaQ+/iU8RmVUjREPRRi9nHaGj4Fxb sGIMCstA4sWTyfsiEM9uYyg5KUc0+/8pDJ3/AKgtJUavllF5D2/swkP7tpsrtMNaEvAlQB sfqXbq13zZIVTCM9T82QTOaoIY1lg7s= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=dM5+GpNk; spf=pass (imf18.hostedemail.com: domain of 35jsEZAgKCJU87zF7NzC5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--jiaqiyan.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=35jsEZAgKCJU87zF7NzC5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677999079; a=rsa-sha256; cv=none; b=2Px+JL/jM835nUxGiiPTQB8ImUHFVjl7OUG43CR5CKCmpMfLNOOpSXukhe549LGHtVTPAZ 6pqIjaM6tnYpHTMzyuGtWE+Nsb9nr7qYsJVPb6LjO0kiZouKTDuP+qP41wpk6rwGpnEZOZ 19CLhg3OgfavwRxQuwwAHZLuc3Rrxjw= Received: by mail-pl1-f201.google.com with SMTP id iy17-20020a170903131100b0019ce046d8f3so3874425plb.23 for ; Sat, 04 Mar 2023 22:51:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677999078; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sLIuIxpZr7ag2cRUUeCAw9IIJ8JVH+T0aoqrowSwcWg=; b=dM5+GpNkBCiy7YjhHWdFF5ALxdVmhS2p5POgOHqDN25J1xkcOSWy0yIRZvIhC2CzBV nY++oXg3I6PTN8JSgsUTCXpP+frIp1kLTrD1nWw6fS+mR35Wklq+H7IqNoaWSRDwUC+9 zSZGIJnSL368vlYM/YAHpk8ft/Ei7byoHedcadL9V/XV+uKMB3aq4s7DWLotIGNb6iNg wd/mlQ1cGBjVG+kf4Qvaz4AqO2EPZy4ftj7XQFMOFBC/+ctb4RdXtOM6c79aYMLtUV/z I4Ylf5GUTeY1SCo6Bqdq7Ol2e+NEpEwf9VijrlVsiD2OPzrXdUpc/GtYT9sqG8X9HlOU YTbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677999078; 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=sLIuIxpZr7ag2cRUUeCAw9IIJ8JVH+T0aoqrowSwcWg=; b=qsZ4g1qXBjtXGd9oG2Imktyhc5y7/rtGF/A8TP7ObVVRjgyXcKpp4DufzexvbkyLRX 4ah117TWP0xDqc2ag955+ZgQ5aLXxQbJYTfk+c7bR1R1aBSSdz6E1QXAejZXPU7lsq3o TSCymvnqDqM3GibS1K1CNO+PicRQA/E1fXTGmIbhmHjMXid1wVj/WPkST8DVXfCBQOhr 9CgmlisyxghD0yUbFSKHG6ZmPPHrovg/Pg/5jDeET68kdSp5QPu/+4OuErS9rFywFBgd GC42wb5FrVyvqH5V4dgnmLDWu3aZVyhnadxV6jRH5TCXq5P1xsykd+0URpnCFv/2fmtC iZYA== X-Gm-Message-State: AO0yUKW3Hydyp4Yu63HzXYYnSYfomW0qwpCtCjrekZBt1Qjmny38ETx8 dwvP7Q2qxPMRkS+8L1Uj8jzkwajU0HlbjQ== X-Google-Smtp-Source: AK7set/pUWGH2PycYxBq3iYSDjSruUrz6/azOCOVgNQq/jH7ucv/nUWObq6WWcQLSnYeXxlW3llz9EnymbvTWA== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a63:7f1a:0:b0:4fb:be1a:2074 with SMTP id a26-20020a637f1a000000b004fbbe1a2074mr2454581pgd.12.1677999078353; Sat, 04 Mar 2023 22:51:18 -0800 (PST) Date: Sat, 4 Mar 2023 22:51:10 -0800 In-Reply-To: <20230305065112.1932255-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20230305065112.1932255-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230305065112.1932255-2-jiaqiyan@google.com> Subject: [PATCH v10 1/3] 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, tony.luck@intel.com, akpm@linux-foundation.org Cc: naoya.horiguchi@nec.com, linmiaohe@huawei.com, jiaqiyan@google.com, linux-mm@kvack.org, osalvador@suse.de, wangkefeng.wang@huawei.com X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 638821C000B X-Rspam-User: X-Stat-Signature: swuyg4a9wein3iatcqdzrucs8k3api1e X-HE-Tag: 1677999079-144485 X-HE-Meta: U2FsdGVkX1+wZ5PN3XEzLDEsNyKFTZ50UERWCHzGLZzhwdIFDlVx0Nu4m+cHMAsfa2Dm4XzmZNS0+PX/RBK2NGLczp+oJ65u9nU2RVx34opw4H328rC+xRyJ51QKbq+040C8CGArC7ibXJSrylmCD5vcb+9357Ih6pHhLxELenbcIHXxXEBWD1kVwoMlcUGUxzTggkL3vBykxabjz5yyIFaHD1jV8qiNLxXLt9KF5SVqvjOBvuO4vrqdRHcP9zBevtTOlB2ZGceHdnynAma5S0fImX21k78ZeYEOlxIA4ZlJPqySdIl34/90Y3MgoYS+8NsEsiKPm+DNyuX5FbUqjjdQ6c7pHjQ1jCBgL6SVNuWaef/paSivJps5J4/hpWMYaufjyLMXGsyTUl/lubC153mtCbvp+PiVMeQSRW1HjOM3xE0diSDsMWHuh6ZV1tv1Un+ThVu6fuxQV8r0/7DBjcUF9KMdFEfqJoSXwxBrzunejmXbiGlrt9RN8RVW90eYrNKfiQRdrS0KWIj4eEizjpIxpL8UH8vTIcIaegta7oImTBPC2eD9Pv4IZ4ql/z+sM6hUESIQhUBoQ5p+okSgNSV7MwgTnzEVMW7oAqWpSFJfNhAM5hwoBEsGpIZj71PYgrD89Z18nX9NcdZfIaAGw/jBlPNpAggBTdlEGALxzhz2ymGk4ZqcZ+lV47dw0Ah5X0g7Sv7RZpopRWe1gIiqp+mMDaSXNFwAyj30zKHzWE/fXJGJ2sGiKYCN0UpP0SI1FkqZXqqE0SOA9ORmYnUvsTnMIbcAgzwR3GbtqH7h9+3DvUAg4FgQAiCnJEMOFfD8e5ZCn9uuDq9TGDjB1bJzQrgyPN4lyZi0jWEsb1huuPctpbI8tDZGanKuo1L4oM+tO0XEAHKxRbUwuPXHT358kHwjg75wwdOfZPL6AyFKqEhcgTi/JlBET2A+Zk0RlGP+4DNwSA2iNTwsjTTc4XH JLApfYeg /SfV7OwlyeYCkFU9gI3say2O+kkHblU+G/RJNcCinvqGgLNfo4AVeOAuMq68stYvqVaZquXxgLKEsOZeW36q1FR/muagG6BhdCZ/iIF9xCLYdPKv3hB5DTQOxezGmOxEs0p7U135YmB5eWLRW6D9ZLQw7qpW4pRlldASpE3GSlAakDJ4XZG81WetjTM8JngjVMzyVn7LvKq3Z3yc0qoWqcXd72yk+EVReCjsWYuCFqhwshXuTiri07aSBLDc3dob4Lmk6vc0IpcCtM/DmQU6eEs+S1wAYXNXyHWr0pv0OQH4E+F8GgYIDtFxitsJaZ8JMnWhrgay02rUlMaMlivzfKItMsMuUgzdLmfqU2AvwsXmxsRZ8DPT6PYkhRQNfciCBks7HizwCdGjU6To7R7qfa4I1j+RjIXxOIL9OsiBoeyUKa71dWW/4QlaOaHFv5CC+4E43bIDNeckmJZg0pVf+DDQycTraj/2xrgTc6idNx4v+GJMekXzIsr3VL7XmPzcD+otvNY0ezOa+9bPi2mL7oHTGhrv3HRhaNZWCkFsSZY/LDRhdnZo94CWFLRx3nyDMGG7thAegfg3aFmNWdTWmvyaYBmt51r2txM91109+s8HWlz5OERogB+Axt5pEFTtGTpakYQOVZUSGhTg= 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/trace/events/huge_memory.h | 3 +- mm/khugepaged.c | 148 ++++++++++++++++++++++++----- 2 files changed, 128 insertions(+), 23 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 3e6fb05852f9a..46cce509957ba 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 27956d4404134..c3c217f6ebc6e 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -55,6 +56,7 @@ enum scan_result { SCAN_CGROUP_CHARGE_FAIL, SCAN_TRUNCATED, SCAN_PAGE_HAS_PRIVATE, + SCAN_COPY_MC, }; #define CREATE_TRACE_POINTS @@ -681,47 +683,47 @@ 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) +static void __collapse_huge_page_copy_succeeded(pte_t *pte, + pmd_t *pmd, + 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; + 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))) { - clear_user_highpage(page, address); add_mm_counter(vma->vm_mm, MM_ANONPAGES, 1); if (is_zero_pfn(pte_pfn(pteval))) { /* - * ptl mostly unnecessary. + * pte_ptl mostly unnecessary. */ - spin_lock(ptl); - ptep_clear(vma->vm_mm, address, _pte); - spin_unlock(ptl); + 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 + * 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_lock(pte_ptl); + ptep_clear(vma->vm_mm, _address, _pte); page_remove_rmap(src_page, vma, false); - spin_unlock(ptl); + spin_unlock(pte_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), @@ -733,6 +735,104 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page, } } +static void __collapse_huge_page_copy_failed(pte_t *pte, + pmd_t *pmd, + pmd_t orig_pmd, + struct vm_area_struct *vma, + unsigned long address, + struct list_head *compound_pagelist) +{ + struct page *src_page, *tmp; + pte_t *_pte; + pte_t pteval; + unsigned long _address; + spinlock_t *pmd_ptl; + + /* + * Re-establish the PMD to point to the original page table + * entry. 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(orig_pmd)); + 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))) + continue; + 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); + } +} + +/* + * __collapse_huge_page_copy - attempts to copy memory contents from raw + * pages to a hugepage. Cleans up the raw pages if copying succeeds; + * otherwise restores the original page table and releases isolated raw pages. + * Returns SCAN_SUCCEED if copying succeeds, otherwise returns SCAN_COPY_MC. + * + * @pte: starting of the PTEs to copy from + * @page: the new hugepage to copy contents to + * @pmd: pointer to the new hugepage's PMD + * @orig_pmd: the original raw pages' PMD + * @vma: the original raw pages' virtual memory area + * @address: starting address to copy + * @pte_ptl: lock on raw pages' PTEs + * @compound_pagelist: list that stores compound pages + */ +static int __collapse_huge_page_copy(pte_t *pte, + struct page *page, + pmd_t *pmd, + pmd_t orig_pmd, + struct vm_area_struct *vma, + unsigned long address, + spinlock_t *pte_ptl, + struct list_head *compound_pagelist) +{ + struct page *src_page; + pte_t *_pte; + pte_t pteval; + unsigned long _address; + int result = SCAN_SUCCEED; + + /* + * 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); + continue; + } + src_page = pte_page(pteval); + if (copy_mc_user_highpage(page, src_page, _address, vma) > 0) { + result = SCAN_COPY_MC; + break; + } + } + + if (likely(result == SCAN_SUCCEED)) + __collapse_huge_page_copy_succeeded(pte, pmd, vma, address, + pte_ptl, compound_pagelist); + else + __collapse_huge_page_copy_failed(pte, pmd, orig_pmd, vma, + address, compound_pagelist); + + return result; +} + static void khugepaged_alloc_sleep(void) { DEFINE_WAIT(wait); @@ -1106,9 +1206,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); + result = __collapse_huge_page_copy(pte, hpage, pmd, _pmd, + vma, address, pte_ptl, + &compound_pagelist); pte_unmap(pte); + if (unlikely(result != SCAN_SUCCEED)) + 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 Sun Mar 5 06:51:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13160066 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 E641DC6FA9E for ; Sun, 5 Mar 2023 06:51:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42F7D6B0074; Sun, 5 Mar 2023 01:51:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 391CA6B0075; Sun, 5 Mar 2023 01:51:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2343D6B0078; Sun, 5 Mar 2023 01:51:23 -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 0F6586B0074 for ; Sun, 5 Mar 2023 01:51:23 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D6038C08C2 for ; Sun, 5 Mar 2023 06:51:22 +0000 (UTC) X-FDA: 80533923204.30.4128348 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf15.hostedemail.com (Postfix) with ESMTP id 1C367A0008 for ; Sun, 5 Mar 2023 06:51:20 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=kr2wZloU; spf=pass (imf15.hostedemail.com: domain of 36DsEZAgKCJcA91H9P1E7FF7C5.3FDC9ELO-DDBM13B.FI7@flex--jiaqiyan.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=36DsEZAgKCJcA91H9P1E7FF7C5.3FDC9ELO-DDBM13B.FI7@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=1677999081; 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=yElMEtS2werw5GTxuHkVYnDGm0sAxyHcBL9NAWkARek=; b=wx2LKDJBP1VjcJN44IdFc0qh1HMBYA6tMMrg3nhe3k1OMt1/arD4rCuwShdcxdRoOAxXlh 698H2krDe36GEfFtgkhqrj/F/drNEQNz8lMS6FWqosii2yiBodgTZleyCr+5DLbrCKIzQh c5q4vZwRXnmbR5bhXMxHLVwFGEIwdIc= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=kr2wZloU; spf=pass (imf15.hostedemail.com: domain of 36DsEZAgKCJcA91H9P1E7FF7C5.3FDC9ELO-DDBM13B.FI7@flex--jiaqiyan.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=36DsEZAgKCJcA91H9P1E7FF7C5.3FDC9ELO-DDBM13B.FI7@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677999081; a=rsa-sha256; cv=none; b=bp8qn/cUME7wvvldHJO6pkXUvULyrCctkWJOFc4/erHs26KLCJWgZORJVFb1+jwfRQf/bz xxbSzH4OcVJeLuIiBxON1MQh1rS1O68ux5sx7ZdBBQySkej0xfT9hC9pqSTFSDz71JCb4u xq3ZdLCMZ1ziQfxe6JAt0s9w/pO9dK8= Received: by mail-pl1-f202.google.com with SMTP id w8-20020a170902a70800b0019e416eabcdso3830331plq.0 for ; Sat, 04 Mar 2023 22:51:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677999080; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=yElMEtS2werw5GTxuHkVYnDGm0sAxyHcBL9NAWkARek=; b=kr2wZloUaKjwdTmUWl/VwJA2tHxokB17qqnLEjMNyR2cOOzsHQeKDxtc/fwKM5AlFz xpVYT/utamOy6LzLhGi3j7+HEz5FzW9sPLDhki/kIYRCiy+4/Ls4DFpEZLhs38l+mln5 EBDobUTRPsm5/ejFtLXbnHRw++oPVEuN5VPjlbuUTyO+93XxywuBZB2WoxhkJvknY+T3 GIyWZfuG2RUy8m183pg4ovsh5tpTfFEGhW7Sl5VE7ll6cpmcfZ4DcaN38yxj0QWb/G23 IkTf2I8RfMqB5o98ZcViqmmHmjHCpo/t6DyW/V0F/7E6stkSdewapFY/4aTd2Ja1krZV XjLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677999080; 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=yElMEtS2werw5GTxuHkVYnDGm0sAxyHcBL9NAWkARek=; b=a7N0oGaB+q3UvLcNPd+ytj+Rj+f2F7QNvIAWOgiSQWH5Q8SE8gAMDe8wxyK0n5KhGN M3XZ/y9pE5yLRmnR2epYlutPHuWrgkaqD+drI9Bleg+adLLIa472A1hfOl5YgzVd268M HulCKWhcnQDIH9OB0RWNhfzj1AyOei70jhOYbX5CK0yKU6nMetFpvhYHP6DIe4zzdID0 +/g7soWulLorVbbDIDIOJ6oRDRwf2JnojThMpkBRXT+K9HvJybrcllAJRrMNx+/xTZQ+ 0kuM2+D7obPQ8R0khkvJHBlCztGK3M7RNxI8duUmZ+7IojLwhQ126GWCTSOEhgxKtRVu 2z1g== X-Gm-Message-State: AO0yUKVjx+OE+LM7SAZmI6CJAF7TXPL9BO4ok0xHMoRjyKVF0dT43KZK puEqyzbJl7TCndahAjyYN0FdPsmxb+FFhw== X-Google-Smtp-Source: AK7set/RsY9qL4X/sU+9bp/skln0LQAOibwdkjzYTNsOkPsiW54+Mn/t3pfLMFIA3LKKPLvGeOvFY02pVy0bQQ== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a62:8645:0:b0:5d9:27a5:619e with SMTP id x66-20020a628645000000b005d927a5619emr3003526pfd.4.1677999080145; Sat, 04 Mar 2023 22:51:20 -0800 (PST) Date: Sat, 4 Mar 2023 22:51:11 -0800 In-Reply-To: <20230305065112.1932255-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20230305065112.1932255-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230305065112.1932255-3-jiaqiyan@google.com> Subject: [PATCH v10 2/3] mm/hwpoison: introduce copy_mc_highpage From: Jiaqi Yan To: kirill.shutemov@linux.intel.com, kirill@shutemov.name, shy828301@gmail.com, tongtiangen@huawei.com, tony.luck@intel.com, akpm@linux-foundation.org Cc: naoya.horiguchi@nec.com, linmiaohe@huawei.com, jiaqiyan@google.com, linux-mm@kvack.org, osalvador@suse.de, wangkefeng.wang@huawei.com X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: cryuxofq84nm8uewqn3j7xyi4p9seykr X-Rspamd-Queue-Id: 1C367A0008 X-HE-Tag: 1677999080-722444 X-HE-Meta: U2FsdGVkX180mxBHPoOa+Yxq/Al1iym/FnwpyD3k/hzSeZ09tHasKudgci/dsI1f+dyHEii4aBKLSwGJX4696ZHVMlO6WR3QfD1ZpPACqL4Mi0azLMdpngi36pmBoqhGyYW+BgV+9RK+EooVjzODWiXWgzsmNAfhos/SFNqB044N44FyJW+v95u+QYS7FDE8dOBdL+L7d583o2wY4U1EOKv3AiftWUikIA3xHzGRsn0/XYF1nDEtLdseDZIE/aU+/zQQ3frCU7XuTChsWiNDlwZLZyD+HDqslomzDTApdz4fiuK4TWaaAH+alrRC95vMnUD82WOFeWG8zucEPKA7Sbea0xPYTMth1Rq7qwI3WCUw270TsNuxBPJZN91FTeFaNmRXpQKrruApDmFT6GriE3OJp3xGPMhCTDFesI6SflIGk52hDAUUfkaBg1F4HiNr4yrzz0R5bw4yuBpiN2sY7Dj9docw9YWXPETCSp6YDMSu1sNreZ6RrWb8w+gd+ZJ3d8Cg0sYijEUw/0wT7h+xOS9HsJzpMeVJ10PWckFhEonPzo1pfNn/UNYlNET1IdKMFLtcDzNlYRxmD02+PFpV0/7RAPJj+h2wV4r7DTc46YwtJoXXQgJCDW+azOSZ5cgzJk7eTvS7SxcvOwJwSTuUD10UMiJ8IO7eAtEIrcHnPH5nGxNIykRledP2lC2hPrmhDkC9e5vCOPkVEIOJkDzYOUyUFyl7i/pgfP5eHFPyJXsBjOfpHBVTO3sWEhXj8CsVW1vtnGvGxpPbBGTdJokXb+5gnPafgd4MavBOuxpjWL8KXkWSFWBh7gG4BoDqkMpWNFaDTM4WYfiHXgKZC8dVI9q/Jn0/1vq3wue1r5pmT9UP4/yQvk1mzf94Dt1GOwTRU4Lf3eEJWYk6PJA4DnSGLozw6Er/BbEhzkCgLnsSNW8KYPFsif/AzlZas5KJnMeJrwuBhe8mwP7S4fRDN/E JDEnzlFa RXr0qy54eO4AAs7v2Z1FY50A+9YxcpVL0GPU+ZQFKZ73NmfAWGcO2Ug//uwtcGNfBULnLAZ1Hjq9H0e2EMXUxHlZB0mRlAQWhRWY+H4iDy4+Hwy/4G6ioTN9wuFSo/frrk1QJooCxX1iOZtdasbNfKQKXFE3zOzZkMVq1gvGMm09/lZ0Q747bawgZek6QAusG35sybMit7uhXOXC6RnrZEWhj2qsLNDWgYptJvcqnk0vWP1fygaUT3bstmQ9fBwJqdrcwEUDIigh6jz17vxsjCgjcdBCusVd27VM9yTW2RRKPGKUCJB8T/Ro+3BRbABwxlH6l2IGJZ6PMJKxpgky8V3mjGTSaBkIuG2CErzZvFHCYF5Sm98gjVuusQtr/HGa3xjJ+U5yYpXXX2TQv2KG20dKDUrWYmGlKABUpNOSvW6kVWEayJWR7svQPf+NgBnTrP+K/mYNAScTQhWAJiesqP34kT7TR9ixrGARvOSxGAVDFNC5jS2FnYarJx6AyzVLTWKDAKet2HuZX6wUN+519XaNpRFLRXdkENMwbpMUCr6yCNze8fCG2FpPG4NfRBJSA7z+Dyb4XKEfakthkEZ5R7IfIB5iUGqL7qTSWRWdrJnP7t921/9/lJMIKFDPFpM8RrARKnT2HKqWFY77Ivne8e5xfLrCnti8eNiEOMYt4xsYeeORr4hH4B/DtEg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Similar to how copy_mc_user_highpage is implemented for copy_user_highpage on #MC supported architecture, introduce the #MC handled version of copy_highpage. This helper has immediate usage when khugepaged wants to copy file-backed memory pages and tolerate #MC. Signed-off-by: Jiaqi Yan Reviewed-by: Yang Shi --- include/linux/highmem.h | 54 +++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 1128b7114931f..7cbecae39b3eb 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -315,7 +315,29 @@ static inline void copy_user_highpage(struct page *to, struct page *from, #endif +#ifndef __HAVE_ARCH_COPY_HIGHPAGE + +static inline void copy_highpage(struct page *to, struct page *from) +{ + char *vfrom, *vto; + + vfrom = kmap_local_page(from); + vto = kmap_local_page(to); + copy_page(vto, vfrom); + kmsan_copy_page_meta(to, from); + kunmap_local(vto); + kunmap_local(vfrom); +} + +#endif + #ifdef copy_mc_to_kernel +/* + * If architecture supports machine check exception handling, define the + * #MC versions of copy_user_highpage and copy_highpage. They copy a memory + * page with #MC in source page (@from) handled, and return the number + * of bytes not copied if there was a #MC, otherwise 0 for success. + */ static inline int copy_mc_user_highpage(struct page *to, struct page *from, unsigned long vaddr, struct vm_area_struct *vma) { @@ -332,29 +354,35 @@ static inline int copy_mc_user_highpage(struct page *to, struct page *from, return ret; } -#else -static inline int copy_mc_user_highpage(struct page *to, struct page *from, - unsigned long vaddr, struct vm_area_struct *vma) -{ - copy_user_highpage(to, from, vaddr, vma); - return 0; -} -#endif -#ifndef __HAVE_ARCH_COPY_HIGHPAGE - -static inline void copy_highpage(struct page *to, struct page *from) +static inline int copy_mc_highpage(struct page *to, struct page *from) { + unsigned long ret; char *vfrom, *vto; vfrom = kmap_local_page(from); vto = kmap_local_page(to); - copy_page(vto, vfrom); - kmsan_copy_page_meta(to, from); + ret = copy_mc_to_kernel(vto, vfrom, PAGE_SIZE); + if (!ret) + kmsan_copy_page_meta(to, from); kunmap_local(vto); kunmap_local(vfrom); + + return ret; +} +#else +static inline int copy_mc_user_highpage(struct page *to, struct page *from, + unsigned long vaddr, struct vm_area_struct *vma) +{ + copy_user_highpage(to, from, vaddr, vma); + return 0; } +static inline int copy_mc_highpage(struct page *to, struct page *from) +{ + copy_highpage(to, from); + return 0; +} #endif static inline void memcpy_page(struct page *dst_page, size_t dst_off, From patchwork Sun Mar 5 06:51:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13160067 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 DE66BC6FA8E for ; Sun, 5 Mar 2023 06:51:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7DAF96B0075; Sun, 5 Mar 2023 01:51:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 73D006B0078; Sun, 5 Mar 2023 01:51:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53F4C6B007B; Sun, 5 Mar 2023 01:51:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 3E53A6B0075 for ; Sun, 5 Mar 2023 01:51:25 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1A1E5A0920 for ; Sun, 5 Mar 2023 06:51:25 +0000 (UTC) X-FDA: 80533923330.19.FAE54C5 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by imf23.hostedemail.com (Postfix) with ESMTP id 2B27B140007 for ; Sun, 5 Mar 2023 06:51:22 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=A9NRA7LO; spf=pass (imf23.hostedemail.com: domain of 36jsEZAgKCJkCB3JBR3G9HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--jiaqiyan.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=36jsEZAgKCJkCB3JBR3G9HH9E7.5HFEBGNQ-FFDO35D.HK9@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=1677999083; 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=3Eup8McE/uaOExA8PBA3tRNDpt9b7T26XXk8FifqgTc=; b=pNpiTjtX7aWC5EJ24QFQ6xIn0UewJ5y9gY27qP6xoShffn4PbSlKcTRKCL/5NKLRozteRu 6NLFhZEBTDccnNsTOwKfeBvVn4D7cQ9xPRe7ItR9N2fTAOM+rxaMDQJoY2izJq0de6Q83/ 2q0hc+ZGglP4JzFq4pV+Cbb+TIqfbrk= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=A9NRA7LO; spf=pass (imf23.hostedemail.com: domain of 36jsEZAgKCJkCB3JBR3G9HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--jiaqiyan.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=36jsEZAgKCJkCB3JBR3G9HH9E7.5HFEBGNQ-FFDO35D.HK9@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677999083; a=rsa-sha256; cv=none; b=KEqa5T2fXezgZ1+Z7a6y2PRLyxhLwls8Y8RqLk9Tx8TUVYhAtt0aryVfgAVzazMXxV6w8b 4YW6UVhYIBWJraaLOBoZIavLfADKy6n1wfRSfTKM9h1NDDhJtSa7TBuaz9uUpRj07AP8EQ u5mFm0JaU1X+es3o02YWejbKdlpbDVk= Received: by mail-pf1-f201.google.com with SMTP id bw25-20020a056a00409900b005a9d0e66a7aso3617636pfb.5 for ; Sat, 04 Mar 2023 22:51:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677999082; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3Eup8McE/uaOExA8PBA3tRNDpt9b7T26XXk8FifqgTc=; b=A9NRA7LOzoqLYNfsOv5cw9awPZz7azqxpXnIXDD/71kPvs5ewSVvY5Nq7Fl8m8asSx ruKHBSjeSAIIz1RVZIShD8AlBHBS3W4zQBwEu/CvqiMOumiB3U/7Am/8/PRgf+LN8kFr euJJqtELjtWL1b+4+42GZv0VGU5xtLOWRw1MXisV+vmdb/tDQmPTGiqLtnv9f59jkxzA i2rSzGqSLI+tUn+bEZQsjE3YE5cTk7ygEnH2kLIqWkjzny57BiQoaaHOb8hALNy9+/2u F+B0FKAeuzG/prep2zTfldr0t2/clBEir+WcHhQBG5GQuNOm71I7ARraUJaATBjABe96 3CGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677999082; 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=3Eup8McE/uaOExA8PBA3tRNDpt9b7T26XXk8FifqgTc=; b=0zgzlpyOvb8heMYx1GoCpiMm4+mBLunzMUoJgy8kVwZ4jwQgyIoZqhzv5yDnMI+YZd Ot8GMzgoTjWZo8lc3VHQXTedDQB89M7nAbXj8G7xywVSpUgwTFz7u7axPAgFHB9aOgSu x5IzODEYGV9Zmztdvr43YU7mjojgENtbnFy5rLf0JEB0RvLCrBtToRo75vJ411i0k7EX xYa82CIriFRggyc3OpdY7ncC0guicsVVNl6lLeB9aVlL1J1BQslmaZYHxVCpefoOuRXN T8JlYGX7wzdyUypaeCcG3taurFF7WHXIPokZFLBJ+QU4t+Bwkksp+2ptnfc4TLDwGeS2 ftUg== X-Gm-Message-State: AO0yUKWQaUAQMz+pit+QNxqe9O7ebRf4GLT0vaSde26cdRV9o6rD/iaK eTNr3/7OAbJFNl8bMqWbNT1/MH4dnNRddQ== X-Google-Smtp-Source: AK7set+12/8VfWcI7PrGGvc1yiHksO8bMxQZJRk1joxSU0lmpLikkQGJa/yCK5rtiOsBNiaHt2SvKQ6bTXfrvg== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a63:f91d:0:b0:502:fd12:83ce with SMTP id h29-20020a63f91d000000b00502fd1283cemr2476574pgi.5.1677999082036; Sat, 04 Mar 2023 22:51:22 -0800 (PST) Date: Sat, 4 Mar 2023 22:51:12 -0800 In-Reply-To: <20230305065112.1932255-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20230305065112.1932255-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230305065112.1932255-4-jiaqiyan@google.com> Subject: [PATCH v10 3/3] 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, tony.luck@intel.com, akpm@linux-foundation.org Cc: naoya.horiguchi@nec.com, linmiaohe@huawei.com, jiaqiyan@google.com, linux-mm@kvack.org, osalvador@suse.de, wangkefeng.wang@huawei.com X-Stat-Signature: 8ccjmh3k9ijnd8bmau1hjn647qwh3xkf X-Rspam-User: X-Rspamd-Queue-Id: 2B27B140007 X-Rspamd-Server: rspam06 X-HE-Tag: 1677999082-152870 X-HE-Meta: U2FsdGVkX1/dXzbI6aVLOZVFXWjG2axOsD4z0SJ0xVaRL1iX66dZJ1Admd0CtsCVZepYI/KNrZuB7HIXotXNj3LRZ4MeYUooZFe5pP8SWNy60zsfCqvbFAxZ3SRyo8jkKuB/viec+7Ki+s5TEaVG98+3YTdsrD2CUmaOzqg5R640Kky5w2wRSD6GHOE2flghfnp++HsF3K/+gE3wvHyySgeiQoB+mYx9jSaO8OseUBj1LrQutqgTgASfg6NjPHq5HlPwDysB+3myq5UjE5ucPodFUN5bjEIL1GZxMhHezBNsiK5Kt5SH5tbrlXn6qZqVLM7uRpr8O9f/PaRRCTF57AaYFP5ecWAIAUkU5cowc/ouLiqNl1LO8ISPy/bxgeFfawCsj6zzTfNwWai6Gfzq2K/2S2O5Shh1kT3uQWhpSib9/dnNb9lLwoRFVgxO3tHlcYyl2VNRuOniB2yKVPM3BuCRNyBxsY194q1Yp6SUYGthgV/jMcI5pnucvmbi5q3xJrOXN5HksxLx3bUCHfOOOf4gYvoIwFL2kL56CZccsclWtNUZXO56Y/oHyHbfG+aHNSy4knQcLAuUrbkOnUt8OF3jhQY8doORpMsYWUOs2WmNuw3EYbh3OyrDqphRl6gBbNT6XLGzbWvmjopak0+eKt4/hxPBl8iHiHMzdPl9wVhVgRKQUVXd0RVZ/IDCs7VyqM8YiDTU4URID65WP/fdMjACADjsVUXIsCvJTda1t0dOkXnHM2digAtsDXYah2IdI2QQ3C83Jmkn9S9KHb+EDjAAK5vwftN612sVfjtCXM8ZGzFueUVX0mF1gnGPx07VHKEp1LFEPVyhjZNoseA6neRGK89mRAFIcsGen0prTCZtpp0fohqTmahFIQcSw8HfQyekhmYNktTQ0s8JTg/6+x8v4XEPaGZ9dAMETiYSjSPX/uuDzi5RmWv76ircY2nxuQ7vcs+SP+ry0XWr3Pp aUhEveWR GJ5+EdIz66JE/qRimHwEuO7D007dsWts5ReuxBpZH4qwzSWRGMUPXTlrVZCJgMGJWGgRr1roAq3FLbS++/cVJGx+kBExzOGJQctq7nwFeQOG2wlUQlmKC9LpFakSIZcylYaEn4J2ReErjA4/OpCFQzGiNe0MtRn6RZYguKxPu5WkJRJsckf1nnl8yGKajHWrYMEKFRvCFUz52Xezg1JT9RlPHqh60rtqRGQJrJrVWxoKuZdeyXmkwZlfEMq4pt2oXSmRvymMgPLD7G+/HHo4BTLi1vOp1EEr8oac71QFlL3BSTHRLCD7VFpsdoBO/cka+MDAuSlgCSFmE4NRLlOyjV0vnD6NDpmlY8fvxELqm5usb5Psci608lxPA2bYwN1UoqIVRQI23fRi1KVN41vy3OKUJVvDdTRDBOhrVHARmL6yBsuf50D/QJTRK7t6hzqmLMyjCeT9sHj+Fz/rDejAvvqxX3ni+kADIqCzbqegJdQBbMhB9SWgmWdkufmoxt2As2mJITKwxtgrfxHu1v7BXgEmFnJx7QdlystN1HyBNa6WFMkFoLgdYwFlT2XRbwZuG6UNJJNXTBNGtEjnY1YaIunW8LLZUWAFXli+ziwiRrQb7T42ZyPkrsbE20HPq3pjPhVY+Zh2DB6IhZxA= 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 threads to inspect their buffer contents and make sure no data corruption. Signed-off-by: Jiaqi Yan Reviewed-by: Yang Shi Acked-by: Hugh Dickins --- mm/khugepaged.c | 78 ++++++++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index c3c217f6ebc6e..3ea2aa55c2c52 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1890,6 +1890,9 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, { struct address_space *mapping = file->f_mapping; struct page *hpage; + struct page *page; + struct page *tmp; + struct folio *folio; pgoff_t index = 0, end = start + HPAGE_PMD_NR; LIST_HEAD(pagelist); XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER); @@ -1934,8 +1937,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); - struct folio *folio; + page = xas_next(&xas); VM_BUG_ON(index != xas.xa_index); if (is_shmem) { @@ -2117,10 +2119,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 @@ -2131,21 +2130,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: @@ -2158,21 +2146,35 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, try_to_unmap_flush(); if (result == SCAN_SUCCEED) { - struct page *page, *tmp; - struct folio *folio; - /* * 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_mc_highpage(hpage + (page->index % HPAGE_PMD_NR), + page) > 0) { + 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); @@ -2180,12 +2182,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); folio = page_folio(hpage); folio_mark_uptodate(folio); @@ -2203,8 +2216,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) { @@ -2238,6 +2249,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;