Unverified Commit 2b8acd71 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Merge patch series "NAPOT Fixes" 

Alexandre Ghiti <alexghiti@rivosinc.com> says:

This contains 2 fixes for NAPOT: patch 1 disables the use of NAPOT
mapping for vmalloc/vmap and patch 2 implements pte_leaf_size() to
report NAPOT size.

* b4-shazam-merge:
  riscv: Fix pte_leaf_size() for NAPOT
  Revert "riscv: mm: support Svnapot in huge vmap"

Link: https://lore.kernel.org/r/20240227205016.121901-1-alexghiti@rivosinc.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parents e2b6bc28 e0fe5ab4

arch/riscv/include/asm/pgtable.h

+4 −0
Original line number Diff line number Diff line
@@ -439,6 +439,10 @@ static inline pte_t pte_mkhuge(pte_t pte) 
	return pte;

}



#define pte_leaf_size(pte)	(pte_napot(pte) ?				\

					napot_cont_size(napot_cont_order(pte)) :\

					PAGE_SIZE)



#ifdef CONFIG_NUMA_BALANCING

/*

 * See the comment in include/asm-generic/pgtable.h

arch/riscv/include/asm/vmalloc.h

+1 −60
Original line number Diff line number Diff line
@@ -19,65 +19,6 @@ static inline bool arch_vmap_pmd_supported(pgprot_t prot) 
	return true;

}



#ifdef CONFIG_RISCV_ISA_SVNAPOT

#include <linux/pgtable.h>

#endif



#define arch_vmap_pte_range_map_size arch_vmap_pte_range_map_size

static inline unsigned long arch_vmap_pte_range_map_size(unsigned long addr, unsigned long end,

							 u64 pfn, unsigned int max_page_shift)

{

	unsigned long map_size = PAGE_SIZE;

	unsigned long size, order;



	if (!has_svnapot())

		return map_size;



	for_each_napot_order_rev(order) {

		if (napot_cont_shift(order) > max_page_shift)

			continue;



		size = napot_cont_size(order);

		if (end - addr < size)

			continue;



		if (!IS_ALIGNED(addr, size))

			continue;



		if (!IS_ALIGNED(PFN_PHYS(pfn), size))

			continue;



		map_size = size;

		break;

	}



	return map_size;

}



#define arch_vmap_pte_supported_shift arch_vmap_pte_supported_shift

static inline int arch_vmap_pte_supported_shift(unsigned long size)

{

	int shift = PAGE_SHIFT;

	unsigned long order;



	if (!has_svnapot())

		return shift;



	WARN_ON_ONCE(size >= PMD_SIZE);



	for_each_napot_order_rev(order) {

		if (napot_cont_size(order) > size)

			continue;



		if (!IS_ALIGNED(size, napot_cont_size(order)))

			continue;



		shift = napot_cont_shift(order);

		break;

	}



	return shift;

}



#endif /* CONFIG_RISCV_ISA_SVNAPOT */

#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */

#endif /* _ASM_RISCV_VMALLOC_H */