Commit 17596731 authored by Robin Murphy's avatar Robin Murphy Committed by Linus Torvalds
Browse files

mm: introduce ARCH_HAS_PTE_DEVMAP 

ARCH_HAS_ZONE_DEVICE is somewhat meaningless in itself, and combined
with the long-out-of-date comment can lead to the impression than an
architecture may just enable it (since __add_pages() now "comprehends
device memory" for itself) and expect things to work.

In practice, however, ZONE_DEVICE users have little chance of
functioning correctly without __HAVE_ARCH_PTE_DEVMAP, so let's clean
that up the same way as ARCH_HAS_PTE_SPECIAL and make it the proper
dependency so the real situation is clearer.

Link: http://lkml.kernel.org/r/87554aa78478a02a63f2c4cf60a847279ae3eb3b.1558547956.git.robin.murphy@arm.com


Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Acked-by: default avatarOliver O'Halloran <oohall@gmail.com>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7588adf8

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ config PPC 
	select ARCH_HAS_MMIOWB			if PPC64

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_PMEM_API                if PPC64

	select ARCH_HAS_PTE_DEVMAP		if PPC_BOOK3S_64

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_MEMBARRIER_CALLBACKS

	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE && PPC64
@@ -136,7 +137,6 @@ config PPC 
	select ARCH_HAS_TICK_BROADCAST		if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UACCESS_FLUSHCACHE	if PPC64

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAS_ZONE_DEVICE		if PPC_BOOK3S_64

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_KEEP_MEMBLOCK

	select ARCH_MIGHT_HAVE_PC_PARPORT

arch/powerpc/include/asm/book3s/64/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
#define _PAGE_SOFT_DIRTY	_RPAGE_SW3 /* software: software dirty tracking */

#define _PAGE_SPECIAL		_RPAGE_SW2 /* software: special page */

#define _PAGE_DEVMAP		_RPAGE_SW1 /* software: ZONE_DEVICE page */

#define __HAVE_ARCH_PTE_DEVMAP



/*

 * Drivers request for cache inhibited pte mapping using _PAGE_NO_CACHE

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ config X86 
	select ARCH_HAS_KCOV			if X86_64

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_PMEM_API		if X86_64

	select ARCH_HAS_PTE_DEVMAP		if X86_64

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_REFCOUNT

	select ARCH_HAS_UACCESS_FLUSHCACHE	if X86_64
@@ -80,7 +81,6 @@ config X86 
	select ARCH_HAS_STRICT_MODULE_RWX

	select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAS_ZONE_DEVICE		if X86_64

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_MIGHT_HAVE_ACPI_PDC		if ACPI

	select ARCH_MIGHT_HAVE_PC_PARPORT

arch/x86/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static inline int has_transparent_hugepage(void) 
	return boot_cpu_has(X86_FEATURE_PSE);

}



#ifdef __HAVE_ARCH_PTE_DEVMAP

#ifdef CONFIG_ARCH_HAS_PTE_DEVMAP

static inline int pmd_devmap(pmd_t pmd)

{

	return !!(pmd_val(pmd) & _PAGE_DEVMAP);
@@ -732,7 +732,7 @@ static inline int pte_present(pte_t a) 
	return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);

}



#ifdef __HAVE_ARCH_PTE_DEVMAP

#ifdef CONFIG_ARCH_HAS_PTE_DEVMAP

static inline int pte_devmap(pte_t a)

{

	return (pte_flags(a) & _PAGE_DEVMAP) == _PAGE_DEVMAP;

arch/x86/include/asm/pgtable_types.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ 
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)

#define _PAGE_NX	(_AT(pteval_t, 1) << _PAGE_BIT_NX)

#define _PAGE_DEVMAP	(_AT(u64, 1) << _PAGE_BIT_DEVMAP)

#define __HAVE_ARCH_PTE_DEVMAP

#else

#define _PAGE_NX	(_AT(pteval_t, 0))

#define _PAGE_DEVMAP	(_AT(pteval_t, 0))

CRA Git | Maintained and supported by SUSTech CRA and CCSE