From patchwork Tue Dec 13 03:05:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13071675 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 5DAACC4167B for ; Tue, 13 Dec 2022 02:49:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C3F468E0003; Mon, 12 Dec 2022 21:49:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF0CA8E0002; Mon, 12 Dec 2022 21:49:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB7118E0003; Mon, 12 Dec 2022 21:49:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9BA1B8E0002 for ; Mon, 12 Dec 2022 21:49:16 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5CAB01A08A0 for ; Tue, 13 Dec 2022 02:49:16 +0000 (UTC) X-FDA: 80235751512.08.E6109E1 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf11.hostedemail.com (Postfix) with ESMTP id C54A540003 for ; Tue, 13 Dec 2022 02:49:12 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670899754; 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:content-transfer-encoding:in-reply-to: references; bh=mzilshgfW567ejOGTo6ukGkOTc/5TZkwT2QE96BTNSE=; b=xFdsi+q1YXLUkEDb4B5q4zSS9KWjEiatrqpGvTBNSXWgkNsylVbWd7B/EX6uCSItoFSyq+ IkMbVwOZUzGehtKyzi6nsSG1GSw1LeMuhl4/S3JGXPu7lr1/bUpZpj7ZOvIOXF+0m2hQL9 Jk8kSVqq5UjNFUROyIvUYhimIOla8bU= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670899754; a=rsa-sha256; cv=none; b=daPlgCjrtQr86I3NXKIiSdUDGDdCeMNdc862Ca3zHSbA0rLa1LWhRvzjMTPso2gmAtRcnA 78lkcAh+gH3QEj5Ow0twC6NHB3IrB9qFVdoyOv6aGi4OuLL32Dbx0vQ9uYTvHe656ezRFx xWyTi7qdpefSKMATIeEUEyC/0aFgHOI= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NWNGJ4J12zRpt2; Tue, 13 Dec 2022 10:48:08 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 13 Dec 2022 10:49:07 +0800 From: Kefeng Wang To: , , CC: , , , David Hildenbrand , Kefeng Wang Subject: [PATCH -next v3] mm: hwposion: support recovery from ksm_might_need_to_copy() Date: Tue, 13 Dec 2022 11:05:57 +0800 Message-ID: <20221213030557.143432-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: C54A540003 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: jxrid5fert7pr9ib8ynuy71dwzqoh8ns X-HE-Tag: 1670899752-621527 X-HE-Meta: U2FsdGVkX18eL2fj9asDzAqB6tzeX0boV8VqXYI078X0oR5+jbwK+TgpNYB0ADEZBVnGNYydN81dcTbLsxs1RolE2zXXBlOr/Q5bmQIebq52ygrrcz9Sr+GHpzjN5qZ0Zv+aSxZsouZV2If/gkuxN/jKEDV+QZGIt+o4iOEpc41auEkYPY84ttljdJof7aJDVv7cB+vWgiPFEzDYZajx2UjJ8mrtjpIsPkdnzBwW3rw5zSyGuS/2wMM9Ons3VwmjP90MNi6/l8GUUzZPE0RrxrDVVWXvei+TLfEVjAZHyqFe1TJpW1XaBmv0sDAn22Ow6w/3IbWD2DO3BmTKzxcATHWyPJ8pOxHGpv7Jby6jSM4XNuQ8iFoYdpsFf5zusmJXlkZED3rQEnM7RX4FjFuE8xoyZveZyO/ICSkxgsmCnPaauq3VoM9nS2hozz7G+emkdtmsoELUMllmq86q6+8pkLXiXsX/5DoWUOf46lgl9brSj1UPOK/aa9ocG/Dx8QCwTwIdj09Tld6r0K5iKDuPQLY6Inga7+HRu98LaWG7UoZHgCOq7qMrcryLVIibBU/TLDNXEqayasfGQyK9SuwgYRrERQKAdXuCrGGtnKZ5+LPZxIyoT43wXZh1DGbExu202XRn7g8K2pIhoirGaffGr1Kn5AF7rTZmvRDl1yWkdZIs4zDS0Ye6eKWEXzcqzERJuiaxSq32JN5xIUXEPJuxwvr85ecO4DyQFeccvOEr9HFOExSUolwr5MmDMaQXgGklwJIqmkr/5WpaL9Ep54MVjj/gNN8vgafwKQtko02blquSiaxpZwMK9n97T0FoIrxZvMLCUyqDEl6G26Uw5V8hKhOfapwOFATt2robvhTmkRqTxqHtsg/6u84i1m4SpM98fKo7bGlN4cqSR8NNpH/6p4DzPQpkTsPe 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: When the kernel copy a page from ksm_might_need_to_copy(), but runs into an uncorrectable error, it will crash since poisoned page is consumed by kernel, this is similar to Copy-on-write poison recovery, When an error is detected during the page copy, return VM_FAULT_HWPOISON in do_swap_page(), and install a hwpoison entry in unuse_pte() when swapoff, which help us to avoid system crash. Note, memory failure on a KSM page will be skipped, but still call memory_failure_queue() to be consistent with general memory failure process. Signed-off-by: Kefeng Wang --- mm/ksm.c | 8 ++++++-- mm/memory.c | 3 +++ mm/swapfile.c | 19 +++++++++++++------ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index dd02780c387f..83e2f74ae7da 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2629,8 +2629,12 @@ struct page *ksm_might_need_to_copy(struct page *page, new_page = NULL; } if (new_page) { - copy_user_highpage(new_page, page, address, vma); - + if (copy_mc_user_highpage(new_page, page, address, vma)) { + put_page(new_page); + new_page = ERR_PTR(-EHWPOISON); + memory_failure_queue(page_to_pfn(page), 0); + return new_page; + } SetPageDirty(new_page); __SetPageUptodate(new_page); __SetPageLocked(new_page); diff --git a/mm/memory.c b/mm/memory.c index aad226daf41b..5b2c137dfb2a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3840,6 +3840,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (unlikely(!page)) { ret = VM_FAULT_OOM; goto out_page; + } else if (unlikely(PTR_ERR(page) == -EHWPOISON)) { + ret = VM_FAULT_HWPOISON; + goto out_page; } folio = page_folio(page); diff --git a/mm/swapfile.c b/mm/swapfile.c index 908a529bca12..06aaca111233 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1763,12 +1763,15 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, struct page *swapcache; spinlock_t *ptl; pte_t *pte, new_pte; + bool hwposioned = false; int ret = 1; swapcache = page; page = ksm_might_need_to_copy(page, vma, addr); if (unlikely(!page)) return -ENOMEM; + else if (unlikely(PTR_ERR(page) == -EHWPOISON)) + hwposioned = true; pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl); if (unlikely(!pte_same_as_swp(*pte, swp_entry_to_pte(entry)))) { @@ -1776,13 +1779,17 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, goto out; } - if (unlikely(!PageUptodate(page))) { - pte_t pteval; + if (hwposioned || !PageUptodate(page)) { + swp_entry_t swp_entry; dec_mm_counter(vma->vm_mm, MM_SWAPENTS); - pteval = swp_entry_to_pte(make_swapin_error_entry()); - set_pte_at(vma->vm_mm, addr, pte, pteval); - swap_free(entry); + if (hwposioned) { + swp_entry = make_hwpoison_entry(swapcache); + page = swapcache; + } else { + swp_entry = make_swapin_error_entry(); + } + new_pte = swp_entry_to_pte(swp_entry); ret = 0; goto out; } @@ -1816,9 +1823,9 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, new_pte = pte_mksoft_dirty(new_pte); if (pte_swp_uffd_wp(*pte)) new_pte = pte_mkuffd_wp(new_pte); +out: set_pte_at(vma->vm_mm, addr, pte, new_pte); swap_free(entry); -out: pte_unmap_unlock(pte, ptl); if (page != swapcache) { unlock_page(page);