Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 215321a0 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Greg Kroah-Hartman
Browse files

mm/zsmalloc: Prepare to variable MAX_PHYSMEM_BITS 



commit 02390b87a9459937cdb299e6b34ff33992512ec7 upstream

With boot-time switching between paging mode we will have variable
MAX_PHYSMEM_BITS.

Let's use the maximum variable possible for CONFIG_X86_5LEVEL=y
configuration to define zsmalloc data structures.

The patch introduces MAX_POSSIBLE_PHYSMEM_BITS to cover such case.
It also suits well to handle PAE special case.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: default avatarNitin Gupta <ngupta@vflare.org>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20180214111656.88514-3-kirill.shutemov@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
[florian: drop arch/x86/include/asm/pgtable_64_types.h changes since
there is no CONFIG_X86_5LEVEL]
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e4814a4

arch/x86/include/asm/pgtable-3level_types.h

+1 −0
Original line number Diff line number Diff line
@@ -42,5 +42,6 @@ typedef union { 
 */

#define PTRS_PER_PTE	512



#define MAX_POSSIBLE_PHYSMEM_BITS	36



#endif /* _ASM_X86_PGTABLE_3LEVEL_DEFS_H */

mm/zsmalloc.c

+7 −6
Original line number Diff line number Diff line
@@ -83,18 +83,19 @@ 
 * This is made more complicated by various memory models and PAE.

 */



#ifndef MAX_PHYSMEM_BITS

#ifdef CONFIG_HIGHMEM64G

#define MAX_PHYSMEM_BITS 36

#else /* !CONFIG_HIGHMEM64G */

#ifndef MAX_POSSIBLE_PHYSMEM_BITS

#ifdef MAX_PHYSMEM_BITS

#define MAX_POSSIBLE_PHYSMEM_BITS MAX_PHYSMEM_BITS

#else

/*

 * If this definition of MAX_PHYSMEM_BITS is used, OBJ_INDEX_BITS will just

 * be PAGE_SHIFT

 */

#define MAX_PHYSMEM_BITS BITS_PER_LONG

#define MAX_POSSIBLE_PHYSMEM_BITS BITS_PER_LONG

#endif

#endif

#define _PFN_BITS		(MAX_PHYSMEM_BITS - PAGE_SHIFT)



#define _PFN_BITS		(MAX_POSSIBLE_PHYSMEM_BITS - PAGE_SHIFT)



/*

 * Memory for allocating for handle keeps object position by