xen: don't build mfn tree if tools don't need it (d51e8b3e) · Commits · 戴 / test

In case the Xen tools indicate they don't need the p2m 3 level tree as they support the virtual mapped linear p2m list, just omit building the tree. Signed-off-by:

Juergen Gross <jgross@suse.com> Reviewed-by:

David Vrabel <david.vrabel@citrix.com> Acked-by:

Konrad Rzeszutek Wilk <Konrad.wilk@oracle.com> Signed-off-by:

David Vrabel <david.vrabel@citrix.com>

arch/x86/xen/p2m.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -199,7 +199,8 @@ void __ref xen_build_mfn_list_list(void)
		unsigned int level, topidx, mididx;
		unsigned long *mid_mfn_p;

		if (xen_feature(XENFEAT_auto_translated_physmap))
		if (xen_feature(XENFEAT_auto_translated_physmap) \|\|
		xen_start_info->flags & SIF_VIRT_P2M_4TOOLS)
		return;

		/* Pre-initialize p2m_top_mfn to be completely missing */
		@@ -260,6 +261,9 @@ void xen_setup_mfn_list_list(void)

		BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info);

		if (xen_start_info->flags & SIF_VIRT_P2M_4TOOLS)
		HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list = ~0UL;
		else
		HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
		virt_to_mfn(p2m_top_mfn);
		HYPERVISOR_shared_info->arch.max_pfn = xen_max_p2m_pfn;

Admin message