From mboxrd@z Thu Jan 1 00:00:00 1970 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 3E7B3C3DA4A for ; Mon, 19 Aug 2024 11:56:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A18D86B007B; Mon, 19 Aug 2024 07:56:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A1676B0082; Mon, 19 Aug 2024 07:56:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 841D96B0083; Mon, 19 Aug 2024 07:56:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6564B6B007B for ; Mon, 19 Aug 2024 07:56:09 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E1D44411AA for ; Mon, 19 Aug 2024 11:56:08 +0000 (UTC) X-FDA: 82468841616.18.0D7FFFB Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by imf16.hostedemail.com (Postfix) with ESMTP id 9B224180007 for ; Mon, 19 Aug 2024 11:56:06 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of jonathan.cameron@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=jonathan.cameron@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=1724068464; 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=HDIbyRnNMP0CUN7ZQ6yTMhvsyTAYGtiUGzKD4OW80pk=; b=npc4SiUXECPwusnDu5SgdTp0ryrEH5qU6uIv3uCJdwjH7UrmFxl70sYcRRWZkQaezWdKc0 81dZqcfADi2IFbFTaXTgLdHtVjD44SV4dVTS8+ZP6fyV6AMq6KTWMlG2Xc5OjQMuunhbkf Q1tPKAoyqDrCuUrZ3Jvr5nGcitkjcpA= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of jonathan.cameron@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=jonathan.cameron@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724068464; a=rsa-sha256; cv=none; b=qMOx2LT+HMOD/B3NQpPNr5Pqa0pjG8G7uOkTSXHf4AYgg4ZTEOiRz3IINTunGAp+zg5VwR 4mhpYTCFaUZy7BSnrtFNu74oOdwt6F0+2GVAM2M4xVRLw+OdeJ2K+kLOvlAVAybsACDEr+ rLIjWxLcge8cLeLt7x91qhVbTSC1wR8= Received: from mail.maildlp.com (unknown [172.18.186.31]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4WnWFL2mDwz6K9Hd; Mon, 19 Aug 2024 19:53:10 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 6A8AA140B2F; Mon, 19 Aug 2024 19:56:03 +0800 (CST) Received: from localhost (10.203.177.66) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Mon, 19 Aug 2024 12:56:02 +0100 Date: Mon, 19 Aug 2024 12:56:01 +0100 From: Jonathan Cameron To: Tong Tiangen CC: 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" , , , , , , Guohanjun Subject: Re: [PATCH v12 4/6] arm64: support copy_mc_[user]_highpage() Message-ID: <20240819125601.0000687b@Huawei.com> In-Reply-To: <20240528085915.1955987-5-tongtiangen@huawei.com> References: <20240528085915.1955987-1-tongtiangen@huawei.com> <20240528085915.1955987-5-tongtiangen@huawei.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.203.177.66] X-ClientProxiedBy: lhrpeml100005.china.huawei.com (7.191.160.25) To lhrpeml500005.china.huawei.com (7.191.163.240) X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 9B224180007 X-Stat-Signature: byzkfnopmfzae9pjbzcqqe8ra956bsma X-Rspam-User: X-HE-Tag: 1724068566-382680 X-HE-Meta: U2FsdGVkX18TNvU/rGaucr/6ILykoYBn60/xLQGwEIN35sRcS/T6mSjvc3K/o6aDaxnTxsx+hRoCocc9wQTkEM33EJlDaTlV5eFm8F1MgFLtU/quPfd/0xQpHIZS/ZjjGcCWsD1x1PcH++pUZP2or+fD5xVU76AlxWmLA36XhcQIHvk8To+WQ7mu8n/RCCNmnHT3cCVm58EJrljLeE77pmK5Int5o+qhIcM1fSxyglKhP28ZKYVje55CJ/FwHOJgsJbm4LSmSaCMuUUAIo+I5zmBRMS1FNBV6PWNmagCjgfFjt501g5kJ+UVvNbau27oHcs4uxYx4gL0zNHqoNUMWy4rqW+ZW22T/tK6GJ/Iyib/NqfQQIbrerC5ILGS2uIuOBbClg7NRBDNnIh46LIDbQIOPPGoIEv/uNQsymltByR9ZXIlpa4XBCmRZ+xfUUnOw0hUSg2QMrWHVjky8feCY0HLltFnP69LtgmQTf2SkkmoFyndWzWgxDUcEEg0LtiBSOXGUa/zkcwcxoUl5a5mmQDJuGq4iswizRDQFA5MhT6WFw6Sptfk5ai8WHy5RzTWrVias2iX6gSyLJLs8T10LHiPejhXVRzCEk2u6s1SHaZMfhLT6W5mtMTA2SSQ38uz3DEnWNlli5Oz9PcPN9kkYy7O739BUty4e5t1ol9X+sN0AT/MR1SC5VffbPdjpZEqNfpNmT7fMSy1akK9stv7yDEfRSJ8BI9xr1fGyTCBVX0TtmJJRhICMR6o+8S6d67LI8aHbBPSYi4JfdlqGKMtSbKweEURuc7zbm2cxrFvyBnr1efa81OxF7cR2n6jvp+6zRiPhj2OU5OV2l3e+0BkQ8oTf00bpM503S+XJCsVQpHs9NusD08hB8CRd9m/sk5Zf1C8vDCxVLhfa7AAw0nVjw4uCCbB0hlX1ZS/bmS/LOKchf8GSAK2K5XmjgInCIvTnyyAd8rvPPbVivvcpwi w3QON1Gb onjjrAZRsJ4MpwY3UaFo7nJW3syFNMCZ7zg07acHbBbSUkWYiOjgtpq7L4wiuPjxdlblPRU79KcpLf8Fahyj81CDy7LYB3t6WNxIjHPA+Swu545w+IQ2TosMT5Q+XLJZzkEKTrJR0nOJtW7Me81YaCDOuvCv85ewUBorSWIcJGEWfkYvuFk1B7FY27RqLJ8N/idF+ZjRb/WPjOoHhbaM1RWqqj5BTn/pMsREYUfY26sQ5+UwX5qXRuIuvMq1i4QX+Rt4L1AyHu+qfTqpo8bOrcPNR19HVgulcV9WwXVO5viNrawbnOSjwMMHxQ8IbFCtI5vK8wJRbY9blctqb5Mh0pspoWGPXtNKnKPdW 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: On Tue, 28 May 2024 16:59:13 +0800 Tong Tiangen wrote: > Currently, many scenarios that can tolerate memory errors when copying page > have been supported in the kernel[1~5], all of which are implemented by > copy_mc_[user]_highpage(). arm64 should also support this mechanism. > > Due to mte, arm64 needs to have its own copy_mc_[user]_highpage() > architecture implementation, macros __HAVE_ARCH_COPY_MC_HIGHPAGE and > __HAVE_ARCH_COPY_MC_USER_HIGHPAGE have been added to control it. > > Add new helper copy_mc_page() which provide a page copy implementation with > hardware memory error safe. The code logic of copy_mc_page() is the same as > copy_page(), the main difference is that the ldp insn of copy_mc_page() > contains the fixup type EX_TYPE_KACCESS_ERR_ZERO_ME_SAFE, therefore, the > main logic is extracted to copy_page_template.S. > > [1] commit d302c2398ba2 ("mm, hwpoison: when copy-on-write hits poison, take page offline") > [2] commit 1cb9dc4b475c ("mm: hwpoison: support recovery from HugePage copy-on-write faults") > [3] commit 6b970599e807 ("mm: hwpoison: support recovery from ksm_might_need_to_copy()") > [4] commit 98c76c9f1ef7 ("mm/khugepaged: recover from poisoned anonymous memory") > [5] commit 12904d953364 ("mm/khugepaged: recover from poisoned file-backed memory") > > Signed-off-by: Tong Tiangen Trivial stuff inline. Jonathan > diff --git a/arch/arm64/lib/mte.S b/arch/arm64/lib/mte.S > index 5018ac03b6bf..50ef24318281 100644 > --- a/arch/arm64/lib/mte.S > +++ b/arch/arm64/lib/mte.S > @@ -80,6 +80,35 @@ SYM_FUNC_START(mte_copy_page_tags) > ret > SYM_FUNC_END(mte_copy_page_tags) > > +#ifdef CONFIG_ARCH_HAS_COPY_MC > +/* > + * Copy the tags from the source page to the destination one wiht machine check safe Spell check. with Also, maybe reword given machine check doesn't make sense on arm64. > + * x0 - address of the destination page > + * x1 - address of the source page > + * Returns: > + * x0 - Return 0 if copy success, or > + * -EFAULT if anything goes wrong while copying. > + */ > +SYM_FUNC_START(mte_copy_mc_page_tags) > + mov x2, x0 > + mov x3, x1 > + multitag_transfer_size x5, x6 > +1: > +KERNEL_ME_SAFE(2f, ldgm x4, [x3]) > + stgm x4, [x2] > + add x2, x2, x5 > + add x3, x3, x5 > + tst x2, #(PAGE_SIZE - 1) > + b.ne 1b > + > + mov x0, #0 > + ret > + > +2: mov x0, #-EFAULT > + ret > +SYM_FUNC_END(mte_copy_mc_page_tags) > +#endif > + > /* > * Read tags from a user buffer (one tag per byte) and set the corresponding > * tags at the given kernel address. Used by PTRACE_POKEMTETAGS. > diff --git a/arch/arm64/mm/copypage.c b/arch/arm64/mm/copypage.c > index a7bb20055ce0..ff0d9ceea2a4 100644 > --- a/arch/arm64/mm/copypage.c > +++ b/arch/arm64/mm/copypage.c > @@ -40,3 +40,48 @@ void copy_user_highpage(struct page *to, struct page *from, > + > +int copy_mc_user_highpage(struct page *to, struct page *from, > + unsigned long vaddr, struct vm_area_struct *vma) > +{ > + int ret; > + > + ret = copy_mc_highpage(to, from); > + if (!ret) > + flush_dcache_page(to); Personally I'd always keep the error out of line as it tends to be more readable when reviewing a lot of code. if (ret) return ret; flush_dcache_page(to); return 0; > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(copy_mc_user_highpage); > +#endif