1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
From e5a5bdeba6a0c3eacd2ba39c1ee36b3c54e77dca Mon Sep 17 00:00:00 2001
From: Henry Wang <Henry.Wang@arm.com>
Date: Tue, 25 Oct 2022 09:21:12 +0000
Subject: [PATCH 28/87] xen/arm: p2m: Populate pages for GICv2 mapping in
p2m_init()
Hardware using GICv2 needs to create a P2M mapping of 8KB GICv2 area
when the domain is created. Considering the worst case of page tables
which requires 6 P2M pages as the two pages will be consecutive but not
necessarily in the same L3 page table and keep a buffer, populate 16
pages as the default value to the P2M pages pool in p2m_init() at the
domain creation stage to satisfy the GICv2 requirement. For GICv3, the
above-mentioned P2M mapping is not necessary, but since the allocated
16 pages here would not be lost, hence populate these pages
unconditionally.
With the default 16 P2M pages populated, there would be a case that
failures would happen in the domain creation with P2M pages already in
use. To properly free the P2M for this case, firstly support the
optionally preemption of p2m_teardown(), then call p2m_teardown() and
p2m_set_allocation(d, 0, NULL) non-preemptively in p2m_final_teardown().
As non-preemptive p2m_teardown() should only return 0, use a
BUG_ON to confirm that.
Since p2m_final_teardown() is called either after
domain_relinquish_resources() where relinquish_p2m_mapping() has been
called, or from failure path of domain_create()/arch_domain_create()
where mappings that require p2m_put_l3_page() should never be created,
relinquish_p2m_mapping() is not added in p2m_final_teardown(), add
in-code comments to refer this.
Fixes: cbea5a1149ca ("xen/arm: Allocate and free P2M pages from the P2M pool")
Suggested-by: Julien Grall <jgrall@amazon.com>
Signed-off-by: Henry Wang <Henry.Wang@arm.com>
Reviewed-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
(cherry picked from commit: c7cff1188802646eaa38e918e5738da0e84949be)
---
xen/arch/arm/domain.c | 2 +-
xen/arch/arm/p2m.c | 34 ++++++++++++++++++++++++++++++++--
xen/include/asm-arm/p2m.h | 14 ++++++++++----
3 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index a818f33a1afa..c7feaa323ad1 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -1059,7 +1059,7 @@ int domain_relinquish_resources(struct domain *d)
return ret;
PROGRESS(p2m):
- ret = p2m_teardown(d);
+ ret = p2m_teardown(d, true);
if ( ret )
return ret;
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 4f7d923ad9f8..6f87e17c1d08 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -1661,7 +1661,7 @@ static void p2m_free_vmid(struct domain *d)
spin_unlock(&vmid_alloc_lock);
}
-int p2m_teardown(struct domain *d)
+int p2m_teardown(struct domain *d, bool allow_preemption)
{
struct p2m_domain *p2m = p2m_get_hostp2m(d);
unsigned long count = 0;
@@ -1669,6 +1669,9 @@ int p2m_teardown(struct domain *d)
unsigned int i;
int rc = 0;
+ if ( page_list_empty(&p2m->pages) )
+ return 0;
+
p2m_write_lock(p2m);
/*
@@ -1692,7 +1695,7 @@ int p2m_teardown(struct domain *d)
p2m_free_page(p2m->domain, pg);
count++;
/* Arbitrarily preempt every 512 iterations */
- if ( !(count % 512) && hypercall_preempt_check() )
+ if ( allow_preemption && !(count % 512) && hypercall_preempt_check() )
{
rc = -ERESTART;
break;
@@ -1712,7 +1715,20 @@ void p2m_final_teardown(struct domain *d)
if ( !p2m->domain )
return;
+ /*
+ * No need to call relinquish_p2m_mapping() here because
+ * p2m_final_teardown() is called either after domain_relinquish_resources()
+ * where relinquish_p2m_mapping() has been called, or from failure path of
+ * domain_create()/arch_domain_create() where mappings that require
+ * p2m_put_l3_page() should never be created. For the latter case, also see
+ * comment on top of the p2m_set_entry() for more info.
+ */
+
+ BUG_ON(p2m_teardown(d, false));
ASSERT(page_list_empty(&p2m->pages));
+
+ while ( p2m_teardown_allocation(d) == -ERESTART )
+ continue; /* No preemption support here */
ASSERT(page_list_empty(&d->arch.paging.p2m_freelist));
if ( p2m->root )
@@ -1779,6 +1795,20 @@ int p2m_init(struct domain *d)
if ( rc )
return rc;
+ /*
+ * Hardware using GICv2 needs to create a P2M mapping of 8KB GICv2 area
+ * when the domain is created. Considering the worst case for page
+ * tables and keep a buffer, populate 16 pages to the P2M pages pool here.
+ * For GICv3, the above-mentioned P2M mapping is not necessary, but since
+ * the allocated 16 pages here would not be lost, hence populate these
+ * pages unconditionally.
+ */
+ spin_lock(&d->arch.paging.lock);
+ rc = p2m_set_allocation(d, 16, NULL);
+ spin_unlock(&d->arch.paging.lock);
+ if ( rc )
+ return rc;
+
return 0;
}
diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
index c9598740bd02..b2725206e8de 100644
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -194,14 +194,18 @@ int p2m_init(struct domain *d);
/*
* The P2M resources are freed in two parts:
- * - p2m_teardown() will be called when relinquish the resources. It
- * will free large resources (e.g. intermediate page-tables) that
- * requires preemption.
+ * - p2m_teardown() will be called preemptively when relinquish the
+ * resources, in which case it will free large resources (e.g. intermediate
+ * page-tables) that requires preemption.
* - p2m_final_teardown() will be called when domain struct is been
* freed. This *cannot* be preempted and therefore one small
* resources should be freed here.
+ * Note that p2m_final_teardown() will also call p2m_teardown(), to properly
+ * free the P2M when failures happen in the domain creation with P2M pages
+ * already in use. In this case p2m_teardown() is called non-preemptively and
+ * p2m_teardown() will always return 0.
*/
-int p2m_teardown(struct domain *d);
+int p2m_teardown(struct domain *d, bool allow_preemption);
void p2m_final_teardown(struct domain *d);
/*
@@ -266,6 +270,8 @@ mfn_t p2m_get_entry(struct p2m_domain *p2m, gfn_t gfn,
/*
* Direct set a p2m entry: only for use by the P2M code.
* The P2M write lock should be taken.
+ * TODO: Add a check in __p2m_set_entry() to avoid creating a mapping in
+ * arch_domain_create() that requires p2m_put_l3_page() to be called.
*/
int p2m_set_entry(struct p2m_domain *p2m,
gfn_t sgfn,
--
2.37.4
|
GitWeb