[Xen-changelog] [xen stable-4.7] x86: extend get_platform_badpages() interface

[p***@xen.org]

commit 4e69e432724ccf2514cf5539c7c63aaf31cdf4f9
Author: Jan Beulich <***@suse.com>
AuthorDate: Wed Nov 7 09:54:07 2018 +0100
Commit: Jan Beulich <***@suse.com>
CommitDate: Wed Nov 7 09:54:07 2018 +0100

x86: extend get_platform_badpages() interface

Use a structure so along with an address (now frame number) an order can
also be specified.

This is part of XSA-282.

Signed-off-by: Jan Beulich <***@suse.com>
Reviewed-by: Andrew Cooper <***@citrix.com>
master commit: 8617e69fb8307b372eeff41d55ec966dbeba36eb
master date: 2018-11-07 09:32:08 +0100
---
xen/arch/x86/mm.c | 22 +++++++++++-----------
xen/common/page_alloc.c | 6 +++---
xen/include/asm-x86/mm.h | 8 +++++++-
3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 544cc0029c..075072c253 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -6965,23 +6965,23 @@ void arch_dump_shared_mem_info(void)
mem_sharing_get_nr_saved_mfns());
}

-const unsigned long *__init get_platform_badpages(unsigned int *array_size)
+const struct platform_bad_page *__init get_platform_badpages(unsigned int *array_size)
{
u32 igd_id;
- static unsigned long __initdata bad_pages[] = {
- 0x20050000,
- 0x20110000,
- 0x20130000,
- 0x20138000,
- 0x40004000,
+ static const struct platform_bad_page __initconst snb_bad_pages[] = {
+ { .mfn = 0x20050000 >> PAGE_SHIFT },
+ { .mfn = 0x20110000 >> PAGE_SHIFT },
+ { .mfn = 0x20130000 >> PAGE_SHIFT },
+ { .mfn = 0x20138000 >> PAGE_SHIFT },
+ { .mfn = 0x40004000 >> PAGE_SHIFT },
};

- *array_size = ARRAY_SIZE(bad_pages);
+ *array_size = ARRAY_SIZE(snb_bad_pages);
igd_id = pci_conf_read32(0, 0, 2, 0, 0);
- if ( !IS_SNB_GFX(igd_id) )
- return NULL;
+ if ( IS_SNB_GFX(igd_id) )
+ return snb_bad_pages;

- return bad_pages;
+ return NULL;
}

void paging_invlpg(struct vcpu *v, unsigned long va)
diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 8e62181a7b..d027819f7b 100644
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -273,7 +273,7 @@ void __init init_boot_pages(paddr_t ps, paddr_t pe)
unsigned long bad_spfn, bad_epfn;
const char *p;
#ifdef CONFIG_X86
- const unsigned long *badpage = NULL;
+ const struct platform_bad_page *badpage;
unsigned int i, array_size;
#endif

@@ -298,8 +298,8 @@ void __init init_boot_pages(paddr_t ps, paddr_t pe)
{
for ( i = 0; i < array_size; i++ )
{
- bootmem_region_zap(*badpage >> PAGE_SHIFT,
- (*badpage >> PAGE_SHIFT) + 1);
+ bootmem_region_zap(badpage->mfn,
+ badpage->mfn + (1U << badpage->order));
badpage++;
}
}
diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index a560dfa731..0637704ff0 100644
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -342,7 +342,13 @@ int is_iomem_page(unsigned long mfn);

void clear_superpage_mark(struct page_info *page);

-const unsigned long *get_platform_badpages(unsigned int *array_size);
+struct platform_bad_page {
+ unsigned long mfn;
+ unsigned int order;
+};
+
+const struct platform_bad_page *get_platform_badpages(unsigned int *array_size);
+
/* Per page locks:
* page_lock() is used for two purposes: pte serialization, and memory sharing.
*
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.7