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: 32605 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2597649wrr; Mon, 12 Dec 2022 18:53:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf5F5hhYDaJD5s8m8dj+U1Jg5tZ3brSZeGJGuqJNYlv3uksH+j1sDxEj0XxJenPWuGOoPn8Y X-Received: by 2002:aa7:c651:0:b0:46c:edb5:afdf with SMTP id z17-20020aa7c651000000b0046cedb5afdfmr16599005edr.41.1670899994778; Mon, 12 Dec 2022 18:53:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670899994; cv=none; d=google.com; s=arc-20160816; b=G6kvV37c/ezkYOrEKLGQ0BAf+bg+5Zlg7PqbrSuayJ3D8rOgcwMwiWOqypZ+gmE7Xm oN51CVv0Ro2hlXvdWhd+4ELaQdL1y6QQOJraJpGzjAUbO4Nrj6V2pTVU0sm8A5WlkCcs OjUKMpmpJKxFLfzbceKj3yrDqvKWM9GUqp/CgkyZ3jalR75Yeybdps/SHPlsR281L47Q r43OJ2gEJBmPPbPcECZY1IhBTjCi0Z6JAsA0SyyK9dAAMMcLdF3zBFuA1DYVIRIQtItg Wk5WBIoC7kXkmBh4RY2AFdrucuFA0WtM5JxlTEeh9ZfSNNbg8KgSXfXWaAjpgQNLWlnN yt9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=mzilshgfW567ejOGTo6ukGkOTc/5TZkwT2QE96BTNSE=; b=tLtS/pzOaADAJ19Rbm+Oc3mNiDDG1fdsSxN01dr3+t7ynUOTMZcdvwZ9eYMlhBkeRD i0Viv9jHXUNds+cPcKLK6TFrSiL2A/d0++zx6F/8+KF+ryqeZ9jvQHqhG1I2bkIkMN7A /0UtBYDuyZJCot5mlW3Ze5zWbPd/k4f/RvahwtRsa/+Pf8ShvpWp4wOfZLNaQzE2JSTM p34XVtoyHRqZNO7kMD5wRMCZ+LX7632oO59a3wIxVsusGFYGh884isfVR1/G5bBNuuHu BU301FaWT8btClUKUXfOxMqMtpv/28J9ZKYsZ7ztiy64g0FzRm93PMkq3klK1AD+cqEG kGwA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f19-20020a0564021e9300b0046fdd119a47si3826112edf.145.2022.12.12.18.52.49; Mon, 12 Dec 2022 18:53:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234294AbiLMCtM (ORCPT + 99 others); Mon, 12 Dec 2022 21:49:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233798AbiLMCtL (ORCPT ); Mon, 12 Dec 2022 21:49:11 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65D1E1DA46 for ; Mon, 12 Dec 2022 18:49:09 -0800 (PST) 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752065632973114147?= X-GMAIL-MSGID: =?utf-8?q?1752065632973114147?= 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);