Commit 781198f1 authored Feb 07, 2018 by Simon Gaiser Committed by Juergen Gross Feb 08, 2018

xen: Fix {set,clear}_foreign_p2m_mapping on autotranslating guests



Commit 82616f95 ("xen: remove tests for pvh mode in pure pv paths")
removed the check for autotranslation from {set,clear}_foreign_p2m_mapping
but those are called by grant-table.c also on PVH/HVM guests.

Cc: <stable@vger.kernel.org> # 4.14
Fixes: 82616f95 ("xen: remove tests for pvh mode in pure pv paths")
Signed-off-by: Simon Gaiser <simon@invisiblethingslab.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>

parent 76119125

arch/x86/xen/p2m.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -694,6 +694,9 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
		int i, ret = 0;
		pte_t *pte;

		if (xen_feature(XENFEAT_auto_translated_physmap))
		return 0;

		if (kmap_ops) {
		ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref,
		kmap_ops, count);
		@@ -736,6 +739,9 @@ int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,
		{
		int i, ret = 0;

		if (xen_feature(XENFEAT_auto_translated_physmap))
		return 0;

		for (i = 0; i < count; i++) {
		unsigned long mfn = __pfn_to_mfn(page_to_pfn(pages[i]));
		unsigned long pfn = page_to_pfn(pages[i]);