[Xen-changelog] [xen master] xen/arm: p2m: Flush for every exit paths in apply_p2m_changes

[patchbot@xxxxxxx]

commit 1ec2fa626f71152031b620bfe2d4941b9016a688
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Tue Dec 1 17:52:09 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Dec 15 11:58:54 2015 +0000

    xen/arm: p2m: Flush for every exit paths in apply_p2m_changes
    
    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.grall@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/arm/p2m.c |    6 ++----
 1 files 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 )
     {
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog