From patchwork Fri Dec 9 02:10:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13069137 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 CF307C001B2 for ; Fri, 9 Dec 2022 01:53:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 380D38E0005; Thu, 8 Dec 2022 20:53:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E1398E0001; Thu, 8 Dec 2022 20:53:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 181BA8E0005; Thu, 8 Dec 2022 20:53:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 070308E0001 for ; Thu, 8 Dec 2022 20:53:46 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DAE971410CA for ; Fri, 9 Dec 2022 01:53:45 +0000 (UTC) X-FDA: 80221096410.24.378EC32 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf14.hostedemail.com (Postfix) with ESMTP id 98DA410000D for ; Fri, 9 Dec 2022 01:53:43 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 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=1670550824; 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=dVqj/pLfI1Quj4499c9IaSQehTndRmqLV1l34UFeCbY=; b=uoKvxBFfMDZGMO2uEmH64x+TThPHnmWo5nDA3nvAQS0SN6v9WMkPCdTNoaTNzItBa9Sxci d3pwfaAYWEvb3x7Upa9cLA0TBo1WZxRTs3SuMz5K5r/quL7SReLXB7gk785Z6VJXTfXVQG ub7+f6gYCjN2Fu/zXKdWVUzPE0rx3rw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670550824; a=rsa-sha256; cv=none; b=7EprTC5yaYNjgQpfMTHgywNL7lIPI32Rz6s1QOLPSwwENyt9kPZqDUS9Jg/Mm3tRX9tk1H artgjkz5z8XA+++am+fGdDL5PzSl4+PUcnjrItg5gCMg6B2gic8mcAl6MQVD6jAuxwwAsA txB0Xblr9pF3d5xo9mxgxftCeTqXF24= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NSv8Q6DYWzqSyF; Fri, 9 Dec 2022 09:49:26 +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:53:38 +0800 From: Kefeng Wang To: , , CC: , , , Kefeng Wang Subject: [PATCH] mm: hwposion: support recovery from ksm_might_need_to_copy() Date: Fri, 9 Dec 2022 10:10:40 +0800 Message-ID: <20221209021041.192835-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: 98DA410000D X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 8ysqkxisw988ma848y4oxiys1h4w3hyz X-HE-Tag: 1670550823-535153 X-HE-Meta: U2FsdGVkX1/MAwu/sGooRp9wu9nkxk+kUUam4lsUJveqC8TkYaqkjVm30TYSQu6GWCoDqQ+Cy2vUMn/EI0yQUg3gsmOKc0eQYAjjm/8EgxDAejtfzE1IUeUtpHYnAm2/Wuhtcg8i3LYghmB0OeCKcWntByX8igtxviGv0l/UHaXvFUzo1RHfAogw9oxJkdpNmzTHBMCQbxXpp5tC/Anik4bD2M12lyMxVa+mPUr9sn/rLEthfdc9q5mR8boXg0As0TOGhxJuABvtr1ysLeElDcDcufCSmpKGAX4zFCfhhukpymgdcFw3bt8+LgCqXYc5mLvWmLMi9b6ITsFlHwwtLwVgDM4sMYEZGMDqp4o2Pk92tQnT1QHSrBI2st6pfl8YtbKCopL3vliY5yBkj8qYATA/AfJ2ykoB0vyrofHs92lJjWizDzacHRO8QDKRl5TsJMbP2EfsZ0LHPLboJ4cQqKMETJj7W6ibmDf/fdLQ0Fot2qiG10lJwdmTGi2drIUvrK9rrcG+p7OKuwZg24TL/s1HeRN3eJe+NRNum0SsrdIWQCi+wY+pAJokTJ5HMt2Ar56FMArPm5qKIW/GF01stQWumoDYNghqMr4MH/clb7kSuG/m9YwZl49JBp6P6SsvJJ1auKVLUvRLQvQ/SyAdAqlGYw66yDrdJmERXeWVQjDSLlRXqHYjQa6wsp254/7NdQZFopuKtqc5NvsEXydcin15JUPos9CaqMOs+lq3M5IKVY9Md7yUm0AUxnw9gwC+6FIrlf7rMioDCBDcYrNJWrl2u3G5nTK8hQEclP7fUANUC0rEsRHSs672jgmGz+BAulTG07+NUWf71vzmivRZ/B/VNr5lIDBhGvZ9X5KLbSHUgZW4fxxX0pbUymxdplLNNLVxCWSqgPSlfjLc9YCXSfNpiv7kJYSg 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, 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 f1e06b1d47f3..356e93b85287 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 2615fa615be4..bb7b35e42297 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 f670ffb7df7e..763ff6a8a576 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);