mm-swap-use-dedicated-entry-for-swap-in-folio.patch removed from -mm tree
The quilt patch titled
Subject: mm/swap: use dedicated entry for swap in folio
has been removed from the -mm tree. Its filename was
mm-swap-use-dedicated-entry-for-swap-in-folio.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Matthew Wilcox <[email protected]>
Subject: mm/swap: use dedicated entry for swap in folio
Date: Mon, 21 Aug 2023 18:08:47 +0200
Let's stop working on the private field and use an explicit swap field. We have to move the swp_entry_t typedef.
Signed-off-by Matthew Wilcox <[email protected]>
Signed-off-by David Hildenbrand <[email protected]>
Reviewed-by Chris Li <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Dan Streetman <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Peter Xu <[email protected]>
Cc Seth Jennings <[email protected]>
Cc Vitaly Wool <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/mm_types.h | 23 +++++++++++++---------- include/linux/swap.h | 5 ++--- 2 files changed, 15 insertions(+), 13 deletions(-)
include/linux/mm_types.h renamed from include/linux/mm_types.h~mm-swap-use-dedicated-entry-for-swap-in-folio +13 -10
@@ -248,6 +248,14 @@ static inline struct page *encoded_page_return (struct page *)(~ENCODE_PAGE_BITS & (unsigned long )page); } +/* +* A swap entry has to fit into a "unsigned long", as the entry is hidden +* in the "index" field of the swapper address space. +*/ +typedef struct { +unsigned long val; +}swp_entry_t ; +/** * struct folio - Represents a contiguous set of bytes. * @flags: Identical to the page flags.
@@ -258,7 +266,7 @@ static inline struct page *encoded_page_* @index: Offset within the file, in units of pages. For anonymous memory, * this is the index from the beginning of the mmap. * @private: Filesystem per-folio data (see folio_attach_private()). -* Used for swp_entry_t if folio_test_swapcache(). +* @swap: Used for swp_entry_t if folio_test_swapcache(). * @_mapcount: Do not access this member directly. Use folio_mapcount() to * find out how many times this folio is mapped by userspace. * @_refcount: Do not access this member directly. Use folio_ref_count()
@@ -301,7 +309,10 @@ struct folio { };struct address_space *mapping;pgoff_t index; -void *private; +union { +void *private; +swp_entry_t swap; + };atomic_t _mapcount;atomic_t _refcount;#ifdef CONFIG_MEMCG
@@ -1209,14 +1220,6 @@ enum tlb_flush_reason { NR_TLB_FLUSH_REASONS, }; -/* -* A swap entry has to fit into a "unsigned long", as the entry is hidden -* in the "index" field of the swapper address space. -*/ -typedef struct { -unsigned long val; -}swp_entry_t ; -/** * enum fault_flag - Fault flag definitions. * @FAULT_FLAG_WRITE: Fault was a write fault.
include/linux/swap.h renamed from include/linux/swap.h~mm-swap-use-dedicated-entry-for-swap-in-folio +2 -3
@@ -335,8 +335,7 @@ struct swap_info_struct {static inline swp_entry_t folio_swap_entry (struct folio *folio) { -swp_entry_t entry = { .val =page_private (&folio->page) }; -return entry; +return folio->swap; }static inline swp_entry_t page_swap_entry (struct page *page)
@@ -350,7 +349,7 @@ static inline swp_entry_t page_swap_entrstatic inline void folio_set_swap_entry (struct folio *folio,swp_entry_t entry) { - folio->private = (void *)entry.val; + folio->swap = entry; }/* linux/mm/workingset.c */
_
Patches currently in -mm which might be from [email protected] are