From patchwork Tue May 28 08:59:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tong Tiangen X-Patchwork-Id: 13676341 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 2FEEFC25B78 for ; Tue, 28 May 2024 08:59:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9297A6B0095; Tue, 28 May 2024 04:59:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AFFC6B0096; Tue, 28 May 2024 04:59:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 728F96B0098; Tue, 28 May 2024 04:59:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 541686B0095 for ; Tue, 28 May 2024 04:59:31 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 04F75403AE for ; Tue, 28 May 2024 08:59:30 +0000 (UTC) X-FDA: 82167206142.23.A3B15EA Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf17.hostedemail.com (Postfix) with ESMTP id 636F740002 for ; Tue, 28 May 2024 08:59:28 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf17.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.190 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=1716886769; 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=d+GeMxnw1qmEmr4PZn8SdT73JpUKtOPcdyNfnD5jfrc=; b=pMxEijO1mbGhnFeZHJyeCs+U3iP2RIP02O5c3rWRDXI/BQbj8TJ8sndjbrEyWmicjt4GkF u1l/ellsAv8RgRgfZQM0qS86QZP569/5mUxEQ54EoOPLYqOBeQV6FLKF6FYygrc3aYF2v7 LpJwajsJxlfEv4q96U8k8YvkjUkwXsQ= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf17.hostedemail.com: domain of tongtiangen@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=tongtiangen@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716886769; a=rsa-sha256; cv=none; b=yoFTr9WZ/aUnbw5W2C6BTPXvk9v8l5nubqtNbef6mM4Umrm7FaowXJbjL3nWJ2/ocC5pQj SdyoVb9VgtQ2LNwc9zKNicoC5u9xMz5Ate/D7I7Pa5+2gajbPvy/vfboB54HK5NJG48pr5 2NNc9JGH4deD0g+tltAoUjii84QN4AA= Received: from mail.maildlp.com (unknown [172.19.88.163]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4VpRF22XpZz2CjFS; Tue, 28 May 2024 16:55:50 +0800 (CST) Received: from kwepemm600017.china.huawei.com (unknown [7.193.23.234]) by mail.maildlp.com (Postfix) with ESMTPS id 8CFA7180066; Tue, 28 May 2024 16:59:24 +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_256_GCM_SHA384) id 15.1.2507.39; Tue, 28 May 2024 16:59:22 +0800 From: Tong Tiangen To: Mark Rutland , Catalin Marinas , Will Deacon , Andrew Morton , James Morse , Robin Murphy , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Michael Ellerman , Nicholas Piggin , Andrey Ryabinin , Alexander Potapenko , 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 v12 3/6] mm/hwpoison: return -EFAULT when copy fail in copy_mc_[user]_highpage() Date: Tue, 28 May 2024 16:59:12 +0800 Message-ID: <20240528085915.1955987-4-tongtiangen@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240528085915.1955987-1-tongtiangen@huawei.com> References: <20240528085915.1955987-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-Rspamd-Queue-Id: 636F740002 X-Stat-Signature: wwnfoar8pjmmyq13shuzddgeeeyq3c66 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1716886768-161764 X-HE-Meta: U2FsdGVkX1+0Jl3Idf5eazSKbRRpyUlDBjx7cS/oCQQdGpaEJ5b94mansRwHrU5r1RYL0gpgY39vRoOSd8eDSTI//qvLHp5bTLNaXA2DCha3FQgSx6WASp2Xldoz6niS84KZpcHXBXyFs6gFDL5/VQtaajJcXNjKkuXv7FheFbN5DvsZXx4pwWdhZeMp83xBr9hcTXkqXnlIyWYyEQbGZEK2eB+WkRzv2ZzmvFcb0eTbfa6DN7+FaE8tVyej0kTBLZelr2vBluv14yDIYJt18zqGVbebR6RLcZSo0LYehOseE/qOr3avRFMt0Ig9umKtTDB/gdJGSOyygRI0rdzGOnuratR1Qz9o6S0aHQ3WjQp1mbdcJ4v9r3iLG002jibsRcBbTz165UfUjbl0N1bQkMBjscGKTp0OYKUXdSojYsT79ZOuua5KwLm1UTl9Fm6aaRKv5Q532HLtqO6Sxz+B+ZAHqtrie5emlvtTMLMW5EUFUQhFvZfhglve1fWRuLPqbVZLfsGepvzYDncfeX59b4BJOgzaXPR+HoO0NIgXCx5d57YhGXDoGyJ6Og4yeBY3JtWws4hr4UjOMNdcvoxjQVG/fF1jNvfrNdAe4jnkmCSbN4h2jOSoAgtgUsxp0X6bvVGq0ycGet2As0rpLtlsFp7MWyaEKmt3NDhNCCuekkkUHesV1rzbjbnQIBRYglJtkRIqRa4mRrM5rV2cd5Ayir311cbsvR2oOEJ7iN+2snmFxb45eMCV2ruN1xMGNv1idnoEa15s81zXBdXI1X541Niv5nKB8GoAUsz96NkQo75DpDIb0ol1pNh7lEk+6fWWekLy1zJHRgsNsBbAY6oILOnw8TKIRku7LqLxmRPTviJ+32bfB+qLMKUg/vjI7g7rLPHYZv/Z7z6xVOA2jKfGXuo5I7o3y2lcMfZgi1wgVvVNULXU9qcWAnvO4Kz4MoqyFzkkTYh4YuLfKPl9ef8 X37X354I xaYvnGAPWS3LfFaq7eZEBaTe+ww7YdhAYr1Egja1N1sXzPwbiFJm/kbTSP0efYL1j2omsw9wftHfxersZRC4R8+HngUcshQJb1U6DZgdG4xBW9zjiOI7Do2j4sv6kNWzQY4MMS4jr38hphkSmcSbEnNhCiCDPIEsv7JN3SjWh5vDniROG7815bGE8EQpmtEvj8qW6fQ6dgjkPyoj1wcDiQmQ7PrOuAM/DzvopBH50ARELQ+pjndxLFmaLWqCt1X79v4DyT78QbQGq5zQ= 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 Reviewed-by: Jonathan Cameron --- 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 00341b56d291..64a567d5ad6f 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 774a97e6e2da..cce838e85967 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -798,7 +798,7 @@ static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio, continue; } src_page = pte_page(pteval); - if (copy_mc_user_highpage(page, src_page, src_addr, vma) > 0) { + if (copy_mc_user_highpage(page, src_page, src_addr, vma)) { result = SCAN_COPY_MC; break; } @@ -2042,7 +2042,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, index++; dst++; } - if (copy_mc_highpage(dst, folio_page(folio, 0)) > 0) { + if (copy_mc_highpage(dst, folio_page(folio, 0))) { result = SCAN_COPY_MC; goto rollback; }