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
|
From 6f948fd1929c01b82a119f03670cab38ffebb47e Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 25 Oct 2022 09:21:11 +0000
Subject: [PATCH 068/126] arm/p2m: Rework p2m_init()
p2m_init() is mostly trivial initialisation, but has two fallible operations
which are on either side of the backpointer trigger for teardown to take
actions.
p2m_free_vmid() is idempotent with a failed p2m_alloc_vmid(), so rearrange
p2m_init() to perform all trivial setup, then set the backpointer, then
perform all fallible setup.
This will simplify a future bugfix which needs to add a third fallible
operation.
No practical change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
(cherry picked from commit: 3783e583319fa1ce75e414d851f0fde191a14753)
---
xen/arch/arm/p2m.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index c1055ff2a745..25eb1d84cbc1 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -1733,7 +1733,7 @@ void p2m_final_teardown(struct domain *d)
int p2m_init(struct domain *d)
{
struct p2m_domain *p2m = p2m_get_hostp2m(d);
- int rc = 0;
+ int rc;
unsigned int cpu;
rwlock_init(&p2m->lock);
@@ -1742,11 +1742,6 @@ int p2m_init(struct domain *d)
INIT_PAGE_LIST_HEAD(&d->arch.paging.p2m_freelist);
p2m->vmid = INVALID_VMID;
-
- rc = p2m_alloc_vmid(d);
- if ( rc != 0 )
- return rc;
-
p2m->max_mapped_gfn = _gfn(0);
p2m->lowest_mapped_gfn = _gfn(ULONG_MAX);
@@ -1762,8 +1757,6 @@ int p2m_init(struct domain *d)
p2m->clean_pte = is_iommu_enabled(d) &&
!iommu_has_feature(d, IOMMU_FEAT_COHERENT_WALK);
- rc = p2m_alloc_table(d);
-
/*
* Make sure that the type chosen to is able to store the an vCPU ID
* between 0 and the maximum of virtual CPUS supported as long as
@@ -1776,13 +1769,20 @@ int p2m_init(struct domain *d)
p2m->last_vcpu_ran[cpu] = INVALID_VCPU_ID;
/*
- * Besides getting a domain when we only have the p2m in hand,
- * the back pointer to domain is also used in p2m_teardown()
- * as an end-of-initialization indicator.
+ * "Trivial" initialisation is now complete. Set the backpointer so
+ * p2m_teardown() and friends know to do something.
*/
p2m->domain = d;
- return rc;
+ rc = p2m_alloc_vmid(d);
+ if ( rc )
+ return rc;
+
+ rc = p2m_alloc_table(d);
+ if ( rc )
+ return rc;
+
+ return 0;
}
/*
--
2.37.4
|
GitWeb