From patchwork Fri Dec 9 02:15:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 31593 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp530779wrr; Thu, 8 Dec 2022 18:00:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf5TyChONbQzF9LtoawgTP4dAE9I1rjwiNVjRjw/Q/UuACaE/5K7cvdKKDKbSMcaBzSXTKi/ X-Received: by 2002:a17:907:cf88:b0:7b9:f909:842 with SMTP id ux8-20020a170907cf8800b007b9f9090842mr3323801ejc.56.1670551240655; Thu, 08 Dec 2022 18:00:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670551240; cv=none; d=google.com; s=arc-20160816; b=kawoCn+7c/eTCVpQ92CVWaD803eUmdW7BUMoyhFbzLgtaSK0oOaan8r53O2RDHtElK uqBLWwr2BUNvP6YkewUKzSHr2SSFnNxTfd2DjYAYvj3K5d3pLGsrcXaz3hbod4bJEHy2 M/B2qQE7BHna4Aof762KVB4QtUHjVIvnomKR4nX/gE8IFMnQm5diQxjim8ibfBcJctus SBK7dnrtabsOZBBXu4z6Bnjwi/9dW+kEyGkYn+NOmLYXLpwUi1efaMt03icu8phwbQPL 0UTWIu4+X8iQ7sjP5+6M8SrZ/iTx6OR1FlE6UMCzoUaBu0umdpSYDbChes4gwVne5d/w NQFA== 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=wRn8+K1jmHpHnjnGO5QxMycdKELXRREIJsOUZlU+X+Y=; b=0p81ergFcPwORzGKGOBK1Hsp60W3bWelAuX7jKxqs5wMihpJXa8YZLfkA99/yJsH1J 1z9chib8nFkjXIyAfCSCc02Pit9p1ZalNRD+wCn6iXYfnRPWc3pdpV5RO5CU6xEI8joI u04RWzQRkP1T+8Pp4xBI4zsRVGUdld3W6JOu4KWvD+T8wLRv5Mx3XQyWJwLnIXKBt8kX I5c2TtufL/tYDgWhOVO49mRLRJJT/8bNslhgbSz3Gtnk9WmBFPfemoOdvHtzkKPIPiII m4mLeWqI+jt9ulKBGl62WQCDiaoJp1fY6CYfJYat2Whcg/Zca3/vpbQjSIJkuYp/9aW9 4bVg== 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 hs28-20020a1709073e9c00b0078df3bd80b9si113126ejc.46.2022.12.08.18.00.12; Thu, 08 Dec 2022 18:00:40 -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 S229676AbiLIB7D (ORCPT + 99 others); Thu, 8 Dec 2022 20:59:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230098AbiLIB6o (ORCPT ); Thu, 8 Dec 2022 20:58:44 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AED826ABE for ; Thu, 8 Dec 2022 17:58:38 -0800 (PST) Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NSvL2591vzJqNd; Fri, 9 Dec 2022 09:57:46 +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.31; Fri, 9 Dec 2022 09:58:36 +0800 From: Kefeng Wang To: , , CC: , , , Kefeng Wang Subject: [PATCH -next resend] mm: hwposion: support recovery from ksm_might_need_to_copy() Date: Fri, 9 Dec 2022 10:15:25 +0800 Message-ID: <20221209021525.196276-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?1751699711580564857?= X-GMAIL-MSGID: =?utf-8?q?1751699937686692109?= 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, 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 | 2 +- 3 files changed, 10 insertions(+), 3 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..8711488f5305 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; + } els 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..d479811bc311 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1767,7 +1767,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, swapcache = page; page = ksm_might_need_to_copy(page, vma, addr); - if (unlikely(!page)) + if (IS_ERR_OR_NULL(page)) return -ENOMEM; pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);