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;