| Message ID | 1502708222-6926-2-git-send-email-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 14/08/17 11:57, Andrew Cooper wrote: > diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h > index ef84b72..8999ae7 100644 > --- a/xen/include/asm-arm/mm.h > +++ b/xen/include/asm-arm/mm.h > @@ -176,7 +176,7 @@ void __iomem *ioremap_attr(paddr_t start, size_t len, unsigned attributes); > > static inline void __iomem *ioremap_nocache(paddr_t start, size_t len) > { > - return ioremap_attr(start, len, PAGE_HYPERVISOR_NOCACHE); > + return ioremap_attr(start, len, PAGE_HYPERVISOR_UCMINUS); > } Oops - this hunk shouldn't have slipped in. (I thought I'd removed all the ARM changes). The patch should be x86-specific. ~Andrew
>>> On 14.08.17 at 12:57, <andrew.cooper3@citrix.com> wrote: > --- a/xen/arch/x86/boot/x86_64.S > +++ b/xen/arch/x86/boot/x86_64.S > @@ -92,7 +92,7 @@ l1_identmap: > .rept L1_PAGETABLE_ENTRIES > /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ > .if pfn >= 0xa0 && pfn < 0xc0 > - .quad (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_NOCACHE | MAP_SMALL_PAGES > + .quad (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_UCMINUS | MAP_SMALL_PAGES Mind making the comment say UC- at once? > --- a/xen/include/asm-arm/mm.h > +++ b/xen/include/asm-arm/mm.h > @@ -176,7 +176,7 @@ void __iomem *ioremap_attr(paddr_t start, size_t len, unsigned attributes); > > static inline void __iomem *ioremap_nocache(paddr_t start, size_t len) > { > - return ioremap_attr(start, len, PAGE_HYPERVISOR_NOCACHE); > + return ioremap_attr(start, len, PAGE_HYPERVISOR_UCMINUS); > } Is UC- really an arch-independent term? I wouldn't mind switching the x86 side, but I don't think ARM should be changed. Oh, and now I notice your follow-up mail ... So preferably with the comment adjustment above Reviewed-by: Jan Beulich <jbeulich@suse.com> Jan
diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index b640d9b..c3a6a02 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -92,7 +92,7 @@ l1_identmap: .rept L1_PAGETABLE_ENTRIES /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ .if pfn >= 0xa0 && pfn < 0xc0 - .quad (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_NOCACHE | MAP_SMALL_PAGES + .quad (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_UCMINUS | MAP_SMALL_PAGES .else .quad (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR | MAP_SMALL_PAGES .endif diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 88bf4f6..f53ca43 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -6100,7 +6100,7 @@ void __iomem *ioremap(paddr_t pa, size_t len) unsigned int offs = pa & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); - va = __vmap(&mfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE, VMAP_DEFAULT) + offs; + va = __vmap(&mfn, nr, 1, 1, PAGE_HYPERVISOR_UCMINUS, VMAP_DEFAULT) + offs; } return (void __force __iomem *)va; diff --git a/xen/arch/x86/x86_64/mmconfig_64.c b/xen/arch/x86/x86_64/mmconfig_64.c index e84a67d..a7d2e33 100644 --- a/xen/arch/x86/x86_64/mmconfig_64.c +++ b/xen/arch/x86/x86_64/mmconfig_64.c @@ -140,7 +140,7 @@ int pci_mmcfg_arch_enable(unsigned int idx) if (pci_mmcfg_virt[idx].virt) return 0; - pci_mmcfg_virt[idx].virt = mcfg_ioremap(cfg, idx, PAGE_HYPERVISOR_NOCACHE); + pci_mmcfg_virt[idx].virt = mcfg_ioremap(cfg, idx, PAGE_HYPERVISOR_UCMINUS); if (!pci_mmcfg_virt[idx].virt) { printk(KERN_ERR "PCI: Cannot map MCFG aperture for segment %04x\n", cfg->pci_segment); diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index ef84b72..8999ae7 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -176,7 +176,7 @@ void __iomem *ioremap_attr(paddr_t start, size_t len, unsigned attributes); static inline void __iomem *ioremap_nocache(paddr_t start, size_t len) { - return ioremap_attr(start, len, PAGE_HYPERVISOR_NOCACHE); + return ioremap_attr(start, len, PAGE_HYPERVISOR_UCMINUS); } static inline void __iomem *ioremap_cache(paddr_t start, size_t len) diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index 27ecc65..c138def 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -160,6 +160,6 @@ void hvm_acpi_sleep_button(struct domain *d); void save_rest_processor_state(void); void restore_rest_processor_state(void); -#define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR_NOCACHE +#define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR_UCMINUS #endif /*__X86_ASM_ACPI_H*/ diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 054889c..89bf6cb 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -72,7 +72,7 @@ extern void __set_fixmap( __set_fixmap(idx, (phys)>>PAGE_SHIFT, PAGE_HYPERVISOR) #define set_fixmap_nocache(idx, phys) \ - __set_fixmap(idx, (phys)>>PAGE_SHIFT, PAGE_HYPERVISOR_NOCACHE) + __set_fixmap(idx, (phys)>>PAGE_SHIFT, PAGE_HYPERVISOR_UCMINUS) #define clear_fixmap(idx) __set_fixmap(idx, 0, 0) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 0f843c2..0b68c5e 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -322,7 +322,7 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #define __PAGE_HYPERVISOR_RX (_PAGE_PRESENT | _PAGE_ACCESSED) #define __PAGE_HYPERVISOR (__PAGE_HYPERVISOR_RX | \ _PAGE_DIRTY | _PAGE_RW) -#define __PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR | _PAGE_PCD) +#define __PAGE_HYPERVISOR_UCMINUS (__PAGE_HYPERVISOR | _PAGE_PCD) #define MAP_SMALL_PAGES _PAGE_AVAIL0 /* don't use superpages mappings */ diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 1b48309..e102624 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -166,10 +166,10 @@ typedef l4_pgentry_t root_pgentry_t; #ifdef __ASSEMBLY__ /* Dependency on NX being available can't be expressed. */ # define PAGE_HYPERVISOR PAGE_HYPERVISOR_RWX -# define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) +# define PAGE_HYPERVISOR_UCMINUS (__PAGE_HYPERVISOR_UCMINUS | _PAGE_GLOBAL) #else # define PAGE_HYPERVISOR PAGE_HYPERVISOR_RW -# define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | \ +# define PAGE_HYPERVISOR_UCMINUS (__PAGE_HYPERVISOR_UCMINUS | \ _PAGE_GLOBAL | _PAGE_NX) #endif
To better describe its actual function. No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> --- xen/arch/x86/boot/x86_64.S | 2 +- xen/arch/x86/mm.c | 2 +- xen/arch/x86/x86_64/mmconfig_64.c | 2 +- xen/include/asm-arm/mm.h | 2 +- xen/include/asm-x86/acpi.h | 2 +- xen/include/asm-x86/fixmap.h | 2 +- xen/include/asm-x86/page.h | 2 +- xen/include/asm-x86/x86_64/page.h | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-)