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 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 Content-Type: text/plain; charset="UTF-8" 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 -- 2.40.0.rc0.216.gc4246ad0f0-goog