From patchwork Thu Apr 18 13:44:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Yang X-Patchwork-Id: 13634761 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 87BFEC4345F for ; Thu, 18 Apr 2024 13:44:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 121AA6B0092; Thu, 18 Apr 2024 09:44:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D2956B0093; Thu, 18 Apr 2024 09:44:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB4976B0095; Thu, 18 Apr 2024 09:44:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id D00F86B0092 for ; Thu, 18 Apr 2024 09:44:57 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 749D11C0034 for ; Thu, 18 Apr 2024 13:44:57 +0000 (UTC) X-FDA: 82022773434.15.1C78A9D Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf17.hostedemail.com (Postfix) with ESMTP id 4B50540024 for ; Thu, 18 Apr 2024 13:44:52 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=mmDU6TXp; spf=pass (imf17.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.170 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=1713447892; 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=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=qaLUI/x9GjLXaW32oR09yq6lCET2Ha+n5uEOkoQUeuEY8AYHGwZ4DsvcrG5nutKzoSaFNG bpzhDdam8sZJPP7DwqxozGVR1UKxOZKvwRI/Az72zCP2SqhfEwEpfYL5ZHLnHD7BsJ6pLW I/pVVRgpFedro3aSJ+VNbC+sTJ6k/fk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713447892; a=rsa-sha256; cv=none; b=m30zqNfWwLg3JXBV4Bp7IJEtTPlgkRE6FJRShuRw9oFvnUL6ImvGWCMosq9LezYk1grCc8 w7SsWpjUw/In/Q9hlqKEKg09t+vfb84ShwSlHZ0btHvT3V+8nIbBQni/W1CYr57r5h2sqe 228tnCTL4FkljCW8iyJKOOdOIEWRQkM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=mmDU6TXp; spf=pass (imf17.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1e4bf0b3e06so8590715ad.1 for ; Thu, 18 Apr 2024 06:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713447891; x=1714052691; 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=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=mmDU6TXpLazfs1y1LwVyYKxtxqQbCQFcSDVXCEUqgRCsxA3A/yOZtoJ9FIAvZT2Cm1 7/31me6yF2LmqGpypsLft18+qbbJSnDbfmzqt3uqp6l6IVOuMqLM09LEITjzuHw0S1qh OSFhXjmuvdlea13UVpahBGAKDVDF7/SWmEBN8QNM+tLnZh8rxxEvJ1ACx2caXLwQhKE1 VTFuE2Aq7+C4pEsGZfahI3wANg/9Yzx5JXK2WsNB2v+TCzLU7/ArBi33oqeD5Eyi6SHZ oL3TkPtrpRZPXyUwHa8jkeUIVlHYvb8os6RxiZ88PSZCByezekRuZQZA8qjqqohLekNR pVGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713447891; x=1714052691; 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=XITq4/hgHmAHZ0ZHlNrd2qmUtOIaf33ePb9J0ZwzOSE=; b=RY5odBdMdB5WLrrtobz0A06zbbn5jS+/MjxZfaAiTSZOivryXQ+rnEYITeE1AJ5YCs rPql1V2+A3Xj71+1vUyDzPKtg+iCZT8bxqYmJYOcRlMj/+Z5r3mQSFD7ShlXHUETyY/t 6KiP+0ZDLvHfyC1mzxVXEzKL2Tvi9X89wnpdF80oA61HK0NETlL+XTiv2hu9ftI4xBEa IzPAm+X3YJsvn0eJOIRJlm+xnC8C99nK03Xgq6dncNIc3nLoHx5uARu/XhfuFLb9yh4s iLZUTvTS411VV4hza6mmEJlOx3qGz91yu+MVXbRZrSaWr19vt0nwkzhMXH83IGZYyKV/ +6kA== X-Forwarded-Encrypted: i=1; AJvYcCVoOcsMYqjtA7IubBnS4n89PQu1ViJc4Q6y7tfdDVeWOC1yez60KpkrNCgseun4ChDJ7SnKtvJl9YA7QYg1gnW2eQY= X-Gm-Message-State: AOJu0YyJ+/wrQOJZHXppsh4ZELs6Vq6p3NpsQpTgXeW3wUDdYUi26jQy I3n9Nq+PE/r8h+MQB0sIfsXY+K6NeM9cHul+GbSlHBaagiqKHvyK X-Google-Smtp-Source: AGHT+IFMvPYbcwWGZBEI/RPL6zIG2k4X3bC8gD2IhYt301UAgb/Og2L2LjKZC1QkdaZ8PQQDYIe8QA== X-Received: by 2002:a17:902:db0a:b0:1e2:1db3:ebeb with SMTP id m10-20020a170902db0a00b001e21db3ebebmr3985587plx.57.1713447891167; Thu, 18 Apr 2024 06:44:51 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id d8-20020a170902b70800b001e4fdcf67desm1504837pls.299.2024.04.18.06.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 06:44:50 -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 v10 2/4] mm/arm64: override clear_young_dirty_ptes() batch helper Date: Thu, 18 Apr 2024 21:44:33 +0800 Message-Id: <20240418134435.6092-3-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240418134435.6092-1-ioworker0@gmail.com> References: <20240418134435.6092-1-ioworker0@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 4B50540024 X-Stat-Signature: qb1hnm79irqhk3k9bcm8og6ai8giofsq X-HE-Tag: 1713447892-610962 X-HE-Meta: U2FsdGVkX1+CJWpQ1bdPFgohDBDHc+f9MamoXpEphvkmhKDPFLw9uPHP2QdAmPJbgScrugymYF+bF/PZKzo63/RIVW+h9yBjrN0lUpvLPxd9Z417xHJHvedPTFHh4gOYbZP5107U2Vsl7mhv8YQRfv5MiAja2jUIfrAy+im4fYmF+GFH9mpjoUcHn/+7BHZqW50Qc0lZT/n1yV+sYqYi8hVs8by/9a4KNgbA0QIxjnfZf/jMEyS4DESy+6qoUZ1gCTSw61OVg58hmkMjWrVxmfORtH0xKgZsV6sn0OLOBB+fJ/r3LoaieHClzQsvkp/H7g1gl8afbZKOdrN93Wtczl4tg4PhA4rRyNS8GWwL7qFMydALBtbho/4w1CczYAPF9ubBp7F/Fk9eT6gmAKD7LlGx5JW6x5ANldWnHsSZRhk0A9Ufk13isxsY9qCJ7qVA2L8LpsoBUOI4wv43AGmHt9TSLKCxrtBFghnv8bR9OfAuP+1Vosp4biuJDX88PVJo2URRkfd6XxUQB5OO4NQvqFg9tS+poFu4QVvPfBEkPYRnt7tWsYSbkx+lnXFNsk/Y6MsU6AH8iA8plL6VN6TYR7RJUNM60Uvh3dqITzUgA87/EzqtqJ+VAM1gF6oQxJxUDJ4tj2RzYuMT/CKxpjzOh+NzAUswjHwhWJBpOg+anGQaMSr/FZdCkR42A7Wq8z8/yazH5R9PqK5Sk5zB0upVBp1Mj01X5MxRz/0KgJF/KwG6vIaDsxKKJprYpPvwqScqOIkLQPzw6UDUMjtBLe2SdHW05l6PIGxfW00zl5edBvgjgtsZ/bv+OsqnK2n0vxwdlYFLf4If9wF1fCf5N097STe9gZPm+sHycC2AB5uCA4Umr2J00mr5WdTEIBSgYcJAEXyD3+vGGW3KASRZqnrbDnRiRIHTXGql/Pfq02y/YBoSye4zW+qV4BTj6qbAaPLNlrYzK//x9s4Rq2Cv9OE IQmrzcM4 MPLfU6Ym7x3mT3pZRXBog46F+3rlSzqx6a0wOWNuqXuHZWmID20B/TFMNbMoYUlN+98zZF1+Dhy57GW7UzRYKDY3eaQgvCKP2db2mijq8lJYTMqSU4esBZAPSq/dvlyVpuozy1UD+199lB4IBSGYzpjh4QIi0WMFu0UKj 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: Barry Song <21cnbao@gmail.com> Suggested-by: Ryan Roberts Reviewed-by: Ryan Roberts Signed-off-by: Lance Yang --- 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)