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 492C9C4345F for ; Wed, 17 Apr 2024 14:15:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1CC56B0085; Wed, 17 Apr 2024 10:15:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCD4B6B008C; Wed, 17 Apr 2024 10:15:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6DEF6B0092; Wed, 17 Apr 2024 10:15:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 87DF86B0085 for ; Wed, 17 Apr 2024 10:15:11 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 46D96140DFA for ; Wed, 17 Apr 2024 14:15:11 +0000 (UTC) X-FDA: 82019220822.20.041E5B3 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf10.hostedemail.com (Postfix) with ESMTP id 9D137C0019 for ; Wed, 17 Apr 2024 14:15:08 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dlqqYL71; spf=pass (imf10.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.179 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=1713363308; a=rsa-sha256; cv=none; b=ObTAlSHwk5oSHW3RA2+eJQ7lrW4f9DXy0XfbQNUm6UaC6oXxjDiu5nDNrGyvXzkRbKRsue L52yGkf92J70/Pt4yeqo8OlfrnBbVFHs5K3ItV6GyTMtfxXYwHhObXZk+1rh6OD5enLRAQ t7sTdY0wxCOMTX2kfpHuW4xOB4CrY+U= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dlqqYL71; spf=pass (imf10.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.214.179 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=1713363308; 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=3GkKZsuHrfkf92sCMkUr1syfLCzanHtfmYCHHKYI4vK5NwrjbF37vr72pY2AJhj0kYmIDy FOm+1GfFzeNb7T/L8MWtlaRM6/a8fb6Wt9eSIyW05coSzhoBUBXX4bg8jPcnGK84j6UF7t TXoxsKZ/uISUusig+TSLdUkpjQGdnco= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1e3c9300c65so49285235ad.0 for ; Wed, 17 Apr 2024 07:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713363307; x=1713968107; 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=dlqqYL711OdK8hyJKoZgTBs17z90dCZGuXZotVmfrRQoB6rgJhaYsiXSad5pqhYrnB YHjT0xp1vDUxSFWGSmAImY4U+hmc3zq5BbTpGNi5BwiuEB7mh6CFYmOkCwSBlmcw+Sd0 3f80ojUEz8isxxF+TMj0gPNE3txbFhdv3/Vcbbe50rpkrWKP6vWHBFr+vUV3SDk9g7nf rgjaXQtxmbU1Qr6H1BVY4M83y44ZGneeqNfM6wVlTA/EGoOR5nJXxkWjpauob5cqaJnP 22IVwbFPOwHq2MGWE0e29oxbaFpx/39fKg4zr3mTyvpyzgGg3VOyC+uHVrsB9hvyyQOz n68w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713363307; x=1713968107; 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=cu+XsM5tJFJh0gAQ8A2EM0tu0tvtuVkHqk0V0zv4yXTN1cxf2tZo+lXnKDbKoHsIGB z8MGZdWfWLPozaVmzK3D3QTS9rvWrxnJnvdA7Z3YsvIg2suWAulUb0j8TJerdNcljhiz +Ogt8rs9E1M9i3pba7g20R9lNlyNcAMlge7OIYQASIMn0J1TKk7Ai+XQYyYCj8zBEQM8 84aOOAzmZ8cPWFfwuKs4nJBng0DapU5dtXrSYpvepJsep9D95wO7q+j5PudBEi9zk3oj n1L+9JwkZpbTWVO8ZMth6iJMdrGutuRAQXZbIBuvyJMpl5MxvtZjZixBYzaNCXzFIDpd N2bw== X-Forwarded-Encrypted: i=1; AJvYcCVsfdxsYm/zUn1kUSGizj/+CCdhktCFl26i9E0pGuGoQA1daLSMNfxa8b0kqoz9FaY5E9x+cpSylc+QX+V+2KDS0AE= X-Gm-Message-State: AOJu0Yw8yce0PQDNI3LKiueU9KrSrRL5u/7pgcS13cyN/8BRRg3JHsbn xPKSy8nOR4NJZHomapdxRZp3fPbWsKJX/EUkY8slYu/tSPqC+NWv X-Google-Smtp-Source: AGHT+IEDm4KbIbQ0YdOSAbJN1v6q6PUuVmA+Q24uMMWeXUZznbyNrcroRNDGswYL5SuQ2L2kRGe+oA== X-Received: by 2002:a17:902:6b0b:b0:1de:e6a5:e51d with SMTP id o11-20020a1709026b0b00b001dee6a5e51dmr12852592plk.16.1713363307446; Wed, 17 Apr 2024 07:15:07 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id s14-20020a170902a50e00b001ddc83fda95sm11613562plq.186.2024.04.17.07.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 07:15:07 -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 v8 2/3] mm/arm64: override clear_young_dirty_ptes() batch helper Date: Wed, 17 Apr 2024 22:14:35 +0800 Message-Id: <20240417141436.77963-3-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240417141436.77963-1-ioworker0@gmail.com> References: <20240417141436.77963-1-ioworker0@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9D137C0019 X-Stat-Signature: riuyuje1m7hzjgkt6moo9rn113xpcget X-Rspam-User: X-HE-Tag: 1713363308-610893 X-HE-Meta: U2FsdGVkX19eBnbTmNbnDW0pKVLlsq+/S5ee1wZk+1qOe7YxCf5dyeYIkYBeJf6HvjGuT534+uRH1Lyk+PZPF0D54x1oXIIoNsdNfl1NhGNiSZ3+G8rDewqVogC2Eua0Jw8EhxhJVtXc/+HEVqjlA3+weEdHIcL34ZodNRPROMV0BHmQ+vOm4qRMZjv+JDo0gsMJ/3tvLJMoC7IHrKxGdBUu/VlzivGQE4J1nCTQtTVcvPwX347EcGo9++2u7Fn8rWVQFNxnF+oJYqDVReXXtzhpvXdTxvuQHp9Q7SbI6vcHZH4uMfZZ0ooccmZ6gx2vnBh27K1i4alQOsH/e6R6ju3r+ziEOw1Ch1sU/T1X78LuFpj2ViR1bdFzaBed/qPsDVsyolWgpTsPiKf73g1GSXUpBxKOAFFJxkq9zkTIZC+Dor/1etfaqp4vDLz3RF9oh6ISoLRp6nocrmrEmej1M1gK+3ubvgzvgEwUrIXRgTuhpukoO5h1PRhGXuC6B2WuCnWR8dO0t9tIVrAYxIQK0PbK4+Jur53msxBmJM/pf89P2zVuqJjvu4P78Tlwx1gx0E5tbudRegYIi5qjuzYX4DAoWWYH1md8AhdjDkIduordD/4a0jJIDKn/tsRwpEkzj/aNinkHqCPO8vna+UixByRAU+/D4CLcDoGFVW6SWuuqBip4hoJwnFGSsCds475sl4OHE76GDs2bn9TU3BmwLKM+Up7SDHaAcohE0Y2joIoZHKoiWxVMG4jGWnSVuXJ1VTrweXLHg6pgzrKh1N70IyZPSEr2YcUSMNz22fZMp89Woim0hq66Ol1UvOS2hpzksTG/xNjjW/cXkeAqOmD0ebyQXWfJDxVZ/Ba+pbH0RKWLgBnnpIxmXKu22HtxU/M6qZDHYHreYblyi/zt1I683Hhkv10zeC1K6l5jZhbhHR4jXI7mVMAswGgYnyPdwAkfzJCeGmMyM2s1pRzD1wA eskwcIIx 59Am4btGmQhbkGN6WD5KhSaGC618/q5h0cgZC7CoEBz6Arj6Bx8odTXTlU06UU41PqfvvPYRsCOFdECkbTG1IV3iM+KfEQQgfT/mcyVcUflb7QeyOdDiqh2o8GNu+gq93eftHt06tYrGCTr94i1N6RDFq2Poug6LqZskHc7fdec+ofVqyPFsBhCNYcGIwZ6QB9IFoU5FRO4z62N11sIm9ICxyDLKsKUWixJMXnvGLWoaa3BsGJE+dk7S5PZ2OFnPPkff/9qo8NjfQ4hojbY2GIkJSBnAXnf7W7W3RSen1rOaSgNgFatRCrB0vlZo/e7er+w0oIQIWmBKfac9c8BTxFZvn7Y9VctvIqVyX1M9SzCZyqFbXgWlDlVkJHgnCytMbcvL9W7L0ycrzUNbwjOXhoaVHKDu6sxICwaTux7Itm2cNIAFHQ5efB+oH5zyRIrwxsHFhq9KCNzcbnRkkEO/oi4HpaG+GBiR+Bw2VJswzqT0GkTyEAphJfFqvt4aWMNFy2p4hT43+FRTCWsllmFMUsJaziVEGJe1aXhsdcrnIoEK2Vzo= 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) -- 2.33.1