From patchwork Tue Apr 16 03:34:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13631164 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 31846C4345F for ; Tue, 16 Apr 2024 03:35:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C00DC6B008A; Mon, 15 Apr 2024 23:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BA1206B0092; Mon, 15 Apr 2024 23:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A763F6B0093; Mon, 15 Apr 2024 23:35:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 899F76B008A for ; Mon, 15 Apr 2024 23:35:30 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4DFBF1A08C2 for ; Tue, 16 Apr 2024 03:35:30 +0000 (UTC) X-FDA: 82013980020.02.541C6E8 Received: from mail-oa1-f46.google.com (mail-oa1-f46.google.com [209.85.160.46]) by imf30.hostedemail.com (Postfix) with ESMTP id 881E98000D for ; Tue, 16 Apr 2024 03:35:28 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=PkPeRowk; spf=pass (imf30.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.160.46 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713238528; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Xa5U5Lslaz+G0m1rVPRlrShOq/KcuLodfgFv0sEM+Zs=; b=fPBFULnKcJLjxGLD09rxZa96xsZPjC5Gm5lZZb6T1G7qq+ZyEoycjIp2t266VpQhOrLZOE /aCko181Px3jR2f/bz7/t/z6U3dLKxPkIG5HnUs5QvOaPE34lsmjjk86a3UN2mMb1x4GUb CtJD1/B5R9n6Uoi+bqocEpqsMtocaVw= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=PkPeRowk; spf=pass (imf30.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.160.46 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713238528; a=rsa-sha256; cv=none; b=oqXT8SGrG5v+Hybyxzp96NAoPaybWRn2x665ubmY8Oes2ugadQ9Wgicb5Wjk5tOLJSUvgo 2Ur79L1wggbGEa7D263wQm334OpOnHeQULSTdCMvdC98N/moC6xeHMyo4cZD5WSiR3PubV nlUbTN+dqrGUt2rql1G+1ghdMa7z2Lc= Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-23489b56559so1084355fac.1 for ; Mon, 15 Apr 2024 20:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713238527; x=1713843327; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xa5U5Lslaz+G0m1rVPRlrShOq/KcuLodfgFv0sEM+Zs=; b=PkPeRowkXN16gKhbbr2m3smTpECn8yPAJMBk1HQBWXtaacyBA5G1CVN9TvLD1a2DbT 9octQeiKiwUkpgNzugGX6xQAHxRxMHVhfcap5WpiwBnWxlOrm3XDO621MmH9jZSax6FA TaJEuJufjSqQ7G1zwyUxAIS2nXnAK9RY+f84ozvGsogEJDUn97+vxl5UIRPD4ccdiOql m99HbeUrgwAPp4uPMe915R7e5ImO7AyPvIhGTEJrgWFuiQ0H4x/wX7/5KNtCYB1iHvOX JIRm77g6iOj8XxF1iniOpUDZuyKG1txA473e1/0tgyqELYGlSSmGTJk1LUFEVaUIA/pt h2cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713238527; x=1713843327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xa5U5Lslaz+G0m1rVPRlrShOq/KcuLodfgFv0sEM+Zs=; b=BAHjUiaBgdQ2pO74+y2qPRw3nTUjBlgDoi/HZ9w5Y30P1BTnkFiN7FI0oJbMdnhY3S jGVTjVE1v2xh6GsZ7pma/aQ0F3jMGP/SdXZosAPYAJ4BaZnpiCiSlWZfAAsjxh7ztZmc yrbGOsZ4cQvxSME3mmGR51Cdi48RA7I3jY1m3xBG6ys7yde7xp5n7sCyzQXhdpDNgjl+ NQB/0ioZXNdQravQklR4YOYWjmYEqeIS12L6KBQkHksb89fZuracipRLUyJ61/Js8CrJ 4NCFaP9HbkFcpbJ9oHbb1Mb8RlvWNNhM77M50uCph9ACm8mqKHf+L5wFeQnzTYS40Wb/ FQWA== X-Forwarded-Encrypted: i=1; AJvYcCUs3vSpu4kA2I3Xjjvmf+Qif9ZANcAB6T5GQl2uJmBIPTJxsCe/1YWO81VkJq1JersGh9UhxwXzBY0+PAastqxyIII= X-Gm-Message-State: AOJu0Yx/151f68WhwI831fdZ//8yaZk68n7T+gCFkctHggd93SzRxTmr 5Ibmxhw4H29sPZ4KPhG7CGxb++IkSBGBLbzueI8gLehBJBlaBOLE X-Google-Smtp-Source: AGHT+IHwk5g3eb1ccJ96pB5R5kMJw+NcK5BFd59uPH2p5YulEU/Mhp5PXvWdZqm/wREsRZ7pVF+wYA== X-Received: by 2002:a05:6870:63a9:b0:22e:d382:87dc with SMTP id t41-20020a05687063a900b0022ed38287dcmr14773843oap.22.1713238527433; Mon, 15 Apr 2024 20:35:27 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id ka13-20020a056a00938d00b006e57247f4e5sm7906737pfb.8.2024.04.15.20.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 20:35:27 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: ryan.roberts@arm.com, david@redhat.com, 21cnbao@gmail.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lance Yang Subject: [PATCH v7 2/3] mm/arm64: override clear_young_dirty_ptes() batch helper Date: Tue, 16 Apr 2024 11:34:56 +0800 Message-Id: <20240416033457.32154-3-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240416033457.32154-1-ioworker0@gmail.com> References: <20240416033457.32154-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 881E98000D X-Rspam-User: X-Stat-Signature: bnrbkzj1o9quttfo1w3ap7wx6qksgxfg X-Rspamd-Server: rspam01 X-HE-Tag: 1713238528-368521 X-HE-Meta: U2FsdGVkX1+mF6vQAnoyQZOZ502vn6nfwXlU3dzcFQWc1DD7pLPJml/BJm1N6m0OF9utzjllRSDjHfBlD8NlG3VR+ZzYvzsb14i/DGa4UTI9Qe8hofKZlFlCJp2KPXnb3aWALJE+s7N9GVENrKxPMO7weo2E4Zo+5ubaN8xkxzT7Rjni6GJggcRiHEOdEmOB5w/Obz633f5NCRvshw4drAGkNS7fMJ5+55RlEIexm8/8epO2lTAV53IGvwlGN3yiRns9+WKhWvrOIm4mMmuEepC9GFxYehbgML8V4y6XgKlIcKumL8hLoVeYjtqZXTdhPolNMGhyDiisVpi8SmZWM7g/b0T13y/5iI2M5VEcKYLHMUYA+0FzxpQz6PNjuSOQ7ZUxntGs7KSbcJL6mQCv9o5ioypYaj2WOfetacHFfiMWJwVdULt4L64+BE0uOQaBWSgY4iJlAf7xvjDynPIwp50tEFMdduhyelX1n3lJYzkIQd0KsNxUNSFemElV1/9DS5XGtYI38DM4Ks5AKR76LPlx81/VSOvUIE0HgF9Pr3j8fMMrxrQynS60i9CCq9CZdzl6HPMbxuLwNHDQIEOX7yvlgcqvMv/pMLNtmJQbZJAfWV1DArktcR2CuSe8ThwGU7MEarPc10+BZZhEukO+otcb6RhtRd8cE69RiAXhHolh6OkXBSKOKwtfOXR/STQzetvSLyd9w3r1i1tL5ILvFJTYloN4xZoaiKwMnq8+NxGunAZ3thsQ31cVZTgSGK8/6xNGH++kdRRGWpekHGf8V63C7Z1z8v7yy3EJEDL2TQNWq8mqH6DqR3n9HoijDC1AQVkiqMek7yx7Z5B1CTY+ANBZzcBlvToiYGEn68eklRF7XNZUTWSIbZtRKDuVn7/PODfwLI1jWy8iddjKPtcYLdAPtyZgta3kav4Lnt9inmA1l9DIlRDxZCXYV/iWRz3J8hdcmf+NOz+2BybPv9D 5Z3OUj0Y kOKn4NuADAnpShcsWAyk/bRwggSyCO8F7e9psdhvgpwvG9TQbH9eVQ6Wt+0OeQLG3lS2d75V4BsyJtA/zVXa9sW/mgnlpdNHGp7R/8vTEqs7QyTe1zoNtEikLLI6w3BRTtjDSZxJQzLUeYBIVB8roCvJiyd2vi/WFBixekuzXB22b5Nzc7EYcscdA0zYDexl5jwuwJsUqWyTlTLDmwh4giteqY3j4D1Mm7YO9nN6dFtuXOFXn8m2oCwF0trOfcCQLtOTM6spoMPxU2xdiLTUGWlG8rKTFTuoJt9Xesc8b60j5Xd8uLH0s/6Q1i9nCsOFVEc9LOV6vzitkYiuJsR26oqTRPkj1DKW14ze/peLYXfmpFtVBDKh+XAwGytDTHB47327ideqLp5BUxWZOCfm3XLiQHGCcHLSjDxqaEYGQd/rNcXz2sJ9yEzAho7J+Wwg/EBhFlF+hwzoJwHVzkoNCvBs0Xl2r6gV6Fthy3roJXmmVtjSxT1fz278THsm8rsumM0XiPD2pc5h9VwQPdR02vSLMyMfR5IuCk4bMCQpotfu9gI3BY4vHlW5Rodb3B+alfpzR 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: The per-pte get_and_clear/modify/set approach would result in unfolding/refolding for contpte mappings on arm64. So we need to override clear_young_dirty_ptes() for arm64 to avoid it. Suggested-by: David Hildenbrand Suggested-by: Barry Song <21cnbao@gmail.com> Suggested-by: Ryan Roberts Signed-off-by: Lance Yang Reviewed-by: Ryan Roberts --- arch/arm64/include/asm/pgtable.h | 55 ++++++++++++++++++++++++++++++++ arch/arm64/mm/contpte.c | 29 +++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 9fd8613b2db2..1303d30287dc 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1223,6 +1223,46 @@ static inline void __wrprotect_ptes(struct mm_struct *mm, unsigned long address, __ptep_set_wrprotect(mm, address, ptep); } +static inline void __clear_young_dirty_pte(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + pte_t pte, cydp_t flags) +{ + pte_t old_pte; + + do { + old_pte = pte; + + if (flags & CYDP_CLEAR_YOUNG) + pte = pte_mkold(pte); + if (flags & CYDP_CLEAR_DIRTY) + pte = pte_mkclean(pte); + + pte_val(pte) = cmpxchg_relaxed(&pte_val(*ptep), + pte_val(old_pte), pte_val(pte)); + } while (pte_val(pte) != pte_val(old_pte)); +} + +static inline void __clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + pte_t pte; + + for (;;) { + pte = __ptep_get(ptep); + + if (flags == (CYDP_CLEAR_YOUNG | CYDP_CLEAR_DIRTY)) + __set_pte(ptep, pte_mkclean(pte_mkold(pte))); + else + __clear_young_dirty_pte(vma, addr, ptep, pte, flags); + + if (--nr == 0) + break; + ptep++; + addr += PAGE_SIZE; + } +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_PMDP_SET_WRPROTECT static inline void pmdp_set_wrprotect(struct mm_struct *mm, @@ -1379,6 +1419,9 @@ extern void contpte_wrprotect_ptes(struct mm_struct *mm, unsigned long addr, extern int contpte_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t entry, int dirty); +extern void contpte_clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags); static __always_inline void contpte_try_fold(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte) @@ -1603,6 +1646,17 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, return contpte_ptep_set_access_flags(vma, addr, ptep, entry, dirty); } +#define clear_young_dirty_ptes clear_young_dirty_ptes +static inline void clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + if (likely(nr == 1 && !pte_cont(__ptep_get(ptep)))) + __clear_young_dirty_ptes(vma, addr, ptep, nr, flags); + else + contpte_clear_young_dirty_ptes(vma, addr, ptep, nr, flags); +} + #else /* CONFIG_ARM64_CONTPTE */ #define ptep_get __ptep_get @@ -1622,6 +1676,7 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma, #define wrprotect_ptes __wrprotect_ptes #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS #define ptep_set_access_flags __ptep_set_access_flags +#define clear_young_dirty_ptes __clear_young_dirty_ptes #endif /* CONFIG_ARM64_CONTPTE */ diff --git a/arch/arm64/mm/contpte.c b/arch/arm64/mm/contpte.c index 1b64b4c3f8bf..9f9486de0004 100644 --- a/arch/arm64/mm/contpte.c +++ b/arch/arm64/mm/contpte.c @@ -361,6 +361,35 @@ void contpte_wrprotect_ptes(struct mm_struct *mm, unsigned long addr, } EXPORT_SYMBOL_GPL(contpte_wrprotect_ptes); +void contpte_clear_young_dirty_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr, cydp_t flags) +{ + /* + * We can safely clear access/dirty without needing to unfold from + * the architectures perspective, even when contpte is set. If the + * range starts or ends midway through a contpte block, we can just + * expand to include the full contpte block. While this is not + * exactly what the core-mm asked for, it tracks access/dirty per + * folio, not per page. And since we only create a contpte block + * when it is covered by a single folio, we can get away with + * clearing access/dirty for the whole block. + */ + unsigned long start = addr; + unsigned long end = start + nr; + + if (pte_cont(__ptep_get(ptep + nr - 1))) + end = ALIGN(end, CONT_PTE_SIZE); + + if (pte_cont(__ptep_get(ptep))) { + start = ALIGN_DOWN(start, CONT_PTE_SIZE); + ptep = contpte_align_down(ptep); + } + + __clear_young_dirty_ptes(vma, start, ptep, end - start, flags); +} +EXPORT_SYMBOL_GPL(contpte_clear_young_dirty_ptes); + int contpte_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t entry, int dirty)