From patchwork Mon Oct 10 16:01:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqi Yan X-Patchwork-Id: 13002707 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 4808AC433FE for ; Mon, 10 Oct 2022 16:02:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F4B66B0073; Mon, 10 Oct 2022 12:02:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97CE36B0074; Mon, 10 Oct 2022 12:02:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A91B8E0001; Mon, 10 Oct 2022 12:02:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 67B676B0073 for ; Mon, 10 Oct 2022 12:02:53 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 252911A0DE7 for ; Mon, 10 Oct 2022 16:02:53 +0000 (UTC) X-FDA: 80005508226.15.1BFC0E4 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf26.hostedemail.com (Postfix) with ESMTP id C31AB140028 for ; Mon, 10 Oct 2022 16:02:52 +0000 (UTC) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-355ae0f4d3dso109291057b3.14 for ; Mon, 10 Oct 2022 09:02:52 -0700 (PDT) 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=elSP1BMRn3v1BJCPhWvKQa5NEwJJzGL4SSbHLZRwz1Q=; b=e0fg1b0kPWGmZwjovBV5vXM2w2ln86DdIY7aJuuLjRuJoZEeFTgEEIDpwfBwnuXYvB CjCI+28iyp3VnBQY6U3OrO6CLVg366lsSCoNVzMn9wRcWdh20U6PXq0JSuv8E8SZYg2n 9RUepvtmo3asv63MbLbfLLKVdI/1pJda3P/qxW/xeWy7c3/C11m9UiX69a4kMq/LXd5h HHpN/3YVThwalp+V5WY9ftYw6aOglECKXSL7rPB+ma2iawXxiyMcdfq4Lzex6ggm7b4O /YrPYfvCTXAWqhB+FMyFfF449J6tuczgQF8Da2fn0qaW0AWzKB/ttcDNNiSeC6JDKouH V7kQ== 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=elSP1BMRn3v1BJCPhWvKQa5NEwJJzGL4SSbHLZRwz1Q=; b=ZD2usKf8rz75Ym8SMtXYCcXW3RRzh/Z9GTBWEAA2tDuAMvkHyBzChQwWsn6hdWKlV4 TAVkTpv8ofh7ixphuZVreDpC5bpsPuVR2i+60yhz0Iw+SGwfeTDELSPYRrin6X7VTZGF J4W9MlGoBUWLV5mJlh9mIM/dBMlihbl807ZPZRWkDm973ld2nSyrkh+2j9N4utv5TWtA B8GHRDLCT9KYiAAxJGrWz8iUctBcgCgfUQktPDGkZF5OASx+x8By24L/hzB2YN+slW+9 TUgwHsIC8mcc+qy7ik/3Zjq0dr8nqLlZGtVH8yx6s6TRP6HxpUur6tgDPZgd5xOAjmPx mmPA== X-Gm-Message-State: ACrzQf1hjneML2+8av9jqHjGefwy42FTPIyC25DGRRddwggc5trs+1hi YuBz/2bZxjOvGcNqe1jY2Uk1gROBvkAZOA== X-Google-Smtp-Source: AMsMyM4bs/rX7ab638VSI9xFQSKP9mvT4Z7puPbY8JDqw/BfN/P87JAyeGoJoguXtNGnEU3YvqpjX1ecf6U5MA== X-Received: from yjqkernel.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1837]) (user=jiaqiyan job=sendgmr) by 2002:a25:d258:0:b0:6c1:5908:a529 with SMTP id j85-20020a25d258000000b006c15908a529mr3380203ybg.478.1665417771917; Mon, 10 Oct 2022 09:02:51 -0700 (PDT) Date: Mon, 10 Oct 2022 09:01:41 -0700 In-Reply-To: <20221010160142.1087120-1-jiaqiyan@google.com> Mime-Version: 1.0 References: <20221010160142.1087120-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Message-ID: <20221010160142.1087120-2-jiaqiyan@google.com> Subject: [PATCH v5 1/2] mm/khugepaged: recover from poisoned anonymous memory From: Jiaqi Yan To: shy828301@gmail.com, tongtiangen@huawei.com Cc: tony.luck@intel.com, naoya.horiguchi@nec.com, kirill.shutemov@linux.intel.com, linmiaohe@huawei.com, linux-mm@kvack.org, akpm@linux-foundation.org, jiaqiyan@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1665417772; a=rsa-sha256; cv=none; b=OhoP7mUgLkGUhiD2t8tAQzjCETqimnzlit4l6Kg9aM/dr7CZWuNCqj7NlFW+N7WW9ENsx6 s081nBMTsjvQ/tVGW0f8T33OC/zAwk1Bni/AmiDTNFs4RGtnuMYB1Wp+XNaF4NVybLnBtw tvxFvTxTwcAf/1j86jx8yjSnxks6TdY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=e0fg1b0k; spf=pass (imf26.hostedemail.com: domain of 3K0JEYwgKCOALKCSKaCPIQQING.EQONKPWZ-OOMXCEM.QTI@flex--jiaqiyan.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3K0JEYwgKCOALKCSKaCPIQQING.EQONKPWZ-OOMXCEM.QTI@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=1665417772; 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=elSP1BMRn3v1BJCPhWvKQa5NEwJJzGL4SSbHLZRwz1Q=; b=xjyMipRE/NMOs9ZDqHX38QnFDl9wzsdVbG+J13dZvuH0dCrGFJri4xRlymAYBDFhoDy2K2 U30zUISH9cEY8QQjdkn3jN3QhawF8/xY21AWY/D0kg6Td65fs44lg+PU/8uIDz0j4L6Rm9 oZv2+yhD1k6TDRgh8btJzh8G6BajJuE= Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=e0fg1b0k; spf=pass (imf26.hostedemail.com: domain of 3K0JEYwgKCOALKCSKaCPIQQING.EQONKPWZ-OOMXCEM.QTI@flex--jiaqiyan.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3K0JEYwgKCOALKCSKaCPIQQING.EQONKPWZ-OOMXCEM.QTI@flex--jiaqiyan.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Stat-Signature: isoq6sehfcr66tnfy645rtrwrdmrkeai X-Rspamd-Queue-Id: C31AB140028 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1665417772-656011 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 collapsing/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 does the following to roll back the page table and page states: 1) re-establish the original PTEs-to-PMD connection. 2) release source pages back to their LRU list. Signed-off-by: Jiaqi Yan --- include/linux/highmem.h | 19 +++++ include/trace/events/huge_memory.h | 3 +- mm/khugepaged.c | 130 ++++++++++++++++++++++------- 3 files changed, 121 insertions(+), 31 deletions(-) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 25679035ca283..91a65bdabcb33 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -332,6 +332,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 d651f3437367d..756e991366639 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -33,7 +33,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 70b7ac66411c0..552e7cb4c8b42 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -51,6 +51,7 @@ enum scan_result { SCAN_CGROUP_CHARGE_FAIL, SCAN_TRUNCATED, SCAN_PAGE_HAS_PRIVATE, + SCAN_COPY_MC, }; #define CREATE_TRACE_POINTS @@ -673,44 +674,99 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, return 0; } -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; + /* + * 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) { + /* + * Copying failed, 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); + } + + 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. - */ - spin_lock(ptl); - ptep_clear(vma->vm_mm, address, _pte); - spin_unlock(ptl); + if (copy_succeeded) { + 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); - 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); + if (copy_succeeded) { + /* + * pte_ptl mostly unnecessary, but preempt + * has to be disabled to update the per-cpu + * stats inside page_remove_rmap(). + */ + 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); + } } } @@ -723,6 +779,8 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page, free_swap_cache(src_page); putback_lru_page(src_page); } + + return copy_succeeded; } static void khugepaged_alloc_sleep(void) @@ -1009,6 +1067,7 @@ static void collapse_huge_page(struct mm_struct *mm, struct vm_area_struct *vma; struct mmu_notifier_range range; gfp_t gfp; + bool copied = false; VM_BUG_ON(address & ~HPAGE_PMD_MASK); @@ -1121,9 +1180,13 @@ static void collapse_huge_page(struct mm_struct *mm, */ anon_vma_unlock_write(vma->anon_vma); - __collapse_huge_page_copy(pte, new_page, vma, address, pte_ptl, - &compound_pagelist); + copied = __collapse_huge_page_copy(pte, new_page, 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 @@ -2129,6 +2192,13 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, khugepaged_scan_file(mm, file, pgoff, hpage); fput(file); } else { + /* + * mmap_read_lock is + * 1) still held if scan failed; + * 2) released if scan succeeded. + * It is not affected by collapsing or copying + * operations. + */ ret = khugepaged_scan_pmd(mm, vma, khugepaged_scan.address, hpage);