From patchwork Mon Dec 5 23:40:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13065209 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 9017AC4708C for ; Mon, 5 Dec 2022 23:41:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D3DF8E0003; Mon, 5 Dec 2022 18:41:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0479A8E0001; Mon, 5 Dec 2022 18:41:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCCB08E0003; Mon, 5 Dec 2022 18:41:07 -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 CACB48E0001 for ; Mon, 5 Dec 2022 18:41:07 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9B762120A98 for ; Mon, 5 Dec 2022 23:41:07 +0000 (UTC) X-FDA: 80209875774.16.D97C2F8 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by imf18.hostedemail.com (Postfix) with ESMTP id 296F01C000B for ; Mon, 5 Dec 2022 23:41:06 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=r8modzlR; spf=pass (imf18.hostedemail.com: domain of 3koGOYwgKCPEcbTjbrTgZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--jiaqiyan.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3koGOYwgKCPEcbTjbrTgZhhZeX.Vhfebgnq-ffdoTVd.hkZ@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=1670283667; 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=vRWS+f0q1YyM43z4bnTfBskYUy71sYwc6j5zfGqtdaI=; b=hccYLlyK/cXFlJX1UhTA/UfmzgjDBIJtoITi2+YXLkRS/Nnkw+oyHp0iU8xok66PCn6/ex xWhEWwMunn/AHFWRbHLglX64KNuYGAvHc+OLvyAERB6DAELg58/e/RxoFbdCYpsIWcb+yu VHccKFVvqq4W3hW/u8Rw1iidAYHOuuk= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=r8modzlR; spf=pass (imf18.hostedemail.com: domain of 3koGOYwgKCPEcbTjbrTgZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--jiaqiyan.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3koGOYwgKCPEcbTjbrTgZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670283667; a=rsa-sha256; cv=none; b=03H1UBFsjz8vzVT69WSbBsnz6oEeeOVj/JIgfIWiArzWchVq5Ct9bLZBO6RGMLg6F6nKi6 61lTn08NZ/dRsoTuVjagLsRgwyiI+AaEM/Z3EnMKwN2s/S34j8mYiver2dwWB4x+lUtkXE MIyP639ZIqO4RuEzHeChuoYUcnuYsnw= Received: by mail-pf1-f202.google.com with SMTP id a18-20020a62bd12000000b0056e7b61ec78so11831506pff.17 for ; Mon, 05 Dec 2022 15:41:06 -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=vRWS+f0q1YyM43z4bnTfBskYUy71sYwc6j5zfGqtdaI=; b=r8modzlRLTSNW0LQWtkmsXp/EZvanOAalZIiWW0I7tkBo1vmg/biFmBdEsY1D0Yb5g NaohTSebT4d8Clk2vgSgH73zcclqsC+mxMbR6TXI+LDuLLdlrMDLJJSuQ7ZK+uU4FtGQ u7ndww/JkFym0nLhUK5QIzVZf0VzWGV/LBROjKm4RWSKonzEh9BCamUYkGFUeS+XNGDn cGdbXMxDF2XwBcXIYRW8IZlka4CNi8sqI/1fXdNpa/ZvGxanP8hproPSjSrgWt3kfa53 h34XkQ+SWhqNrx6dnEtcpnuVSOfaqjsr670I5zUIwiSZNzfRZFxUFzrNg1PuiJavmaLj KiCA== 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=vRWS+f0q1YyM43z4bnTfBskYUy71sYwc6j5zfGqtdaI=; b=fjHoSE5t1cnUXnpRAUDeLrIe2cnyF/6woy9N3yDaWQv3ExrZyO1kVtglQODFv/d+VJ rw0qVX3r7UINrc26vAVFHFEAO0njI8voL3InwoIMDnHH1VzR+OUE5eZA9pZDlC2XdmxK f4HhawNr7viTnSrSFHnQN/wwt9YBrII9do7USN+HN7/i6e6CxoXpThPIVeAyaZPpWev7 rvDrWl+0+oJjKL3TNS7U+E1GmOSYSi4wO7u/4JDMbya6tKS2vQZ81q1JlNqgWGzdflba NG2tIp6KkxgEuqNHVcuMrdkfRDN5egfPMA8mWk1CQV+NIhgqBHX5OCwZ+gxdr6JKGtPP suTw== X-Gm-Message-State: ANoB5plk0Js04EKwvfpiQzI8pA06pSLpgET1PzQclRt7DQFBBep+0obx OsjqSCHbQEXj2lYcO9ur6D24EbgCXvZqyg== X-Google-Smtp-Source: AA0mqf5u4g3SVwE1I+b3XUfGMO0TmmPsMYh4ig9cDxlomG1tFaiVbRts6dQBKlH94X9iDd+3p5Trw2oSEnNpSw== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a17:903:452:b0:189:6574:7ac2 with SMTP id iw18-20020a170903045200b0018965747ac2mr53926679plb.65.1670283666251; Mon, 05 Dec 2022 15:41:06 -0800 (PST) Date: Mon, 5 Dec 2022 15:40:58 -0800 In-Reply-To: <20221205234059.42971-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20221205234059.42971-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Message-ID: <20221205234059.42971-2-jiaqiyan@google.com> Subject: [PATCH v9 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, tony.luck@intel.com, akpm@linux-foundation.org, wangkefeng.wang@huawei.com Cc: naoya.horiguchi@nec.com, linmiaohe@huawei.com, jiaqiyan@google.com, linux-mm@kvack.org, osalvador@suse.de X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 296F01C000B X-Stat-Signature: 8bhqkp1jorhosfpmttuz6zic4jufj4y6 X-Spamd-Result: default: False [-1.10 / 9.00]; BAYES_HAM(-6.00)[100.00%]; SORBS_IRL_BL(3.00)[209.85.210.202:from]; MID_CONTAINS_FROM(1.00)[]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jiaqiyan@google.com,3koGOYwgKCPEcbTjbrTgZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--jiaqiyan.bounces.google.com]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; TO_DN_NONE(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17:c]; R_DKIM_ALLOW(0.00)[google.com:s=20210112]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; RCPT_COUNT_TWELVE(0.00)[12]; DKIM_TRACE(0.00)[google.com:+]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; DMARC_POLICY_ALLOW(0.00)[google.com,reject]; FROM_NEQ_ENVFROM(0.00)[jiaqiyan@google.com,3koGOYwgKCPEcbTjbrTgZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--jiaqiyan.bounces.google.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[] X-Rspam-User: X-HE-Tag: 1670283666-260903 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 | 179 ++++++++++++++++++++++------- 2 files changed, 139 insertions(+), 43 deletions(-) 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 5a7d2d5093f9c..0f1b9e05e17ec 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 @@ -530,6 +532,27 @@ static bool is_refcount_suitable(struct page *page) return page_count(page) == expected_refcount; } +/* + * Copies memory with #MC in source page (@from) handled. Returns number + * of bytes not copied if there was an exception; otherwise 0 for success. + * Note handling #MC requires arch opt-in. + */ +static int copy_mc_page(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); + if (ret == 0) + kmsan_copy_page_meta(to, from); + kunmap_local(vto); + kunmap_local(vfrom); + + return ret; +} + static int __collapse_huge_page_isolate(struct vm_area_struct *vma, unsigned long address, pte_t *pte, @@ -670,56 +693,124 @@ 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. Cleans up the normal pages if copying succeeds; + * otherwise restores the original page table and releases isolated normal 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 + * @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 int __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; + int result = SCAN_SUCCEED; - 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_mc_page(page, src_page) > 0) { + result = SCAN_COPY_MC; + break; + } + } + } + + if (likely(result == SCAN_SUCCEED)) { + 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); + } + } + 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); } - } 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); + 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 result; } static void khugepaged_alloc_sleep(void) @@ -1079,9 +1170,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 Mon Dec 5 23:40:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13065210 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 457FDC47089 for ; Mon, 5 Dec 2022 23:41:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B82D78E0005; Mon, 5 Dec 2022 18:41:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B0C778E0001; Mon, 5 Dec 2022 18:41:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 987148E0005; Mon, 5 Dec 2022 18:41:09 -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 8A6FB8E0001 for ; Mon, 5 Dec 2022 18:41:09 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5FAA0A02B1 for ; Mon, 5 Dec 2022 23:41:09 +0000 (UTC) X-FDA: 80209875858.01.27A40BE Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf09.hostedemail.com (Postfix) with ESMTP id DB499140003 for ; Mon, 5 Dec 2022 23:41:08 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="LcwPIl3/"; spf=pass (imf09.hostedemail.com: domain of 3k4GOYwgKCPIdcUkcsUhaiiafY.Wigfchor-ggepUWe.ila@flex--jiaqiyan.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3k4GOYwgKCPIdcUkcsUhaiiafY.Wigfchor-ggepUWe.ila@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=1670283668; 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=gHOBwiJOxhTrk3ftzvwEAkUpw0oCoMleHlgjjJER/jc=; b=NkylUrXbLmuRT9oBXNAeLSdm6y1AQjE6d2ZHvtRUn3tRy9pYjZijN5VsUJZqCvPHjjEw1I 4hS5jpyueMQK0PG6OoDQM44HqssaWt1zkzLm/JDTJoWSB6xESxRD9xdVCoEL4UMcqe9tJS VAKfz+/2PrtRgQyK8Ghn39lqJ9ELPGI= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="LcwPIl3/"; spf=pass (imf09.hostedemail.com: domain of 3k4GOYwgKCPIdcUkcsUhaiiafY.Wigfchor-ggepUWe.ila@flex--jiaqiyan.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3k4GOYwgKCPIdcUkcsUhaiiafY.Wigfchor-ggepUWe.ila@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670283668; a=rsa-sha256; cv=none; b=3BPxwLfA02tN5QUIswfJeW8eqlsbySeDYYNHN1lUJVjcJ3VMSSEvw0Y0RCQudaMqqjJ2Mg YjaDZLluSyoFJ5qAw6dE7/s3nVXoaGAugxExpm/uPSdSvLC+AxdZNnOzJDuagX4U5sNaPF +uDmwokkq4PMjppQqnye3dSlX/bcVC8= Received: by mail-pj1-f73.google.com with SMTP id oj5-20020a17090b4d8500b00219e1abad17so2725879pjb.1 for ; Mon, 05 Dec 2022 15:41:08 -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=gHOBwiJOxhTrk3ftzvwEAkUpw0oCoMleHlgjjJER/jc=; b=LcwPIl3/NHtlyvaw9AE2mGweYReib9D31gIan6cYe1NNJ4lgdyNflSyIkX7WqivGVL ag/KSYjUMUJi1ll1MtZ9suXy8UOvMNFCLBPPB7Dd/CdL53wX7OkSuPZLaBJTDjWTdcji 9eLqfhtf+5xEPcAwyy2rVR3jWTclwsRcrcpWDiBNOcOra+ioRNMm/3t8aX4G1ZqPhJYc cdqOOPbf7tzA7t6KrUd1PIlfzXlX0PUXtWU5KeZ/k0cdr3nEbOqxS5lRTjw5EW7ZOwXA c3Mvwna6pvRgTbfYCnmAWMqoNdtO3vNaNKjs6QwA9hi9lwe3Y7BrCw6LOSAuFs/MSTGi 5NBQ== 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=gHOBwiJOxhTrk3ftzvwEAkUpw0oCoMleHlgjjJER/jc=; b=EgDGoUwFiar4MYdzN7J864WO15NOyp3x1Vvs0PqZfFPiUaT+G/0sYF3byC7BR8eE13 TlTpZJmh11oZt4Jmp8VOoSJb85RV771iSQftZO4B/LEYWtQrL19Xb8E3plBJgGX1DTDk vIbNJ1qPshmd+ZRFq/UHhl2THyY/ryaoP56erEhg0oDnLO1OunPgOHpJPdFwBMlW5bXJ ws4wL3I30yR3NAju3SuM0rpYpixp0oqgTj1ohA/7AhXhC7RGxJA4Gshl/2yFmuT82Q1X 8zbMXMVLj6xVDP3R6F0TH5C2CGo6Q0/L0MtDpMFPYqItoi7xrXimOFZRBqe2UjXbuRcL uXhg== X-Gm-Message-State: ANoB5pnGam0rfTtXHnE/olYi1kHPkAj/3ocYSRT1wj9TzT78ZuTHmA2z wtlcT2DJ9Tia1feuU/2Hlyi+cTo/aRPVZg== X-Google-Smtp-Source: AA0mqf7R40azKQ2QRj7dZGpPiMfaYWu+wfwG9BfO5lyzdbh7Ik6YiOL+UP6YFF/f0Z8cUYRkT2Sd+yy95ZFIcw== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a62:1c49:0:b0:575:b4c0:f664 with SMTP id c70-20020a621c49000000b00575b4c0f664mr30697314pfc.56.1670283667982; Mon, 05 Dec 2022 15:41:07 -0800 (PST) Date: Mon, 5 Dec 2022 15:40:59 -0800 In-Reply-To: <20221205234059.42971-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20221205234059.42971-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Message-ID: <20221205234059.42971-3-jiaqiyan@google.com> Subject: [PATCH v9 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, tony.luck@intel.com, akpm@linux-foundation.org, wangkefeng.wang@huawei.com Cc: naoya.horiguchi@nec.com, linmiaohe@huawei.com, jiaqiyan@google.com, linux-mm@kvack.org, osalvador@suse.de X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: DB499140003 X-Stat-Signature: 3go6izfu4c66ey5fne3d6kis5wi7yubj X-Spamd-Result: default: False [2.44 / 9.00]; SORBS_IRL_BL(3.00)[209.85.216.73:from]; BAYES_HAM(-2.46)[89.43%]; MID_CONTAINS_FROM(1.00)[]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jiaqiyan@google.com,3k4GOYwgKCPIdcUkcsUhaiiafY.Wigfchor-ggepUWe.ila@flex--jiaqiyan.bounces.google.com]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; TO_DN_NONE(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17:c]; R_DKIM_ALLOW(0.00)[google.com:s=20210112]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; RCPT_COUNT_TWELVE(0.00)[12]; DKIM_TRACE(0.00)[google.com:+]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; DMARC_POLICY_ALLOW(0.00)[google.com,reject]; FROM_NEQ_ENVFROM(0.00)[jiaqiyan@google.com,3k4GOYwgKCPIdcUkcsUhaiiafY.Wigfchor-ggepUWe.ila@flex--jiaqiyan.bounces.google.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[] X-Rspam-User: X-HE-Tag: 1670283668-998056 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 Acked-by: Kirill A. Shutemov --- mm/khugepaged.c | 78 ++++++++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 0f1b9e05e17ec..ce68e76c1f0f2 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1839,6 +1839,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); @@ -1883,8 +1886,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) { @@ -2066,10 +2068,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 @@ -2080,21 +2079,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: @@ -2107,21 +2095,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_page(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); @@ -2129,12 +2131,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); @@ -2152,8 +2165,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) { @@ -2187,6 +2198,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;