Commit 403d1338 authored by Magnus Lindholm's avatar Magnus Lindholm Committed by Linus Torvalds
Browse files

mm: pgtable: fix pte_swp_exclusive 



Make pte_swp_exclusive return bool instead of int.  This will better
reflect how pte_swp_exclusive is actually used in the code.

This fixes swap/swapoff problems on Alpha due pte_swp_exclusive not
returning correct values when _PAGE_SWP_EXCLUSIVE bit resides in upper
32-bits of PTE (like on alpha).

Suggested-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarMagnus Lindholm <linmag7@gmail.com>
Cc: Sam James <sam@gentoo.org>
Link: https://lore.kernel.org/lkml/20250218175735.19882-2-linmag7@gmail.com/
Link: https://lore.kernel.org/lkml/20250602041118.GA2675383@ZenIV/


[ Applied as the 'sed' script Al suggested   - Linus ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 488ef356

arch/alpha/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) 
#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })

#define __swp_entry_to_pte(x)	((pte_t) { (x).val })



static inline int pte_swp_exclusive(pte_t pte)

static inline bool pte_swp_exclusive(pte_t pte)

{

	return pte_val(pte) & _PAGE_SWP_EXCLUSIVE;

}

arch/arc/include/asm/pgtable-bits-arcv2.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void update_mmu_cache_range(struct vm_fault *vmf, struct vm_area_struct *vma, 
#define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) })

#define __swp_entry_to_pte(x)		((pte_t) { (x).val })



static inline int pte_swp_exclusive(pte_t pte)

static inline bool pte_swp_exclusive(pte_t pte)

{

	return pte_val(pte) & _PAGE_SWP_EXCLUSIVE;

}

arch/arm/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })

#define __swp_entry_to_pte(swp)	__pte((swp).val)



static inline int pte_swp_exclusive(pte_t pte)

static inline bool pte_swp_exclusive(pte_t pte)

{

	return pte_isset(pte, L_PTE_SWP_EXCLUSIVE);

}

arch/arm64/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static inline pte_t pte_swp_mkexclusive(pte_t pte) 
	return set_pte_bit(pte, __pgprot(PTE_SWP_EXCLUSIVE));

}



static inline int pte_swp_exclusive(pte_t pte)

static inline bool pte_swp_exclusive(pte_t pte)

{

	return pte_val(pte) & PTE_SWP_EXCLUSIVE;

}

arch/csky/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static inline pte_t pte_mkyoung(pte_t pte) 
	return pte;

}



static inline int pte_swp_exclusive(pte_t pte)

static inline bool pte_swp_exclusive(pte_t pte)

{

	return pte_val(pte) & _PAGE_SWP_EXCLUSIVE;

}