Skip to contentSkip to conversation

x86/xen/p2m: hint at the last populated P2M entry

PATCH In review David Vrabel 2 participants 3 messages Sep 8, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/xen/p2m: hint at the last populated P2M entry

With commit 633d6f17cd91ad5bf2370265946f716e42d388c6 (x86/xen: prepare p2m list for memory hotplug) the P2M may be sized to accomdate a much larger amount of memory than the domain currently has.

When saving a domain, the toolstack must scan all the P2M looking for populated pages. This results in a performance regression due to the unnecessary scanning.

Instead of reporting (via shared_info) the maximum possible size of the P2M, hint at the last PFN which might be populated. This hint is increased as new leaves are added to the P2M (in the expectation that they will be used for populated entries).

---
 arch/x86/xen/p2m.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
arch/x86/xen/p2m.c +18 -1
index 8b7f18e..b228bc9 100644
@@ -108,6 +108,15 @@ static unsigned long *p2m_identity;
 static pte_t *p2m_missing_pte;
 static pte_t *p2m_identity_pte;
 
+/*
+ * Hint at last populated PFN.
+ *
+ * Used to set HYPERVISOR_shared_info->arch.max_pfn so the toolstack
+ * can avoid scanning the whole P2M (which may be sized to account for
+ * hotplugged memory).
+ */
+static unsigned long xen_p2m_last_pfn;
+
 static inline unsigned p2m_top_index(unsigned long pfn)
 {
 	BUG_ON(pfn >= MAX_P2M_PFN);
@@ -262,7 +271,7 @@ void xen_setup_mfn_list_list(void)
 
 	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;
+	HYPERVISOR_shared_info->arch.max_pfn = xen_p2m_last_pfn;
 }
 
 /* Set up p2m_top to point to the domain-builder provided p2m pages */
@@ -394,6 +403,8 @@ void __init xen_vmalloc_p2m_tree(void)
 	static struct vm_struct vm;
 	unsigned long p2m_limit;
 
+	xen_p2m_last_pfn = xen_max_p2m_pfn;
+
 	p2m_limit = (phys_addr_t)P2M_LIMIT * 1024 * 1024 * 1024 / PAGE_SIZE;
 	vm.flags = VM_ALLOC;
 	vm.size = ALIGN(sizeof(unsigned long) * max(xen_max_p2m_pfn, p2m_limit),
@@ -590,6 +601,12 @@ static bool alloc_p2m(unsigned long pfn)
 			free_p2m_page(p2m);
 	}
 
+	/* Expanded the p2m? */
+	if (pfn >= xen_p2m_last_pfn) {
+		xen_p2m_last_pfn = pfn;
+		HYPERVISOR_shared_info->arch.max_pfn = xen_p2m_last_pfn;
+	}
+
 	return true;
 }
 
Signature · 1 line
2.1.4
maintainer
#1 lore raw
Quoted 2 lines · David Vrabel

With commit 633d6f17cd91ad5bf2370265946f716e42d388c6 (x86/xen: prepare p2m list for memory hotplug) the P2M may be sized to accomdate a much

s/accomdate/accommodate/

Quoted 6 lines

larger amount of memory than the domain currently has.

When saving a domain, the toolstack must scan all the P2M looking for populated pages. This results in a performance regression due to the unnecessary scanning.

Quoted 6 lines

Instead of reporting (via shared_info) the maximum possible size of the P2M, hint at the last PFN which might be populated. This hint is increased as new leaves are added to the P2M (in the expectation that they will be used for populated entries).

I'd suggest an update of arch/x86/include/asm/xen/interface.h regarding a possible change of max_pfn. Something like:

...
* p2m_vaddr holds the virtual address of the linear p2m list. All
* entries in the range [0...max_pfn[ are accessible via this pointer.
+ * max_pfn is allowed to be changed by the guest to reflect a change
+ * of the highest used page frame.
...

Quoted 43 lines
---
  arch/x86/xen/p2m.c | 19 ++++++++++++++++++-
  1 file changed, 18 insertions(+), 1 deletion(-)
arch/x86/xen/p2m.c +12 -1
index 8b7f18e..b228bc9 100644
@@ -108,6 +108,15 @@ static unsigned long *p2m_identity;
  static pte_t *p2m_missing_pte;
  static pte_t *p2m_identity_pte;
 
+/*
+ * Hint at last populated PFN.
+ *
+ * Used to set HYPERVISOR_shared_info->arch.max_pfn so the toolstack
+ * can avoid scanning the whole P2M (which may be sized to account for
+ * hotplugged memory).
+ */
+static unsigned long xen_p2m_last_pfn;
+
  static inline unsigned p2m_top_index(unsigned long pfn)
  {
  	BUG_ON(pfn >= MAX_P2M_PFN);
@@ -262,7 +271,7 @@ void xen_setup_mfn_list_list(void)
 
  	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;
+	HYPERVISOR_shared_info->arch.max_pfn = xen_p2m_last_pfn;
  }
 
  /* Set up p2m_top to point to the domain-builder provided p2m pages */
@@ -394,6 +403,8 @@ void __init xen_vmalloc_p2m_tree(void)
  	static struct vm_struct vm;
  	unsigned long p2m_limit;
 
+	xen_p2m_last_pfn = xen_max_p2m_pfn;
+
  	p2m_limit = (phys_addr_t)P2M_LIMIT * 1024 * 1024 * 1024 / PAGE_SIZE;
  	vm.flags = VM_ALLOC;
  	vm.size = ALIGN(sizeof(unsigned long) * max(xen_max_p2m_pfn, p2m_limit),

arch/x86/xen/p2m.c static bool alloc_p2m(unsigned long pfn) · line 605

Quoted 5 lines
arch/x86/xen/p2m.c +2 -0
@@ -590,6 +601,12 @@ static bool alloc_p2m(unsigned long pfn)
  			free_p2m_page(p2m);
  	}
 
+	/* Expanded the p2m? */
+	if (pfn >= xen_p2m_last_pfn) {

I think "pfn > xen_p2m_last_pfn" would be better.

arch/x86/xen/p2m.c static bool alloc_p2m(unsigned long pfn) · line 611

Quoted 6 lines
arch/x86/xen/p2m.c +4 -0
+		xen_p2m_last_pfn = pfn;
+		HYPERVISOR_shared_info->arch.max_pfn = xen_p2m_last_pfn;
+	}
+
  	return true;
  }

Juergen

#2 lore raw

Review

Quoted 9 lines · Juergen Gross

I'd suggest an update of arch/x86/include/asm/xen/interface.h regarding a possible change of max_pfn. Something like:

...
* p2m_vaddr holds the virtual address of the linear p2m list. All
* entries in the range [0...max_pfn[ are accessible via this pointer.

(quoted diff) +2 -0
+  * max_pfn is allowed to be changed by the guest to reflect a change
+  * of the highest used page frame.

This header comes from Xen so I'll need to update it there first.

David