Commit 728b0e21 authored by Claudio Imbrenda's avatar Claudio Imbrenda
Browse files

KVM: S390: Remove PGSTE code from linux/s390 mm 



Remove the PGSTE config option.
Remove all code from linux/s390 mm that involves PGSTEs.

Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
parent cec38587

arch/s390/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ config GENERIC_BUG_RELATIVE_POINTERS 
config GENERIC_LOCKBREAK

	def_bool y if PREEMPTION



config PGSTE

	def_bool n



config AUDIT_ARCH

	def_bool y

arch/s390/include/asm/hugetlb.h

+0 −6
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm, 
	return __huge_ptep_get_and_clear(mm, addr, ptep);

}



static inline void arch_clear_hugetlb_flags(struct folio *folio)

{

	clear_bit(PG_arch_1, &folio->flags.f);

}

#define arch_clear_hugetlb_flags arch_clear_hugetlb_flags



#define __HAVE_ARCH_HUGE_PTE_CLEAR

static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,

				  pte_t *ptep, unsigned long sz)

arch/s390/include/asm/mmu.h

+0 −13
Original line number Diff line number Diff line
@@ -18,24 +18,11 @@ typedef struct { 
	unsigned long vdso_base;

	/* The mmu context belongs to a secure guest. */

	atomic_t protected_count;

	/*

	 * The following bitfields need a down_write on the mm

	 * semaphore when they are written to. As they are only

	 * written once, they can be read without a lock.

	 */

	/* The mmu context uses extended page tables. */

	unsigned int has_pgste:1;

	/* The mmu context uses storage keys. */

	unsigned int uses_skeys:1;

	/* The mmu context uses CMM. */

	unsigned int uses_cmm:1;

	/*

	 * The mmu context allows COW-sharing of memory pages (KSM, zeropage).

	 * Note that COW-sharing during fork() is currently always allowed.

	 */

	unsigned int allow_cow_sharing:1;

	/* The gmaps associated with this context are allowed to use huge pages. */

	unsigned int allow_gmap_hpage_1m:1;

} mm_context_t;



#define INIT_MM_CONTEXT(name)						   \

arch/s390/include/asm/page.h

+0 −4
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static inline void copy_page(void *to, void *from) 
#ifdef STRICT_MM_TYPECHECKS



typedef struct { unsigned long pgprot; } pgprot_t;

typedef struct { unsigned long pgste; } pgste_t;

typedef struct { unsigned long pte; } pte_t;

typedef struct { unsigned long pmd; } pmd_t;

typedef struct { unsigned long pud; } pud_t;
@@ -94,7 +93,6 @@ static __always_inline unsigned long name ## _val(name ## _t name) \ 
#else /* STRICT_MM_TYPECHECKS */



typedef unsigned long pgprot_t;

typedef unsigned long pgste_t;

typedef unsigned long pte_t;

typedef unsigned long pmd_t;

typedef unsigned long pud_t;
@@ -110,7 +108,6 @@ static __always_inline unsigned long name ## _val(name ## _t name) \ 
#endif /* STRICT_MM_TYPECHECKS */



DEFINE_PGVAL_FUNC(pgprot)

DEFINE_PGVAL_FUNC(pgste)

DEFINE_PGVAL_FUNC(pte)

DEFINE_PGVAL_FUNC(pmd)

DEFINE_PGVAL_FUNC(pud)
@@ -120,7 +117,6 @@ DEFINE_PGVAL_FUNC(pgd) 
typedef pte_t *pgtable_t;



#define __pgprot(x)	((pgprot_t) { (x) } )

#define __pgste(x)	((pgste_t) { (x) } )

#define __pte(x)        ((pte_t) { (x) } )

#define __pmd(x)        ((pmd_t) { (x) } )

#define __pud(x)	((pud_t) { (x) } )

arch/s390/include/asm/pgalloc.h

+0 −4
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ unsigned long *page_table_alloc_noprof(struct mm_struct *); 
#define page_table_alloc(...)	alloc_hooks(page_table_alloc_noprof(__VA_ARGS__))

void page_table_free(struct mm_struct *, unsigned long *);



struct ptdesc *page_table_alloc_pgste_noprof(struct mm_struct *mm);

#define page_table_alloc_pgste(...)	alloc_hooks(page_table_alloc_pgste_noprof(__VA_ARGS__))

void page_table_free_pgste(struct ptdesc *ptdesc);



static inline void crst_table_init(unsigned long *crst, unsigned long entry)

{

	memset64((u64 *)crst, entry, _CRST_ENTRIES);