From patchwork Mon May 8 01:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tong Tiangen X-Patchwork-Id: 13233996 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 B36A3C7EE22 for ; Mon, 8 May 2023 01:45:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E7FCD6B0081; Sun, 7 May 2023 21:45:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CA5166B0082; Sun, 7 May 2023 21:45:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6C4E6B0083; Sun, 7 May 2023 21:45:05 -0400 (EDT) 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 A5F7E6B0081 for ; Sun, 7 May 2023 21:45:05 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7A9E91A06A3 for ; Mon, 8 May 2023 01:45:05 +0000 (UTC) X-FDA: 80765394570.05.EA34B41 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf28.hostedemail.com (Postfix) with ESMTP id D18A9C0003 for ; Mon, 8 May 2023 01:45:02 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf28.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683510303; 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:in-reply-to:references:references; bh=dDxjDtgyFwFbxUTgZqlBdm7TmtNwdDEKJzeF52MA/B8=; b=MDBYnPFZdqnemZznyDr/8OXALL6cJacKZfcjwoh8aiqmK15J3Kq7JJfCMqPSkXkgZe68wQ Y3bqyCwSfHAheyIwcuyJ0eZUDs518xXKOqFwjdurh9nCBGFUMWRo1FEOHpgw5SWdnKSIqX vyivraRkVciCT3KIs0ewkBsNBV9MoXM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf28.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683510303; a=rsa-sha256; cv=none; b=rn0Rfm/UFUYNGIIAuMbovMQchDMqPQtlSZbU5k0x2fj+K++TmHEBjDTW42eKN96a/NC+kJ Ph+2Zf9t58Rdgz+HbUqpgXCs9IH+XwtLE4rhfPcjxOkX5Np5yYRg4/Kp73p7XvQHxiuC6Z J0aDr/cbAr+IdTG6G1MqSTYhv9em08k= Received: from kwepemm600017.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QF3tp09PtzLnwc; Mon, 8 May 2023 09:42:09 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600017.china.huawei.com (7.193.23.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 8 May 2023 09:44:57 +0800 From: Tong Tiangen To: Catalin Marinas , Mark Rutland , James Morse , Andrew Morton , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Robin Murphy , Dave Hansen , Will Deacon , Alexander Viro , , "H . Peter Anvin" CC: , , , Kefeng Wang , Guohanjun , Xie XiuQi , Tong Tiangen Subject: [PATCH -next v9 4/5] mm/hwpoison: return -EFAULT when copy fail in copy_mc_[user]_highpage() Date: Mon, 8 May 2023 09:44:35 +0800 Message-ID: <20230508014436.198717-5-tongtiangen@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230508014436.198717-1-tongtiangen@huawei.com> References: <20230508014436.198717-1-tongtiangen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600017.china.huawei.com (7.193.23.234) X-CFilter-Loop: Reflected X-Stat-Signature: 3kghfqxdmaf9gq8ss4w1s9s9t7w4itm6 X-Rspam-User: X-Rspamd-Queue-Id: D18A9C0003 X-Rspamd-Server: rspam07 X-HE-Tag: 1683510302-10507 X-HE-Meta: U2FsdGVkX18XPFMDufBFnszVD9tBcaB/AK0NJ6CmW8OwChcBnPo/2nQwYcO0Mh1PVdf8IP1ybXuAMHVSW8unop9pzBonLYxVNpg0HKhfr8vtHup/XkuXg9z3UuUFv5gUvsHUbQXzyNirZR0ta6SWsdfk6qmMsFejLfj5SkXd/6cN/9SH+4wlJzkd7y7j8SrJSObkgUGaWaJeoVhmBHuIWng/He/A9dOUss7uNk4vHqpQUWt7KpxSDwpdApvhfQZnx+QZLnNiEdk+qxT4JXpaB31MQbSTv/6GJf89uU1yTNbFQFYcgR9QnF2ace4/YhX6SAyoJGuKDBaLw7Yn18okjWPD3SAKrwq/Nq9q/iqaP+m4sgCgkXcW8OqyCBSmoEblOeBK+l0WraJg8rW4dgwFQSKs5xOKT2UAo+5SkBeYgfIGD2Wl6FyRT58DBTzREyoUqVcT4ty9rnKi6TovmQutfSGKjDb3j/MIomJvjjsPTTgFiStlzeBGsJfbAZdpw0bqlScJ6hOBnI5gD+t4KfA/WRywE0Pqhn4pQC1Su/zSS60uKY/PJK2UGA+jKQ2Maz/zddsZd2DTahV5TiTSDPxsjfj4iUCuFT8pTRY7hToyvc2f5v0DpRD5wrxv0aHT4f17l/JfpnJY8pFQV/aLM8YUqFWQw+rwSLoWCwYeU+HW9qJhUQcPCSrbH+ngpUdUXaCSHRNanRxTMrmEapmn6HczZEtMGIzMYqGrhZ9mleEZ6ctDCkDalZRFAbE6SsF1GZXqsO7yLD366Rx8X5uwINIjXfz5+1SZBcESNthxuqSg8mqZQ2EqxfeqeeKW8B/QVB4fXH2Xo1oa93M1e6gFqizy7+mmSJoozqRV88MivJXcYVrA4EQ21MbVsXpfeC/wsdbpO2joY3o3J3W2sqLE0D3oiHct0Z+CkufF7iXhc65MCkbwxOQqWnpU81+VKrTmm4kGlmfo3tA51Y68qFPBOjl IzwjYNpY xQYFKO2ZCaC6gdRFLTbId3thWRoRB6j8vWG4Zk1iykwXeF5UgHIdcH1lhdg5XtJ1PhwoFQDR7fo7xIfIaOQxFE1VI/wvCBkryutHSMdmMs4bW6QNkGe1MFQkPF+NjNQU5SdNA+UCD6IZTeIL6xtsPu3q4CL1l+86zD8GI1AeAcGvA2Uo0MfaNvle1pjCgxs0yovBJ 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: If hardware errors are encountered during page copying, returning the bytes not copied is not meaningful, and the caller cannot do any processing on the remaining data. Returning -EFAULT is more reasonable, which represents a hardware error encountered during the copying. Signed-off-by: Tong Tiangen --- include/linux/highmem.h | 8 ++++---- mm/khugepaged.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 4de1dbcd3ef6..c29f51ea8517 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -335,8 +335,8 @@ static inline void copy_highpage(struct page *to, struct page *from) /* * If architecture supports machine check exception handling, define the * #MC versions of copy_user_highpage and copy_highpage. They copy a memory - * page with #MC in source page (@from) handled, and return the number - * of bytes not copied if there was a #MC, otherwise 0 for success. + * page with #MC in source page (@from) handled, and return -EFAULT if there + * was a #MC, otherwise 0 for success. */ static inline int copy_mc_user_highpage(struct page *to, struct page *from, unsigned long vaddr, struct vm_area_struct *vma) @@ -352,7 +352,7 @@ static inline int copy_mc_user_highpage(struct page *to, struct page *from, kunmap_local(vto); kunmap_local(vfrom); - return ret; + return ret ? -EFAULT : 0; } static inline int copy_mc_highpage(struct page *to, struct page *from) @@ -368,7 +368,7 @@ static inline int copy_mc_highpage(struct page *to, struct page *from) kunmap_local(vto); kunmap_local(vfrom); - return ret; + return ret ? -EFAULT : 0; } #else static inline int copy_mc_user_highpage(struct page *to, struct page *from, diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 6b9d39d65b73..ef8b70377292 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -805,7 +805,7 @@ static int __collapse_huge_page_copy(pte_t *pte, continue; } src_page = pte_page(pteval); - if (copy_mc_user_highpage(page, src_page, _address, vma) > 0) { + if (copy_mc_user_highpage(page, src_page, _address, vma)) { result = SCAN_COPY_MC; break; } @@ -2140,7 +2140,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, clear_highpage(hpage + (index % HPAGE_PMD_NR)); index++; } - if (copy_mc_highpage(hpage + (page->index % HPAGE_PMD_NR), page) > 0) { + if (copy_mc_highpage(hpage + (page->index % HPAGE_PMD_NR), page)) { result = SCAN_COPY_MC; goto rollback; }