Commit 9ff30bb9 authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Andrew Morton
Browse files

mm: remove non_swap_entry() and use softleaf helpers instead 

There is simply no need for the hugely confusing concept of 'non-swap'
swap entries now we have the concept of softleaf entries and relevant
softleaf_xxx() helpers.

Adjust all callers to use these instead and remove non_swap_entry()
altogether.

No functional change intended.

Link: https://lkml.kernel.org/r/2562093f37f4a9cffea0447058014485eb50aaaf.1762812360.git.lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Byungchul Park <byungchul@sk.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Chris Li <chrisl@kernel.org>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Gregory Price <gourry@gourry.net>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: "Huang, Ying" <ying.huang@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Janosch Frank <frankja@linux.ibm.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Joshua Hahn <joshua.hahnjy@gmail.com>
Cc: Kairui Song <kasong@tencent.com>
Cc: Kemeng Shi <shikemeng@huaweicloud.com>
Cc: Lance Yang <lance.yang@linux.dev>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mathew Brost <matthew.brost@intel.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Nico Pache <npache@redhat.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Pasha Tatashin <pasha.tatashin@soleen.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Rakie Kim <rakie.kim@sk.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Wei Xu <weixugc@google.com>
Cc: xu xin <xu.xin16@zte.com.cn>
Cc: Yuanchu Xie <yuanchu@google.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c0a80c2c

arch/s390/mm/gmap_helpers.c

+10 −10
Original line number Diff line number Diff line
@@ -11,27 +11,27 @@ 
#include <linux/mm.h>

#include <linux/hugetlb.h>

#include <linux/swap.h>

#include <linux/swapops.h>

#include <linux/leafops.h>

#include <linux/pagewalk.h>

#include <linux/ksm.h>

#include <asm/gmap_helpers.h>

#include <asm/pgtable.h>



/**

 * ptep_zap_swap_entry() - discard a swap entry.

 * ptep_zap_softleaf_entry() - discard a software leaf entry.

 * @mm: the mm

 * @entry: the swap entry that needs to be zapped

 * @entry: the software leaf entry that needs to be zapped

 *

 * Discards the given swap entry. If the swap entry was an actual swap

 * entry (and not a migration entry, for example), the actual swapped

 * Discards the given software leaf entry. If the leaf entry was an actual

 * swap entry (and not a migration entry, for example), the actual swapped

 * page is also discarded from swap.

 */

static void ptep_zap_swap_entry(struct mm_struct *mm, swp_entry_t entry)

static void ptep_zap_softleaf_entry(struct mm_struct *mm, softleaf_t entry)

{

	if (!non_swap_entry(entry))

	if (softleaf_is_swap(entry))

		dec_mm_counter(mm, MM_SWAPENTS);

	else if (is_migration_entry(entry))

		dec_mm_counter(mm, mm_counter(pfn_swap_entry_folio(entry)));

	else if (softleaf_is_migration(entry))

		dec_mm_counter(mm, mm_counter(softleaf_to_folio(entry)));

	free_swap_and_cache(entry);

}
@@ -66,7 +66,7 @@ void gmap_helper_zap_one_page(struct mm_struct *mm, unsigned long vmaddr) 
		preempt_disable();

		pgste = pgste_get_lock(ptep);



		ptep_zap_swap_entry(mm, pte_to_swp_entry(*ptep));

		ptep_zap_softleaf_entry(mm, softleaf_from_pte(*ptep));

		pte_clear(mm, vmaddr, ptep);



		pgste_set_unlock(ptep, pgste);

arch/s390/mm/pgtable.c

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/spinlock.h>

#include <linux/rcupdate.h>

#include <linux/slab.h>

#include <linux/swapops.h>

#include <linux/leafops.h>

#include <linux/sysctl.h>

#include <linux/ksm.h>

#include <linux/mman.h>
@@ -683,12 +683,12 @@ void ptep_unshadow_pte(struct mm_struct *mm, unsigned long saddr, pte_t *ptep) 
	pgste_set_unlock(ptep, pgste);

}



static void ptep_zap_swap_entry(struct mm_struct *mm, swp_entry_t entry)

static void ptep_zap_softleaf_entry(struct mm_struct *mm, softleaf_t entry)

{

	if (!non_swap_entry(entry))

	if (softleaf_is_swap(entry))

		dec_mm_counter(mm, MM_SWAPENTS);

	else if (is_migration_entry(entry)) {

		struct folio *folio = pfn_swap_entry_folio(entry);

	else if (softleaf_is_migration(entry)) {

		struct folio *folio = softleaf_to_folio(entry);



		dec_mm_counter(mm, mm_counter(folio));

	}
@@ -710,7 +710,7 @@ void ptep_zap_unused(struct mm_struct *mm, unsigned long addr, 
	if (!reset && pte_swap(pte) &&

	    ((pgstev & _PGSTE_GPS_USAGE_MASK) == _PGSTE_GPS_USAGE_UNUSED ||

	     (pgstev & _PGSTE_GPS_ZERO))) {

		ptep_zap_swap_entry(mm, pte_to_swp_entry(pte));

		ptep_zap_softleaf_entry(mm, softleaf_from_pte(pte));

		pte_clear(mm, addr, ptep);

	}

	if (reset)

fs/proc/task_mmu.c

+6 −6
Original line number Diff line number Diff line
@@ -1020,13 +1020,13 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, 
	} else if (pte_none(ptent)) {

		smaps_pte_hole_lookup(addr, walk);

	} else {

		swp_entry_t swpent = pte_to_swp_entry(ptent);

		const softleaf_t entry = softleaf_from_pte(ptent);



		if (!non_swap_entry(swpent)) {

		if (softleaf_is_swap(entry)) {

			int mapcount;



			mss->swap += PAGE_SIZE;

			mapcount = swp_swapcount(swpent);

			mapcount = swp_swapcount(entry);

			if (mapcount >= 2) {

				u64 pss_delta = (u64)PAGE_SIZE << PSS_SHIFT;
@@ -1035,10 +1035,10 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, 
			} else {

				mss->swap_pss += (u64)PAGE_SIZE << PSS_SHIFT;

			}

		} else if (is_pfn_swap_entry(swpent)) {

			if (is_device_private_entry(swpent))

		} else if (softleaf_has_pfn(entry)) {

			if (softleaf_is_device_private(entry))

				present = true;

			page = pfn_swap_entry_to_page(swpent);

			page = softleaf_to_page(entry);

		}

	}

include/linux/swapops.h

+0 −5
Original line number Diff line number Diff line
@@ -492,10 +492,5 @@ static inline pmd_t swp_entry_to_pmd(swp_entry_t entry) 


#endif  /* CONFIG_ARCH_ENABLE_THP_MIGRATION */



static inline int non_swap_entry(swp_entry_t entry)

{

	return swp_type(entry) >= MAX_SWAPFILES;

}



#endif /* CONFIG_MMU */

#endif /* _LINUX_SWAPOPS_H */

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -4567,7 +4567,7 @@ static void filemap_cachestat(struct address_space *mapping, 
				swp_entry_t swp = radix_to_swp_entry(folio);



				/* swapin error results in poisoned entry */

				if (non_swap_entry(swp))

				if (!softleaf_is_swap(swp))

					goto resched;



				/*