From nobody Sat Apr 11 21:14:18 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0CA7C25B06 for ; Thu, 4 Aug 2022 20:40:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239788AbiHDUkF (ORCPT ); Thu, 4 Aug 2022 16:40:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234568AbiHDUkA (ORCPT ); Thu, 4 Aug 2022 16:40:00 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4D2713F338 for ; Thu, 4 Aug 2022 13:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659645598; h=from:from: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=dwFW3K3FIJLlM5PL8SE9IfeEGlQLs9/vUgiVy5snic8=; b=I2sMJ9C1UQPGVhcuvzonJFZbT6BAEGmspN2JYQOj1KE5ag7jvvzTgDwvdtFh7C29zKHhrH jvNX/fk/X370RjuKiDuhg4Pnl5IFJ90IgXcPe6U8TX/NWukifeOZPEcQq4QgsOYvJMslr4 +E5ar+I8s0NdwU3s9K2MwKaxGQy3o9s= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-vUUyf0K1NHmrVdHttTFNDw-1; Thu, 04 Aug 2022 16:39:57 -0400 X-MC-Unique: vUUyf0K1NHmrVdHttTFNDw-1 Received: by mail-qt1-f198.google.com with SMTP id s26-20020a05622a1a9a00b003427c5de47aso388180qtc.5 for ; Thu, 04 Aug 2022 13:39:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=dwFW3K3FIJLlM5PL8SE9IfeEGlQLs9/vUgiVy5snic8=; b=CSLCa9jWz520f830P4B9CIeiZZRghrS5UgCag//hd7nWP+5AFM2yyY6+41ZL55PdOE 4X//HfIM4wYcHO94zd8iitEIh4X5/2OAAX+BnfZdotXxqetpchzooFpKWdVS7TBuR+PO nA2jNuzYhc4GulDKjw4Hi3nYB90QSfR8EY4D+hZgsdUBsF/mhL610sfqsU5Jag6AyGAw qnd552thfFVATdCq1vIeQVUKiGnwf9X5TAMCPo4dmrWZE0nAEHiOMnTIFX0Twb/OkgBL rwv/G1oIfCb6fpMc8fIlCm3on6kRJAnRuMcOUzj06ATFuPsg0Ic6/YYaYhlvyFmSO76f NVGQ== X-Gm-Message-State: ACgBeo1n0OQsoEKj+JEwMyOhuKYbIZKgjuuRNt0JZCfcYAmCRnSCcWma bn+9oKhS5eA//E8HPdblOpduErDi/DlrV62b1kIp6g8bTISBep4ElyHgg6Yx33QTsAHg2sVdKcB rwtGakMQgBhVkD2Rq/B7DfV1n X-Received: by 2002:a37:ad12:0:b0:6b8:e0b8:ae10 with SMTP id f18-20020a37ad12000000b006b8e0b8ae10mr2840628qkm.85.1659645596938; Thu, 04 Aug 2022 13:39:56 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Z08KtmPe5+dyaYSj18vt4Tyg+ZOaUQwFSnQ0HQdgeBgEJWU4MhE8Ryt4btpbCMXWfsrsRsg== X-Received: by 2002:a37:ad12:0:b0:6b8:e0b8:ae10 with SMTP id f18-20020a37ad12000000b006b8e0b8ae10mr2840614qkm.85.1659645596673; Thu, 04 Aug 2022 13:39:56 -0700 (PDT) Received: from localhost.localdomain (bras-base-aurron9127w-grc-35-70-27-3-10.dsl.bell.ca. [70.27.3.10]) by smtp.gmail.com with ESMTPSA id k19-20020ae9f113000000b006b5e50057basm1395266qkg.95.2022.08.04.13.39.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 04 Aug 2022 13:39:56 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Huang Ying , Andrea Arcangeli , David Hildenbrand , Minchan Kim , Andrew Morton , Vlastimil Babka , Nadav Amit , Hugh Dickins , Andi Kleen , peterx@redhat.com, "Kirill A . Shutemov" Subject: [PATCH v2 1/2] mm/swap: Add swp_offset_pfn() to fetch PFN from swap entry Date: Thu, 4 Aug 2022 16:39:51 -0400 Message-Id: <20220804203952.53665-2-peterx@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220804203952.53665-1-peterx@redhat.com> References: <20220804203952.53665-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We've got a bunch of special swap entries that stores PFN inside the swap offset fields. To fetch the PFN, normally the user just calls swp_offset() assuming that'll be the PFN. Add a helper swp_offset_pfn() to fetch the PFN instead, fetching only the max possible length of a PFN on the host, meanwhile doing proper check with MAX_PHYSMEM_BITS to make sure the swap offsets can actually store the PFNs properly always using the BUILD_BUG_ON() in is_pfn_swap_entry(). One reason to do so is we never tried to sanitize whether swap offset can really fit for storing PFN. At the meantime, this patch also prepares us with the future possibility to store more information inside the swp offset field, so assuming "swp_offset(entry)" to be the PFN will not stand any more very soon. Replace many of the swp_offset() callers to use swp_offset_pfn() where proper. Note that many of the existing users are not candidates for the replacement, e.g.: (1) When the swap entry is not a pfn swap entry at all, or, (2) when we wanna keep the whole swp_offset but only change the swp type. For the latter, it can happen when fork() triggered on a write-migration swap entry pte, we may want to only change the migration type from write->read but keep the rest, so it's not "fetching PFN" but "changing swap type only". They're left aside so that when there're more information within the swp offset they'll be carried over naturally in those cases. Since at it, dropping hwpoison_entry_to_pfn() because that's exactly what the new swp_offset_pfn() is about. Signed-off-by: Peter Xu --- arch/arm64/mm/hugetlbpage.c | 2 +- include/linux/swapops.h | 35 +++++++++++++++++++++++++++++------ mm/hmm.c | 2 +- mm/memory-failure.c | 2 +- mm/page_vma_mapped.c | 6 +++--- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 7430060cb0d6..f897d40821dd 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -242,7 +242,7 @@ static inline struct folio *hugetlb_swap_entry_to_folio= (swp_entry_t entry) { VM_BUG_ON(!is_migration_entry(entry) && !is_hwpoison_entry(entry)); =20 - return page_folio(pfn_to_page(swp_offset(entry))); + return page_folio(pfn_to_page(swp_offset_pfn(entry))); } =20 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, diff --git a/include/linux/swapops.h b/include/linux/swapops.h index a3d435bf9f97..1d17e4bb3d2f 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -23,6 +23,20 @@ #define SWP_TYPE_SHIFT (BITS_PER_XA_VALUE - MAX_SWAPFILES_SHIFT) #define SWP_OFFSET_MASK ((1UL << SWP_TYPE_SHIFT) - 1) =20 +/* + * Definitions only for PFN swap entries (see is_pfn_swap_entry()). To + * store PFN, we only need SWP_PFN_BITS bits. Each of the pfn swap entries + * can use the extra bits to store other information besides PFN. + */ +#ifdef MAX_PHYSMEM_BITS +#define SWP_PFN_BITS (MAX_PHYSMEM_BITS - PAGE_SHIFT) +#else +#define SWP_PFN_BITS (BITS_PER_LONG - PAGE_SHIFT) +#endif +#define SWP_PFN_MASK ((1UL << SWP_PFN_BITS) - 1) + +static inline bool is_pfn_swap_entry(swp_entry_t entry); + /* Clear all flags but only keep swp_entry_t related information */ static inline pte_t pte_swp_clear_flags(pte_t pte) { @@ -64,6 +78,17 @@ static inline pgoff_t swp_offset(swp_entry_t entry) return entry.val & SWP_OFFSET_MASK; } =20 +/* + * This should only be called upon a pfn swap entry to get the PFN stored + * in the swap entry. Please refers to is_pfn_swap_entry() for definition + * of pfn swap entry. + */ +static inline unsigned long swp_offset_pfn(swp_entry_t entry) +{ + VM_BUG_ON(!is_pfn_swap_entry(entry)); + return swp_offset(entry) & SWP_PFN_MASK; +} + /* check whether a pte points to a swap entry */ static inline int is_swap_pte(pte_t pte) { @@ -369,7 +394,7 @@ static inline int pte_none_mostly(pte_t pte) =20 static inline struct page *pfn_swap_entry_to_page(swp_entry_t entry) { - struct page *p =3D pfn_to_page(swp_offset(entry)); + struct page *p =3D pfn_to_page(swp_offset_pfn(entry)); =20 /* * Any use of migration entries may only occur while the @@ -387,6 +412,9 @@ static inline struct page *pfn_swap_entry_to_page(swp_e= ntry_t entry) */ static inline bool is_pfn_swap_entry(swp_entry_t entry) { + /* Make sure the swp offset can always store the needed fields */ + BUILD_BUG_ON(SWP_TYPE_SHIFT < SWP_PFN_BITS); + return is_migration_entry(entry) || is_device_private_entry(entry) || is_device_exclusive_entry(entry); } @@ -475,11 +503,6 @@ static inline int is_hwpoison_entry(swp_entry_t entry) return swp_type(entry) =3D=3D SWP_HWPOISON; } =20 -static inline unsigned long hwpoison_entry_to_pfn(swp_entry_t entry) -{ - return swp_offset(entry); -} - static inline void num_poisoned_pages_inc(void) { atomic_long_inc(&num_poisoned_pages); diff --git a/mm/hmm.c b/mm/hmm.c index f2aa63b94d9b..3850fb625dda 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -253,7 +253,7 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, uns= igned long addr, cpu_flags =3D HMM_PFN_VALID; if (is_writable_device_private_entry(entry)) cpu_flags |=3D HMM_PFN_WRITE; - *hmm_pfn =3D swp_offset(entry) | cpu_flags; + *hmm_pfn =3D swp_offset_pfn(entry) | cpu_flags; return 0; } =20 diff --git a/mm/memory-failure.c b/mm/memory-failure.c index cc6fc9be8d22..e451219124dd 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -632,7 +632,7 @@ static int check_hwpoisoned_entry(pte_t pte, unsigned l= ong addr, short shift, swp_entry_t swp =3D pte_to_swp_entry(pte); =20 if (is_hwpoison_entry(swp)) - pfn =3D hwpoison_entry_to_pfn(swp); + pfn =3D swp_offset_pfn(swp); } =20 if (!pfn || pfn !=3D poisoned_pfn) diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index 8e9e574d535a..93e13fc17d3c 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -86,7 +86,7 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw) !is_device_exclusive_entry(entry)) return false; =20 - pfn =3D swp_offset(entry); + pfn =3D swp_offset_pfn(entry); } else if (is_swap_pte(*pvmw->pte)) { swp_entry_t entry; =20 @@ -96,7 +96,7 @@ static bool check_pte(struct page_vma_mapped_walk *pvmw) !is_device_exclusive_entry(entry)) return false; =20 - pfn =3D swp_offset(entry); + pfn =3D swp_offset_pfn(entry); } else { if (!pte_present(*pvmw->pte)) return false; @@ -221,7 +221,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *= pvmw) return not_found(pvmw); entry =3D pmd_to_swp_entry(pmde); if (!is_migration_entry(entry) || - !check_pmd(swp_offset(entry), pvmw)) + !check_pmd(swp_offset_pfn(entry), pvmw)) return not_found(pvmw); return true; } --=20 2.32.0 From nobody Sat Apr 11 21:14:18 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99D1DC25B08 for ; Thu, 4 Aug 2022 20:40:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239900AbiHDUkT (ORCPT ); Thu, 4 Aug 2022 16:40:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239704AbiHDUkD (ORCPT ); Thu, 4 Aug 2022 16:40:03 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 12FF24C611 for ; Thu, 4 Aug 2022 13:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659645600; h=from:from: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=yjbqitvPqSyZJdTsNvN60J+IesFSNFAJ7gz7O8lHdlw=; b=MYHn5HiNV5SlN0r0brZiuUkhWB8yUzzyDMCT11mH0kW3XpciIOehJ6hNwzjNWe4Y5ID5We OCwucKIVl+l+EbHImk0TyKOaG3es0sKsOaNncMjpEXvK8uYckNEq09OpxQC46qdmTpGu3e GDndeod5wpTJuG8noe9AUZ4WTCLTAN0= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-199-O_awLECQMAaIrlDx4Z9_cw-1; Thu, 04 Aug 2022 16:39:59 -0400 X-MC-Unique: O_awLECQMAaIrlDx4Z9_cw-1 Received: by mail-qk1-f199.google.com with SMTP id bp40-20020a05620a45a800b006b87633579fso505900qkb.0 for ; Thu, 04 Aug 2022 13:39:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=yjbqitvPqSyZJdTsNvN60J+IesFSNFAJ7gz7O8lHdlw=; b=4fu6unehPExAKSqv710iJVWnV2ukmMt5JHxNEsAJvYtT5L/+TxizIj0KjhQaDIfhaw yaJlnAoVU78bL2mFknR9Alh6vub7uIHnlaEOMYjLYvCUOjFiBC6w05lBcYzkiD72cntu aS0aRKW7JPMW1qxau/sA01FxMs6Z+sLsr0pmqoarSKg9sCRvTReDJRG/2V2Y9nosE+Rn rbMWQna/t3RyVvkvzbG8gDtRf1QubV4V89xSVD8JrO1DqCZH5JCC2QOd3+He7k4revgb Hti4pnYfLJhePfbB8HfG3oUUSPbwo8bZQifn27koA1J1Td+9I+Nj+tRWjP86RNJ4770r 9N7A== X-Gm-Message-State: ACgBeo3mYPRPIP5F3nkJR2OOLWpkCW85aUF7QfQWOmLD1BBz/RBS9J7i rgj7W4EDD+WS2HIjD0MHZ5s8iCYsn3T8DyVIebgKEmkzJM2O96X/XP6DzjdbPuNFjqQ0FSWIhiP sJQtJs15D0msAcXWliIrN6tve X-Received: by 2002:a05:622a:10a:b0:341:bba0:3b05 with SMTP id u10-20020a05622a010a00b00341bba03b05mr3101667qtw.648.1659645598516; Thu, 04 Aug 2022 13:39:58 -0700 (PDT) X-Google-Smtp-Source: AA6agR78YxyW7sWXeHw1v5VNrRrWnFysEzZiSyOl3pZEfHSEAaxw5+EQubb7GVQgqtDJNOthk7giRQ== X-Received: by 2002:a05:622a:10a:b0:341:bba0:3b05 with SMTP id u10-20020a05622a010a00b00341bba03b05mr3101643qtw.648.1659645598254; Thu, 04 Aug 2022 13:39:58 -0700 (PDT) Received: from localhost.localdomain (bras-base-aurron9127w-grc-35-70-27-3-10.dsl.bell.ca. [70.27.3.10]) by smtp.gmail.com with ESMTPSA id k19-20020ae9f113000000b006b5e50057basm1395266qkg.95.2022.08.04.13.39.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 04 Aug 2022 13:39:57 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Huang Ying , Andrea Arcangeli , David Hildenbrand , Minchan Kim , Andrew Morton , Vlastimil Babka , Nadav Amit , Hugh Dickins , Andi Kleen , peterx@redhat.com, "Kirill A . Shutemov" Subject: [PATCH v2 2/2] mm: Remember young/dirty bit for page migrations Date: Thu, 4 Aug 2022 16:39:52 -0400 Message-Id: <20220804203952.53665-3-peterx@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220804203952.53665-1-peterx@redhat.com> References: <20220804203952.53665-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When page migration happens, we always ignore the young/dirty bit settings in the old pgtable, and marking the page as old in the new page table using either pte_mkold() or pmd_mkold(), and keeping the pte clean. That's fine from functional-wise, but that's not friendly to page reclaim because the moving page can be actively accessed within the procedure. Not to mention hardware setting the young bit can bring quite some overhead on some systems, e.g. x86_64 needs a few hundreds nanoseconds to set the bit. The same slowdown problem to dirty bits when the memory is first written after page migration happened. Actually we can easily remember the A/D bit configuration and recover the information after the page is migrated. To achieve it, define a new set of bits in the migration swap offset field to cache the A/D bits for old pte. Then when removing/recovering the migration entry, we can recover the A/D bits even if the page changed. One thing to mention is that here we used max_swapfile_size() to detect how many swp offset bits we have, and we'll only enable this feature if we know the swp offset can be big enough to store both the PFN value and the young bit. Otherwise the A/D bits are dropped like before. Signed-off-by: Peter Xu --- include/linux/swapops.h | 91 +++++++++++++++++++++++++++++++++++++++++ mm/huge_memory.c | 26 +++++++++++- mm/migrate.c | 6 ++- mm/migrate_device.c | 4 ++ mm/rmap.c | 5 ++- 5 files changed, 128 insertions(+), 4 deletions(-) diff --git a/include/linux/swapops.h b/include/linux/swapops.h index 1d17e4bb3d2f..34aa448ac6ee 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -8,6 +8,8 @@ =20 #ifdef CONFIG_MMU =20 +#include + /* * swapcache pages are stored in the swapper_space radix tree. We want to * get good packing density in that tree, so the index should be dense in @@ -35,6 +37,24 @@ #endif #define SWP_PFN_MASK ((1UL << SWP_PFN_BITS) - 1) =20 +/** + * Migration swap entry specific bitfield definitions. + * + * @SWP_MIG_YOUNG_BIT: Whether the page used to have young bit set + * @SWP_MIG_DIRTY_BIT: Whether the page used to have dirty bit set + * + * Note: these bits will be stored in migration entries iff there're enough + * free bits in arch specific swp offset. By default we'll ignore A/D bits + * when migrating a page. Please refer to migration_entry_supports_ad() + * for more information. + */ +#define SWP_MIG_YOUNG_BIT (SWP_PFN_BITS) +#define SWP_MIG_DIRTY_BIT (SWP_PFN_BITS + 1) +#define SWP_MIG_TOTAL_BITS (SWP_PFN_BITS + 2) + +#define SWP_MIG_YOUNG (1UL << SWP_MIG_YOUNG_BIT) +#define SWP_MIG_DIRTY (1UL << SWP_MIG_DIRTY_BIT) + static inline bool is_pfn_swap_entry(swp_entry_t entry); =20 /* Clear all flags but only keep swp_entry_t related information */ @@ -265,6 +285,57 @@ static inline swp_entry_t make_writable_migration_entr= y(pgoff_t offset) return swp_entry(SWP_MIGRATION_WRITE, offset); } =20 +/* + * Returns whether the host has large enough swap offset field to support + * carrying over pgtable A/D bits for page migrations. The result is + * pretty much arch specific. + */ +static inline bool migration_entry_supports_ad(void) +{ + /* + * max_swapfile_size() returns the max supported swp-offset plus 1. + * We can support the migration A/D bits iff the pfn swap entry has + * the offset large enough to cover all of them (PFN, A & D bits). + */ +#ifdef CONFIG_SWAP + return max_swapfile_size() >=3D (1UL << SWP_MIG_TOTAL_BITS); +#else + return false; +#endif +} + +static inline swp_entry_t make_migration_entry_young(swp_entry_t entry) +{ + if (migration_entry_supports_ad()) + return swp_entry(swp_type(entry), + swp_offset(entry) | SWP_MIG_YOUNG); + return entry; +} + +static inline bool is_migration_entry_young(swp_entry_t entry) +{ + if (migration_entry_supports_ad()) + return swp_offset(entry) & SWP_MIG_YOUNG; + /* Keep the old behavior of aging page after migration */ + return false; +} + +static inline swp_entry_t make_migration_entry_dirty(swp_entry_t entry) +{ + if (migration_entry_supports_ad()) + return swp_entry(swp_type(entry), + swp_offset(entry) | SWP_MIG_DIRTY); + return entry; +} + +static inline bool is_migration_entry_dirty(swp_entry_t entry) +{ + if (migration_entry_supports_ad()) + return swp_offset(entry) & SWP_MIG_YOUNG_BIT; + /* Keep the old behavior of clean page after migration */ + return false; +} + extern void __migration_entry_wait(struct mm_struct *mm, pte_t *ptep, spinlock_t *ptl); extern void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd, @@ -311,6 +382,26 @@ static inline int is_readable_migration_entry(swp_entr= y_t entry) return 0; } =20 +static inline swp_entry_t make_migration_entry_young(swp_entry_t entry) +{ + return entry; +} + +static inline bool is_migration_entry_young(swp_entry_t entry) +{ + return false; +} + +static inline swp_entry_t make_migration_entry_dirty(swp_entry_t entry) +{ + return entry; +} + +static inline bool is_migration_entry_dirty(swp_entry_t entry) +{ + return false; +} + #endif =20 typedef unsigned long pte_marker; diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 29e3628687a6..7d79db4bd76a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2005,6 +2005,7 @@ static void __split_huge_pmd_locked(struct vm_area_st= ruct *vma, pmd_t *pmd, pmd_t old_pmd, _pmd; bool young, write, soft_dirty, pmd_migration =3D false, uffd_wp =3D false; bool anon_exclusive =3D false; + bool dirty =3D false; unsigned long addr; int i; =20 @@ -2088,7 +2089,8 @@ static void __split_huge_pmd_locked(struct vm_area_st= ruct *vma, pmd_t *pmd, write =3D is_writable_migration_entry(entry); if (PageAnon(page)) anon_exclusive =3D is_readable_exclusive_migration_entry(entry); - young =3D false; + young =3D is_migration_entry_young(entry); + dirty =3D is_migration_entry_dirty(entry); soft_dirty =3D pmd_swp_soft_dirty(old_pmd); uffd_wp =3D pmd_swp_uffd_wp(old_pmd); } else { @@ -2097,6 +2099,7 @@ static void __split_huge_pmd_locked(struct vm_area_st= ruct *vma, pmd_t *pmd, SetPageDirty(page); write =3D pmd_write(old_pmd); young =3D pmd_young(old_pmd); + dirty =3D pmd_dirty(old_pmd); soft_dirty =3D pmd_soft_dirty(old_pmd); uffd_wp =3D pmd_uffd_wp(old_pmd); =20 @@ -2146,6 +2149,10 @@ static void __split_huge_pmd_locked(struct vm_area_s= truct *vma, pmd_t *pmd, else swp_entry =3D make_readable_migration_entry( page_to_pfn(page + i)); + if (young) + swp_entry =3D make_migration_entry_young(swp_entry); + if (dirty) + swp_entry =3D make_migration_entry_dirty(swp_entry); entry =3D swp_entry_to_pte(swp_entry); if (soft_dirty) entry =3D pte_swp_mksoft_dirty(entry); @@ -2160,6 +2167,12 @@ static void __split_huge_pmd_locked(struct vm_area_s= truct *vma, pmd_t *pmd, entry =3D pte_wrprotect(entry); if (!young) entry =3D pte_mkold(entry); + if (dirty) + /* + * NOTE: this may contains setting soft + * dirty too on some archs like x86. + */ + entry =3D pte_mkdirty(entry); if (soft_dirty) entry =3D pte_mksoft_dirty(entry); if (uffd_wp) @@ -3148,6 +3161,10 @@ int set_pmd_migration_entry(struct page_vma_mapped_w= alk *pvmw, entry =3D make_readable_exclusive_migration_entry(page_to_pfn(page)); else entry =3D make_readable_migration_entry(page_to_pfn(page)); + if (pmd_young(pmdval)) + entry =3D make_migration_entry_young(entry); + if (pmd_dirty(pmdval)) + entry =3D make_migration_entry_dirty(entry); pmdswp =3D swp_entry_to_pmd(entry); if (pmd_soft_dirty(pmdval)) pmdswp =3D pmd_swp_mksoft_dirty(pmdswp); @@ -3173,13 +3190,18 @@ void remove_migration_pmd(struct page_vma_mapped_wa= lk *pvmw, struct page *new) =20 entry =3D pmd_to_swp_entry(*pvmw->pmd); get_page(new); - pmde =3D pmd_mkold(mk_huge_pmd(new, READ_ONCE(vma->vm_page_prot))); + pmde =3D mk_huge_pmd(new, READ_ONCE(vma->vm_page_prot)); if (pmd_swp_soft_dirty(*pvmw->pmd)) pmde =3D pmd_mksoft_dirty(pmde); if (is_writable_migration_entry(entry)) pmde =3D maybe_pmd_mkwrite(pmde, vma); if (pmd_swp_uffd_wp(*pvmw->pmd)) pmde =3D pmd_wrprotect(pmd_mkuffd_wp(pmde)); + if (!is_migration_entry_young(entry)) + pmde =3D pmd_mkold(pmde); + if (PageDirty(new) && is_migration_entry_dirty(entry)) + /* NOTE: this may contain setting soft-dirty on some archs */ + pmde =3D pmd_mkdirty(pmde); =20 if (PageAnon(new)) { rmap_t rmap_flags =3D RMAP_COMPOUND; diff --git a/mm/migrate.c b/mm/migrate.c index 1649270bc1a7..957e8e6ee28e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -199,7 +199,7 @@ static bool remove_migration_pte(struct folio *folio, #endif =20 folio_get(folio); - pte =3D pte_mkold(mk_pte(new, READ_ONCE(vma->vm_page_prot))); + pte =3D mk_pte(new, READ_ONCE(vma->vm_page_prot)); if (pte_swp_soft_dirty(*pvmw.pte)) pte =3D pte_mksoft_dirty(pte); =20 @@ -207,6 +207,10 @@ static bool remove_migration_pte(struct folio *folio, * Recheck VMA as permissions can change since migration started */ entry =3D pte_to_swp_entry(*pvmw.pte); + if (!is_migration_entry_young(entry)) + pte =3D pte_mkold(pte); + if (folio_test_dirty(folio) && is_migration_entry_dirty(entry)) + pte =3D pte_mkdirty(pte); if (is_writable_migration_entry(entry)) pte =3D maybe_mkwrite(pte, vma); else if (pte_swp_uffd_wp(*pvmw.pte)) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 7feeb447e3b9..47d90df04cc6 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -221,6 +221,10 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, else entry =3D make_readable_migration_entry( page_to_pfn(page)); + if (pte_young(pte)) + entry =3D make_migration_entry_young(entry); + if (pte_dirty(pte)) + entry =3D make_migration_entry_dirty(entry); swp_pte =3D swp_entry_to_pte(entry); if (pte_present(pte)) { if (pte_soft_dirty(pte)) diff --git a/mm/rmap.c b/mm/rmap.c index af775855e58f..28aef434ea41 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2065,7 +2065,10 @@ static bool try_to_migrate_one(struct folio *folio, = struct vm_area_struct *vma, else entry =3D make_readable_migration_entry( page_to_pfn(subpage)); - + if (pte_young(pteval)) + entry =3D make_migration_entry_young(entry); + if (pte_dirty(pteval)) + entry =3D make_migration_entry_dirty(entry); swp_pte =3D swp_entry_to_pte(entry); if (pte_soft_dirty(pteval)) swp_pte =3D pte_swp_mksoft_dirty(swp_pte); --=20 2.32.0