Commit f955371c authored by David Vrabel's avatar David Vrabel Committed by Stefano Stabellini
Browse files

x86: remove the Xen-specific _PAGE_IOMAP PTE flag 



The _PAGE_IO_MAP PTE flag was only used by Xen PV guests to mark PTEs
that were used to map I/O regions that are 1:1 in the p2m.  This
allowed Xen to obtain the correct PFN when converting the MFNs read
from a PTE back to their PFN.

Xen guests no longer use _PAGE_IOMAP for this. Instead mfn_to_pfn()
returns the correct PFN by using a combination of the m2p and p2m to
determine if an MFN corresponds to a 1:1 mapping in the the p2m.

Remove _PAGE_IOMAP, replacing it with _PAGE_UNUSED2 to allow for
future uses of the PTE flag.

Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Acked-by: default avatar"H. Peter Anvin" <hpa@zytor.com>
parent 7f2f8822

arch/x86/include/asm/pgtable_types.h

+5 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#define _PAGE_BIT_SPECIAL	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_CPA_TEST	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_SPLITTING	_PAGE_BIT_SOFTW2 /* only valid on a PSE pmd */

#define _PAGE_BIT_IOMAP		_PAGE_BIT_SOFTW2 /* flag used to indicate IO mapping */

#define _PAGE_BIT_HIDDEN	_PAGE_BIT_SOFTW3 /* hidden by kmemcheck */

#define _PAGE_BIT_SOFT_DIRTY	_PAGE_BIT_SOFTW3 /* software dirty tracking */

#define _PAGE_BIT_NX           63       /* No execute: only valid after cpuid check */
@@ -52,7 +51,7 @@ 
#define _PAGE_PSE	(_AT(pteval_t, 1) << _PAGE_BIT_PSE)

#define _PAGE_GLOBAL	(_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)

#define _PAGE_SOFTW1	(_AT(pteval_t, 1) << _PAGE_BIT_SOFTW1)

#define _PAGE_IOMAP	(_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)

#define _PAGE_SOFTW2	(_AT(pteval_t, 1) << _PAGE_BIT_SOFTW2)

#define _PAGE_PAT	(_AT(pteval_t, 1) << _PAGE_BIT_PAT)

#define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)

#define _PAGE_SPECIAL	(_AT(pteval_t, 1) << _PAGE_BIT_SPECIAL)
@@ -168,10 +167,10 @@ 
#define __PAGE_KERNEL_LARGE_NOCACHE	(__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE)

#define __PAGE_KERNEL_LARGE_EXEC	(__PAGE_KERNEL_EXEC | _PAGE_PSE)



#define __PAGE_KERNEL_IO		(__PAGE_KERNEL | _PAGE_IOMAP)

#define __PAGE_KERNEL_IO_NOCACHE	(__PAGE_KERNEL_NOCACHE | _PAGE_IOMAP)

#define __PAGE_KERNEL_IO_UC_MINUS	(__PAGE_KERNEL_UC_MINUS | _PAGE_IOMAP)

#define __PAGE_KERNEL_IO_WC		(__PAGE_KERNEL_WC | _PAGE_IOMAP)

#define __PAGE_KERNEL_IO		(__PAGE_KERNEL)

#define __PAGE_KERNEL_IO_NOCACHE	(__PAGE_KERNEL_NOCACHE)

#define __PAGE_KERNEL_IO_UC_MINUS	(__PAGE_KERNEL_UC_MINUS)

#define __PAGE_KERNEL_IO_WC		(__PAGE_KERNEL_WC)



#define PAGE_KERNEL			__pgprot(__PAGE_KERNEL)

#define PAGE_KERNEL_RO			__pgprot(__PAGE_KERNEL_RO)

arch/x86/mm/init_32.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static void __init pagetable_init(void) 
	permanent_kmaps_init(pgd_base);

}



pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);

pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);

EXPORT_SYMBOL_GPL(__supported_pte_mask);



/* user-defined highmem size */

arch/x86/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on); 
 * around without checking the pgd every time.

 */



pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;

pteval_t __supported_pte_mask __read_mostly = ~0;

EXPORT_SYMBOL_GPL(__supported_pte_mask);



int force_personality32;

arch/x86/pci/i386.c

+0 −2
Original line number Diff line number Diff line
@@ -442,8 +442,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 
		 */

		prot |= _PAGE_CACHE_UC_MINUS;



	prot |= _PAGE_IOMAP;	/* creating a mapping for IO */



	vma->vm_page_prot = __pgprot(prot);



	if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

arch/x86/xen/enlighten.c

+0 −2
Original line number Diff line number Diff line
@@ -1559,8 +1559,6 @@ asmlinkage __visible void __init xen_start_kernel(void) 
#endif

		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);



	__supported_pte_mask |= _PAGE_IOMAP;



	/*

	 * Prevent page tables from being allocated in highmem, even

	 * if CONFIG_HIGHPTE is enabled.

CRA Git | Maintained and supported by SUSTech CRA and CCSE