Currently, the TLB is not flushed if an error occured while updating the stage-2 p2m. However, the TLB will contain stale mappings for any entry updated so far.
To avoid a such situation, flush on every exit path when the variable "flush" is set. Signed-off-by: Julien Grall <julien.gr...@citrix.com> Acked-by: Ian Campbell <ian.campb...@citrix.com> --- Changes in v2: - Add Ian's Acked-by - Fix typoes --- xen/arch/arm/p2m.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index e396c40..f910cab 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1010,7 +1010,7 @@ static int apply_p2m_changes(struct domain *d, if ( (egfn - sgfn) > progress && !(progress & mask) ) { rc = progress; - goto tlbflush; + goto out; } break; } @@ -1096,15 +1096,13 @@ static int apply_p2m_changes(struct domain *d, rc = 0; -tlbflush: +out: if ( flush ) { flush_tlb_domain(d); iommu_iotlb_flush(d, sgfn, egfn - sgfn); } -out: - if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && addr != start_gpaddr ) { -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel