From patchwork Mon Jan 29 13:46:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tong Tiangen X-Patchwork-Id: 13535675 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 0D158C47DDB for ; Mon, 29 Jan 2024 13:47:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D88006B0078; Mon, 29 Jan 2024 08:47:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D3A646B007E; Mon, 29 Jan 2024 08:47:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3D1C6B009F; Mon, 29 Jan 2024 08:47:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A549A6B0078 for ; Mon, 29 Jan 2024 08:47:11 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 7EBCF160A42 for ; Mon, 29 Jan 2024 13:47:11 +0000 (UTC) X-FDA: 81732475062.23.44FFCFD Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf15.hostedemail.com (Postfix) with ESMTP id B190BA0023 for ; Mon, 29 Jan 2024 13:47:08 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; spf=pass (imf15.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706536029; a=rsa-sha256; cv=none; b=AflzLBoKYC+brL95bgIZOGZdmwF+8A6W1i0vAJhxOTrmyN9cE0vJA1f84KRLRcQOLvrBAM nT96a2lrLjxNGmmGrNaJdIWMc11hgdwYzl2HuufVUzJj0JOgK/YkJ4eLFwsln0Je/xVac0 34jkqjoHXnQJG8viCz5bZ3L5HyC/fwA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; spf=pass (imf15.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706536029; 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=4oS5QI8PowY+Zs3TQNKojee8XDIVZivI95uIZM8SiOM=; b=2a5/OOMFhBBN+qRVvLTXV0ljpAEqvb++d5oYJPYGcEFeRGgcBpoRFy8JhpyKje/6zPf0Vz XAjHjopgbBvXYrWtxO8Wba8NA0Rw256u9/IKcokYSZSKQa9zi9HydpRFWo0KSu0qijO8QK /s833P9+JtNUKa9uvV1MwxZ6PMz4M2U= Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4TNqMz4Dbvz1vsj8; Mon, 29 Jan 2024 21:46:39 +0800 (CST) Received: from kwepemm600017.china.huawei.com (unknown [7.193.23.234]) by mail.maildlp.com (Postfix) with ESMTPS id D25391404DB; Mon, 29 Jan 2024 21:47:03 +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.35; Mon, 29 Jan 2024 21:47:01 +0800 From: Tong Tiangen To: Catalin Marinas , Will Deacon , Mark Rutland , James Morse , Robin Murphy , Andrey Ryabinin , Alexander Potapenko , Alexander Viro , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Andrew Morton , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Aneesh Kumar K.V , "Naveen N. Rao" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "H. Peter Anvin" CC: , , , , , Tong Tiangen , , Guohanjun Subject: [PATCH v10 4/6] mm/hwpoison: return -EFAULT when copy fail in copy_mc_[user]_highpage() Date: Mon, 29 Jan 2024 21:46:50 +0800 Message-ID: <20240129134652.4004931-5-tongtiangen@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240129134652.4004931-1-tongtiangen@huawei.com> References: <20240129134652.4004931-1-tongtiangen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600017.china.huawei.com (7.193.23.234) X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B190BA0023 X-Stat-Signature: ieppahydo8zg5hck7unbe6hgxtziy7zy X-HE-Tag: 1706536028-843329 X-HE-Meta: U2FsdGVkX18CsaoPzB7r5HE0KIWyDWpHkUZA34aErRLZBwmvK5KXL/LxbBAzaAzfRstJy6ak+3E/25ST37K7fO1L2ZjC9muiJq1ymanQkHm+3PMCFsqENQLCI8ddH561fEnmlbOjW/v89ZZGrC/vqtoQhi4DLMW3vdV+0/zK62W3j78mx2gAHJ1cM9Sh+OQ0/5yTsLXdL/xNlMVw6d69yKdVmQklpImXn/Bys5nY/WRmU5ju/5TxErvlDdoy4Ryv/be6kSArv5v6w8jmonanKziA2eY0Uk7Hw3DWgU65v4i1YMYmpee5G9RhDqqkPndj+FflVLryVYqclscjQe0CJfzGHUsAkDj7Dwl49FSUCCcbkTTBzdNkY0b38iiOI5jLG96I/MbQjpKlo77tJXVnc6KPkX4wwcpwRXShKcN2wGXJ+WXBsiBxaaFIcVpPtlmGD9WZjeuOt2VTwb2WlwLKNlxvA5lZXPNR1YmXY77O/QGIEGPxTYooHc5v5Vg0u7umZQitPO06uDh2fGkp8PeCtR83SPtAJmiaF37+ZLuv8eoVzyGPJUjE8zoS40ElfmI0n3TOyapYNHrBOO8a+64tQ4VHUbZLnHtvXdlugovkyuBKsr61lZPeTihJKqJRgJLVk3zghuMBrc6KVCbUx4nLKN04AU0S5eEPrcC0P4h45vLZJfIuyrcocHWhPX6YZt2Jj0Ca9d9ZuRcH1pyuk0h6CzRkdwMYkQY5nEK+xMxX5LsiGlxBkwG7DnkWFtTLbHXgCDrm+ySyxi7diYSj60sEV+mTYUwiZUDSHWtsw19D4gzWJ7Qswnr4SoCOyy6urpWlB+DR2doFZc9QdvS2xsivXcAI6u+6ivdIk3OlBjUUdTSzcrgqZMcBhFCTulYN1gBncQGj3OPJsxNE/qygVfEenMd8kQMnhgd//4+tvaKQUqANMocQwiPS+0EEKEwBFoWjMbbxkJMIfkLlm91MjWd kebTpWtF jyqjuLgl+PPAI+RaAuk4JCe/wBuGbtJxUSkPVkf6iGzCuScHI/2YyJUMQMrHQVMOPTmsjuOlTeBD0HzNvvx5zpXDLgpduD166TUsVpXgBRG+n2oPlNnPBSANiXQLzZgKvo3DiHO8CIbIixhJefD9X57ZqrZKQR8rda3xTRzFYDHcL2w0Lslo2X1GyHo0ODvY5FEhVa9VW0ERc73iZRArBpVW1ucD5lh4kQOYCNPmTvya5ytp1uy0cngN1LBQOcJ7mrbZgmeN1N0sKvHg= 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: List-Subscribe: List-Unsubscribe: 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 451c1dff0e87..c5ca1a1fc4f5 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 2b219acb528e..ba6743a54c86 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -797,7 +797,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; } @@ -2053,7 +2053,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; }