From nobody Wed May 15 18:55:19 2024 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABC1713F444 for ; Wed, 17 Apr 2024 14:15:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713363302; cv=none; b=pdeflXqAMNMamhiH5mA43UlMDA2l/GYsucQMvmENrKxZoN8izGsINM6+Z4doszqllAUPlxS2SWGq1qxNpL/WLj4Tnhn/SfCJFf33hR5ILBr9Tg8DcGuC0MBAqaKC813l/EzV4J8TbBhuOF9fCSJ+ub548yUGU6Y4gARjGvutL/U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713363302; c=relaxed/simple; bh=YS1E84UOxIjSnPESm8G/PnNhVqV2TAef9FqSYBszYkA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Jnzvi4ndO0TR/daBmj4G07HcDQ93MvxfWGu5NoAggHNdGxcJu+atg+Lo51J60pJfrWfdCxjrkX248lN53Ic0TW/B9VizHJEdvRLj8RYf/eeQAZgEUOXrQN+/pCfodMI6fJyt0tOclbKeltjh4lPq3c0owd+7bbC15FMJAjMJuHY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=T1T31Z6Q; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="T1T31Z6Q" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1e455b630acso26569155ad.1 for ; Wed, 17 Apr 2024 07:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713363300; x=1713968100; darn=vger.kernel.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=lkdNcUi/cFtD91tOAv56m6RXgS21TIueDzxwluwn/Lw=; b=T1T31Z6Q9K5WNrP/QX8ppTSLI0WeqLu/fV2mLIUXHVQLso8lOqESHCiU77o3wRDUci T3iQ9yG/LbIgw9jQjd8LJQ7qQ27XF5VQ5oo4mVClrmRNuoaarjJQbISm09GVLXGa98CH sHKkUK1JBhF8Le7bD1v5msL49q9nn8jrR67Q9SNtXgpDG6biZ9aEj+pc8mAiwHrSJC5e UTI1HCNzcwn3gXzeDtDWPUg77A1Uvwht8msd5abq9EPek3+U7xMFi6nFW4kaiTDkvk6H 7ZX6CH3QDgQW936sxCnr0jA3/g1McJ53qMNi4DqYQziTjxpApGnKrJQg/Qbdmv4TiPV7 mzhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713363300; x=1713968100; 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=lkdNcUi/cFtD91tOAv56m6RXgS21TIueDzxwluwn/Lw=; b=qjOjk3K9vANGE3dSVOGaKpbkrt8Pzbwq+0lx942lUuoxs1gtbMvwMUnDWv1YLl5gx+ yze8XUVXbpjEYidlLgZ4etP9ksj1eeck71j7kCUXbXcRGHGDPCoUdEXfEk39+UFF7s+c vVAXt4u1mBnjlZU9ALs95WrwXcp2nkZyLUL64wea80+rTZfu/I3ojAfhqxqtC8hGhCCm 4d1JUi8oCliVx/WMdwfNmuBCJV8K+zprluYdT8jwIpVr554zxhtNz9f//wOBsW1RQbU8 LtVwILoK+bG6vpsXVEqTCbswhahFyCunJHAsU36YFNbFXhEexhwjqiSQug+itioUuK4X GK6w== X-Forwarded-Encrypted: i=1; AJvYcCXQDWjz6ZJ1YS0DT3/osfSikLQ64adiUJwh5PMiEX4yS/x/C+wKCxp5aIfZ8+Zzf9kFr2mhNwpsCIFfxmyuayatNmBlLKNB/LqK6aom X-Gm-Message-State: AOJu0YxfI0/nisOf0916Z/n2MlRAU2xaGfhhqIGV66PxQ0IWiYOodFvl 9QcKuSIp0Nfu8CiJLgzDSKGklearAs92ZH2GepgwiUDme2oN4vSM X-Google-Smtp-Source: AGHT+IFNu14u7a3I7+Ll1HOcTWP+Tr+CtfofRjw+IGm+xSJjJO923Owls7pUFZJGkbba4Ch4IATTlg== X-Received: by 2002:a17:903:2303:b0:1e4:b1eb:7dee with SMTP id d3-20020a170903230300b001e4b1eb7deemr16402525plh.47.1713363299859; Wed, 17 Apr 2024 07:14:59 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id s14-20020a170902a50e00b001ddc83fda95sm11613562plq.186.2024.04.17.07.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 07:14:59 -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 1/3] mm/madvise: introduce clear_young_dirty_ptes() batch helper Date: Wed, 17 Apr 2024 22:14:34 +0800 Message-Id: <20240417141436.77963-2-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit introduces clear_young_dirty_ptes() to replace mkold_ptes(). By doing so, we can use the same function for both use cases (madvise_pageout and madvise_free), and it also provides the flexibility to only clear the dirty flag in the future if needed. Suggested-by: Ryan Roberts Acked-by: David Hildenbrand Reviewed-by: Ryan Roberts Signed-off-by: Lance Yang --- include/linux/mm_types.h | 9 +++++ include/linux/pgtable.h | 74 ++++++++++++++++++++++++---------------- mm/madvise.c | 3 +- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index db0adf5721cc..24323c7d0bd4 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1368,6 +1368,15 @@ enum fault_flag { =20 typedef unsigned int __bitwise zap_flags_t; =20 +/* Flags for clear_young_dirty_ptes(). */ +typedef int __bitwise cydp_t; + +/* Clear the access bit */ +#define CYDP_CLEAR_YOUNG ((__force cydp_t)BIT(0)) + +/* Clear the dirty bit */ +#define CYDP_CLEAR_DIRTY ((__force cydp_t)BIT(1)) + /* * FOLL_PIN and FOLL_LONGTERM may be used in various combinations with each * other. Here is what they mean, and how to use them: diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index e2f45e22a6d1..18019f037bae 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -361,36 +361,6 @@ static inline int ptep_test_and_clear_young(struct vm_= area_struct *vma, } #endif =20 -#ifndef mkold_ptes -/** - * mkold_ptes - Mark PTEs that map consecutive pages of the same folio as = old. - * @vma: VMA the pages are mapped into. - * @addr: Address the first page is mapped at. - * @ptep: Page table pointer for the first entry. - * @nr: Number of entries to mark old. - * - * May be overridden by the architecture; otherwise, implemented as a simp= le - * loop over ptep_test_and_clear_young(). - * - * Note that PTE bits in the PTE range besides the PFN can differ. For exa= mple, - * some PTEs might be write-protected. - * - * Context: The caller holds the page table lock. The PTEs map consecutive - * pages that belong to the same folio. The PTEs are all in the same PMD. - */ -static inline void mkold_ptes(struct vm_area_struct *vma, unsigned long ad= dr, - pte_t *ptep, unsigned int nr) -{ - for (;;) { - ptep_test_and_clear_young(vma, addr, ptep); - if (--nr =3D=3D 0) - break; - ptep++; - addr +=3D PAGE_SIZE; - } -} -#endif - #ifndef __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_ARCH_HAS_NONLEA= F_PMD_YOUNG) static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma, @@ -489,6 +459,50 @@ static inline pte_t ptep_get_and_clear(struct mm_struc= t *mm, } #endif =20 +#ifndef clear_young_dirty_ptes +/** + * clear_young_dirty_ptes - Mark PTEs that map consecutive pages of the + * same folio as old/clean. + * @mm: Address space the pages are mapped into. + * @addr: Address the first page is mapped at. + * @ptep: Page table pointer for the first entry. + * @nr: Number of entries to mark old/clean. + * @flags: Flags to modify the PTE batch semantics. + * + * May be overridden by the architecture; otherwise, implemented by + * get_and_clear/modify/set for each pte in the range. + * + * Note that PTE bits in the PTE range besides the PFN can differ. For exa= mple, + * some PTEs might be write-protected. + * + * Context: The caller holds the page table lock. The PTEs map consecutive + * pages that belong to the same folio. The PTEs are all in the same PMD. + */ +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 (;;) { + if (flags =3D=3D CYDP_CLEAR_YOUNG) + ptep_test_and_clear_young(vma, addr, ptep); + else { + pte =3D ptep_get_and_clear(vma->vm_mm, addr, ptep); + if (flags & CYDP_CLEAR_YOUNG) + pte =3D pte_mkold(pte); + if (flags & CYDP_CLEAR_DIRTY) + pte =3D pte_mkclean(pte); + set_pte_at(vma->vm_mm, addr, ptep, pte); + } + if (--nr =3D=3D 0) + break; + ptep++; + addr +=3D PAGE_SIZE; + } +} +#endif + static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { diff --git a/mm/madvise.c b/mm/madvise.c index 4b869b682fd5..f5e3699e7b54 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -507,7 +507,8 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, continue; =20 if (!pageout && pte_young(ptent)) { - mkold_ptes(vma, addr, pte, nr); + clear_young_dirty_ptes(vma, addr, pte, nr, + CYDP_CLEAR_YOUNG); tlb_remove_tlb_entries(tlb, pte, nr, addr); } =20 --=20 2.33.1 From nobody Wed May 15 18:55:19 2024 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D82E13F444 for ; Wed, 17 Apr 2024 14:15:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713363309; cv=none; b=OR1EanP7aFPLrtGTFXmzqIhXCcMyjeN2DW940fWLdHJtjtkZX0OJj6j8L2ZZIVe5FU89Pgzj9Deq8jHKAqwEyYuIUMsUd/4RTtdVMplZM+mBnuD/zh46mY7wwdUgnl0TdWJARZOepLGAsgcccK1LfW0FJiPGGgck1MR+aZUoRVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713363309; c=relaxed/simple; bh=vs6Beq48+kXNT5qsMOGp08C7Ii4wZzzBthcyqUl9lGQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=c5/ippqZnYFUHoYvJZ0jThKjU8eSuWcpaiNrRXc/Zy0r1r5843Ohi5uT33uxoebC/j8pjAbl2F3heLacbDIAvKsjcqpqYLM6w5ovki0WZGU4T2P/eDzNK7fWa5atVXKqtQ86rFfSIKcY/JFDsZ/CGp3NE8BYUEctoIjOuexX0XE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MgMvqu6F; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MgMvqu6F" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1e0bec01232so47107315ad.3 for ; Wed, 17 Apr 2024 07:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713363307; x=1713968107; darn=vger.kernel.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=MgMvqu6FqStoQlHg8irmeyAy5bymH8PICNssyWp8LGvCju1YZ6HsePZrnXylyhu9Km D210aPGM5Jp9ztS4W/KVPwIdPMZXpFzkh0TfkQillGtjkCtCAr1XbMPnH0ZU/DmjYZfM SFejjqXZ/hNZM+kKL83Rc1KcHdEwAeyCQ4xagebHZkaa6XPjtVRHRePzM5dOeZB3ua3q vvVKeSVgK9nf99hoR4z+YpD5uEpbhxnF7FxLR3V+UoPynFugLiCd+aik8Oj5omn4bIPn ZsnlSmVJTcLNdvdRcVoudGO15uIFYaAKnM02SpXjrh1bG6P0BPgptLbZPFLkhAUgZUvE a5NA== 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=FqT80IF0JB0O9kqjcM+/qo8/B3+IDMjasg7RhmTfor5oPZsGGvS3war0x3d3E2ihzv Jzo0OadPpLCwkNaPlv07fK7dOFslNMV0qq6mLPT6zF5AVbYsd1On1gWvlIN0UgYat3fj Q5KUOagT3mD2NWd/xX7kQ06lUM0QKIDMP2Y1u7YjOyU6j3M2FLTvRIKD1tvwG5UoLIXr ClEzC4VNEqAIeZ58b1mQ4tclCUorBZm+6aKxOm0PP5arLq8rNZItllyJSJH3rWe5alQy H7OnK+76BaUWX/ZNTF3TPnZxIuYRADmn5dHn1VO/yKCtX6F9FTwY3Xd4rjnoCbLll/RW S9JQ== X-Forwarded-Encrypted: i=1; AJvYcCUJj70t3mDkpejnqEunvFo5q4Nsi9Qj9XQewhguB/NS5HFTkUueymr6PfP6Wn9cwm3+KlhVMpI/ICDJ5g2YnT6gD5xDOkIb0if4v8gT X-Gm-Message-State: AOJu0Yx4Cmk8VAwOq3j6m1d17rozF+R77E8eRVA4v+PIzHeehZiA8e6P +ECyOZGEe/5jBCEIglM3wPA0iQp9vMqjYo8nokqrXECyTTpwR3H8 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/pgta= ble.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); } =20 +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 =3D pte; + + if (flags & CYDP_CLEAR_YOUNG) + pte =3D pte_mkold(pte); + if (flags & CYDP_CLEAR_DIRTY) + pte =3D pte_mkclean(pte); + + pte_val(pte) =3D cmpxchg_relaxed(&pte_val(*ptep), + pte_val(old_pte), pte_val(pte)); + } while (pte_val(pte) !=3D 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 =3D __ptep_get(ptep); + + if (flags =3D=3D (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 =3D=3D 0) + break; + ptep++; + addr +=3D 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); =20 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_ar= ea_struct *vma, return contpte_ptep_set_access_flags(vma, addr, ptep, entry, dirty); } =20 +#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 =3D=3D 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 */ =20 #define ptep_get __ptep_get @@ -1622,6 +1676,7 @@ static inline int ptep_set_access_flags(struct vm_are= a_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 =20 #endif /* CONFIG_ARM64_CONTPTE */ =20 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, unsi= gned long addr, } EXPORT_SYMBOL_GPL(contpte_wrprotect_ptes); =20 +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 =3D addr; + unsigned long end =3D start + nr; + + if (pte_cont(__ptep_get(ptep + nr - 1))) + end =3D ALIGN(end, CONT_PTE_SIZE); + + if (pte_cont(__ptep_get(ptep))) { + start =3D ALIGN_DOWN(start, CONT_PTE_SIZE); + ptep =3D 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) --=20 2.33.1 From nobody Wed May 15 18:55:19 2024 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E4FE13F444 for ; Wed, 17 Apr 2024 14:15:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713363317; cv=none; b=UlNFRfTU90LMZ2L0AIMcVC2uM3uaes57M3ee9X7PHkEABIkGGXFqMr2ddJuZDpYWvtGKBR9oh6XiO82H5jt91TU6jsGOnJcVMfh0ekkg2y4PShUZbB0pg2Bxg1gjWSu8S+0M8oxf2ekoBwKIbKhJ/b/r3tCW8USEJvUnLBHGMhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713363317; c=relaxed/simple; bh=ED3NPuf2ZjFnZsmYAh+DaAHMHS+tX0qG/uB2wKwa5eU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FP7b8WdLOQ1MX2nTfQfLnz5aVxM314fX3mOZ0OL8bBw9W7VHsl7UOJyfc7ICoGg5g0c0tr8lBWh8R6UrcCW0INk7fHdllspnGtc4IB9z8uFEWflvshw3v8YlBcHvS3o0H8prS5trRmbC6h7twe7ObWEApbUT+T7EYGYvaDAdTQg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D3EMaGUd; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D3EMaGUd" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6ead4093f85so4751456b3a.3 for ; Wed, 17 Apr 2024 07:15:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713363315; x=1713968115; darn=vger.kernel.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=8zmDsYAtJOCrhdAwJbAGzI50/YgT/UfiWJqJuE4bljE=; b=D3EMaGUd1hygSY4amlRsY3EzBK2rOmOWefd9MJkjJwzD1+5hgAPeA5W/2t16pSShfR FcWqdlFtJMipihBoOvJZEoVgsGuJxALCeOslO7oghJE2Plx104gAP2L6INyfZ13xJOKz P5lvoepFFOOg0Z1vbJwQMlmCWBwI4Q6K0YMsYS6uzBjVmT1/aynZm3TC12wK4YDTjyfv WvqFtVs0iE1pkBEFO8uqzwkoh/RYGFrTsTmrR4TbXEuv8QUmUxX4hE5SkF+wp+jBNYT4 RTYjtHaVDyePAuwL3R/+uiuqGYs6rGFmt5eWPa/SiSglSR7ATBslfJMn6giBjTNV6pho /nWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713363315; x=1713968115; 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=8zmDsYAtJOCrhdAwJbAGzI50/YgT/UfiWJqJuE4bljE=; b=U8GsoXu8eAT6UdMw817yZicltqAWMe2e2Uf3O9h169j8eyScYmBsj2LI2w4kpPCKXp Fz3j/WmoqN//pXY1I5ays/awnLDrQtKfWrhxU4x4mxabSQ6OoWU3PKWvYttdA2ggV/2S o6buncUAxV20jzrwHK+8pMODWn4h2Eqa4TlsumLArlzBdP/nNh9xt4k8gu1pYogrkepR adOvMr89YtmWOx1Q3GPF2DBJl1F19o4DomAdYOYBDbXqGcrLX+fZV8Uyl+n5rPTHPG4b zVdrAvLwpK52sn48nY74jQ/mhqf6dRnBXiBb0Qt/y3WRLwAD1d1FOJ1+cTFu+8BC+BJ7 krQA== X-Forwarded-Encrypted: i=1; AJvYcCWQwoOLTJdb+EIsAzE6Gomma31I/SE7ik3Uoe4ZcT9DYW6d1t4uuPP+KB2O1h9Cm9Df/QoFzhh743k7lSAZrqF60UCFzzWXC+9tjz4k X-Gm-Message-State: AOJu0Yy1ni7fTaFqxv8D+L/BeZ362gagJXpcRpLKtxKF1P6MBR/VoZ+V MSfsHqy0POyOai/U/cv5VIx2BWgnJjsvFBNTLvA0Gixa10wXeZaghTPGS8hz X-Google-Smtp-Source: AGHT+IFHnRpIQz0volgPDyOzixsfBZR9W7TzOuIOwAy8+qIhGQ8COOnMGTqpfoWRzRuyD6dpMUBD1w== X-Received: by 2002:a05:6a20:3c9e:b0:1a8:2cd1:e437 with SMTP id b30-20020a056a203c9e00b001a82cd1e437mr17085789pzj.11.1713363315179; Wed, 17 Apr 2024 07:15:15 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 07:15:14 -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 3/3] mm/madvise: optimize lazyfreeing with mTHP in madvise_free Date: Wed, 17 Apr 2024 22:14:36 +0800 Message-Id: <20240417141436.77963-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch optimizes lazyfreeing with PTE-mapped mTHP[1] (Inspired by David Hildenbrand[2]). We aim to avoid unnecessary folio splitting if the large folio is fully mapped within the target range. If a large folio is locked or shared, or if we fail to split it, we just leave it in place and advance to the next PTE in the range. But note that the behavior is changed; previously, any failure of this sort would cause the entire operation to give up. As large folios become more common, sticking to the old way could result in wasted opportunities. On an Intel I5 CPU, lazyfreeing a 1GiB VMA backed by PTE-mapped folios of the same size results in the following runtimes for madvise(MADV_FREE) in seconds (shorter is better): Folio Size | Old | New | Change Reviewed-by: Ryan Roberts ------------------------------------------ 4KiB | 0.590251 | 0.590259 | 0% 16KiB | 2.990447 | 0.185655 | -94% 32KiB | 2.547831 | 0.104870 | -95% 64KiB | 2.457796 | 0.052812 | -97% 128KiB | 2.281034 | 0.032777 | -99% 256KiB | 2.230387 | 0.017496 | -99% 512KiB | 2.189106 | 0.010781 | -99% 1024KiB | 2.183949 | 0.007753 | -99% 2048KiB | 0.002799 | 0.002804 | 0% [1] https://lkml.kernel.org/r/20231207161211.2374093-5-ryan.roberts@arm.com [2] https://lore.kernel.org/linux-mm/20240214204435.167852-1-david@redhat.c= om Signed-off-by: Lance Yang --- mm/internal.h | 12 ++++- mm/madvise.c | 141 ++++++++++++++++++++++++++++---------------------- mm/memory.c | 4 +- 3 files changed, 91 insertions(+), 66 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index c6483f73ec13..daa59cef85d7 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -134,6 +134,8 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte= , fpb_t flags) * first one is writable. * @any_young: Optional pointer to indicate whether any entry except the * first one is young. + * @any_dirty: Optional pointer to indicate whether any entry except the + * first one is dirty. * * Detect a PTE batch: consecutive (present) PTEs that map consecutive * pages of the same large folio. @@ -149,18 +151,20 @@ static inline pte_t __pte_batch_clear_ignored(pte_t p= te, fpb_t flags) */ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, pte_t *start_ptep, pte_t pte, int max_nr, fpb_t flags, - bool *any_writable, bool *any_young) + bool *any_writable, bool *any_young, bool *any_dirty) { unsigned long folio_end_pfn =3D folio_pfn(folio) + folio_nr_pages(folio); const pte_t *end_ptep =3D start_ptep + max_nr; pte_t expected_pte, *ptep; - bool writable, young; + bool writable, young, dirty; int nr; =20 if (any_writable) *any_writable =3D false; if (any_young) *any_young =3D false; + if (any_dirty) + *any_dirty =3D false; =20 VM_WARN_ON_FOLIO(!pte_present(pte), folio); VM_WARN_ON_FOLIO(!folio_test_large(folio) || max_nr < 1, folio); @@ -176,6 +180,8 @@ static inline int folio_pte_batch(struct folio *folio, = unsigned long addr, writable =3D !!pte_write(pte); if (any_young) young =3D !!pte_young(pte); + if (any_dirty) + dirty =3D !!pte_dirty(pte); pte =3D __pte_batch_clear_ignored(pte, flags); =20 if (!pte_same(pte, expected_pte)) @@ -193,6 +199,8 @@ static inline int folio_pte_batch(struct folio *folio, = unsigned long addr, *any_writable |=3D writable; if (any_young) *any_young |=3D young; + if (any_dirty) + *any_dirty |=3D dirty; =20 nr =3D pte_batch_hint(ptep, pte); expected_pte =3D pte_advance_pfn(expected_pte, nr); diff --git a/mm/madvise.c b/mm/madvise.c index f5e3699e7b54..d6f1889d6308 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -321,6 +321,39 @@ static inline bool can_do_file_pageout(struct vm_area_= struct *vma) file_permission(vma->vm_file, MAY_WRITE) =3D=3D 0; } =20 +static inline int madvise_folio_pte_batch(unsigned long addr, unsigned lon= g end, + struct folio *folio, pte_t *ptep, + pte_t pte, bool *any_young, + bool *any_dirty) +{ + int max_nr =3D (end - addr) / PAGE_SIZE; + const fpb_t fpb_flags =3D FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; + + return folio_pte_batch(folio, addr, ptep, pte, max_nr, fpb_flags, NULL, + any_young, any_dirty); +} + +static inline bool madvise_pte_split_folio(struct mm_struct *mm, pmd_t *pm= d, + unsigned long addr, + struct folio *folio, pte_t **pte, + spinlock_t **ptl) +{ + int err; + + if (!folio_trylock(folio)) + return false; + + folio_get(folio); + pte_unmap_unlock(*pte, *ptl); + err =3D split_folio(folio); + folio_unlock(folio); + folio_put(folio); + + *pte =3D pte_offset_map_lock(mm, pmd, addr, ptl); + + return err =3D=3D 0; +} + static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, struct mm_walk *walk) @@ -456,41 +489,30 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *p= md, * next pte in the range. */ if (folio_test_large(folio)) { - const fpb_t fpb_flags =3D FPB_IGNORE_DIRTY | - FPB_IGNORE_SOFT_DIRTY; - int max_nr =3D (end - addr) / PAGE_SIZE; bool any_young; =20 - nr =3D folio_pte_batch(folio, addr, pte, ptent, max_nr, - fpb_flags, NULL, &any_young); - if (any_young) - ptent =3D pte_mkyoung(ptent); + nr =3D madvise_folio_pte_batch(addr, end, folio, pte, + ptent, &any_young, NULL); =20 if (nr < folio_nr_pages(folio)) { - int err; - if (folio_likely_mapped_shared(folio)) continue; if (pageout_anon_only_filter && !folio_test_anon(folio)) continue; - if (!folio_trylock(folio)) - continue; - folio_get(folio); + arch_leave_lazy_mmu_mode(); - pte_unmap_unlock(start_pte, ptl); - start_pte =3D NULL; - err =3D split_folio(folio); - folio_unlock(folio); - folio_put(folio); - start_pte =3D pte =3D - pte_offset_map_lock(mm, pmd, addr, &ptl); + if (madvise_pte_split_folio(mm, pmd, addr, + folio, &start_pte, &ptl)) + nr =3D 0; if (!start_pte) break; + pte =3D start_pte; arch_enter_lazy_mmu_mode(); - if (!err) - nr =3D 0; continue; } + + if (any_young) + ptent =3D pte_mkyoung(ptent); } =20 /* @@ -688,44 +710,48 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigne= d long addr, continue; =20 /* - * If pmd isn't transhuge but the folio is large and - * is owned by only this process, split it and - * deactivate all pages. + * If we encounter a large folio, only split it if it is not + * fully mapped within the range we are operating on. Otherwise + * leave it as is so that it can be marked as lazyfree. If we + * fail to split a folio, leave it in place and advance to the + * next pte in the range. */ if (folio_test_large(folio)) { - int err; + bool any_young, any_dirty; =20 - if (folio_likely_mapped_shared(folio)) - break; - if (!folio_trylock(folio)) - break; - folio_get(folio); - arch_leave_lazy_mmu_mode(); - pte_unmap_unlock(start_pte, ptl); - start_pte =3D NULL; - err =3D split_folio(folio); - folio_unlock(folio); - folio_put(folio); - if (err) - break; - start_pte =3D pte =3D - pte_offset_map_lock(mm, pmd, addr, &ptl); - if (!start_pte) - break; - arch_enter_lazy_mmu_mode(); - pte--; - addr -=3D PAGE_SIZE; - continue; + nr =3D madvise_folio_pte_batch(addr, end, folio, pte, + ptent, &any_young, &any_dirty); + + if (nr < folio_nr_pages(folio)) { + if (folio_likely_mapped_shared(folio)) + continue; + + arch_leave_lazy_mmu_mode(); + if (madvise_pte_split_folio(mm, pmd, addr, + folio, &start_pte, &ptl)) + nr =3D 0; + if (!start_pte) + break; + pte =3D start_pte; + arch_enter_lazy_mmu_mode(); + continue; + } + + if (any_young) + ptent =3D pte_mkyoung(ptent); + if (any_dirty) + ptent =3D pte_mkdirty(ptent); } =20 if (folio_test_swapcache(folio) || folio_test_dirty(folio)) { if (!folio_trylock(folio)) continue; /* - * If folio is shared with others, we mustn't clear - * the folio's dirty flag. + * If we have a large folio at this point, we know it is + * fully mapped so if its mapcount is the same as its + * number of pages, it must be exclusive. */ - if (folio_mapcount(folio) !=3D 1) { + if (folio_mapcount(folio) !=3D folio_nr_pages(folio)) { folio_unlock(folio); continue; } @@ -741,19 +767,10 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigne= d long addr, } =20 if (pte_young(ptent) || pte_dirty(ptent)) { - /* - * Some of architecture(ex, PPC) don't update TLB - * with set_pte_at and tlb_remove_tlb_entry so for - * the portability, remap the pte with old|clean - * after pte clearing. - */ - ptent =3D ptep_get_and_clear_full(mm, addr, pte, - tlb->fullmm); - - ptent =3D pte_mkold(ptent); - ptent =3D pte_mkclean(ptent); - set_pte_at(mm, addr, pte, ptent); - tlb_remove_tlb_entry(tlb, pte, addr); + clear_young_dirty_ptes(vma, addr, pte, nr, + CYDP_CLEAR_YOUNG | + CYDP_CLEAR_DIRTY); + tlb_remove_tlb_entries(tlb, pte, nr, addr); } folio_mark_lazyfree(folio); } diff --git a/mm/memory.c b/mm/memory.c index 33d87b64d15d..9e07d1b9020c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -989,7 +989,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struc= t vm_area_struct *src_vma flags |=3D FPB_IGNORE_SOFT_DIRTY; =20 nr =3D folio_pte_batch(folio, addr, src_pte, pte, max_nr, flags, - &any_writable, NULL); + &any_writable, NULL, NULL); folio_ref_add(folio, nr); if (folio_test_anon(folio)) { if (unlikely(folio_try_dup_anon_rmap_ptes(folio, page, @@ -1558,7 +1558,7 @@ static inline int zap_present_ptes(struct mmu_gather = *tlb, */ if (unlikely(folio_test_large(folio) && max_nr !=3D 1)) { nr =3D folio_pte_batch(folio, addr, pte, ptent, max_nr, fpb_flags, - NULL, NULL); + NULL, NULL, NULL); =20 zap_present_folio_ptes(tlb, vma, folio, page, pte, ptent, nr, addr, details, rss, force_flush, --=20 2.33.1