diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-04-29 18:04:26 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-04-30 11:31:33 +0100 |
| commit | 11d8866da50a75ef5089faebdfa37164bdcb7545 (patch) | |
| tree | d1cc01bfe1d4846b45123d9477dc0074588cd1cf | |
| parent | b4aae03ce525e8e2364814d0fed8f982aefc4958 (diff) | |
| download | xen-11d8866da50a75ef5089faebdfa37164bdcb7545.tar.gz xen-11d8866da50a75ef5089faebdfa37164bdcb7545.tar.bz2 xen-11d8866da50a75ef5089faebdfa37164bdcb7545.zip | |
xen/arm: move the tlb_flush in create_p2m_entries to the end of the function
Move the flush after the pagetable entry has actually been written to
avoid races with other vcpus refreshing the same entriy.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
| -rw-r--r-- | xen/arch/arm/p2m.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 1e8c8b4027..9fc55346d7 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -133,7 +133,7 @@ static int create_p2m_entries(struct domain *d, paddr_t maddr, int mattr) { - int rc; + int rc, flush; struct p2m_domain *p2m = &d->arch.p2m; lpae_t *first = NULL, *second = NULL, *third = NULL; paddr_t addr; @@ -186,10 +186,8 @@ static int create_p2m_entries(struct domain *d, third = map_domain_page(second[second_table_offset(addr)].p2m.base); cur_second_offset = second_table_offset(addr); } - /* else: third already valid */ - if ( third[third_table_offset(addr)].p2m.valid ) - flush_tlb_all_local(); + flush = third[third_table_offset(addr)].p2m.valid; /* Allocate a new RAM page and attach */ switch (op) { @@ -226,6 +224,9 @@ static int create_p2m_entries(struct domain *d, } break; } + + if ( flush ) + flush_tlb_all_local(); } rc = 0; |