Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b194da25 authored by Boris Ostrovsky's avatar Boris Ostrovsky
Browse files

xen: Don't try to call xen_alloc_p2m_entry() on autotranslating guests 



Commit aba831a69632 ("xen: remove tests for pvh mode in pure pv paths")
removed XENFEAT_auto_translated_physmap test in xen_alloc_p2m_entry()
since it is assumed that the routine is never called by non-PV guests.

However, alloc_xenballooned_pages() may make this call on a PVH guest.
Prevent this from happening by adding XENFEAT_auto_translated_physmap
check there.

Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Fixes: aba831a69632 ("xen: remove tests for pvh mode in pure pv paths")
parent 22f12f0d

drivers/xen/balloon.c

+5 −3
Original line number Diff line number Diff line
@@ -664,9 +664,11 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages) 
			 */

			BUILD_BUG_ON(XEN_PAGE_SIZE != PAGE_SIZE);



			if (!xen_feature(XENFEAT_auto_translated_physmap)) {

				ret = xen_alloc_p2m_entry(page_to_pfn(page));

				if (ret < 0)

					goto out_undo;

			}

#endif

		} else {

			ret = add_ballooned_pages(nr_pages - pgno);